lib: prefer call() over apply() if argument list is not array

PR-URL: #60796
Reviewed-By: René <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>

Author: LiviaMedeiros

lib/assert.js

@@ -27,13 +27,13 @@ const {
   ArrayPrototypePush,
   ArrayPrototypeSlice,
   Error,
+  FunctionPrototypeCall,
   NumberIsNaN,
   ObjectAssign,
   ObjectDefineProperty,
   ObjectIs,
   ObjectKeys,
   ObjectPrototypeIsPrototypeOf,
-  ReflectApply,
   RegExpPrototypeExec,
   String,
   StringPrototypeIndexOf,
@@ -544,7 +544,7 @@ function expectedException(actual, expected, message, fn) {
     throwError = true;
   } else {
     // Check validation functions return value.
-    const res = ReflectApply(expected, {}, [actual]);
+    const res = FunctionPrototypeCall(expected, {}, actual);
     if (res !== true) {
       if (!message) {
         generatedMessage = true;
@@ -689,7 +689,7 @@ function hasMatchingError(actual, expected) {
   if (ObjectPrototypeIsPrototypeOf(Error, expected)) {
     return false;
   }
-  return ReflectApply(expected, {}, [actual]) === true;
+  return FunctionPrototypeCall(expected, {}, actual) === true;
 }
 
 function expectsNoError(stackStartFn, actual, error, message) {

lib/dgram.js

@@ -29,7 +29,6 @@ const {
   FunctionPrototypeCall,
   ObjectDefineProperty,
   ObjectSetPrototypeOf,
-  ReflectApply,
   SymbolAsyncDispose,
   SymbolDispose,
 } = primordials;
@@ -436,7 +435,7 @@ Socket.prototype.connect = function(port, address, callback) {
     return;
   }
 
-  ReflectApply(_connect, this, [port, address, callback]);
+  FunctionPrototypeCall(_connect, this, port, address, callback);
 };
 
 

lib/fs.js

@@ -29,6 +29,7 @@ const {
   ArrayPrototypePush,
   BigIntPrototypeToString,
   Boolean,
+  FunctionPrototypeCall,
   MathMax,
   Number,
   ObjectDefineProperties,
@@ -366,7 +367,7 @@ function readFile(path, options, callback) {
   }
   if (context.isUserFd) {
     process.nextTick(function tick(context) {
-      ReflectApply(readFileAfterOpen, { context }, [null, path]);
+      FunctionPrototypeCall(readFileAfterOpen, { context }, null, path);
     }, context);
     return;
   }

lib/internal/child_process.js

@@ -805,8 +805,7 @@ function setupChannel(target, channel, serializationMode) {
       obj = handleConversion[message.type];
 
       // convert TCP object to native handle object
-      handle = ReflectApply(handleConversion[message.type].send,
-                            target, [message, handle, options]);
+      handle = FunctionPrototypeCall(handleConversion[message.type].send, target, message, handle, options);
 
       // If handle was sent twice, or it is impossible to get native handle
       // out of it - just send a text without the handle.

lib/internal/cluster/child.js

@@ -3,6 +3,7 @@
 const {
   ArrayPrototypeJoin,
   FunctionPrototype,
+  FunctionPrototypeCall,
   ObjectAssign,
   ReflectApply,
   SafeMap,
@@ -58,7 +59,7 @@ cluster._setupWorker = function() {
     if (message.act === 'newconn')
       onconnection(message, handle);
     else if (message.act === 'disconnect')
-      ReflectApply(_disconnect, worker, [true]);
+      FunctionPrototypeCall(_disconnect, worker, true);
   }
 };
 
@@ -287,7 +288,7 @@ function _disconnect(primaryInitiated) {
 Worker.prototype.disconnect = function() {
   if (this.state !== 'disconnecting' && this.state !== 'destroying') {
     this.state = 'disconnecting';
-    ReflectApply(_disconnect, this, []);
+    FunctionPrototypeCall(_disconnect, this);
   }
 
   return this;

lib/internal/cluster/worker.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {
+  FunctionPrototypeCall,
   ObjectSetPrototypeOf,
   ReflectApply,
 } = primordials;
@@ -16,7 +17,7 @@ function Worker(options) {
   if (!(this instanceof Worker))
     return new Worker(options);
 
-  ReflectApply(EventEmitter, this, []);
+  FunctionPrototypeCall(EventEmitter, this);
 
   if (options === null || typeof options !== 'object')
     options = kEmptyObject;

lib/internal/crypto/cipher.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const {
+  FunctionPrototypeCall,
   NumberIsInteger,
   ObjectSetPrototypeOf,
-  ReflectApply,
 } = primordials;
 
 const {
@@ -117,15 +117,15 @@ function createCipherBase(cipher, credential, options, isEncrypt, iv) {
   this[kHandle] = new CipherBase(isEncrypt, cipher, credential, iv, authTagLength);
   this._decoder = null;
 
-  ReflectApply(LazyTransform, this, [options]);
+  FunctionPrototypeCall(LazyTransform, this, options);
 }
 
 function createCipherWithIV(cipher, key, options, isEncrypt, iv) {
   validateString(cipher, 'cipher');
   const encoding = getStringOption(options, 'encoding');
   key = prepareSecretKey(key, encoding);
   iv = iv === null ? null : getArrayBufferOrView(iv, 'iv');
-  ReflectApply(createCipherBase, this, [cipher, key, options, isEncrypt, iv]);
+  FunctionPrototypeCall(createCipherBase, this, cipher, key, options, isEncrypt, iv);
 }
 
 // The Cipher class is part of the legacy Node.js crypto API. It exposes
@@ -215,7 +215,7 @@ function Cipheriv(cipher, key, iv, options) {
   if (!(this instanceof Cipheriv))
     return new Cipheriv(cipher, key, iv, options);
 
-  ReflectApply(createCipherWithIV, this, [cipher, key, options, true, iv]);
+  FunctionPrototypeCall(createCipherWithIV, this, cipher, key, options, true, iv);
 }
 
 function addCipherPrototypeFunctions(constructor) {
@@ -244,7 +244,7 @@ function Decipheriv(cipher, key, iv, options) {
   if (!(this instanceof Decipheriv))
     return new Decipheriv(cipher, key, iv, options);
 
-  ReflectApply(createCipherWithIV, this, [cipher, key, options, false, iv]);
+  FunctionPrototypeCall(createCipherWithIV, this, cipher, key, options, false, iv);
 }
 
 ObjectSetPrototypeOf(Decipheriv.prototype, LazyTransform.prototype);

lib/internal/crypto/hash.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const {
+  FunctionPrototypeCall,
   ObjectSetPrototypeOf,
-  ReflectApply,
   StringPrototypeReplace,
   StringPrototypeToLowerCase,
   Symbol,
@@ -105,7 +105,7 @@ function Hash(algorithm, options) {
   if (!isCopy && xofLen === undefined) {
     maybeEmitDeprecationWarning(algorithm);
   }
-  ReflectApply(LazyTransform, this, [options]);
+  FunctionPrototypeCall(LazyTransform, this, options);
 }
 
 ObjectSetPrototypeOf(Hash.prototype, LazyTransform.prototype);
@@ -169,7 +169,7 @@ function Hmac(hmac, key, options) {
   this[kState] = {
     [kFinalized]: false,
   };
-  ReflectApply(LazyTransform, this, [options]);
+  FunctionPrototypeCall(LazyTransform, this, options);
 }
 
 ObjectSetPrototypeOf(Hmac.prototype, LazyTransform.prototype);

lib/internal/crypto/sig.js

@@ -3,7 +3,6 @@
 const {
   FunctionPrototypeCall,
   ObjectSetPrototypeOf,
-  ReflectApply,
 } = primordials;
 
 const {
@@ -59,7 +58,7 @@ function Sign(algorithm, options) {
   this[kHandle] = new _Sign();
   this[kHandle].init(algorithm);
 
-  ReflectApply(Writable, this, [options]);
+  FunctionPrototypeCall(Writable, this, options);
 }
 
 ObjectSetPrototypeOf(Sign.prototype, Writable.prototype);
@@ -219,7 +218,7 @@ function Verify(algorithm, options) {
   this[kHandle] = new _Verify();
   this[kHandle].init(algorithm);
 
-  ReflectApply(Writable, this, [options]);
+  FunctionPrototypeCall(Writable, this, options);
 }
 
 ObjectSetPrototypeOf(Verify.prototype, Writable.prototype);

lib/internal/crypto/webcrypto.js

@@ -2,6 +2,7 @@
 
 const {
   ArrayPrototypeIncludes,
+  FunctionPrototypeCall,
   JSONParse,
   JSONStringify,
   ObjectDefineProperties,
@@ -84,7 +85,7 @@ async function digest(algorithm, data) {
 
   algorithm = normalizeAlgorithm(algorithm, 'digest');
 
-  return await ReflectApply(asyncDigest, this, [algorithm, data]);
+  return await FunctionPrototypeCall(asyncDigest, this, algorithm, data);
 }
 
 function randomUUID() {
@@ -377,10 +378,10 @@ async function deriveKey(
       throw lazyDOMException('Unrecognized algorithm name', 'NotSupportedError');
   }
 
-  return ReflectApply(
+  return FunctionPrototypeCall(
     importKeySync,
     this,
-    ['raw-secret', bits, derivedKeyAlgorithm, extractable, keyUsages],
+    'raw-secret', bits, derivedKeyAlgorithm, extractable, keyUsages,
   );
 }
 
@@ -889,10 +890,10 @@ async function importKey(
 
   algorithm = normalizeAlgorithm(algorithm, 'importKey');
 
-  return ReflectApply(
+  return FunctionPrototypeCall(
     importKeySync,
     this,
-    [format, keyData, algorithm, extractable, keyUsages],
+    format, keyData, algorithm, extractable, keyUsages,
   );
 }
 
@@ -926,7 +927,7 @@ async function wrapKey(format, key, wrappingKey, algorithm) {
   } catch {
     algorithm = normalizeAlgorithm(algorithm, 'encrypt');
   }
-  let keyData = await ReflectApply(exportKey, this, [format, key]);
+  let keyData = await FunctionPrototypeCall(exportKey, this, format, key);
 
   if (format === 'jwk') {
     const ec = new TextEncoder();
@@ -1023,10 +1024,10 @@ async function unwrapKey(
     }
   }
 
-  return ReflectApply(
+  return FunctionPrototypeCall(
     importKeySync,
     this,
-    [format, keyData, unwrappedKeyAlgo, extractable, keyUsages],
+    format, keyData, unwrappedKeyAlgo, extractable, keyUsages,
   );
 }
 
@@ -1349,10 +1350,10 @@ async function encapsulateKey(encapsulationAlgorithm, encapsulationKey, sharedKe
       throw lazyDOMException('Unrecognized algorithm name', 'NotSupportedError');
   }
 
-  const sharedKey = ReflectApply(
+  const sharedKey = FunctionPrototypeCall(
     importKeySync,
     this,
-    ['raw-secret', encapsulateBits.sharedKey, normalizedSharedKeyAlgorithm, extractable, usages],
+    'raw-secret', encapsulateBits.sharedKey, normalizedSharedKeyAlgorithm, extractable, usages,
   );
 
   const encapsulatedKey = {
@@ -1469,10 +1470,10 @@ async function decapsulateKey(
       throw lazyDOMException('Unrecognized algorithm name', 'NotSupportedError');
   }
 
-  return ReflectApply(
+  return FunctionPrototypeCall(
     importKeySync,
     this,
-    ['raw-secret', decapsulatedBits, normalizedSharedKeyAlgorithm, extractable, usages],
+    'raw-secret', decapsulatedBits, normalizedSharedKeyAlgorithm, extractable, usages,
   );
 }