Skip to content

Commit

Permalink
[Refactor] use var instead of const and let.
Browse files Browse the repository at this point in the history 
Partially reverts 6c70b31.
  • Loading branch information
@ljharb
ljharb committed Dec 23, 2015
1 parent e4cf648 commit 224c8af
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 120 deletions.
6 changes: 3 additions & 3 deletions lib/index.js
View file
Expand Up @@ -2,13 +2,13 @@

// Load modules

const Stringify = require('./stringify');
const Parse = require('./parse');
var Stringify = require('./stringify');
var Parse = require('./parse');


// Declare internals

const internals = {};
var internals = {};


exports.stringify = Stringify;
Expand Down
50 changes: 25 additions & 25 deletions lib/parse.js
View file
Expand Up @@ -2,12 +2,12 @@

// Load modules

const Utils = require('./utils');
var Utils = require('./utils');


// Declare internals

const internals = {
var internals = {
delimiter: '&',
depth: 5,
arrayLimit: 20,
Expand All @@ -21,12 +21,12 @@ const internals = {

internals.parseValues = function (str, options) {

const obj = {};
const parts = str.split(options.delimiter, options.parameterLimit === Infinity ? undefined : options.parameterLimit);
var obj = {};
var parts = str.split(options.delimiter, options.parameterLimit === Infinity ? undefined : options.parameterLimit);

for (let i = 0; i < parts.length; ++i) {
const part = parts[i];
const pos = part.indexOf(']=') === -1 ? part.indexOf('=') : part.indexOf(']=') + 1;
for (var i = 0; i < parts.length; ++i) {
var part = parts[i];
var pos = part.indexOf(']=') === -1 ? part.indexOf('=') : part.indexOf(']=') + 1;

if (pos === -1) {
obj[Utils.decode(part)] = '';
Expand All @@ -36,8 +36,8 @@ internals.parseValues = function (str, options) {
}
}
else {
const key = Utils.decode(part.slice(0, pos));
const val = Utils.decode(part.slice(pos + 1));
var key = Utils.decode(part.slice(0, pos));
var val = Utils.decode(part.slice(pos + 1));

if (!Object.prototype.hasOwnProperty.call(obj, key)) {
obj[key] = val;
Expand All @@ -58,18 +58,18 @@ internals.parseObject = function (chain, val, options) {
return val;
}

const root = chain.shift();
var root = chain.shift();

let obj;
var obj;
if (root === '[]') {
obj = [];
obj = obj.concat(internals.parseObject(chain, val, options));
}
else {
obj = options.plainObjects ? Object.create(null) : {};
const cleanRoot = root[0] === '[' && root[root.length - 1] === ']' ? root.slice(1, root.length - 1) : root;
const index = parseInt(cleanRoot, 10);
const indexString = '' + index;
var cleanRoot = root[0] === '[' && root[root.length - 1] === ']' ? root.slice(1, root.length - 1) : root;
var index = parseInt(cleanRoot, 10);
var indexString = '' + index;
if (!isNaN(index) &&
root !== cleanRoot &&
indexString === cleanRoot &&
Expand Down Expand Up @@ -103,16 +103,16 @@ internals.parseKeys = function (key, val, options) {

// The regex chunks

const parent = /^([^\[\]]*)/;
const child = /(\[[^\[\]]*\])/g;
var parent = /^([^\[\]]*)/;
var child = /(\[[^\[\]]*\])/g;

// Get the parent

let segment = parent.exec(key);
var segment = parent.exec(key);

// Stash the parent if it exists

const keys = [];
var keys = [];
if (segment[1]) {
// If we aren't using plain objects, optionally prefix keys
// that would overwrite object prototype properties
Expand All @@ -129,7 +129,7 @@ internals.parseKeys = function (key, val, options) {

// Loop through children appending to the array until we hit depth

let i = 0;
var i = 0;
while ((segment = child.exec(key)) !== null && i < options.depth) {

++i;
Expand Down Expand Up @@ -173,15 +173,15 @@ module.exports = function (str, options) {
return options.plainObjects ? Object.create(null) : {};
}

const tempObj = typeof str === 'string' ? internals.parseValues(str, options) : str;
let obj = options.plainObjects ? Object.create(null) : {};
var tempObj = typeof str === 'string' ? internals.parseValues(str, options) : str;
var obj = options.plainObjects ? Object.create(null) : {};

// Iterate over the keys and setup the new object

const keys = Object.keys(tempObj);
for (let i = 0; i < keys.length; ++i) {
const key = keys[i];
const newObj = internals.parseKeys(key, tempObj[key], options);
var keys = Object.keys(tempObj);
for (var i = 0; i < keys.length; ++i) {
var key = keys[i];
var newObj = internals.parseKeys(key, tempObj[key], options);
obj = Utils.merge(obj, newObj, options);
}

Expand Down
38 changes: 19 additions & 19 deletions lib/stringify.js
View file
Expand Up @@ -2,12 +2,12 @@

// Load modules

const Utils = require('./utils');
var Utils = require('./utils');


// Declare internals

const internals = {
var internals = {
delimiter: '&',
arrayPrefixGenerators: {
brackets: function (prefix, key) {
Expand Down Expand Up @@ -58,23 +58,23 @@ internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHand
return [prefix + '=' + obj];
}

let values = [];
var values = [];

if (typeof obj === 'undefined') {
return values;
}

let objKeys;
var objKeys;
if (Array.isArray(filter)) {
objKeys = filter;
}
else {
const keys = Object.keys(obj);
var keys = Object.keys(obj);
objKeys = sort ? keys.sort(sort) : keys;
}

for (let i = 0; i < objKeys.length; ++i) {
const key = objKeys[i];
for (var i = 0; i < objKeys.length; ++i) {
var key = objKeys[i];

if (skipNulls &&
obj[key] === null) {
Expand All @@ -97,13 +97,13 @@ internals.stringify = function (obj, prefix, generateArrayPrefix, strictNullHand
module.exports = function (obj, options) {

options = options || {};
const delimiter = typeof options.delimiter === 'undefined' ? internals.delimiter : options.delimiter;
const strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : internals.strictNullHandling;
const skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : internals.skipNulls;
const encode = typeof options.encode === 'boolean' ? options.encode : internals.encode;
const sort = typeof options.sort === 'function' ? options.sort : null;
let objKeys;
let filter;
var delimiter = typeof options.delimiter === 'undefined' ? internals.delimiter : options.delimiter;
var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : internals.strictNullHandling;
var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : internals.skipNulls;
var encode = typeof options.encode === 'boolean' ? options.encode : internals.encode;
var sort = typeof options.sort === 'function' ? options.sort : null;
var objKeys;
var filter;
if (typeof options.filter === 'function') {
filter = options.filter;
obj = filter('', obj);
Expand All @@ -112,15 +112,15 @@ module.exports = function (obj, options) {
objKeys = filter = options.filter;
}

let keys = [];
var keys = [];

if (typeof obj !== 'object' ||
obj === null) {

return '';
}

let arrayFormat;
var arrayFormat;
if (options.arrayFormat in internals.arrayPrefixGenerators) {
arrayFormat = options.arrayFormat;
}
Expand All @@ -131,7 +131,7 @@ module.exports = function (obj, options) {
arrayFormat = 'indices';
}

const generateArrayPrefix = internals.arrayPrefixGenerators[arrayFormat];
var generateArrayPrefix = internals.arrayPrefixGenerators[arrayFormat];

if (!objKeys) {
objKeys = Object.keys(obj);
Expand All @@ -141,8 +141,8 @@ module.exports = function (obj, options) {
objKeys.sort(sort);
}

for (let i = 0; i < objKeys.length; ++i) {
const key = objKeys[i];
for (var i = 0; i < objKeys.length; ++i) {
var key = objKeys[i];

if (skipNulls &&
obj[key] === null) {
Expand Down
36 changes: 18 additions & 18 deletions lib/utils.js
View file
Expand Up @@ -5,13 +5,13 @@

// Declare internals

const internals = {};
var internals = {};


internals.hexTable = function () {

const array = new Array(256);
for (let i = 0; i < 256; ++i) {
var array = new Array(256);
for (var i = 0; i < 256; ++i) {
array[i] = '%' + ((i < 16 ? '0' : '') + i.toString(16)).toUpperCase();
}

Expand All @@ -21,8 +21,8 @@ internals.hexTable = function () {

exports.arrayToObject = function (source, options) {

const obj = options.plainObjects ? Object.create(null) : {};
for (let i = 0; i < source.length; ++i) {
var obj = options.plainObjects ? Object.create(null) : {};
for (var i = 0; i < source.length; ++i) {
if (typeof source[i] !== 'undefined') {
obj[i] = source[i];
}
Expand Down Expand Up @@ -63,10 +63,10 @@ exports.merge = function (target, source, options) {
target = exports.arrayToObject(target, options);
}

const keys = Object.keys(source);
for (let i = 0; i < keys.length; ++i) {
const key = keys[i];
const value = source[key];
var keys = Object.keys(source);
for (var i = 0; i < keys.length; ++i) {
var key = keys[i];
var value = source[key];

if (!Object.prototype.hasOwnProperty.call(target, key)) {
target[key] = value;
Expand Down Expand Up @@ -102,9 +102,9 @@ exports.encode = function (str) {
str = '' + str;
}

let out = '';
for (let i = 0; i < str.length; ++i) {
let c = str.charCodeAt(i);
var out = '';
for (var i = 0; i < str.length; ++i) {
var c = str.charCodeAt(i);

if (c === 0x2D || // -
c === 0x2E || // .
Expand Down Expand Up @@ -150,17 +150,17 @@ exports.compact = function (obj, refs) {
}

refs = refs || [];
const lookup = refs.indexOf(obj);
var lookup = refs.indexOf(obj);
if (lookup !== -1) {
return refs[lookup];
}

refs.push(obj);

if (Array.isArray(obj)) {
const compacted = [];
var compacted = [];

for (let i = 0; i < obj.length; ++i) {
for (var i = 0; i < obj.length; ++i) {
if (typeof obj[i] !== 'undefined') {
compacted.push(obj[i]);
}
Expand All @@ -169,9 +169,9 @@ exports.compact = function (obj, refs) {
return compacted;
}

const keys = Object.keys(obj);
for (let i = 0; i < keys.length; ++i) {
const key = keys[i];
var keys = Object.keys(obj);
for (var i = 0; i < keys.length; ++i) {
var key = keys[i];
obj[key] = exports.compact(obj[key], refs);
}

Expand Down

0 comments on commit 224c8af

Please sign in to comment.