knip 2.28.0 → 2.30.0

package/dist/DependencyDeputy.d.ts

@@ -13,6 +13,7 @@ export declare class DependencyDeputy {
     referencedBinaries: Map<string, Set<string>>;
     hostDependencies: Map<string, HostDependencies>;
     installedBinaries: Map<string, InstalledBinaries>;
+    hasTypesIncluded: Map<string, Set<string>>;
     ignoreBinaries: string[];
     ignoreDependencies: string[];
     constructor({ isStrict }: Options);
@@ -42,6 +43,8 @@ export declare class DependencyDeputy {
     getDevDependencies(workspaceName: string): string[];
     setInstalledBinaries(workspaceName: string, installedBinaries: Map<string, Set<string>>): void;
     getInstalledBinaries(workspaceName: string): InstalledBinaries | undefined;
+    setHasTypesIncluded(workspaceName: string, hasTypesIncluded: Set<string>): void;
+    getHasTypesIncluded(workspaceName: string): InstalledBinaries | undefined;
     addReferencedDependency(workspaceName: string, packageName: string): void;
     addReferencedBinary(workspaceName: string, binaryName: string): void;
     addHostDependencies(workspaceName: string, hostDependencies: HostDependencies): void;

package/dist/DependencyDeputy.js

@@ -8,6 +8,7 @@ export class DependencyDeputy {
     referencedBinaries;
     hostDependencies;
     installedBinaries;
+    hasTypesIncluded;
     ignoreBinaries = [];
     ignoreDependencies = [];
     constructor({ isStrict }) {
@@ -16,6 +17,7 @@ export class DependencyDeputy {
         this.referencedBinaries = new Map();
         this.hostDependencies = new Map();
         this.installedBinaries = new Map();
+        this.hasTypesIncluded = new Map();
     }
     addWorkspace({ name, dir, manifestPath, manifest, ignoreDependencies, ignoreBinaries, }) {
         const scripts = Object.values(manifest.scripts ?? {});
@@ -67,6 +69,12 @@ export class DependencyDeputy {
     getInstalledBinaries(workspaceName) {
         return this.installedBinaries.get(workspaceName);
     }
+    setHasTypesIncluded(workspaceName, hasTypesIncluded) {
+        this.hasTypesIncluded.set(workspaceName, hasTypesIncluded);
+    }
+    getHasTypesIncluded(workspaceName) {
+        return this.installedBinaries.get(workspaceName);
+    }
     addReferencedDependency(workspaceName, packageName) {
         if (!this.referencedDependencies.has(workspaceName)) {
             this.referencedDependencies.set(workspaceName, new Set());
@@ -155,6 +163,7 @@ export class DependencyDeputy {
         for (const [workspaceName, { manifestPath, ignoreDependencies, ignoreBinaries }] of this._manifests.entries()) {
             const referencedDependencies = this.referencedDependencies.get(workspaceName);
             const installedBinaries = this.getInstalledBinaries(workspaceName);
+            const hasTypesIncluded = this.getHasTypesIncluded(workspaceName);
             const ignoreBins = [...IGNORED_GLOBAL_BINARIES, ...this.ignoreBinaries, ...ignoreBinaries];
             const ignoreDeps = [...IGNORED_DEPENDENCIES, ...this.ignoreDependencies, ...ignoreDependencies];
             const isNotIgnoredDependency = (packageName) => !ignoreDeps.includes(packageName);
@@ -176,6 +185,8 @@ export class DependencyDeputy {
                     return false;
                 const [scope, typedDependency] = dependency.split('/');
                 if (scope === '@types') {
+                    if (hasTypesIncluded?.has(typedDependency))
+                        return false;
                     const typedPackageName = getPackageFromDefinitelyTyped(typedDependency);
                     if (IGNORE_DEFINITELY_TYPED.includes(typedPackageName))
                         return true;

package/dist/ProjectPrincipal.js

@@ -6,7 +6,7 @@ import { getJSDocTags, isInModuleBlock } from './typescript/ast-helpers.js';
 import { createHosts } from './typescript/createHosts.js';
 import { getImportsAndExports } from './typescript/getImportsAndExports.js';
 import { SourceFileManager } from './typescript/SourceFileManager.js';
-import { isMaybePackageName } from './util/modules.js';
+import { isMaybePackageName, sanitizeSpecifier } from './util/modules.js';
 import { dirname, extname, isInNodeModules, join } from './util/path.js';
 import { timerify } from './util/Performance.js';
 const baseCompilerOptions = {
@@ -128,7 +128,7 @@ export class ProjectPrincipal {
                 }
             }
             else {
-                const sanitizedSpecifier = specifier.replace(/^([?!|-]+)?([^!?]+).*/, '$2');
+                const sanitizedSpecifier = sanitizeSpecifier(specifier);
                 if (isMaybePackageName(sanitizedSpecifier)) {
                     external.add(sanitizedSpecifier);
                 }

package/dist/WorkspaceWorker.d.ts

@@ -30,6 +30,7 @@ export declare class WorkspaceWorker {
     referencedDependencies: ReferencedDependencies;
     hostDependencies: HostDependencies;
     installedBinaries: InstalledBinaries;
+    hasTypesIncluded: Set<string>;
     constructor({ name, dir, cwd, config, manifest, isProduction, isStrict, rootIgnore, negatedWorkspacePatterns, enabledPluginsInAncestors, }: WorkspaceManagerOptions);
     init(): Promise<void>;
     private setEnabledPlugins;
@@ -50,6 +51,7 @@ export declare class WorkspaceWorker {
         hostDependencies: HostDependencies;
         installedBinaries: InstalledBinaries;
         referencedDependencies: ReferencedDependencies;
+        hasTypesIncluded: Set<string>;
         enabledPlugins: ("angular" | "ava" | "babel" | "capacitor" | "changesets" | "commitizen" | "commitlint" | "cspell" | "cypress" | "eslint" | "gatsby" | "husky" | "jest" | "lefthook" | "markdownlint" | "mocha" | "next" | "nx" | "nyc" | "playwright" | "postcss" | "prettier" | "remark" | "remix" | "rollup" | "sentry" | "storybook" | "stryker" | "stylelint" | "tailwind" | "typedoc" | "typescript" | "vite" | "vitest" | "webpack" | "drizzle" | "githubActions" | "lintStaged" | "npmPackageJsonLint" | "playwrightCt" | "releaseIt" | "semanticRelease" | "svelte")[];
     }>;
 }

package/dist/WorkspaceWorker.js

@@ -22,6 +22,7 @@ export class WorkspaceWorker {
     referencedDependencies = new Set();
     hostDependencies = new Map();
     installedBinaries = new Map();
+    hasTypesIncluded = new Set();
     constructor({ name, dir, cwd, config, manifest, isProduction, isStrict, rootIgnore, negatedWorkspacePatterns, enabledPluginsInAncestors, }) {
         this.name = name;
         this.dir = dir;
@@ -59,7 +60,7 @@ export class WorkspaceWorker {
         debugLogObject(`Enabled plugins (${this.name})`, enabledPluginNames);
     }
     async initReferencedDependencies() {
-        const { dependencies, hostDependencies, installedBinaries } = await npm.findDependencies({
+        const { dependencies, hostDependencies, installedBinaries, hasTypesIncluded } = await npm.findDependencies({
             manifest: this.manifest,
             isProduction: this.isProduction,
             isStrict: this.isStrict,
@@ -70,6 +71,7 @@ export class WorkspaceWorker {
         dependencies.forEach(dependency => this.referencedDependencies.add([filePath, dependency]));
         this.hostDependencies = hostDependencies;
         this.installedBinaries = installedBinaries;
+        this.hasTypesIncluded = hasTypesIncluded;
     }
     getConfigForPlugin(pluginName) {
         return this.config[pluginName] ?? { config: null, entry: null, project: null };
@@ -238,6 +240,7 @@ export class WorkspaceWorker {
             hostDependencies: this.hostDependencies,
             installedBinaries: this.installedBinaries,
             referencedDependencies: this.referencedDependencies,
+            hasTypesIncluded: this.hasTypesIncluded,
             enabledPlugins: this.enabledPlugins,
         };
     }

package/dist/index.js

@@ -168,9 +168,10 @@ export const main = async (unresolvedConfiguration) => {
         if (chief.resolvedConfigFilePath)
             principal.addEntryPath(chief.resolvedConfigFilePath, { skipExportsAnalysis: true });
         const dependencies = await worker.findAllDependencies();
-        const { referencedDependencies, hostDependencies, installedBinaries, enabledPlugins } = dependencies;
+        const { referencedDependencies, hostDependencies, installedBinaries, enabledPlugins, hasTypesIncluded } = dependencies;
         deputy.addHostDependencies(name, hostDependencies);
         deputy.setInstalledBinaries(name, installedBinaries);
+        deputy.setHasTypesIncluded(name, hasTypesIncluded);
         enabledPluginsStore.set(name, enabledPlugins);
         referencedDependencies.forEach(([containingFilePath, specifier]) => {
             handleReferencedDependency({ specifier, containingFilePath, principal, workspace });

package/dist/manifest/index.d.ts

@@ -12,5 +12,6 @@ export declare const findDependencies: ({ manifest, isProduction, isStrict, dir,
     dependencies: string[];
     hostDependencies: HostDependencies;
     installedBinaries: InstalledBinaries;
+    hasTypesIncluded: Set<string>;
 }>;
 export {};

package/dist/manifest/index.js

@@ -1,4 +1,5 @@
 import { _getDependenciesFromScripts } from '../binaries/index.js';
+import { isDefinitelyTyped } from '../util/modules.js';
 import { timerify } from '../util/Performance.js';
 import { getPackageManifest } from './helpers.js';
 const findManifestDependencies = async ({ manifest, isProduction, isStrict, dir, cwd }) => {
@@ -12,6 +13,7 @@ const findManifestDependencies = async ({ manifest, isProduction, isStrict, dir,
     }, []);
     const dependencies = _getDependenciesFromScripts(scripts, { cwd: dir, manifest });
     const installedBinaries = new Map();
+    const hasTypesIncluded = new Set();
     const packageNames = [
         ...Object.keys(manifest.dependencies ?? {}),
         ...(isStrict ? Object.keys(manifest.peerDependencies ?? {}) : []),
@@ -45,12 +47,15 @@ const findManifestDependencies = async ({ manifest, isProduction, isStrict, dir,
                     hostDependencies.set(packagePeerDependency, new Set([packageName]));
                 }
             });
+            if (!isDefinitelyTyped(packageName) && (manifest.types || manifest.typings))
+                hasTypesIncluded.add(packageName);
         }
     }
     return {
         dependencies,
         hostDependencies,
         installedBinaries,
+        hasTypesIncluded,
     };
 };
 export const findDependencies = timerify(findManifestDependencies);

package/dist/plugins/next/index.js

@@ -9,7 +9,7 @@ const productionEntryFilePatternsWithoutSrc = [
     'app/**/{error,layout,loading,not-found,page,template}.{js,jsx,ts,tsx}',
     'instrumentation.{js,ts}',
     'app/{manifest,sitemap,robots}.{js,ts}',
-    'app/**/{icon,apple-icon}-image.{js,ts,tsx}',
+    'app/**/{icon,apple-icon}.{js,ts,tsx}',
     'app/**/{opengraph,twitter}-image.{js,ts,tsx}',
     'pages/**/*.{js,jsx,ts,tsx}',
 ];

package/dist/plugins/vitest/index.js

@@ -5,7 +5,7 @@ import { getEnvPackageName, getExternalReporters } from './helpers.js';
 export const NAME = 'Vitest';
 export const ENABLERS = ['vitest'];
 export const isEnabled = ({ dependencies }) => hasDependency(dependencies, ENABLERS);
-export const CONFIG_FILE_PATTERNS = ['vitest.config.ts'];
+export const CONFIG_FILE_PATTERNS = ['vitest.config.ts', 'vitest.{workspace,projects}.{ts,js,json}'];
 export const ENTRY_FILE_PATTERNS = [];
 export const findVitestDeps = (config) => {
     if (!config || !config.test)
@@ -18,8 +18,20 @@ export const findVitestDeps = (config) => {
     const globalSetup = cfg.globalSetup ? [cfg.globalSetup].flat() : [];
     return compact([...environments, ...reporters, ...coverage, ...setupFiles, ...globalSetup]);
 };
+const findVitestWorkspaceDeps = (config) => {
+    let deps = [];
+    for (const cfg of config) {
+        if (typeof cfg === 'string')
+            continue;
+        deps = [...deps, ...findVitestDeps(cfg)];
+    }
+    return compact(deps);
+};
 const findVitestDependencies = async (configFilePath) => {
     const config = await load(configFilePath);
+    if (Array.isArray(config)) {
+        return findVitestWorkspaceDeps(config);
+    }
     return findVitestDeps(config);
 };
 export const findDependencies = timerify(findVitestDependencies);

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

@@ -9,3 +9,4 @@ export interface VitestConfig {
         setupFiles?: string | string[];
     };
 }
+export type VitestWorkspaceConfig = (string | VitestConfig)[];

package/dist/typescript/getImportsAndExports.js

@@ -1,9 +1,7 @@
-import { existsSync } from 'node:fs';
 import { isBuiltin } from 'node:module';
-import { resolve, dirname } from 'node:path';
 import ts from 'typescript';
 import { getOrSet } from '../util/map.js';
-import { isMaybePackageName } from '../util/modules.js';
+import { isMaybePackageName, sanitizeSpecifier } from '../util/modules.js';
 import { isInNodeModules } from '../util/path.js';
 import { isDeclarationFileExtension, isAccessExpression, getAccessExpressionName, getJSDocTags, } from './ast-helpers.js';
 import getExportVisitors from './visitors/exports/index.js';
@@ -60,13 +58,14 @@ export const getImportsAndExports = (sourceFile, options) => {
                     if (!isInNodeModules(filePath)) {
                         addInternalImport({ identifier, specifier, symbol, filePath, isReExport });
                     }
-                    if (!isMaybePackageName(specifier))
+                    const sanitizedSpecifier = sanitizeSpecifier(specifier);
+                    if (!isMaybePackageName(sanitizedSpecifier))
                         return;
                     if (isDeclarationFileExtension(module.resolvedModule.extension)) {
-                        externalImports.add(specifier);
+                        externalImports.add(sanitizedSpecifier);
                     }
                     else {
-                        externalImports.add(module.resolvedModule.packageId?.name ?? specifier);
+                        externalImports.add(module.resolvedModule.packageId?.name ?? sanitizedSpecifier);
                     }
                 }
                 else {
@@ -75,13 +74,7 @@ export const getImportsAndExports = (sourceFile, options) => {
             }
         }
         else {
-            const filePath = resolve(dirname(sourceFile.fileName), specifier);
-            if (existsSync(filePath)) {
-                unresolvedImports.add(filePath);
-            }
-            else {
-                unresolvedImports.add(specifier);
-            }
+            unresolvedImports.add(specifier);
         }
     };
     const maybeAddNamespaceAccessAsImport = ({ namespace, member }) => {

package/dist/typescript/resolveModuleNames.js

@@ -1,11 +1,29 @@
+import { existsSync } from 'node:fs';
 import ts from 'typescript';
+import { sanitizeSpecifier } from '../util/modules.js';
+import { dirname, extname, isInternal, join } from '../util/path.js';
 import { ensureRealFilePath, isVirtualFilePath } from './utils.js';
 export function createCustomModuleResolver(customSys, compilerOptions, virtualFileExtensions) {
     function resolveModuleNames(moduleNames, containingFile) {
         return moduleNames.map(moduleName => resolveModuleName(moduleName, containingFile));
     }
     function resolveModuleName(name, containingFile) {
-        const tsResolvedModule = ts.resolveModuleName(name, containingFile, compilerOptions, ts.sys).resolvedModule;
+        const sanitizedSpecifier = sanitizeSpecifier(name);
+        const tsResolvedModule = ts.resolveModuleName(sanitizedSpecifier, containingFile, compilerOptions, ts.sys).resolvedModule;
+        if (!tsResolvedModule) {
+            const extension = extname(sanitizedSpecifier);
+            if (extension && isInternal(sanitizedSpecifier) && !virtualFileExtensions.includes(extension)) {
+                const resolvedFileName = join(dirname(containingFile), sanitizedSpecifier);
+                if (existsSync(resolvedFileName)) {
+                    return {
+                        resolvedFileName,
+                        extension,
+                        isExternalLibraryImport: false,
+                        resolvedUsingTsExtension: false,
+                    };
+                }
+            }
+        }
         if (virtualFileExtensions.length === 0)
             return tsResolvedModule;
         if (tsResolvedModule && !isVirtualFilePath(tsResolvedModule.resolvedFileName, virtualFileExtensions)) {

package/dist/util/modules.d.ts

@@ -6,3 +6,4 @@ export declare const isDefinitelyTyped: (packageName: string) => boolean;
 export declare const getDefinitelyTypedFor: (packageName: string) => string;
 export declare const getPackageFromDefinitelyTyped: (typedDependency: string) => string;
 export declare const getEntryPathFromManifest: (cwd: string, dir: string, manifest: PackageJson) => Promise<string[]>;
+export declare const sanitizeSpecifier: (specifier: string) => string;

package/dist/util/modules.js

@@ -50,3 +50,4 @@ export const getEntryPathFromManifest = (cwd, dir, manifest) => {
     }
     return _glob({ cwd, workingDir: dir, patterns: Array.from(entryPaths) });
 };
+export const sanitizeSpecifier = (specifier) => specifier.replace(/^([?!|-]+)?([^!?]+).*/, '$2');

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "2.28.0";
+export declare const version = "2.30.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = '2.28.0';
+export const version = '2.30.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "2.28.0",
+  "version": "2.30.0",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript projects",
   "homepage": "https://github.com/webpro/knip",
   "repository": "github:webpro/knip",
@@ -65,12 +65,12 @@
     "@npmcli/package-json": "5.0.0",
     "@release-it/bumper": "5.1.0",
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.89",
+    "@swc/core": "1.3.90",
     "@types/eslint": "8.44.3",
     "@types/js-yaml": "4.0.6",
-    "@types/micromatch": "4.0.2",
-    "@types/minimist": "1.2.2",
-    "@types/node": "20.6.5",
+    "@types/micromatch": "4.0.3",
+    "@types/minimist": "1.2.3",
+    "@types/node": "20.7.1",
     "@types/npmcli__map-workspaces": "3.0.2",
     "@types/webpack": "5.28.3",
     "@typescript-eslint/eslint-plugin": "6.7.3",
@@ -81,11 +81,11 @@
     "eslint-plugin-import": "2.28.1",
     "eslint-plugin-n": "16.1.0",
     "prettier": "3.0.3",
-    "release-it": "16.2.0",
+    "release-it": "16.2.1",
     "remark-cli": "11.0.0",
     "remark-preset-webpro": "0.0.3",
     "tsx": "3.13.0",
-    "type-fest": "4.3.1"
+    "type-fest": "4.3.2"
   },
   "engines": {
     "node": ">=16.17.0 <17 || >=18.6.0"