Turn ignored logic around (for config hints)

Author: webpro

packages/knip/src/DependencyDeputy.ts

@@ -66,9 +66,9 @@ export class DependencyDeputy {
     manifestPath,
     manifestStr,
     manifest,
-    ignoreDependencies,
-    ignoreBinaries,
-    ignoreUnresolved,
+    ignoreDependencies: id,
+    ignoreBinaries: ib,
+    ignoreUnresolved: iu,
   }: {
     name: string;
     cwd: string;
@@ -110,16 +110,20 @@ export class DependencyDeputy {
     this.setInstalledBinaries(name, installedBinaries);
     this.setHasTypesIncluded(name, hasTypesIncluded);
 
+    const ignoreDependencies = id.map(toRegexOrString);
+    const ignoreBinaries = ib.map(toRegexOrString);
+    const ignoreUnresolved = iu.map(toRegexOrString);
+
     this._manifests.set(name, {
       workspaceDir: dir,
       manifestPath,
       manifestStr,
-      ignoreDependencies: ignoreDependencies.map(toRegexOrString),
-      ignoreBinaries: ignoreBinaries.map(toRegexOrString),
-      ignoreUnresolved: ignoreUnresolved.map(toRegexOrString),
-      usedIgnoreDependencies: new Set<string | RegExp>(),
-      usedIgnoreBinaries: new Set<string | RegExp>(),
-      usedIgnoreUnresolved: new Set<string | RegExp>(),
+      ignoreDependencies,
+      ignoreBinaries,
+      ignoreUnresolved,
+      unusedIgnoreDependencies: new Set(ignoreDependencies),
+      unusedIgnoreBinaries: new Set(ignoreBinaries),
+      unusedIgnoreUnresolved: new Set(ignoreUnresolved),
       dependencies,
       devDependencies,
       peerDependencies: new Set(peerDependencies),
@@ -347,15 +351,15 @@ export class DependencyDeputy {
             if (ignoreItem) {
               delete issueSet[issueKey];
               counters[type]--;
-              manifest.usedIgnoreDependencies.add(ignoreItem);
+              manifest.unusedIgnoreDependencies.delete(ignoreItem);
             } else if (issue.workspace !== ROOT_WORKSPACE_NAME) {
               const manifest = this.getWorkspaceManifest(ROOT_WORKSPACE_NAME);
               if (manifest) {
                 const ignoreItem = findMatch(manifest.ignoreDependencies, packageName);
                 if (ignoreItem) {
                   delete issueSet[issueKey];
                   counters[type]--;
-                  manifest.usedIgnoreDependencies.add(ignoreItem);
+                  manifest.unusedIgnoreDependencies.delete(ignoreItem);
                 }
               }
             }
@@ -381,15 +385,15 @@ export class DependencyDeputy {
           if (ignoreItem) {
             delete issueSet[issueKey];
             counters[type]--;
-            manifest.usedIgnoreBinaries.add(ignoreItem);
+            manifest.unusedIgnoreBinaries.delete(ignoreItem);
           } else {
             const manifest = this.getWorkspaceManifest(ROOT_WORKSPACE_NAME);
             if (manifest) {
               const ignoreItem = findMatch(manifest.ignoreBinaries, issue.symbol);
               if (ignoreItem) {
                 delete issueSet[issueKey];
                 counters[type]--;
-                manifest.usedIgnoreBinaries.add(ignoreItem);
+                manifest.unusedIgnoreBinaries.delete(ignoreItem);
               }
             }
           }
@@ -409,15 +413,15 @@ export class DependencyDeputy {
           if (ignoreItem) {
             delete issueSet[issueKey];
             counters.unresolved--;
-            manifest.usedIgnoreUnresolved.add(ignoreItem);
+            manifest.unusedIgnoreUnresolved.delete(ignoreItem);
           } else {
             const manifest = this.getWorkspaceManifest(ROOT_WORKSPACE_NAME);
             if (manifest) {
               const ignoreItem = findMatch(manifest.ignoreUnresolved, issue.symbol);
               if (ignoreItem) {
                 delete issueSet[issueKey];
                 counters.unresolved--;
-                manifest.usedIgnoreUnresolved.add(ignoreItem);
+                manifest.unusedIgnoreUnresolved.delete(ignoreItem);
               }
             }
           }
@@ -440,22 +444,16 @@ export class DependencyDeputy {
     const configurationHints: ConfigurationHints = new Set();
 
     for (const [workspaceName, manifest] of this._manifests.entries()) {
-      for (const identifier of manifest.ignoreDependencies) {
-        if (!manifest.usedIgnoreDependencies.has(identifier)) {
-          configurationHints.add({ workspaceName, identifier, type: 'ignoreDependencies' });
-        }
+      for (const identifier of manifest.unusedIgnoreDependencies) {
+        configurationHints.add({ workspaceName, identifier, type: 'ignoreDependencies' });
       }
 
-      for (const identifier of manifest.ignoreBinaries) {
-        if (!manifest.usedIgnoreBinaries.has(identifier)) {
-          configurationHints.add({ workspaceName, identifier, type: 'ignoreBinaries' });
-        }
+      for (const identifier of manifest.unusedIgnoreBinaries) {
+        configurationHints.add({ workspaceName, identifier, type: 'ignoreBinaries' });
       }
 
-      for (const identifier of manifest.ignoreUnresolved) {
-        if (!manifest.usedIgnoreUnresolved.has(identifier)) {
-          configurationHints.add({ workspaceName, identifier, type: 'ignoreUnresolved' });
-        }
+      for (const identifier of manifest.unusedIgnoreUnresolved) {
+        configurationHints.add({ workspaceName, identifier, type: 'ignoreUnresolved' });
       }
     }
 

packages/knip/src/types/workspace.ts

@@ -13,9 +13,9 @@ type WorkspaceManifest = {
   ignoreDependencies: (string | RegExp)[];
   ignoreBinaries: (string | RegExp)[];
   ignoreUnresolved: (string | RegExp)[];
-  usedIgnoreDependencies: Set<string | RegExp>;
-  usedIgnoreBinaries: Set<string | RegExp>;
-  usedIgnoreUnresolved: Set<string | RegExp>;
+  unusedIgnoreDependencies: Set<string | RegExp>;
+  unusedIgnoreBinaries: Set<string | RegExp>;
+  unusedIgnoreUnresolved: Set<string | RegExp>;
 };
 
 export type WorkspaceManifests = Map<string, WorkspaceManifest>;