fix(pnp): esm - use correct error code when module not found (#5355)

* fix(pnp): Use correct error code when module not found * test(pnp): Add tests * Commits file updates * fix(pnp): re-throw regardless of what the error is --------- Co-authored-by: Kristoffer K <[email protected]> Co-authored-by: Maël Nison <[email protected]>
yarnpkg · Apr 24, 2023 · 4927819 · 4927819
1 parent 03995ff
commit 4927819
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 10 deletions.
diff --git a/.pnp.loader.mjs b/.pnp.loader.mjs
diff --git a/.yarn/versions/cac399bc.yml b/.yarn/versions/cac399bc.yml
@@ -0,0 +1,27 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-pnp": patch
+  "@yarnpkg/pnp": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"
diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/pnp-esm.test.ts b/packages/acceptance-tests/pkg-tests-specs/sources/pnp-esm.test.ts
@@ -654,6 +654,81 @@ describe(`Plug'n'Play - ESM`, () => {
     ),
   );
 
+  test(
+    `it should throw ERR_MODULE_NOT_FOUND when statically importing a nonexistent file`,
+    makeTemporaryEnv(
+      {
+        type: `module`,
+      },
+      async ({path, run, source}) => {
+        await expect(run(`install`)).resolves.toMatchObject({code: 0});
+
+        await xfs.writeFilePromise(ppath.join(path, `index.js`), `
+          import("./foo.js").catch((err) => {
+            console.log(err.code)
+          })
+        `);
+
+        await xfs.writeFilePromise(ppath.join(path, `foo.js`), `import './nonexistent.js'`);
+
+        await expect(run(`node`, `index.js`)).resolves.toMatchObject({
+          code: 0,
+          stdout: `ERR_MODULE_NOT_FOUND\n`,
+        });
+      },
+    ),
+  );
+
+  test(
+    `it should throw ERR_MODULE_NOT_FOUND when dynamically importing a nonexistent file`,
+    makeTemporaryEnv(
+      {
+        type: `module`,
+      },
+      async ({path, run, source}) => {
+        await expect(run(`install`)).resolves.toMatchObject({code: 0});
+
+        await xfs.writeFilePromise(ppath.join(path, `index.js`), `
+          import("./nonexistent.js").catch((err) => {
+            console.log(err.code)
+          })
+        `);
+
+        await expect(run(`node`, `index.js`)).resolves.toMatchObject({
+          code: 0,
+          stdout: `ERR_MODULE_NOT_FOUND\n`,
+        });
+      },
+    ),
+  );
+
+  test(
+    `it should throw ERR_PACKAGE_PATH_NOT_EXPORTED when subpath isn't exported`,
+    makeTemporaryEnv(
+      {
+        name: `foo`,
+        type: `module`,
+        exports: {
+          './package.json': `./package.json`,
+        },
+      },
+      async ({path, run, source}) => {
+        await expect(run(`install`)).resolves.toMatchObject({code: 0});
+
+        await xfs.writeFilePromise(ppath.join(path, `index.mjs`), `
+          import('foo/bar').catch(err => {
+            console.log(err.code)
+          });
+        `);
+
+        await expect(run(`node`, `./index.mjs`)).resolves.toMatchObject({
+          code: 0,
+          stdout: `ERR_PACKAGE_PATH_NOT_EXPORTED\n`,
+        });
+      },
+    ),
+  );
+
   // Tests /packages/yarnpkg-pnp/sources/esm-loader/fspatch.ts
   test(
     `it should support named exports in commonjs files`,

diff --git a/packages/yarnpkg-pnp/sources/esm-loader/built-loader.js b/packages/yarnpkg-pnp/sources/esm-loader/built-loader.js
diff --git a/packages/yarnpkg-pnp/sources/esm-loader/hooks/resolve.ts b/packages/yarnpkg-pnp/sources/esm-loader/hooks/resolve.ts
@@ -100,11 +100,19 @@ export async function resolve(
     }
   }
 
-  const result = pnpapi.resolveRequest(specifier, issuer, {
-    conditions: new Set(conditions),
-    // TODO: Handle --experimental-specifier-resolution=node
-    extensions: allowLegacyResolve ? undefined : [],
-  });
+  let result;
+  try {
+    result = pnpapi.resolveRequest(specifier, issuer, {
+      conditions: new Set(conditions),
+      // TODO: Handle --experimental-specifier-resolution=node
+      extensions: allowLegacyResolve ? undefined : [],
+    });
+  } catch (err) {
+    if (err instanceof Error && `code` in err && err.code === `MODULE_NOT_FOUND`)
+      err.code = `ERR_MODULE_NOT_FOUND`;
+
+    throw err;
+  }
 
   if (!result)
     throw new Error(`Resolving '${specifier}' from '${issuer}' failed`);