knip 6.3.0 → 6.3.1

package/dist/DependencyDeputy.js

@@ -187,12 +187,12 @@ export class DependencyDeputy {
             const referencedDependencies = this.referencedDependencies.get(workspace);
             const hasTypesIncluded = this.getHasTypesIncluded(workspace);
             const peeker = new PackagePeeker(manifestStr);
-            const peerDepCount = {};
-            const isReferencedDependency = (dependency, isPeerDep) => {
+            const isReferencedDependency = (dependency, visited = new Set()) => {
                 if (referencedDependencies?.has(dependency))
                     return true;
-                if (isPeerDep && peerDepCount[dependency])
+                if (visited.has(dependency))
                     return false;
+                visited.add(dependency);
                 const [scope, typedDependency] = dependency.split('/');
                 if (scope === DT_SCOPE) {
                     const typedPackageName = getPackageFromDefinitelyTyped(typedDependency);
@@ -205,21 +205,15 @@ export class DependencyDeputy {
                         ...this.getHostDependenciesFor(workspace, typedPackageName),
                     ];
                     if (hostDependencies.length)
-                        return !!hostDependencies.find(host => isReferencedDependency(host.name, true));
+                        return !!hostDependencies.find(host => isReferencedDependency(host.name, visited));
                     if (!referencedDependencies?.has(dependency))
                         return false;
                     return referencedDependencies.has(typedPackageName);
                 }
                 const hostDependencies = this.getHostDependenciesFor(workspace, dependency);
-                for (const { name } of hostDependencies) {
-                    if (!peerDepCount[name])
-                        peerDepCount[name] = 1;
-                    else
-                        peerDepCount[name]++;
-                }
-                return hostDependencies.some(hostDependency => (isPeerDep === false || !hostDependency.isPeerOptional) && isReferencedDependency(hostDependency.name, true));
+                return hostDependencies.some(hostDependency => isReferencedDependency(hostDependency.name, visited));
             };
-            const isNotReferencedDependency = (dependency) => !isReferencedDependency(dependency, false);
+            const isNotReferencedDependency = (dependency) => !isReferencedDependency(dependency);
             for (const symbol of this.getProductionDependencies(workspace).filter(isNotReferencedDependency)) {
                 const position = peeker.getLocation('dependencies', symbol);
                 dependencyIssues.push({ type: 'dependencies', workspace, filePath, symbol, fixes: [], ...position });

package/dist/plugins/react-router/index.js

@@ -26,7 +26,7 @@ const resolveConfig = async (localConfig, options) => {
         routeConfig = await load(routesPathJs);
     }
     const mapRoute = (route) => {
-        return [join(appDir, route.file), ...(route.children ? route.children.flatMap(mapRoute) : [])];
+        return [toAbsolute(route.file, appDir), ...(route.children ? route.children.flatMap(mapRoute) : [])];
     };
     const routes = routeConfig
         .flatMap(mapRoute)

package/dist/typescript/visitors/calls.js

@@ -96,7 +96,7 @@ export function handleCallExpression(node, s) {
         }
         else if (arg.type === 'ObjectExpression') {
             for (const prop of arg.properties ?? []) {
-                if (prop.type === 'Property' && prop.shorthand && prop.value?.type === 'Identifier')
+                if (prop.type === 'Property' && !prop.computed && prop.value?.type === 'Identifier')
                     markRefIfNs(prop.value.name);
                 if (prop.type === 'SpreadElement' && prop.argument?.type === 'Identifier')
                     markRefIfNs(prop.argument.name);

package/dist/typescript/visitors/imports.js

@@ -160,18 +160,22 @@ export function handleVariableDeclarator(node, s) {
                         }
                     }
                 }
-                if (prop.type === 'Property' && prop.shorthand && prop.value?.type === 'Identifier') {
-                    const _import = s.localImportMap.get(prop.value.name);
+                if (prop.type === 'Property' &&
+                    !prop.computed &&
+                    prop.value?.type === 'Identifier' &&
+                    prop.key?.type === 'Identifier') {
+                    const nsName = prop.value.name;
+                    const _import = s.localImportMap.get(nsName);
                     if (_import?.isNamespace) {
                         const internalImport = s.internal.get(_import.filePath);
                         if (internalImport)
-                            internalImport.refs.add(prop.value.name);
-                        let set = s.shorthandNsContainers.get(aliasName);
-                        if (!set) {
-                            set = new Set();
-                            s.shorthandNsContainers.set(aliasName, set);
+                            internalImport.refs.add(nsName);
+                        let map = s.nsContainers.get(aliasName);
+                        if (!map) {
+                            map = new Map();
+                            s.nsContainers.set(aliasName, map);
                         }
-                        set.add(prop.value.name);
+                        map.set(prop.key.name, nsName);
                     }
                 }
             }

package/dist/typescript/visitors/members.js

@@ -130,8 +130,9 @@ export function handleMemberExpression(node, s) {
         node.object.object.type === 'Identifier' &&
         node.object.property.type === 'Identifier') {
         const containerName = node.object.object.name;
-        const nsName = node.object.property.name;
-        if (s.shorthandNsContainers.get(containerName)?.has(nsName)) {
+        const propKey = node.object.property.name;
+        const nsName = s.nsContainers.get(containerName)?.get(propKey);
+        if (nsName) {
             const _import = s.localImportMap.get(nsName);
             if (_import) {
                 const internalImport = s.internal.get(_import.filePath);
@@ -143,7 +144,7 @@ export function handleMemberExpression(node, s) {
                         memberName = getStringValue(node.property);
                     if (memberName) {
                         s.addNsMemberRefs(internalImport, nsName, memberName);
-                        s.accessedShorthandNs.add(`${containerName}.${nsName}`);
+                        s.accessedNsContainers.add(`${containerName}.${propKey}`);
                     }
                 }
             }

package/dist/typescript/visitors/walk.d.ts

@@ -46,8 +46,8 @@ export interface WalkState extends WalkContext {
     handledImportExpressions: Set<number>;
     bareExprRefs: Set<string>;
     accessedAliases: Set<string>;
-    shorthandNsContainers: Map<string, Set<string>>;
-    accessedShorthandNs: Set<string>;
+    nsContainers: Map<string, Map<string, string>>;
+    accessedNsContainers: Set<string>;
     chainedMemberExprs: WeakSet<object>;
     currentVarDeclStart: number;
     nsRanges: [number, number][];

package/dist/typescript/visitors/walk.js

@@ -641,8 +641,8 @@ export function walkAST(program, sourceText, filePath, ctx) {
         handledImportExpressions: new Set(),
         bareExprRefs: new Set(),
         accessedAliases: new Set(),
-        shorthandNsContainers: new Map(),
-        accessedShorthandNs: new Set(),
+        nsContainers: new Map(),
+        accessedNsContainers: new Set(),
         chainedMemberExprs: new WeakSet(),
         currentVarDeclStart: -1,
         nsRanges: [],
@@ -682,9 +682,9 @@ export function walkAST(program, sourceText, filePath, ctx) {
             }
         }
     }
-    for (const [containerName, nsSet] of state.shorthandNsContainers) {
-        for (const nsName of nsSet) {
-            if (!state.accessedShorthandNs.has(`${containerName}.${nsName}`)) {
+    for (const [containerName, propMap] of state.nsContainers) {
+        for (const [propKey, nsName] of propMap) {
+            if (!state.accessedNsContainers.has(`${containerName}.${propKey}`)) {
                 const _import = state.localImportMap.get(nsName);
                 if (_import) {
                     const internalImport = state.internal.get(_import.filePath);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.3.0";
+export declare const version = "6.3.1";

package/dist/version.js

@@ -1 +1 @@
-export const version = '6.3.0';
+export const version = '6.3.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "description": "Find and fix unused dependencies, exports and files in your TypeScript and JavaScript projects",
   "keywords": [
     "analysis",
@@ -118,7 +118,7 @@
     "test": "node scripts/run-test.ts",
     "test:node": "tsx --test test/*.test.ts test/**/*.test.ts",
     "test:bun": "bun test test/*.test.ts test/**/*.test.ts",
-    "test:smoke": "glob-bin -c \"tsx --test\" \"test/*.test.ts\" && glob-bin -c \"tsx --test\" \"test/{plugins,util}/*.test.ts\"",
+    "test:smoke": "glob-bin -c \"tsx --test\" \"test/*.test.ts\" && glob-bin -c \"tsx --test\" \"test/plugins/*.test.ts\" && glob-bin -c \"tsx --test\" \"test/util/*.test.ts\"",
     "test:bun:smoke": "bun test test/*.test.ts test/{plugins,util}/*.test.ts",
     "watch": "npm link && tsc --watch",
     "prebuild": "pnpm run generate-plugin-defs && node rmdir.js dist",