src: use V8 function to get Module Namespace

PR-URL: #16261 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>

Author: bmeck

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');
 
 constModuleMap=require('internal/loader/ModuleMap');
 constModuleJob=require('internal/loader/ModuleJob');
@@ -100,7 +97,7 @@ class Loader{
 asyncimport(specifier,parentURL=this.base){
 constjob=awaitthis.getModuleJob(specifier,parentURL);
 constmodule=awaitjob.run();
-returngetNamespaceOfModuleWrap(module);
+returnmodule.namespace();
 }
 }
 Object.setPrototypeOf(Loader.prototype,null);

lib/internal/loader/ModuleWrap.js

@@ -6,13 +6,6 @@ const debug = require('util').debuglog('esm');
 constArrayJoin=Function.call.bind(Array.prototype.join);
 constArrayMap=Function.call.bind(Array.prototype.map);
 
-constgetNamespaceOfModuleWrap=(m)=>{
-consttmp=newModuleWrap('import * as _ from ""_;','');
-tmp.link(async()=>m);
-tmp.instantiate();
-returntmp.evaluate();
-};
-
 constcreateDynamicModule=(exports,url='',evaluate)=>{
 debug(
 `creating ESM facade for ${url} with exports: ${ArrayJoin(exports,', ')}`
@@ -57,6 +50,5 @@ const createDynamicModule = (exports, url = '', evaluate) =>{
 
 module.exports={
  createDynamicModule,
- getNamespaceOfModuleWrap,
  ModuleWrap
 };

src/module_wrap.cc

@@ -207,6 +207,29 @@ void ModuleWrap::Evaluate(const FunctionCallbackInfo<Value>& args){
  args.GetReturnValue().Set(ret);
 }
 
+voidModuleWrap::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);
+
+automodule = 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);

src/module_wrap.h

@@ -34,6 +34,7 @@ class ModuleWrap : public BaseObject{
 staticvoidLink(const v8::FunctionCallbackInfo<v8::Value>& args);
 staticvoidInstantiate(const v8::FunctionCallbackInfo<v8::Value>& args);
 staticvoidEvaluate(const v8::FunctionCallbackInfo<v8::Value>& args);
+staticvoidNamespace(const v8::FunctionCallbackInfo<v8::Value>& args);
 staticvoidGetUrl(v8::Local<v8::String> property,
 const v8::PropertyCallbackInfo<v8::Value>& info);
 staticvoidResolve(const v8::FunctionCallbackInfo<v8::Value>& args);