knip 3.2.0 → 3.3.0

package/dist/ProjectPrincipal.js

@@ -172,7 +172,8 @@ export class ProjectPrincipal {
     }
     getHasReferences(filePath, exportedItem) {
         const hasReferences = { external: false, internal: false };
-        const symbolReferences = this.findReferences(filePath, exportedItem.pos).flatMap(f => f.references);
+        const pos = exportedItem.posDecl ?? exportedItem.pos;
+        const symbolReferences = this.findReferences(filePath, pos).flatMap(f => f.references);
         for (const reference of symbolReferences) {
             if (reference.fileName === filePath) {
                 if (!reference.isDefinition) {

package/dist/plugins/vitest/index.js

@@ -1,5 +1,5 @@
 import { compact } from '../../util/array.js';
-import { dirname, join, relative } from '../../util/path.js';
+import { dirname, isAbsolute, join, relative } from '../../util/path.js';
 import { timerify } from '../../util/Performance.js';
 import { hasDependency, load, tryResolve } from '../../util/plugin.js';
 import { toEntryPattern } from '../../util/protocols.js';
@@ -14,7 +14,7 @@ export const CONFIG_FILE_PATTERNS = [
 export const ENTRY_FILE_PATTERNS = ['**/*.{test,spec}.?(c|m)[jt]s?(x)'];
 const resolveEntry = (containingFilePath, specifier) => {
     const dir = dirname(containingFilePath);
-    const resolvedPath = tryResolve(join(dir, specifier), containingFilePath);
+    const resolvedPath = isAbsolute(specifier) ? specifier : tryResolve(join(dir, specifier), containingFilePath);
     if (resolvedPath)
         return toEntryPattern(relative(dir, resolvedPath));
     return specifier;
@@ -47,9 +47,11 @@ export const findVitestDependencies = async (configFilePath, localConfig, option
         }
         return Array.from(dependencies);
     }
+    const entry = localConfig.build?.lib?.entry ?? [];
+    const dependencies = (typeof entry === 'string' ? [entry] : Object.values(entry)).map(specifier => resolveEntry(configFilePath, specifier));
     if (!localConfig.test)
-        return [];
-    return findConfigDependencies(configFilePath, localConfig, options);
+        return dependencies;
+    return [...dependencies, ...findConfigDependencies(configFilePath, localConfig, options)];
 };
 const findVitestWorkspaceDependencies = async (configFilePath, options) => {
     const localConfig = await load(configFilePath);

package/dist/plugins/vitest/types.d.ts

@@ -12,7 +12,14 @@ interface VitestConfig {
     };
 }
 export interface ViteConfig extends VitestConfig {
-    plugins: unknown[];
+    plugins?: unknown[];
+    build?: {
+        lib?: {
+            entry: string | string[] | {
+                [entryAlias: string]: string;
+            };
+        };
+    };
 }
 export type COMMAND = 'dev' | 'serve' | 'build';
 export type MODE = 'development' | 'production';

package/dist/types/exports.d.ts

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

package/dist/typescript/SourceFile.d.ts

@@ -12,6 +12,7 @@ export interface BoundSourceFile extends ts.SourceFile {
     symbol?: SymbolWithExports;
     resolvedModules?: ts.ModeAwareCache<ts.ResolvedModuleWithFailedLookupLocations>;
     locals?: SymbolTable;
+    getNamedDeclarations?(): Map<string, readonly ts.Declaration[]>;
     scriptKind?: ts.ScriptKind;
     pragmas?: Map<string, PragmaMap | PragmaMap[]>;
 }

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

@@ -1,10 +1,4 @@
 import ts from 'typescript';
-interface ValidImportTypeNode extends ts.ImportTypeNode {
-    argument: ts.LiteralTypeNode & {
-        literal: ts.StringLiteral;
-    };
-}
-export declare function isValidImportTypeNode(node: ts.Node): node is ValidImportTypeNode;
 export declare function isGetOrSetAccessorDeclaration(node: ts.Node): node is ts.AccessorDeclaration;
 export declare function isPrivateMember(node: ts.MethodDeclaration | ts.PropertyDeclaration | ts.SetAccessorDeclaration | ts.GetAccessorDeclaration): boolean;
 export declare function isDefaultImport(node: ts.ImportDeclaration | ts.ImportEqualsDeclaration | ts.ExportDeclaration): boolean;
@@ -24,4 +18,3 @@ export declare const getLineAndCharacterOfPosition: (node: ts.Node, pos: number)
     col: number;
     pos: number;
 };
-export {};

package/dist/typescript/ast-helpers.js

@@ -1,7 +1,4 @@
 import ts from 'typescript';
-export function isValidImportTypeNode(node) {
-    return ts.isImportTypeNode(node);
-}
 export function isGetOrSetAccessorDeclaration(node) {
     return node.kind === ts.SyntaxKind.SetAccessor || node.kind === ts.SyntaxKind.GetAccessor;
 }

package/dist/typescript/getImportsAndExports.js

@@ -93,7 +93,7 @@ export const getImportsAndExports = (sourceFile, getResolvedModule, options) =>
             }
         }
     };
