module: fix cyclical dynamic import

ensures that instantiation result is only used during initial loading

PR-URL: #18965
Reviewed-By: Gus Caplan <[email protected]>
Reviewed-By: Guy Bedford <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Jan Krems <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>

Author: bmeck

lib/internal/loader/ModuleJob.js

@@ -50,10 +50,11 @@ class ModuleJob {
   }
 
   async instantiate() {
-    if (this.instantiated) {
-      return this.instantiated;
+    if (!this.instantiated) {
+      return this.instantiated = this._instantiate();
     }
-    return this.instantiated = this._instantiate();
+    await this.instantiated;
+    return this.module;
   }
 
   // This method instantiates the module associated with this job and its

test/es-module/test-esm-cyclic-dynamic-import.mjs

@@ -0,0 +1,3 @@
+// Flags: --experimental-modules
+import '../common';
+import('./test-esm-cyclic-dynamic-import');