Move toSourcePath to ProjectPrincipal constructor

webpro-nl · Jul 14, 2024 · ef1ab49 · ef1ab49
1 parent d7285c1
commit ef1ab49
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/packages/knip/src/PrincipalFactory.ts b/packages/knip/src/PrincipalFactory.ts
@@ -3,6 +3,7 @@ import { ProjectPrincipal } from './ProjectPrincipal.js';
 import type { AsyncCompilers, SyncCompilers } from './compilers/types.js';
 import { debugLog } from './util/debug.js';
 import { toAbsolute, toRelative } from './util/path.js';
+import type { ToSourceFilePath } from './util/to-source-path.js';
 
 type Paths = ts.CompilerOptions['paths'];
 
@@ -19,6 +20,7 @@ export type PrincipalOptions = {
   isIsolateWorkspaces: boolean;
   isSkipLibs: boolean;
   isWatch: boolean;
+  toSourceFilePath: ToSourceFilePath;
 };
 
 const mapToAbsolutePaths = (paths: NonNullable<Paths>, cwd: string): Paths =>

diff --git a/packages/knip/src/ProjectPrincipal.ts b/packages/knip/src/ProjectPrincipal.ts
@@ -9,7 +9,7 @@ import type { DependencyGraph, Export, ExportMember, FileNode, UnresolvedImport
 import type { BoundSourceFile } from './typescript/SourceFile.js';
 import type { SourceFileManager } from './typescript/SourceFileManager.js';
 import { createHosts } from './typescript/createHosts.js';
-import { type GetImportsAndExportsOptions, _getImportsAndExports } from './typescript/getImportsAndExports.js';
+import { type GetImportsAndExportsOptions, _getImportsAndExports } from './typescript/get-imports-and-exports.js';
 import type { ResolveModuleNames } from './typescript/resolveModuleNames.js';
 import { timerify } from './util/Performance.js';
 import { compact } from './util/array.js';
@@ -69,6 +69,8 @@ export class ProjectPrincipal {
 
   cache: CacheConsultant<FileNode>;
 
+  toSourceFilePath: ToSourceFilePath;
+
   // @ts-expect-error Don't want to ignore this, but we're not touching this until after init()
   backend: {
     fileManager: SourceFileManager;
@@ -81,7 +83,7 @@ export class ProjectPrincipal {
 
   findReferences?: ts.LanguageService['findReferences'];
 
-  constructor({ compilerOptions, cwd, compilers, isSkipLibs, isWatch, pkgName }: PrincipalOptions) {
+  constructor({ compilerOptions, cwd, compilers, isSkipLibs, isWatch, pkgName, toSourceFilePath }: PrincipalOptions) {
     this.cwd = cwd;
 
     this.compilerOptions = {
@@ -98,16 +100,17 @@ export class ProjectPrincipal {
     this.isSkipLibs = isSkipLibs;
     this.isWatch = isWatch;
     this.cache = new CacheConsultant(pkgName || ANONYMOUS);
+    this.toSourceFilePath = toSourceFilePath;
   }
 
-  init(toSourceFilePath: ToSourceFilePath) {
+  init() {
     const { fileManager, compilerHost, resolveModuleNames, languageServiceHost } = createHosts({
       cwd: this.cwd,
       compilerOptions: this.compilerOptions,
       entryPaths: this.entryPaths,
       compilers: [this.syncCompilers, this.asyncCompilers],
       isSkipLibs: this.isSkipLibs,
-      toSourceFilePath,
+      toSourceFilePath: this.toSourceFilePath,
       useResolverCache: !this.isWatch,
     });
 

diff --git a/packages/knip/src/index.ts b/packages/knip/src/index.ts
@@ -130,6 +130,7 @@ export const main = async (unresolvedConfiguration: CommandLineOptions) => {
       isIsolateWorkspaces,
       isSkipLibs,
       isWatch,
+      toSourceFilePath,
     });
 
     const worker = new WorkspaceWorker({
@@ -331,7 +332,7 @@ export const main = async (unresolvedConfiguration: CommandLineOptions) => {
   };
 
   for (const principal of principals) {
-    principal.init(toSourceFilePath);
+    principal.init();
 
     for (const [containingFilePath, specifier, workspaceName] of principal.referencedDependencies) {
       const workspace = chief.findWorkspaceByName(workspaceName);

diff --git a/packages/knip/src/util/to-source-path.ts b/packages/knip/src/util/to-source-path.ts
@@ -6,8 +6,6 @@ import { debugLog } from './debug.js';
 import { isDirectory } from './fs.js';
 import { isInternal, join, toRelative } from './path.js';
 
-export type ToSourceFilePath = (filePath: string) => undefined | string;
-
 const defaultExtensions = `.{${DEFAULT_EXTENSIONS.map(ext => ext.slice(1)).join(',')}}`;
 const hasJSExt = /\.(m|c)js$/;
 const hasTSExt = /(?<!\.d)\.(m|c)?tsx?$/;
@@ -22,7 +20,7 @@ export const augmentWorkspace = (workspace: Workspace, dir: string, compilerOpti
 export const getToSourcePathHandler = (chief: ConfigurationChief) => {
   const toSourceMapCache = new Map<string, string>();
 
-  const toSourcePath: ToSourceFilePath = (filePath: string) => {
+  const toSourcePath = (filePath: string) => {
     if (!isInternal(filePath) || hasJSExt.test(filePath) || hasTSExt.test(filePath)) return;
     if (toSourceMapCache.has(filePath)) return toSourceMapCache.get(filePath);
     const workspace = chief.findWorkspaceByFilePath(filePath);
@@ -43,3 +41,5 @@ export const getToSourcePathHandler = (chief: ConfigurationChief) => {
 
   return toSourcePath;
 };
+
+export type ToSourceFilePath = ReturnType<typeof getToSourcePathHandler>;