refactor: remove some unnecessary codes

Author: JounQin

package.json

@@ -96,15 +96,17 @@
     "@commitlint/cli": "^19.8.0",
     "@mozilla/glean": "^5.0.3",
     "@pkgr/rollup": "^6.0.0",
+    "@total-typescript/ts-reset": "^0.6.1",
     "@types/debug": "^4.1.12",
     "@types/node": "^22.13.10",
+    "@types/pnpapi": "^0.0.5",
     "@types/unist": "^3.0.3",
     "clean-pkg-json": "^1.2.1",
     "cross-env": "^7.0.3",
     "dummy.js": "link:dummy.js",
     "eslint": "^9.22.0",
     "eslint-import-resolver-typescript": "link:.",
-    "eslint-plugin-import-x": "^4.7.2",
+    "eslint-plugin-import-x": "^4.8.0",
     "lint-staged": "^15.5.0",
     "npm-run-all2": "^7.0.2",
     "prettier": "^3.5.3",

src/global.d.ts

@@ -0,0 +1,8 @@
+import '@total-typescript/ts-reset'
+import type * as pnpapi from 'pnpapi'
+
+declare module 'module' {
+  namespace Module {
+    function findPnpApi(source: string): typeof pnpapi
+  }
+}

src/index.ts

@@ -1,4 +1,5 @@
 import fs from 'node:fs'
+import module from 'node:module'
 import path from 'node:path'
 
 import isNodeCoreModule from '@nolyfill/is-core-module'
@@ -94,7 +95,7 @@ let previousOptionsHash: string
 let optionsHash: string
 let cachedOptions: InternalResolverOptions | undefined
 
-let prevCwd: string
+let cachedCwd: string
 
 let mappersCachedOptions: InternalResolverOptions
 let mappers: Array<{
@@ -160,6 +161,18 @@ export function resolve(
     }
   }
 
+  /**
+   * {@link https://github.com/webpack/enhanced-resolve/blob/38e9fd9acb79643a70e7bcd0d85dabc600ea321f/lib/PnpPlugin.js#L81-L83}
+   */
+  if (process.versions.pnp && source === 'pnpapi') {
+    return {
+      found: true,
+      path: module.findPnpApi(file).resolveToUnqualified(source, file, {
+        considerBuiltins: false,
+      }),
+    }
+  }
+
   initMappers(cachedOptions)
 
   let mappedPaths = getMappedPaths(source, file, cachedOptions.extensions, true)
