knip 5.30.1 → 5.30.2

package/dist/ConfigurationChief.d.ts

@@ -37,7 +37,7 @@ export declare class ConfigurationChief {
     manifest?: PackageJson;
     ignoredWorkspacePatterns: string[];
     workspacePackages: Map<string, Package>;
-    workspacePackagesByName: Map<string, Package>;
+    workspacePackagesByPkgName: Map<string, Package>;
     additionalWorkspaceNames: Set<string>;
     availableWorkspaceNames: string[];
     availableWorkspacePkgNames: Set<string>;

package/dist/ConfigurationChief.js

@@ -54,7 +54,7 @@ export class ConfigurationChief {
     manifest;
     ignoredWorkspacePatterns = [];
     workspacePackages = new Map();
-    workspacePackagesByName = new Map();
+    workspacePackagesByPkgName = new Map();
     additionalWorkspaceNames = new Set();
     availableWorkspaceNames = [];
     availableWorkspacePkgNames = new Set();
@@ -157,7 +157,7 @@ export class ConfigurationChief {
         const workspaceNames = compact([...this.getListedWorkspaces(), ...this.additionalWorkspaceNames]);
         const [byName, byPkgName] = await mapWorkspaces(this.cwd, workspaceNames);
         this.workspacePackages = byName;
-        this.workspacePackagesByName = byPkgName;
+        this.workspacePackagesByPkgName = byPkgName;
         this.addRootPackage();
         this.availableWorkspaceNames = this.getAvailableWorkspaceNames(byName.keys());
         this.availableWorkspacePkgNames = this.getAvailableWorkspacePkgNames(byPkgName.keys());
@@ -178,7 +178,7 @@ export class ConfigurationChief {
                 manifest: this.manifest,
             };
             this.workspacePackages.set('.', rootPackage);
-            this.workspacePackagesByName.set(pkgName, rootPackage);
+            this.workspacePackagesByPkgName.set(pkgName, rootPackage);
         }
     }
     getListedWorkspaces() {

package/dist/index.js

@@ -16,7 +16,8 @@ import { _glob, negate } from './util/glob.js';
 import { getReferencedDependencyHandler } from './util/handle-dependency.js';
 import { getHasStrictlyNsReferences, getType } from './util/has-strictly-ns-references.js';
 import { getIsIdentifierReferencedHandler } from './util/is-identifier-referenced.js';
-import { getEntryPathsFromManifest, getPackageNameFromModuleSpecifier } from './util/modules.js';
+import { getPackageNameFromModuleSpecifier } from './util/modules.js';
+import { getEntryPathsFromManifest } from './util/package-json.js';
 import { dirname, join } from './util/path.js';
 import { findMatch } from './util/regex.js';
 import { getShouldIgnoreHandler, getShouldIgnoreTagHandler } from './util/tag.js';

package/dist/typescript/get-imports-and-exports.js

@@ -3,7 +3,7 @@ import ts from 'typescript';
 import { ALIAS_TAG, ANONYMOUS, DEFAULT_EXTENSIONS, IMPORT_STAR } from '../constants.js';
 import { timerify } from '../util/Performance.js';
 import { addNsValue, addValue, createImports } from '../util/dependency-graph.js';
-import { isStartsLikePackageName, sanitizeSpecifier } from '../util/modules.js';
+import { getPackageNameFromFilePath, isStartsLikePackageName, sanitizeSpecifier } from '../util/modules.js';
 import { extname, isInNodeModules } from '../util/path.js';
 import { shouldIgnore } from '../util/tag.js';
 import { getAccessMembers, getDestructuredIds, getJSDocTags, getLineAndCharacterOfPosition, getTypeName, isAccessExpression, isConsiderReferencedNS, isDestructuring, isImportSpecifier, isReferencedInExportedType, } from './ast-helpers.js';
@@ -102,7 +102,9 @@ const getImportsAndExports = (sourceFile, resolveModule, typeChecker, options) =
                 if (module.isExternalLibraryImport) {
                     if (skipTypeOnly && isTypeOnly)
                         return;
-                    const sanitizedSpecifier = sanitizeSpecifier(specifier);
+                    const sanitizedSpecifier = isInNodeModules(specifier)
+                        ? getPackageNameFromFilePath(specifier)
+                        : sanitizeSpecifier(specifier);
                     if (!isStartsLikePackageName(sanitizedSpecifier)) {
                         return;
                     }

package/dist/typescript/resolve-module-names.js

@@ -55,7 +55,7 @@ export function createCustomModuleResolver(compilerOptions, customCompilerExtens
     }
     function resolveModuleName(name, containingFile) {
         const sanitizedSpecifier = sanitizeSpecifier(name);
-        if (isBuiltin(sanitizedSpecifier) || isInNodeModules(name))
+        if (isBuiltin(sanitizedSpecifier))
             return undefined;
         const resolvedFileName = resolveSync(sanitizedSpecifier, dirname(containingFile));
         if (resolvedFileName) {

package/dist/util/handle-dependency.js

@@ -39,10 +39,17 @@ export const getReferencedDependencyHandler = (collector, deputy, chief) => (spe
                     symbol: specifier,
                 });
             if (packageName && specifier !== packageName) {
-                if (chief.workspacePackagesByName.get(packageName)) {
-                    const filePath = _resolveSync(specifier, dirname(containingFilePath));
-                    if (filePath)
-                        return filePath;
+                const specifierWorkspace = chief.workspacePackagesByPkgName.get(packageName);
+                if (specifierWorkspace) {
+                    if (specifier.startsWith(packageName)) {
+                        const dir = specifier.replace(new RegExp(`^${packageName}`), `./${specifierWorkspace.name}`);
+                        const resolvedFilePath = _resolveSync(dir, chief.cwd);
+                        if (resolvedFilePath)
+                            return resolvedFilePath;
+                    }
+                    const resolvedFilePath = _resolveSync(specifier, dirname(containingFilePath));
+                    if (resolvedFilePath)
+                        return resolvedFilePath;
                     collector.addIssue({
                         type: 'unresolved',
                         filePath: containingFilePath,

package/dist/util/modules.d.ts

@@ -1,14 +1,7 @@
-import type { PackageJson } from '../types/package-json.js';
 export declare const getPackageNameFromModuleSpecifier: (moduleSpecifier: string) => string | undefined;
 export declare const getPackageNameFromFilePath: (value: string) => string;
 export declare const isStartsLikePackageName: (specifier: string) => boolean;
 export declare const isDefinitelyTyped: (packageName: string) => boolean;
 export declare const getDefinitelyTypedFor: (packageName: string) => string;
 export declare const getPackageFromDefinitelyTyped: (typedDependency: string) => string;
-export declare const getEntryPathsFromManifest: (manifest: PackageJson, sharedGlobOptions: {
-    cwd: string;
-    dir: string;
-    gitignore: boolean;
-    ignore: string[];
-}) => Promise<string[]>;
 export declare const sanitizeSpecifier: (specifier: string) => string;

package/dist/util/modules.js

@@ -1,7 +1,5 @@
 import { isBuiltin } from 'node:module';
 import { DT_SCOPE } from '../constants.js';
-import { _glob } from './glob.js';
-import { getStringValues } from './object.js';
 import { isAbsolute, toPosix } from './path.js';
 export const getPackageNameFromModuleSpecifier = (moduleSpecifier) => {
     if (!isStartsLikePackageName(moduleSpecifier))
@@ -32,28 +30,6 @@ export const getPackageFromDefinitelyTyped = (typedDependency) => {
     }
     return typedDependency;
 };
-export const getEntryPathsFromManifest = (manifest, sharedGlobOptions) => {
-    const { main, bin, exports, types, typings } = manifest;
-    const entryPaths = new Set();
-    if (typeof main === 'string')
-        entryPaths.add(main);
-    if (bin) {
-        if (typeof bin === 'string')
-            entryPaths.add(bin);
-        if (typeof bin === 'object')
-            for (const id of Object.values(bin))
-                entryPaths.add(id);
-    }
-    if (exports) {
-        for (const item of getStringValues(exports))
-            entryPaths.add(item);
-    }
-    if (typeof types === 'string')
-        entryPaths.add(types);
-    if (typeof typings === 'string')
-        entryPaths.add(typings);
-    return _glob({ ...sharedGlobOptions, patterns: Array.from(entryPaths) });
-};
 const matchDirectives = /^([?!|-]+)?([^!?:]+).*/;
 export const sanitizeSpecifier = (specifier) => {
     if (isBuiltin(specifier))

package/dist/util/package-json.d.ts

@@ -7,4 +7,10 @@ interface ExtendedPackageJson extends PackageJson {
 }
 export declare const load: (filePath: string) => Promise<ExtendedPackageJson>;
 export declare const save: (filePath: string, content: ExtendedPackageJson) => Promise<void>;
+export declare const getEntryPathsFromManifest: (manifest: PackageJson, sharedGlobOptions: {
+    cwd: string;
+    dir: string;
+    gitignore: boolean;
+    ignore: string[];
+}) => Promise<string[]>;
 export {};

package/dist/util/package-json.js

@@ -1,4 +1,6 @@
 import { readFile, writeFile } from 'node:fs/promises';
+import { _glob } from './glob.js';
+import { getStringValues } from './object.js';
 const INDENT = Symbol.for('indent');
 const NEWLINE = Symbol.for('newline');
 const DEFAULT_NEWLINE = '\n';
@@ -28,3 +30,25 @@ export const save = async (filePath, content) => {
     const fileContent = `${JSON.stringify(content, null, space)}\n`.replace(/\n/g, EOL);
     await writeFile(filePath, fileContent);
 };
+export const getEntryPathsFromManifest = (manifest, sharedGlobOptions) => {
+    const { main, bin, exports, types, typings } = manifest;
+    const entryPaths = new Set();
+    if (typeof main === 'string')
+        entryPaths.add(main);
+    if (bin) {
+        if (typeof bin === 'string')
+            entryPaths.add(bin);
+        if (typeof bin === 'object')
+            for (const id of Object.values(bin))
+                entryPaths.add(id);
+    }
+    if (exports) {
+        for (const item of getStringValues(exports))
+            entryPaths.add(item);
+    }
+    if (typeof types === 'string')
+        entryPaths.add(types);
+    if (typeof typings === 'string')
+        entryPaths.add(typings);
+    return _glob({ ...sharedGlobOptions, patterns: Array.from(entryPaths) });
+};

package/dist/util/package-name.js

@@ -1,6 +1,6 @@
 import { basename, dirname } from './path.js';
-const getName2 = (parent, base) => (parent.charAt(0) === '@' ? `${parent}/${base}` : base);
-const getName = (dir) => (dir ? getName2(basename(dirname(dir)), basename(dir)) : undefined);
+const getPkgName = (parent, base) => (parent.charAt(0) === '@' ? `${parent}/${base}` : base);
+const getName = (dir) => (dir ? getPkgName(basename(dirname(dir)), basename(dir)) : undefined);
 export function getPackageName(pkg, pathname) {
     const { name } = pkg;
     return name || getName(pathname);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.30.1";
+export declare const version = "5.30.2";

package/dist/version.js

@@ -1 +1 @@
-export const version = '5.30.1';
+export const version = '5.30.2';

package/package.json

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