Update readme

Author: romanlex

.github/workflows/ci.yml

@@ -9,7 +9,6 @@ jobs:
     strategy:
       matrix:
         node:
-          - 16
           - 18
           - 20
         os:

README.md

@@ -129,13 +129,13 @@ Add the following to your `.eslintrc` config:
 
 ## Options from [`enhanced-resolve`][]
 
-#### `conditionNames` - [See default](src/default.ts)
+#### `conditionNames` - [See default](src/default.ts#1)
 
-#### `extensions` - [See default](src/default.ts)
+#### `extensions` - [See default](src/default.ts#20)
 
-#### `extensionAlias` - [See default](src/default.ts)
+#### `extensionAlias` - [See default](src/default.ts#22)
 
-### `mainFields` - [See default](src/default.ts)
+### `mainFields` - [See default](src/default.ts#35)
 
 ### Other options
 

package.json

@@ -72,6 +72,6 @@
   },
   "packageManager": "[email protected]+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee",
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   }
 }

src/resolveImport.ts

@@ -13,9 +13,11 @@ import { logger } from './logger'
 
 import type { InternalResolverOptions, Matcher } from './types'
 import type { Resolver } from 'enhanced-resolve'
+import type { TsConfigResult } from 'get-tsconfig'
 import type { Version } from 'is-bun-module'
 
-const fileTsConfigCache = new Map()
+const fileTsJsConfigCache: Map<string, TsConfigResult> = new Map()
+const possiblePathsBySpecifier: Map<{ specifier: string; configPath: TsConfigResult['path'] }, string[]> = new Map()
 
 /**
  * Resolve an import specifier to a path
@@ -122,68 +124,74 @@ function getMappedPath(
 
   extensions = ['', ...extensions]
 
-  let paths: string[] = []
-
   if (RELATIVE_PATH_PATTERN.test(specifier)) {
     const resolved = path.resolve(path.dirname(file), specifier)
     if (isFile(resolved)) {
-      paths = [resolved]
+      return resolved
     }
-  } else {
-    let projectConfig
-    const isJsconfig = currentMatchersOfCwd.every((mapper) => mapper.path.includes('jsconfig'))
+  }
 
-    const fromCache = fileTsConfigCache.get(file)
+  let paths: string[] = []
 
-    if (fromCache) {
-      projectConfig = fromCache
-    } else {
-      projectConfig = getTsconfig(file, isJsconfig ? 'jsconfig.json' : 'tsconfig.json')
-    }
+  let projectConfig: TsConfigResult | null = null
 
-    if (projectConfig) logger('project config by file path:', projectConfig?.path)
+  const { ext } = path.parse(file)
 
-    const closestMapper = currentMatchersOfCwd?.find((mapper) => {
-      return mapper.path === projectConfig?.path
-    })
+  const fromCache = fileTsJsConfigCache.get(file)
 
-    if (closestMapper) {
-      logger('found closest mapper by config path:', closestMapper.path)
-    }
+  if (fromCache) {
+    projectConfig = fromCache
+  } else {
+    projectConfig = getTsconfig(file, ext.includes('js') ? 'jsconfig.json' : 'tsconfig.json')
+    if (projectConfig) fileTsJsConfigCache.set(file, projectConfig)
+  }
 
-    const possiblePaths = (
-      closestMapper
-        ? closestMapper.matcher(specifier)
-        : currentMatchersOfCwd.map((mapper) => mapper?.matcher(specifier)).flat()
-    )
-      .map((item) => [
-        ...extensions.map((ext) => `${item}${ext}`),
-        ...originalExtensions.map((ext) => `${item}/index${ext}`),
-      ])
-      .flat()
-
-    logger('possible paths:', possiblePaths)
-
-    paths = possiblePaths.filter((mappedPath) => {
-      try {
-        const stat = fs.statSync(mappedPath, { throwIfNoEntry: false })
-        if (stat === undefined) return false
-        if (stat.isFile()) return true
-        if (stat.isDirectory()) {
-          return isModule(mappedPath)
-        }
-      } catch {
-        return false
-      }
+  if (projectConfig) logger('project config by file path:', projectConfig?.path)
 
-      return false
-    })
+  const closestMapper = currentMatchersOfCwd?.find((mapper) => {
+    return mapper.path === projectConfig?.path
+  })
 
-    logger('paths', paths)
+  if (closestMapper) {
+    logger('found closest mapper by config path:', closestMapper.path)
   }
 
+  const possiblePaths = (
+    closestMapper
+      ? closestMapper.matcher(specifier)
+      : currentMatchersOfCwd.map((mapper) => mapper?.matcher(specifier)).flat()
+  )
+    .map((item) => [
+      ...extensions.map((ext) => `${item}${ext}`),
+      ...originalExtensions.map((ext) => `${item}/index${ext}`),
+    ])
+    .flat()
+
+  logger('possible paths:', possiblePaths)
+
+  paths = projectConfig?.path
+    ? (possiblePathsBySpecifier.get({ specifier, configPath: projectConfig.path }) ?? [])
+    : possiblePaths.filter((mappedPath) => {
+        try {
+          const stat = fs.statSync(mappedPath, { throwIfNoEntry: false })
+          if (stat === undefined) return false
+          if (stat.isFile()) return true
+          if (stat.isDirectory()) {
+            return isModule(mappedPath)
+          }
+        } catch {
+          return false
+        }
+
+        return false
+      })
+
+  if (projectConfig?.path) possiblePathsBySpecifier.set({ specifier, configPath: projectConfig.path }, paths)
+
   if (paths.length > 1) {
-    logger('found multiple matching ts paths:', paths)
+    logger('found multiple matching paths:', paths)
+  } else {
+    logger('found matching paths:', paths)
   }
 
   return paths[0]

tools/postbuild.mjs

@@ -17,6 +17,10 @@ newPackageJson.publishConfig = {
   access: 'public',
 }
 
+newPackageJson.engines = {
+  node: '>=16',
+}
+
 newPackageJson = sortPackageJson(newPackageJson)
 
 fs.writeFileSync('dist/package.json', JSON.stringify(newPackageJson, null, 2))