react-doctor 0.0.30 → 0.0.32

package/dist/cli.js

@@ -32,7 +32,7 @@ const OPEN_BASE_URL = "https://www.react.doctor/open";
 const FETCH_TIMEOUT_MS = 1e4;
 const GIT_LS_FILES_MAX_BUFFER_BYTES = 50 * 1024 * 1024;
 const SPAWN_ARGS_MAX_LENGTH_CHARS = 24e3;
-const OFFLINE_MESSAGE = "You are offline, could not calculate score. Reconnect to calculate.";
+const OFFLINE_MESSAGE = "Score calculated locally (offline mode).";
 const DEFAULT_BRANCH_CANDIDATES = ["main", "master"];
 const ERROR_RULE_PENALTY = 1.5;
 const WARNING_RULE_PENALTY = .75;
@@ -41,6 +41,12 @@ const WARNING_ESTIMATED_FIX_RATE = .8;
 const MAX_KNIP_RETRIES = 5;
 const OXLINT_NODE_REQUIREMENT = "^20.19.0 || >=22.12.0";
 const OXLINT_RECOMMENDED_NODE_MAJOR = 24;
+const IGNORED_DIRECTORIES = new Set([
+	"node_modules",
+	"dist",
+	"build",
+	"coverage"
+]);
 const AMI_WEBSITE_URL = "https://ami.dev";
 const AMI_INSTALL_URL = `${AMI_WEBSITE_URL}/install.sh`;
 const AMI_RELEASES_URL = "https://github.com/millionco/ami-releases/releases";
@@ -278,17 +284,31 @@ const compileGlobPattern = (pattern) => {
 	return new RegExp(regexSource);
 };
 
+//#endregion
+//#region src/utils/is-ignored-file.ts
+const toRelativePath = (filePath, rootDirectory) => {
+	const normalizedFilePath = filePath.replace(/\\/g, "/");
+	const normalizedRoot = rootDirectory.replace(/\\/g, "/").replace(/\/$/, "") + "/";
+	if (normalizedFilePath.startsWith(normalizedRoot)) return normalizedFilePath.slice(normalizedRoot.length);
+	return normalizedFilePath.replace(/^\.\//, "");
+};
+const compileIgnoredFilePatterns = (userConfig) => Array.isArray(userConfig?.ignore?.files) ? userConfig.ignore.files.map(compileGlobPattern) : [];
+const isFileIgnoredByPatterns = (filePath, rootDirectory, patterns) => {
+	if (patterns.length === 0) return false;
+	const relativePath = toRelativePath(filePath, rootDirectory);
+	return patterns.some((pattern) => pattern.test(relativePath));
+};
+
 //#endregion
 //#region src/utils/filter-diagnostics.ts
-const filterIgnoredDiagnostics = (diagnostics, config) => {
+const filterIgnoredDiagnostics = (diagnostics, config, rootDirectory) => {
 	const ignoredRules = new Set(Array.isArray(config.ignore?.rules) ? config.ignore.rules : []);
-	const ignoredFilePatterns = Array.isArray(config.ignore?.files) ? config.ignore.files.map(compileGlobPattern) : [];
+	const ignoredFilePatterns = compileIgnoredFilePatterns(config);
 	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;
+		if (isFileIgnoredByPatterns(diagnostic.filePath, rootDirectory, ignoredFilePatterns)) return false;
 		return true;
 	});
 };
@@ -343,7 +363,7 @@ const combineDiagnostics = (lintDiagnostics, deadCodeDiagnostics, directory, isD
 		...deadCodeDiagnostics,
 		...isDiffMode ? [] : checkReducedMotion(directory)
 	];
-	return filterInlineSuppressions(userConfig ? filterIgnoredDiagnostics(merged, userConfig) : merged, directory);
+	return filterInlineSuppressions(userConfig ? filterIgnoredDiagnostics(merged, userConfig, directory) : merged, directory);
 };
 
 //#endregion
@@ -422,12 +442,6 @@ const FRAMEWORK_DISPLAY_NAMES = {
 	unknown: "React"
 };
 const formatFrameworkName = (framework) => FRAMEWORK_DISPLAY_NAMES[framework];
