knip 5.73.0 → 5.73.1

package/dist/ProjectPrincipal.d.ts

@@ -11,7 +11,7 @@ import type { ToSourceFilePath } from './util/to-source-path.js';
 export declare class ProjectPrincipal {
     entryPaths: Set<string>;
     projectPaths: Set<string>;
-    nonEntryPaths: Set<string>;
+    programPaths: Set<string>;
     skipExportsAnalysis: Set<string>;
     cwd: string;
     compilerOptions: ts.CompilerOptions;
@@ -44,7 +44,7 @@ export declare class ProjectPrincipal {
     addEntryPaths(filePaths: Set<string> | string[], options?: {
         skipExportsAnalysis: boolean;
     }): void;
-    addNonEntryPath(filePath: string): void;
+    addProgramPath(filePath: string): void;
     addProjectPath(filePath: string): void;
     deletedFiles: Set<unknown>;
     removeProjectPath(filePath: string): void;

package/dist/ProjectPrincipal.js

@@ -29,7 +29,7 @@ const tsCreateProgram = timerify(ts.createProgram);
 export class ProjectPrincipal {
     entryPaths = new Set();
     projectPaths = new Set();
-    nonEntryPaths = new Set();
+    programPaths = new Set();
     skipExportsAnalysis = new Set();
     cwd;
     compilerOptions;
@@ -98,7 +98,7 @@ export class ProjectPrincipal {
         this.extensions = new Set([...this.extensions, ...getCompilerExtensions(compilers)]);
     }
     createProgram() {
-        this.backend.program = tsCreateProgram([...this.entryPaths, ...this.nonEntryPaths], this.compilerOptions, this.backend.compilerHost, this.backend.program);
+        this.backend.program = tsCreateProgram([...this.entryPaths, ...this.programPaths], this.compilerOptions, this.backend.compilerHost, this.backend.program);
         const typeChecker = timerify(this.backend.program.getTypeChecker);
         this.backend.typeChecker = typeChecker();
     }
@@ -117,9 +117,9 @@ export class ProjectPrincipal {
         for (const filePath of filePaths)
             this.addEntryPath(filePath, options);
     }
-    addNonEntryPath(filePath) {
+    addProgramPath(filePath) {
         if (!isInNodeModules(filePath) && this.hasAcceptedExtension(filePath)) {
-            this.nonEntryPaths.add(filePath);
+            this.programPaths.add(filePath);
         }
     }
     addProjectPath(filePath) {

package/dist/constants.d.ts

@@ -57,6 +57,7 @@ export declare const IMPORT_MODIFIERS: {
     readonly RE_EXPORT: number;
     readonly TYPE_ONLY: number;
     readonly ENTRY: number;
+    readonly BRIDGE: number;
     readonly OPTIONAL: number;
     readonly SIDE_EFFECTS: number;
     readonly OPAQUE: number;

package/dist/constants.js

@@ -217,7 +217,8 @@ export const IMPORT_MODIFIERS = {
     RE_EXPORT: 1 << 0,
     TYPE_ONLY: 1 << 1,
     ENTRY: 1 << 2,
-    OPTIONAL: 1 << 3,
-    SIDE_EFFECTS: 1 << 4,
-    OPAQUE: 1 << 5,
+    BRIDGE: 1 << 3,
+    OPTIONAL: 1 << 4,
+    SIDE_EFFECTS: 1 << 5,
+    OPAQUE: 1 << 6,
 };

package/dist/graph/build.js

@@ -271,7 +271,12 @@ export async function build({ chief, collector, counselor, deputy, factory, isGi
                     }
                 }
             }
-            for (const filePath of file.imports.resolved) {
+            for (const filePath of file.imports.programFiles) {
+                const isIgnored = isGitIgnored(filePath);
+                if (!isIgnored)
+                    principal.addProgramPath(filePath);
+            }
+            for (const filePath of file.imports.entryFiles) {
                 const isIgnored = isGitIgnored(filePath);
                 if (!isIgnored)
                     principal.addEntryPath(filePath, { skipExportsAnalysis: true });
@@ -283,7 +288,7 @@ export async function build({ chief, collector, counselor, deputy, factory, isGi
                         file.imports.external.add({ ..._import, specifier: packageName });
                         const principal = getPrincipalByFilePath(_import.filePath);
                         if (principal && !isGitIgnored(_import.filePath)) {
-                            principal.addNonEntryPath(_import.filePath);
+                            principal.addProgramPath(_import.filePath);
                         }
                     }
                 }

package/dist/plugins/astro/index.js

@@ -16,7 +16,7 @@ const production = [
 ];
 const resolveFromAST = sourceFile => {
     const srcDir = getSrcDir(sourceFile);
-    const setSrcDir = (entry) => entry.replace(/^`src\//, `${srcDir}/`);
+    const setSrcDir = (entry) => entry.replace(/^src\//, `${srcDir}/`);
     return [
         ...entry.map(setSrcDir).map(path => toEntry(path)),
         ...production.map(setSrcDir).map(path => toProductionEntry(path)),

package/dist/types/module-graph.d.ts

@@ -58,7 +58,8 @@ export type FileNode = {
         internal: ImportMap;
         external: Set<Import>;
         unresolved: Set<Import>;
-        resolved: Set<FilePath>;
+        programFiles: Set<FilePath>;
+        entryFiles: Set<FilePath>;
         imports: Imports;
     };
     exports: ExportMap;

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

@@ -37,7 +37,8 @@ const getImportsAndExports = (sourceFile, resolveModule, typeChecker, options, i
     const internal = new Map();
     const external = new Set();
     const unresolved = new Set();
-    const resolved = new Set();
+    const programFiles = new Set();
+    const entryFiles = new Set();
     const imports = new Set();
     const exports = new Map();
     const aliasedExports = new Map();
@@ -132,9 +133,11 @@ const getImportsAndExports = (sourceFile, resolveModule, typeChecker, options, i
         if (module) {
             const filePath = module.resolvedFileName;
             if (filePath) {
-                if (opts.modifiers && opts.modifiers & IMPORT_MODIFIERS.ENTRY && !isInNodeModules(filePath)) {
-                    resolved.add(filePath);
-                    return;
+                if (!isInNodeModules(filePath)) {
+                    if (opts.modifiers & IMPORT_MODIFIERS.ENTRY)
+                        entryFiles.add(filePath);
+                    if (opts.modifiers & IMPORT_MODIFIERS.BRIDGE)
+                        programFiles.add(filePath);
                 }
                 if (!module.isExternalLibraryImport || !isInNodeModules(filePath)) {
                     const { line, character } = node.getSourceFile().getLineAndCharacterOfPosition(opts.pos);
@@ -176,7 +179,7 @@ const getImportsAndExports = (sourceFile, resolveModule, typeChecker, options, i
             if (opts.specifier.startsWith(PROTOCOL_VIRTUAL))
                 return;
             if (opts.modifiers && opts.modifiers & IMPORT_MODIFIERS.OPTIONAL) {
-                resolved.add(resolve(dirname(sourceFile.fileName), opts.specifier));
+                programFiles.add(resolve(dirname(sourceFile.fileName), opts.specifier));
                 return;
             }
             const pos = 'moduleSpecifier' in node ? node.moduleSpecifier.pos : node.pos;
@@ -441,7 +444,7 @@ const getImportsAndExports = (sourceFile, resolveModule, typeChecker, options, i
         item.symbol = undefined;
     }
     return {
-        imports: { internal, external, resolved, imports, unresolved },
+        imports: { internal, external, programFiles, entryFiles, imports, unresolved },
         exports,
         duplicates: [...aliasedExports.values()],
         scripts,

package/dist/typescript/visitors/dynamic-imports/requireCall.js

@@ -7,7 +7,7 @@ export default visit(() => true, node => {
     if (isRequireCall(node)) {
         if (ts.isStringLiteralLike(node.arguments[0])) {
             const specifier = node.arguments[0].text;
-            const modifiers = isNotJS(node.getSourceFile()) ? IMPORT_MODIFIERS.ENTRY : IMPORT_MODIFIERS.NONE;
+            const modifiers = isNotJS(node.getSourceFile()) ? IMPORT_MODIFIERS.BRIDGE : IMPORT_MODIFIERS.NONE;
             if (specifier) {
                 const propertyAccessExpression = findAncestor(node, _node => {
                     if (ts.isExpressionStatement(_node) || ts.isCallExpression(_node))

package/dist/util/map-workspaces.js

@@ -1,7 +1,6 @@
 import { readFile } from 'node:fs/promises';
 import fg from 'fast-glob';
 import { partition } from './array.js';
-import { debugLog } from './debug.js';
 import { ConfigurationError } from './errors.js';
 import { getPackageName } from './package-name.js';
 import { join } from './path.js';
@@ -11,14 +10,15 @@ export default async function mapWorkspaces(cwd, workspaces) {
     const wsPkgNames = new Set();
     if (patterns.length === 0 && negatedPatterns.length === 0)
         return [packages, wsPkgNames];
-    const matches = await fg.glob(patterns, {
+    const manifestPatterns = patterns.map(p => join(p, 'package.json'));
+    const matches = await fg.glob(manifestPatterns, {
         cwd,
-        onlyDirectories: true,
-        ignore: ['**/node_modules/**', ...negatedPatterns],
+        ignore: ['**/node_modules/**', ...negatedPatterns.map(p => p.slice(1))],
     });
-    for (const name of matches) {
+    for (const match of matches) {
+        const name = match === 'package.json' ? '.' : match.replace(/\/package\.json$/, '');
         const dir = join(cwd, name);
-        const manifestPath = join(dir, 'package.json');
+        const manifestPath = join(cwd, match);
         try {
             const manifestStr = await readFile(manifestPath, 'utf8');
             const manifest = JSON.parse(manifestStr);

package/dist/util/module-graph.js

@@ -34,7 +34,8 @@ const createFileNode = () => ({
         internal: new Map(),
         external: new Set(),
         unresolved: new Set(),
-        resolved: new Set(),
+        programFiles: new Set(),
+        entryFiles: new Set(),
         imports: new Set(),
     },
     exports: new Map(),

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.73.0";
+export declare const version = "5.73.1";

package/dist/version.js

@@ -1 +1 @@
-export const version = '5.73.0';
+export const version = '5.73.1';

package/package.json

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