fixup! fixup! src: support import() and import.meta in embedder-run modules

Author: joyeecheung

lib/internal/modules/esm/create_dynamic_module.js

@@ -59,9 +59,9 @@ ${ArrayPrototypeJoin(ArrayPrototypeMap(exports, createExport), '\n')}
 import.meta.done();
 `;
   const {
-    registerModule, compileSourceTextModule, SourceTextModuleTypes: { kDynamic },
+    registerModule, compileSourceTextModule, SourceTextModuleTypes: { kFacade },
   } = require('internal/modules/esm/utils');
-  const m = compileSourceTextModule(`${url}`, source, kDynamic);
+  const m = compileSourceTextModule(`${url}`, source, kFacade);
 
   const readyfns = new SafeSet();
   /** @type {DynamicModuleReflect} */

lib/internal/modules/esm/utils.js

@@ -322,7 +322,7 @@ const SourceTextModuleTypes = {
   kInternal: 'internal',  // TODO(joyeecheung): support internal ESM.
   kEmbedder: 'embedder',  // Embedder ESM, also used by SEA
   kUser: 'user', // User-land ESM
-  kDynamic: 'dynamic',  // Currently only used by the facade that proxies WASM module import/exports.
+  kFacade: 'facade',  // Currently only used by the facade that proxies WASM module import/exports.
 };
 
 /**
@@ -337,7 +337,7 @@ const SourceTextModuleTypes = {
 function compileSourceTextModule(url, source, type, context = kEmptyObject) {
   let hostDefinedOptions;
   switch (type) {
-    case SourceTextModuleTypes.kDynamic:
+    case SourceTextModuleTypes.kFacade:
     case SourceTextModuleTypes.kInternal:
       hostDefinedOptions = undefined;
       break;
@@ -353,7 +353,7 @@ function compileSourceTextModule(url, source, type, context = kEmptyObject) {
 
   const wrap = new ModuleWrap(url, undefined, source, 0, 0, hostDefinedOptions);
 
-  if (type === SourceTextModuleTypes.kDynamic) {
+  if (type === SourceTextModuleTypes.kFacade) {
     return wrap;
   }
 

test/cctest/test_environment.cc

@@ -879,7 +879,8 @@ TEST_F(EnvironmentTest, LoadEnvironmentWithESModuleDynamicImport) {
   // Finish the await.
   context->GetMicrotaskQueue()->PerformCheckpoint(isolate_);
 
-  EXPECT_EQ(result.As<v8::Promise>()->State(), v8::Promise::kFulfilled);
+  EXPECT_EQ(imported_promise.As<v8::Promise>()->State(),
+            v8::Promise::kFulfilled);
   v8::Local<v8::Value> imported_value =
       imported_promise.As<v8::Promise>()->Result();
   EXPECT_TRUE(imported_value->IsObject());