knip 5.48.0 → 5.49.0

package/dist/graph/build.js

@@ -69,9 +69,10 @@ export async function build({ cacheLocation, chief, collector, cwd, deputy, fact
         const ignore = worker.getIgnorePatterns();
         const sharedGlobOptions = { cwd, dir, gitignore };
         collector.addIgnorePatterns(ignore.map(pattern => join(cwd, pattern)));
-        const entryPathsFromManifest = await getEntryPathsFromManifest(manifest, { ...sharedGlobOptions, ignore });
-        for (const id of entryPathsFromManifest.map(id => toProductionEntry(id)))
-            inputs.add(id);
+        const entryPathsFromManifest = await getEntryPathsFromManifest(manifest, { cwd: dir, ignore });
+        for (const filePath of entryPathsFromManifest) {
+            inputs.add(toProductionEntry(toSourceFilePath(filePath) ?? filePath));
+        }
         const principal = factory.createPrincipal({
             cwd: dir,
             paths: config.paths,
@@ -88,18 +89,32 @@ export async function build({ cacheLocation, chief, collector, cwd, deputy, fact
         });
         const inputsFromPlugins = await worker.runPlugins();
         for (const id of inputsFromPlugins)
-            inputs.add(id);
+            inputs.add(Object.assign(id, { skipExportsAnalysis: true }));
         enabledPluginsStore.set(name, worker.enabledPlugins);
-        const entryFilePatterns = new Set();
-        const productionEntryFilePatterns = new Set();
+        const entryPatterns = new Set();
+        const entryPatternsSkipExports = new Set();
+        const productionPatterns = new Set();
+        const productionPatternsSkipExports = new Set();
         const projectFilePatterns = new Set();
         for (const input of inputs) {
             const specifier = input.specifier;
             if (isEntry(input)) {
-                entryFilePatterns.add(isAbsolute(specifier) ? relative(dir, specifier) : specifier);
+                const relativePath = isAbsolute(specifier) ? relative(dir, specifier) : specifier;
+                if (!input.skipExportsAnalysis) {
+                    entryPatterns.add(relativePath);
+                }
+                else {
+                    entryPatternsSkipExports.add(relativePath);
+                }
             }
             else if (isProductionEntry(input)) {
-                productionEntryFilePatterns.add(isAbsolute(specifier) ? relative(dir, specifier) : specifier);
+                const relativePath = isAbsolute(specifier) ? relative(dir, specifier) : specifier;
+                if (!input.skipExportsAnalysis) {
+                    productionPatterns.add(relativePath);
+                }
+                else {
+                    productionPatternsSkipExports.add(relativePath);
+                }
             }
             else if (isProject(input)) {
                 projectFilePatterns.add(isAbsolute(specifier) ? relative(dir, specifier) : specifier);
@@ -109,11 +124,11 @@ export async function build({ cacheLocation, chief, collector, cwd, deputy, fact
                 const resolvedFilePath = getReferencedInternalFilePath(input, ws);
                 if (resolvedFilePath) {
                     if (isDeferResolveProductionEntry(input)) {
-                        productionEntryFilePatterns.add(resolvedFilePath);
+                        productionPatternsSkipExports.add(resolvedFilePath);
                     }
                     else if (isDeferResolveEntry(input)) {
                         if (!isProduction || !input.optional)
-                            entryFilePatterns.add(resolvedFilePath);
+                            entryPatternsSkipExports.add(resolvedFilePath);
                     }
                     else {
                         principal.addEntryPath(resolvedFilePath, { skipExportsAnalysis: true });
@@ -122,21 +137,27 @@ export async function build({ cacheLocation, chief, collector, cwd, deputy, fact
             }
         }
         if (isProduction) {
-            const negatedEntryPatterns = Array.from(entryFilePatterns).map(negate);
+            const negatedEntryPatterns = [...entryPatterns, ...entryPatternsSkipExports].map(negate);
             {
-                const label = 'entry';
+                const label = 'entry paths';
                 const patterns = worker.getProductionEntryFilePatterns(negatedEntryPatterns);
                 const workspaceEntryPaths = await _glob({ ...sharedGlobOptions, patterns, gitignore: false, label });
                 principal.addEntryPaths(workspaceEntryPaths);
             }
             {
-                const label = 'production plugin entry';
-                const patterns = Array.from(productionEntryFilePatterns);
+                const label = 'production entry paths from plugins (skip exports analysis)';
+                const patterns = Array.from(productionPatternsSkipExports);
                 const pluginWorkspaceEntryPaths = await _glob({ ...sharedGlobOptions, patterns, label });
                 principal.addEntryPaths(pluginWorkspaceEntryPaths, { skipExportsAnalysis: true });
             }
             {
-                const label = 'project';
+                const label = 'production entry paths from plugins';
+                const patterns = Array.from(productionPatterns);
+                const pluginWorkspaceEntryPaths = await _glob({ ...sharedGlobOptions, patterns, label });
+                principal.addEntryPaths(pluginWorkspaceEntryPaths);
+            }
+            {
+                const label = 'project paths';
                 const patterns = worker.getProductionProjectFilePatterns(negatedEntryPatterns);
                 const workspaceProjectPaths = await _glob({ ...sharedGlobOptions, patterns, label });
                 for (const projectPath of workspaceProjectPaths)
@@ -145,33 +166,42 @@ export async function build({ cacheLocation, chief, collector, cwd, deputy, fact
         }
         else {
             {
-                const label = 'entry';
+                const label = 'entry paths';
                 const patterns = worker.getEntryFilePatterns();
                 const workspaceEntryPaths = await _glob({ ...sharedGlobOptions, patterns, gitignore: false, label });
                 principal.addEntryPaths(workspaceEntryPaths);
             }
             {
-                const label = 'project';
-                const patterns = worker.getProjectFilePatterns([...productionEntryFilePatterns, ...projectFilePatterns]);
-                const workspaceProjectPaths = await _glob({ ...sharedGlobOptions, patterns, label });
-                for (const projectPath of workspaceProjectPaths)
-                    principal.addProjectPath(projectPath);
+                const label = 'entry paths from plugins (skip exports analysis)';
+                const patterns = worker.getPluginEntryFilePatterns([
+                    ...entryPatternsSkipExports,
+                    ...productionPatternsSkipExports,
+                ]);
+                const pluginWorkspaceEntryPaths = await _glob({ ...sharedGlobOptions, patterns, label });
+                principal.addEntryPaths(pluginWorkspaceEntryPaths, { skipExportsAnalysis: true });
             }
             {
-                const label = 'plugin entry';
-                const patterns = worker.getPluginEntryFilePatterns([...entryFilePatterns, ...productionEntryFilePatterns]);
+                const label = 'entry paths from plugins';
+                const patterns = worker.getPluginEntryFilePatterns([...entryPatterns, ...productionPatterns]);
                 const pluginWorkspaceEntryPaths = await _glob({ ...sharedGlobOptions, patterns, label });
-                principal.addEntryPaths(pluginWorkspaceEntryPaths, { skipExportsAnalysis: true });
+                principal.addEntryPaths(pluginWorkspaceEntryPaths);
+            }
+            {
+                const label = 'project paths';
+                const patterns = worker.getProjectFilePatterns([...productionPatternsSkipExports, ...projectFilePatterns]);
+                const workspaceProjectPaths = await _glob({ ...sharedGlobOptions, patterns, label });
+                for (const projectPath of workspaceProjectPaths)
+                    principal.addProjectPath(projectPath);
             }
             {
-                const label = 'plugin project';
+                const label = 'project paths from plugins';
                 const patterns = worker.getPluginProjectFilePatterns();
                 const pluginWorkspaceProjectPaths = await _glob({ ...sharedGlobOptions, patterns, label });
                 for (const projectPath of pluginWorkspaceProjectPaths)
                     principal.addProjectPath(projectPath);
             }
             {
-                const label = 'plugin configuration';
+                const label = 'plugin configuration paths (skip exports analysis)';
                 const patterns = worker.getPluginConfigPatterns();
                 const configurationEntryPaths = await _glob({ ...sharedGlobOptions, patterns, label });
                 principal.addEntryPaths(configurationEntryPaths, { skipExportsAnalysis: true });

package/dist/plugins/ava/index.js

@@ -19,7 +19,7 @@ const entry = [
 const resolveEntryPaths = localConfig => {
     if (typeof localConfig === 'function')
         localConfig = localConfig();
-    return (localConfig?.files ?? entry).map(toEntry);
+    return (localConfig?.files ?? entry).map(id => toEntry(id));
 };
 const resolveConfig = async (localConfig, options) => {
     if (typeof localConfig === 'function')

package/dist/plugins/cucumber/index.js

@@ -6,7 +6,7 @@ const isEnabled = ({ dependencies }) => hasDependency(dependencies, enablers);
 const config = ['cucumber.{json,yaml,yml,js,cjs,mjs}'];
 const entry = ['features/**/*.@(js|cjs|mjs)'];
 const resolveEntryPaths = config => {
-    return (config?.import ? config.import : []).map(toEntry);
+    return (config?.import ? config.import : []).map(id => toEntry(id));
 };
 const resolveConfig = config => {
     const formatters = config?.format ? config.format : [];

package/dist/plugins/cypress/index.js

@@ -19,7 +19,7 @@ const resolveEntryPaths = async (localConfig) => {
     return [
         ...(specPatterns.length > 0 ? specPatterns : TEST_FILE_PATTERNS),
         ...(supportFiles.length > 0 ? supportFiles : SUPPORT_FILE_PATTERNS),
-    ].map(toEntry);
+    ].map(id => toEntry(id));
 };
 const resolveConfig = async (config, options) => {
     const inputs = await resolveDependencies(config, options);

package/dist/plugins/github-actions/index.js

@@ -41,7 +41,7 @@ const resolveConfig = async (config, options) => {
             }
         }
     }
-    return [...inputs, ...getActionDependencies(config, options).map(toEntry)];
+    return [...inputs, ...getActionDependencies(config, options).map(id => toEntry(id))];
 };
 export default {
     title,

package/dist/plugins/jest/index.js

@@ -81,7 +81,7 @@ const resolveEntryPaths = async (localConfig, options) => {
     const rootDir = localConfig.rootDir ?? configFileDir;
     const replaceRootDir = (name) => name.replace(/<rootDir>/, rootDir);
     if (localConfig.testMatch)
-        return localConfig.testMatch.map(replaceRootDir).map(toEntry);
+        return localConfig.testMatch.map(replaceRootDir).map(id => toEntry(id));
     return entry.map(id => toEntry(id));
 };
 const resolveConfig = async (localConfig, options) => {

package/dist/plugins/ladle/index.js

@@ -14,7 +14,7 @@ const resolveEntryPaths = (localConfig, options) => {
     const localStories = typeof localConfig.stories === 'string' ? [localConfig.stories] : localConfig.stories;
     const viteConfig = localConfig.viteConfig ? [toAbsolute(localConfig.viteConfig, options.cwd)] : [];
     const patterns = [...restEntry, ...(localStories ?? stories), ...viteConfig];
-    return patterns.map(toEntry);
+    return patterns.map(id => toEntry(id));
 };
 const resolveConfig = async (localConfig, options) => {
     if (localConfig.viteConfig) {

package/dist/plugins/mocha/index.js

@@ -7,11 +7,11 @@ const config = ['.mocharc.{js,cjs,json,jsonc,yml,yaml}', 'package.json'];
 const entry = ['**/test/*.{js,cjs,mjs}'];
 const resolveEntryPaths = localConfig => {
     const entryPatterns = localConfig.spec ? [localConfig.spec].flat() : [];
-    return [...entryPatterns].map(toEntry);
+    return [...entryPatterns].map(id => toEntry(id));
 };
 const resolveConfig = localConfig => {
     const require = localConfig.require ? [localConfig.require].flat() : [];
-    return [...require].map(toEntry);
+    return [...require].map(id => toEntry(id));
 };
 const args = {
     nodeImportArgs: true,

package/dist/plugins/node/index.js

@@ -8,7 +8,7 @@ const resolveEntryPaths = localConfig => {
     const entries = [toProductionEntry('server.js')];
     if (scripts && Object.keys(scripts).some(script => /(?<=^|\s)node\s(.*)--test/.test(scripts[script]))) {
         const patterns = ['**/*{.,-,_}test.?(c|m)js', '**/test-*.?(c|m)js', '**/test.?(c|m)js', '**/test/**/*.?(c|m)js'];
-        entries.push(...patterns.map(toEntry));
+        entries.push(...patterns.map(id => toEntry(id)));
     }
     return entries;
 };

package/dist/plugins/preconstruct/index.js

@@ -5,7 +5,7 @@ const enablers = ['@preconstruct/cli'];
 const isEnabled = ({ dependencies }) => hasDependency(dependencies, enablers);
 const config = ['package.json'];
 const resolveEntryPaths = async (config) => {
-    return (config.entrypoints ?? []).map(toEntry);
+    return (config.entrypoints ?? []).map(id => toEntry(id));
 };
 export default {
     title,

package/dist/plugins/react-cosmos/index.js

@@ -16,7 +16,7 @@ const resolveEntryPaths = async (localConfig) => {
         join(fixturesDir ?? '', `**/*.${fixtureFileSuffix ?? 'fixture'}.${ext}`),
         join(fixturesDir ?? '', `**/${fixtureFileSuffix ?? 'fixture'}.${ext}`),
     ];
-    return [...entries, ...decoratorEntry].map(toEntry);
+    return [...entries, ...decoratorEntry].map(id => toEntry(id));
 };
 const resolveConfig = async (localConfig) => {
     return (localConfig?.plugins ?? []).map(toDeferResolve);

package/dist/plugins/react-router/index.js

@@ -32,7 +32,7 @@ const resolveEntryPaths = async (localConfig, options) => {
         join(appDir, 'root.{jsx,tsx}'),
         join(appDir, 'entry.{client,server}.{js,jsx,ts,tsx}'),
         ...routes,
-    ].map(toEntry);
+    ].map(id => toEntry(id));
 };
 export default {
     title,

package/dist/plugins/storybook/index.js

@@ -21,7 +21,7 @@ const resolveEntryPaths = async (localConfig, options) => {
         ...(options.config.entry ?? restEntry),
         ...(relativePatterns && relativePatterns.length > 0 ? relativePatterns : stories),
     ];
-    return patterns.map(toEntry);
+    return patterns.map(id => toEntry(id));
 };
 const resolveConfig = async (localConfig) => {
     const addons = localConfig.addons?.map(addon => (typeof addon === 'string' ? addon : addon.name)) ?? [];

package/dist/plugins/tanstack-router/index.js

@@ -2,7 +2,7 @@ import { toEntry } from '../../util/input.js';
 import { extname, join } from '../../util/path.js';
 import { hasDependency } from '../../util/plugin.js';
 import { getCustomConfig } from './resolveFromAST.js';
-const title = 'tanstack-router';
+const title = 'TanStack Router';
 const enablers = ['@tanstack/react-router', '@tanstack/router-plugin', '@tanstack/router-cli'];
 const isEnabled = ({ dependencies }) => hasDependency(dependencies, enablers);
 const config = [

package/dist/plugins/unbuild/index.js

@@ -9,7 +9,7 @@ const resolveConfig = config => {
         .flat()
         .map(obj => obj.entries)
         .flatMap(entries => entries?.map(entry => (typeof entry === 'string' ? entry : entry.input)) ?? [])
-        .map(toEntry);
+        .map(id => toEntry(id));
 };
 export default {
     title,

package/dist/plugins/vitest/index.js

@@ -84,7 +84,7 @@ export const resolveConfig = async (localConfig, options) => {
         const dir = join(options.configFileDir, cfg.test?.root ?? '.');
         const deps = (typeof entry === 'string' ? [entry] : Object.values(entry))
             .map(specifier => join(dir, specifier))
-            .map(toEntry);
+            .map(id => toEntry(id));
         for (const dependency of deps)
             inputs.add(dependency);
     }

package/dist/util/glob-core.js

@@ -187,7 +187,7 @@ export async function glob(patterns, options) {
     const ignore = cachedIgnores || compact(_ignore);
     const { dir, label, ...fgOptions } = { ...options, ignore };
     const paths = await fg.glob(patterns, fgOptions);
-    debugLogObject(relative(options.cwd, dir) || ROOT_WORKSPACE_NAME, label ? `Finding ${label} paths` : 'Finding paths', () => ({ patterns, ...fgOptions, ignore: cachedIgnores ? `// identical to ${dir}` : ignore, paths }));
+    debugLogObject(relative(options.cwd, dir) || ROOT_WORKSPACE_NAME, label ? `Finding ${label}` : 'Finding paths', () => ({ patterns, ...fgOptions, ignore: cachedIgnores ? `// identical to ${dir}` : ignore, paths }));
     if (willCache)
         cachedGlobIgnores.set(options.dir, ignore);
     return paths;

package/dist/util/input.d.ts

@@ -7,6 +7,7 @@ export interface Input {
     optional?: boolean;
     dir?: string;
     containingFilePath?: string;
+    skipExportsAnalysis?: string;
 }
 export interface ConfigInput extends Input {
     type: 'config';

package/dist/util/object.d.ts

@@ -1,5 +1,4 @@
 export declare const getValuesByKeyDeep: (obj: any, key: string) => unknown[];
 export declare const findByKeyDeep: <T>(obj: any, key: string) => T[];
-export declare const getStringValues: (obj: any) => string[];
 export declare const getKeysByValue: <T>(obj: T, value: unknown) => (keyof T)[];
 export declare const get: <T>(obj: T, path: string) => any;

package/dist/util/object.js

@@ -32,22 +32,6 @@ export const findByKeyDeep = (obj, key) => {
     }
     return objects;
 };
-export const getStringValues = (obj) => {
-    if (typeof obj === 'string')
-        return [obj];
-    let values = [];
-    for (const prop in obj) {
-        if (obj[prop]) {
-            if (typeof obj[prop] === 'string') {
-                values.push(obj[prop]);
-            }
-            else if (typeof obj[prop] === 'object') {
-                values = values.concat(getStringValues(obj[prop]));
-            }
-        }
-    }
-    return values;
-};
 export const getKeysByValue = (obj, value) => {
     const keys = [];
     for (const key in obj) {

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

@@ -7,10 +7,8 @@ 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: {
+export declare const getEntryPathsFromManifest: (manifest: PackageJson, options: {
     cwd: string;
-    dir: string;
-    gitignore: boolean;
     ignore: string[];
 }) => Promise<string[]>;
 export {};

package/dist/util/package-json.js

@@ -1,6 +1,5 @@
 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';
@@ -19,6 +18,23 @@ const parseJson = (raw) => {
     }
     return result;
 };
+const getEntriesFromExports = (obj) => {
+    if (typeof obj === 'string')
+        return [obj];
+    let values = [];
+    for (const prop in obj) {
+        if (typeof obj[prop] === 'string') {
+            values.push(obj[prop]);
+        }
+        else if (obj[prop] === null) {
+            values.push(`!${prop}`);
+        }
+        else if (typeof obj[prop] === 'object') {
+            values = values.concat(getEntriesFromExports(obj[prop]));
+        }
+    }
+    return values;
+};
 export const load = async (filePath) => {
     const file = await readFile(filePath, 'utf8');
     return parseJson(file);
@@ -30,7 +46,7 @@ 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) => {
+export const getEntryPathsFromManifest = (manifest, options) => {
     const { main, module, browser, bin, exports, types, typings } = manifest;
     const entryPaths = new Set();
     if (typeof main === 'string')
@@ -47,12 +63,19 @@ export const getEntryPathsFromManifest = (manifest, sharedGlobOptions) => {
                 entryPaths.add(id);
     }
     if (exports) {
-        for (const item of getStringValues(exports))
-            entryPaths.add(item);
+        for (const item of getEntriesFromExports(exports)) {
+            if (item === './*')
+                continue;
+            const expanded = item
+                .replace(/\/\*$/, '/**')
+                .replace(/\/\*\./, '/**/*.')
+                .replace(/\/\*\//, '/**/');
+            entryPaths.add(expanded);
+        }
     }
     if (typeof types === 'string')
         entryPaths.add(types);
     if (typeof typings === 'string')
         entryPaths.add(typings);
-    return _glob({ ...sharedGlobOptions, patterns: Array.from(entryPaths), label: 'package.json entry' });
+    return _glob({ patterns: Array.from(entryPaths), ...options, gitignore: false, label: 'package.json entry paths' });
 };

package/dist/util/to-source-path.js

@@ -14,25 +14,22 @@ export const augmentWorkspace = (workspace, dir, compilerOptions) => {
 };
 export const getToSourcePathHandler = (chief) => {
     const toSourceMapCache = new Map();
-    const toSourcePath = (filePath) => {
+    return (filePath) => {
         if (!isInternal(filePath) || hasJSExt.test(filePath) || hasTSExt.test(filePath))
             return;
         if (toSourceMapCache.has(filePath))
             return toSourceMapCache.get(filePath);
         const workspace = chief.findWorkspaceByFilePath(filePath);
-        if (workspace) {
-            if (workspace.srcDir && workspace.outDir) {
-                if (filePath.startsWith(workspace.outDir)) {
-                    const pattern = filePath.replace(workspace.outDir, workspace.srcDir).replace(matchExt, defaultExtensions);
-                    const [srcFilePath] = fastGlob.sync(pattern);
-                    toSourceMapCache.set(filePath, srcFilePath);
-                    if (srcFilePath && srcFilePath !== filePath) {
-                        debugLog('*', `Rewiring ${toRelative(filePath)} → ${toRelative(srcFilePath)}`);
-                        return srcFilePath;
-                    }
+        if (workspace?.srcDir && workspace.outDir) {
+            if (filePath.startsWith(workspace.outDir)) {
+                const pattern = filePath.replace(workspace.outDir, workspace.srcDir).replace(matchExt, defaultExtensions);
+                const [srcFilePath] = fastGlob.sync(pattern);
+                toSourceMapCache.set(filePath, srcFilePath);
+                if (srcFilePath && srcFilePath !== filePath) {
+                    debugLog('*', `Source mapping ${toRelative(filePath)} → ${toRelative(srcFilePath)}`);
+                    return srcFilePath;
                 }
             }
         }
     };
-    return toSourcePath;
 };

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.48.0";
+export declare const version = "5.49.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = '5.48.0';
+export const version = '5.49.0';

package/package.json

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