feat!: use oxc-resolver directly

Author: JounQin

Diff for: package.json

@@ -64,8 +64,7 @@
   "peerDependencies": {
     "eslint": "*",
     "eslint-plugin-import": "*",
-    "eslint-plugin-import-x": "*",
-    "oxc-resolver": "^4.0.0 || ^5.0.0"
+    "eslint-plugin-import-x": "*"
   },
   "peerDependenciesMeta": {
     "eslint-plugin-import": {
@@ -78,8 +77,9 @@
   "dependencies": {
     "@pkgr/core": "^0.1.1",
     "debug": "^4.3.7",
-    "eslint-import-resolver-oxc": "^0.12.0",
-    "is-bun-module": "^1.0.2"
+    "is-bun-module": "^1.0.2",
+    "oxc-resolver": "^5.0.0",
+    "stable-hash": "^0.0.4"
   },
   "devDependencies": {
     "@1stg/eslint-config": "7.0.1",
@@ -101,7 +101,6 @@
     "eslint-plugin-import-x": "^4.5.0",
     "lint-staged": "^13.3.0",
     "npm-run-all2": "^5.0.2",
-    "oxc-resolver": "^4.0.0",
     "prettier": "^2.8.8",
     "react": "^18.3.1",
     "simple-git-hooks": "^2.11.1",

Diff for: patches/eslint-import-resolver-oxc+0.12.0.patch

@@ -1,3 +1,3 @@
 module.exports = {
-  extends: require.resolve('@1stg/eslint-config'),
+  extends: '@1stg',
 }

Diff for: src/.eslintrc.cjs

@@ -1,9 +1,9 @@
 import { isBuiltin } from 'node:module'
 import path from 'node:path'
 
-import { resolve as oxcResolve } from 'eslint-import-resolver-oxc'
 import { type Version, isBunModule } from 'is-bun-module'
 import { ResolverFactory } from 'oxc-resolver'
+import stableHash_ from 'stable-hash'
 
 import { JS_EXT_PATTERN } from './constants.js'
 import { mangleScopedPackage, removeQuerystring } from './helpers.js'
@@ -16,6 +16,28 @@ export * from './helpers.js'
 export * from './normalize-options.js'
 export type * from './types.js'
 
+// CJS <-> ESM interop
+const stableHash = 'default' in stableHash_ ? stableHash_.default : stableHash_
+
+const resolverCache = new Map<string, ResolverFactory>()
+
+const oxcResolve = (
+  source: string,
+  file: string,
+  resolver: ResolverFactory,
+) => {
+  const result = resolver.sync(path.dirname(file), source)
+  if (result.path) {
+    return {
+      found: true,
+      path: result.path,
+    }
+  }
+  return {
+    found: false,
+  }
+}
+
 export const resolve = (
   source: string,
   file: string,
@@ -39,20 +61,28 @@ export const resolve = (
     }
   }
 
-  source = removeQuerystring(source)
-
   if (resolver == null) {
-    options = normalizeOptions(options)
+    const optionsHash = stableHash(options)
+    // take `cwd` into account -- #217
+    const cacheKey = `${optionsHash}:${process.cwd()}`
+    let cached = resolverCache.get(cacheKey)
+    if (!cached) {
+      options = normalizeOptions(options)
+      resolverCache.set(cacheKey, (cached = new ResolverFactory(options)))
+    }
+    resolver = cached
   }
 
-  const resolved = oxcResolve(source, file, options, resolver)
+  source = removeQuerystring(source)
+
+  const resolved = oxcResolve(source, file, resolver)
 
   const foundPath = resolved.path
 
   // naive attempt at `@types/*` resolution,
   // if path is neither absolute nor relative
   if (
-    (JS_EXT_PATTERN.test(foundPath!) ||
+    ((foundPath && JS_EXT_PATTERN.test(foundPath)) ||
       (options?.alwaysTryTypes && !foundPath)) &&
     !/^@types[/\\]/.test(source) &&
     !path.isAbsolute(source) &&
@@ -61,27 +91,21 @@ export const resolve = (
     const definitelyTyped = oxcResolve(
       '@types/' + mangleScopedPackage(source),
       file,
-      options,
+      resolver,
     )
+
     if (definitelyTyped.found) {
       return definitelyTyped
     }
   }
 
   if (foundPath) {
     log('matched path:', foundPath)
-
-    return {
-      found: true,
-      path: foundPath,
-    }
+  } else {
+    log("didn't find", source)
   }
 
-  log("didn't find ", source)
-
-  return {
-    found: false,
-  }
+  return resolved
 }
 
 export const createTypeScriptImportResolver = (

Diff for: src/index.ts

@@ -62,7 +62,10 @@ export const normalizeOptions = (
 
   if (fallback) {
     log('auto setting `tsconfig.configFile` to', defaultConfigFile)
-    options = { ...options, tsconfig: { configFile: defaultConfigFile } }
+    options = {
+      ...options,
+      tsconfig: { ...options?.tsconfig, configFile: defaultConfigFile },
+    }
   }
 
   if (options?.tsconfig && !options.tsconfig.references) {

Diff for: src/normalize-options.ts

@@ -1,6 +1,6 @@
-import type { OxcResolverOptions } from 'eslint-import-resolver-oxc'
+import type { NapiResolveOptions } from 'oxc-resolver'
 
-export interface TypeScriptResolverOptions extends OxcResolverOptions {
+export interface TypeScriptResolverOptions extends NapiResolveOptions {
   /**
    * @deprecated Use `tsconfig` instead, `references` is supported
    */