Clean up and modernize codebase

.eslintrc.js

@@ -34,6 +34,7 @@ module.exports = {
 		'no-multiple-empty-lines': [ 'error', {
 			'max': 1,
 		} ],
+		'no-var': [ 'error' ],
 		'object-curly-newline': [ 'error', {
 			'ObjectExpression': {
 				'consistent': true,
@@ -56,6 +57,8 @@ module.exports = {
 		} ],
 		'object-curly-spacing': [ 'error', 'always' ],
 		'object-property-newline': [ 'error' ],
+		'prefer-arrow-callback': [ 'error' ],
+		'prefer-const': [ 'error' ],
 		'quotes': [ 'error', 'single' ],
 		'semi': [ 'error', 'always' ],
 		'semi-spacing': [ 'error', {

.travis.yml

@@ -5,6 +5,5 @@ node_js:
   - "lts/*"
   - "10"
   - "8"
-  - "6"
 # Opt-in to travis container infrastructure
 sudo: false

CONTRIBUTING.md

@@ -73,39 +73,9 @@ We rebase feature branches onto master when merging in order to maintain a linea
 
 ## Code Syntax & Style
 
-We use [JSCS](https://www.npmjs.org/package/jscs) to enforce a basic set of code style guidelines, and [JSHint](http://jshint.com/) to guard against syntax errors. To run them both execute `npm run lint`; they will also be run every time you execute `npm test`.
+We use [ESLint](https://eslint.org/) to enforce a basic set of code style guidelines and syntax warnings. To run ESLint use the command `npm run lint`; this command will also be run every time you execute `npm test`.
 
-JSCS is a useful tool for enforcing a code style, but isn't flexible enough to cover all guidelines. Note our standard for spacing within function parentheses, which is not enforced mechanically but will be evaluated manually when reviewing pull requests:
-
-```javascript
-// Function params and args should be spaced out from the parentheses:
-someMethodCall( param1, param2 );
-function newFunction( arg1, arg2 ) {};
-```
-
-"When in doubt, space it out," with the following exceptions.
-
-```javascript
-// The space can be omitted when passing function expressions, object literals
-// or array literals as arguments:
-someMethodCall(function() {
-    // do stuff
-});
-someOtherMethod({
-    object: 'no space before an object literal'
-}, 'but this String argument still has a space after it' );
-someMethodThatTakesAnArray([
-    'no',
-    'leading or trailing',
-    'spaces needed'
-]);
-```
-
-We prefer `camelCase` variable and function names, and `UpperCamelCase` constructors. When using the `underscore_case` parameter names that are required by the WordPress API, the following JSHint directive can be used to disable the case enforcement for that particular file:
-
-```javascript
-/*jshint -W106 */// Disable underscore_case warnings in this file
-```
+We prefer `camelCase` variable and function names, and `UpperCamelCase` constructors. `underscore_case` parameter names may be necessary when working with values returned from or intended to be sent to the WordPress REST API.
 
 ## Documentation
 

README.md

@@ -41,7 +41,9 @@ To get started, `npm install wpapi` or [download the browser build](https://wp-a
 
 ## Installation
 
-`node-wpapi` works both on the server or in the browser. Node.js version 4.0 or higher is required.
+`node-wpapi` works both on the server or in the browser. Node.js version 8 or higher is required, and the latest LTS release is recommended.
+
+In the browser `node-wpapi` officially supports the latest two versions of all evergreen browsers, and Internet Explorer 11.
 
 ### Install with NPM
 

build/grunt/generate-docs.js

@@ -6,12 +6,12 @@ module.exports = function( grunt ) {
 		'can be rendered with Jekyll.',
 	].join( ' ' ), function() {
 		// Force task into async mode and grab a handle to the "done" function.
-		var done = this.async();
+		const done = this.async();
 
 		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/generate-docs-markdown.js

@@ -125,7 +125,7 @@ const readmeOutput = readFile( readmePath ).then( ( contents ) => {
 	let entry = null;
 
 	for ( let i = 0; i < tokens.length; i++ ) {
-		let token = tokens[ i ];
+		const token = tokens[ i ];
 
 		if ( ! isTitle( token ) ) {
 			if ( entry && entry.tokens ) {

build/scripts/simplify-object.js

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var objectReduce = require( '../../lib/util/object-reduce' );
+const objectReduce = require( '../../lib/util/object-reduce' );
 
 /**
  * Walk through the keys and values of a provided object, removing any properties
@@ -17,42 +17,57 @@ var 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;
 	}
 
+	if ( obj.methods && obj.args ) {
+		// If the key is an object with "methods" and "args" properties, only
+		// include the full "args" object if "methods" contains GET.
+		if ( ! obj.methods.map( str => str.toLowerCase() ).includes( 'get' ) ) {
+			obj.args = {};
+		}
+	}
+
 	// Map arrays through simplifyObject
 	if ( Array.isArray( obj ) ) {
 		return obj.map( simplifyObject );
 	}
 
 	// 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 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
+				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;
-			}
-
-			// 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;
-		}, {} );
+			},
+			{}
+		);
 	}
 
 	// All other types pass through without modification
 	return obj;
-}
+};
 
 module.exports = simplifyObject;

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

@@ -62,13 +62,13 @@
  */
 'use strict';
 
-var agent = require( 'superagent' );
-var fs = require( 'fs' );
-var path = require( 'path' );
-var simplifyObject = require( './simplify-object' );
+const agent = require( 'superagent' );
+const fs = require( 'fs' );
+const path = require( 'path' );
+const simplifyObject = require( './simplify-object' );
 
 // Parse the arguments object
-var argv = require( 'minimist' )( process.argv.slice( 2 ) );
+const argv = require( 'minimist' )( process.argv.slice( 2 ) );
 
 if ( argv.h || argv.help ) {
 	console.log( `
@@ -90,25 +90,25 @@ update-default-routes-json \\
 // The output directory defaults to the lib/data directory. To customize it,
 // specify your own directory with --output=your/output/directory (supports
 // both relative and absolute paths)
-var outputPath = argv.output ?
+const outputPath = argv.output ?
 	// Nested ternary, don't try this at home: this is to support absolute paths
 	argv.output[ 0 ] === '/' ? argv.output : path.join( process.cwd(), argv.output ) :
 	// Output to lib/data/ by default
 	path.resolve( process.cwd(), 'lib', 'data' );
 
 // Specify your own API endpoint with --endpoint=http://your-endpoint.com/wp-json
-var endpoint = argv.endpoint || 'http://wpapi.local/wp-json';
+const endpoint = argv.endpoint || 'http://wpapi.local/wp-json';
 
 // Specify a custom output file name with --file=custom-api-routes-filename.json
-var fileName = argv.file || 'default-routes.json';
+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
-		var endpointJSON = JSON.parse( JSON.stringify( response.body ) );
+		const endpointJSON = JSON.parse( JSON.stringify( response.body ) );
 		// Simplify the JSON structure and pick out the routes dictionary
-		var slimJSON = simplifyObject( endpointJSON ).routes;
+		const slimJSON = simplifyObject( endpointJSON ).routes;
 
 		// Save the file
-		var outputFilePath = path.join( outputPath, fileName );
-		fs.writeFile( outputFilePath, JSON.stringify( slimJSON ), function( err ) {
+		const outputFilePath = path.join( outputPath, fileName );
+		fs.writeFile( outputFilePath, JSON.stringify( slimJSON ), ( err ) => {
 			if ( err ) {
 				console.error( '\nSomething went wrong! Could not save ' + outputFilePath );
 				return process.exit( 1 );

lib/autodiscovery.js

@@ -6,7 +6,7 @@
  */
 'use strict';
 
-var parseLinkHeader = require( 'parse-link-header' );
+const parseLinkHeader = require( 'parse-link-header' );
 
 /**
  * Attempt to locate a `rel="https://api.w.org"` link relation header
@@ -17,12 +17,12 @@ var parseLinkHeader = require( 'parse-link-header' );
  */
 function locateAPIRootHeader( response ) {
 	// Define the expected link rel value per http://v2.wp-api.org/guide/discovery/
-	var rel = 'https://api.w.org/';
+	const rel = 'https://api.w.org/';
 
 	// Extract & parse the response link headers
-	var link = response.link || ( response.headers && response.headers.link );
-	var headers = parseLinkHeader( link );
-	var apiHeader = headers && headers[ rel ];
+	const link = response.link || ( response.headers && response.headers.link );
+	const headers = parseLinkHeader( link );
+	const apiHeader = headers && headers[ rel ];
 
 	if ( apiHeader && apiHeader.url ) {
 		return apiHeader.url;