refactor: add jest-pnp-resolver back temporarily, fix known failing test cases

Author: JounQin

e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap

@@ -41,7 +41,7 @@ exports[`moduleNameMapper wrong array configuration 1`] = `
       12 | module.exports = () => 'test';
       13 |
 
-      at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1080:17)
+      at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1105:17)
       at Object.require (index.js:10:1)
       at Object.require (__tests__/index.js:10:20)"
 `;
@@ -71,7 +71,7 @@ exports[`moduleNameMapper wrong configuration 1`] = `
       12 | module.exports = () => 'test';
       13 |
 
-      at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1080:17)
+      at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:1105:17)
       at Object.require (index.js:10:1)
       at Object.require (__tests__/index.js:10:20)"
 `;

e2e/__tests__/__snapshots__/requireMissingExt.test.ts.snap

@@ -26,7 +26,7 @@ exports[`shows a proper error from deep requires 1`] = `
       12 | test('dummy', () => {
       13 |   expect(1).toBe(1);
 
-      at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:826:11)
+      at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:851:11)
       at Object.<anonymous> (node_modules/discord.js/src/index.js:21:12)
       at Object.require (__tests__/test.js:10:1)"
 `;

e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap

@@ -37,7 +37,7 @@ exports[`show error message with matching files 1`] = `
         |                  ^
       9 |
 
-      at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:930:11)
+      at Resolver._throwModNotFoundError (../../packages/jest-resolve/build/index.js:851:11)
       at Object.require (index.js:8:18)
       at Object.require (__tests__/test.js:8:11)"
 `;

e2e/pnp/__tests__/undeclared-dependency.test.js

@@ -9,5 +9,5 @@
 it('should surface pnp errors', () => {
   expect(() => {
     require('undeclared');
-  }).toThrow("Cannot find module 'unesitent_module__'");
+  }).toThrow(expect.objectContaining({code: 'MODULE_NOT_FOUND'}));
 });

packages/jest-resolve-dependencies/src/__tests__/dependency_resolver.test.ts

