Finish switching functions to arrows, and remove JSHint comments

Author: kadamwhite

.eslintrc.js

@@ -57,6 +57,7 @@ module.exports = {
 		} ],
 		'object-curly-spacing': [ 'error', 'always' ],
 		'object-property-newline': [ 'error' ],
+		'prefer-arrow-callback': [ 'error' ],
 		'prefer-const': [ 'error' ],
 		'quotes': [ 'error', 'single' ],
 		'semi': [ 'error', 'always' ],

build/grunt/generate-docs.js

@@ -11,7 +11,7 @@ module.exports = function( grunt ) {
 		grunt.log.writeln( 'Extracting page content from README.md...' );
 
 		// Kick off generation
-		require( '../scripts/generate-docs-markdown' ).then( function() {
+		require( '../scripts/generate-docs-markdown' ).then( () => {
 			grunt.log.writeln( 'Pages generated successfully' );
 			done();
 		} );

build/scripts/simplify-object.js

@@ -17,7 +17,7 @@ const objectReduce = require( '../../lib/util/object-reduce' );
  * @returns {*} The passed-in value, with non-essential args properties and all
  * _links properties removes.
  */
-function simplifyObject( obj ) {
+const simplifyObject = ( obj ) => {
 	// Pass through falsy values, Dates and RegExp values without modification
 	if ( ! obj || obj instanceof Date || obj instanceof RegExp ) {
 		return obj;
@@ -30,29 +30,36 @@ function simplifyObject( obj ) {
 
 	// Reduce through objects to run each property through simplifyObject
 	if ( typeof obj === 'object' ) {
-		return objectReduce( obj, function( newObj, val, key ) {
-			// Omit _links objects entirely
-			if ( key === '_links' ) {
-				return newObj;
-			}
+		return objectReduce(
+			obj,
+			( newObj, val, key ) => {
+				// Omit _links objects entirely
+				if ( key === '_links' ) {
+					return newObj;
+				}
 
-			// If the key is "args", omit all keys of second-level descendants
-			// other than "required"
-			if ( key === 'args' ) {
-				newObj.args = objectReduce( val, function( slimArgs, argVal, argKey ) {
-					slimArgs[ argKey ] = {};
-					return slimArgs;
-				}, {} );
-			} else {
-				// Pass all other objects through simplifyObject
-				newObj[ key ] = simplifyObject( obj[ key ] );
-			}
-			return newObj;
-		}, {} );
+				// If the key is "args", omit all keys of second-level descendants
+				if ( key === 'args' ) {
+					newObj.args = objectReduce(
+						val,
+						( slimArgs, argVal, argKey ) => {
+							slimArgs[ argKey ] = {};
+							return slimArgs;
+						},
+						{}
+					);
+				} else {
+					// Pass all other objects through simplifyObject
+					newObj[ key ] = simplifyObject( obj[ key ] );
+				}
+				return newObj;
+			},
+			{}
+		);
 	}
 
 	// All other types pass through without modification
 	return obj;
-}
+};
 
 module.exports = simplifyObject;

build/scripts/update-default-routes-json.js

@@ -104,11 +104,11 @@ const fileName = argv.file || 'default-routes.json';
 
 // This directory will be called to kick off the JSON download: it uses
 // superagent internally for HTTP transport that respects HTTP redirects.
-function getJSON( cbFn ) {
+const getJSON = ( cbFn ) => {
 	agent
 		.get( endpoint )
 		.set( 'Accept', 'application/json' )
-		.end( function( err, res ) {
+		.end( ( err, res ) => {
 			// Inspect the error and then the response to infer various error states
 			if ( err ) {
 				console.error( '\nSomething went wrong! Could not download endpoint JSON.' );
@@ -129,7 +129,7 @@ function getJSON( cbFn ) {
 
 			cbFn( res );
 		} );
-}
+};
 
 // The only assumption we want to make about the URL is that it should be a web
 // URL of _some_ sort, which generally means it has "http" in it somewhere. We
@@ -142,23 +142,23 @@ if ( ! /http/i.test( endpoint ) ) {
 	process.exit( 1 );
 }
 
-fs.stat( outputPath, function( err, stats ) {
+fs.stat( outputPath, ( err, stats ) => {
 	if ( err || ! stats.isDirectory() ) {
 		console.error( '\nError: ' + outputPath );
 		console.error( 'This is not a valid directory. Please double-check the path and try again.' );
 		process.exit( 1 );
 	}
 
 	// If we made it this far, our arguments look good! Carry on.
-	getJSON( function( response ) {
+	getJSON( ( response ) => {
 		// Extract the JSON
 		const endpointJSON = JSON.parse( JSON.stringify( response.body ) );
 		// Simplify the JSON structure and pick out the routes dictionary
 		const slimJSON = simplifyObject( endpointJSON ).routes;
 
 		// Save the file
 		const outputFilePath = path.join( outputPath, fileName );
-		fs.writeFile( outputFilePath, JSON.stringify( slimJSON ), function( err ) {
+		fs.writeFile( outputFilePath, JSON.stringify( slimJSON ), ( err ) => {
 			if ( err ) {
 				console.error( '\nSomething went wrong! Could not save ' + outputFilePath );
 				return process.exit( 1 );

lib/constructors/wp-request.js

@@ -123,15 +123,19 @@ function prepareTaxonomies( taxonomyFilters ) {
 		return {};
 	}
 
-	return objectReduce( taxonomyFilters, function( result, terms, key ) {
-		// Trim whitespace and concatenate multiple terms with +
-		result[ key ] = terms
-			// Coerce term into a string so that trim() won't fail
-			.map( term => ( term + '' ).trim().toLowerCase() )
-			.join( '+' );
-
-		return result;
-	}, {} );
+	return objectReduce(
+		taxonomyFilters,
+		( result, terms, key ) => {
+			// Trim whitespace and concatenate multiple terms with +
+			result[ key ] = terms
+				// Coerce term into a string so that trim() won't fail
+				.map( term => ( term + '' ).trim().toLowerCase() )
+				.join( '+' );
+
+			return result;
+		},
+		{}
+	);
 }
 
 /**
@@ -150,7 +154,7 @@ function prepareTaxonomies( taxonomyFilters ) {
  * @param {Object} obj An object of key/value pairs
  * @returns {Object} That object with all empty values removed
  */
-function populated( obj ) {
+const populated = ( obj ) => {
 	if ( ! obj ) {
 		return obj;
 	}
@@ -164,7 +168,7 @@ function populated( obj ) {
 		},
 		{}
 	);
-}
+};
 
 /**
  * Assert whether a provided URL component is "valid" by checking it against
@@ -178,7 +182,7 @@ function populated( obj ) {
  * @returns {boolean} Whether the provided input matches any of the provided
  * level validation functions
  */
-function validatePathLevel( levelDefinitions, levelContents ) {
+const validatePathLevel = ( levelDefinitions, levelContents ) => {
 	// One "level" may have multiple options, as a route tree is a branching
 	// structure. We consider a level "valid" if the provided levelContents
 	// match any of the available validators.
@@ -202,7 +206,7 @@ function validatePathLevel( levelDefinitions, levelContents ) {
 			).join( ', ' ),
 		].join( ' ' ) );
 	}
-}
+};
 
 // (Semi-)Private Prototype Methods
 // ================================

lib/mixins/filters.js

@@ -47,8 +47,6 @@ const filterMixins = {};
  * @returns The request instance (for chaining)
  */
 filterMixins.filter = function( props, value ) {
-	/* jshint validthis:true */
-
 	if ( ! props || typeof props === 'string' && value === undefined ) {
 		// We have no filter to set, or no value to set for that filter
 		return this;
@@ -74,14 +72,15 @@ filterMixins.filter = function( props, value ) {
  * @returns The request instance (for chaining)
  */
 filterMixins.taxonomy = function( taxonomy, term ) {
-	/* jshint validthis:true */
 	const termIsArray = Array.isArray( term );
+
 	const termIsNumber = termIsArray ?
 		term.reduce(
 			( allAreNumbers, term ) => allAreNumbers && typeof term === 'number',
 			true
 		) :
 		typeof term === 'number';
+
 	const termIsString = termIsArray ?
 		term.reduce(
 			( allAreStrings, term ) => allAreStrings && typeof term === 'string',
@@ -133,7 +132,6 @@ filterMixins.taxonomy = function( taxonomy, term ) {
  * @returns The request instance (for chaining)
  */
 filterMixins.year = function( year ) {
-	/* jshint validthis:true */
 	return filterMixins.filter.call( this, 'year', year );
 };
 
@@ -147,7 +145,6 @@ filterMixins.year = function( year ) {
  * @returns The request instance (for chaining)
  */
 filterMixins.month = function( month ) {
-	/* jshint validthis:true */
 	let monthDate;
 	if ( typeof month === 'string' ) {
 		// Append a arbitrary day and year to the month to parse the string into a Date
@@ -179,7 +176,6 @@ filterMixins.month = function( month ) {
  * @returns The request instance (for chaining)
  */
 filterMixins.day = function( day ) {
-	/* jshint validthis:true */
 	return filterMixins.filter.call( this, 'day', day );
 };
 
@@ -192,7 +188,6 @@ filterMixins.day = function( day ) {
  * @returns The request instance (for chaining)
  */
 filterMixins.path = function( path ) {
-	/* jshint validthis:true */
 	return filterMixins.filter.call( this, 'pagename', path );
 };
 

lib/mixins/parameters.js

@@ -44,7 +44,6 @@ const taxonomy = filters.taxonomy;
  * @returns The request instance (for chaining)
  */
 parameterMixins.author = function( author ) {
-	/* jshint validthis:true */
 	if ( author === undefined ) {
 		return this;
 	}
@@ -156,7 +155,6 @@ parameterMixins.categories = paramSetter( 'categories' );
  * @returns The request instance (for chaining)
  */
 parameterMixins.category = function( category ) {
-	/* jshint validthis:true */
 	if ( argumentIsNumeric( category ) ) {
 		return parameterMixins.categories.call( this, category );
 	}
@@ -193,7 +191,6 @@ parameterMixins.tags = paramSetter( 'tags' );
  * @returns The request instance (for chaining)
  */
 parameterMixins.tag = function( tag ) {
-	/* jshint validthis:true */
 	if ( argumentIsNumeric( tag ) ) {
 		return parameterMixins.tags.call( this, tag );
 	}
@@ -230,7 +227,6 @@ parameterMixins.excludeTags = paramSetter( 'tags_exclude' );
  * @returns The request instance (for chaining)
  */
 parameterMixins.before = function( date ) {
-	/* jshint validthis:true */
 	return this.param( 'before', new Date( date ).toISOString() );
 };
 
@@ -251,7 +247,6 @@ parameterMixins.before = function( date ) {
  * @returns The request instance (for chaining)
  */
 parameterMixins.after = function( date ) {
-	/* jshint validthis:true */
 	return this.param( 'after', new Date( date ).toISOString() );
 };
 

lib/path-part-setter.js

@@ -42,7 +42,6 @@ function createPathPartSetter( node ) {
 		 * @returns {Object} The handler instance (for chaining)
 		 */
 		return function( val ) {
-			/* jshint validthis:true */
 			this.setPathPart( nodeLevel, val );
 			if ( supportedMethods.length ) {
 				this._supportedMethods = supportedMethods;
@@ -67,7 +66,6 @@ function createPathPartSetter( node ) {
 		 * @returns {Object} The handler instance (for chaining)
 		 */
 		return function( val ) {
-			/* jshint validthis:true */
 			// If the path part is not a namedGroup, it should have exactly one
 			// entry in the names array: use that as the value for this setter,
 			// as it will usually correspond to a collection endpoint.

lib/util/object-reduce.js

@@ -19,7 +19,8 @@
  * @param {*} initialState The initial value to pass to the reducer function
  * @returns The result of the reduction operation
  */
-module.exports = ( obj, iterator, initialState ) => Object.keys( obj )
+module.exports = ( obj, iterator, initialState ) => Object
+	.keys( obj )
 	.reduce(
 		( memo, key ) => iterator( memo, obj[ key ], key ),
 		initialState

lib/util/parameter-setter.js

@@ -16,7 +16,6 @@ module.exports = ( param ) => {
 	 * @returns The request instance on which this method was called (for chaining)
 	 */
 	return function( val ) {
-		/* jshint validthis:true */
 		return this.param( param, val );
 	};
 };

lib/wp-register-route.js

@@ -91,7 +91,6 @@ function registerRoute( namespace, restBase, options = {} ) {
 	}
 
 	function endpointFactory( options ) {
-		/* jshint validthis:true */
 		options = options || {};
 		options = extend( options, this && this._options );
 		return new EndpointRequest( options );

tests/integration/custom-http-transport.js

@@ -102,7 +102,6 @@ describe( 'integration: custom HTTP transport methods', () => {
 				// If .slug is used, auto-unwrap the returned array
 				get( wpreq, cb ) {
 					if ( ! wpreq._params.slug ) {
-						/* jshint validthis:true */
 						return WPAPI.transport.get.call( this, wpreq, cb );
 					}
 					return WPAPI.transport.get( wpreq ).then( ( results ) => {
@@ -142,7 +141,6 @@ describe( 'integration: custom HTTP transport methods', () => {
 			transport: {
 				// Add collection helper methods to the returned arrays
 				get( wpreq, cb ) {
-					/* jshint validthis:true */
 					return WPAPI.transport.get.call( this, wpreq, cb ).then( ( results ) => {
 						if ( Array.isArray( results ) ) {
 							return new Collection( results );

tests/integration/posts.js

@@ -817,7 +817,7 @@ describe( 'integration: posts()', () => {
 
 			request( cb ) {
 				const self = this;
-				wp.posts().get( function( err, data ) {
+				wp.posts().get( ( err, data ) => {
 					expect( err ).toBeNull();
 
 					// Context is maintained
@@ -832,7 +832,7 @@ describe( 'integration: posts()', () => {
 					expect( Array.isArray( this.state.data ) ).toBe( true );
 					expect( this.state.data.length ).toBe( 10 );
 					cb();
-				}.bind( this ) );
+				} );
 			}
 		}
 		( new Ctor() ).request( done );