knip 2.19.5 → 2.19.7

package/dist/ProjectPrincipal.d.ts

@@ -58,6 +58,7 @@ export declare class ProjectPrincipal {
     };
     findUnusedMembers(filePath: string, members: ExportItemMember[]): string[];
     private findReferences;
-    isPublicExport(exportedItem: ExportItem): ts.JSDocPublicTag | undefined;
+    isPublicExport(exportedItem: ExportItem): boolean;
+    getJSDocTags(exportedItem: ExportItem): string[];
 }
 export {};

package/dist/ProjectPrincipal.js

@@ -195,6 +195,10 @@ export class ProjectPrincipal {
         return this.backend.lsFindReferences(filePath, node.getStart()) ?? [];
     }
     isPublicExport(exportedItem) {
-        return ts.getJSDocPublicTag(exportedItem.node);
+        const tags = this.getJSDocTags(exportedItem);
+        return tags.includes('@public');
+    }
+    getJSDocTags(exportedItem) {
+        return ts.getJSDocTags(exportedItem.node).map(node => node.getText().match(/@\S+/)[0]);
     }
 }

package/dist/binaries/bash-parser.js

@@ -1,51 +1,55 @@
-import parse from '@ericcornelissen/bash-parser';
+import Parser from 'tree-sitter';
+import Bash from 'tree-sitter-bash';
 import { debugLogObject } from '../util/debug.js';
 import * as FallbackResolver from './resolvers/fallback.js';
 import * as KnownResolvers from './resolvers/index.js';
 import { stripBinaryPath } from './util.js';
