Keep track of analyzed files per resolver

webpro-nl · Apr 16, 2024 · 890375f · 890375f
1 parent 9ad7a3c
commit 890375f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/packages/knip/fixtures/plugins/metro/src/About.android.js b/packages/knip/fixtures/plugins/metro/src/About.android.js
@@ -0,0 +1 @@
+export default () => 1;
diff --git a/packages/knip/fixtures/plugins/metro/src/About.ios.js b/packages/knip/fixtures/plugins/metro/src/About.ios.js
@@ -0,0 +1 @@
+export default () => 1;
diff --git a/packages/knip/fixtures/plugins/metro/src/About.js b/packages/knip/fixtures/plugins/metro/src/About.js
@@ -0,0 +1 @@
+export default () => 1;
diff --git a/packages/knip/src/index.ts b/packages/knip/src/index.ts
@@ -293,7 +293,7 @@ export const main = async (unresolvedConfiguration: CommandLineOptions) => {
 
   debugLog('*', `Created ${principals.length} programs for ${workspaces.length} workspaces`);
 
-  const analyzedFiles = new Set<string>();
+  const analyzed = new Map<string, Set<string>>();
   const exportedSymbols: SerializableExportMap = {};
   const importedSymbols: SerializableImportMap = {};
   const unreferencedFiles = new Set<string>();
@@ -303,6 +303,11 @@ export const main = async (unresolvedConfiguration: CommandLineOptions) => {
   for (const principal of principals) {
     principal.init();
 
+    const [moduleResolverName] = principal.moduleResolver;
+
+    if (!analyzed.has(moduleResolverName)) analyzed.set(moduleResolverName, new Set<string>());
+    const analyzedFiles = analyzed.get(moduleResolverName)!;
+
     principal.referencedDependencies.forEach(([containingFilePath, specifier, workspaceName]) => {
       const workspace = chief.findWorkspaceByName(workspaceName);
       if (workspace) handleReferencedDependency({ specifier, containingFilePath, principal, workspace });
@@ -386,8 +391,6 @@ export const main = async (unresolvedConfiguration: CommandLineOptions) => {
 
     await principal.runAsyncCompilers();
 
-    const [moduleResolverName] = principal.moduleResolver;
-
     streamer.cast(`Connecting the dots...${moduleResolverName === 'default' ? '' : ` (${moduleResolverName})`}`);
 
     let size = principal.entryPaths.size;
@@ -618,6 +621,9 @@ export const main = async (unresolvedConfiguration: CommandLineOptions) => {
     }
   }
 
+  const analyzedFiles = new Set<string>();
+  for (const files of analyzed.values()) for (const filePath of files.values()) analyzedFiles.add(filePath);
+
   const unusedFiles = [...unreferencedFiles].filter(filePath => !analyzedFiles.has(filePath));
 
   collector.addFilesIssues(unusedFiles);