src: use V8 function to get Module Namespace

PR-URL: #16261 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
nodejs · Oct 28, 2017 · 1c07724 · 1c07724
1 parent cadc47f
commit 1c07724
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/lib/internal/loader/Loader.js b/lib/internal/loader/Loader.js
@@ -2,10 +2,7 @@
 
 const { getURLFromFilePath } = require('internal/url');
 
-const {
-  getNamespaceOfModuleWrap,
-  createDynamicModule
-} = require('internal/loader/ModuleWrap');
+const { createDynamicModule } = require('internal/loader/ModuleWrap');
 
 const ModuleMap = require('internal/loader/ModuleMap');
 const ModuleJob = require('internal/loader/ModuleJob');
@@ -100,7 +97,7 @@ class Loader {
   async import(specifier, parentURL = this.base) {
     const job = await this.getModuleJob(specifier, parentURL);
     const module = await job.run();
-    return getNamespaceOfModuleWrap(module);
+    return module.namespace();
   }
 }
 Object.setPrototypeOf(Loader.prototype, null);

diff --git a/lib/internal/loader/ModuleWrap.js b/lib/internal/loader/ModuleWrap.js
@@ -5,13 +5,6 @@ const debug = require('util').debuglog('esm');
 const ArrayJoin = Function.call.bind(Array.prototype.join);
 const ArrayMap = Function.call.bind(Array.prototype.map);
 
-const getNamespaceOfModuleWrap = (m) => {
-  const tmp = new ModuleWrap('import * as _ from "";_;', '');
-  tmp.link(async () => m);
-  tmp.instantiate();
-  return tmp.evaluate();
-};
-
 const createDynamicModule = (exports, url = '', evaluate) => {
   debug(
     `creating ESM facade for ${url} with exports: ${ArrayJoin(exports, ', ')}`
@@ -56,6 +49,5 @@ const createDynamicModule = (exports, url = '', evaluate) => {
 
 module.exports = {
   createDynamicModule,
-  getNamespaceOfModuleWrap,
   ModuleWrap
 };
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -207,6 +207,29 @@ void ModuleWrap::Evaluate(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(ret);
 }
 
+void ModuleWrap::Namespace(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
+  auto isolate = args.GetIsolate();
+  auto that = args.This();
+  ModuleWrap* obj = Unwrap<ModuleWrap>(that);
+  CHECK_NE(obj, nullptr);
+
+  auto module = obj->module_.Get(isolate);
+
+  switch (module->GetStatus()) {
+    default:
+      return env->ThrowError(
+          "cannot get namespace, Module has not been instantiated");
+    case v8::Module::Status::kInstantiated:
+    case v8::Module::Status::kEvaluating:
+    case v8::Module::Status::kEvaluated:
+      break;
+  }
+
+  auto result = module->GetModuleNamespace();
+  args.GetReturnValue().Set(result);
+}
+
 MaybeLocal<Module> ModuleWrap::ResolveCallback(Local<Context> context,
                                                Local<String> specifier,
                                                Local<Module> referrer) {
@@ -520,6 +543,7 @@ void ModuleWrap::Initialize(Local<Object> target,
   env->SetProtoMethod(tpl, "link", Link);
   env->SetProtoMethod(tpl, "instantiate", Instantiate);
   env->SetProtoMethod(tpl, "evaluate", Evaluate);
+  env->SetProtoMethod(tpl, "namespace", Namespace);
 
   target->Set(FIXED_ONE_BYTE_STRING(isolate, "ModuleWrap"), tpl->GetFunction());
   env->SetMethod(target, "resolve", node::loader::ModuleWrap::Resolve);

diff --git a/src/module_wrap.h b/src/module_wrap.h
@@ -34,6 +34,7 @@ class ModuleWrap : public BaseObject {
   static void Link(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void Instantiate(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void Evaluate(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void Namespace(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void GetUrl(v8::Local<v8::String> property,
                      const v8::PropertyCallbackInfo<v8::Value>& info);
   static void Resolve(const v8::FunctionCallbackInfo<v8::Value>& args);