@@ -383,18 +396,18 @@ function initMappers(options: InternalResolverOptions) {
   if (
     mappers.length > 0 &&
     mappersCachedOptions === options &&
-    prevCwd === process.cwd()
+    cachedCwd === process.cwd()
   ) {
     return
   }
-  prevCwd = process.cwd()
+  cachedCwd = process.cwd()
   const configPaths = (
     typeof options.project === 'string'
       ? [options.project]
       : // eslint-disable-next-line sonarjs/no-nested-conditional
         Array.isArray(options.project)
         ? options.project
-        : [process.cwd()]
+        : [cachedCwd]
   ) // 'tinyglobby' pattern must have POSIX separator
     .map(config => replacePathSeparator(config, path.sep, path.posix.sep))
 
@@ -432,20 +445,18 @@ function initMappers(options: InternalResolverOptions) {
       }
 
       if (!tsconfigResult) {
-        // eslint-disable-next-line unicorn/no-useless-undefined
-        return undefined
+        return
       }
 
       const mapperFn = createPathsMatcher(tsconfigResult)
 
       if (!mapperFn) {
-        // eslint-disable-next-line unicorn/no-useless-undefined
-        return undefined
+        return
       }
 
       const files =
-        tsconfigResult.config.files === undefined &&
-        tsconfigResult.config.include === undefined
+        tsconfigResult.config.files == null &&
+        tsconfigResult.config.include == null
           ? // Include everything if no files or include options
             globSync(defaultInclude, {
               absolute: true,
@@ -458,7 +469,7 @@ function initMappers(options: InternalResolverOptions) {
             })
           : [
               // https://www.typescriptlang.org/tsconfig/#files
-              ...(tsconfigResult.config.files !== undefined &&
+              ...(tsconfigResult.config.files != null &&
               tsconfigResult.config.files.length > 0
                 ? tsconfigResult.config.files.map(file =>
                     path.normalize(
@@ -467,7 +478,7 @@ function initMappers(options: InternalResolverOptions) {
                   )
                 : []),
               // https://www.typescriptlang.org/tsconfig/#include
-              ...(tsconfigResult.config.include !== undefined &&
+              ...(tsconfigResult.config.include != null &&
               tsconfigResult.config.include.length > 0
                 ? globSync(tsconfigResult.config.include, {
                     absolute: true,
@@ -487,7 +498,7 @@ function initMappers(options: InternalResolverOptions) {
         mapperFn,
       }
     })
-    .filter(isDefined)
+    .filter(Boolean)
 
   mappersCachedOptions = options
 }
@@ -535,19 +546,6 @@ function toNativePathSeparator(p: string) {
   )
 }
 
-/**
- * Check if value is defined.
- *
- * Helper function for TypeScript.
- * Should be removed when upgrading to TypeScript >= 5.5.
- *
- * @param {T | null | undefined} value Value
- * @returns `true` if value is defined, `false` otherwise
- */
-function isDefined<T>(value: T | null | undefined): value is T {
-  return value !== null && value !== undefined
-}
-
 /**
  * Counts how many characters in strings `a` and `b` are exactly the same and in the same position.
  *

yarn.lock

@@ -3771,6 +3771,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@total-typescript/ts-reset@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "@total-typescript/ts-reset@npm:0.6.1"
+  checksum: 10/3e18063433c4667561b2a5ea6b698d95f8ca2cbecc7e3717b60f9266e2fd7070b2006cab0df255e60eaad5658d1cec4afc89ea4ca5645c8f36a312093bba3645
+  languageName: node
+  linkType: hard
+
 "@tsconfig/node10@npm:^1.0.7":
   version: 1.0.11
   resolution: "@tsconfig/node10@npm:1.0.11"
@@ -4050,6 +4057,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/pnpapi@npm:^0.0.5":
+  version: 0.0.5
+  resolution: "@types/pnpapi@npm:0.0.5"
+  checksum: 10/46d8474b77358c8cc48b957c059de6ad0839d18d8e90252c500c6bc30702e44e2629cf330350f7b291f35d863190b5390b641992c0601853a5d8b129fa91bd4d
+  languageName: node
+  linkType: hard
+
 "@types/resolve@npm:1.20.2":
   version: 1.20.2
   resolution: "@types/resolve@npm:1.20.2"
@@ -6691,16 +6705,18 @@ __metadata:
     "@mozilla/glean": "npm:^5.0.3"
     "@nolyfill/is-core-module": "npm:1.0.39"
     "@pkgr/rollup": "npm:^6.0.0"
+    "@total-typescript/ts-reset": "npm:^0.6.1"
     "@types/debug": "npm:^4.1.12"
     "@types/node": "npm:^22.13.10"
+    "@types/pnpapi": "npm:^0.0.5"
     "@types/unist": "npm:^3.0.3"
     clean-pkg-json: "npm:^1.2.1"
     cross-env: "npm:^7.0.3"
     debug: "npm:^4.4.0"
     dummy.js: "link:dummy.js"
     eslint: "npm:^9.22.0"
     eslint-import-resolver-typescript: "link:."
-    eslint-plugin-import-x: "npm:^4.7.2"
+    eslint-plugin-import-x: "npm:^4.8.0"
     get-tsconfig: "npm:^4.10.0"
     is-bun-module: "npm:^1.3.0"
     lint-staged: "npm:^15.5.0"
@@ -6796,25 +6812,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import-x@npm:^4.6.1, eslint-plugin-import-x@npm:^4.7.2":
-  version: 4.7.2
-  resolution: "eslint-plugin-import-x@npm:4.7.2"
+"eslint-plugin-import-x@npm:^4.6.1, eslint-plugin-import-x@npm:^4.8.0":
+  version: 4.8.0
+  resolution: "eslint-plugin-import-x@npm:4.8.0"
   dependencies:
     "@types/doctrine": "npm:^0.0.9"
     "@typescript-eslint/utils": "npm:^8.26.1"
     debug: "npm:^4.4.0"
     doctrine: "npm:^3.0.0"
     eslint-import-resolver-node: "npm:^0.3.9"
     get-tsconfig: "npm:^4.10.0"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:^10.0.1"
+    picomatch: "npm:^4.0.2"
     rspack-resolver: "npm:^1.1.0"
     semver: "npm:^7.7.1"
     stable-hash: "npm:^0.0.5"
     tslib: "npm:^2.8.1"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-  checksum: 10/866ef0301576310fb55a07748909373d93593bc891ef869e05a6122ffc1dc60b609aa016a70a4be1ff9186d9608422357e2949d7f09a6e38d6d95a494e9b8805
+  checksum: 10/ab0fe7b33a8c0f08ba7e7f0a4e0a7421f82f15688b775d6cd6dcd7b84ab5a511fd35bb6dd026156ff12b83b2be0b3d185638a1c886ecbd12979efafc0a298428
   languageName: node
   linkType: hard
 
@@ -10648,16 +10663,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:6 || 7 || 8 || 9 || 10, minimatch@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "minimatch@npm:10.0.1"
-  dependencies:
-    brace-expansion: "npm:^2.0.1"
-  checksum: 10/082e7ccbc090d5f8c4e4e029255d5a1d1e3af37bda837da2b8b0085b1503a1210c91ac90d9ebfe741d8a5f286ece820a1abb4f61dc1f82ce602a055d461d93f3
-  languageName: node
-  linkType: hard
-
-"minimatch@npm:9.0.5, minimatch@npm:^9.0.0, minimatch@npm:^9.0.3, minimatch@npm:^9.0.4, minimatch@npm:^9.0.5":
+"minimatch@npm:6 || 7 || 8 || 9 || 10, minimatch@npm:9.0.5, minimatch@npm:^9.0.0, minimatch@npm:^9.0.3, minimatch@npm:^9.0.4, minimatch@npm:^9.0.5":
   version: 9.0.5
   resolution: "minimatch@npm:9.0.5"
   dependencies: