fixup! feedback

nodejs · Jul 21, 2023 · d55dc44 · d55dc44
1 parent caf952a
commit d55dc44
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/internal/modules/esm/hooks.js b/lib/internal/modules/esm/hooks.js
@@ -2,6 +2,7 @@
 
 const {
   ArrayPrototypePush,
+  ArrayPrototypePushApply,
   FunctionPrototypeCall,
   Int32Array,
   ObjectAssign,
@@ -146,7 +147,7 @@ class Hooks {
    * @param {Record<string, unknown>} exports
    * @param {any} data Arbitrary data to pass to loader's `initialize`
    */
-  async addCustomLoader(url, exports, data) {
+  addCustomLoader(url, exports, data) {
     const {
       globalPreload,
       resolve,
@@ -165,9 +166,7 @@ class Hooks {
       const next = this.#chains.load[this.#chains.load.length - 1];
       ArrayPrototypePush(this.#chains.load, { __proto__: null, fn: load, url, next });
     }
-    if (initialize) {
-      return initialize(data);
-    }
+    return initialize?.(data);
   }
 
   /**
@@ -574,9 +573,10 @@ class HooksProxy {
 
     // Pass work to the worker.
     debug('post async message to worker', { method, args, transferList });
-    const finalTransferList = transferList ?
-      [asyncCommChannel.port2, ...transferList] :
-      [asyncCommChannel.port2];
+    const finalTransferList = [asyncCommChannel.port2];
+    if (transferList) {
+      ArrayPrototypePushApply(finalTransferList, transferList);
+    }
     this.#worker.postMessage({ __proto__: null, method, args, port: asyncCommChannel.port2 }, finalTransferList);
 
     if (this.#numberOfPendingAsyncResponses++ === 0) {

diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -512,7 +512,7 @@ function getHooksProxy() {
  * register('./myLoader.js', import.meta.url, someArrayBuffer, [someArrayBuffer]);
  * ```
  */
-function register(specifier, parentURL = 'data:', data = undefined, transferList = []) {
+function register(specifier, parentURL = 'data:', data, transferList) {
   const moduleLoader = require('internal/process/esm_loader').esmLoader;
   return moduleLoader.register(`${specifier}`, parentURL, data, transferList);
 }

diff --git a/test/fixtures/es-module-loaders/hooks-initialize.mjs b/test/fixtures/es-module-loaders/hooks-initialize.mjs
@@ -1,3 +1,3 @@
 export async function initialize() {
   console.log('hooks initialize');
-}
+}