knip 4.1.0 → 4.2.0

package/dist/ConfigurationChief.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="npmcli__package-json" />
 import { createPkgGraph } from '@pnpm/workspace.pkgs-graph';
 import type { Configuration, WorkspaceConfiguration } from './types/config.js';
-import type { PackageJson } from '@npmcli/package-json';
+import type { PackageJson } from './types/package-json.js';
 type ConfigurationManagerOptions = {
     cwd: string;
     isProduction: boolean;
@@ -15,7 +14,6 @@ export type Workspace = {
     ancestors: string[];
     config: WorkspaceConfiguration;
     manifestPath: string;
-    manifest: PackageJson;
 };
 export declare class ConfigurationChief {
     cwd: string;
@@ -26,7 +24,7 @@ export declare class ConfigurationChief {
     manifestPath?: string;
     manifest?: PackageJson;
     ignoredWorkspacePatterns: string[];
-    manifestWorkspaces: Map<string, string>;
+    workspaceManifests: Map<string, string>;
     additionalWorkspaceNames: Set<string>;
     availableWorkspaceNames: string[];
     availableWorkspacePkgNames: Set<string | undefined>;
@@ -35,8 +33,8 @@ export declare class ConfigurationChief {
         dir: string;
         manifest: PackageJson;
     }[];
-    workspacesGraph: ReturnType<typeof createPkgGraph> | undefined;
-    enabledWorkspaces: Workspace[];
+    packageGraph: ReturnType<typeof createPkgGraph> | undefined;
+    includedWorkspaces: Workspace[];
     resolvedConfigFilePath?: string;
     rawConfig?: any;
     constructor({ cwd, isProduction, isStrict, isIncludeEntryExports }: ConfigurationManagerOptions);
@@ -52,18 +50,23 @@ export declare class ConfigurationChief {
     private setWorkspaces;
     private getListedWorkspaces;
     private getIgnoredWorkspacePatterns;
-    private getManifestWorkspaces;
+    private getWorkspaceManifests;
     private getConfiguredWorkspaceKeys;
     private getAdditionalWorkspaceNames;
     private getAvailableWorkspaceNames;
     private getAvailableWorkspaceManifests;
     private getAvailableWorkspacePkgNames;
-    private getEnabledWorkspaces;
-    getWorkspaces(): Workspace[];
+    private determineIncludedWorkspaces;
+    getManifestForWorkspace(dir: string): PackageJson;
+    getIncludedWorkspaces(): Workspace[];
     private getDescendentWorkspaces;
     private getIgnoredWorkspacesFor;
     getNegatedWorkspacePatterns(name: string): string[];
     private getConfigKeyForWorkspace;
+    getIgnores(workspaceName: string): {
+        ignoreBinaries: (string | RegExp)[];
+        ignoreDependencies: (string | RegExp)[];
+    };
     getConfigForWorkspace(workspaceName: string, extensions: string[]): {
         typescript?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
         astro?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
@@ -87,6 +90,7 @@ export declare class ConfigurationChief {
         linthtml?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
         markdownlint?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
         mocha?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
+        netlify?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
         next?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
         nx?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
         nyc?: (boolean | import("./types/config.js").EnsuredPluginConfiguration) | undefined;
@@ -121,11 +125,9 @@ export declare class ConfigurationChief {
         project: string[];
         paths: any;
         ignore: string[];
-        ignoreBinaries: (string | RegExp)[];
-        ignoreDependencies: (string | RegExp)[];
         isIncludeEntryExports: any;
     };
-    getIssueTypesToReport(): import("./types/issues.js").Report;
+    getIncludedIssueTypes(): import("./types/issues.js").Report;
     findWorkspaceByFilePath(filePath: string): Workspace | undefined;
     findWorkspaceByName(name: string): Workspace | undefined;
     getUnusedIgnoredWorkspaces(): string[];

package/dist/ConfigurationChief.js

@@ -54,14 +54,14 @@ export class ConfigurationChief {
     manifestPath;
     manifest;
     ignoredWorkspacePatterns = [];
-    manifestWorkspaces = new Map();
+    workspaceManifests = new Map();
     additionalWorkspaceNames = new Set();
     availableWorkspaceNames = [];
     availableWorkspacePkgNames = new Set();
     availableWorkspaceDirs = [];
     availableWorkspaceManifests = [];
-    workspacesGraph;
-    enabledWorkspaces = [];
+    packageGraph;
+    includedWorkspaces = [];
     resolvedConfigFilePath;
     rawConfig;
     constructor({ cwd, isProduction, isStrict, isIncludeEntryExports }) {
@@ -112,7 +112,7 @@ export class ConfigurationChief {
         return this.config.rules;
     }
     getFilters() {
-        if (this.workspacesGraph?.graph && workspaceArg)
+        if (this.packageGraph?.graph && workspaceArg)
             return { dir: join(this.cwd, workspaceArg) };
         return {};
     }
@@ -151,7 +151,7 @@ export class ConfigurationChief {
     }
     async setWorkspaces() {
         this.ignoredWorkspacePatterns = this.getIgnoredWorkspacePatterns();
-        this.manifestWorkspaces = await this.getManifestWorkspaces();
+        this.workspaceManifests = await this.getWorkspaceManifests();
         this.additionalWorkspaceNames = await this.getAdditionalWorkspaceNames();
         this.availableWorkspaceNames = this.getAvailableWorkspaceNames();
         this.availableWorkspaceDirs = this.availableWorkspaceNames
@@ -160,8 +160,8 @@ export class ConfigurationChief {
             .map(dir => join(this.cwd, dir));
         this.availableWorkspaceManifests = this.getAvailableWorkspaceManifests(this.availableWorkspaceDirs);
         this.availableWorkspacePkgNames = this.getAvailableWorkspacePkgNames(this.availableWorkspaceManifests);
-        this.workspacesGraph = createPkgGraph(this.availableWorkspaceManifests);
-        this.enabledWorkspaces = this.getEnabledWorkspaces();
+        this.packageGraph = createPkgGraph(this.availableWorkspaceManifests);
+        this.includedWorkspaces = this.determineIncludedWorkspaces();
     }
     getListedWorkspaces() {
         return this.manifest?.workspaces
@@ -176,7 +176,7 @@ export class ConfigurationChief {
             .map(name => name.replace(/^!/, ''));
         return [...ignoredWorkspaces, ...this.config.ignoreWorkspaces];
     }
-    async getManifestWorkspaces() {
+    async getWorkspaceManifests() {
         const workspaces = await mapWorkspaces({
             pkg: this.manifest ?? {},
             cwd: this.cwd,
@@ -200,12 +200,12 @@ export class ConfigurationChief {
         const dirs = workspaceKeys.filter(key => !key.includes('*'));
         const globbedDirs = await _dirGlob({ patterns, cwd: this.cwd });
         return new Set([...dirs, ...globbedDirs].filter(name => name !== ROOT_WORKSPACE_NAME &&
-            !this.manifestWorkspaces.has(name) &&
+            !this.workspaceManifests.has(name) &&
             !micromatch.isMatch(name, this.ignoredWorkspacePatterns)));
     }
     getAvailableWorkspaceNames() {
         return [
-            ...new Set([ROOT_WORKSPACE_NAME, ...this.manifestWorkspaces.keys(), ...this.additionalWorkspaceNames]),
+            ...new Set([ROOT_WORKSPACE_NAME, ...this.workspaceManifests.keys(), ...this.additionalWorkspaceNames]),
         ].filter(name => !micromatch.isMatch(name, this.ignoredWorkspacePatterns));
     }
     getAvailableWorkspaceManifests(availableWorkspaceDirs) {
@@ -227,7 +227,7 @@ export class ConfigurationChief {
         }
         return pkgNames;
     }
-    getEnabledWorkspaces() {
+    determineIncludedWorkspaces() {
         if (workspaceArg && !existsSync(workspaceArg)) {
             throw new ConfigurationError(`Directory does not exist: ${workspaceArg}`);
         }
@@ -241,7 +241,7 @@ export class ConfigurationChief {
         const workspaceNames = workspaceArg
             ? [...this.availableWorkspaceNames.reduce(getAncestors(workspaceArg), []), workspaceArg]
             : this.availableWorkspaceNames;
-        const graph = this.workspacesGraph?.graph;
+        const graph = this.packageGraph?.graph;
         const ws = new Set();
         if (workspaceArg && this.isStrict) {
             ws.add(workspaceArg);
@@ -249,17 +249,17 @@ export class ConfigurationChief {
         else if (graph && workspaceArg) {
             const seen = new Set();
             const initialWorkspaces = new Set(workspaceNames.map(name => join(this.cwd, name)));
-            const workspaceDirsWithDependants = new Set(initialWorkspaces);
+            const workspaceDirsWithDependents = new Set(initialWorkspaces);
             const addDependents = (dir) => {
                 seen.add(dir);
                 const deps = graph[dir]?.dependencies ?? [];
                 if (deps.length > 0 && Array.from(initialWorkspaces).some(dir => deps.includes(dir))) {
-                    workspaceDirsWithDependants.add(dir);
+                    workspaceDirsWithDependents.add(dir);
                 }
                 deps.filter(dir => !seen.has(dir)).forEach(addDependents);
             };
             this.availableWorkspaceNames.map(name => join(this.cwd, name)).forEach(addDependents);
-            workspaceDirsWithDependants.forEach(dir => ws.add(relative(this.cwd, dir) || ROOT_WORKSPACE_NAME));
+            workspaceDirsWithDependents.forEach(dir => ws.add(relative(this.cwd, dir) || ROOT_WORKSPACE_NAME));
         }
         else {
             workspaceNames.forEach(name => ws.add(name));
@@ -276,12 +276,14 @@ export class ConfigurationChief {
                 config: this.getConfigForWorkspace(name, DEFAULT_EXTENSIONS),
                 ancestors: this.availableWorkspaceNames.reduce(getAncestors(name), []),
                 manifestPath: join(dir, 'package.json'),
-                manifest: this.availableWorkspaceManifests?.find(item => item.dir === dir)?.manifest ?? {},
             };
         });
     }
-    getWorkspaces() {
-        return this.enabledWorkspaces;
+    getManifestForWorkspace(dir) {
+        return this.availableWorkspaceManifests?.find(item => item.dir === dir)?.manifest ?? {};
+    }
+    getIncludedWorkspaces() {
+        return this.includedWorkspaces;
     }
     getDescendentWorkspaces(name) {
         return this.availableWorkspaceNames
@@ -307,6 +309,18 @@ export class ConfigurationChief {
             .reverse()
             .find(pattern => micromatch.isMatch(workspaceName, pattern));
     }
+    getIgnores(workspaceName) {
+        const key = this.getConfigKeyForWorkspace(workspaceName);
+        const workspaces = this.rawConfig?.workspaces ?? {};
+        const workspaceConfig = (key
+            ? key === ROOT_WORKSPACE_NAME && !(ROOT_WORKSPACE_NAME in workspaces)
+                ? this.rawConfig
+                : workspaces[key]
+            : {}) ?? {};
+        const ignoreBinaries = arrayify(workspaceConfig.ignoreBinaries).map(toRegexOrString);
+        const ignoreDependencies = arrayify(workspaceConfig.ignoreDependencies).map(toRegexOrString);
+        return { ignoreBinaries, ignoreDependencies };
+    }
     getConfigForWorkspace(workspaceName, extensions) {
         const baseConfig = getDefaultWorkspaceConfig(extensions);
         const key = this.getConfigKeyForWorkspace(workspaceName);
@@ -320,8 +334,6 @@ export class ConfigurationChief {
         const project = workspaceConfig.project ? arrayify(workspaceConfig.project) : baseConfig.project;
         const paths = workspaceConfig.paths ?? {};
         const ignore = arrayify(workspaceConfig.ignore);
-        const ignoreBinaries = arrayify(workspaceConfig.ignoreBinaries).map(toRegexOrString);
-        const ignoreDependencies = arrayify(workspaceConfig.ignoreDependencies).map(toRegexOrString);
         const isIncludeEntryExports = workspaceConfig.includeEntryExports ?? this.config.isIncludeEntryExports;
         const plugins = {};
         for (const [name, pluginConfig] of Object.entries(this.config.rootPluginConfigs)) {
@@ -335,9 +347,9 @@ export class ConfigurationChief {
                 plugins[pluginName] = normalizePluginConfig(pluginConfig);
             }
         }
-        return { entry, project, paths, ignore, ignoreBinaries, ignoreDependencies, isIncludeEntryExports, ...plugins };
+        return { entry, project, paths, ignore, isIncludeEntryExports, ...plugins };
     }
-    getIssueTypesToReport() {
+    getIncludedIssueTypes() {
         const cliArgs = { include, exclude, dependencies, exports };
         const excludesFromRules = getKeysByValue(this.config.rules, 'off');
         const config = {
@@ -349,14 +361,14 @@ export class ConfigurationChief {
     }
     findWorkspaceByFilePath(filePath) {
         const workspaceDir = this.availableWorkspaceDirs.find(workspaceDir => filePath.startsWith(workspaceDir + '/'));
-        return this.enabledWorkspaces.find(workspace => workspace.dir === workspaceDir);
+        return this.includedWorkspaces.find(workspace => workspace.dir === workspaceDir);
     }
     findWorkspaceByName(name) {
-        return this.enabledWorkspaces.find(workspace => workspace.name === name);
+        return this.includedWorkspaces.find(workspace => workspace.name === name);
     }
     getUnusedIgnoredWorkspaces() {
         const ignoredWorkspaceNames = this.config.ignoreWorkspaces;
-        const workspaceNames = [...this.manifestWorkspaces.keys(), ...this.additionalWorkspaceNames];
+        const workspaceNames = [...this.workspaceManifests.keys(), ...this.additionalWorkspaceNames];
         return ignoredWorkspaceNames
             .filter(ignoredWorkspaceName => !workspaceNames.some(name => micromatch.isMatch(name, ignoredWorkspaceName)))
             .filter(ignoredWorkspaceName => {

package/dist/ConfigurationValidator.d.ts

@@ -335,6 +335,19 @@ export declare const ConfigurationValidator: z.ZodObject<{
             entry?: string | string[] | undefined;
             project?: string | string[] | undefined;
         }>]>>;
+        netlify: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, z.ZodObject<{
+            config: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+            entry: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+            project: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+        }, "strip", z.ZodTypeAny, {
+            config?: string | string[] | undefined;
+            entry?: string | string[] | undefined;
+            project?: string | string[] | undefined;
+        }, {
+            config?: string | string[] | undefined;
+            entry?: string | string[] | undefined;
+            project?: string | string[] | undefined;
+        }>]>>;
         next: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, z.ZodObject<{
             config: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
             entry: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
@@ -809,6 +822,11 @@ export declare const ConfigurationValidator: z.ZodObject<{
             entry?: string | string[] | undefined;
             project?: string | string[] | undefined;
         } | undefined;
+        netlify?: string | boolean | string[] | {
+            config?: string | string[] | undefined;
+            entry?: string | string[] | undefined;
+            project?: string | string[] | undefined;
+        } | undefined;
         next?: string | boolean | string[] | {
             config?: string | string[] | undefined;
             entry?: string | string[] | undefined;
@@ -1067,6 +1085,11 @@ export declare const ConfigurationValidator: z.ZodObject<{
             entry?: string | string[] | undefined;
             project?: string | string[] | undefined;
         } | undefined;
+        netlify?: string | boolean | string[] | {
+            config?: string | string[] | undefined;
+            entry?: string | string[] | undefined;
+            project?: string | string[] | undefined;
+        } | undefined;
         next?: string | boolean | string[] | {
             config?: string | string[] | undefined;
             entry?: string | string[] | undefined;
@@ -1502,6 +1525,19 @@ export declare const ConfigurationValidator: z.ZodObject<{
         entry?: string | string[] | undefined;
         project?: string | string[] | undefined;
     }>]>>;
+    netlify: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, z.ZodObject<{
+        config: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+        entry: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+        project: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+    }, "strip", z.ZodTypeAny, {
+        config?: string | string[] | undefined;
+        entry?: string | string[] | undefined;
+        project?: string | string[] | undefined;
+    }, {
+        config?: string | string[] | undefined;
+        entry?: string | string[] | undefined;
+        project?: string | string[] | undefined;
+    }>]>>;
     next: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>, z.ZodObject<{
         config: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         entry: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
@@ -1992,6 +2028,11 @@ export declare const ConfigurationValidator: z.ZodObject<{
             entry?: string | string[] | undefined;
             project?: string | string[] | undefined;
         } | undefined;
+        netlify?: string | boolean | string[] | {
+            config?: string | string[] | undefined;
+            entry?: string | string[] | undefined;
+            project?: string | string[] | undefined;
+        } | undefined;
         next?: string | boolean | string[] | {
             config?: string | string[] | undefined;
             entry?: string | string[] | undefined;
@@ -2243,6 +2284,11 @@ export declare const ConfigurationValidator: z.ZodObject<{
         entry?: string | string[] | undefined;
         project?: string | string[] | undefined;
     } | undefined;
+    netlify?: string | boolean | string[] | {
+        config?: string | string[] | undefined;
+        entry?: string | string[] | undefined;
+        project?: string | string[] | undefined;
+    } | undefined;
     next?: string | boolean | string[] | {
         config?: string | string[] | undefined;
         entry?: string | string[] | undefined;
@@ -2517,6 +2563,11 @@ export declare const ConfigurationValidator: z.ZodObject<{
             entry?: string | string[] | undefined;
             project?: string | string[] | undefined;
         } | undefined;
+        netlify?: string | boolean | string[] | {
+            config?: string | string[] | undefined;
+            entry?: string | string[] | undefined;
+            project?: string | string[] | undefined;
+        } | undefined;
         next?: string | boolean | string[] | {
             config?: string | string[] | undefined;
             entry?: string | string[] | undefined;
@@ -2768,6 +2819,11 @@ export declare const ConfigurationValidator: z.ZodObject<{
         entry?: string | string[] | undefined;
         project?: string | string[] | undefined;
     } | undefined;
+    netlify?: string | boolean | string[] | {
+        config?: string | string[] | undefined;
+        entry?: string | string[] | undefined;
+        project?: string | string[] | undefined;
+    } | undefined;
     next?: string | boolean | string[] | {
         config?: string | string[] | undefined;
         entry?: string | string[] | undefined;

package/dist/ConfigurationValidator.js

@@ -85,6 +85,7 @@ const pluginsSchema = z.object({
     linthtml: pluginSchema,
     markdownlint: pluginSchema,
     mocha: pluginSchema,
+    netlify: pluginSchema,
     next: pluginSchema,
     'node-test-runner': pluginSchema,
     'npm-package-json-lint': pluginSchema,

package/dist/DependencyDeputy.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="npmcli__package-json" />
 import type { Workspace } from './ConfigurationChief.js';
 import type { ConfigurationHints, Issue } from './types/issues.js';
-import type { WorkspaceManifests, HostDependencies, InstalledBinaries } from './types/workspace.js';
-import type { PackageJson } from '@npmcli/package-json';
+import type { PackageJson } from './types/package-json.js';
+import type { WorkspaceManifests, HostDependencies, InstalledBinaries, DependencySet, DependencyArray } from './types/workspace.js';
 type Options = {
     isProduction: boolean;
     isStrict: boolean;
@@ -19,43 +18,43 @@ export declare class DependencyDeputy {
     ignoreBinaries: (string | RegExp)[];
     ignoreDependencies: (string | RegExp)[];
     constructor({ isProduction, isStrict }: Options);
-    addWorkspace({ name, dir, manifestPath, manifest, ignoreDependencies, ignoreBinaries, }: {
+    addWorkspace({ name, cwd, dir, manifestPath, manifest, ignoreDependencies, ignoreBinaries, }: {
         name: string;
+        cwd: string;
         dir: string;
         manifestPath: string;
         manifest: PackageJson;
         ignoreDependencies: (string | RegExp)[];
         ignoreBinaries: (string | RegExp)[];
     }): void;
-    addIgnored(ignoreBinaries: (string | RegExp)[], ignoreDependencies: (string | RegExp)[]): void;
+    setIgnored(ignoreBinaries: (string | RegExp)[], ignoreDependencies: (string | RegExp)[]): void;
     getWorkspaceManifest(workspaceName: string): {
         workspaceDir: string;
         manifestPath: string;
-        scripts: string[];
-        dependencies: string[];
-        peerDependencies: string[];
-        optionalPeerDependencies: string[];
-        optionalDependencies: string[];
-        devDependencies: string[];
-        allDependencies: string[];
+        dependencies: DependencyArray;
+        devDependencies: DependencyArray;
+        peerDependencies: DependencySet;
+        optionalPeerDependencies: DependencyArray;
+        allDependencies: DependencySet;
         ignoreDependencies: (string | RegExp)[];
         ignoreBinaries: (string | RegExp)[];
     } | undefined;
-    getProductionDependencies(workspaceName: string): string[];
-    getDevDependencies(workspaceName: string): string[];
+    getProductionDependencies(workspaceName: string): DependencyArray;
+    getDevDependencies(workspaceName: string): DependencyArray;
+    getDependencies(workspaceName: string): DependencySet;
     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;
+    setHostDependencies(workspaceName: string, hostDependencies: HostDependencies): void;
     getHostDependenciesFor(workspaceName: string, dependency: string): {
         name: string;
         isPeerOptional: boolean;
     }[];
-    getPeerDependencies(workspaceName: string): string[];
-    getOptionalPeerDependencies(workspaceName: string): string[];
+    getPeerDependencies(workspaceName: string): DependencySet;
+    getOptionalPeerDependencies(workspaceName: string): DependencyArray;
     maybeAddReferencedExternalDependency(workspace: Workspace, packageName: string): boolean;
     maybeAddReferencedBinary(workspace: Workspace, binaryName: string): boolean;
     private isInDependencies;

package/dist/DependencyDeputy.js

@@ -1,7 +1,8 @@
 import { isBuiltin } from 'node:module';
 import { IGNORE_DEFINITELY_TYPED, IGNORED_DEPENDENCIES, IGNORED_GLOBAL_BINARIES, IGNORED_RUNTIME_DEPENDENCIES, ROOT_WORKSPACE_NAME, } from './constants.js';
+import { getDependencyMetaData } from './manifest/index.js';
 import { isDefinitelyTyped, getDefinitelyTypedFor, getPackageFromDefinitelyTyped } from './util/modules.js';
-import { hasMatch, hasMatchInArray, hasMatchInSet, toRegexOrString, findKey } from './util/regex.js';
+import { hasMatch, hasMatchInSet, toRegexOrString, findKey } from './util/regex.js';
 export class DependencyDeputy {
     isProduction;
     isStrict;
@@ -22,8 +23,7 @@ export class DependencyDeputy {
         this.installedBinaries = new Map();
         this.hasTypesIncluded = new Map();
     }
-    addWorkspace({ name, dir, manifestPath, manifest, ignoreDependencies, ignoreBinaries, }) {
-        const scripts = Object.values(manifest.scripts ?? {});
+    addWorkspace({ name, cwd, dir, manifestPath, manifest, ignoreDependencies, ignoreBinaries, }) {
         const dependencies = Object.keys(manifest.dependencies ?? {});
         const peerDependencies = Object.keys(manifest.peerDependencies ?? {});
         const optionalDependencies = Object.keys(manifest.optionalDependencies ?? {});
@@ -34,21 +34,32 @@ export class DependencyDeputy {
             : [];
         const devDependencies = Object.keys(manifest.devDependencies ?? {});
         const allDependencies = [...dependencies, ...devDependencies, ...peerDependencies, ...optionalDependencies];
+        const packageNames = [
+            ...dependencies,
+            ...(this.isStrict ? peerDependencies : []),
+            ...(this.isProduction ? [] : devDependencies),
+        ];
+        const { hostDependencies, installedBinaries, hasTypesIncluded } = getDependencyMetaData({
+            packageNames,
+            dir,
+            cwd,
+        });
+        this.setHostDependencies(name, hostDependencies);
+        this.setInstalledBinaries(name, installedBinaries);
+        this.setHasTypesIncluded(name, hasTypesIncluded);
         this._manifests.set(name, {
             workspaceDir: dir,
             manifestPath,
             ignoreDependencies,
             ignoreBinaries,
-            scripts,
             dependencies,
-            peerDependencies,
-            optionalPeerDependencies,
-            optionalDependencies,
             devDependencies,
-            allDependencies,
+            peerDependencies: new Set(peerDependencies),
+            optionalPeerDependencies,
+            allDependencies: new Set(allDependencies),
         });
     }
-    addIgnored(ignoreBinaries, ignoreDependencies) {
+    setIgnored(ignoreBinaries, ignoreDependencies) {
         this.ignoreBinaries = ignoreBinaries.map(toRegexOrString);
         this.ignoreDependencies = ignoreDependencies.map(toRegexOrString);
     }
@@ -66,6 +77,12 @@ export class DependencyDeputy {
     getDevDependencies(workspaceName) {
         return this._manifests.get(workspaceName)?.devDependencies ?? [];
     }
+    getDependencies(workspaceName) {
+        const manifest = this._manifests.get(workspaceName);
+        if (!manifest)
+            return new Set();
+        return new Set([...manifest.dependencies, ...manifest.devDependencies]);
+    }
     setInstalledBinaries(workspaceName, installedBinaries) {
         this.installedBinaries.set(workspaceName, installedBinaries);
     }
@@ -90,16 +107,16 @@ export class DependencyDeputy {
         }
         this.referencedBinaries.get(workspaceName)?.add(binaryName);
     }
-    addHostDependencies(workspaceName, hostDependencies) {
+    setHostDependencies(workspaceName, hostDependencies) {
         this.hostDependencies.set(workspaceName, hostDependencies);
     }
     getHostDependenciesFor(workspaceName, dependency) {
-        return Array.from(this.hostDependencies.get(workspaceName)?.get(dependency) ?? []);
+        return this.hostDependencies.get(workspaceName)?.get(dependency) ?? [];
     }
     getPeerDependencies(workspaceName) {
         const manifest = this._manifests.get(workspaceName);
         if (!manifest)
-            return [];
+            return new Set();
         return manifest.peerDependencies;
     }
     getOptionalPeerDependencies(workspaceName) {
@@ -158,8 +175,9 @@ export class DependencyDeputy {
         const manifest = this._manifests.get(workspaceName);
         if (!manifest)
             return false;
-        const dependencies = this.isStrict ? this.getProductionDependencies(workspaceName) : manifest.allDependencies;
-        return dependencies.includes(packageName);
+        if (this.isStrict)
+            return this.getProductionDependencies(workspaceName).includes(packageName);
+        return manifest.allDependencies.has(packageName);
     }
     settleDependencyIssues() {
         const dependencyIssues = [];
@@ -238,6 +256,7 @@ export class DependencyDeputy {
             const referencedDependencies = this.referencedDependencies.get(workspaceName);
             const referencedBinaries = this.referencedBinaries.get(workspaceName);
             const installedBinaries = this.getInstalledBinaries(workspaceName);
+            const installedBinaryNames = new Set(installedBinaries?.keys() ?? []);
             const ignoredBinaries = this._manifests.get(workspaceName)?.ignoreBinaries ?? [];
             const ignoredDependencies = this._manifests.get(workspaceName)?.ignoreDependencies ?? [];
             referencedDependencies?.forEach(pkg => {
@@ -264,10 +283,7 @@ export class DependencyDeputy {
             });
             if (workspaceName === ROOT_WORKSPACE_NAME)
                 continue;
-            const dependencies = [
-                ...this.getProductionDependencies(workspaceName),
-                ...this.getDevDependencies(workspaceName),
-            ];
+            const dependencies = this.getDependencies(workspaceName);
             const peerDependencies = this.getPeerDependencies(workspaceName);
             ignoreDependencies
                 .filter(packageName => {
@@ -276,7 +292,7 @@ export class DependencyDeputy {
                 if (this.ignoreDependencies.includes(packageName))
                     return true;
                 const isReferenced = hasMatchInSet(referencedDependencies, packageName);
-                const isListed = hasMatchInArray(dependencies, packageName) && !hasMatchInArray(peerDependencies, packageName);
+                const isListed = hasMatchInSet(dependencies, packageName) && !hasMatchInSet(peerDependencies, packageName);
                 return (isListed && isReferenced) || (!this.isProduction && !isReferenced && !isListed);
             })
                 .forEach(identifier => {
@@ -289,23 +305,20 @@ export class DependencyDeputy {
                 if (this.ignoreBinaries.includes(binaryName))
                     return true;
                 const isReferenced = hasMatchInSet(referencedBinaries, binaryName);
-                const isInstalled = hasMatchInArray(Array.from(installedBinaries?.keys() ?? []), binaryName);
+                const isInstalled = hasMatchInSet(installedBinaryNames, binaryName);
                 return (isReferenced && isInstalled) || (!this.isProduction && !isInstalled && !isReferenced);
             })
                 .forEach(identifier => configurationHints.add({ workspaceName, identifier, type: 'ignoreBinaries' }));
         }
-        const installedBinaries = this.getInstalledBinaries(ROOT_WORKSPACE_NAME);
-        const dependencies = [
-            ...this.getProductionDependencies(ROOT_WORKSPACE_NAME),
-            ...this.getDevDependencies(ROOT_WORKSPACE_NAME),
-        ];
+        const installedBinaryNames = new Set(this.getInstalledBinaries(ROOT_WORKSPACE_NAME)?.keys());
+        const dependencies = this.getDependencies(ROOT_WORKSPACE_NAME);
         const peerDependencies = this.getPeerDependencies(ROOT_WORKSPACE_NAME);
         Array.from(rootIgnoreDependencies.keys())
             .filter(packageName => {
             if (hasMatchInSet(IGNORED_DEPENDENCIES, packageName))
                 return true;
             const isReferenced = rootIgnoreDependencies.get(packageName) !== 0;
-            const isListed = hasMatchInArray(dependencies, packageName) && !hasMatchInArray(peerDependencies, packageName);
+            const isListed = hasMatchInSet(dependencies, packageName) && !hasMatchInSet(peerDependencies, packageName);
             return (isReferenced && isListed) || (!this.isProduction && !isReferenced && !isListed);
         })
             .forEach(identifier => configurationHints.add({ workspaceName: ROOT_WORKSPACE_NAME, identifier, type: 'ignoreDependencies' }));
@@ -314,7 +327,7 @@ export class DependencyDeputy {
             if (hasMatchInSet(IGNORED_GLOBAL_BINARIES, binaryName))
                 return true;
             const isReferenced = rootIgnoreBinaries.get(binaryName) !== 0;
-            const isInstalled = hasMatchInArray(Array.from(installedBinaries?.keys() ?? []), binaryName);
+            const isInstalled = hasMatchInSet(installedBinaryNames, binaryName);
             return (isReferenced && isInstalled) || (!this.isProduction && !isReferenced && !isInstalled);
         })
             .forEach(identifier => configurationHints.add({ workspaceName: ROOT_WORKSPACE_NAME, identifier, type: 'ignoreBinaries' }));

package/dist/IssueFixer.js

@@ -1,5 +1,5 @@
 import { readFile, writeFile } from 'fs/promises';
-import NPMCliPackageJson from '@npmcli/package-json';
+import NPMCliPackageJson, {} from '@npmcli/package-json';
 import { dirname, join } from './util/path.js';
 export class IssueFixer {
     isEnabled = false;

package/dist/ProjectPrincipal.d.ts

@@ -46,7 +46,7 @@ export declare class ProjectPrincipal {
         skipExportsAnalysis: boolean;
     }): void;
     addProjectPath(filePath: string): void;
-    addReferencedDependencies(referencedDependencies: ReferencedDependencies, workspaceName: string): void;
+    addReferencedDependencies(workspaceName: string, referencedDependencies: ReferencedDependencies): void;
     runAsyncCompilers(): Promise<void>;
     getUsedResolvedFiles(): string[];
     private getProgramSourceFiles;