squash me: extract spawnAsPromised into helper & apply to more tests

Author: JakobJingleheimer

test/es-module/helper.spawnAsPromised.mjs

@@ -0,0 +1,32 @@
+import cp from 'node:child_process';
+
+
+export default function spawn(...args) {
+  let stderr = '';
+  let stdout = '';
+
+  const child = cp.spawn(...args);
+  child.stderr.setEncoding('utf8');
+  child.stderr.on('data', (data) => { stderr += data; });
+  child.stdout.setEncoding('utf8');
+  child.stdout.on('data', (data) => { stdout += data; });
+
+  return new Promise((resolve, reject) => {
+    child.on('close', (code, signal) => {
+      resolve({
+        code,
+        signal,
+        stderr,
+        stdout,
+      });
+    });
+    child.on('error', (code, signal) => {
+      reject({
+        code,
+        signal,
+        stderr,
+        stdout,
+      });
+    });
+  });
+}

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

@@ -0,0 +1,63 @@
+import { mustCall } from '../common/index.mjs';
+import * as fixtures from '../common/fixtures.mjs';
+import assert from 'node:assert';
+import path from 'node:path';
+
+import spawn from './helper.spawnAsPromised.mjs';
+
+const requiringCjsAsEsm = path.resolve(fixtures.path('/es-modules/cjs-esm.js'));
+const requiringEsm = path.resolve(fixtures.path('/es-modules/cjs-esm-esm.js'));
+const pjson = path.resolve(
+  fixtures.path('/es-modules/package-type-module/package.json')
+);
+
+{
+  const required = path.resolve(
+    fixtures.path('/es-modules/package-type-module/cjs.js')
+  );
+  const basename = 'cjs.js';
+  spawn(process.execPath, [requiringCjsAsEsm])
+    .then(mustCall(({ code, signal, stderr }) => {
+      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);
+    }));
+}
+
+{
+  const required = path.resolve(
+    fixtures.path('/es-modules/package-type-module/esm.js')
+  );
+  const basename = 'esm.js';
+  spawn(process.execPath, [requiringEsm])
+    .then(mustCall(({ code, signal, stderr }) => {
+      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'
+        )
+      );
+
+      assert.strictEqual(code, 1);
+      assert.strictEqual(signal, null);
+    }));
+}

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

@@ -1,31 +1,26 @@
 import { mustCall } from '../common/index.mjs';
 import { fileURL } from '../common/fixtures.mjs';
 import { doesNotMatch, match, strictEqual } from 'assert';
-import { spawn } from 'child_process';
-import { execPath } from 'process';
+import { execPath } from 'node:process';
 
-// Verify no warnings are printed when no experimental features are enabled or used
-{
-  const input = `import ${JSON.stringify(fileURL('es-module-loaders', 'module-named-exports.mjs'))}`;
-  const child = spawn(execPath, [
-    '--input-type=module',
-    '--eval',
-    input,
-  ]);
+import spawn from './helper.spawnAsPromised.mjs';
 
-  let stderr = '';
-  child.stderr.setEncoding('utf8');
-  child.stderr.on('data', (data) => { stderr += data; });
-  child.on('close', mustCall((code, signal) => {
-    strictEqual(code, 0);
-    strictEqual(signal, null);
+
+// Verify no warnings are printed when no experimental features are enabled or used
+spawn(execPath, [
+  '--input-type=module',
+  '--eval',
+  `import ${JSON.stringify(fileURL('es-module-loaders', 'module-named-exports.mjs'))}`,
+])
+  .then(mustCall(({ code, signal, stderr }) => {
     doesNotMatch(
       stderr,
       /ExperimentalWarning/,
       new Error('No experimental warning(s) should be emitted when no experimental feature is enabled')
     );
+    strictEqual(code, 0);
+    strictEqual(signal, null);
   }));
-}
 
 // Verify experimental warning is printed when experimental feature is enabled
 for (
@@ -35,21 +30,16 @@ for (
     [/specifier resolution/, '--experimental-specifier-resolution=node'],
   ]
 ) {
-  const input = `import ${JSON.stringify(fileURL('es-module-loaders', 'module-named-exports.mjs'))}`;
-  const child = spawn(execPath, [
+  spawn(execPath, [
     arg,
     '--input-type=module',
     '--eval',
-    input,
-  ]);
-
-  let stderr = '';
-  child.stderr.setEncoding('utf8');
-  child.stderr.on('data', (data) => { stderr += data; });
-  child.on('close', mustCall((code, signal) => {
-    strictEqual(code, 0);
-    strictEqual(signal, null);
-    match(stderr, /ExperimentalWarning/);
-    match(stderr, experiment);
-  }));
+    `import ${JSON.stringify(fileURL('es-module-loaders', 'module-named-exports.mjs'))}`,
+  ])
+    .then(mustCall(({ code, signal, stderr }) => {
+      match(stderr, /ExperimentalWarning/);
+      match(stderr, experiment);
+      strictEqual(code, 0);
+      strictEqual(signal, null);
+    }));
 }