esm: refactor test-esm-loader-resolve-type

PR-URL: #49493 Backport-PR-URL: #50669 Reviewed-By: Jacob Smith <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]>

Author: GeoffreyBooth

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

@@ -16,7 +16,7 @@ try{
 {recursive: true}
 );
 
-deepStrictEqual(awaitspawnPromisified(
+constoutput=awaitspawnPromisified(
 execPath,
 [
 '--no-warnings',
@@ -29,15 +29,17 @@ try{
  console.log(JSON.stringify({before, after }));`,
 ],
 {cwd: base},
-),{
+);
+
+deepStrictEqual(output,{
+code: 0,
+signal: null,
 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{
 awaitrm(base,{recursive: true,force: true});

test/fixtures/es-module-loaders/hook-resolve-type-loader.mjs

@@ -0,0 +1,18 @@
+/** @type{MessagePort} */
+letport;
+exportfunctioninitialize(data){
+port=data.port;
+}
+
+exportasyncfunctionresolve(specifier,context,next){
+constnextResult=awaitnext(specifier,context);
+const{ format }=nextResult;
+
+if(format==='module'||specifier.endsWith('.mjs')){
+port.postMessage({type: 'module'});
+}elseif(format==null||format==='commonjs'){
+port.postMessage({type: 'commonjs'});
+}
+
+returnnextResult;
+}

test/fixtures/es-module-loaders/hook-resolve-type.mjs

@@ -1,44 +1,30 @@
+import*asfixturesfrom'../../common/fixtures.mjs';
+import{register}from'node:module';
+import{MessageChannel}from'node:worker_threads';
+
 letimportedESM=0;
 letimportedCJS=0;
+exportfunctiongetModuleTypeStats(){
+return{ importedESM, importedCJS };
+};
 
-exportfunctionglobalPreload({ port }){
-port.on('message',(int32)=>{
-port.postMessage({ importedESM, importedCJS });
-Atomics.store(int32,0,1);
-Atomics.notify(int32,0);
-});
-port.unref();
-return`
- const{receiveMessageOnPort } = getBuiltin('worker_threads');
- global.getModuleTypeStats = async function getModuleTypeStats(){
- const sab = new SharedArrayBuffer(4);
- const int32 = new Int32Array(sab);
- port.postMessage(int32);
- // Artificial timeout to keep the event loop alive.
- // https://bugs.chromium.org/p/v8/issues/detail?id=13238
- // TODO(targos) Remove when V8 issue is resolved.
- const timeout = setTimeout(() =>{throw new Error('timeout')}, 1_000);
- await Atomics.waitAsync(int32, 0, 0).value;
- clearTimeout(timeout);
- return receiveMessageOnPort(port).message;
- };
- `;
-}
-
-exportasyncfunctionload(url,context,next){
-returnnext(url);
-}
+const{ port1, port2 }=newMessageChannel();
 
-exportasyncfunctionresolve(specifier,context,next){
-constnextResult=awaitnext(specifier,context);
-const{ format }=nextResult;
+register(fixtures.fileURL('es-module-loaders/hook-resolve-type-loader.mjs'),{
+data: {port: port2},
+transferList: [port2],
+});
 
-if(format==='module'||specifier.endsWith('.mjs')){
-importedESM++;
-}elseif(format==null||format==='commonjs'){
-importedCJS++;
+port1.on('message',({ type })=>{
+switch(type){
+case'module':
+importedESM++;
+break;
+case'commonjs':
+importedCJS++;
+break;
 }
+});
 
-returnnextResult;
-}
-
+port1.unref();
+port2.unref();