Resolve module paths from selected tsconfig (resolve #1794)

webpro · webpro · commit 1c2f398331fd · 2026-06-16T07:32:03.000+02:00
diff --git a/packages/knip/fixtures/resolution/tsconfig-cli-paths/package.json b/packages/knip/fixtures/resolution/tsconfig-cli-paths/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "@fixtures/tsconfig-cli-paths"
+}
diff --git a/packages/knip/fixtures/resolution/tsconfig-cli-paths/src/main.ts b/packages/knip/fixtures/resolution/tsconfig-cli-paths/src/main.ts
@@ -0,0 +1,3 @@
+import { used } from '@app/used';
+
+used();
diff --git a/packages/knip/fixtures/resolution/tsconfig-cli-paths/src/unused.ts b/packages/knip/fixtures/resolution/tsconfig-cli-paths/src/unused.ts
@@ -0,0 +1 @@
+export const unused = () => 'unused';
diff --git a/packages/knip/fixtures/resolution/tsconfig-cli-paths/src/used.ts b/packages/knip/fixtures/resolution/tsconfig-cli-paths/src/used.ts
@@ -0,0 +1 @@
+export const used = () => 'used';
diff --git a/packages/knip/fixtures/resolution/tsconfig-cli-paths/tsconfig.app.json b/packages/knip/fixtures/resolution/tsconfig-cli-paths/tsconfig.app.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "paths": {
+      "@app/*": ["./src/*"]
+    }
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/packages/knip/fixtures/resolution/tsconfig-cli-paths/tsconfig.json b/packages/knip/fixtures/resolution/tsconfig-cli-paths/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "module": "preserve",
+    "moduleResolution": "bundler",
+    "target": "ESNext",
+    "strict": true
+  }
+}
diff --git a/packages/knip/src/ProjectPrincipal.ts b/packages/knip/src/ProjectPrincipal.ts
@@ -46,6 +46,7 @@ export class ProjectPrincipal {
   asyncCompilers: AsyncCompilers = new Map();
   private paths = new Map<string, Record<string, string[]>>();
   private rootDirs = new Map<string, string[]>();
+  private tsConfigFile: string | undefined;
   private extensions = new Set(DEFAULT_EXTENSIONS);
 
   cache: CacheConsultant<FileNode>;
@@ -67,6 +68,7 @@ export class ProjectPrincipal {
     this.cache = new CacheConsultant('root', options);
     this.toSourceFilePath = toSourceFilePath;
     this.findWorkspaceManifestImports = findWorkspaceManifestImports;
+    this.tsConfigFile = options.tsConfigFile ? toAbsolute(options.tsConfigFile, options.cwd) : undefined;
     this.pluginVisitorObjects.push(createBunShellVisitor(this.pluginCtx));
     this.fileManager = new SourceFileManager({
       compilers: [this.syncCompilers, this.asyncCompilers],
@@ -119,7 +121,8 @@ export class ProjectPrincipal {
       { scopedPaths, scopedRootDirs },
       customCompilerExtensions,
       this.toSourceFilePath,
-      this.findWorkspaceManifestImports
+      this.findWorkspaceManifestImports,
+      this.tsConfigFile
     );
   }
 
diff --git a/packages/knip/src/types/project.ts b/packages/knip/src/types/project.ts
@@ -18,7 +18,6 @@ export interface CompilerOptions {
   noEmit?: boolean;
   outDir?: string;
   paths?: Record<string, string[]>;
-  pathsBasePath?: string;
   plugins?: Array<{ name: string } | string>;
   rootDir?: string;
   rootDirs?: string[];
diff --git a/packages/knip/src/typescript/resolve-module-names.ts b/packages/knip/src/typescript/resolve-module-names.ts
@@ -68,12 +68,14 @@ export function createCustomModuleResolver(
   compilerOptions: { scopedPaths?: ScopedPaths; scopedRootDirs?: ScopedRootDirs },
   customCompilerExtensions: string[],
   toSourceFilePath: ToSourceFilePath,
-  findWorkspaceManifestImports?: WorkspaceManifestHandler
+  findWorkspaceManifestImports?: WorkspaceManifestHandler,
+  tsConfigFile?: string
 ): ResolveModule {
   const customCompilerExtensionsSet = new Set(customCompilerExtensions);
   const hasCustomExts = customCompilerExtensionsSet.size > 0;
-  const extensions = [...DEFAULT_EXTENSIONS, ...customCompilerExtensions, ...DTS_EXTENSIONS];
-  const resolveSync = hasCustomExts ? _createSyncModuleResolver(extensions) : _resolveModuleSync;
+  const extensions = [...DEFAULT_EXTENSIONS, ...customCompilerExtensions, ...DTS_EXTENSIONS, '.json', '.jsonc'];
+  const resolveSync =
+    hasCustomExts || tsConfigFile ? _createSyncModuleResolver(extensions, tsConfigFile) : _resolveModuleSync;
   const pathMappings = compilePathMappings(compilerOptions.scopedPaths);
   const rootDirMappings = compileRootDirs(compilerOptions.scopedRootDirs);
 
diff --git a/packages/knip/src/util/load-tsconfig.ts b/packages/knip/src/util/load-tsconfig.ts
@@ -120,9 +120,6 @@ export const loadTSConfig = async (tsConfigFilePath: string): Promise<TSConfigIn
     if (compilerOptions.outDir) compilerOptions.outDir = absDir(compilerOptions.outDir, dir);
     if (compilerOptions.rootDir) compilerOptions.rootDir = absDir(compilerOptions.rootDir, dir);
     if (compilerOptions.rootDirs) compilerOptions.rootDirs = compilerOptions.rootDirs.map(d => absDir(d, dir));
-    if (compilerOptions.paths) {
-      compilerOptions.pathsBasePath ??= dir;
-    }
 
     const sourceMapPairs: SourceMap[] = [];
     if (config.references?.length) {
diff --git a/packages/knip/src/util/resolve.ts b/packages/knip/src/util/resolve.ts
@@ -12,16 +12,17 @@ const extensionAlias = {
 
 const resolverInstances: ResolverFactory[] = [];
 
-const createSyncModuleResolver = (extensions: string[], alias?: Record<string, string[]>) => {
-  const aliasOpt = alias && { alias };
+const createSyncModuleResolver = (extensions: string[], tsConfigFile?: string) => {
   const baseOptions = {
     extensions,
     extensionAlias,
     conditionNames: ['require', 'import', 'node', 'default'],
     nodePath: false,
-    ...aliasOpt,
   };
-  const resolver = new ResolverFactory({ tsconfig: 'auto', ...baseOptions });
+  const resolver = new ResolverFactory({
+    tsconfig: tsConfigFile ? { configFile: tsConfigFile, references: 'auto' } : 'auto',
+    ...baseOptions,
+  });
   const fallbackResolver = new ResolverFactory(baseOptions);
 
   resolverInstances.push(resolver, fallbackResolver);
@@ -43,8 +44,8 @@ const resolveModuleSync = createSyncModuleResolver([...DEFAULT_EXTENSIONS, ...DT
  */
 export const _resolveModuleSync = timerify(resolveModuleSync, 'resolveModuleSync');
 
-export const _createSyncModuleResolver = (extensions: string[]) =>
-  timerify(createSyncModuleResolver(extensions), 'resolveModuleSync');
+export const _createSyncModuleResolver = (extensions: string[], tsConfigFile?: string) =>
+  timerify(createSyncModuleResolver(extensions, tsConfigFile), 'resolveModuleSync');
 
 const createSyncResolver = (extensions: string[]) => {
   const resolver = new ResolverFactory({
diff --git a/packages/knip/test/resolution/tsconfig-cli-paths.test.ts b/packages/knip/test/resolution/tsconfig-cli-paths.test.ts
@@ -0,0 +1,15 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { main } from '../../src/index.ts';
+import { createOptions } from '../helpers/create-options.ts';
+import { resolve } from '../helpers/resolve.ts';
+
+const cwd = resolve('fixtures/resolution/tsconfig-cli-paths');
+
+test('Resolve modules using paths from the selected tsconfig file', async () => {
+  const options = await createOptions({ cwd, args: { include: ['files'], tsConfig: 'tsconfig.app.json' } });
+  const { issues } = await main(options);
+
+  assert(issues.files['src/unused.ts']);
+  assert(!issues.files['src/used.ts']);
+});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "@fixtures/tsconfig-cli-paths"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { used } from '@app/used';`
	`2`	`+`
	`3`	`+used();`