knip 6.0.3 → 6.0.5

package/dist/graph/analyze.js

@@ -60,7 +60,7 @@ export const analyze = async ({ analyzedFiles, counselor, chief, collector, depu
                             if (isIgnored &&
                                 (isReferenced || isReferencedInUsedExport(exportedItem, filePath, isIncludeEntryExports))) {
                                 for (const tagName of exportedItem.jsDocTags) {
-                                    if (options.tags[1].includes(tagName.replace(/^@/, ''))) {
+                                    if (options.tags[1].includes(tagName)) {
                                         collector.addTagHint({ type: 'tag', filePath, identifier, tagName });
                                     }
                                 }
@@ -114,7 +114,7 @@ export const analyze = async ({ analyzedFiles, counselor, chief, collector, depu
                                             }
                                             else if (isIgnored) {
                                                 for (const tagName of exportedItem.jsDocTags) {
-                                                    if (options.tags[1].includes(tagName.replace(/^@/, ''))) {
+                                                    if (options.tags[1].includes(tagName)) {
                                                         collector.addTagHint({ type: 'tag', filePath, identifier: id, tagName });
                                                     }
                                                 }

package/dist/plugins/nx/index.js

@@ -45,7 +45,7 @@ const resolveConfig = async (localConfig, options) => {
             commands = [target.options.command];
         else if (target.options?.commands)
             commands = target.options.commands.map(commandConfig => typeof commandConfig === 'string' ? commandConfig : commandConfig.command);
-        const cwd = target.options?.cwd ? join(options.cwd, target.options.cwd) : undefined;
+        const cwd = target.options?.cwd ? join(options.cwd, target.options.cwd) : options.cwd;
         return options.getInputsFromScripts(commands, { cwd });
     });
     const configInputs = targets.flatMap(target => {

package/dist/reporters/trace.js

@@ -27,7 +27,11 @@ export default ({ graph, explorer, options, workspaceFilePathFilter }) => {
             console.log(line);
     }
     else {
-        const nodes = explorer.buildExportsTree({ filePath: options.traceFile, identifier: options.traceExport });
+        let nodes = explorer.buildExportsTree({ filePath: options.traceFile, identifier: options.traceExport });
+        if (nodes.length === 0 && options.traceExport?.includes('.')) {
+            const nsName = options.traceExport.substring(0, options.traceExport.indexOf('.'));
+            nodes = explorer.buildExportsTree({ filePath: options.traceFile, identifier: nsName });
+        }
         nodes.sort((a, b) => a.filePath.localeCompare(b.filePath) || a.identifier.localeCompare(b.identifier));
         const toRel = (path) => toRelative(path, options.cwd);
         const isReferenced = (node) => {
@@ -37,7 +41,18 @@ export default ({ graph, explorer, options, workspaceFilePathFilter }) => {
                 return true;
             return !!graph.get(node.filePath)?.exports.get(node.identifier)?.hasRefsInFile;
         };
-        for (const node of nodes)
-            console.log(formatTrace(node, toRel, isReferenced(node)));
+        for (const node of nodes) {
+            const exp = graph.get(node.filePath)?.exports.get(node.identifier);
+            let memberStatuses;
+            if (exp && exp.members.length > 0) {
+                memberStatuses = [];
+                for (const m of exp.members) {
+                    const id = `${node.identifier}.${m.identifier}`;
+                    const referenced = m.hasRefsInFile || explorer.isReferenced(node.filePath, id, { includeEntryExports: true })[0];
+                    memberStatuses.push({ identifier: m.identifier, referenced });
+                }
+            }
+            console.log(formatTrace(node, toRel, isReferenced(node), memberStatuses));
+        }
     }
 };

package/dist/types/module-graph.d.ts

@@ -47,7 +47,7 @@ export interface ExportMember extends Position {
     readonly identifier: Identifier;
     readonly type: SymbolType;
     readonly fix: Fix;
-    readonly jsDocTags: Tags;
+    jsDocTags: Tags;
     readonly flags: number;
     hasRefsInFile: boolean;
 }

package/dist/typescript/get-imports-and-exports.js

@@ -11,7 +11,7 @@ import { walkAST } from "./visitors/walk.js";
 const jsDocImportRe = /import\(\s*['"]([^'"]+)['"]\s*\)(?:\.(\w+))?/g;
 const jsDocImportTagRe = /@import\s+(?:\{[^}]*\}|\*\s+as\s+\w+)\s+from\s+['"]([^'"]+)['"]/g;
 const jsxImportSourceRe = /@jsxImportSource\s+(\S+)/;
-const referenceTypesRe = /\/\s*<reference\s+types\s*=\s*"([^"]+)"\s*\/>/;
+const referenceTypesRe = /\s*<reference\s+types\s*=\s*"([^"]+)"\s*\/>/;
 const envRe = /@(?:vitest|jest)-environment\s+(\S+)/g;
 const getImportsAndExports = (filePath, sourceText, resolveModule, options, ignoreExportsUsedInFile, skipExportsForFile, visitor, pluginCtx, cachedParseResult) => {
     const skipExports = skipExportsForFile || !options.isReportExports;
@@ -303,7 +303,7 @@ const getImportsAndExports = (filePath, sourceText, resolveModule, options, igno
             addImport(id, undefined, undefined, undefined, comment.start + results.index, modifiers);
         }
         if (comment.type === 'Line') {
-            const refMatch = ('/' + comment.value).match(referenceTypesRe);
+            const refMatch = comment.value.match(referenceTypesRe);
             if (refMatch) {
                 addImport(refMatch[1], undefined, undefined, undefined, comment.start, IMPORT_FLAGS.TYPE_ONLY);
             }

package/dist/typescript/visitors/helpers.js

@@ -1,6 +1,7 @@
 import { parseSync, rawTransferSupported, } from 'oxc-parser';
 import { DEFAULT_EXTENSIONS, FIX_FLAGS, SYMBOL_TYPE } from "../../constants.js";
 import { extname } from "../../util/path.js";
+import { EMPTY_TAGS } from "./jsdoc.js";
 const defaultParseOptions = {
     sourceType: 'unambiguous',
     experimentalRawTransfer: rawTransferSupported(),
@@ -57,6 +58,18 @@ export function extractNamespaceMembers(decl, options, lineStarts, getJSDocTags,
     const members = [];
     const addMember = (name, pos, stmtStart, stmtEnd) => {
         const fullName = prefix ? `${prefix}.${name}` : name;
+        const tags = getJSDocTags(stmtStart);
+        const existing = members.find(m => m.identifier === fullName);
+        if (existing) {
+            if (tags.size) {
+                if (existing.jsDocTags === EMPTY_TAGS)
+                    existing.jsDocTags = new Set(tags);
+                else
+                    for (const t of tags)
+                        existing.jsDocTags.add(t);
+            }
+            return;
+        }
         const { line, col } = getLineAndCol(lineStarts, pos);
         const fix = options.isFixExports
             ? [stmtStart, stmtEnd, FIX_FLAGS.OBJECT_BINDING | FIX_FLAGS.WITH_NEWLINE]
@@ -69,7 +82,7 @@ export function extractNamespaceMembers(decl, options, lineStarts, getJSDocTags,
             col,
             fix,
             hasRefsInFile: false,
-            jsDocTags: getJSDocTags(stmtStart),
+            jsDocTags: tags,
             flags: 0,
         });
     };

package/dist/typescript/visitors/members.js

@@ -37,13 +37,7 @@ export function handleMemberExpression(node, s) {
         else if (!shadowed) {
             const memberName = node.computed === false && node.property.type === 'Identifier' ? node.property.name : undefined;
             if (memberName) {
-                const exp = s.exports.get(localName);
-                if (exp) {
-                    for (const member of exp.members) {
-                        if (member.identifier === memberName)
-                            member.hasRefsInFile = true;
-                    }
-                }
+                s.memberRefsInFile.push(localName, memberName);
             }
         }
         const aliases = s.importAliases.get(localName);
@@ -95,15 +89,8 @@ export function handleMemberExpression(node, s) {
                 }
             }
             else {
-                const exp = s.exports.get(rootName);
-                if (exp && exp.members.length > 0) {
-                    const mid = node.object.property.name;
-                    const dottedName = `${mid}.${node.property.name}`;
-                    for (const member of exp.members) {
-                        if (member.identifier === mid || member.identifier === dottedName)
-                            member.hasRefsInFile = true;
-                    }
-                }
+                const mid = node.object.property.name;
+                s.memberRefsInFile.push(rootName, mid, rootName, `${mid}.${node.property.name}`);
             }
         }
     }
@@ -131,17 +118,10 @@ export function handleMemberExpression(node, s) {
                 }
             }
             else {
-                const exp = s.exports.get(rootName);
-                if (exp && exp.members.length > 0) {
-                    const a = node.object.object.property.name;
-                    const b = node.object.property.name;
-                    const c = node.property.name;
-                    const dottedName = `${a}.${b}.${c}`;
-                    for (const member of exp.members) {
-                        if (member.identifier === a || member.identifier === `${a}.${b}` || member.identifier === dottedName)
-                            member.hasRefsInFile = true;
-                    }
-                }
+                const a = node.object.object.property.name;
+                const b = node.object.property.name;
+                const c = node.property.name;
+                s.memberRefsInFile.push(rootName, a, rootName, `${a}.${b}`, rootName, `${a}.${b}.${c}`);
             }
         }
     }

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

@@ -51,6 +51,7 @@ export interface WalkState extends WalkContext {
     chainedMemberExprs: WeakSet<object>;
     currentVarDeclStart: number;
     nsRanges: [number, number][];
+    memberRefsInFile: string[];
     scopeDepth: number;
     scopeStarts: number[];
     scopeEnds: number[];

package/dist/typescript/visitors/walk.js

@@ -112,15 +112,48 @@ const _addLocalRef = (name, pos) => {
     if (!state.localImportMap.has(name) && !isShadowed(name, pos))
         state.localRefs.add(name);
 };
-const _addShadow = (name) => {
-    const i = state.scopeDepth - 1;
-    const range = [state.scopeStarts[i], state.scopeEnds[i]];
+const _addShadowRange = (name, range) => {
     const ranges = state.shadowScopes.get(name);
     if (ranges)
         ranges.push(range);
     else
         state.shadowScopes.set(name, [range]);
 };
+const _addShadow = (name) => {
+    const i = state.scopeDepth - 1;
+    _addShadowRange(name, [state.scopeStarts[i], state.scopeEnds[i]]);
+};
+const _collectBindingNames = (pattern, range) => {
+    if (!pattern)
+        return;
+    if (pattern.type === 'Identifier') {
+        _addShadowRange(pattern.name, range);
+    }
+    else if (pattern.type === 'ObjectPattern') {
+        for (const prop of pattern.properties ?? []) {
+            _collectBindingNames(prop.value ?? prop.argument, range);
+        }
+    }
+    else if (pattern.type === 'ArrayPattern') {
+        for (const el of pattern.elements ?? []) {
+            _collectBindingNames(el, range);
+        }
+    }
+    else if (pattern.type === 'AssignmentPattern') {
+        _collectBindingNames(pattern.left, range);
+    }
+    else if (pattern.type === 'RestElement') {
+        _collectBindingNames(pattern.argument, range);
+    }
+};
+const _addParamShadows = (params, body) => {
+    if (!body || !params)
+        return;
+    const range = [body.start, body.end];
+    const items = Array.isArray(params) ? params : params.items ?? params;
+    for (const param of items)
+        _collectBindingNames(param, range);
+};
 const coreVisitorObject = {
     BlockStatement(node) {
         state.scopeStarts[state.scopeDepth] = node.start;
@@ -143,6 +176,18 @@ const coreVisitorObject = {
             if (state.scopeDepth > 0)
                 _addShadow(node.id.name);
         }
+        _addParamShadows(node.params, node.body);
+    },
+    FunctionExpression(node) {
+        _addParamShadows(node.params, node.body);
+    },
+    ArrowFunctionExpression(node) {
+        _addParamShadows(node.params, node.body);
+    },
+    CatchClause(node) {
+        if (node.param?.type === 'Identifier' && node.body) {
+            _addShadowRange(node.param.name, [node.body.start, node.body.end]);
+        }
     },
     VariableDeclaration(node) {
         state.currentVarDeclStart = node.start;
@@ -196,6 +241,10 @@ const coreVisitorObject = {
         handleJSXMemberExpression(node, state);
     },
     ForInStatement(node) {
+        if (node.left.type === 'VariableDeclaration' && node.body) {
+            for (const decl of node.left.declarations)
+                _collectBindingNames(decl.id, [node.body.start, node.body.end]);
+        }
         if (node.right.type === 'Identifier' && !isShadowed(node.right.name, node.right.start)) {
             const _import = state.localImportMap.get(node.right.name);
             if (_import?.isNamespace) {
@@ -206,6 +255,10 @@ const coreVisitorObject = {
         }
     },
     ForOfStatement(node) {
+        if (node.left.type === 'VariableDeclaration' && node.body) {
+            for (const decl of node.left.declarations)
+                _collectBindingNames(decl.id, [node.body.start, node.body.end]);
+        }
         if (node.right.type === 'Identifier' && !isShadowed(node.right.name, node.right.start)) {
             const _import = state.localImportMap.get(node.right.name);
             if (_import?.isNamespace) {
@@ -242,16 +295,10 @@ const coreVisitorObject = {
                 }
             }
             else if (parts.length > 0) {
-                const exp = state.exports.get(rootName);
-                if (exp) {
-                    let path = '';
-                    for (const part of parts) {
-                        path = path ? `${path}.${part}` : part;
-                        for (const member of exp.members) {
-                            if (member.identifier === path)
-                                member.hasRefsInFile = true;
-                        }
-                    }
+                let path = '';
+                for (const part of parts) {
+                    path = path ? `${path}.${part}` : part;
+                    state.memberRefsInFile.push(rootName, path);
                 }
             }
         }
@@ -525,14 +572,7 @@ const localRefsVisitorObject = {
         if (left.type === 'Identifier') {
             const rootName = left.name;
             if (!state.localImportMap.has(rootName) && !isShadowed(rootName, left.start) && parts.length > 0) {
-                const exp = state.exports.get(rootName);
-                if (exp) {
-                    state.localRefs.add(rootName);
-                    for (const member of exp.members) {
-                        if (member.identifier === parts[0])
-                            member.hasRefsInFile = true;
-                    }
-                }
+                state.localRefs.add(rootName);
             }
         }
     },
@@ -606,6 +646,7 @@ export function walkAST(program, sourceText, filePath, ctx) {
         chainedMemberExprs: new WeakSet(),
         currentVarDeclStart: -1,
         nsRanges: [],
+        memberRefsInFile: [],
         scopeDepth: 0,
         scopeStarts: [],
         scopeEnds: [],
@@ -618,6 +659,16 @@ export function walkAST(program, sourceText, filePath, ctx) {
         isInNamespace: _isInNamespace,
     };
     ctx.visitor.visit(program);
+    for (let i = 0; i < state.memberRefsInFile.length; i += 2) {
+        const exp = state.exports.get(state.memberRefsInFile[i]);
+        if (exp) {
+            const id = state.memberRefsInFile[i + 1];
+            for (const member of exp.members) {
+                if (member.identifier === id)
+                    member.hasRefsInFile = true;
+            }
+        }
+    }
     for (const [aliasName, aliasSet] of state.importAliases) {
         if (!state.accessedAliases.has(aliasName)) {
             for (const alias of aliasSet) {

package/dist/util/load-tsconfig.js

@@ -3,7 +3,7 @@ import { parseTsconfig } from 'get-tsconfig';
 import stripJsonComments from 'strip-json-comments';
 import { isFile as _isFile } from "./fs.js";
 import { _syncGlob } from "./glob.js";
-import { dirname, isAbsolute, join } from "./path.js";
+import { dirname, isAbsolute, join, toAbsolute } from "./path.js";
 const hasGlobChar = (p) => p.includes('*') || p.includes('?');
 const hasExtension = (p) => {
     const last = p.lastIndexOf('/');
@@ -81,12 +81,10 @@ export const loadTSConfig = async (tsConfigFilePath) => {
             return { isFile: true, compilerOptions: {}, fileNames: [] };
         const dir = dirname(tsConfigFilePath);
         const compilerOptions = (config.compilerOptions ?? {});
-        if (compilerOptions.outDir && !isAbsolute(compilerOptions.outDir)) {
-            compilerOptions.outDir = join(dir, compilerOptions.outDir);
-        }
-        if (compilerOptions.rootDir && !isAbsolute(compilerOptions.rootDir)) {
-            compilerOptions.rootDir = join(dir, compilerOptions.rootDir);
-        }
+        if (compilerOptions.outDir)
+            compilerOptions.outDir = toAbsolute(compilerOptions.outDir, dir).replace(/\/+$/, '');
+        if (compilerOptions.rootDir)
+            compilerOptions.rootDir = toAbsolute(compilerOptions.rootDir, dir).replace(/\/+$/, '');
         if (compilerOptions.paths) {
             compilerOptions.pathsBasePath ??= dir;
         }

package/dist/util/tag.js

@@ -4,11 +4,11 @@ export const splitTags = (rawTags) => {
     return tags.reduce(([incl, excl], tag) => {
         const match = tag.match(/[a-zA-Z]+/);
         if (match)
-            (tag.startsWith('-') ? excl : incl).push(match[0]);
+            (tag.startsWith('-') ? excl : incl).push(`@${match[0]}`);
         return [incl, excl];
     }, [[], []]);
 };
-const hasTag = (tags, jsDocTags) => tags.some(tag => jsDocTags.has(`@${tag}`));
+const hasTag = (tags, jsDocTags) => tags.some(tag => jsDocTags.has(tag));
 export const shouldIgnore = (jsDocTags, tags) => {
     const [includeJSDocTags, excludeJSDocTags] = tags;
     if (includeJSDocTags.length > 0 && !hasTag(includeJSDocTags, jsDocTags))

package/dist/util/trace.d.ts

@@ -1,2 +1,6 @@
 import type { ExportsTreeNode } from '../graph-explorer/operations/build-exports-tree.ts';
-export declare const formatTrace: (node: ExportsTreeNode, toRelative: (path: string) => string, isReferenced: boolean) => string;
+export interface TraceMemberStatus {
+    identifier: string;
+    referenced: boolean;
+}
+export declare const formatTrace: (node: ExportsTreeNode, toRelative: (path: string) => string, isReferenced: boolean, memberStatuses?: TraceMemberStatus[]) => string;

package/dist/util/trace.js

@@ -1,5 +1,5 @@
 import pc from 'picocolors';
-export const formatTrace = (node, toRelative, isReferenced) => {
+export const formatTrace = (node, toRelative, isReferenced, memberStatuses) => {
     const lines = [];
     const file = pc.white;
     const id = pc.cyanBright;
@@ -41,5 +41,12 @@ export const formatTrace = (node, toRelative, isReferenced) => {
         const leafMarker = isReferenced ? ok(' ✓') : fail(' ✗');
         lines.push(`${dim('└── (no imports found)')}${leafMarker}`);
     }
+    if (memberStatuses && memberStatuses.length > 0) {
+        const parts = memberStatuses.map(m => {
+            const marker = m.referenced ? ok(' ✓') : fail(' ✗');
+            return `${id(m.identifier)}${marker}`;
+        });
+        lines.push(`${dim('    members: [')}${parts.join(dim(', '))}${dim(']')}`);
+    }
     return lines.join('\n');
 };

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.0.3";
+export declare const version = "6.0.5";

package/dist/version.js

@@ -1 +1 @@
-export const version = '6.0.3';
+export const version = '6.0.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "6.0.3",
+  "version": "6.0.5",
   "description": "Find and fix unused dependencies, exports and files in your TypeScript and JavaScript projects",
   "keywords": [
     "analysis",