feat: implement interface version 3

src/index.ts

@@ -6,18 +6,23 @@ import { normalizeOptions } from './normalizeOptions'
 import { hashObject } from './utils'
 
 let cacheOptionsHash: string | undefined
-let resolver: ResolverFactory | undefined
-export function resolve(source: string, file: string, options?: NapiResolveOptions | null): { found: boolean, path: string | null | undefined } {
+let cachedResolver: ResolverFactory | undefined
+
+export function resolve(source: string, file: string, options?: NapiResolveOptions | null, resolver: ResolverFactory | null = null): { found: boolean, path: string | null | undefined } {
   if (isBuiltin(source))
     return { found: true, path: null }
 
-  options ??= {}
-  const optionsHash = hashObject(options)
+  if (resolver == null) {
+    options ??= {}
+    const optionsHash = hashObject(options)
+
+    if (!cachedResolver || cacheOptionsHash !== optionsHash) {
+      options = normalizeOptions(options)
+      cachedResolver = new ResolverFactory(options)
+      cacheOptionsHash = optionsHash
+    }
 
-  if (!resolver || cacheOptionsHash !== optionsHash) {
-    options = normalizeOptions(options)
-    resolver = new ResolverFactory(options)
-    cacheOptionsHash = optionsHash
+    resolver = cachedResolver
   }
 
   // https://github.com/oxc-project/oxc-resolver/blob/main/npm/README.md#api
@@ -30,3 +35,15 @@ export function resolve(source: string, file: string, options?: NapiResolveOptio
 }
 
 export const interfaceVersion = 2
+
+export function createOxcResolver(options?: NapiResolveOptions | null) {
+  const resolver = new ResolverFactory(options)
+
+  return {
+    interfaceVersion: 3,
+    name: 'eslint-import-resolver-oxc',
+    resolve(source: string, file: string) {
+      return resolve(source, file, null, resolver)
+    },
+  }
+}

tests/eslint-plugin/rules/no-cycle.test.ts

@@ -2,7 +2,8 @@ import { run } from '../utils'
 
 function createCycleSourceError(p: string) {
   return {
-    message: `Dependency cycle via ${p}`,
+    messageId: 'cycleSource',
+    data: { source: p },
   }
 }
 

tests/eslint-plugin/utils.ts

@@ -1,11 +1,12 @@
 import type { RuleTesterInitOptions, TestCasesOptions } from 'eslint-vitest-rule-tester'
-import type { NapiResolveOptions } from 'oxc-resolver'
 import path from 'node:path'
 import { cwd } from 'node:process'
 import tsParser from '@typescript-eslint/parser'
 import { rules } from 'eslint-plugin-import-x'
 import { run as _run } from 'eslint-vitest-rule-tester'
 
+import { createOxcResolver } from '../../src'
+
 export * from 'eslint-vitest-rule-tester'
 export { unindent as $ } from 'eslint-vitest-rule-tester'
 
@@ -35,15 +36,15 @@ export function run(options: ExtendedRuleTesterOptions) {
     configs: {
       settings: {
         ...(options.lang === 'js' ? {} : { 'import-x/parsers': { [require.resolve('@typescript-eslint/parser')]: ['.ts'] } }),
-        'import-x/resolver': {
-          [oxcResolver]: {
+        'import-x/resolver-next': [
+          createOxcResolver({
             tsconfig: {
               configFile: path.resolve(FIXTURES_PATH, 'tsconfig.json'),
               references: 'auto',
             },
             roots: [FIXTURES_PATH],
-          } satisfies NapiResolveOptions,
-        },
+          }),
+        ],
       },
     },
     ...(options.lang === 'js' ? {} : { parser: tsParser as any }),