multiple pending imports of the same URL with differing assertions

nodejs · Oct 13, 2021 · 13b63c2 · 13b63c2
1 parent 38b2f97
commit 13b63c2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -19,6 +19,9 @@ const {
   globalThis,
 } = primordials;
 
+const {
+  deepStrictEqual
+} = require('assert/strict')
 const {
   ERR_INVALID_ARG_TYPE,
   ERR_INVALID_ARG_VALUE,
@@ -209,7 +212,8 @@ class ESMLoader {
 
       return module;
     };
-    const job = new ModuleJob(this, url, evalInstance, false, false);
+    const job = new ModuleJob(
+      this, url, undefined, evalInstance, false, false);
     this.moduleMap.set(url, job);
     const { module } = await job.run();
 
@@ -226,7 +230,14 @@ class ESMLoader {
     // CommonJS will set functions for lazy job evaluation.
     if (typeof job === 'function') this.moduleMap.set(url, job = job());
 
-    if (job !== undefined) return job;
+    if (job !== undefined) {
+      try {
+        deepStrictEqual(importAssertions || {}, job.importAssertions || {});
+        return job;
+      } catch {
+        job = undefined;
+      }
+    }
 
     const moduleProvider = async (url, isMain) => {
       const { format: finalFormat, source } = await this.load(
@@ -250,6 +261,7 @@ class ESMLoader {
     job = new ModuleJob(
       this,
       url,
+      importAssertions,
       moduleProvider,
       parentURL === undefined,
       inspectBrk

diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js
@@ -52,8 +52,10 @@ const isCommonJSGlobalLikeNotDefinedError = (errorMessage) =>
 class ModuleJob {
   // `loader` is the Loader instance used for loading dependencies.
   // `moduleProvider` is a function
-  constructor(loader, url, moduleProvider, isMain, inspectBrk) {
+  constructor(loader, url, importAssertions, moduleProvider, isMain,
+    inspectBrk) {
     this.loader = loader;
+    this.importAssertions = importAssertions;
     this.isMain = isMain;
     this.inspectBrk = inspectBrk;
 

diff --git a/test/es-module/test-esm-loader-modulemap.js b/test/es-module/test-esm-loader-modulemap.js
@@ -17,7 +17,7 @@ const stubModuleUrl = new URL('file://tmp/test');
 const stubModule = createDynamicModule(['default'], stubModuleUrl);
 const loader = new ESMLoader();
 const moduleMap = new ModuleMap();
-const moduleJob = new ModuleJob(loader, stubModule.module,
+const moduleJob = new ModuleJob(loader, stubModule.module, undefined,
                                 () => new Promise(() => {}));
 
 assert.throws(