knip 2.24.0 → 2.25.0

package/README.md

@@ -799,7 +799,7 @@ Special thanks to the wonderful people who have contributed to this project:
 [7]: #jsdoc-tags
 [8]: https://labs.openai.com/s/xZQACaLepaKya0PRUPtIN5dC
 [9]: ./assets/cow-with-orange-scissors-van-gogh-style.webp
-[10]: https://discord.gg/ya5yktTq
+[10]: https://discord.gg/r5uXTtbTpc
 [11]: https://twitter.com/webprolific
 [12]: https://fosstodon.org/@webpro
 [13]: https://github.com/webpro/knip/issues

package/dist/ProjectPrincipal.js

@@ -178,7 +178,7 @@ export class ProjectPrincipal {
     findUnusedMembers(filePath, members) {
         return members
             .filter(member => {
-            if (getJSDocTags(member.node).includes('@public'))
+            if (getJSDocTags(member.node).has('@public'))
                 return false;
             const referencedSymbols = this.findReferences(filePath, member.pos);
             const files = referencedSymbols

package/dist/binaries/resolvers/index.d.ts

@@ -3,6 +3,7 @@ export * as dotenv from './dotenv.js';
 export * as node from './node.js';
 export * as nodemon from './nodemon.js';
 export * as npx from './npx.js';
+export * as nx from './nx.js';
 export * as pnpm from './pnpm.js';
 export * as rollup from './rollup.js';
 export * as yarn from './yarn.js';

package/dist/binaries/resolvers/index.js

@@ -3,6 +3,7 @@ export * as dotenv from './dotenv.js';
 export * as node from './node.js';
 export * as nodemon from './nodemon.js';
 export * as npx from './npx.js';
+export * as nx from './nx.js';
 export * as pnpm from './pnpm.js';
 export * as rollup from './rollup.js';
 export * as yarn from './yarn.js';

package/dist/binaries/resolvers/nx.d.ts

@@ -0,0 +1,2 @@
+import type { Resolver } from '../types.js';
+export declare const resolve: Resolver;

package/dist/binaries/resolvers/nx.js

@@ -0,0 +1,9 @@
+import parseArgs from 'minimist';
+import { toBinary } from '../util.js';
+export const resolve = (binary, args, { fromArgs }) => {
+    const parsed = parseArgs(args);
+    const [command] = parsed._;
+    if (command === 'exec')
+        return [toBinary(binary), ...fromArgs(parsed._.slice(1))];
+    return [toBinary(binary)];
+};

package/dist/index.js

@@ -278,9 +278,9 @@ export const main = async (unresolvedConfiguration) => {
                     continue;
                 const importingModule = importedSymbols.get(filePath);
                 for (const [symbol, exportedItem] of exportItems.entries()) {
-                    if (exportedItem.jsDocTags.includes('@public') || exportedItem.jsDocTags.includes('@beta'))
+                    if (exportedItem.jsDocTags.has('@public') || exportedItem.jsDocTags.has('@beta'))
                         continue;
-                    if (isIgnoreInternal && exportedItem.jsDocTags.includes('@internal'))
+                    if (isIgnoreInternal && exportedItem.jsDocTags.has('@internal'))
                         continue;
                     if (importingModule && isSymbolImported(symbol, importingModule)) {
                         if (importingModule.isReExport && isExportedInEntryFile(importingModule))

package/dist/plugins/jest/index.js

@@ -62,7 +62,8 @@ const findJestDependencies = async (configFilePath, { cwd, manifest }) => {
         config = await config();
     if (!config)
         return [];
-    const replaceRootDir = (name) => name.includes('<rootDir>') ? join(cwd, name.replace(/^.*<rootDir>/, '')) : name;
+    const rootDir = config.rootDir ?? '';
+    const replaceRootDir = (name) => name.includes('<rootDir>') ? join(cwd, name.replace(/^.*<rootDir>/, rootDir)) : name;
     return resolveDependencies(config).map(replaceRootDir);
 };
 export const findDependencies = timerify(findJestDependencies);

package/dist/plugins/next/index.js

@@ -3,9 +3,17 @@ export const NAME = 'Next.js';
 export const ENABLERS = ['next'];
 export const isEnabled = ({ dependencies }) => hasDependency(dependencies, ENABLERS);
 export const ENTRY_FILE_PATTERNS = ['next.config.{js,ts,cjs,mjs}'];
-export const PRODUCTION_ENTRY_FILE_PATTERNS = [
-    '{app,pages}/**/*.{js,jsx,ts,tsx}',
-    'src/{app,pages}/**/*.{js,jsx,ts,tsx}',
+const productionEntryFilePatternsWithoutSrc = [
     'middleware.{js,ts}',
-    'src/middleware.{js,ts}',
+    'app/**/route.{js,ts}',
+    'app/**/{error,layout,loading,not-found,page,template}.{js,jsx,tsx}',
+    'instrumentation.{js,ts}',
+    'app/{manifest,sitemap,robots}.{js,ts}',
+    'app/**/{icon,apple-icon}-image.{js,ts,tsx}',
+    'app/**/{opengraph,twitter}-image.{js,ts,tsx}',
+    'pages/**/*.{js,jsx,ts,tsx}',
+];
+export const PRODUCTION_ENTRY_FILE_PATTERNS = [
+    ...productionEntryFilePatternsWithoutSrc,
+    ...productionEntryFilePatternsWithoutSrc.map(pattern => `src/${pattern}`),
 ];

package/dist/plugins/typescript/index.js

@@ -1,3 +1,4 @@
+import ts from 'typescript';
 import { compact } from '../../util/array.js';
 import { dirname, isInternal, toAbsolute } from '../../util/path.js';
 import { timerify } from '../../util/Performance.js';
@@ -21,21 +22,23 @@ const resolveExtensibleConfig = async (configFilePath) => {
     }
     return config;
 };
+const jsxWithReact = [ts.JsxEmit.React, ts.JsxEmit.ReactJSX, ts.JsxEmit.ReactJSXDev, ts.JsxEmit.ReactNative];
 const findTypeScriptDependencies = async (configFilePath) => {
     const compilerOptions = await loadTSConfig(configFilePath);
     const config = await resolveExtensibleConfig(configFilePath);
     if (!compilerOptions || !config)
         return [];
     const extend = config.extends ? [config.extends].flat().filter(extend => !isInternal(extend)) : [];
+    const types = compilerOptions.types ?? [];
     const plugins = Array.isArray(compilerOptions?.plugins)
         ? compilerOptions.plugins.map(plugin => (typeof plugin === 'object' && 'name' in plugin ? plugin.name : ''))
         : [];
     const importHelpers = compilerOptions?.importHelpers ? ['tslib'] : [];
     const jsx = compilerOptions?.jsxImportSource
         ? [compilerOptions.jsxImportSource]
-        : compilerOptions?.jsx
+        : compilerOptions?.jsx && jsxWithReact.includes(compilerOptions.jsx)
             ? ['react']
             : [];
-    return compact([...extend, ...plugins, ...importHelpers, ...jsx]);
+    return compact([...extend, ...types, ...plugins, ...importHelpers, ...jsx]);
 };
 export const findDependencies = timerify(findTypeScriptDependencies);

package/dist/types/exports.d.ts

@@ -7,7 +7,7 @@ export type ExportItem = {
     pos: number;
     type: SymbolType;
     members?: ExportItemMember[];
-    jsDocTags?: string[];
+    jsDocTags?: Set<string>;
 };
 export type ExportItemMember = {
     node: ts.Node;

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

@@ -10,7 +10,7 @@ export declare function isDefaultImport(node: ts.ImportDeclaration | ts.ImportEq
 export declare function isAccessExpression(node: ts.Node): node is ts.PropertyAccessExpression | ts.ElementAccessExpression;
 export declare function isImportCall(node: ts.Node): node is ts.ImportCall;
 export declare function isRequireCall(callExpression: ts.Node): callExpression is ts.CallExpression;
-export declare function isRequireResolveCall(node: ts.Node): node is ts.CallExpression;
+export declare function isPropertyAccessCall(node: ts.Node, identifier: string): node is ts.CallExpression;
 export declare function getAccessExpressionName(node: ts.PropertyAccessExpression | ts.ElementAccessExpression): string;
 type LiteralLikeElementAccessExpression = ts.ElementAccessExpression & ts.Declaration & {
     readonly argumentExpression: ts.StringLiteralLike | ts.NumericLiteral;
@@ -23,5 +23,5 @@ export declare function findAncestor<T>(node: ts.Node | undefined, callback: (el
 export declare function findDescendants<T>(node: ts.Node | undefined, callback: (element: ts.Node) => boolean | 'STOP'): T[];
 export declare const isDeclarationFileExtension: (extension: string) => boolean;
 export declare const isInModuleBlock: (node: ts.Node) => boolean;
-export declare const getJSDocTags: (node: ts.Node) => string[];
+export declare const getJSDocTags: (node: ts.Node) => Set<string>;
 export {};

package/dist/typescript/ast-helpers.js

@@ -25,10 +25,10 @@ export function isRequireCall(callExpression) {
     }
     return args.length === 1;
 }
-export function isRequireResolveCall(node) {
+export function isPropertyAccessCall(node, identifier) {
     return (ts.isCallExpression(node) &&
         ts.isPropertyAccessExpression(node.expression) &&
-        node.expression.getText() === 'require.resolve');
+        node.expression.getText() === identifier);
 }
 export function getAccessExpressionName(node) {
     return 'argumentExpression' in node ? stripQuotes(node.argumentExpression.getText()) : node.name.getText();
@@ -98,4 +98,12 @@ export const isInModuleBlock = (node) => {
     }
     return false;
 };
-export const getJSDocTags = (node) => ts.getJSDocTags(node).map(node => node.getText().match(/@\S+/)[0]);
+export const getJSDocTags = (node) => {
+    const tags = new Set();
+    for (const tagNode of ts.getJSDocTags(node)) {
+        const match = tagNode.getText()?.match(/@\S+/);
+        if (match)
+            tags.add(match[0]);
+    }
+    return tags;
+};

package/dist/typescript/getImportsAndExports.js

@@ -1,4 +1,6 @@
+import { existsSync } from 'node:fs';
 import { isBuiltin } from 'node:module';
+import { resolve, dirname } from 'node:path';
 import ts from 'typescript';
 import { getOrSet } from '../util/map.js';
 import { isMaybePackageName } from '../util/modules.js';
@@ -73,7 +75,13 @@ export const getImportsAndExports = (sourceFile, options) => {
             }
         }
         else {
-            unresolvedImports.add(specifier);
+            const filePath = resolve(dirname(sourceFile.fileName), specifier);
+            if (existsSync(filePath)) {
+                unresolvedImports.add(filePath);
+            }
+            else {
+                unresolvedImports.add(specifier);
+            }
         }
     };
     const maybeAddNamespaceAccessAsImport = ({ namespace, member }) => {
@@ -93,13 +101,13 @@ export const getImportsAndExports = (sourceFile, options) => {
         if (exports.has(identifier)) {
             const item = exports.get(identifier);
             const crew = [...item.members, ...members];
-            const tags = [...item.jsDocTags, ...jsDocTags];
+            const tags = new Set([...item.jsDocTags, ...jsDocTags]);
             exports.set(identifier, { ...item, node, type, pos, members: crew, jsDocTags: tags });
         }
         else {
             exports.set(identifier, { node, type, pos, members, jsDocTags });
         }
-        if (!jsDocTags.includes('@alias')) {
+        if (!jsDocTags.has('@alias')) {
             if (ts.isExportAssignment(node))
                 maybeAddAliasedExport(node.expression, 'default');
             if (ts.isVariableDeclaration(node))

package/dist/typescript/visitors/imports/index.js

@@ -3,16 +3,16 @@ import importCall from './importCall.js';
 import importDeclaration from './importDeclaration.js';
 import importEqualsDeclaration from './importEqualsDeclaration.js';
 import jsDocType from './jsDocType.js';
+import propertyAccessCall from './propertyAccessCall.js';
 import reExportDeclaration from './reExportDeclaration.js';
 import requireCall from './requireCall.js';
-import requireResolveCall from './requireResolveCall.js';
 const visitors = [
     importCall,
     importDeclaration,
     importEqualsDeclaration,
     jsDocType,
+    propertyAccessCall,
     reExportDeclaration,
     requireCall,
-    requireResolveCall,
 ];
 export default (sourceFile) => visitors.map(v => v(sourceFile));

package/dist/typescript/visitors/imports/{requireResolveCall.js → propertyAccessCall.js}

@@ -1,8 +1,8 @@
 import ts from 'typescript';
-import { isRequireResolveCall } from '../../ast-helpers.js';
+import { isPropertyAccessCall } from '../../ast-helpers.js';
 import { importVisitor as visit } from '../index.js';
 export default visit(() => true, node => {
-    if (isRequireResolveCall(node)) {
+    if (isPropertyAccessCall(node, 'require.resolve')) {
         if (node.arguments[0] && ts.isStringLiteralLike(node.arguments[0])) {
             const specifier = node.arguments[0].text;
             if (specifier)

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.24.0";
+export declare const version = "2.25.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = '2.24.0';
+export const version = '2.25.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://github.com/webpro/knip",
   "repository": "github:webpro/knip",
@@ -35,7 +35,7 @@
     "qa": "npm run lint && npm run build && npm run knip && npm run knip:production && npm test",
     "release": "release-it",
     "create-plugin": "tsx --no-warnings ./scripts/create-new-plugin.ts",
-    "postcreate-plugin": "prettier schema.json src/ConfigurationValidator.ts --write --config .prettierrc --loglevel silent"
+    "postcreate-plugin": "prettier schema.json src/ConfigurationValidator.ts --write --config .prettierrc --log-level silent"
   },
   "files": [
     "dist",
@@ -65,12 +65,12 @@
     "@npmcli/package-json": "5.0.0",
     "@release-it/bumper": "5.1.0",
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.84",
+    "@swc/core": "1.3.85",
     "@types/eslint": "8.44.2",
-    "@types/js-yaml": "4.0.5",
+    "@types/js-yaml": "4.0.6",
     "@types/micromatch": "4.0.2",
     "@types/minimist": "1.2.2",
-    "@types/node": "20.6.0",
+    "@types/node": "20.6.2",
     "@types/npmcli__map-workspaces": "3.0.1",
     "@types/webpack": "5.28.2",
     "@typescript-eslint/eslint-plugin": "6.7.0",
@@ -84,7 +84,7 @@
     "release-it": "16.1.5",
     "remark-cli": "11.0.0",
     "remark-preset-webpro": "0.0.3",
-    "tsx": "3.12.8",
+    "tsx": "3.12.10",
     "type-fest": "4.3.1"
   },
   "engines": {