react-doctor 0.0.30 → 0.0.31

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,WAAA;AAAA,KAEA,SAAA;AAAA,UAUK,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;EACA,MAAA,GAAS,WAAA;AAAA;;;cChGE,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"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/types.ts","../src/utils/get-diff-files.ts","../src/index.ts"],"mappings":";KAAY,WAAA;AAAA,KAEA,SAAA;AAAA,UAUK,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;EACA,MAAA,GAAS,WAAA;AAAA;;;cChGE,WAAA,GAAe,SAAA,UAAmB,kBAAA,cAA8B,QAAA;AAAA,cAiBhE,iBAAA,GAAqB,SAAA;;;UClFjB,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

@@ -25,6 +25,12 @@ const WARNING_RULE_PENALTY = .75;
 const ERROR_ESTIMATED_FIX_RATE = .85;
 const WARNING_ESTIMATED_FIX_RATE = .8;
 const MAX_KNIP_RETRIES = 5;
+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`;
 
@@ -230,17 +236,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;
 	});
 };
@@ -295,7 +315,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
@@ -363,12 +383,6 @@ const FRAMEWORK_PACKAGES = {
 	expo: "expo",
 	"react-native": "react-native"
 };
-const IGNORED_DIRECTORIES = new Set([
-	"node_modules",
-	"dist",
-	"build",
-	"coverage"
-]);
 const countSourceFilesViaFilesystem = (rootDirectory) => {
 	let count = 0;
 	const stack = [rootDirectory];
@@ -410,23 +424,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) => {
@@ -487,7 +593,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,
@@ -542,7 +648,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;
@@ -593,6 +706,49 @@ const loadConfig = (rootDirectory) => {
 	return null;
 };
 
+//#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 = {
@@ -851,24 +1007,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);
@@ -1144,7 +1303,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 = [
@@ -1260,9 +1419,9 @@ 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 = computeJsxIncludePaths(includePaths);
+	const lintIncludePaths = computeJsxIncludePaths(includePaths) ?? resolveLintIncludePaths(resolvedDirectory, userConfig);
 	const emptyDiagnostics = [];
-	const lintPromise = effectiveLint ? runOxlint(resolvedDirectory, projectInfo.hasTypeScript, projectInfo.framework, projectInfo.hasReactCompiler, jsxIncludePaths).catch((error) => {
+	const lintPromise = effectiveLint ? runOxlint(resolvedDirectory, projectInfo.hasTypeScript, projectInfo.framework, projectInfo.hasReactCompiler, lintIncludePaths).catch((error) => {
 		console.error("Lint failed:", error);
 		return emptyDiagnostics;
 	}) : Promise.resolve(emptyDiagnostics);