-    const addExport = ({ node, identifier, type, pos, members = [] }) => {
+    const addExport = ({ node, identifier, type, pos, posDecl, members = [] }) => {
         if (options.skipExports)
             return;
         const jsDocTags = getJSDocTags(node);
@@ -104,7 +104,7 @@ export const getImportsAndExports = (sourceFile, getResolvedModule, options) =>
             exports.set(identifier, { ...item, members: crew, jsDocTags: tags });
         }
         else {
-            exports.set(identifier, { node, type, members, jsDocTags, pos });
+            exports.set(identifier, { node, type, members, jsDocTags, pos, posDecl: posDecl ?? pos });
         }
         if (!jsDocTags.has('@alias')) {
             if (ts.isExportAssignment(node))

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

@@ -5,12 +5,20 @@ export default visit(() => true, node => {
     if (ts.isExportDeclaration(node)) {
         if (node.exportClause && ts.isNamedExports(node.exportClause)) {
             const type = node.isTypeOnly ? SymbolType.TYPE : SymbolType.UNKNOWN;
+            const sourceFile = node.getSourceFile();
+            const declarations = sourceFile.getNamedDeclarations?.();
             return node.exportClause.elements.map(element => {
+                const identifier = String(element.name.escapedText);
+                const declaration = declarations?.get(identifier)?.find((d) => d !== element);
+                const pos = element.name.pos;
+                const name = ts.getNameOfDeclaration(declaration);
+                const posDecl = name?.pos ?? declaration?.pos ?? pos;
                 return {
                     node: element,
-                    identifier: element.name.getText(),
+                    identifier,
                     type,
-                    pos: element.name.flowNode?.node?.pos ?? element.name.pos,
+                    pos,
+                    posDecl,
                 };
             });
         }

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

@@ -1,11 +1,43 @@
 import ts from 'typescript';
-import { isValidImportTypeNode } from '../../ast-helpers.js';
 import { importVisitor as visit } from '../index.js';
+const extractImportSpecifiers = (node) => {
+    const importSpecifiers = [];
+    function visit(node) {
+        if (ts.isJSDocTypeExpression(node)) {
+            const typeNode = node.type;
+            if (ts.isTypeReferenceNode(typeNode) && typeNode.typeArguments) {
+                typeNode.typeArguments.forEach(arg => {
+                    if (ts.isImportTypeNode(arg)) {
+                        const importClause = arg.argument;
+                        if (ts.isLiteralTypeNode(importClause) && ts.isStringLiteral(importClause.literal)) {
+                            importSpecifiers.push(importClause.literal.text);
+                        }
+                    }
+                });
+            }
+        }
+        if (ts.isJSDocTypeTag(node)) {
+            const typeNode = node.typeExpression?.type;
+            if (ts.isImportTypeNode(typeNode)) {
+                const importClause = typeNode.argument;
+                if (ts.isLiteralTypeNode(importClause) && ts.isStringLiteral(importClause.literal)) {
+                    importSpecifiers.push(importClause.literal.text);
+                }
+            }
+        }
+        ts.forEachChild(node, visit);
+    }
+    visit(node);
+    return importSpecifiers;
+};
 export default visit(() => true, node => {
-    if ('jsDoc' in node) {
-        const type = ts.getJSDocType(node);
-        if (type && isValidImportTypeNode(type)) {
-            return { specifier: type.argument.literal.text };
+    if ('jsDoc' in node && node.jsDoc) {
+        const jsDoc = node.jsDoc;
+        if (jsDoc.length > 0 && jsDoc[0].parent.parent === node.parent) {
+            return jsDoc
+                .flatMap(jsDoc => (jsDoc.tags ?? []).flatMap(extractImportSpecifiers))
+                .map(specifier => ({ specifier }));
         }
     }
+    return [];
 });

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.2.0";
+export declare const version = "3.3.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = '3.2.0';
+export const version = '3.3.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://knip.dev",
   "repository": {
@@ -25,7 +25,7 @@
     "knip:production": "node ./dist/cli.js --directory ../.. --production --strict",
     "lint": "eslint scripts src test",
     "lint:fix": "eslint scripts src test --fix",
-    "format": "prettier scripts src test schema.json --with-node-modules --write",
+    "format": "prettier scripts src test schema.json schema-jsonc.json --with-node-modules --write",
     "pretest": "node rmdir.js tmp && swc src -d tmp/src && swc test -d tmp/test",
     "test": "node --no-warnings --test tmp",
     "coverage": "c8 --reporter html node --no-warnings --loader tsx --test test/*.test.ts test/*/*.test.ts",
@@ -35,11 +35,12 @@
     "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 --log-level silent"
+    "postcreate-plugin": "prettier schema.json schema-jsonc.json src/ConfigurationValidator.ts --write --config .prettierrc --log-level silent"
   },
   "files": [
     "dist",
-    "schema.json"
+    "schema.json",
+    "schema-jsonc.json"
   ],
   "dependencies": {
     "@ericcornelissen/bash-parser": "0.5.2",

package/schema-jsonc.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Knip configuration for JSONC",
+  "description": "See https://github.com/webpro/knip",
+  "allOf": [
+    {
+      "$ref": "https://unpkg.com/knip@3/schema.json"
+    }
+  ],
+  "allowTrailingCommas": true
+}

package/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "Knip configuration",
+  "title": "Knip configuration for JSON",
   "description": "See https://github.com/webpro/knip",
   "type": "object",
   "allOf": [