knip 2.35.0 → 2.36.0

package/dist/ConfigurationChief.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="npmcli__package-json" />
 import { createPkgGraph } from '@pnpm/workspace.pkgs-graph';
 import type { SyncCompilers, AsyncCompilers } from './types/compilers.js';
 import type { Configuration, WorkspaceConfiguration } from './types/config.js';
-import type { PackageJsonWithPlugins } from './types/plugins.js';
+import type { PackageJson } from '@npmcli/package-json';
 type ConfigurationManagerOptions = {
     cwd: string;
     isProduction: boolean;
@@ -13,14 +14,14 @@ export type Workspace = {
     ancestors: string[];
     config: WorkspaceConfiguration;
     manifestPath: string;
-    manifest: PackageJsonWithPlugins;
+    manifest: PackageJson;
 };
 export declare class ConfigurationChief {
     cwd: string;
     isProduction: boolean;
     config: Configuration;
     manifestPath?: string;
-    manifest?: PackageJsonWithPlugins;
+    manifest?: PackageJson;
     ignoredWorkspacePatterns: string[];
     manifestWorkspaces: Map<string, string>;
     additionalWorkspaceNames: Set<string>;
@@ -29,7 +30,7 @@ export declare class ConfigurationChief {
     availableWorkspaceDirs: string[];
     availableWorkspaceManifests: {
         dir: string;
-        manifest: PackageJsonWithPlugins;
+        manifest: PackageJson;
     }[];
     workspacesGraph: ReturnType<typeof createPkgGraph> | undefined;
     enabledWorkspaces: Workspace[];

package/dist/WorkspaceWorker.d.ts

@@ -1,5 +1,5 @@
 import type { Configuration, PluginName, WorkspaceConfiguration } from './types/config.js';
-import type { PackageJsonWithPlugins } from './types/plugins.js';
+import type { PackageJsonWithPlugins } from './types/package-json.js';
 import type { InstalledBinaries, HostDependencies } from './types/workspace.js';
 type WorkspaceManagerOptions = {
     name: string;

package/dist/plugins/_template/index.js

@@ -11,7 +11,8 @@ export const PROJECT_FILE_PATTERNS = [];
 const findPluginDependencies = async (configFilePath, options) => {
     const { manifest, config, isProduction } = options;
     const localConfig = configFilePath.endsWith('package.json')
-        ? manifest.plugin
+        ?
+            manifest.plugin
         : await load(configFilePath);
     if (!localConfig)
         return [];

package/dist/plugins/eslint/helpers.d.ts

@@ -1,12 +1,7 @@
-/// <reference types="npmcli__package-json" />
-import type { ESLintConfig } from './types.js';
-import type { PackageJson } from '@npmcli/package-json';
-type Manifest = PackageJson & {
-    eslintConfig?: ESLintConfig;
-};
+import type { PackageJsonWithPlugins } from '../../types/package-json.js';
 type GetDependenciesDeep = (configFilePath: string, options: {
     cwd: string;
-    manifest: Manifest;
+    manifest: PackageJsonWithPlugins;
 }, dependencies?: Set<string>) => Promise<Set<string>>;
 export declare const getDependenciesDeep: GetDependenciesDeep;
 export declare const resolvePluginSpecifier: (specifier: string) => string;

package/dist/plugins/prettier/index.js

@@ -5,8 +5,8 @@ export const ENABLERS = ['prettier'];
 export const isEnabled = ({ dependencies, config }) => hasDependency(dependencies, ENABLERS) || 'prettier' in config;
 export const CONFIG_FILE_PATTERNS = [
     '.prettierrc',
-    '.prettierrc.{json,js,cjs,yml,yaml}',
-    'prettier.config.{js,cjs}',
+    '.prettierrc.{json,js,cjs,mjs,yml,yaml}',
+    'prettier.config.{js,cjs,mjs}',
     'package.json',
 ];
 const findPrettierDependencies = async (configFilePath, { manifest, isProduction }) => {

package/dist/plugins/typescript/index.js

@@ -25,19 +25,19 @@ const resolveExtensibleConfig = async (configFilePath) => {
 };
 export const findTypeScriptDependencies = async (configFilePath, options) => {
     const { isProduction } = options;
-    if (isProduction)
-        return [];
     const { compilerOptions } = await loadTSConfig(configFilePath);
     const localConfig = await resolveExtensibleConfig(configFilePath);
     if (!compilerOptions || !localConfig)
         return [];
+    const jsx = compilerOptions?.jsxImportSource ? [compilerOptions.jsxImportSource] : [];
+    if (isProduction)
+        return [...jsx];
     const extend = localConfig.extends ? [localConfig.extends].flat().filter(extend => !isInternal(extend)) : [];
     const types = compilerOptions.types ?? [];
     const plugins = Array.isArray(compilerOptions?.plugins)
         ? compilerOptions.plugins.map(plugin => (typeof plugin === 'object' && 'name' in plugin ? plugin.name : ''))
         : [];
     const importHelpers = compilerOptions?.importHelpers ? ['tslib'] : [];
-    const jsx = compilerOptions?.jsxImportSource ? [compilerOptions.jsxImportSource] : [];
     return compact([...extend, ...types, ...plugins, ...importHelpers, ...jsx]);
 };
 export const findDependencies = timerify(findTypeScriptDependencies);

package/dist/plugins/vite/index.js

@@ -1,6 +1,6 @@
 import { timerify } from '../../util/Performance.js';
 import { hasDependency, load } from '../../util/plugin.js';
-import { findVitestDeps } from '../vitest/index.js';
+import { findVitestDependencies } from '../vitest/index.js';
 export const NAME = 'Vite';
 export const ENABLERS = ['vite'];
 export const isEnabled = ({ dependencies }) => hasDependency(dependencies, ENABLERS);
@@ -9,16 +9,6 @@ const findViteDependencies = async (configFilePath, options) => {
     const localConfig = await load(configFilePath);
     if (!localConfig)
         return [];
-    if (typeof localConfig === 'function') {
-        const dependencies = new Set();
-        for (const command of ['dev', 'serve', 'build']) {
-            for (const mode of ['development', 'production']) {
-                const config = await localConfig({ command, mode, ssrBuild: undefined });
-                findVitestDeps(config, options).forEach(dependency => dependencies.add(dependency));
-            }
-        }
-        return Array.from(dependencies);
-    }
-    return findVitestDeps(localConfig, options);
+    return findVitestDependencies(localConfig, options);
 };
 export const findDependencies = timerify(findViteDependencies);

package/dist/plugins/vitest/helpers.d.ts

@@ -1,6 +1,6 @@
-import type { VitestConfig } from './types.js';
+import type { ViteConfig } from './types.js';
 type BuiltinEnvironment = 'node' | 'jsdom' | 'happy-dom' | 'edge-runtime';
 type VitestEnvironment = BuiltinEnvironment | (string & Record<never, never>);
 export declare const getEnvPackageName: (env: VitestEnvironment) => any;
-export declare const getExternalReporters: (reporters?: VitestConfig['test']['reporters']) => unknown[];
+export declare const getExternalReporters: (reporters?: ViteConfig['test']['reporters']) => unknown[];
 export {};

package/dist/plugins/vitest/index.d.ts

@@ -1,9 +1,9 @@
-import type { VitestConfigOrFn } from './types.js';
+import type { ViteConfigOrFn } from './types.js';
 import type { IsPluginEnabledCallback, GenericPluginCallback, GenericPluginCallbackOptions } from '../../types/plugins.js';
 export declare const NAME = "Vitest";
 export declare const ENABLERS: string[];
 export declare const isEnabled: IsPluginEnabledCallback;
 export declare const CONFIG_FILE_PATTERNS: string[];
 export declare const ENTRY_FILE_PATTERNS: string[];
-export declare const findVitestDeps: (localConfig: VitestConfigOrFn, options: GenericPluginCallbackOptions) => any[];
+export declare const findVitestDependencies: (localConfig: ViteConfigOrFn, options: GenericPluginCallbackOptions) => Promise<any[]>;
 export declare const findDependencies: GenericPluginCallback;

package/dist/plugins/vitest/index.js

@@ -1,4 +1,3 @@
-import { compact } from '../../util/array.js';
 import { timerify } from '../../util/Performance.js';
 import { hasDependency, load } from '../../util/plugin.js';
 import { toEntryPattern } from '../../util/protocols.js';
@@ -8,14 +7,11 @@ export const ENABLERS = ['vitest'];
 export const isEnabled = ({ dependencies }) => hasDependency(dependencies, ENABLERS);
 export const CONFIG_FILE_PATTERNS = ['vitest.config.ts', 'vitest.{workspace,projects}.{ts,js,json}'];
 export const ENTRY_FILE_PATTERNS = ['**/*.{test,spec}.?(c|m)[jt]s?(x)'];
-export const findVitestDeps = (localConfig, options) => {
-    const { isProduction } = options;
-    localConfig = typeof localConfig === 'function' ? localConfig() : localConfig;
-    if (!localConfig || !localConfig.test)
-        return [];
+const findConfigDependencies = (localConfig, options) => {
+    const { isProduction, config } = options;
     const testConfig = localConfig.test;
-    const entryPatterns = (options.config?.entry ?? testConfig.include ?? ENTRY_FILE_PATTERNS).map(toEntryPattern);
-    if (isProduction)
+    const entryPatterns = (config?.entry ?? testConfig?.include ?? ENTRY_FILE_PATTERNS).map(toEntryPattern);
+    if (!testConfig || isProduction)
         return entryPatterns;
     const environments = testConfig.environment ? [getEnvPackageName(testConfig.environment)] : [];
     const reporters = getExternalReporters(testConfig.reporters);
@@ -24,10 +20,31 @@ export const findVitestDeps = (localConfig, options) => {
     const globalSetup = testConfig.globalSetup ? [testConfig.globalSetup].flat() : [];
     return [...entryPatterns, ...environments, ...reporters, ...coverage, ...setupFiles, ...globalSetup];
 };
-const findVitestDependencies = async (configFilePath, options) => {
+export const findVitestDependencies = async (localConfig, options) => {
+    if (!localConfig)
+        return [];
+    if (typeof localConfig === 'function') {
+        const dependencies = new Set();
+        for (const command of ['dev', 'serve', 'build']) {
+            for (const mode of ['development', 'production']) {
+                const config = await localConfig({ command, mode, ssrBuild: undefined });
+                findConfigDependencies(config, options).forEach(dependency => dependencies.add(dependency));
+            }
+        }
+        return Array.from(dependencies);
+    }
+    if (!localConfig.test)
+        return [];
+    return findConfigDependencies(localConfig, options);
+};
+const findVitestWorkspaceDependencies = async (configFilePath, options) => {
     const localConfig = await load(configFilePath);
-    return compact([localConfig]
-        .flat()
-        .flatMap(config => (!config || typeof config === 'string' ? [] : findVitestDeps(config, options))));
+    const dependencies = new Set();
+    for (const config of [localConfig].flat()) {
+        if (config && typeof config !== 'string') {
+            (await findVitestDependencies(config, options)).forEach(dependency => dependencies.add(dependency));
+        }
+    }
+    return Array.from(dependencies);
 };
-export const findDependencies = timerify(findVitestDependencies);
+export const findDependencies = timerify(findVitestWorkspaceDependencies);

package/dist/plugins/vitest/types.d.ts

@@ -1,4 +1,4 @@
-export interface VitestConfig {
+interface VitestConfig {
     test: {
         include: string[];
         coverage?: {
@@ -10,5 +10,16 @@ export interface VitestConfig {
         setupFiles?: string | string[];
     };
 }
-export type VitestConfigOrFn = VitestConfig | (() => VitestConfig);
-export type VitestWorkspaceConfig = (string | VitestConfig)[];
+export interface ViteConfig extends VitestConfig {
+    plugins: unknown[];
+}
+export type COMMAND = 'dev' | 'serve' | 'build';
+export type MODE = 'development' | 'production';
+interface Options {
+    command: COMMAND;
+    mode: MODE;
+    ssrBuild?: boolean | undefined;
+}
+export type ViteConfigOrFn = ViteConfig | ((options: Options) => ViteConfig) | ((options: Options) => Promise<ViteConfig>);
+export type VitestWorkspaceConfig = (string | ViteConfig)[];
+export {};

package/dist/types/config.d.ts

@@ -7,6 +7,7 @@ export type RawConfiguration = z.infer<typeof ConfigurationValidator>;
 export type RawPluginConfiguration = z.infer<typeof pluginSchema>;
 type NormalizedGlob = string[];
 export type PluginName = keyof typeof Plugins;
+export type PluginMap = typeof Plugins;
 export type EnsuredPluginConfiguration = {
     config: NormalizedGlob | null;
     entry: NormalizedGlob | null;

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

@@ -0,0 +1,41 @@
+import type { PluginMap } from './config.js';
+import type { LiteralUnion, MergeUnion } from './util.js';
+type Dependency = Record<string, string>;
+type ExportCondition = LiteralUnion<'import' | 'require' | 'node' | 'node-addons' | 'deno' | 'browser' | 'electron' | 'react-native' | 'default', string>;
+type Exports = null | string | string[] | {
+    [key in ExportCondition]: Exports;
+} | {
+    [key: string]: Exports;
+};
+type ExtractKeys<T, K extends string> = T extends {
+    PACKAGE_JSON_PATH: infer P;
+} ? P extends `${infer First}.${infer Second}` ? {
+    [K1 in First]?: {
+        [K2 in Second]?: unknown;
+    };
+} : {
+    [P in T['PACKAGE_JSON_PATH'] & string]?: unknown;
+} : Record<K, unknown>;
+type PluginKeys = {
+    [K in keyof PluginMap]: ExtractKeys<PluginMap[K], K>;
+};
+type Plugins = MergeUnion<PluginKeys[keyof PluginMap]>;
+export type PackageJsonWithPlugins = {
+    name?: string;
+    main?: string;
+    bin?: string | Record<string, string>;
+    version?: string;
+    workspaces?: string[] | {
+        packages?: string[];
+    };
+    exports?: Exports;
+    scripts?: Record<string, string>;
+    dependencies?: Dependency;
+    devDependencies?: Dependency;
+    peerDependencies?: Dependency;
+    optionalDependencies?: Dependency;
+    peerDependenciesMeta?: Record<string, {
+        optional: true;
+    }>;
+} & Plugins;
+export {};

package/dist/types/plugins.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="npmcli__package-json" />
 import type { EnsuredPluginConfiguration, WorkspaceConfiguration } from './config.js';
-import type { PackageJson } from '@npmcli/package-json';
-export type PackageJsonWithPlugins = PackageJson & Record<string, unknown>;
+import type { PackageJsonWithPlugins } from './package-json.js';
 type IsPluginEnabledCallbackOptions = {
     cwd: string;
-    manifest: PackageJson;
+    manifest: PackageJsonWithPlugins;
     dependencies: Set<string>;
     config: WorkspaceConfiguration;
 };

package/dist/types/util.d.ts

@@ -0,0 +1,16 @@
+type Primitive = null | undefined | string | number | boolean | symbol | bigint;
+export type LiteralUnion<LiteralType, BaseType extends Primitive> = LiteralType | (BaseType & Record<never, never>);
+type CommonKeys<T extends object> = keyof T;
+type AllKeys<T> = T extends unknown ? keyof T : never;
+type Subtract<A, C> = A extends C ? never : A;
+type NonCommonKeys<T extends object> = Subtract<AllKeys<T>, CommonKeys<T>>;
+type PickType<T, K extends AllKeys<T>> = T extends {
+    [k in K]?: unknown;
+} ? T[K] : undefined;
+type PickTypeOf<T, K extends string | number | symbol> = K extends AllKeys<T> ? PickType<T, K> : never;
+export type MergeUnion<T extends object> = {
+    [k in CommonKeys<T>]: PickTypeOf<T, k>;
+} & {
+    [k in NonCommonKeys<T>]?: PickTypeOf<T, k>;
+};
+export {};

package/dist/types/util.js

@@ -0,0 +1 @@
+export {};

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.35.0";
+export declare const version = "2.36.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = '2.35.0';
+export const version = '2.36.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "2.35.0",
+  "version": "2.36.0",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://github.com/webpro/knip",
   "repository": "github:webpro/knip",
@@ -46,7 +46,7 @@
     "@npmcli/map-workspaces": "^3.0.4",
     "@pkgjs/parseargs": "0.11.0",
     "@pnpm/logger": "5.0.0",
-    "@pnpm/workspace.pkgs-graph": "2.0.7",
+    "@pnpm/workspace.pkgs-graph": "2.0.8",
     "@snyk/github-codeowners": "^1.1.0",
     "chalk": "^5.2.0",
     "easy-table": "^1.2.0",
@@ -61,26 +61,26 @@
     "summary": "^2.1.0",
     "typescript": "^5.0.2",
     "zod": "3.22.4",
-    "zod-validation-error": "^1.5.0"
+    "zod-validation-error": "2.0.0"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",
     "@npmcli/package-json": "5.0.0",
     "@release-it/bumper": "5.1.0",
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.92",
-    "@types/eslint": "8.44.4",
-    "@types/js-yaml": "4.0.7",
-    "@types/micromatch": "4.0.3",
-    "@types/minimist": "1.2.3",
-    "@types/node": "20.8.4",
-    "@types/npmcli__map-workspaces": "3.0.2",
-    "@types/pkgjs__parseargs": "0.10.1",
-    "@types/webpack": "5.28.3",
-    "@typescript-eslint/eslint-plugin": "6.7.5",
-    "@typescript-eslint/parser": "6.7.5",
+    "@swc/core": "1.3.94",
+    "@types/eslint": "8.44.6",
+    "@types/js-yaml": "4.0.8",
+    "@types/micromatch": "4.0.4",
+    "@types/minimist": "1.2.4",
+    "@types/node": "20.8.7",
+    "@types/npmcli__map-workspaces": "3.0.3",
+    "@types/pkgjs__parseargs": "0.10.2",
+    "@types/webpack": "5.28.4",
+    "@typescript-eslint/eslint-plugin": "6.8.0",
+    "@typescript-eslint/parser": "6.8.0",
     "c8": "8.0.1",
-    "eslint": "8.51.0",
+    "eslint": "8.52.0",
     "eslint-import-resolver-typescript": "3.6.1",
     "eslint-plugin-import": "2.28.1",
     "eslint-plugin-n": "16.2.0",
@@ -89,8 +89,8 @@
     "release-it": "16.2.1",
     "remark-cli": "12.0.0",
     "remark-preset-webpro": "1.0.0",
-    "tsx": "3.13.0",
-    "type-fest": "4.4.0"
+    "tsx": "3.14.0",
+    "type-fest": "4.5.0"
   },
   "engines": {
     "node": ">=16.17.0 <17 || >=18.6.0"

package/schema.json

@@ -133,7 +133,7 @@
       }
     },
     "globPatterns": {
-      "description": "Use file paths and glob patterns to match files. Knip uses fast-glob and and minimatch (https://github.com/micromatch/micromatch#matching-features)",
+      "description": "Use file paths and glob patterns to match files. Knip uses fast-glob and minimatch (https://github.com/micromatch/micromatch#matching-features)",
       "anyOf": [
         {
           "type": "string"

package/dist/plugins/vite/types.d.ts

@@ -1,13 +0,0 @@
-import type { VitestConfig } from '../vitest/types.js';
-interface Config extends VitestConfig {
-    plugins: unknown[];
-}
-export type COMMAND = 'dev' | 'serve' | 'build';
-export type MODE = 'development' | 'production';
-interface Options {
-    command: COMMAND;
-    mode: MODE;
-    ssrBuild?: boolean | undefined;
-}
-export type ViteConfig = Config | ((options: Options) => Config) | ((options: Options) => Promise<Config>);
-export {};