+const parser = new Parser();
+parser.setLanguage(Bash);
+const getCommandsFromScript = (script) => {
+    const tree = parser.parse(script);
+    const commands = [];
+    const traverse = (node) => {
+        switch (node.type) {
+            case 'command': {
+                const commandNameIndex = node.children.findIndex(node => node.type === 'command_name');
+                const command = node.children.slice(commandNameIndex).map(node => node.text);
+                commands.push(command);
+                break;
+            }
+            default:
+                break;
+        }
+        for (const child of node.children) {
+            traverse(child);
+        }
+    };
+    traverse(tree.rootNode);
+    return commands;
+};
 export const getBinariesFromScript = (script, { cwd, manifest, knownGlobalsOnly = false }) => {
     if (!script)
         return [];
     const fromArgs = (args) => getBinariesFromScript(args.filter(arg => arg !== '--').join(' '), { cwd, manifest });
-    const getBinariesFromNodes = (nodes) => nodes.flatMap(node => {
-        switch (node.type) {
-            case 'Command': {
-                const binary = node.name?.text ? stripBinaryPath(node.name.text) : node.name?.text;
-                const commandExpansions = node.prefix?.flatMap(prefix => prefix.expansion?.filter(expansion => expansion.type === 'CommandExpansion') ?? []) ?? [];
-                if (commandExpansions.length > 0) {
-                    return commandExpansions.flatMap(expansion => getBinariesFromNodes(expansion.commandAST.commands)) ?? [];
-                }
-                if (!binary || binary === '.' || binary === 'source')
-                    return [];
-                if (binary.startsWith('-') || binary.startsWith('"') || binary.startsWith('..'))
-                    return [];
-                if (['bun', 'deno'].includes(binary))
-                    return [];
-                const args = node.suffix?.map(arg => arg.text) ?? [];
-                if (['!', 'test'].includes(binary))
-                    return fromArgs(args);
-                if (binary in KnownResolvers) {
-                    return KnownResolvers[binary].resolve(binary, args, { cwd, manifest, fromArgs });
-                }
-                if (knownGlobalsOnly)
-                    return [];
-                return FallbackResolver.resolve(binary, args, { cwd, manifest, fromArgs });
-            }
-            case 'LogicalExpression':
-                return getBinariesFromNodes([node.left, node.right]);
-            case 'If':
-                return getBinariesFromNodes([...node.clause.commands, ...node.then.commands, ...(node.else?.commands ?? [])]);
-            case 'For':
-                return getBinariesFromNodes(node.do.commands);
-            case 'CompoundList':
-                return getBinariesFromNodes(node.commands);
-            default:
-                return [];
+    const commands = getCommandsFromScript(script);
+    const getBinariesFromCommand = (command) => {
+        const [bin, ...args] = command;
+        const binary = stripBinaryPath(bin);
+        if (!binary || binary === '.' || binary === 'source')
+            return [];
+        if (binary.startsWith('-') || binary.startsWith('"') || binary.startsWith('..'))
+            return [];
+        if (['bun', 'deno'].includes(binary))
+            return [];
+        if (binary in KnownResolvers) {
+            return KnownResolvers[binary].resolve(binary, args, { cwd, manifest, fromArgs });
         }
-    });
+        if (knownGlobalsOnly)
+            return [];
+        return FallbackResolver.resolve(binary, args, { cwd, manifest, fromArgs });
+    };
     try {
-        const parsed = parse(script);
-        return parsed?.commands ? getBinariesFromNodes(parsed.commands) : [];
+        return commands.map(getBinariesFromCommand).flat();
     }
     catch (error) {
         debugLogObject('Bash parser error', error);

package/dist/binaries/resolvers/npx.js

@@ -1,5 +1,6 @@
 import parseArgs from 'minimist';
 import { isInternal } from '../../util/path.js';
+import { stripQuotes } from '../../util/string.js';
 import { getBinariesFromScript } from '../bash-parser.js';
 import { argsFrom, stripVersionFromSpecifier, toBinary } from '../util.js';
 export const resolve = (binary, args, { cwd, fromArgs, manifest }) => {
@@ -10,7 +11,7 @@ export const resolve = (binary, args, { cwd, fromArgs, manifest }) => {
     const packageSpecifier = parsed._[0];
     const specifier = packageSpecifier ? stripVersionFromSpecifier(packageSpecifier) : '';
     const packages = parsed.package ? [parsed.package].flat().map(stripVersionFromSpecifier) : [];
-    const command = parsed.call ? getBinariesFromScript(parsed.call, { cwd, manifest }) : [];
+    const command = parsed.call ? getBinariesFromScript(stripQuotes(parsed.call), { cwd, manifest }) : [];
     const restArgs = argsFrom(args, packageSpecifier);
     const dependencies = manifest ? Object.keys({ ...manifest.dependencies, ...manifest.devDependencies }) : [];
     const isBinary = specifier && !packageSpecifier.includes('@') && !isInternal(specifier) && !dependencies.includes(specifier);

package/dist/binaries/resolvers/pnpm.js

@@ -2,38 +2,54 @@ import parseArgs from 'minimist';
 import { toBinary } from '../util.js';
 const commands = [
     'add',
+    'audit',
+    'bin',
+    'config',
     'dedupe',
+    'deploy',
     'dlx',
-    'run',
+    'doctor',
+    'env',
+    'fetch',
     'i',
-    'install',
-    'up',
-    'update',
-    'upgrade',
-    'remove',
-    'rm',
-    'uninstall',
-    'un',
-    'link',
-    'ln',
-    'unlink',
     'import',
-    'rebuild',
-    'rb',
-    'prune',
-    'fetch',
+    'init',
     'install-test',
+    'install',
     'it',
-    'patch',
-    'patch-commit',
-    'audit',
+    'licenses',
+    'link',
     'list',
+    'ln',
     'ls',
     'outdated',
-    'why',
-    'test',
+    'outdated',
+    'pack',
+    'patch-commit',
+    'patch-remove',
+    'patch',
+    'prune',
+    'publish',
+    'rb',
+    'rebuild',
+    'remove',
+    'rm',
+    'root',
+    'run',
+    'server',
+    'setup',
+    'start',
+    'store',
     't',
+    'test',
     'tst',
+    'un',
+    'uninstall',
+    'unlink',
+    'up',
+    'update',
+    'upgrade',
+    'why',
 ];
 export const resolve = (_binary, args, { manifest }) => {
     const scripts = manifest.scripts ? Object.keys(manifest.scripts) : [];

package/dist/binaries/resolvers/rollup.js

@@ -1,10 +1,11 @@
 import parseArgs from 'minimist';
 import { compact } from '../../util/array.js';
+import { stripQuotes } from '../../util/string.js';
 import { toBinary, tryResolveSpecifiers } from '../util.js';
 export const resolve = (binary, args, { cwd, fromArgs }) => {
     const safeArgs = args.filter(arg => arg !== '--watch');
     const parsed = parseArgs(safeArgs, { alias: { plugin: 'p' } });
-    const watchers = parsed.watch ? fromArgs(Object.values(parsed.watch)) : [];
+    const watchers = parsed.watch ? fromArgs(Object.values(parsed.watch).map(value => stripQuotes(value))) : [];
     const plugins = parsed.plugin ? tryResolveSpecifiers(cwd, [parsed.plugin].flat()) : [];
     const configPlugins = parsed.configPlugin ? tryResolveSpecifiers(cwd, [parsed.configPlugin].flat()) : [];
     return compact([toBinary(binary), ...watchers, ...plugins, ...configPlugins]);

package/dist/binaries/resolvers/yarn.js

@@ -14,8 +14,8 @@ const commands = [
     'install',
     'link',
     'pack',
-    'patch',
     'patch-commit',
+    'patch',
     'plugin',
     'rebuild',
     'remove',
@@ -25,8 +25,8 @@ const commands = [
     'unlink',
     'unplug',
     'up',
-    'upgrade',
     'upgrade-interactive',
+    'upgrade',
     'version',
     'why',
     'workspace',

package/dist/constants.js

@@ -13,6 +13,7 @@ export const IGNORED_GLOBAL_BINARIES = [
     'cd',
     'cp',
     'deno',
+    'dirname',
     'echo',
     'exec',
     'exit',
@@ -28,6 +29,7 @@ export const IGNORED_GLOBAL_BINARIES = [
     'rm',
     'sh',
     'sudo',
+    'test',
     'true',
     'yarn',
 ];

package/dist/index.js

@@ -267,7 +267,8 @@ export const main = async (unresolvedConfiguration) => {
                     continue;
                 const importedModule = importedSymbols.get(filePath);
                 for (const [symbol, exportedItem] of exportItems.entries()) {
-                    if (principal.isPublicExport(exportedItem))
+                    const jsDocTags = principal.getJSDocTags(exportedItem);
+                    if (jsDocTags.includes('@public') || jsDocTags.includes('@beta'))
                         continue;
                     if (importedModule?.symbols.has(symbol)) {
                         if (importedModule.isReExport && isExportedInEntryFile(importedModule))

package/dist/typescript/ast-helpers.d.ts

@@ -18,7 +18,6 @@ type LiteralLikeElementAccessExpression = ts.ElementAccessExpression & ts.Declar
 export declare function isModuleExportsAccessExpression(node: ts.Node): node is LiteralLikeElementAccessExpression & {
     expression: ts.Identifier;
 };
-export declare function stripQuotes(name: string): string;
 export declare function findAncestor<T>(node: ts.Node | undefined, callback: (element: ts.Node) => boolean | 'STOP'): T | undefined;
 export declare function findDescendants<T>(node: ts.Node | undefined, callback: (element: ts.Node) => boolean | 'STOP'): T[];
 export declare const isDeclarationFileExtension: (extension: string) => boolean;

package/dist/typescript/ast-helpers.js

@@ -1,4 +1,5 @@
 import ts from 'typescript';
+import { stripQuotes } from '../util/string.js';
 export function isValidImportTypeNode(node) {
     return ts.isImportTypeNode(node);
 }
@@ -39,24 +40,6 @@ export function isModuleExportsAccessExpression(node) {
         node.expression.escapedText === 'module' &&
         getAccessExpressionName(node) === 'exports');
 }
-export function stripQuotes(name) {
-    const length = name.length;
-    if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && isQuoteOrBacktick(name.charCodeAt(0))) {
-        return name.substring(1, length - 1);
-    }
-    return name;
-}
-var CharacterCodes;
-(function (CharacterCodes) {
-    CharacterCodes[CharacterCodes["backtick"] = 96] = "backtick";
-    CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
-    CharacterCodes[CharacterCodes["singleQuote"] = 39] = "singleQuote";
-})(CharacterCodes || (CharacterCodes = {}));
-function isQuoteOrBacktick(charCode) {
-    return (charCode === CharacterCodes.singleQuote ||
-        charCode === CharacterCodes.doubleQuote ||
-        charCode === CharacterCodes.backtick);
-}
 export function findAncestor(node, callback) {
     node = node?.parent;
     while (node) {

package/dist/typescript/visitors/exports/exportKeyword.js

@@ -1,7 +1,8 @@
 import ts from 'typescript';
 import { SymbolType } from '../../../types/issues.js';
 import { compact } from '../../../util/array.js';
-import { isPrivateMember, stripQuotes } from '../../ast-helpers.js';
+import { stripQuotes } from '../../../util/string.js';
+import { isPrivateMember } from '../../ast-helpers.js';
 import { exportVisitor as visit } from '../index.js';
 export default visit(() => true, node => {
     const modifierKinds = node.modifiers?.map(modifier => modifier.kind) ?? [];

package/dist/typescript/visitors/exports/moduleExportsAccessExpression.js

@@ -1,6 +1,7 @@
 import ts from 'typescript';
 import { SymbolType } from '../../../types/issues.js';
-import { isModuleExportsAccessExpression, stripQuotes } from '../../ast-helpers.js';
+import { stripQuotes } from '../../../util/string.js';
+import { isModuleExportsAccessExpression } from '../../ast-helpers.js';
 import { isJS } from '../helpers.js';
 import { exportVisitor as visit } from '../index.js';
 export default visit(isJS, node => {

package/dist/typescript/visitors/scripts/execa.js

@@ -1,9 +1,11 @@
 import ts from 'typescript';
-import { stripQuotes } from '../../ast-helpers.js';
+import { stripQuotes } from '../../../util/string.js';
 import { scriptVisitor as visit } from '../index.js';
 export default visit(sourceFile => sourceFile.statements.some(statementImportsExeca$), node => {
-    if (ts.isTaggedTemplateExpression(node) && node.tag.getText() === '$') {
-        return stripQuotes(node.template.getText());
+    if (ts.isTaggedTemplateExpression(node)) {
+        if (node.tag.getText() === '$' || (ts.isCallExpression(node.tag) && node.tag.expression.getText() === '$')) {
+            return stripQuotes(node.template.getText());
+        }
     }
 });
 function statementImportsExeca$(node) {

package/dist/typescript/visitors/scripts/zx.js

@@ -1,5 +1,5 @@
 import ts from 'typescript';
-import { stripQuotes } from '../../ast-helpers.js';
+import { stripQuotes } from '../../../util/string.js';
 import { scriptVisitor as visit } from '../index.js';
 export default visit(sourceFile => ts.getShebang(sourceFile.text) === '#!/usr/bin/env zx', node => {
     if (ts.isTaggedTemplateExpression(node) && node.tag.getText() === '$') {

package/dist/util/string.d.ts

@@ -0,0 +1 @@
+export declare function stripQuotes(name: string): string;

package/dist/util/string.js

@@ -0,0 +1,18 @@
+export function stripQuotes(name) {
+    const length = name.length;
+    if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && isQuoteOrBacktick(name.charCodeAt(0))) {
+        return name.substring(1, length - 1);
+    }
+    return name;
+}
+var CharacterCodes;
+(function (CharacterCodes) {
+    CharacterCodes[CharacterCodes["backtick"] = 96] = "backtick";
+    CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
+    CharacterCodes[CharacterCodes["singleQuote"] = 39] = "singleQuote";
+})(CharacterCodes || (CharacterCodes = {}));
+function isQuoteOrBacktick(charCode) {
+    return (charCode === CharacterCodes.singleQuote ||
+        charCode === CharacterCodes.doubleQuote ||
+        charCode === CharacterCodes.backtick);
+}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.19.5";
+export declare const version = "2.19.7";

package/dist/version.js

@@ -1 +1 @@
-export const version = '2.19.5';
+export const version = '2.19.7';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "2.19.5",
+  "version": "2.19.7",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://github.com/webpro/knip",
   "repository": "github:webpro/knip",
@@ -42,35 +42,36 @@
     "schema.json"
   ],
   "dependencies": {
-    "@ericcornelissen/bash-parser": "^0.5.2",
     "@npmcli/map-workspaces": "^3.0.4",
     "@snyk/github-codeowners": "^1.1.0",
     "chalk": "^5.2.0",
     "easy-table": "^1.2.0",
     "fast-glob": "^3.2.12",
     "globby": "^13.1.3",
-    "jiti": "1.19.1",
+    "jiti": "^1.19.3",
     "js-yaml": "^4.1.0",
     "micromatch": "^4.0.5",
     "minimist": "^1.2.8",
     "pretty-ms": "^8.0.0",
     "strip-json-comments": "^5.0.0",
     "summary": "^2.1.0",
+    "tree-sitter": "0.20.5",
+    "tree-sitter-bash": "0.20.0",
     "typescript": "^5.0.2",
-    "zod": "^3.20.6",
-    "zod-validation-error": "1.3.1"
+    "zod": "^3.22.2",
+    "zod-validation-error": "^1.5.0"
   },
   "devDependencies": {
     "@jest/types": "29.6.1",
     "@npmcli/package-json": "5.0.0",
     "@release-it/bumper": "5.1.0",
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.77",
+    "@swc/core": "1.3.78",
     "@types/eslint": "8.44.2",
     "@types/js-yaml": "4.0.5",
     "@types/micromatch": "4.0.2",
     "@types/minimist": "1.2.2",
-    "@types/node": "20.5.0",
+    "@types/node": "20.5.1",
     "@types/npmcli__map-workspaces": "3.0.1",
     "@types/webpack": "5.28.1",
     "@typescript-eslint/eslint-plugin": "6.4.0",
@@ -78,7 +79,7 @@
     "c8": "8.0.1",
     "eslint": "8.47.0",
     "eslint-import-resolver-typescript": "3.6.0",
-    "eslint-plugin-import": "2.28.0",
+    "eslint-plugin-import": "2.28.1",
     "eslint-plugin-n": "16.0.1",
     "prettier": "3.0.2",
     "release-it": "16.1.5",