knip 5.50.2 → 5.50.4

package/dist/ConfigurationChief.js

@@ -86,7 +86,7 @@ export class ConfigurationChief {
         this.manifest = manifest;
         const pnpmWorkspacesPath = findFile(this.cwd, 'pnpm-workspace.yaml');
         const pnpmWorkspaces = pnpmWorkspacesPath && (await _load(pnpmWorkspacesPath));
-        if (this.manifest && !this.manifest.workspaces && pnpmWorkspaces) {
+        if (this.manifest && pnpmWorkspaces) {
             this.manifest.workspaces = pnpmWorkspaces;
         }
         for (const configPath of rawConfigArg ? [rawConfigArg] : KNIP_CONFIG_LOCATIONS) {

package/dist/WorkspaceWorker.d.ts

@@ -23,8 +23,7 @@ type WorkspaceManagerOptions = {
     isStrict: boolean;
     isCache: boolean;
     cacheLocation: string;
-    extConfigFilesMap: Map<string, Map<PluginName, Set<string>>>;
-    configFilesMap: Map<PluginName, Set<string>>;
+    configFilesMap: Map<string, Map<PluginName, Set<string>>>;
 };
 type CacheItem = {
     resolveEntryPaths?: Input[];
@@ -50,9 +49,8 @@ export declare class WorkspaceWorker {
     enabledPlugins: PluginName[];
     enabledPluginsInAncestors: string[];
     cache: CacheConsultant<CacheItem>;
-    extConfigFilesMap: Map<string, Map<PluginName, Set<string>>>;
-    configFilesMap: Map<PluginName, Set<string>>;
-    constructor({ name, dir, cwd, config, manifest, dependencies, isProduction, isStrict, rootIgnore, negatedWorkspacePatterns, ignoredWorkspacePatterns, enabledPluginsInAncestors, getReferencedInternalFilePath, findWorkspaceByFilePath, getSourceFile, isCache, cacheLocation, extConfigFilesMap, configFilesMap, }: WorkspaceManagerOptions);
+    configFilesMap: Map<string, Map<PluginName, Set<string>>>;
+    constructor({ name, dir, cwd, config, manifest, dependencies, isProduction, isStrict, rootIgnore, negatedWorkspacePatterns, ignoredWorkspacePatterns, enabledPluginsInAncestors, getReferencedInternalFilePath, findWorkspaceByFilePath, getSourceFile, isCache, cacheLocation, configFilesMap, }: WorkspaceManagerOptions);
     init(): Promise<void>;
     private determineEnabledPlugins;
     private getConfigForPlugin;

package/dist/WorkspaceWorker.js

@@ -31,9 +31,8 @@ export class WorkspaceWorker {
     enabledPlugins = [];
     enabledPluginsInAncestors;
     cache;
-    extConfigFilesMap;
     configFilesMap;
-    constructor({ name, dir, cwd, config, manifest, dependencies, isProduction, isStrict, rootIgnore, negatedWorkspacePatterns, ignoredWorkspacePatterns, enabledPluginsInAncestors, getReferencedInternalFilePath, findWorkspaceByFilePath, getSourceFile, isCache, cacheLocation, extConfigFilesMap, configFilesMap, }) {
+    constructor({ name, dir, cwd, config, manifest, dependencies, isProduction, isStrict, rootIgnore, negatedWorkspacePatterns, ignoredWorkspacePatterns, enabledPluginsInAncestors, getReferencedInternalFilePath, findWorkspaceByFilePath, getSourceFile, isCache, cacheLocation, configFilesMap, }) {
         this.name = name;
         this.dir = dir;
         this.cwd = cwd;
@@ -46,7 +45,6 @@ export class WorkspaceWorker {
         this.negatedWorkspacePatterns = negatedWorkspacePatterns;
         this.ignoredWorkspacePatterns = ignoredWorkspacePatterns;
         this.enabledPluginsInAncestors = enabledPluginsInAncestors;
-        this.extConfigFilesMap = extConfigFilesMap;
         this.configFilesMap = configFilesMap;
         this.getReferencedInternalFilePath = getReferencedInternalFilePath;
         this.findWorkspaceByFilePath = findWorkspaceByFilePath;
@@ -189,19 +187,20 @@ export class WorkspaceWorker {
                 inputs.push({ ...input, containingFilePath });
             }
         };
-        const extMap = this.extConfigFilesMap;
-        const configFiles = this.extConfigFilesMap.get(wsName);
+        const configFilesMap = this.configFilesMap;
+        const configFiles = this.configFilesMap.get(wsName);
+        const seen = new Map();
         const handleConfigInput = (pluginName, input) => {
             const configFilePath = this.getReferencedInternalFilePath(input);
             if (configFilePath) {
                 const workspace = this.findWorkspaceByFilePath(configFilePath);
                 if (workspace) {
                     const name = this.name === ROOT_WORKSPACE_NAME ? workspace.name : this.name;
-                    if (!extMap.has(name))
-                        extMap.set(name, new Map());
-                    if (!extMap.get(name)?.has(pluginName))
-                        extMap.get(name)?.set(pluginName, new Set());
-                    extMap.get(name)?.get(pluginName)?.add(configFilePath);
+                    if (!configFilesMap.has(name))
+                        configFilesMap.set(name, new Map());
+                    if (!configFilesMap.get(name)?.has(pluginName))
+                        configFilesMap.get(name)?.set(pluginName, new Set());
+                    configFilesMap.get(name)?.get(pluginName)?.add(configFilePath);
                 }
             }
         };
@@ -222,10 +221,7 @@ export class WorkspaceWorker {
             if (!config)
                 return;
             const label = 'config file';
-            const configFilePaths = await _glob({ patterns, cwd, dir: cwd, gitignore: false, label });
-            if (!this.configFilesMap.has(pluginName))
-                this.configFilesMap.set(pluginName, new Set());
-            const filteredFilePaths = configFilePaths.filter(filePath => !this.configFilesMap.get(pluginName)?.has(filePath));
+            const configFilePaths = await _glob({ patterns, cwd: rootCwd, dir: cwd, gitignore: false, label });
             const options = {
                 ...baseScriptOptions,
                 config,
@@ -241,8 +237,8 @@ export class WorkspaceWorker {
             }
             else if ((!plugin.resolveEntryPaths && !plugin.resolveFromAST) ||
                 (configFilePaths.length === 0 &&
-                    (!this.extConfigFilesMap.get(wsName)?.get(pluginName) ||
-                        this.extConfigFilesMap.get(wsName)?.get(pluginName)?.size === 0))) {
+                    (!this.configFilesMap.get(wsName)?.get(pluginName) ||
+                        this.configFilesMap.get(wsName)?.get(pluginName)?.size === 0))) {
                 if (plugin.entry)
                     for (const id of plugin.entry)
                         addInput(toEntry(id));
@@ -250,8 +246,7 @@ export class WorkspaceWorker {
                     for (const id of plugin.production)
                         addInput(toProductionEntry(id));
             }
-            for (const configFilePath of filteredFilePaths) {
-                this.configFilesMap.get(pluginName)?.add(configFilePath);
+            for (const configFilePath of configFilePaths) {
                 const isManifest = basename(configFilePath) === 'package.json';
                 const fd = isManifest ? undefined : this.cache.getFileDescriptor(configFilePath);
                 if (fd?.meta?.data && !fd.changed) {
@@ -274,10 +269,9 @@ export class WorkspaceWorker {
                     configFileDir: dirname(configFilePath),
                     configFileName: basename(configFilePath),
                 };
-                const seen = this.extConfigFilesMap.get(wsName)?.get(pluginName)?.has(configFilePath);
                 const cache = {};
                 let loadedConfig;
-                if (plugin.resolveEntryPaths && !seen) {
+                if (plugin.resolveEntryPaths && !seen.get(wsName)?.has(configFilePath)) {
                     if (!loadedConfig)
                         loadedConfig = await loadConfigForPlugin(configFilePath, plugin, resolveOpts, pluginName);
                     if (loadedConfig) {
@@ -287,7 +281,7 @@ export class WorkspaceWorker {
                         cache.resolveEntryPaths = inputs;
                     }
                 }
-                if (plugin.resolveConfig && !seen) {
+                if (plugin.resolveConfig && !seen.get(wsName)?.has(configFilePath)) {
                     if (!loadedConfig)
                         loadedConfig = await loadConfigForPlugin(configFilePath, plugin, resolveOpts, pluginName);
                     if (loadedConfig) {
@@ -314,6 +308,9 @@ export class WorkspaceWorker {
                 if (basename(configFilePath) !== 'package.json') {
                     addInput(toEntry(configFilePath));
                     addInput(toConfig(pluginName, configFilePath));
+                    if (!seen.has(wsName))
+                        seen.set(wsName, new Set());
+                    seen.get(wsName)?.add(configFilePath);
                 }
                 if (!isManifest && fd?.changed && fd.meta)
                     fd.meta.data = cache;
@@ -333,7 +330,7 @@ export class WorkspaceWorker {
             remainingPlugins.delete(pluginName);
         }
         {
-            const configFiles = this.extConfigFilesMap.get(wsName);
+            const configFiles = this.configFilesMap.get(wsName);
             if (configFiles) {
                 do {
                     for (const [pluginName, dependencies] of configFiles.entries()) {

package/dist/graph/build.js

@@ -12,7 +12,6 @@ import {} from '../util/tag.js';
 import { augmentWorkspace, getToSourcePathHandler } from '../util/to-source-path.js';
 import { loadTSConfig } from '../util/tsconfig-loader.js';
 export async function build({ cacheLocation, chief, collector, cwd, deputy, factory, gitignore, isCache, isFixExports, isFixTypes, isGitIgnored, isIsolateWorkspaces, isProduction, isSkipLibs, isStrict, isWatch, report, streamer, tags, tsConfigFile, workspaces, }) {
-    const extConfigFilesMap = new Map();
     const configFilesMap = new Map();
     const enabledPluginsStore = new Map();
     const toSourceFilePath = getToSourcePathHandler(chief);
@@ -58,7 +57,6 @@ export async function build({ cacheLocation, chief, collector, cwd, deputy, fact
             getSourceFile: (filePath) => principal.backend.fileManager.getSourceFile(filePath),
             isCache,
             cacheLocation,
-            extConfigFilesMap,
             configFilesMap,
         });
         await worker.init();

package/dist/plugins/simple-git-hooks/index.js

@@ -1,3 +1,4 @@
+import { toDependency } from '../../util/input.js';
 import { hasDependency } from '../../util/plugin.js';
 const title = 'simple-git-hooks';
 const enablers = ['simple-git-hooks'];
@@ -13,7 +14,7 @@ const resolveConfig = async (config, options) => {
         for (const id of options.getInputsFromScripts(hook))
             inputs.add(id);
     }
-    return Array.from(inputs);
+    return [toDependency('simple-git-hooks'), ...Array.from(inputs)];
 };
 export default {
     title,

package/dist/typescript/visitors/imports/importDeclaration.js

@@ -41,6 +41,14 @@ export default visit(() => true, node => {
                     });
                 }
             }
+            if (imports.length === 0) {
+                imports.push({
+                    specifier,
+                    identifier: undefined,
+                    isTypeOnly: node.importClause?.isTypeOnly,
+                    pos: node.importClause.namedBindings.pos,
+                });
+            }
         }
         return imports;
     }

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

@@ -4,8 +4,8 @@ import { debugLog } from './debug.js';
 import { isDirectory } from './fs.js';
 import { isInternal, join, toRelative } from './path.js';
 const defaultExtensions = `.{${DEFAULT_EXTENSIONS.map(ext => ext.slice(1)).join(',')}}`;
-const hasJSExt = /\.(m|c)js$/;
 const hasTSExt = /(?<!\.d)\.(m|c)?tsx?$/;
+const hasDTSExt = /.d\.(m|c)?ts$/;
 const matchExt = /(\.d)?\.(m|c)?(j|t)s$/;
 export const augmentWorkspace = (workspace, dir, compilerOptions) => {
     const srcDir = join(dir, 'src');
@@ -15,13 +15,14 @@ export const augmentWorkspace = (workspace, dir, compilerOptions) => {
 export const getToSourcePathHandler = (chief) => {
     const toSourceMapCache = new Map();
     return (filePath) => {
-        if (!isInternal(filePath) || hasJSExt.test(filePath) || hasTSExt.test(filePath))
+        if (!isInternal(filePath) || hasTSExt.test(filePath))
             return;
         if (toSourceMapCache.has(filePath))
             return toSourceMapCache.get(filePath);
         const workspace = chief.findWorkspaceByFilePath(filePath);
         if (workspace?.srcDir && workspace.outDir) {
-            if (filePath.startsWith(workspace.outDir)) {
+            if ((!filePath.startsWith(workspace.srcDir) && filePath.startsWith(workspace.outDir)) ||
+                (workspace.srcDir === workspace.outDir && hasDTSExt.test(filePath))) {
                 const pattern = filePath.replace(workspace.outDir, workspace.srcDir).replace(matchExt, defaultExtensions);
                 const [srcFilePath] = fastGlob.sync(pattern);
                 toSourceMapCache.set(filePath, srcFilePath);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.50.2";
+export declare const version = "5.50.4";

package/dist/version.js

@@ -1 +1 @@
-export const version = '5.50.2';
+export const version = '5.50.4';

package/package.json

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