module: fix dynamic import from eval

This allows dynamic import to work from CLI `--eval` with or without `--input-type=module`. Fixes: #30591 PR-URL: #30624 Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Yorkie Liu <[email protected]> Reviewed-By: Ben Coe <[email protected]>

Author: coreyfarrell

lib/internal/modules/esm/loader.js

@@ -25,7 +25,6 @@ const defaultResolve = require('internal/modules/esm/default_resolve');
 constcreateDynamicModule=require(
 'internal/modules/esm/create_dynamic_module');
 const{ translators }=require('internal/modules/esm/translators');
-const{ ModuleWrap }=internalBinding('module_wrap');
 const{ getOptionValue }=require('internal/options');
 
 constdebug=require('internal/util/debuglog').debuglog('esm');
@@ -117,7 +116,17 @@ class Loader{
 source,
 url=pathToFileURL(`${process.cwd()}/[eval${++this.evalIndex}]`).href
 ){
-constevalInstance=(url)=>newModuleWrap(url,undefined,source,0,0);
+constevalInstance=(url)=>{
+const{ ModuleWrap, callbackMap }=internalBinding('module_wrap');
+constmodule=newModuleWrap(url,undefined,source,0,0);
+callbackMap.set(module,{
+importModuleDynamically: (specifier,{ url })=>{
+returnthis.import(specifier,url);
+}
+});
+
+returnmodule;
+};
 constjob=newModuleJob(this,url,evalInstance,false,false);
 this.moduleMap.set(url,job);
 const{ module, result }=awaitjob.run();

lib/internal/process/execution.js

@@ -57,27 +57,38 @@ function evalModule(source, print){
 functionevalScript(name,body,breakFirstLine,print){
 constCJSModule=require('internal/modules/cjs/loader').Module;
 const{ kVmBreakFirstLineSymbol }=require('internal/util');
+const{ pathToFileURL }=require('url');
 
 constcwd=tryGetCwd();
 constorigModule=global.module;// Set e.g. when called from the REPL.
 
 constmodule=newCJSModule(name);
 module.filename=path.join(cwd,name);
 module.paths=CJSModule._nodeModulePaths(cwd);
+
 global.kVmBreakFirstLineSymbol=kVmBreakFirstLineSymbol;
+global.asyncESM=require('internal/process/esm_loader');
+
+constbaseUrl=pathToFileURL(module.filename).href;
+
 constscript=`
  global.__filename = ${JSONStringify(name)};
  global.exports = exports;
  global.module = module;
  global.__dirname = __dirname;
  global.require = require;
- const{kVmBreakFirstLineSymbol } = global;
+ const{kVmBreakFirstLineSymbol, asyncESM } = global;
  delete global.kVmBreakFirstLineSymbol;
+ delete global.asyncESM;
  return require("vm").runInThisContext(
 ${JSONStringify(body)},{
  filename: ${JSONStringify(name)},
  displayErrors: true,
- [kVmBreakFirstLineSymbol]: ${!!breakFirstLine}
+ [kVmBreakFirstLineSymbol]: ${!!breakFirstLine},
+ async importModuleDynamically (specifier){
+ const loader = await asyncESM.ESMLoader;
+ return loader.import(specifier, ${JSONStringify(baseUrl)});
+ }
  });\n`;
 constresult=module._compile(script,`${name}-wrapper`);
 if(print){

test/parallel/test-cli-eval.js

@@ -283,3 +283,23 @@ child.exec(
 assert.ifError(err);
 assert.strictEqual(stdout,'.mjs file\n');
 }));
+
+
+// Assert that packages can be dynamic imported initial cwd-relative with --eval
+child.exec(
+`${nodejs}${execOptions} `+
+'--eval "process.chdir(\'..\');'+
+'import(\'./test/fixtures/es-modules/mjs-file.mjs\')"',
+common.mustCall((err,stdout)=>{
+assert.ifError(err);
+assert.strictEqual(stdout,'.mjs file\n');
+}));
+
+child.exec(
+`${nodejs} `+
+'--eval "process.chdir(\'..\');'+
+'import(\'./test/fixtures/es-modules/mjs-file.mjs\')"',
+common.mustCall((err,stdout)=>{
+assert.ifError(err);
+assert.strictEqual(stdout,'.mjs file\n');
+}));