test: refactor ESM tests to improve performance

PR-URL: #43784
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

Author: JakobJingleheimer

lib/internal/modules/esm/loader.js

@@ -336,7 +336,7 @@ class ESMLoader {
  * A list of exports from user-defined loaders (as returned by
  * ESMLoader.import()).
  */
-asyncaddCustomLoaders(
+addCustomLoaders(
 customLoaders=[],
 ){
 for(leti=0;i<customLoaders.length;i++){

test/common/index.js

@@ -24,7 +24,7 @@
 constprocess=global.process;// Some tests tamper with the process global.
 
 constassert=require('assert');
-const{ exec, execSync, spawnSync }=require('child_process');
+const{ exec, execSync,spawn,spawnSync }=require('child_process');
 constfs=require('fs');
 // Do not require 'os' until needed so that test-os-checked-function can
 // monkey patch it. If 'os' is required here, that test will fail.
@@ -842,6 +842,36 @@ function requireNoPackageJSONAbove(dir = __dirname) {
 }
 }
 
+functionspawnPromisified(...args){
+letstderr='';
+letstdout='';
+
+constchild=spawn(...args);
+child.stderr.setEncoding('utf8');
+child.stderr.on('data',(data)=>{stderr+=data;});
+child.stdout.setEncoding('utf8');
+child.stdout.on('data',(data)=>{stdout+=data;});
+
+returnnewPromise((resolve,reject)=>{
+child.on('close',(code,signal)=>{
+resolve({
+ code,
+ signal,
+ stderr,
+ stdout,
+});
+});
+child.on('error',(code,signal)=>{
+reject({
+ code,
+ signal,
+ stderr,
+ stdout,
+});
+});
+});
+}
+
 constcommon={
  allowGlobals,
  buildType,
@@ -891,6 +921,7 @@ const common = {
  skipIfEslintMissing,
  skipIfInspectorDisabled,
  skipIfWorker,
+ spawnPromisified,
 
 getenoughTestMem(){
 returnrequire('os').totalmem()>0x70000000;/* 1.75 Gb */

test/common/index.mjs

@@ -23,6 +23,7 @@ const {
  hasCrypto,
  hasIPv6,
  childShouldThrowAndAbort,
+ checkoutEOL,
  createZeroFilledFile,
  platformTimeout,
  allowGlobals,
@@ -47,7 +48,8 @@ const {
  getArrayBufferViews,
  getBufferSources,
  getTTYfd,
- runWithInvalidFD
+ runWithInvalidFD,
+ spawnPromisified,
 }=common;
 
 export{
@@ -70,6 +72,7 @@ export {
 hasCrypto,
 hasIPv6,
 childShouldThrowAndAbort,
+checkoutEOL,
 createZeroFilledFile,
 platformTimeout,
 allowGlobals,
@@ -95,5 +98,6 @@ export {
 getBufferSources,
 getTTYfd,
 runWithInvalidFD,
-createRequire
+createRequire,
+spawnPromisified,
 };

test/es-module/test-cjs-esm-warn.js

@@ -1,64 +1,68 @@
 'use strict';
 
-constcommon=require('../common');
-constfixtures=require('../common/fixtures');
-const{ spawn }=require('child_process');
-constassert=require('assert');
-constpath=require('path');
+const{ spawnPromisified }=require('../common');
+constfixtures=require('../common/fixtures.js');
+constassert=require('node:assert');
+constpath=require('node:path');
+const{ execPath }=require('node:process');
+const{ describe, it }=require('node:test');
+
 
 constrequiringCjsAsEsm=path.resolve(fixtures.path('/es-modules/cjs-esm.js'));
 constrequiringEsm=path.resolve(fixtures.path('/es-modules/cjs-esm-esm.js'));
 constpjson=path.resolve(
 fixtures.path('/es-modules/package-type-module/package.json')
 );
 
-{
-constrequired=path.resolve(
-fixtures.path('/es-modules/package-type-module/cjs.js')
-);
-constbasename='cjs.js';
-constchild=spawn(process.execPath,[requiringCjsAsEsm]);
-letstderr='';
-child.stderr.setEncoding('utf8');
-child.stderr.on('data',(data)=>{
-stderr+=data;
-});
-child.on('close',common.mustCall((code,signal)=>{
+
+describe('CJS ↔︎ ESM interop warnings',{concurrency: true},()=>{
+
+it(async()=>{
+constrequired=path.resolve(
+fixtures.path('/es-modules/package-type-module/cjs.js')
+);
+constbasename='cjs.js';
+const{ code, signal, stderr }=awaitspawnPromisified(execPath,[requiringCjsAsEsm]);
+
+assert.ok(
+stderr.replaceAll('\r','').includes(
+`Error [ERR_REQUIRE_ESM]: require() of ES Module ${required} from ${requiringCjsAsEsm} not supported.\n`
+)
+);
+assert.ok(
+stderr.replaceAll('\r','').includes(
+`Instead rename ${basename} to end in .cjs, change the requiring `+
+'code to use dynamic import() which is available in all CommonJS '+
+`modules, or change "type": "module" to "type": "commonjs" in ${pjson} to `+
+'treat all .js files as CommonJS (using .mjs for all ES modules '+
+'instead).\n'
+)
+);
+
 assert.strictEqual(code,1);
 assert.strictEqual(signal,null);
+});
 
-assert.ok(stderr.replaceAll('\r','').includes(
-`Error [ERR_REQUIRE_ESM]: require() of ES Module ${required} from ${
-requiringCjsAsEsm} not supported.\n`));
-assert.ok(stderr.replaceAll('\r','').includes(
-`Instead rename ${basename} to end in .cjs, change the requiring `+
-'code to use dynamic import() which is available in all CommonJS '+
-`modules, or change "type": "module" to "type": "commonjs" in ${pjson} to `+
-'treat all .js files as CommonJS (using .mjs for all ES modules '+
-'instead).\n'));
-}));
-}
+it(async()=>{
+constrequired=path.resolve(
+fixtures.path('/es-modules/package-type-module/esm.js')
+);
+constbasename='esm.js';
+const{ code, signal, stderr }=awaitspawnPromisified(execPath,[requiringEsm]);
+
+assert.ok(
+stderr.replace(/\r/g,'').includes(
+`Error [ERR_REQUIRE_ESM]: require() of ES Module ${required} from ${requiringEsm} not supported.\n`
+)
+);
+assert.ok(
+stderr.replace(/\r/g,'').includes(
+`Instead change the require of ${basename} in ${requiringEsm} to`+
+' a dynamic import() which is available in all CommonJS modules.\n'
+)
+);
 
-{
-constrequired=path.resolve(
-fixtures.path('/es-modules/package-type-module/esm.js')
-);
-constbasename='esm.js';
-constchild=spawn(process.execPath,[requiringEsm]);
-letstderr='';
-child.stderr.setEncoding('utf8');
-child.stderr.on('data',(data)=>{
-stderr+=data;
-});
-child.on('close',common.mustCall((code,signal)=>{
 assert.strictEqual(code,1);
 assert.strictEqual(signal,null);
-
-assert.ok(stderr.replace(/\r/g,'').includes(
-`Error [ERR_REQUIRE_ESM]: require() of ES Module ${required} from ${
-requiringEsm} not supported.\n`));
-assert.ok(stderr.replace(/\r/g,'').includes(
-`Instead change the require of ${basename} in ${requiringEsm} to`+
-' a dynamic import() which is available in all CommonJS modules.\n'));
-}));
-}
+});
+});

test/es-module/test-esm-cjs-builtins.js

@@ -1,21 +1,20 @@
 'use strict';
 
-constcommon=require('../common');
-constfixtures=require('../common/fixtures');
-const{ spawn }=require('child_process');
-constassert=require('assert');
+const{ spawnPromisified }=require('../common');
+constfixtures=require('../common/fixtures.js');
+constassert=require('node:assert');
+const{ execPath }=require('node:process');
+const{ describe, it }=require('node:test');
+
 
 constentry=fixtures.path('/es-modules/builtin-imports-case.mjs');
 
-constchild=spawn(process.execPath,[entry]);
-child.stderr.setEncoding('utf8');
-letstdout='';
-child.stdout.setEncoding('utf8');
-child.stdout.on('data',(data)=>{
-stdout+=data;
+describe('ESM: importing builtins & CJS',()=>{
+it('should work',async()=>{
+const{ code, signal, stdout }=awaitspawnPromisified(execPath,[entry]);
+
+assert.strictEqual(code,0);
+assert.strictEqual(signal,null);
+assert.strictEqual(stdout,'ok\n');
+});
 });
-child.on('close',common.mustCall((code,signal)=>{
-assert.strictEqual(code,0);
-assert.strictEqual(signal,null);
-assert.strictEqual(stdout,'ok\n');
-}));

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

@@ -1,35 +1,29 @@
 'use strict';
 
-constcommon=require('../common');
-constfixtures=require('../common/fixtures');
-const{ spawn }=require('child_process');
-constassert=require('assert');
+const{ spawnPromisified }=require('../common');
+constfixtures=require('../common/fixtures.js');
+constassert=require('node:assert');
+const{ execPath }=require('node:process');
+const{ describe, it }=require('node:test');
 
-constentry=fixtures.path('/es-modules/cjs-exports.mjs');
 
-letchild=spawn(process.execPath,[entry]);
-child.stderr.setEncoding('utf8');
-letstdout='';
-child.stdout.setEncoding('utf8');
-child.stdout.on('data',(data)=>{
-stdout+=data;
-});
-child.on('close',common.mustCall((code,signal)=>{
-assert.strictEqual(code,0);
-assert.strictEqual(signal,null);
-assert.strictEqual(stdout,'ok\n');
-}));
+describe('ESM: importing CJS',{concurrency: true},()=>{
+it('should support valid CJS exports',async()=>{
+constvalidEntry=fixtures.path('/es-modules/cjs-exports.mjs');
+const{ code, signal, stdout }=awaitspawnPromisified(execPath,[validEntry]);
+
+assert.strictEqual(code,0);
+assert.strictEqual(signal,null);
+assert.strictEqual(stdout,'ok\n');
+});
+
+it('should eror on invalid CJS exports',async()=>{
+constinvalidEntry=fixtures.path('/es-modules/cjs-exports-invalid.mjs');
+const{ code, signal, stderr }=awaitspawnPromisified(execPath,[invalidEntry]);
 
-constentryInvalid=fixtures.path('/es-modules/cjs-exports-invalid.mjs');
-child=spawn(process.execPath,[entryInvalid]);
-letstderr='';
-child.stderr.setEncoding('utf8');
-child.stderr.on('data',(data)=>{
-stderr+=data;
+assert.strictEqual(code,1);
+assert.strictEqual(signal,null);
+assert.ok(stderr.includes('Warning: To load an ES module'));
+assert.ok(stderr.includes('Unexpected token \'export\''));
+});
 });
-child.on('close',common.mustCall((code,signal)=>{
-assert.strictEqual(code,1);
-assert.strictEqual(signal,null);
-assert.ok(stderr.includes('Warning: To load an ES module'));
-assert.ok(stderr.includes('Unexpected token \'export\''));
-}));