vm: add importModuleDynamically option to compileFunction

This reverts commit 2d5d773.
See: #32985
See: #33364
See: #33166Fixes: #31860
PR-URL: #35431
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>

Author: devsnek

doc/api/vm.md

@@ -813,6 +813,9 @@ const vm = require('vm');
 <!--YAML
 added: v10.10.0
 changes:
+- version:REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/35431
+ description: Added `importModuleDynamically` option again.
 - version: v14.3.0
  pr-url: https://github.com/nodejs/node/pull/33364
  description: Removal of`importModuleDynamically` due to compatibility
@@ -844,6 +847,16 @@ changes:
  * `contextExtensions` {Object[]} An array containing a collection of context
 extensions (objectswrappingthecurrentscope) to be applied while
  compiling. **Default:** `[]`.
+ * `importModuleDynamically` {Function} Called during evaluation ofthismodule
+ when `import()` is called. Ifthis option is not specified, calls to
+`import()` will reject with [`ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING`][].
+ This option is part of the experimental modules API, and should not be
+ considered stable.
+*`specifier` {string} specifier passed to `import()`
+*`function` {Function}
+* Returns: {Module Namespace Object|vm.Module} Returning a `vm.Module` is
+ recommended in order to take advantage of error tracking, and to avoid
+ issues with namespaces that contain `then`function exports.
 * Returns: {Function}
 
 Compiles the given code into the provided context (ifnocontextis

lib/internal/modules/cjs/loader.js

@@ -101,7 +101,6 @@ const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
 constpolicy=getOptionValue('--experimental-policy') ?
 require('internal/process/policy') :
 null;
-const{ compileFunction }=internalBinding('contextify');
 
 // Whether any user-provided CJS modules had been loaded (executed).
 // Used for internal assertions.
@@ -1019,40 +1018,25 @@ function wrapSafe(filename, content, cjsModuleInstance) {
 },
 });
 }
-letcompiled;
 try{
-compiled=compileFunction(
-content,
+returnvm.compileFunction(content,[
+'exports',
+'require',
+'module',
+'__filename',
+'__dirname',
+],{
  filename,
-0,
-0,
-undefined,
-false,
-undefined,
-[],
-[
-'exports',
-'require',
-'module',
-'__filename',
-'__dirname',
-]
-);
+importModuleDynamically(specifier){
+constloader=asyncESM.ESMLoader;
+returnloader.import(specifier,normalizeReferrerURL(filename));
+},
+});
 }catch(err){
 if(process.mainModule===cjsModuleInstance)
 enrichCJSError(err);
 throwerr;
 }
-
-const{ callbackMap }=internalBinding('module_wrap');
-callbackMap.set(compiled.cacheKey,{
-importModuleDynamically: async(specifier)=>{
-constloader=asyncESM.ESMLoader;
-returnloader.import(specifier,normalizeReferrerURL(filename));
-}
-});
-
-returncompiled.function;
 }
 
 // Run the file contents in the correct scope or sandbox. Expose

lib/vm.js

@@ -324,6 +324,7 @@ function compileFunction(code, params, options = {}) {
  produceCachedData =false,
  parsingContext =undefined,
  contextExtensions =[],
+ importModuleDynamically,
 }=options;
 
 validateString(filename,'options.filename');
@@ -371,6 +372,22 @@ function compileFunction(code, params, options = {}) {
 result.function.cachedData=result.cachedData;
 }
 
+if(importModuleDynamically!==undefined){
+if(typeofimportModuleDynamically!=='function'){
+thrownewERR_INVALID_ARG_TYPE('options.importModuleDynamically',
+'function',
+importModuleDynamically);
+}
+const{ importModuleDynamicallyWrap }=
+require('internal/vm/module');
+const{ callbackMap }=internalBinding('module_wrap');
+constwrapped=importModuleDynamicallyWrap(importModuleDynamically);
+constfunc=result.function;
+callbackMap.set(result.cacheKey,{
+importModuleDynamically: (s,_k)=>wrapped(s,func),
+});
+}
+
 returnresult.function;
 }
 

test/parallel/test-vm-module-basic.js

@@ -8,7 +8,8 @@ const {
  Module,
  SourceTextModule,
  SyntheticModule,
- createContext
+ createContext,
+ compileFunction,
 }=require('vm');
 constutil=require('util');
 
@@ -160,3 +161,19 @@ const util = require('util');
 name: 'TypeError'
 });
 }
+
+// Test compileFunction importModuleDynamically
+{
+constmodule=newSyntheticModule([],()=>{});
+module.link(()=>{});
+constf=compileFunction('return import("x")',[],{
+importModuleDynamically(specifier,referrer){
+assert.strictEqual(specifier,'x');
+assert.strictEqual(referrer,f);
+returnmodule;
+},
+});
+f().then((ns)=>{
+assert.strictEqual(ns,module.namespace);
+});
+}