Skip to content

Commit

Permalink
var -> const using eslint auto fix, phetsims/tasks#1012
Browse files Browse the repository at this point in the history
  • Loading branch information
@zepumph
zepumph committed Sep 19, 2019
1 parent caa5ef4 commit bbee74e
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
80 changes: 40 additions & 40 deletions js/QueryStringMachine.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
'use strict';

// Default string that splits array strings
var DEFAULT_SEPARATOR = ',';
const DEFAULT_SEPARATOR = ',';

// If a query parameter has private:true in its schema, it must pass this predicate to be read from the URL.
// See https://github.com/phetsims/chipper/issues/743
Expand Down Expand Up @@ -106,7 +106,7 @@
const values = ( schema.private && !privatePredicate() ) ? [] : getValues( key, string );

validateSchema( key, schema );
var value = parseValues( key, schema, values );
const value = parseValues( key, schema, values );
validateValue( key, schema, value );
return value;
},
Expand All @@ -119,8 +119,8 @@
* @public
*/
getAllForString: function( schemaMap, string ) {
var result = {};
for ( var key in schemaMap ) {
const result = {};
for ( const key in schemaMap ) {
if ( schemaMap.hasOwnProperty( key ) ) {
result[ key ] = this.getForString( key, schemaMap[ key ], string );
}
Expand Down Expand Up @@ -152,7 +152,7 @@
throw new Error( 'Query strings should be either the empty string or start with a "?": ' + string );
}

var values = getValues( key, string );
const values = getValues( key, string );
return values.length > 0;
},

Expand Down Expand Up @@ -182,8 +182,8 @@
if ( a === undefined && b === null ) {
return false;
}
var aKeys = Object.keys( a );
var bKeys = Object.keys( b );
const aKeys = Object.keys( a );
const bKeys = Object.keys( b );
if ( aKeys.length !== bKeys.length ) {
return false;
}
Expand All @@ -192,12 +192,12 @@
}
else {

for ( var i = 0; i < aKeys.length; i++ ) {
for ( let i = 0; i < aKeys.length; i++ ) {
if ( aKeys[ i ] !== bKeys[ i ] ) {
return false;
}
var aChild = a[ aKeys[ i ] ];
var bChild = b[ aKeys[ i ] ];
const aChild = a[ aKeys[ i ] ];
const bChild = b[ aKeys[ i ] ];
if ( !QueryStringMachine.deepEquals( aChild, bChild ) ) {
return false;
}
Expand All @@ -220,12 +220,12 @@
assert && assert( key.length > 0, 'url should be a string with length > 0' );

if ( queryString.indexOf( '?' ) === 0 ) {
var newParameters = [];
var query = queryString.substring( 1 );
var elements = query.split( '&' );
for ( var i = 0; i < elements.length; i++ ) {
var element = elements[ i ];
var keyAndMaybeValue = element.split( '=' );
const newParameters = [];
const query = queryString.substring( 1 );
const elements = query.split( '&' );
for ( let i = 0; i < elements.length; i++ ) {
const element = elements[ i ];
const keyAndMaybeValue = element.split( '=' );

const elementKey = decodeURIComponent( keyAndMaybeValue[ 0 ] );
if ( elementKey !== key ) {
Expand Down Expand Up @@ -297,12 +297,12 @@
* @returns {Array.<string|null>} - the resulting values, null indicates the query parameter is present with no value
*/
var getValues = function( key, string ) {
var values = [];
var params = string.slice( 1 ).split( '&' );
for ( var i = 0; i < params.length; i++ ) {
var splitByEquals = params[ i ].split( '=' );
var name = splitByEquals[ 0 ];
var value = splitByEquals.slice( 1 ).join( '=' ); // Support arbitrary number of '=' in the value
const values = [];
const params = string.slice( 1 ).split( '&' );
for ( let i = 0; i < params.length; i++ ) {
const splitByEquals = params[ i ].split( '=' );
const name = splitByEquals[ 0 ];
const value = splitByEquals.slice( 1 ).join( '=' ); // Support arbitrary number of '=' in the value
if ( name === key ) {
if ( value ) {
values.push( decodeURIComponent( value ) );
Expand Down Expand Up @@ -381,7 +381,7 @@
* @param {string} key - the query parameter name
* @param {Object} schema - schema that describes the query parameter, see QueryStringMachine.get
*/
var validateArraySchema = function( key, schema ) {
const validateArraySchema = function( key, schema ) {

// separator is a single character
if ( schema.hasOwnProperty( 'separator' ) ) {
Expand All @@ -403,7 +403,7 @@
var validateSchemaProperties = function( key, schema, requiredProperties, optionalProperties ) {

// {string[]}, the names of the properties in the schema
var schemaProperties = Object.getOwnPropertyNames( schema );
const schemaProperties = Object.getOwnPropertyNames( schema );

// verify that all required properties are present
requiredProperties.forEach( function( property ) {
Expand All @@ -412,7 +412,7 @@
} );

// verify that there are no unsupported properties
var supportedProperties = requiredProperties.concat( optionalProperties );
const supportedProperties = requiredProperties.concat( optionalProperties );
schemaProperties.forEach( function( property ) {
queryStringMachineAssert( property === 'type' || supportedProperties.indexOf( property ) !== -1,
key, 'unsupported property: ' + property );
Expand Down Expand Up @@ -450,7 +450,7 @@
* @param {Object} schema - schema that describes the query parameter
* @param {boolean} value
*/
var validateFlagValue = function( key, schema, value ) {
const validateFlagValue = function( key, schema, value ) {
return validateBooleanValue( key, schema, value ); // flag is a convenient variation of boolean
};

Expand All @@ -470,7 +470,7 @@
* @param {Object} schema - schema that describes the query parameter
* @param {number} value - value from the query parameter string
*/
var validateNumberValue = function( key, schema, value ) {
const validateNumberValue = function( key, schema, value ) {
queryStringMachineAssert( typeof value === 'number' && !isNaN( value ), key, 'invalid value: ' + value );
};

Expand All @@ -480,7 +480,7 @@
* @param {Object} schema - schema that describes the query parameter
* @param {string|null} value - value from the query parameter string
*/
var validateStringValue = function( key, schema, value ) {
const validateStringValue = function( key, schema, value ) {
queryStringMachineAssert( value === null || typeof value === 'string', key, 'invalid value: ' + value );
};

Expand All @@ -490,7 +490,7 @@
* @param {Object} schema - schema that describes the query parameter
* @param {Array.<*>} value - type of array elements depends on elementSchema
*/
var validateArrayValue = function( key, schema, value ) {
const validateArrayValue = function( key, schema, value ) {
queryStringMachineAssert( Array.isArray( value ) || value === null, key, 'invalid value: ' + value );
};

Expand All @@ -500,7 +500,7 @@
* @param {Object} schema - schema that describes the query parameter
* @param {*} value - type depends on what parse returns
*/
var validateCustomValue = function( key, schema, value ) {
const validateCustomValue = function( key, schema, value ) {
//TODO do we need to add a property to 'custom' schema that handles validation of custom value's type?
};

Expand All @@ -516,7 +516,7 @@
*/
var parseValues = function( key, schema, values ) {

var returnValue;
let returnValue;

// values contains values for all occurrences of the query parameter. We currently support only 1 occurrence.
queryStringMachineAssert( values.length <= 1, key, 'query parameter cannot occur multiple times' );
Expand Down Expand Up @@ -565,7 +565,7 @@
* @param {string|null} value - value from the query parameter string
* @returns {boolean}
*/
var parseBoolean = function( key, schema, value ) {
const parseBoolean = function( key, schema, value ) {
queryStringMachineAssert( value === 'true' || value === 'false', key, 'invalid value: ' + value );
return ( value === 'true' );
};
Expand All @@ -577,8 +577,8 @@
* @param {string|null} value - value from the query parameter string
* @returns {number}
*/
var parseNumber = function( key, schema, value ) {
var returnValue = Number( value );
const parseNumber = function( key, schema, value ) {
const returnValue = Number( value );
queryStringMachineAssert( !isNaN( returnValue ), key, 'value must be a number: ' + value );
return returnValue;
};
Expand All @@ -590,7 +590,7 @@
* @param {string|null} value - value from the query parameter string
* @returns {string|null}
*/
var parseString = function( key, schema, value ) {
const parseString = function( key, schema, value ) {
return value;
};

Expand All @@ -601,9 +601,9 @@
* @param {string|null} value - value from the query parameter string
* @returns {Array.<*>|null}
*/
var parseArray = function( key, schema, value ) {
const parseArray = function( key, schema, value ) {

var returnValue;
let returnValue;

if ( value === null ) {

Expand All @@ -629,7 +629,7 @@
* @param {string} value - value from the query parameter string
* @returns {*}
*/
var parseCustom = function( key, schema, value ) {
const parseCustom = function( key, schema, value ) {
return schema.parse( value );
};

Expand All @@ -642,8 +642,8 @@
* @returns {boolean}
*/
var isValidValue = function( value, validValues ) {
var found = false;
for ( var i = 0; i < validValues.length && !found; i++ ) {
let found = false;
for ( let i = 0; i < validValues.length && !found; i++ ) {
found = QueryStringMachine.deepEquals( validValues[ i ], value );
}
return found;
Expand Down
10 changes: 5 additions & 5 deletions js/QueryStringMachineTests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ define( require => {

// assert shadows window.assert
QUnit.test( 'basic tests', function( assert ) {
var value = 'hello';
const value = 'hello';
assert.equal( value, 'hello', 'We expect value to be hello' );

var schemaMap = {
const schemaMap = {
height: {
type: 'number',
defaultValue: 6,
Expand Down Expand Up @@ -103,7 +103,7 @@ define( require => {
defaultValue: [ 1, 6, 0 ],
isValidValue: function( arr ) {
// Fake test: check that elements sum to 7 for phetsims/query-string-machine#11
var arraySum = arr.reduce( function( a, b ) { return a + b; }, 0 );
const arraySum = arr.reduce( function( a, b ) { return a + b; }, 0 );
return ( arraySum === 7 );
}
}
Expand Down Expand Up @@ -170,7 +170,7 @@ define( require => {
assert.equal( QueryStringMachine.deepEquals( null, undefined ), false, 'null undefined' );
assert.equal( QueryStringMachine.deepEquals( undefined, undefined ), true, 'undefined undefined' );
assert.equal( QueryStringMachine.deepEquals( function() {}, function() {} ), false, 'different implementations of similar functions' );
var f = function() {};
const f = function() {};
assert.equal( QueryStringMachine.deepEquals( f, f ), true, 'same reference function' );
} );

Expand All @@ -191,7 +191,7 @@ define( require => {

QUnit.test( 'appendQueryString', function( assert ) {

var test = function( url, queryParameters, expected ) {
const test = function( url, queryParameters, expected ) {
assert.equal( QueryStringMachine.appendQueryString( url, queryParameters ), expected, url + ' + ' + queryParameters + ' should be ok' );
};

Expand Down

0 comments on commit bbee74e

Please sign in to comment.