knip 5.1.6 → 5.2.0

package/dist/IssueFixer.js

@@ -45,7 +45,10 @@ export class IssueFixer {
             ].sort((a, b) => b[0] - a[0]);
             if (exportPositions.length > 0) {
                 const sourceFileText = exportPositions.reduce((text, [start, end]) => text.substring(0, start) + text.substring(end), await readFile(filePath, 'utf-8'));
-                await writeFile(filePath, sourceFileText);
+                const withoutEmptyReExports = sourceFileText
+                    .replaceAll(/export \{[ ,]+\} from ('|")[^'"]+('|");?\n?/g, '')
+                    .replaceAll(/export \{[ ,]+\};?\n?/g, '');
+                await writeFile(filePath, withoutEmptyReExports);
             }
         }
     }

package/dist/ProjectPrincipal.d.ts

@@ -1,4 +1,5 @@
 import ts from 'typescript';
+import { type GetImportsAndExportsOptions } from './typescript/getImportsAndExports.js';
 import { createCustomModuleResolver } from './typescript/resolveModuleNames.js';
 import { SourceFileManager } from './typescript/SourceFileManager.js';
 import type { SyncCompilers, AsyncCompilers } from './compilers/types.js';
@@ -7,12 +8,6 @@ import type { SerializableExportMember } from './types/exports.js';
 import type { UnresolvedImport } from './types/imports.js';
 import type { ProgramMaybe53 } from './typescript/SourceFile.js';
 import type { ReferencedDependencies } from './WorkspaceWorker.js';
