util: refactor to use more primordials

PR-URL: #36265 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
nodejs · Dec 28, 2020 · ecdff81 · ecdff81
1 parent d146b25
commit ecdff81
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 97 deletions.
diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -3,8 +3,11 @@
 const {
   ArrayFrom,
   ArrayIsArray,
+  ArrayPrototypePop,
+  ArrayPrototypePush,
+  ArrayPrototypeSlice,
+  ArrayPrototypeSort,
   Error,
-  Map,
   ObjectCreate,
   ObjectDefineProperties,
   ObjectDefineProperty,
@@ -13,8 +16,14 @@ const {
   ObjectGetPrototypeOf,
   ObjectSetPrototypeOf,
   Promise,
+  ReflectApply,
   ReflectConstruct,
-  Set,
+  RegExpPrototypeTest,
+  SafeMap,
+  SafeSet,
+  StringPrototypeReplace,
+  StringPrototypeToLowerCase,
+  StringPrototypeToUpperCase,
   Symbol,
   SymbolFor,
 } = primordials;
@@ -40,12 +49,12 @@ const { isNativeError } = internalBinding('types');
 
 const noCrypto = !process.versions.openssl;
 
-const experimentalWarnings = new Set();
+const experimentalWarnings = new SafeSet();
 
 const colorRegExp = /\u001b\[\d\d?m/g; // eslint-disable-line no-control-regex
 
 function removeColors(str) {
-  return str.replace(colorRegExp, '');
+  return StringPrototypeReplace(str, colorRegExp, '');
 }
 
 function isError(e) {
@@ -57,7 +66,7 @@ function isError(e) {
 
 // Keep a list of deprecation codes that have been warned on so we only warn on
 // each one once.
-const codesWarned = new Set();
+const codesWarned = new SafeSet();
 
 // Mark that a method should not be used.
 // Returns a modified function which warns once by default.
@@ -86,7 +95,7 @@ function deprecate(fn, msg, code) {
     if (new.target) {
       return ReflectConstruct(fn, args, new.target);
     }
-    return fn.apply(this, args);
+    return ReflectApply(fn, this, args);
   }
 
   // The wrapper will keep the same prototype as fn to maintain prototype chain
@@ -132,12 +141,13 @@ function slowCases(enc) {
     case 4:
       if (enc === 'UTF8') return 'utf8';
       if (enc === 'ucs2' || enc === 'UCS2') return 'utf16le';
-      enc = `${enc}`.toLowerCase();
+      enc = StringPrototypeToLowerCase(`${enc}`);
       if (enc === 'utf8') return 'utf8';
       if (enc === 'ucs2') return 'utf16le';
       break;
     case 3:
-      if (enc === 'hex' || enc === 'HEX' || `${enc}`.toLowerCase() === 'hex')
+      if (enc === 'hex' || enc === 'HEX' ||
+          StringPrototypeToLowerCase(`${enc}`) === 'hex')
         return 'hex';
       break;
     case 5:
@@ -146,7 +156,7 @@ function slowCases(enc) {
       if (enc === 'UTF-8') return 'utf8';
       if (enc === 'ASCII') return 'ascii';
       if (enc === 'UCS-2') return 'utf16le';
-      enc = `${enc}`.toLowerCase();
+      enc = StringPrototypeToLowerCase(`${enc}`);
       if (enc === 'utf-8') return 'utf8';
       if (enc === 'ascii') return 'ascii';
       if (enc === 'ucs-2') return 'utf16le';
@@ -156,18 +166,18 @@ function slowCases(enc) {
       if (enc === 'latin1' || enc === 'binary') return 'latin1';
       if (enc === 'BASE64') return 'base64';
       if (enc === 'LATIN1' || enc === 'BINARY') return 'latin1';
-      enc = `${enc}`.toLowerCase();
+      enc = StringPrototypeToLowerCase(`${enc}`);
       if (enc === 'base64') return 'base64';
       if (enc === 'latin1' || enc === 'binary') return 'latin1';
       break;
     case 7:
       if (enc === 'utf16le' || enc === 'UTF16LE' ||
-        `${enc}`.toLowerCase() === 'utf16le')
+          StringPrototypeToLowerCase(`${enc}`) === 'utf16le')
         return 'utf16le';
       break;
     case 8:
       if (enc === 'utf-16le' || enc === 'UTF-16LE' ||
-        `${enc}`.toLowerCase() === 'utf-16le')
+        StringPrototypeToLowerCase(`${enc}`) === 'utf-16le')
         return 'utf16le';
       break;
     default:
@@ -184,25 +194,25 @@ function emitExperimentalWarning(feature) {
 }
 
 function filterDuplicateStrings(items, low) {
-  const map = new Map();
+  const map = new SafeMap();
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
-    const key = item.toLowerCase();
+    const key = StringPrototypeToLowerCase(item);
     if (low) {
       map.set(key, key);
     } else {
       map.set(key, item);
     }
   }
-  return ArrayFrom(map.values()).sort();
+  return ArrayPrototypeSort(ArrayFrom(map.values()));
 }
 
 function cachedResult(fn) {
   let result;
   return () => {
     if (result === undefined)
       result = fn();
-    return result.slice();
+    return ArrayPrototypeSlice(result);
   };
 }
 
@@ -244,7 +254,7 @@ function convertToValidSignal(signal) {
     return signal;
 
   if (typeof signal === 'string') {
-    const signalName = signals[signal.toUpperCase()];
+    const signalName = signals[StringPrototypeToUpperCase(signal)];
     if (signalName) return signalName;
   }
 
@@ -294,7 +304,7 @@ function promisify(original) {
 
   function fn(...args) {
     return new Promise((resolve, reject) => {
-      original.call(this, ...args, (err, ...values) => {
+      ArrayPrototypePush(args, (err, ...values) => {
         if (err) {
           return reject(err);
         }
@@ -307,6 +317,7 @@ function promisify(original) {
           resolve(values[0]);
         }
       });
+      ReflectApply(original, this, args);
     });
   }
 
@@ -343,7 +354,7 @@ function join(output, separator) {
 function spliceOne(list, index) {
   for (; index + 1 < list.length; index++)
     list[index] = list[index + 1];
-  list.pop();
+  ArrayPrototypePop(list);
 }
 
 const kNodeModulesRE = /^(.*)[\\/]node_modules[\\/]/;
@@ -376,9 +387,9 @@ function isInsideNodeModules() {
       const filename = frame.getFileName();
       // If a filename does not start with / or contain \,
       // it's likely from Node.js core.
-      if (!/^\/|\\/.test(filename))
+      if (!RegExpPrototypeTest(/^\/|\\/, filename))
         continue;
-      return kNodeModulesRE.test(filename);
+      return RegExpPrototypeTest(kNodeModulesRE, filename);
     }
   }
   return false;
@@ -389,7 +400,7 @@ function once(callback) {
   return function(...args) {
     if (called) return;
     called = true;
-    callback.apply(this, args);
+    ReflectApply(callback, this, args);
   };
 }
 

diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
@@ -2,11 +2,12 @@
 
 const {
   ArrayIsArray,
+  ArrayPrototypeFilter,
+  ArrayPrototypePush,
   BigIntPrototypeValueOf,
   BooleanPrototypeValueOf,
   DatePrototypeGetTime,
   Error,
-  Map,
   NumberIsNaN,
   NumberPrototypeValueOf,
   ObjectGetOwnPropertySymbols,
@@ -16,10 +17,11 @@ const {
   ObjectPrototypeHasOwnProperty,
   ObjectPrototypePropertyIsEnumerable,
   ObjectPrototypeToString,
-  Set,
+  SafeMap,
+  SafeSet,
   StringPrototypeValueOf,
   SymbolPrototypeValueOf,
-  SymbolToStringTag,
+  TypedArrayPrototypeGetSymbolToStringTag,
   Uint8Array,
 } = primordials;
 
@@ -126,7 +128,7 @@ function isEqualBoxedPrimitive(val1, val2) {
 
 function isIdenticalTypedArrayType(a, b) {
   // Fast path to reduce type checks in the common case.
-  const check = types[`is${a[SymbolToStringTag]}`];
+  const check = types[`is${TypedArrayPrototypeGetSymbolToStringTag(a)}`];
   if (check !== undefined && check(a)) {
     return check(b);
   }
@@ -150,8 +152,9 @@ function isIdenticalTypedArrayType(a, b) {
   }
   /* c8 ignore next 4 */
   assert.fail(
-    `Unknown TypedArray type checking ${a[SymbolToStringTag]} ${a}\n` +
-    `and ${b[SymbolToStringTag]} ${b}`
+    'Unknown TypedArray type checking ' +
+    `${TypedArrayPrototypeGetSymbolToStringTag(a)} ${a}\n` +
+    `and ${TypedArrayPrototypeGetSymbolToStringTag(b)} ${b}`
   );
 }
 
@@ -291,7 +294,10 @@ function innerDeepEqual(val1, val2, strict, memos) {
 }
 
 function getEnumerables(val, keys) {
-  return keys.filter((k) => ObjectPrototypePropertyIsEnumerable(val, k));
+  return ArrayPrototypeFilter(
+    keys,
+    (k) => ObjectPrototypePropertyIsEnumerable(val, k)
+  );
 }
 
 function keyCheck(val1, val2, strict, memos, iterationType, aKeys) {
@@ -330,7 +336,7 @@ function keyCheck(val1, val2, strict, memos, iterationType, aKeys) {
           if (!ObjectPrototypePropertyIsEnumerable(val2, key)) {
             return false;
           }
-          aKeys.push(key);
+          ArrayPrototypePush(aKeys, key);
           count++;
         } else if (ObjectPrototypePropertyIsEnumerable(val2, key)) {
           return false;
@@ -360,8 +366,8 @@ function keyCheck(val1, val2, strict, memos, iterationType, aKeys) {
   // Use memos to handle cycles.
   if (memos === undefined) {
     memos = {
-      val1: new Map(),
-      val2: new Map(),
+      val1: new SafeMap(),
+      val2: new SafeMap(),
       position: 0
     };
   } else {
@@ -458,7 +464,7 @@ function setEquiv(a, b, strict, memo) {
     // to check this improves the worst case scenario instead.
     if (typeof val === 'object' && val !== null) {
       if (set === null) {
-        set = new Set();
+        set = new SafeSet();
       }
       // If the specified value doesn't exist in the second set its an not null
       // object (or non strict only: a not matching primitive) we'll need to go
@@ -475,7 +481,7 @@ function setEquiv(a, b, strict, memo) {
       }
 
       if (set === null) {
-        set = new Set();
+        set = new SafeSet();
       }
       set.add(val);
     }
@@ -521,7 +527,7 @@ function mapEquiv(a, b, strict, memo) {
   for (const [key, item1] of a) {
     if (typeof key === 'object' && key !== null) {
       if (set === null) {
-        set = new Set();
+        set = new SafeSet();
       }
       set.add(key);
     } else {
@@ -537,7 +543,7 @@ function mapEquiv(a, b, strict, memo) {
         if (!mapMightHaveLoosePrim(a, b, key, item1, memo))
           return false;
         if (set === null) {
-          set = new Set();
+          set = new SafeSet();
         }
         set.add(key);
       }

diff --git a/lib/internal/util/debuglog.js b/lib/internal/util/debuglog.js
@@ -1,13 +1,15 @@
 'use strict';
 
 const {
+  FunctionPrototype,
   FunctionPrototypeBind,
   ObjectCreate,
   ObjectDefineProperty,
   RegExp,
   RegExpPrototypeTest,
   SafeArrayIterator,
-  StringPrototypeToUpperCase
+  StringPrototypeToLowerCase,
+  StringPrototypeToUpperCase,
 } = primordials;
 
 const { inspect, format, formatWithOptions } = require('internal/util/inspect');
@@ -37,13 +39,13 @@ function initializeDebugEnv(debugEnv) {
 function emitWarningIfNeeded(set) {
   if ('HTTP' === set || 'HTTP2' === set) {
     process.emitWarning('Setting the NODE_DEBUG environment variable ' +
-      'to \'' + set.toLowerCase() + '\' can expose sensitive ' +
+      'to \'' + StringPrototypeToLowerCase(set) + '\' can expose sensitive ' +
       'data (such as passwords, tokens and authentication headers) ' +
       'in the resulting log.');
   }
 }
 
-function noop() {}
+const noop = FunctionPrototype;
 
 function debuglogImpl(enabled, set) {
   if (debugImpls[set] === undefined) {