Merge pull request #11 from nodejs/specifier-resolution-tests

Author: GeoffreyBooth

commonjs-extension-resolution-loader/loader.js

@@ -24,11 +24,22 @@ export async function resolve(specifier, context, next) {
   }
   const parentPath = fileURLToPath(parentURL);
 
-  const resolution = await resolveAsync(specifier, {
-    basedir: dirname(parentPath),
-    extensions: ['.js', '.json', '.node'],
-  });
-  const url = pathToFileURL(resolution).href;
+  let url;
+  try {
+    const resolution = await resolveAsync(specifier, {
+      basedir: dirname(parentPath),
+      // For whatever reason, --experimental-specifier-resolution=node doesn't search for .mjs extensions
+      // but it does search for index.mjs files within directories
+      extensions: ['.js', '.json', '.node', '.mjs'],
+    });
+    url = pathToFileURL(resolution).href;
+  } catch (error) {
+    if (error.code === 'MODULE_NOT_FOUND') {
+      // Match Node's error code
+      error.code = 'ERR_MODULE_NOT_FOUND';
+    }
+    throw error;
+  }
 
   return next(url, context);
 }

commonjs-extension-resolution-loader/package.json

@@ -6,7 +6,7 @@
   "main": "./loader.js",
   "scripts": {
     "start": "npm test",
-    "test": "node test.js"
+    "test": "node test/basic.js && node test/test-esm-specifiers.js && node test/test-esm-specifiers-symlink.js"
   },
   "author": "Geoffrey Booth <[email protected]>",
   "license": "MIT",

commonjs-extension-resolution-loader/fixtures/file.js renamed to commonjs-extension-resolution-loader/test/basic-fixtures/file.js

@@ -9,7 +9,7 @@ import { execPath } from 'process';
 const child = spawn(execPath, [
   '--loader',
   './loader.js',
-  './fixtures/index.js'
+  './test/basic-fixtures/index.js'
 ]);
 
 let stdout = '';

commonjs-extension-resolution-loader/fixtures/folder/index.js renamed to commonjs-extension-resolution-loader/test/basic-fixtures/folder/index.js

@@ -0,0 +1,34 @@
+// Ported from https://github.com/nodejs/node/blob/45f2258f74117e27ffced434a98ad6babc14f7fa/test/common/index.js
+
+import { spawn } from 'node:child_process';
+
+
+export function spawnPromisified(...args) {
+  let stderr = '';
+  let stdout = '';
+
+  const child = 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,
+      });
+    });
+  });
+}

commonjs-extension-resolution-loader/fixtures/index.js renamed to commonjs-extension-resolution-loader/test/basic-fixtures/index.js

@@ -0,0 +1,11 @@
+import explicit from 'explicit-main';
+import implicit from 'implicit-main';
+import implicitModule from 'implicit-main-type-module';
+import noMain from 'no-main-field';
+
+function getImplicitCommonjs () {
+  return import('implicit-main-type-commonjs');
+}
+
+export {explicit, implicit, implicitModule, getImplicitCommonjs, noMain};
+export default 'success';

commonjs-extension-resolution-loader/test.js renamed to commonjs-extension-resolution-loader/test/basic.js

@@ -0,0 +1 @@
+module.exports = 'a';

commonjs-extension-resolution-loader/test/common.js

@@ -0,0 +1 @@
+export const b = 'b';