@@ -31,7 +31,11 @@ beforeEach(async () => {
     cacheDirectory: path.resolve(tmpdir(), 'jest-resolve-dependencies-test'),
     moduleDirectories: ['node_modules'],
     moduleNameMapper: [['^\\$asdf/(.*)$', '<rootDir>/$1']],
-    rootDir: '.',
+    /**
+     * `filter` must be an absolute path
+     * @See https://github.com/jestjs/jest/blob/76632c6ec3f56708ec5781158972a295d0cc9332/packages/jest-haste-map/src/lib/fast_path.ts#L19-L25
+     */
+    rootDir: process.cwd(),
     roots: ['./packages/jest-resolve-dependencies'],
   });
   const runtimeContext = await Runtime.createContext(config, {
@@ -98,6 +102,7 @@ test('resolves no inverse dependencies for set of non-existent paths', () => {
 test('resolves inverse dependencies for existing path', () => {
   const paths = new Set([path.resolve(__dirname, '__fixtures__/file.js')]);
   const resolved = dependencyResolver.resolveInverse(paths, filter);
+  console.log('resolved', resolved);
   expect(resolved).toEqual([
     expect.stringContaining(
       path.join('__tests__', '__fixtures__', 'file.test.js'),

packages/jest-resolve/__typetests__/resolver.test.ts

@@ -9,9 +9,7 @@ import {expect} from 'tstyche';
 import type {
   AsyncResolver,
   JestResolver,
-  PackageFilter,
   PackageJSON,
-  PathFilter,
   ResolverOptions,
   SyncResolver,
 } from 'jest-resolve';
@@ -30,19 +28,6 @@ expect<PackageJSON>().type.not.toBeAssignableWith({
   filter: () => {},
 });
 
-// PackageFilter
-
-const packageFilter = (pkg: PackageJSON, file: string, dir: string) => pkg;
-
-expect<PackageFilter>().type.toBeAssignableWith(packageFilter);
-
-// PathFilter
-
-const pathFilter = (pkg: PackageJSON, path: string, relativePath: string) =>
-  relativePath;
-
-expect<PathFilter>().type.toBeAssignableWith(pathFilter);
-
 // ResolverOptions
 
 function customSyncResolver(path: string, options: ResolverOptions): string {
@@ -68,8 +53,6 @@ const asyncResolver: AsyncResolver = async (path, options) => {
   expect(options.defaultResolver).type.toBe<SyncResolver>();
   expect(options.extensions).type.toBe<Array<string> | undefined>();
   expect(options.moduleDirectory).type.toBe<Array<string> | undefined>();
-  expect(options.packageFilter).type.toBe<PackageFilter | undefined>();
-  expect(options.pathFilter).type.toBe<PathFilter | undefined>();
   expect(options.paths).type.toBe<Array<string> | undefined>();
   expect(options.rootDir).type.toBe<string | undefined>();
 
@@ -91,8 +74,6 @@ const syncResolver: SyncResolver = (path, options) => {
   expect(options.defaultResolver).type.toBe<SyncResolver>();
   expect(options.extensions).type.toBe<Array<string> | undefined>();
   expect(options.moduleDirectory).type.toBe<Array<string> | undefined>();
-  expect(options.packageFilter).type.toBe<PackageFilter | undefined>();
-  expect(options.pathFilter).type.toBe<PathFilter | undefined>();
   expect(options.paths).type.toBe<Array<string> | undefined>();
   expect(options.rootDir).type.toBe<string | undefined>();
 

packages/jest-resolve/package.json

@@ -22,6 +22,7 @@
     "chalk": "^4.0.0",
     "graceful-fs": "^4.2.9",
     "jest-haste-map": "workspace:*",
+    "jest-pnp-resolver": "^1.2.3",
     "jest-util": "workspace:*",
     "jest-validate": "workspace:*",
     "slash": "^3.0.0",

packages/jest-resolve/src/defaultResolver.ts

@@ -5,7 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import {resolve} from 'path';
 import {fileURLToPath} from 'url';
+import pnpResolver from 'jest-pnp-resolver';
 import {
   ResolverFactory,
   type NapiResolveOptions as UpstreamResolveOptions,
@@ -34,6 +36,12 @@ export interface ResolverOptions extends UpstreamResolveOptions {
   paths?: Array<string>;
   /** Current root directory. */
   rootDir?: string;
+
+  /**
+   * @internal Whether to allow the `jest-pnp-resolver` to be used.
+   * @see https://app.unpkg.com/jest-pnp-resolver@1.2.3/files/index.js#L49
+   */
+  allowPnp?: boolean;
 }
 
 export type SyncResolver = (path: string, options: ResolverOptions) => string;
@@ -44,9 +52,17 @@ export type AsyncResolver = (
 
 export type Resolver = SyncResolver | AsyncResolver;
 
-const defaultResolver: SyncResolver = (
-  path,
-  {
+const defaultResolver: SyncResolver = (path, options) => {
+  if (process.versions.pnp && options.allowPnp !== false) {
+    return pnpResolver(path, options);
+  }
+
+  if (path.startsWith('file://')) {
+    path = fileURLToPath(path);
+  }
+
+  /* eslint-disable prefer-const */
+  let {
     basedir,
     conditions,
     conditionNames,
@@ -56,11 +72,11 @@ const defaultResolver: SyncResolver = (
     roots,
     rootDir,
     ...rest
-  },
-) => {
-  if (path.startsWith('file://')) {
-    path = fileURLToPath(path);
-  }
+    /* eslint-enable prefer-const */
+  } = options;
+
+  // make sure that `basedir` is an absolute path
+  basedir = resolve(basedir);
 
   modules = modules || moduleDirectory;
 

yarn.lock

@@ -13958,6 +13958,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"jest-pnp-resolver@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "jest-pnp-resolver@npm:1.2.3"
+  peerDependencies:
+    jest-resolve: "*"
+  peerDependenciesMeta:
+    jest-resolve:
+      optional: true
+  checksum: db1a8ab2cb97ca19c01b1cfa9a9c8c69a143fde833c14df1fab0766f411b1148ff0df878adea09007ac6a2085ec116ba9a996a6ad104b1e58c20adbf88eed9b2
+  languageName: node
+  linkType: hard
+
 "jest-regex-util@npm:^29.0.0":
   version: 29.6.3
   resolution: "jest-regex-util@npm:29.6.3"
@@ -14018,6 +14030,7 @@ __metadata:
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
     jest-haste-map: "workspace:*"
+    jest-pnp-resolver: ^1.2.3
     jest-util: "workspace:*"
     jest-validate: "workspace:*"
     slash: ^3.0.0