react-doctor 0.0.25 → 0.0.27

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/types.ts","../src/utils/get-diff-files.ts","../src/index.ts"],"mappings":";KAAY,SAAA;AAAA,UAEK,WAAA;EACf,aAAA;EACA,WAAA;EACA,YAAA;EACA,SAAA,EAAW,SAAA;EACX,aAAA;EACA,gBAAA;EACA,eAAA;AAAA;AAAA,UAiCe,UAAA;EACf,QAAA;EACA,MAAA;EACA,IAAA;EACA,QAAA;EACA,OAAA;EACA,IAAA;EACA,IAAA;EACA,MAAA;EACA,QAAA;EACA,MAAA;AAAA;AAAA,UA4Be,WAAA;EACf,KAAA;EACA,KAAA;AAAA;AAAA,UAwBe,QAAA;EACf,aAAA;EACA,UAAA;EACA,YAAA;EACA,gBAAA;AAAA;AAAA,UA2Ce,uBAAA;EACf,KAAA;EACA,KAAA;AAAA;AAAA,UAGe,iBAAA;EACf,MAAA,GAAS,uBAAA;EACT,IAAA;EACA,QAAA;EACA,OAAA;EACA,IAAA;AAAA;;;cCpFW,WAAA,GAAe,SAAA,UAAmB,kBAAA,cAA8B,QAAA;AAAA,cAiBhE,iBAAA,GAAqB,SAAA;;;UCjFjB,eAAA;EACf,IAAA;EACA,QAAA;EACA,YAAA;AAAA;AAAA,UAGe,cAAA;EACf,WAAA,EAAa,UAAA;EACb,KAAA,EAAO,WAAA;EACP,OAAA,EAAS,WAAA;EACT,mBAAA;AAAA;AAAA,cAGW,QAAA,GACX,SAAA,UACA,OAAA,GAAS,eAAA,KACR,OAAA,CAAQ,cAAA"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/types.ts","../src/utils/get-diff-files.ts","../src/index.ts"],"mappings":";KAAY,SAAA;AAAA,UAEK,WAAA;EACf,aAAA;EACA,WAAA;EACA,YAAA;EACA,SAAA,EAAW,SAAA;EACX,aAAA;EACA,gBAAA;EACA,eAAA;AAAA;AAAA,UAiCe,UAAA;EACf,QAAA;EACA,MAAA;EACA,IAAA;EACA,QAAA;EACA,OAAA;EACA,IAAA;EACA,IAAA;EACA,MAAA;EACA,QAAA;EACA,MAAA;AAAA;AAAA,UA4Be,WAAA;EACf,KAAA;EACA,KAAA;AAAA;AAAA,UAyBe,QAAA;EACf,aAAA;EACA,UAAA;EACA,YAAA;EACA,gBAAA;AAAA;AAAA,UA2Ce,uBAAA;EACf,KAAA;EACA,KAAA;AAAA;AAAA,UAGe,iBAAA;EACf,MAAA,GAAS,uBAAA;EACT,IAAA;EACA,QAAA;EACA,OAAA;EACA,IAAA;AAAA;;;cCrFW,WAAA,GAAe,SAAA,UAAmB,kBAAA,cAA8B,QAAA;AAAA,cAiBhE,iBAAA,GAAqB,SAAA;;;UCnFjB,eAAA;EACf,IAAA;EACA,QAAA;EACA,YAAA;AAAA;AAAA,UAGe,cAAA;EACf,WAAA,EAAa,UAAA;EACb,KAAA,EAAO,WAAA;EACP,OAAA,EAAS,WAAA;EACT,mBAAA;AAAA;AAAA,cAGW,QAAA,GACX,SAAA,UACA,OAAA,GAAS,eAAA,KACR,OAAA,CAAQ,cAAA"}

package/dist/index.js

@@ -13,14 +13,67 @@ const SOURCE_FILE_PATTERN = /\.(tsx?|jsx?)$/;
 const JSX_FILE_PATTERN = /\.(tsx|jsx)$/;
 const ERROR_PREVIEW_LENGTH_CHARS = 200;
 const SCORE_API_URL = "https://www.react.doctor/api/score";
+const FETCH_TIMEOUT_MS = 1e4;
 const GIT_LS_FILES_MAX_BUFFER_BYTES = 50 * 1024 * 1024;
