ongoing work for hook ownership

Author: dygabo

lib/internal/modules/esm/hooks.js

@@ -169,7 +169,8 @@ class Hooks {
   addCustomLoader(url, exports, data) {
     const alreadyKnown = ArrayPrototypeSome(ArrayPrototypeMap(['initialize', 'resolve', 'load'], (hookName) => {
       if (this.#chains[hookName]) {
-        return ArrayPrototypeFilter(this.#chains[hookName], (el) => el.url === url).length === 1;
+        return ArrayPrototypeFilter(
+          this.#chains[hookName], (el) => el.url === url && el.data === data).length === 1;
       }
     }), (el) => el);
 
@@ -185,11 +186,11 @@ class Hooks {
 
     if (resolve) {
       const next = this.#chains.resolve[this.#chains.resolve.length - 1];
-      ArrayPrototypePush(this.#chains.resolve, { __proto__: null, fn: resolve, url, next });
+      ArrayPrototypePush(this.#chains.resolve, { __proto__: null, fn: resolve, url, data, next });
     }
     if (load) {
       const next = this.#chains.load[this.#chains.load.length - 1];
-      ArrayPrototypePush(this.#chains.load, { __proto__: null, fn: load, url, next });
+      ArrayPrototypePush(this.#chains.load, { __proto__: null, fn: load, url, data, next });
     }
     return initialize?.(data);
   }
@@ -211,6 +212,7 @@ class Hooks {
     originalSpecifier,
     parentURL,
     importAttributes = { __proto__: null },
+    threadId
   ) {
     throwIfInvalidParentURL(parentURL);
 
@@ -219,6 +221,7 @@ class Hooks {
       conditions: getDefaultConditions(),
       importAttributes,
       parentURL,
+      threadId,
     };
     const meta = {
       chainFinished: null,

lib/internal/modules/esm/loader.js

@@ -41,6 +41,7 @@ const { ModuleWrap, kEvaluating, kEvaluated } = internalBinding('module_wrap');
 const {
   urlToFilename,
 } = require('internal/modules/helpers');
+const { threadId } = require('worker_threads');
 let defaultResolve, defaultLoad, defaultLoadSync, importMetaInitializer;
 
 /**
@@ -500,7 +501,7 @@ class ModuleLoader {
    */
   resolve(originalSpecifier, parentURL, importAttributes) {
     if (this.#customizations) {
-      return this.#customizations.resolve(originalSpecifier, parentURL, importAttributes);
+      return this.#customizations.resolve(originalSpecifier, parentURL, importAttributes, threadId);
     }
     const requestKey = this.#resolveCache.serializeKey(originalSpecifier, importAttributes);
     const cachedResult = this.#resolveCache.get(requestKey, parentURL);
@@ -622,7 +623,7 @@ class CustomizedModuleLoader {
    * @returns {{ format: string, url: URL['href'] } | undefined}
    */
   register(originalSpecifier, parentURL, data, transferList) {
-    return hooksProxy.makeSyncRequest('register', transferList, originalSpecifier, parentURL, data);
+    return hooksProxy.makeSyncRequest('register', transferList, originalSpecifier, parentURL, data, threadId);
   }
 
   /**
@@ -635,7 +636,7 @@ class CustomizedModuleLoader {
    * @returns {{ format: string, url: URL['href'] }}
    */
   resolve(originalSpecifier, parentURL, importAttributes) {
-    return hooksProxy.makeAsyncRequest('resolve', undefined, originalSpecifier, parentURL, importAttributes);
+    return hooksProxy.makeAsyncRequest('resolve', undefined, originalSpecifier, parentURL, importAttributes, threadId);
   }
 
   resolveSync(originalSpecifier, parentURL, importAttributes) {

test/fixtures/es-module-loaders/hooks-input.mjs

@@ -37,6 +37,7 @@ export async function resolve(specifier, context, next) {
     'conditions',
     'importAttributes',
     'parentURL',
+    'threadId',
   ]);
   assert.ok(Array.isArray(context.conditions));
   assert.strictEqual(typeof next, 'function');