knip 5.46.3 → 5.46.5

package/dist/ConfigurationChief.d.ts

@@ -38,7 +38,7 @@ export declare class ConfigurationChief {
     availableWorkspaceNames: string[];
     availableWorkspacePkgNames: Set<string>;
     availableWorkspaceDirs: string[];
-    workspaceGraph: WorkspaceGraph | undefined;
+    workspaceGraph: WorkspaceGraph;
     includedWorkspaces: Workspace[];
     resolvedConfigFilePath?: string;
     rawConfig?: any;

package/dist/ConfigurationChief.js

@@ -4,13 +4,14 @@ import { partitionCompilers } from './compilers/index.js';
 import { DEFAULT_EXTENSIONS, KNIP_CONFIG_LOCATIONS, ROOT_WORKSPACE_NAME } from './constants.js';
 import { knipConfigurationSchema } from './schema/configuration.js';
 import { pluginNames } from './types/PluginNames.js';
-import { arrayify, compact } from './util/array.js';
+import { arrayify, compact, partition } from './util/array.js';
 import parsedArgValues from './util/cli-arguments.js';
 import { createWorkspaceGraph } from './util/create-workspace-graph.js';
 import { ConfigurationError } from './util/errors.js';
 import { findFile, isDirectory, isFile, loadJSON } from './util/fs.js';
 import { getIncludedIssueTypes } from './util/get-included-issue-types.js';
 import { _dirGlob } from './util/glob.js';
+import { graphSequencer } from './util/graph-sequencer.js';
 import { defaultRules } from './util/issue-initializers.js';
 import { _load } from './util/loader.js';
 import mapWorkspaces from './util/map-workspaces.js';
@@ -63,7 +64,7 @@ export class ConfigurationChief {
     availableWorkspaceNames = [];
     availableWorkspacePkgNames = new Set();
     availableWorkspaceDirs = [];
-    workspaceGraph;
+    workspaceGraph = new Map();
     includedWorkspaces = [];
     resolvedConfigFilePath;
     rawConfig;
@@ -205,7 +206,12 @@ export class ConfigurationChief {
             !picomatch.isMatch(name, this.ignoredWorkspacePatterns)));
     }
     getAvailableWorkspaceNames(names) {
-        return [...names, ...this.additionalWorkspaceNames].filter(name => !picomatch.isMatch(name, this.ignoredWorkspacePatterns));
+        const availableWorkspaceNames = [];
+        for (const name of names) {
+            if (!picomatch.isMatch(name, this.ignoredWorkspacePatterns))
+                availableWorkspaceNames.push(name);
+        }
+        return availableWorkspaceNames;
     }
     getIncludedWorkspaces() {
         if (this.workspace) {
@@ -237,9 +243,9 @@ export class ConfigurationChief {
                 const workspaceDirsWithDependents = new Set(initialWorkspaces);
                 const addDependents = (dir) => {
                     seen.add(dir);
-                    if (!graph[dir] || graph[dir].size === 0)
+                    const dirs = graph.get(dir);
+                    if (!dirs || dirs.size === 0)
                         return;
-                    const dirs = graph[dir];
                     if (initialWorkspaces.some(dir => dirs.has(dir)))
                         workspaceDirsWithDependents.add(dir);
                     for (const dir of dirs)
@@ -281,7 +287,9 @@ export class ConfigurationChief {
         return this.workspacePackages.get(name)?.manifest;
     }
     getWorkspaces() {
-        return this.includedWorkspaces;
+        const sorted = graphSequencer(this.workspaceGraph, this.includedWorkspaces.map(workspace => workspace.dir));
+        const [root, rest] = partition(sorted.chunks.flat(), dir => dir === this.cwd);
+        return [...root, ...rest.reverse()].map(dir => this.includedWorkspaces.find(w => w.dir === dir));
     }
     getDescendentWorkspaces(name) {
         return this.availableWorkspaceNames

package/dist/PrincipalFactory.js

@@ -22,16 +22,14 @@ export class PrincipalFactory {
         options.compilerOptions = mergePaths(cwd, compilerOptions, paths);
         if (isFile && compilerOptions.module !== ts.ModuleKind.CommonJS)
             compilerOptions.moduleResolution ??= ts.ModuleResolutionKind.Bundler;
-        const principal = this.findReusablePrincipal(cwd, compilerOptions);
+        const principal = this.findReusablePrincipal(compilerOptions);
         if (!isIsolateWorkspaces && principal) {
             this.linkPrincipal(principal, cwd, compilerOptions, pkgName, compilers);
             return principal.principal;
         }
         return this.addNewPrincipal(options);
     }
-    findReusablePrincipal(cwd, compilerOptions) {
-        if (compilerOptions.rootDir && cwd !== compilerOptions.rootDir)
-            return;
+    findReusablePrincipal(compilerOptions) {
         const workspacePaths = compilerOptions?.paths ? Object.keys(compilerOptions.paths) : [];
         const principal = Array.from(this.principals).find(principal => {
             if (compilerOptions.pathsBasePath && principal.principal.compilerOptions.pathsBasePath)
@@ -63,7 +61,7 @@ export class PrincipalFactory {
         return principal;
     }
     getPrincipals() {
-        return Array.from(this.principals, p => p.principal).reverse();
+        return Array.from(this.principals, p => p.principal);
     }
     getPrincipalByPackageName(packageName) {
         return Array.from(this.principals).find(principal => principal.pkgNames.has(packageName))?.principal;

package/dist/WorkspaceWorker.js

@@ -123,7 +123,8 @@ export class WorkspaceWorker {
         return patterns;
     }
     getPluginEntryFilePatterns(patterns) {
-        return [patterns, this.ignoredWorkspacePatterns.map(negate)].flat();
+        const negateWorkspaces = patterns.some(pattern => pattern.startsWith('**/')) ? this.negatedWorkspacePatterns : [];
+        return [patterns, negateWorkspaces, this.ignoredWorkspacePatterns.map(negate)].flat();
     }
     getProductionEntryFilePatterns(negatedTestFilePatterns) {
         const entry = this.config.entry.filter(hasProductionSuffix);

package/dist/compilers/compilers.d.ts

@@ -2,4 +2,4 @@ import type { SyncCompilerFn } from './types.js';
 export declare const fencedCodeBlockMatcher: RegExp;
 export declare const importMatcher: RegExp;
 export declare const importsWithinScripts: SyncCompilerFn;
-export declare const tsScriptBodies: SyncCompilerFn;
+export declare const scriptBodies: SyncCompilerFn;

package/dist/compilers/compilers.js

@@ -11,11 +11,11 @@ export const importsWithinScripts = (text) => {
     }
     return scripts.join(';\n');
 };
-const tsScriptExtractor = /<script\b[^>]*lang="ts"[^>]*>(?<body>[\s\S]*?)<\/script>/gm;
-export const tsScriptBodies = (text) => {
+const scriptBodyExtractor = /<script\b[^>]*>(?<body>[\s\S]*?)<\/script>/gm;
+export const scriptBodies = (text) => {
     const scripts = [];
     let scriptMatch;
-    while ((scriptMatch = tsScriptExtractor.exec(text))) {
+    while ((scriptMatch = scriptBodyExtractor.exec(text))) {
         if (scriptMatch.groups?.body)
             scripts.push(scriptMatch.groups.body);
     }

package/dist/compilers/vue.js

@@ -1,4 +1,4 @@
-import { tsScriptBodies } from './compilers.js';
+import { scriptBodies } from './compilers.js';
 const condition = (hasDependency) => hasDependency('vue') || hasDependency('nuxt');
-const compiler = tsScriptBodies;
+const compiler = scriptBodies;
 export default { condition, compiler };

package/dist/util/create-workspace-graph.d.ts

@@ -1,3 +1,3 @@
 import type { WorkspacePackage } from '../types/package-json.js';
-export type WorkspaceGraph = Record<string, Set<string>>;
+export type WorkspaceGraph = Map<string, Set<string>>;
 export declare function createWorkspaceGraph(cwd: string, wsNames: string[], wsPkgNames: Set<string>, wsPackages: Map<string, WorkspacePackage>): WorkspaceGraph;

package/dist/util/create-workspace-graph.js

@@ -1,7 +1,7 @@
 import { join } from './path.js';
 const types = ['peerDependencies', 'devDependencies', 'optionalDependencies', 'dependencies'];
 export function createWorkspaceGraph(cwd, wsNames, wsPkgNames, wsPackages) {
-    const graph = {};
+    const graph = new Map();
     const packages = Array.from(wsPackages.values());
     const getWorkspaceDirs = (pkg) => {
         const dirs = new Set();
@@ -21,7 +21,7 @@ export function createWorkspaceGraph(cwd, wsNames, wsPkgNames, wsPackages) {
     for (const name of wsNames) {
         const pkg = wsPackages.get(name);
         if (pkg)
-            graph[join(cwd, name)] = getWorkspaceDirs(pkg);
+            graph.set(join(cwd, name), getWorkspaceDirs(pkg));
     }
     return graph;
 }

package/dist/util/graph-sequencer.d.ts

@@ -0,0 +1,9 @@
+type Graph<T> = Map<T, Set<T>>;
+type Groups<T> = T[][];
+interface Result<T> {
+    safe: boolean;
+    chunks: Groups<T>;
+    cycles: Groups<T>;
+}
+export declare function graphSequencer<T>(graph: Graph<T>, includedNodes?: T[]): Result<T>;
+export {};

package/dist/util/graph-sequencer.js

@@ -0,0 +1,94 @@
+export function graphSequencer(graph, includedNodes = [...graph.keys()]) {
+    const reverseGraph = new Map();
+    for (const key of graph.keys()) {
+        reverseGraph.set(key, []);
+    }
+    const nodes = new Set(includedNodes);
+    const visited = new Set();
+    const outDegree = new Map();
+    for (const [from, edges] of graph.entries()) {
+        outDegree.set(from, 0);
+        for (const to of edges) {
+            if (nodes.has(from) && nodes.has(to)) {
+                changeOutDegree(from, 1);
+                reverseGraph.get(to).push(from);
+            }
+        }
+        if (!nodes.has(from)) {
+            visited.add(from);
+        }
+    }
+    const chunks = [];
+    const cycles = [];
+    let safe = true;
+    while (nodes.size) {
+        const chunk = [];
+        let minDegree = Number.MAX_SAFE_INTEGER;
+        for (const node of nodes) {
+            const degree = outDegree.get(node);
+            if (degree === 0) {
+                chunk.push(node);
+            }
+            minDegree = Math.min(minDegree, degree);
+        }
+        if (minDegree === 0) {
+            chunk.forEach(removeNode);
+            chunks.push(chunk);
+        }
+        else {
+            const cycleNodes = [];
+            for (const node of nodes) {
+                const cycle = findCycle(node);
+                if (cycle.length) {
+                    cycles.push(cycle);
+                    cycle.forEach(removeNode);
+                    cycleNodes.push(...cycle);
+                    if (cycle.length > 1) {
+                        safe = false;
+                    }
+                }
+            }
+            chunks.push(cycleNodes);
+        }
+    }
+    return { safe, chunks, cycles };
+    function changeOutDegree(node, value) {
+        const degree = outDegree.get(node) ?? 0;
+        outDegree.set(node, degree + value);
+    }
+    function removeNode(node) {
+        for (const from of reverseGraph.get(node)) {
+            changeOutDegree(from, -1);
+        }
+        visited.add(node);
+        nodes.delete(node);
+    }
+    function findCycle(startNode) {
+        const queue = [[startNode, [startNode]]];
+        const cycleVisited = new Set();
+        const cycles = [];
+        while (queue.length) {
+            const [id, cycle] = queue.shift();
+            const nodes = graph.get(id);
+            if (!nodes)
+                continue;
+            for (const to of nodes) {
+                if (to === startNode) {
+                    cycleVisited.add(to);
+                    cycles.push([...cycle]);
+                    continue;
+                }
+                if (visited.has(to) || cycleVisited.has(to)) {
+                    continue;
+                }
+                cycleVisited.add(to);
+                queue.push([to, [...cycle, to]]);
+            }
+        }
+        if (!cycles.length) {
+            return [];
+        }
+        cycles.sort((a, b) => b.length - a.length);
+        return cycles[0];
+    }
+}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.46.3";
+export declare const version = "5.46.5";

package/dist/version.js

@@ -1 +1 @@
-export const version = '5.46.3';
+export const version = '5.46.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "5.46.3",
+  "version": "5.46.5",
   "description": "Find and fix unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://knip.dev",
   "repository": {
@@ -62,7 +62,7 @@
     "@nodelib/fs.walk": "3.0.1",
     "@snyk/github-codeowners": "1.1.0",
     "easy-table": "1.2.0",
-    "enhanced-resolve": "^5.18.0",
+    "enhanced-resolve": "^5.18.1",
     "fast-glob": "^3.3.3",
     "jiti": "^2.4.2",
     "js-yaml": "^4.1.0",
@@ -83,7 +83,7 @@
   "devDependencies": {
     "@jest/types": "^29.6.3",
     "@release-it/bumper": "^7.0.2",
-    "@types/bun": "1.2.4",
+    "@types/bun": "1.2.8",
     "@types/js-yaml": "^4.0.9",
     "@types/minimist": "^1.2.5",
     "@types/picomatch": "3.0.1",