+const SPAWN_ARGS_MAX_LENGTH_CHARS = 24e3;
 const DEFAULT_BRANCH_CANDIDATES = ["main", "master"];
+const MAX_KNIP_RETRIES = 5;
+const AMI_WEBSITE_URL = "https://ami.dev";
+const AMI_INSTALL_URL = `${AMI_WEBSITE_URL}/install.sh`;
+
+//#endregion
+//#region src/utils/proxy-fetch.ts
+const readNpmConfigValue = (key) => {
+	try {
+		const value = execSync(`npm config get ${key}`, {
+			encoding: "utf-8",
+			stdio: [
+				"pipe",
+				"pipe",
+				"ignore"
+			]
+		}).trim();
+		if (value && value !== "null" && value !== "undefined") return value;
+	} catch {}
+};
+const resolveProxyUrl = () => process.env.HTTPS_PROXY ?? process.env.https_proxy ?? process.env.HTTP_PROXY ?? process.env.http_proxy ?? readNpmConfigValue("https-proxy") ?? readNpmConfigValue("proxy");
+let isProxyUrlResolved = false;
+let resolvedProxyUrl;
+const getProxyUrl = () => {
+	if (isProxyUrlResolved) return resolvedProxyUrl;
+	isProxyUrlResolved = true;
+	resolvedProxyUrl = resolveProxyUrl();
+	return resolvedProxyUrl;
+};
+const createProxyDispatcher = async (proxyUrl) => {
+	try {
+		const { ProxyAgent } = await import("undici");
+		return new ProxyAgent(proxyUrl);
+	} catch {
+		return null;
+	}
+};
+const proxyFetch = async (url, init) => {
+	const controller = new AbortController();
+	const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+	try {
+		const proxyUrl = getProxyUrl();
+		const dispatcher = proxyUrl ? await createProxyDispatcher(proxyUrl) : null;
+		return await fetch(url, {
+			...init,
+			signal: controller.signal,
+			...dispatcher ? { dispatcher } : {}
+		});
+	} finally {
+		clearTimeout(timeoutId);
+	}
+};
 
 //#endregion
 //#region src/utils/calculate-score.ts
 const calculateScore = async (diagnostics) => {
 	try {
-		const response = await fetch(SCORE_API_URL, {
+		const response = await proxyFetch(SCORE_API_URL, {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify({ diagnostics })
@@ -82,6 +135,79 @@ const checkReducedMotion = (rootDirectory) => {
 	}
 };
 
+//#endregion
+//#region src/utils/match-glob-pattern.ts
+const REGEX_SPECIAL_CHARACTERS = /[.+^${}()|[\]\\]/g;
+const compileGlobPattern = (pattern) => {
+	const normalizedPattern = pattern.replace(/\\/g, "/");
+	let regexSource = "^";
+	let characterIndex = 0;
+	while (characterIndex < normalizedPattern.length) if (normalizedPattern[characterIndex] === "*" && normalizedPattern[characterIndex + 1] === "*") if (normalizedPattern[characterIndex + 2] === "/") {
+		regexSource += "(?:.+/)?";
+		characterIndex += 3;
+	} else {
+		regexSource += ".*";
+		characterIndex += 2;
+	}
+	else if (normalizedPattern[characterIndex] === "*") {
+		regexSource += "[^/]*";
+		characterIndex++;
+	} else if (normalizedPattern[characterIndex] === "?") {
+		regexSource += "[^/]";
+		characterIndex++;
+	} else {
+		regexSource += normalizedPattern[characterIndex].replace(REGEX_SPECIAL_CHARACTERS, "\\$&");
+		characterIndex++;
+	}
+	regexSource += "$";
+	return new RegExp(regexSource);
+};
+
+//#endregion
+//#region src/utils/filter-diagnostics.ts
+const filterIgnoredDiagnostics = (diagnostics, config) => {
+	const ignoredRules = new Set(Array.isArray(config.ignore?.rules) ? config.ignore.rules : []);
+	const ignoredFilePatterns = Array.isArray(config.ignore?.files) ? config.ignore.files.map(compileGlobPattern) : [];
+	if (ignoredRules.size === 0 && ignoredFilePatterns.length === 0) return diagnostics;
+	return diagnostics.filter((diagnostic) => {
+		const ruleIdentifier = `${diagnostic.plugin}/${diagnostic.rule}`;
+		if (ignoredRules.has(ruleIdentifier)) return false;
+		const normalizedPath = diagnostic.filePath.replace(/\\/g, "/").replace(/^\.\//, "");
+		if (ignoredFilePatterns.some((pattern) => pattern.test(normalizedPath))) return false;
+		return true;
+	});
+};
+
+//#endregion
+//#region src/utils/combine-diagnostics.ts
+const computeJsxIncludePaths = (includePaths) => includePaths.length > 0 ? includePaths.filter((filePath) => JSX_FILE_PATTERN.test(filePath)) : void 0;
+const combineDiagnostics = (lintDiagnostics, deadCodeDiagnostics, directory, isDiffMode, userConfig) => {
+	const allDiagnostics = [
+		...lintDiagnostics,
+		...deadCodeDiagnostics,
+		...isDiffMode ? [] : checkReducedMotion(directory)
+	];
+	return userConfig ? filterIgnoredDiagnostics(allDiagnostics, userConfig) : allDiagnostics;
+};
+
+//#endregion
+//#region src/utils/find-monorepo-root.ts
+const isMonorepoRoot = (directory) => {
+	if (fs.existsSync(path.join(directory, "pnpm-workspace.yaml"))) return true;
+	const packageJsonPath = path.join(directory, "package.json");
+	if (!fs.existsSync(packageJsonPath)) return false;
+	const packageJson = readPackageJson(packageJsonPath);
+	return Array.isArray(packageJson.workspaces) || Boolean(packageJson.workspaces?.packages);
+};
+const findMonorepoRoot = (startDirectory) => {
+	let currentDirectory = path.dirname(startDirectory);
+	while (currentDirectory !== path.dirname(currentDirectory)) {
+		if (isMonorepoRoot(currentDirectory)) return currentDirectory;
+		currentDirectory = path.dirname(currentDirectory);
+	}
+	return null;
+};
+
 //#endregion
 //#region src/utils/discover-project.ts
 const REACT_COMPILER_PACKAGES = new Set([
@@ -183,27 +309,14 @@ const resolveWorkspaceDirectories = (rootDirectory, pattern) => {
 		if (fs.existsSync(directoryPath) && fs.existsSync(path.join(directoryPath, "package.json"))) return [directoryPath];
 		return [];
 	}
-	const baseDirectory = path.join(rootDirectory, cleanPattern.slice(0, cleanPattern.indexOf("*")));
+	const wildcardIndex = cleanPattern.indexOf("*");
+	const baseDirectory = path.join(rootDirectory, cleanPattern.slice(0, wildcardIndex));
+	const suffixAfterWildcard = cleanPattern.slice(wildcardIndex + 1);
 	if (!fs.existsSync(baseDirectory) || !fs.statSync(baseDirectory).isDirectory()) return [];
-	return fs.readdirSync(baseDirectory).map((entry) => path.join(baseDirectory, entry)).filter((entryPath) => fs.statSync(entryPath).isDirectory() && fs.existsSync(path.join(entryPath, "package.json")));
-};
-const isMonorepoRoot = (directory) => {
-	if (fs.existsSync(path.join(directory, "pnpm-workspace.yaml"))) return true;
-	const packageJsonPath = path.join(directory, "package.json");
-	if (!fs.existsSync(packageJsonPath)) return false;
-	const packageJson = readPackageJson(packageJsonPath);
-	return Array.isArray(packageJson.workspaces) || Boolean(packageJson.workspaces?.packages);
-};
-const findMonorepoRoot$1 = (startDirectory) => {
-	let currentDirectory = path.dirname(startDirectory);
-	while (currentDirectory !== path.dirname(currentDirectory)) {
-		if (isMonorepoRoot(currentDirectory)) return currentDirectory;
-		currentDirectory = path.dirname(currentDirectory);
-	}
-	return null;
+	return fs.readdirSync(baseDirectory).map((entry) => path.join(baseDirectory, entry, suffixAfterWildcard)).filter((entryPath) => fs.existsSync(entryPath) && fs.statSync(entryPath).isDirectory() && fs.existsSync(path.join(entryPath, "package.json")));
 };
 const findDependencyInfoFromMonorepoRoot = (directory) => {
-	const monorepoRoot = findMonorepoRoot$1(directory);
+	const monorepoRoot = findMonorepoRoot(directory);
 	if (!monorepoRoot) return {
 		reactVersion: null,
 		framework: "unknown"
@@ -289,49 +402,6 @@ const discoverProject = (directory) => {
 	};
 };
 
-//#endregion
-//#region src/utils/match-glob-pattern.ts
-const REGEX_SPECIAL_CHARACTERS = /[.+^${}()|[\]\\]/g;
-const compileGlobPattern = (pattern) => {
-	const normalizedPattern = pattern.replace(/\\/g, "/");
-	let regexSource = "^";
-	let characterIndex = 0;
-	while (characterIndex < normalizedPattern.length) if (normalizedPattern[characterIndex] === "*" && normalizedPattern[characterIndex + 1] === "*") if (normalizedPattern[characterIndex + 2] === "/") {
-		regexSource += "(?:.+/)?";
-		characterIndex += 3;
-	} else {
-		regexSource += ".*";
-		characterIndex += 2;
-	}
-	else if (normalizedPattern[characterIndex] === "*") {
-		regexSource += "[^/]*";
-		characterIndex++;
-	} else if (normalizedPattern[characterIndex] === "?") {
-		regexSource += "[^/]";
-		characterIndex++;
-	} else {
-		regexSource += normalizedPattern[characterIndex].replace(REGEX_SPECIAL_CHARACTERS, "\\$&");
-		characterIndex++;
-	}
-	regexSource += "$";
-	return new RegExp(regexSource);
-};
-
-//#endregion
-//#region src/utils/filter-diagnostics.ts
-const filterIgnoredDiagnostics = (diagnostics, config) => {
-	const ignoredRules = new Set(Array.isArray(config.ignore?.rules) ? config.ignore.rules : []);
-	const ignoredFilePatterns = Array.isArray(config.ignore?.files) ? config.ignore.files.map(compileGlobPattern) : [];
-	if (ignoredRules.size === 0 && ignoredFilePatterns.length === 0) return diagnostics;
-	return diagnostics.filter((diagnostic) => {
-		const ruleIdentifier = `${diagnostic.plugin}/${diagnostic.rule}`;
-		if (ignoredRules.has(ruleIdentifier)) return false;
-		const normalizedPath = diagnostic.filePath.replace(/\\/g, "/").replace(/^\.\//, "");
-		if (ignoredFilePatterns.some((pattern) => pattern.test(normalizedPath))) return false;
-		return true;
-	});
-};
-
 //#endregion
 //#region src/utils/load-config.ts
 const CONFIG_FILENAME = "react-doctor.config.json";
@@ -416,24 +486,10 @@ const silenced = async (fn) => {
 		console.error = originalError;
 	}
 };
-const findMonorepoRoot = (directory) => {
-	let currentDirectory = path.dirname(directory);
-	while (currentDirectory !== path.dirname(currentDirectory)) {
-		if (fs.existsSync(path.join(currentDirectory, "pnpm-workspace.yaml")) || (() => {
-			const packageJsonPath = path.join(currentDirectory, "package.json");
-			if (!fs.existsSync(packageJsonPath)) return false;
-			const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
-			return Array.isArray(packageJson.workspaces) || packageJson.workspaces?.packages;
-		})()) return currentDirectory;
-		currentDirectory = path.dirname(currentDirectory);
-	}
-	return null;
-};
 const CONFIG_LOADING_ERROR_PATTERN = /Error loading .*\/([a-z-]+)\.config\./;
 const extractFailedPluginName = (error) => {
 	return String(error).match(CONFIG_LOADING_ERROR_PATTERN)?.[1] ?? null;
 };
-const MAX_KNIP_RETRIES = 5;
 const runKnipWithOptions = async (knipCwd, workspaceName) => {
 	const options = await silenced(() => createOptions({
 		cwd: knipCwd,
@@ -818,6 +874,69 @@ const resolvePluginPath = () => {
 const resolveDiagnosticCategory = (plugin, rule) => {
 	return RULE_CATEGORY_MAP[`${plugin}/${rule}`] ?? PLUGIN_CATEGORY_MAP[plugin] ?? "Other";
 };
+const estimateArgsLength = (args) => args.reduce((total, argument) => total + argument.length + 1, 0);
+const batchIncludePaths = (baseArgs, includePaths) => {
+	const baseArgsLength = estimateArgsLength(baseArgs);
+	const batches = [];
+	let currentBatch = [];
+	let currentBatchLength = baseArgsLength;
+	for (const filePath of includePaths) {
+		const entryLength = filePath.length + 1;
+		if (currentBatch.length > 0 && currentBatchLength + entryLength > SPAWN_ARGS_MAX_LENGTH_CHARS) {
+			batches.push(currentBatch);
+			currentBatch = [];
+			currentBatchLength = baseArgsLength;
+		}
+		currentBatch.push(filePath);
+		currentBatchLength += entryLength;
+	}
+	if (currentBatch.length > 0) batches.push(currentBatch);
+	return batches;
+};
+const spawnOxlint = (args, rootDirectory) => new Promise((resolve, reject) => {
+	const child = spawn(process.execPath, args, { cwd: rootDirectory });
+	const stdoutBuffers = [];
+	const stderrBuffers = [];
+	child.stdout.on("data", (buffer) => stdoutBuffers.push(buffer));
+	child.stderr.on("data", (buffer) => stderrBuffers.push(buffer));
+	child.on("error", (error) => reject(/* @__PURE__ */ new Error(`Failed to run oxlint: ${error.message}`)));
+	child.on("close", () => {
+		const output = Buffer.concat(stdoutBuffers).toString("utf-8").trim();
+		if (!output) {
+			const stderrOutput = Buffer.concat(stderrBuffers).toString("utf-8").trim();
+			if (stderrOutput) {
+				reject(/* @__PURE__ */ new Error(`Failed to run oxlint: ${stderrOutput}`));
+				return;
+			}
+		}
+		resolve(output);
+	});
+});
+const parseOxlintOutput = (stdout) => {
+	if (!stdout) return [];
+	let output;
+	try {
+		output = JSON.parse(stdout);
+	} catch {
+		throw new Error(`Failed to parse oxlint output: ${stdout.slice(0, ERROR_PREVIEW_LENGTH_CHARS)}`);
+	}
+	return output.diagnostics.filter((diagnostic) => diagnostic.code && JSX_FILE_PATTERN.test(diagnostic.filename)).map((diagnostic) => {
+		const { plugin, rule } = parseRuleCode(diagnostic.code);
+		const primaryLabel = diagnostic.labels[0];
+		const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule);
+		return {
+			filePath: diagnostic.filename,
+			plugin,
+			rule,
+			severity: diagnostic.severity,
+			message: cleaned.message,
+			help: cleaned.help,
+			line: primaryLabel?.span.line ?? 0,
+			column: primaryLabel?.span.column ?? 0,
+			category: resolveDiagnosticCategory(plugin, rule)
+		};
+	});
+};
 const runOxlint = async (rootDirectory, hasTypeScript, framework, hasReactCompiler, includePaths) => {
 	if (includePaths !== void 0 && includePaths.length === 0) return [];
 	const configPath = path.join(os.tmpdir(), `react-doctor-oxlintrc-${process.pid}.json`);
@@ -829,58 +948,21 @@ const runOxlint = async (rootDirectory, hasTypeScript, framework, hasReactCompil
 	const restoreDisableDirectives = neutralizeDisableDirectives(rootDirectory);
 	try {
 		fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-		const args = [
+		const baseArgs = [
 			resolveOxlintBinary(),
 			"-c",
 			configPath,
 			"--format",
 			"json"
 		];
-		if (hasTypeScript) args.push("--tsconfig", "./tsconfig.json");
-		if (includePaths !== void 0) args.push(...includePaths);
-		else args.push(".");
-		const stdout = await new Promise((resolve, reject) => {
-			const child = spawn(process.execPath, args, { cwd: rootDirectory });
-			const stdoutBuffers = [];
-			const stderrBuffers = [];
-			child.stdout.on("data", (buffer) => stdoutBuffers.push(buffer));
-			child.stderr.on("data", (buffer) => stderrBuffers.push(buffer));
-			child.on("error", (error) => reject(/* @__PURE__ */ new Error(`Failed to run oxlint: ${error.message}`)));
-			child.on("close", () => {
-				const output = Buffer.concat(stdoutBuffers).toString("utf-8").trim();
-				if (!output) {
-					const stderrOutput = Buffer.concat(stderrBuffers).toString("utf-8").trim();
-					if (stderrOutput) {
-						reject(/* @__PURE__ */ new Error(`Failed to run oxlint: ${stderrOutput}`));
-						return;
-					}
-				}
-				resolve(output);
-			});
-		});
-		if (!stdout) return [];
-		let output;
-		try {
-			output = JSON.parse(stdout);
-		} catch {
-			throw new Error(`Failed to parse oxlint output: ${stdout.slice(0, ERROR_PREVIEW_LENGTH_CHARS)}`);
+		if (hasTypeScript) baseArgs.push("--tsconfig", "./tsconfig.json");
+		const fileBatches = includePaths !== void 0 ? batchIncludePaths(baseArgs, includePaths) : [["."]];
+		const allDiagnostics = [];
+		for (const batch of fileBatches) {
+			const stdout = await spawnOxlint([...baseArgs, ...batch], rootDirectory);
+			allDiagnostics.push(...parseOxlintOutput(stdout));
 		}
-		return output.diagnostics.filter((diagnostic) => diagnostic.code && JSX_FILE_PATTERN.test(diagnostic.filename)).map((diagnostic) => {
-			const { plugin, rule } = parseRuleCode(diagnostic.code);
-			const primaryLabel = diagnostic.labels[0];
-			const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule);
-			return {
-				filePath: diagnostic.filename,
-				plugin,
-				rule,
-				severity: diagnostic.severity,
-				message: cleaned.message,
-				help: cleaned.help,
-				line: primaryLabel?.span.line ?? 0,
-				column: primaryLabel?.span.column ?? 0,
-				category: resolveDiagnosticCategory(plugin, rule)
-			};
-		});
+		return allDiagnostics;
 	} finally {
 		restoreDisableDirectives();
 		if (fs.existsSync(configPath)) fs.unlinkSync(configPath);
@@ -979,22 +1061,18 @@ const diagnose = async (directory, options = {}) => {
 	const effectiveLint = options.lint ?? userConfig?.lint ?? true;
 	const effectiveDeadCode = options.deadCode ?? userConfig?.deadCode ?? true;
 	if (!projectInfo.reactVersion) throw new Error("No React dependency found in package.json");
-	const jsxIncludePaths = isDiffMode ? includePaths.filter((filePath) => JSX_FILE_PATTERN.test(filePath)) : void 0;
+	const jsxIncludePaths = computeJsxIncludePaths(includePaths);
+	const emptyDiagnostics = [];
 	const lintPromise = effectiveLint ? runOxlint(resolvedDirectory, projectInfo.hasTypeScript, projectInfo.framework, projectInfo.hasReactCompiler, jsxIncludePaths).catch((error) => {
 		console.error("Lint failed:", error);
-		return [];
-	}) : Promise.resolve([]);
+		return emptyDiagnostics;
+	}) : Promise.resolve(emptyDiagnostics);
 	const deadCodePromise = effectiveDeadCode && !isDiffMode ? runKnip(resolvedDirectory).catch((error) => {
 		console.error("Dead code analysis failed:", error);
-		return [];
-	}) : Promise.resolve([]);
+		return emptyDiagnostics;
+	}) : Promise.resolve(emptyDiagnostics);
 	const [lintDiagnostics, deadCodeDiagnostics] = await Promise.all([lintPromise, deadCodePromise]);
-	const allDiagnostics = [
-		...lintDiagnostics,
-		...deadCodeDiagnostics,
-		...isDiffMode ? [] : checkReducedMotion(resolvedDirectory)
-	];
-	const diagnostics = userConfig ? filterIgnoredDiagnostics(allDiagnostics, userConfig) : allDiagnostics;
+	const diagnostics = combineDiagnostics(lintDiagnostics, deadCodeDiagnostics, resolvedDirectory, isDiffMode, userConfig);
 	const elapsedMilliseconds = performance.now() - startTime;
 	return {
 		diagnostics,