knip 6.0.4 → 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/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/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/version.d.ts

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

package/dist/version.js

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

package/package.json

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