@geoql/doctor-core 1.3.0 → 1.3.1

package/dist/index.js

@@ -1,6 +1,6 @@
 import { dirname, extname, isAbsolute, join, relative, resolve } from "node:path";
 import { performance } from "node:perf_hooks";
-import { access, mkdir, mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises";
+import { access, mkdir, mkdtemp, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { execFile, spawn } from "node:child_process";
 import { parseSync } from "oxc-parser";
@@ -227,7 +227,84 @@ async function checkBuildQuality(projectInfo) {
 //#endregion
 //#region src/dead-code/build-knip-config.ts
 const DEMO_WORKSPACES = ["example", "playground"];
-function buildKnipConfig(projectInfo, doctorConfig) {
+async function findPnpmWorkspaceYaml(startDir) {
+	let dir = startDir;
+	for (let i = 0; i < 5; i++) {
+		const candidate = join(dir, "pnpm-workspace.yaml");
+		try {
+			if ((await stat(candidate)).isFile()) return candidate;
+		} catch {}
+		const parent = dirname(dir);
+		if (parent === dir) break;
+		dir = parent;
+	}
+	return null;
+}
+function collectCatalogNames(packageJson) {
+	const names = /* @__PURE__ */ new Set();
+	const fields = [
+		packageJson.dependencies,
+		packageJson.devDependencies,
+		packageJson.peerDependencies,
+		packageJson.optionalDependencies
+	];
+	for (const field of fields) {
+		if (!field) continue;
+		for (const version of Object.values(field)) if (typeof version === "string" && version.startsWith("catalog:")) names.add(version.slice(8));
+	}
+	return names;
+}
+function extractCatalogDependencies(workspaceYaml, catalogName) {
+	const lines = workspaceYaml.split(/\r?\n/);
+	const deps = [];
+	let inCatalogs = false;
+	let inTargetBlock = false;
+	let blockIndent = -1;
+	const escapedCatalogName = catalogName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	const catalogPattern = new RegExp(`^${escapedCatalogName}\\s*:\\s*$`);
+	for (const line of lines) {
+		const trimmed = line.trim();
+		if (trimmed === "" || trimmed.startsWith("#")) continue;
+		if (!inCatalogs) {
+			if (/^catalogs\s*:/.test(trimmed)) inCatalogs = true;
+			continue;
+		}
+		const indent = line.length - line.trimStart().length;
+		if (inTargetBlock) {
+			if (indent <= blockIndent) break;
+			const match = line.match(/^[ \t]*["']?([@a-zA-Z0-9_./-]+)["']?[ \t]*:/);
+			if (match) deps.push(match[1]);
+			continue;
+		}
+		if (catalogPattern.test(trimmed)) {
+			inTargetBlock = true;
+			blockIndent = indent;
+		} else if (indent === 0 && /^\w+/.test(trimmed) && !/^catalogs\b/.test(trimmed)) break;
+	}
+	return deps;
+}
+async function resolveCatalogDependencies(rootDirectory) {
+	const workspacePath = await findPnpmWorkspaceYaml(rootDirectory);
+	if (!workspacePath) return [];
+	let packageJson;
+	try {
+		packageJson = JSON.parse(await readFile(join(rootDirectory, "package.json"), "utf8"));
+	} catch {
+		return [];
+	}
+	const catalogNames = collectCatalogNames(packageJson);
+	if (catalogNames.size === 0) return [];
+	let workspaceYaml;
+	try {
+		workspaceYaml = await readFile(workspacePath, "utf8");
+	} catch {
+		return [];
+	}
+	const resolved = /* @__PURE__ */ new Set();
+	for (const catalogName of catalogNames) for (const dep of extractCatalogDependencies(workspaceYaml, catalogName)) resolved.add(dep);
+	return [...resolved];
+}
+async function buildKnipConfig(projectInfo, doctorConfig) {
 	const isNuxt = projectInfo.framework === "nuxt";
 	const usesConventionResolution = projectInfo.hasAutoImports || projectInfo.hasComponentsAutoImport || projectInfo.hasVueRouter;
 	const entry = isNuxt ? [
@@ -248,6 +325,7 @@ function buildKnipConfig(projectInfo, doctorConfig) {
 			"src/stores/**/*.ts"
 		] : []
 	];
+	const catalogDependencies = await resolveCatalogDependencies(projectInfo.rootDirectory);
 	const config = {
 		cwd: projectInfo.rootDirectory,
 		entry,
@@ -259,11 +337,12 @@ function buildKnipConfig(projectInfo, doctorConfig) {
 			"!**/knip.config.mjs"
 		],
 		ignoreFiles: [...doctorConfig.exclude, "knip.config.mjs"],
-		ignoreDependencies: [
+		ignoreDependencies: [...new Set([
 			"vite-plus",
 			"@geoql/vue-doctor",
-			"@geoql/nuxt-doctor"
-		],
+			"@geoql/nuxt-doctor",
+			...catalogDependencies
+		])],
 		ignoreWorkspaces: [...DEMO_WORKSPACES]
 	};
 	if (isNuxt) config.compilers = { nuxt: true };
@@ -421,7 +500,7 @@ async function writeKnipConfig(rootDir, config) {
 }
 async function checkDeadCode(options) {
 	if (!options.enabled) return [];
-	const config = buildKnipConfig(options.projectInfo, options.doctorConfig);
+	const config = await buildKnipConfig(options.projectInfo, options.doctorConfig);
 	const timeoutMs = options.timeoutMs ?? 3e4;
 	let createOptions;
 	let run;
@@ -1611,6 +1690,7 @@ async function generateOxlintConfig(input) {
 		...userConfig ? { extends: [userConfig] } : {},
 		plugins: ["vue"],
 		jsPlugins: input.pluginPaths,
+		...input.exclude && input.exclude.length > 0 ? { ignorePatterns: input.exclude } : {},
 		rules
 	};
 	const configPath = join(dir, ".oxlintrc.json");
@@ -1816,7 +1896,8 @@ async function runScriptPass(opts) {
 		pluginPaths,
 		ruleOverrides: opts.ruleOverrides,
 		rootDir: opts.rootDir,
-		framework: opts.framework
+		framework: opts.framework,
+		exclude: opts.exclude
 	});
 	try {
 		const raw = await runOxlint({
@@ -4127,7 +4208,8 @@ async function audit(config = {}) {
 			ruleOverrides: config.rules,
 			framework: project.framework === "nuxt" ? "nuxt" : "vue",
 			fix: config.fix === true && config.scopeFiles === void 0,
-			fixExcludes: config.fixExcludes
+			fixExcludes: config.fixExcludes,
+			exclude
 		});
 		scriptDiagnostics = result.diagnostics;
 		oxlintStderr = result.stderr;