-type AnalyzeSourceFileOptions = {
-    skipTypeOnly: boolean;
-    isFixExports: boolean;
-    isFixTypes: boolean;
-    ignoreExportsUsedInFile: boolean;
-};
 export declare class ProjectPrincipal {
     entryPaths: Set<string>;
     projectPaths: Set<string>;
@@ -52,7 +47,7 @@ export declare class ProjectPrincipal {
     getUsedResolvedFiles(): string[];
     private getProgramSourceFiles;
     getUnreferencedFiles(): string[];
-    analyzeSourceFile(filePath: string, options: AnalyzeSourceFileOptions): {
+    analyzeSourceFile(filePath: string, options: Omit<GetImportsAndExportsOptions, 'skipExports'>): {
         imports: {
             internal: import("./types/imports.js").SerializableImportMap;
             unresolved: Set<UnresolvedImport>;
@@ -67,4 +62,3 @@ export declare class ProjectPrincipal {
     resolveModule(specifier: string, filePath?: string): ts.ResolvedModuleFull | undefined;
     findUnusedMembers(filePath: string, members: SerializableExportMember[]): SerializableExportMember[];
 }
-export {};

package/dist/index.js

@@ -227,6 +227,7 @@ export const main = async (unresolvedConfiguration) => {
                     isFixExports: fixer.isEnabled && fixer.isFixUnusedExports,
                     isFixTypes: fixer.isEnabled && fixer.isFixUnusedTypes,
                     ignoreExportsUsedInFile: Boolean(chief.config.ignoreExportsUsedInFile),
+                    tags,
                 });
                 const { internal, external, unresolved } = imports;
                 const { exported, duplicate } = exports;
@@ -423,7 +424,7 @@ export const main = async (unresolvedConfiguration) => {
                         continue;
                     if (exportedItem.jsDocTags.includes('@alias'))
                         continue;
-                    if (shouldIgnore(exportedItem, tags))
+                    if (shouldIgnore(exportedItem.jsDocTags, tags))
                         continue;
                     if (isProduction && exportedItem.jsDocTags.includes('@internal'))
                         continue;
@@ -437,7 +438,7 @@ export const main = async (unresolvedConfiguration) => {
                         if (isIdentifierReferenced(filePath, identifier, importsForExport)) {
                             if (exportedItem.type === 'enum') {
                                 exportedItem.members?.forEach(member => {
-                                    if (shouldIgnore(member, tags))
+                                    if (shouldIgnore(member.jsDocTags, tags))
                                         return;
                                     if (member.refs === 0) {
                                         exportLookupLog(-1, `Looking up export member ${identifier}.${member.identifier} from`, filePath);
@@ -507,7 +508,7 @@ export const main = async (unresolvedConfiguration) => {
             const workspace = chief.findWorkspaceByFilePath(filePath);
             const principal = workspace && factory.getPrincipalByPackageName(workspace.pkgName);
             if (principal) {
-                const members = exportedItem.members.filter(member => !shouldIgnore(member, tags));
+                const members = exportedItem.members.filter(member => !shouldIgnore(member.jsDocTags, tags));
                 principal.findUnusedMembers(filePath, members).forEach(member => {
                     collector.addIssue({
                         type: 'classMembers',

package/dist/typescript/ast-helpers.js

@@ -89,6 +89,9 @@ export const getJSDocTags = (node) => {
     else if (ts.isEnumMember(node) || ts.isClassElement(node)) {
         tagNodes = [...tagNodes, ...ts.getJSDocTags(node.parent)];
     }
+    else if (ts.isCallExpression(node)) {
+        tagNodes = [...tagNodes, ...ts.getJSDocTags(node.parent)];
+    }
     for (const tagNode of tagNodes) {
         const match = tagNode.getText()?.match(/@\S+/);
         if (match)

package/dist/typescript/getImportsAndExports.d.ts

@@ -1,5 +1,6 @@
 import ts from 'typescript';
 import type { BoundSourceFile, GetResolvedModule } from './SourceFile.js';
+import type { Tags } from '../types/cli.js';
 import type { SerializableExports } from '../types/exports.js';
 import type { SerializableImportMap, UnresolvedImport } from '../types/imports.js';
 import type { IssueSymbol } from '../types/issues.js';
@@ -9,6 +10,7 @@ export type GetImportsAndExportsOptions = {
     isFixExports: boolean;
     isFixTypes: boolean;
     ignoreExportsUsedInFile: boolean;
+    tags: Tags;
 };
 export declare const _getImportsAndExports: (sourceFile: BoundSourceFile, getResolvedModule: GetResolvedModule, typeChecker: ts.TypeChecker, options: GetImportsAndExportsOptions) => {
     imports: {

package/dist/typescript/getImportsAndExports.js

@@ -3,6 +3,7 @@ import ts from 'typescript';
 import { isStartsLikePackageName, sanitizeSpecifier } from '../util/modules.js';
 import { isInNodeModules } from '../util/path.js';
 import { timerify } from '../util/Performance.js';
+import { shouldIgnore } from '../util/tag.js';
 import { isAccessExpression, getJSDocTags, getLineAndCharacterOfPosition, getMemberStringLiterals, } from './ast-helpers.js';
 import getDynamicImportVisitors from './visitors/dynamic-imports/index.js';
 import getExportVisitors from './visitors/exports/index.js';
@@ -30,7 +31,7 @@ const createSerializableMember = (node, member, pos) => {
     };
 };
 const getImportsAndExports = (sourceFile, getResolvedModule, typeChecker, options) => {
-    const { skipTypeOnly } = options;
+    const { skipTypeOnly, tags } = options;
     const internalImports = {};
     const externalImports = new Set();
     const unresolvedImports = new Set();
@@ -75,7 +76,7 @@ const getImportsAndExports = (sourceFile, getResolvedModule, typeChecker, option
         if (symbol)
             importedInternalSymbols.set(symbol, filePath);
     };
-    const addImport = (options) => {
+    const addImport = (options, node) => {
         const { specifier, isTypeOnly, pos, identifier = '__anonymous', isReExport = false } = options;
         if (isBuiltin(specifier))
             return;
@@ -103,6 +104,8 @@ const getImportsAndExports = (sourceFile, getResolvedModule, typeChecker, option
         else {
             if (skipTypeOnly && isTypeOnly)
                 return;
+            if (shouldIgnore(getJSDocTags(node), tags))
+                return;
             if (typeof pos === 'number') {
                 const { line, character } = sourceFile.getLineAndCharacterOfPosition(pos);
                 unresolvedImports.add({ specifier, pos, line: line + 1, col: character + 1 });
@@ -208,13 +211,13 @@ const getImportsAndExports = (sourceFile, getResolvedModule, typeChecker, option
     const visit = (node) => {
         for (const visitor of visitors.dynamicImport) {
             const result = visitor(node, options);
-            result && (Array.isArray(result) ? result.forEach(addImport) : addImport(result));
+            result && (Array.isArray(result) ? result.forEach(r => addImport(r, node)) : addImport(result, node));
         }
         const isTopLevel = node.parent === sourceFile || node.parent?.parent === sourceFile;
         if (isTopLevel) {
             for (const visitor of visitors.import) {
                 const result = visitor(node, options);
-                result && (Array.isArray(result) ? result.forEach(addImport) : addImport(result));
+                result && (Array.isArray(result) ? result.forEach(r => addImport(r, node)) : addImport(result, node));
             }
             for (const visitor of visitors.export) {
                 const result = visitor(node, options);

package/dist/util/tag.d.ts

@@ -1,4 +1,3 @@
 import type { Tags } from '../types/cli.js';
-import type { SerializableExport, SerializableExportMember } from '../types/exports.js';
 export declare const splitTags: (tags: string[]) => Tags;
-export declare const shouldIgnore: (exportedItem: SerializableExport | SerializableExportMember, tags: Tags) => boolean;
+export declare const shouldIgnore: (jsDocTags: string[], tags: Tags) => boolean;

package/dist/util/tag.js

@@ -5,11 +5,11 @@ export const splitTags = (tags) => tags
     return [incl, excl];
 }, [[], []]);
 const hasTag = (tags, jsDocTags) => tags.some(tag => jsDocTags.includes('@' + tag));
-export const shouldIgnore = (exportedItem, tags) => {
+export const shouldIgnore = (jsDocTags, tags) => {
     const [includeJSDocTags, excludeJSDocTags] = tags;
-    if (includeJSDocTags.length > 0 && !hasTag(includeJSDocTags, exportedItem.jsDocTags))
+    if (includeJSDocTags.length > 0 && !hasTag(includeJSDocTags, jsDocTags))
         return true;
-    if (excludeJSDocTags.length > 0 && hasTag(excludeJSDocTags, exportedItem.jsDocTags))
+    if (excludeJSDocTags.length > 0 && hasTag(excludeJSDocTags, jsDocTags))
         return true;
     return false;
 };

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.1.6";
+export declare const version = "5.2.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = '5.1.6';
+export const version = '5.2.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "5.1.6",
+  "version": "5.2.0",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://knip.dev",
   "repository": {