-const IGNORED_DIRECTORIES = new Set([
-	"node_modules",
-	"dist",
-	"build",
-	"coverage"
-]);
 const countSourceFilesViaFilesystem = (rootDirectory) => {
 	let count = 0;
 	const stack = [rootDirectory];
@@ -469,23 +483,115 @@ const detectFramework = (dependencies) => {
 	return "unknown";
 };
 const isCatalogReference = (version) => version.startsWith("catalog:");
+const extractCatalogName = (version) => {
+	if (!isCatalogReference(version)) return null;
+	const name = version.slice(8).trim();
+	return name.length > 0 ? name : null;
+};
 const resolveVersionFromCatalog = (catalog, packageName) => {
 	const version = catalog[packageName];
 	if (typeof version === "string" && !isCatalogReference(version)) return version;
 	return null;
 };
-const resolveCatalogVersion = (packageJson, packageName) => {
+const parsePnpmWorkspaceCatalogs = (rootDirectory) => {
+	const workspacePath = path.join(rootDirectory, "pnpm-workspace.yaml");
+	if (!isFile(workspacePath)) return {
+		defaultCatalog: {},
+		namedCatalogs: {}
+	};
+	const content = fs.readFileSync(workspacePath, "utf-8");
+	const defaultCatalog = {};
+	const namedCatalogs = {};
+	let currentSection = "none";
+	let currentCatalogName = "";
+	for (const line of content.split("\n")) {
+		const trimmed = line.trim();
+		if (trimmed.length === 0 || trimmed.startsWith("#")) continue;
+		const indentLevel = line.search(/\S/);
+		if (indentLevel === 0 && trimmed === "catalog:") {
+			currentSection = "catalog";
+			continue;
+		}
+		if (indentLevel === 0 && trimmed === "catalogs:") {
+			currentSection = "catalogs";
+			continue;
+		}
+		if (indentLevel === 0) {
+			currentSection = "none";
+			continue;
+		}
+		if (currentSection === "catalog" && indentLevel > 0) {
+			const colonIndex = trimmed.indexOf(":");
+			if (colonIndex > 0) {
+				const key = trimmed.slice(0, colonIndex).trim().replace(/["']/g, "");
+				const value = trimmed.slice(colonIndex + 1).trim().replace(/["']/g, "");
+				if (key && value) defaultCatalog[key] = value;
+			}
+			continue;
+		}
+		if (currentSection === "catalogs" && indentLevel > 0) {
+			if (trimmed.endsWith(":") && !trimmed.includes(" ")) {
+				currentCatalogName = trimmed.slice(0, -1).replace(/["']/g, "");
+				currentSection = "named-catalog";
+				namedCatalogs[currentCatalogName] = {};
+				continue;
+			}
+		}
+		if (currentSection === "named-catalog" && indentLevel > 0) {
+			if (indentLevel <= 2 && trimmed.endsWith(":") && !trimmed.includes(" ")) {
+				currentCatalogName = trimmed.slice(0, -1).replace(/["']/g, "");
+				namedCatalogs[currentCatalogName] = {};
+				continue;
+			}
+			const colonIndex = trimmed.indexOf(":");
+			if (colonIndex > 0 && currentCatalogName) {
+				const key = trimmed.slice(0, colonIndex).trim().replace(/["']/g, "");
+				const value = trimmed.slice(colonIndex + 1).trim().replace(/["']/g, "");
+				if (key && value) namedCatalogs[currentCatalogName][key] = value;
+			}
+		}
+	}
+	return {
+		defaultCatalog,
+		namedCatalogs
+	};
+};
+const resolveCatalogVersionFromCollection = (catalogs, packageName, catalogReference) => {
+	if (catalogReference) {
+		const namedCatalog = catalogs.namedCatalogs[catalogReference];
+		if (namedCatalog?.[packageName]) return namedCatalog[packageName];
+	}
+	if (catalogs.defaultCatalog[packageName]) return catalogs.defaultCatalog[packageName];
+	for (const namedCatalog of Object.values(catalogs.namedCatalogs)) if (namedCatalog[packageName]) return namedCatalog[packageName];
+	return null;
+};
+const resolveCatalogVersion = (packageJson, packageName, rootDirectory) => {
+	const rawVersion = collectAllDependencies(packageJson)[packageName];
+	const catalogName = rawVersion ? extractCatalogName(rawVersion) : null;
 	const raw = packageJson;
 	if (isPlainObject(raw.catalog)) {
 		const version = resolveVersionFromCatalog(raw.catalog, packageName);
 		if (version) return version;
 	}
 	if (isPlainObject(raw.catalogs)) {
+		if (catalogName && isPlainObject(raw.catalogs[catalogName])) {
+			const version = resolveVersionFromCatalog(raw.catalogs[catalogName], packageName);
+			if (version) return version;
+		}
 		for (const catalogEntries of Object.values(raw.catalogs)) if (isPlainObject(catalogEntries)) {
 			const version = resolveVersionFromCatalog(catalogEntries, packageName);
 			if (version) return version;
 		}
 	}
+	const workspaces = packageJson.workspaces;
+	if (workspaces && !Array.isArray(workspaces) && isPlainObject(workspaces.catalog)) {
+		const version = resolveVersionFromCatalog(workspaces.catalog, packageName);
+		if (version) return version;
+	}
+	if (rootDirectory) {
+		const pnpmVersion = resolveCatalogVersionFromCollection(parsePnpmWorkspaceCatalogs(rootDirectory), packageName, catalogName);
+		if (pnpmVersion) return pnpmVersion;
+	}
 	return null;
 };
 const extractDependencyInfo = (packageJson) => {
@@ -546,7 +652,7 @@ const findDependencyInfoFromMonorepoRoot = (directory) => {
 	};
 	const rootPackageJson = readPackageJson(monorepoPackageJsonPath);
 	const rootInfo = extractDependencyInfo(rootPackageJson);
-	const catalogVersion = resolveCatalogVersion(rootPackageJson, "react");
+	const catalogVersion = resolveCatalogVersion(rootPackageJson, "react", monorepoRoot);
 	const workspaceInfo = findReactInWorkspaces(monorepoRoot, rootPackageJson);
 	return {
 		reactVersion: rootInfo.reactVersion ?? catalogVersion ?? workspaceInfo.reactVersion,
@@ -612,9 +718,17 @@ const discoverReactSubprojects = (rootDirectory) => {
 const listWorkspacePackages = (rootDirectory) => {
 	const packageJsonPath = path.join(rootDirectory, "package.json");
 	if (!isFile(packageJsonPath)) return [];
-	const patterns = getWorkspacePatterns(rootDirectory, readPackageJson(packageJsonPath));
+	const packageJson = readPackageJson(packageJsonPath);
+	const patterns = getWorkspacePatterns(rootDirectory, packageJson);
 	if (patterns.length === 0) return [];
 	const packages = [];
+	if (hasReactDependency(packageJson)) {
+		const rootName = packageJson.name ?? path.basename(rootDirectory);
+		packages.push({
+			name: rootName,
+			directory: rootDirectory
+		});
+	}
 	for (const pattern of patterns) {
 		const directories = resolveWorkspaceDirectories(rootDirectory, pattern);
 		for (const workspaceDirectory of directories) {
@@ -660,7 +774,14 @@ const discoverProject = (directory) => {
 	if (!isFile(packageJsonPath)) throw new Error(`No package.json found in ${directory}`);
 	const packageJson = readPackageJson(packageJsonPath);
 	let { reactVersion, framework } = extractDependencyInfo(packageJson);
-	if (!reactVersion) reactVersion = resolveCatalogVersion(packageJson, "react");
+	if (!reactVersion) reactVersion = resolveCatalogVersion(packageJson, "react", directory);
+	if (!reactVersion) {
+		const monorepoRoot = findMonorepoRoot(directory);
+		if (monorepoRoot) {
+			const monorepoPackageJsonPath = path.join(monorepoRoot, "package.json");
+			if (isFile(monorepoPackageJsonPath)) reactVersion = resolveCatalogVersion(readPackageJson(monorepoPackageJsonPath), "react", monorepoRoot);
+		}
+	}
 	if (!reactVersion || framework === "unknown") {
 		const workspaceInfo = findReactInWorkspaces(directory, packageJson);
 		if (!reactVersion && workspaceInfo.reactVersion) reactVersion = workspaceInfo.reactVersion;
@@ -942,6 +1063,49 @@ const resolveNodeForOxlint = () => {
 	};
 };
 
+//#endregion
+//#region src/utils/resolve-lint-include-paths.ts
+const listSourceFilesViaGit = (rootDirectory) => {
+	const result = spawnSync("git", [
+		"ls-files",
+		"--cached",
+		"--others",
+		"--exclude-standard"
+	], {
+		cwd: rootDirectory,
+		encoding: "utf-8",
+		maxBuffer: GIT_LS_FILES_MAX_BUFFER_BYTES
+	});
+	if (result.error || result.status !== 0) return null;
+	return result.stdout.split("\n").filter((filePath) => filePath.length > 0 && SOURCE_FILE_PATTERN.test(filePath));
+};
+const listSourceFilesViaFilesystem = (rootDirectory) => {
+	const filePaths = [];
+	const stack = [rootDirectory];
+	while (stack.length > 0) {
+		const currentDirectory = stack.pop();
+		const entries = fs.readdirSync(currentDirectory, { withFileTypes: true });
+		for (const entry of entries) {
+			const absolutePath = path.join(currentDirectory, entry.name);
+			if (entry.isDirectory()) {
+				if (!entry.name.startsWith(".") && !IGNORED_DIRECTORIES.has(entry.name)) stack.push(absolutePath);
+				continue;
+			}
+			if (entry.isFile() && SOURCE_FILE_PATTERN.test(entry.name)) filePaths.push(path.relative(rootDirectory, absolutePath).replace(/\\/g, "/"));
+		}
+	}
+	return filePaths;
+};
+const listSourceFiles = (rootDirectory) => listSourceFilesViaGit(rootDirectory) ?? listSourceFilesViaFilesystem(rootDirectory);
+const resolveLintIncludePaths = (rootDirectory, userConfig) => {
+	if (!Array.isArray(userConfig?.ignore?.files) || userConfig.ignore.files.length === 0) return;
+	const ignoredPatterns = compileIgnoredFilePatterns(userConfig);
+	return listSourceFiles(rootDirectory).filter((filePath) => {
+		if (!JSX_FILE_PATTERN.test(filePath)) return false;
+		return !isFileIgnoredByPatterns(filePath, rootDirectory, ignoredPatterns);
+	});
+};
+
 //#endregion
 //#region src/utils/run-knip.ts
 const KNIP_CATEGORY_MAP = {
@@ -1200,24 +1364,27 @@ const createOxlintConfig = ({ pluginPath, framework, hasReactCompiler }) => ({
 
 //#endregion
 //#region src/utils/neutralize-disable-directives.ts
-const findFilesWithDisableDirectives = (rootDirectory) => {
-	const result = spawnSync("git", [
+const findFilesWithDisableDirectives = (rootDirectory, includePaths) => {
+	const grepArgs = [
 		"grep",
 		"-l",
 		"--untracked",
 		"-E",
 		"(eslint|oxlint)-disable"
-	], {
+	];
+	if (includePaths && includePaths.length > 0) grepArgs.push("--", ...includePaths);
+	const result = spawnSync("git", grepArgs, {
 		cwd: rootDirectory,
 		encoding: "utf-8",
 		maxBuffer: GIT_LS_FILES_MAX_BUFFER_BYTES
 	});
 	if (result.error || result.status === null) return [];
+	if (result.status !== 0 && result.stdout.trim().length === 0) return [];
 	return result.stdout.split("\n").filter((filePath) => filePath.length > 0 && SOURCE_FILE_PATTERN.test(filePath));
 };
 const neutralizeContent = (content) => content.replaceAll("eslint-disable", "eslint_disable").replaceAll("oxlint-disable", "oxlint_disable");
-const neutralizeDisableDirectives = (rootDirectory) => {
-	const filePaths = findFilesWithDisableDirectives(rootDirectory);
+const neutralizeDisableDirectives = (rootDirectory, includePaths) => {
+	const filePaths = findFilesWithDisableDirectives(rootDirectory, includePaths);
 	const originalContents = /* @__PURE__ */ new Map();
 	for (const relativePath of filePaths) {
 		const absolutePath = path.join(rootDirectory, relativePath);
@@ -1493,7 +1660,7 @@ const runOxlint = async (rootDirectory, hasTypeScript, framework, hasReactCompil
 		framework,
 		hasReactCompiler
 	});
-	const restoreDisableDirectives = neutralizeDisableDirectives(rootDirectory);
+	const restoreDisableDirectives = neutralizeDisableDirectives(rootDirectory, includePaths);
 	try {
 		fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
 		const baseArgs = [
@@ -1780,7 +1947,7 @@ const mergeScanOptions = (inputOptions, userConfig) => ({
 	offline: inputOptions.offline ?? false,
 	includePaths: inputOptions.includePaths ?? []
 });
-const printProjectDetection = (projectInfo, userConfig, isDiffMode, includePaths) => {
+const printProjectDetection = (projectInfo, userConfig, isDiffMode, includePaths, lintSourceFileCount) => {
 	const frameworkLabel = formatFrameworkName(projectInfo.framework);
 	const languageLabel = projectInfo.hasTypeScript ? "TypeScript" : "JavaScript";
 	const completeStep = (message) => {
@@ -1791,7 +1958,7 @@ const printProjectDetection = (projectInfo, userConfig, isDiffMode, includePaths
 	completeStep(`Detecting language. Found ${highlighter.info(languageLabel)}.`);
 	completeStep(`Detecting React Compiler. ${projectInfo.hasReactCompiler ? highlighter.info("Found React Compiler.") : "Not found."}`);
 	if (isDiffMode) completeStep(`Scanning ${highlighter.info(`${includePaths.length}`)} changed source files.`);
-	else completeStep(`Found ${highlighter.info(`${projectInfo.sourceFileCount}`)} source files.`);
+	else completeStep(`Found ${highlighter.info(`${lintSourceFileCount ?? projectInfo.sourceFileCount}`)} source files.`);
 	if (userConfig) completeStep(`Loaded ${highlighter.info("react-doctor config")}.`);
 	logger.break();
 };
@@ -1803,8 +1970,9 @@ const scan = async (directory, inputOptions = {}) => {
 	const { includePaths } = options;
 	const isDiffMode = includePaths.length > 0;
 	if (!projectInfo.reactVersion) throw new Error("No React dependency found in package.json");
-	if (!options.scoreOnly) printProjectDetection(projectInfo, userConfig, isDiffMode, includePaths);
-	const jsxIncludePaths = computeJsxIncludePaths(includePaths);
+	const lintIncludePaths = computeJsxIncludePaths(includePaths) ?? resolveLintIncludePaths(directory, userConfig);
+	const lintSourceFileCount = lintIncludePaths?.length ?? projectInfo.sourceFileCount;
+	if (!options.scoreOnly) printProjectDetection(projectInfo, userConfig, isDiffMode, includePaths, lintSourceFileCount);
 	let didLintFail = false;
 	let didDeadCodeFail = false;
 	const resolvedNodeBinaryPath = await resolveOxlintNode(options.lint, options.scoreOnly);
@@ -1812,7 +1980,7 @@ const scan = async (directory, inputOptions = {}) => {
 	const lintPromise = resolvedNodeBinaryPath ? (async () => {
 		const lintSpinner = options.scoreOnly ? null : spinner("Running lint checks...").start();
 		try {
-			const lintDiagnostics = await runOxlint(directory, projectInfo.hasTypeScript, projectInfo.framework, projectInfo.hasReactCompiler, jsxIncludePaths, resolvedNodeBinaryPath);
+			const lintDiagnostics = await runOxlint(directory, projectInfo.hasTypeScript, projectInfo.framework, projectInfo.hasReactCompiler, lintIncludePaths, resolvedNodeBinaryPath);
 			lintSpinner?.succeed("Running lint checks.");
 			return lintDiagnostics;
 		} catch (error) {
@@ -1883,7 +2051,7 @@ const scan = async (directory, inputOptions = {}) => {
 		};
 	}
 	printDiagnostics(diagnostics, options.verbose);
-	const displayedSourceFileCount = isDiffMode ? includePaths.length : projectInfo.sourceFileCount;
+	const displayedSourceFileCount = isDiffMode ? includePaths.length : lintSourceFileCount;
 	printSummary(diagnostics, elapsedMilliseconds, scoreResult, projectInfo.projectName, displayedSourceFileCount, noScoreMessage, options.offline);
 	if (hasSkippedChecks) {
 		const skippedLabel = skippedChecks.join(" and ");
@@ -2211,7 +2379,7 @@ const maybePromptSkillInstall = async (shouldSkipPrompts) => {
 
 //#endregion
 //#region src/cli.ts
-const VERSION = "0.0.30";
+const VERSION = "0.0.32";
 const VALID_FAIL_ON_LEVELS = new Set([
 	"error",
 	"warning",
@@ -2264,7 +2432,7 @@ const resolveDiffMode = async (diffInfo, effectiveDiff, shouldSkipPrompts, isSco
 	if (effectiveDiff === false || !diffInfo) return false;
 	const changedSourceFiles = filterSourceFiles(diffInfo.changedFiles);
 	if (changedSourceFiles.length === 0) return false;
-	if (shouldSkipPrompts) return true;
+	if (shouldSkipPrompts) return false;
 	if (isScoreOnly) return false;
 	const { shouldScanChangedOnly } = await prompts({
 		type: "confirm",