1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: replace var for (let|const) in utilities module

Browse Source 
Update Utilities module to replace var for let or const

PR-URL: https://github.com/nodejs/node/pull/18814
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Matheus Marchini <matheus@sthima.com>
This commit is contained in:
jvelezpo 2018-02-16 07:28:38 -05:00 committed by Ruben Bridgewater
parent 6aab9e1eed
commit ca79fc5373
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/internal/util.js
View File

@ -47,7 +47,7 @@ function deprecate(fn, msg, code) {
if (code !== undefined && typeof code !== 'string') if (code !== undefined && typeof code !== 'string')
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'code', 'string'); throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'code', 'string');
var warned = false; let warned = false;
function deprecated(...args) { function deprecated(...args) {
if (!warned) { if (!warned) {
warned = true; warned = true;
@ -103,7 +103,7 @@ function assertCrypto() {
// Return undefined if there is no match. // Return undefined if there is no match.
function normalizeEncoding(enc) { function normalizeEncoding(enc) {
if (!enc) return 'utf8'; if (!enc) return 'utf8';
var retried; let retried;
while (true) { while (true) {
switch (enc) { switch (enc) {
case 'utf8': case 'utf8':
@ -152,7 +152,7 @@ function filterDuplicateStrings(items, low) {
} }
function cachedResult(fn) { function cachedResult(fn) {
var result; let result;
return () => { return () => {
if (result === undefined) if (result === undefined)
result = fn(); result = fn();
@ -207,7 +207,7 @@ function convertToValidSignal(signal) {
function getConstructorOf(obj) { function getConstructorOf(obj) {
while (obj) { while (obj) {
var descriptor = Object.getOwnPropertyDescriptor(obj, 'constructor'); const descriptor = Object.getOwnPropertyDescriptor(obj, 'constructor');
if (descriptor !== undefined && if (descriptor !== undefined &&
typeof descriptor.value === 'function' && typeof descriptor.value === 'function' &&
descriptor.value.name !== '') { descriptor.value.name !== '') {
@ -323,7 +323,7 @@ promisify.custom = kCustomPromisifiedSymbol;
// The build-in Array#join is slower in v8 6.0 // The build-in Array#join is slower in v8 6.0
function join(output, separator) { function join(output, separator) {
var str = ''; let str = '';
if (output.length !== 0) { if (output.length !== 0) {
for (var i = 0; i < output.length - 1; i++) { for (var i = 0; i < output.length - 1; i++) {
// It is faster not to use a template string here // It is faster not to use a template string here

76
lib/util.js
View File

@ -79,7 +79,7 @@ const regExpToString = RegExp.prototype.toString;
const dateToISOString = Date.prototype.toISOString; const dateToISOString = Date.prototype.toISOString;
const errorToString = Error.prototype.toString; const errorToString = Error.prototype.toString;
var CIRCULAR_ERROR_MESSAGE; let CIRCULAR_ERROR_MESSAGE;
/* eslint-disable */ /* eslint-disable */
const strEscapeSequencesRegExp = /[\x00-\x1f\x27\x5c]/; const strEscapeSequencesRegExp = /[\x00-\x1f\x27\x5c]/;
@ -119,8 +119,8 @@ function strEscape(str) {
return `'${str}'`; return `'${str}'`;
if (str.length > 100) if (str.length > 100)
return `'${str.replace(strEscapeSequencesReplacer, escapeFn)}'`; return `'${str.replace(strEscapeSequencesReplacer, escapeFn)}'`;
var result = ''; let result = '';
var last = 0; let last = 0;
for (var i = 0; i < str.length; i++) { for (var i = 0; i < str.length; i++) {
const point = str.charCodeAt(i); const point = str.charCodeAt(i);
if (point === 39 || point === 92 || point < 32) { if (point === 39 || point === 92 || point < 32) {
@ -159,10 +159,10 @@ function tryStringify(arg) {
} }
function format(f) { function format(f) {
var i, tempStr; let i, tempStr;
if (typeof f !== 'string') { if (typeof f !== 'string') {
if (arguments.length === 0) return ''; if (arguments.length === 0) return '';
var res = ''; let res = '';
for (i = 0; i < arguments.length - 1; i++) { for (i = 0; i < arguments.length - 1; i++) {
res += inspect(arguments[i]); res += inspect(arguments[i]);
res += ' '; res += ' ';
@ -173,9 +173,9 @@ function format(f) {
if (arguments.length === 1) return f; if (arguments.length === 1) return f;
var str = ''; let str = '';
var a = 1; let a = 1;
var lastPos = 0; let lastPos = 0;
for (i = 0; i < f.length - 1; i++) { for (i = 0; i < f.length - 1; i++) {
if (f.charCodeAt(i) === 37) { // '%' if (f.charCodeAt(i) === 37) { // '%'
const nextChar = f.charCodeAt(++i); const nextChar = f.charCodeAt(++i);
@ -250,9 +250,9 @@ function debuglog(set) {
set = set.toUpperCase(); set = set.toUpperCase();
if (!debugs[set]) { if (!debugs[set]) {
if (debugEnvRegex.test(set)) { if (debugEnvRegex.test(set)) {
var pid = process.pid; const pid = process.pid;
debugs[set] = function() { debugs[set] = function() {
var msg = exports.format.apply(exports, arguments); const msg = exports.format.apply(exports, arguments);
console.error('%s %d: %s', set, pid, msg); console.error('%s %d: %s', set, pid, msg);
}; };
} else { } else {
@ -426,8 +426,8 @@ function formatValue(ctx, value, recurseTimes, ln) {
} }
} }
var keys; let keys;
var symbols = Object.getOwnPropertySymbols(value); let symbols = Object.getOwnPropertySymbols(value);
// Look up the keys of the object. // Look up the keys of the object.
if (ctx.showHidden) { if (ctx.showHidden) {
@ -441,7 +441,7 @@ function formatValue(ctx, value, recurseTimes, ln) {
const keyLength = keys.length + symbols.length; const keyLength = keys.length + symbols.length;
const { constructor, tag } = getIdentificationOf(value); const { constructor, tag } = getIdentificationOf(value);
var prefix = ''; let prefix = '';
if (constructor && tag && constructor !== tag) if (constructor && tag && constructor !== tag)
prefix = `${constructor} [${tag}] `; prefix = `${constructor} [${tag}] `;
else if (constructor) else if (constructor)
@ -449,11 +449,11 @@ function formatValue(ctx, value, recurseTimes, ln) {
else if (tag) else if (tag)
prefix = `[${tag}] `; prefix = `[${tag}] `;
var base = ''; let base = '';
var formatter = formatObject; let formatter = formatObject;
var braces; let braces;
var noIterator = true; let noIterator = true;
var raw; let raw;
// Iterators and the rest are split to reduce checks // Iterators and the rest are split to reduce checks
if (value[Symbol.iterator]) { if (value[Symbol.iterator]) {
@ -623,7 +623,7 @@ function formatPrimitive(fn, value, ctx) {
// eslint-disable-next-line max-len // eslint-disable-next-line max-len
const averageLineLength = Math.ceil(value.length / Math.ceil(value.length / minLineLength)); const averageLineLength = Math.ceil(value.length / Math.ceil(value.length / minLineLength));
const divisor = Math.max(averageLineLength, MIN_LINE_LENGTH); const divisor = Math.max(averageLineLength, MIN_LINE_LENGTH);
var res = ''; let res = '';
if (readableRegExps[divisor] === undefined) { if (readableRegExps[divisor] === undefined) {
// Build a new RegExp that naturally breaks text into multiple lines. // Build a new RegExp that naturally breaks text into multiple lines.
// //
@ -678,8 +678,8 @@ function formatObject(ctx, value, recurseTimes, keys) {
function formatSpecialArray(ctx, value, recurseTimes, keys, maxLength, valLen) { function formatSpecialArray(ctx, value, recurseTimes, keys, maxLength, valLen) {
const output = []; const output = [];
const keyLen = keys.length; const keyLen = keys.length;
var visibleLength = 0; let visibleLength = 0;
var i = 0; let i = 0;
if (keyLen !== 0 && numberRegExp.test(keys[0])) { if (keyLen !== 0 && numberRegExp.test(keys[0])) {
for (const key of keys) { for (const key of keys) {
if (visibleLength === maxLength) if (visibleLength === maxLength)
@ -728,7 +728,7 @@ function formatSpecialArray(ctx, value, recurseTimes, keys, maxLength, valLen) {
} else if (keys[keyLen - 1] !== `${valLen - 1}`) { } else if (keys[keyLen - 1] !== `${valLen - 1}`) {
const extra = []; const extra = [];
// Only handle special keys // Only handle special keys
var key; let key;
for (i = keys.length - 1; i >= 0; i--) { for (i = keys.length - 1; i >= 0; i--) {
key = keys[i]; key = keys[i];
if (numberRegExp.test(key) && +key < 2 ** 32 - 1) if (numberRegExp.test(key) && +key < 2 ** 32 - 1)
@ -792,7 +792,7 @@ function formatTypedArray(ctx, value, recurseTimes, keys) {
function formatSet(ctx, value, recurseTimes, keys) { function formatSet(ctx, value, recurseTimes, keys) {
const output = new Array(value.size + keys.length + (ctx.showHidden ? 1 : 0)); const output = new Array(value.size + keys.length + (ctx.showHidden ? 1 : 0));
var i = 0; let i = 0;
for (const v of value) for (const v of value)
output[i++] = formatValue(ctx, v, recurseTimes); output[i++] = formatValue(ctx, v, recurseTimes);
// With `showHidden`, `length` will display as a hidden property for // With `showHidden`, `length` will display as a hidden property for
@ -808,7 +808,7 @@ function formatSet(ctx, value, recurseTimes, keys) {
function formatMap(ctx, value, recurseTimes, keys) { function formatMap(ctx, value, recurseTimes, keys) {
const output = new Array(value.size + keys.length + (ctx.showHidden ? 1 : 0)); const output = new Array(value.size + keys.length + (ctx.showHidden ? 1 : 0));
var i = 0; let i = 0;
for (const [k, v] of value) for (const [k, v] of value)
output[i++] = `${formatValue(ctx, k, recurseTimes)} => ` + output[i++] = `${formatValue(ctx, k, recurseTimes)} => ` +
formatValue(ctx, v, recurseTimes); formatValue(ctx, v, recurseTimes);
@ -823,9 +823,9 @@ function formatMap(ctx, value, recurseTimes, keys) {
function formatCollectionIterator(preview, ctx, value, recurseTimes, function formatCollectionIterator(preview, ctx, value, recurseTimes,
visibleKeys, keys) { visibleKeys, keys) {
var nextRecurseTimes = recurseTimes === null ? null : recurseTimes - 1; const nextRecurseTimes = recurseTimes === null ? null : recurseTimes - 1;
var vals = preview(value, 100); const vals = preview(value, 100);
var output = []; const output = [];
for (const o of vals) { for (const o of vals) {
output.push(formatValue(ctx, o, nextRecurseTimes)); output.push(formatValue(ctx, o, nextRecurseTimes));
} }
@ -843,7 +843,7 @@ function formatSetIterator(ctx, value, recurseTimes, visibleKeys, keys) {
} }
function formatPromise(ctx, value, recurseTimes, keys) { function formatPromise(ctx, value, recurseTimes, keys) {
var output; let output;
const [state, result] = getPromiseDetails(value); const [state, result] = getPromiseDetails(value);
if (state === kPending) { if (state === kPending) {
output = ['<pending>']; output = ['<pending>'];
@ -858,7 +858,7 @@ function formatPromise(ctx, value, recurseTimes, keys) {
} }
function formatProperty(ctx, value, recurseTimes, key, array) { function formatProperty(ctx, value, recurseTimes, key, array) {
var name, str; let name, str;
const desc = Object.getOwnPropertyDescriptor(value, key) || const desc = Object.getOwnPropertyDescriptor(value, key) ||
{ value: value[key], enumerable: true }; { value: value[key], enumerable: true };
if (desc.value !== undefined) { if (desc.value !== undefined) {
@ -895,10 +895,10 @@ function formatProperty(ctx, value, recurseTimes, key, array) {
function reduceToSingleString(ctx, output, base, braces, addLn) { function reduceToSingleString(ctx, output, base, braces, addLn) {
const breakLength = ctx.breakLength; const breakLength = ctx.breakLength;
var i = 0; let i = 0;
if (ctx.compact === false) { if (ctx.compact === false) {
const indentation = ' '.repeat(ctx.indentationLvl); const indentation = ' '.repeat(ctx.indentationLvl);
var res = `${base ? `${base} ` : ''}${braces[0]}\n${indentation} `; let res = `${base ? `${base} ` : ''}${braces[0]}\n${indentation} `;
for (; i < output.length - 1; i++) { for (; i < output.length - 1; i++) {
res += `${output[i]},\n${indentation} `; res += `${output[i]},\n${indentation} `;
} }
@ -906,7 +906,7 @@ function reduceToSingleString(ctx, output, base, braces, addLn) {
return res; return res;
} }
if (output.length * 2 <= breakLength) { if (output.length * 2 <= breakLength) {
var length = 0; let length = 0;
for (; i < output.length && length <= breakLength; i++) { for (; i < output.length && length <= breakLength; i++) {
if (ctx.colors) { if (ctx.colors) {
length += removeColors(output[i]).length + 1; length += removeColors(output[i]).length + 1;
@ -979,10 +979,10 @@ const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
// 26 Feb 16:19:34 // 26 Feb 16:19:34
function timestamp() { function timestamp() {
var d = new Date(); const d = new Date();
var time = [pad(d.getHours()), const time = [pad(d.getHours()),
pad(d.getMinutes()), pad(d.getMinutes()),
pad(d.getSeconds())].join(':'); pad(d.getSeconds())].join(':');
return [d.getDate(), months[d.getMonth()], time].join(' '); return [d.getDate(), months[d.getMonth()], time].join(' ');
} }
@ -1026,8 +1026,8 @@ function _extend(target, source) {
// Don't do anything if source isn't an object // Don't do anything if source isn't an object
if (source === null || typeof source !== 'object') return target; if (source === null || typeof source !== 'object') return target;
var keys = Object.keys(source); const keys = Object.keys(source);
var i = keys.length; let i = keys.length;
while (i--) { while (i--) {
target[keys[i]] = source[keys[i]]; target[keys[i]] = source[keys[i]];
} }