esm: refactor test-esm-named-exports

PR-URL: #49493
Reviewed-By: Jacob Smith <jacob@frende.me>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

Author: GeoffreyBooth

test/es-module/test-esm-loader-resolve-type.mjs

@@ -1,44 +1,44 @@
-// Flags: --loader ./test/fixtures/es-module-loaders/hook-resolve-type.mjs
-import{allowGlobals}from'../common/index.mjs';
+import{spawnPromisified}from'../common/index.mjs';
+import*astmpdirfrom'../common/tmpdir.js';
 import*asfixturesfrom'../common/fixtures.mjs';
-import{strictasassert}from'assert';
-import*asfsfrom'fs';
-
-allowGlobals(global.getModuleTypeStats);
-
-const{importedESM: importedESMBefore,
-importedCJS: importedCJSBefore}=awaitglobal.getModuleTypeStats();
-
-constbasePath=
-newURL('./node_modules/',import.meta.url);
-
-constrel=(file)=>newURL(file,basePath);
-constcreateDir=(path)=>{
-if(!fs.existsSync(path)){
-fs.mkdirSync(path);
-}
-};
+import{deepStrictEqual}from'node:assert';
+import{mkdir,rm,cp}from'node:fs/promises';
+import{execPath}from'node:process';
 
+constbase=tmpdir.fileURL(`test-esm-loader-resolve-type-${(Math.random()*Date.now()).toFixed(0)}`);
 constmoduleName='module-counter-by-type';
-constmoduleDir=rel(`${moduleName}`);
+constmoduleURL=newURL(`${base}/node_modules/${moduleName}`);
 try{
-createDir(basePath);
-createDir(moduleDir);
-fs.cpSync(
-fixtures.path('es-modules',moduleName),
-moduleDir,
+awaitmkdir(moduleURL,{recursive: true});
+awaitcp(
+fixtures.path('es-modules','module-counter-by-type'),
+moduleURL,
 {recursive: true}
 );
 
-
-awaitimport(`${moduleName}`);
+deepStrictEqual(awaitspawnPromisified(
+execPath,
+[
+'--no-warnings',
+'--input-type=module',
+'--eval',
+`import { getModuleTypeStats } from ${JSON.stringify(fixtures.fileURL('es-module-loaders','hook-resolve-type.mjs'))};
+ const before = getModuleTypeStats();
+ await import(${JSON.stringify(moduleName)});
+ const after = getModuleTypeStats();
+ console.log(JSON.stringify({ before, after }));`,
+],
+{cwd: base},
+),{
+stderr: '',
+stdout: JSON.stringify({
+before: {importedESM: 0,importedCJS: 0},
+// Dynamic import in the eval script should increment ESM counter but not CJS counter
+after: {importedESM: 1,importedCJS: 0},
+})+'\n',
+code: 0,
+signal: null,
+});
 }finally{
-fs.rmSync(basePath,{recursive: true,force: true});
+awaitrm(base,{recursive: true,force: true});
 }
-
-const{importedESM: importedESMAfter,
-importedCJS: importedCJSAfter}=awaitglobal.getModuleTypeStats();
-
-// Dynamic import above should increment ESM counter but not CJS counter
-assert.strictEqual(importedESMBefore+1,importedESMAfter);
-assert.strictEqual(importedCJSBefore,importedCJSAfter);

test/es-module/test-esm-named-exports.js

@@ -1,4 +1,4 @@
-// Flags: --experimental-loader ./test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs
+// Flags: --import ./test/fixtures/es-module-loaders/builtin-named-exports.mjs
 'use strict';
 
 require('../common');

test/es-module/test-esm-named-exports.mjs

@@ -1,4 +1,4 @@
-// Flags: --experimental-loader ./test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs
+// Flags: --import ./test/fixtures/es-module-loaders/builtin-named-exports.mjs
 import'../common/index.mjs';
 import{readFile,__fromLoader}from'fs';
 importassertfrom'assert';

test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs

@@ -1,17 +1,10 @@
-importmodulefrom'module';
+importmodulefrom'node:module';
 import{readFileSync}from'node:fs';
 
-constGET_BUILTIN=`$__get_builtin_hole_${Date.now()}`;
-
-exportfunctionglobalPreload(){
-return`Object.defineProperty(globalThis, ${JSON.stringify(GET_BUILTIN)}, {
- value: (builtinName) => {
- return getBuiltin(builtinName);
- },
- enumerable: false,
- configurable: false,
-});
-`;
+/** @type {string} */
+letGET_BUILTIN;
+exportfunctioninitialize(data){
+GET_BUILTIN=data.GET_BUILTIN;
 }
 
 exportasyncfunctionresolve(specifier,context,next){
@@ -56,7 +49,7 @@ const $builtinInstance = ${GET_BUILTIN}(${JSON.stringify(builtinName)});
 module.exports = $builtinInstance;
 module.exports.__fromLoader = true;
 
-// We need this for CJS-module-lexer can parse the exported names.
+// We need this for CJS-module-lexer can parse the exported names.
 ${
 builtinExports
 .map(name=>`exports.${name} = $builtinInstance.${name};`)

test/fixtures/es-module-loaders/builtin-named-exports.mjs

@@ -0,0 +1,17 @@
+import*asfixturesfrom'../../common/fixtures.mjs';
+import{createRequire,register}from'node:module';
+
+constrequire=createRequire(import.meta.url);
+
+constGET_BUILTIN=`$__get_builtin_hole_${Date.now()}`;
+Object.defineProperty(globalThis,GET_BUILTIN,{
+value: builtinName=>require(builtinName),
+enumerable: false,
+configurable: false,
+});
+
+register(fixtures.fileURL('es-module-loaders/builtin-named-exports-loader.mjs'),{
+data: {
+GET_BUILTIN,
+},
+});