react-doctor 0.7.6-dev.82e10cd → 0.7.6-dev.88ef7fd

package/dist/index.d.ts

@@ -9654,6 +9654,7 @@ interface DiagnoseOptions {
   /** See `ReactDoctorConfig.deadCode`. Ignored in diff mode. */
   deadCode?: boolean;
   verbose?: boolean;
+  /** Restrict linting to these supported JS/TS source files. */
   includePaths?: string[];
   /**
    * Per-call override for `ReactDoctorConfig.respectInlineDisables`.
@@ -9915,9 +9916,9 @@ interface JsonReportProjectEntry {
   skippedCheckReasons?: Record<string, string>;
   /**
    * Number of source files this scan's linter examined. In diff / changed
-   * mode it's the count of changed React-eligible files (`.tsx`/`.jsx` plus
-   * framework entry files); in a full scan it's the whole source tree. `0`
-   * in a diff scan means the changed files held nothing React Doctor lints —
+   * mode it's the count of changed supported JS/TS source files; in a full
+   * scan it's the whole source tree. `0` in a diff scan means the changed
+   * files held nothing React Doctor lints —
    * the GitHub Action reads that as "nothing to report" (skips the PR comment;
    * the commit status says "skipped"). Optional: absent on reports from
    * constructors that don't track it (e.g. `toJsonReport`).
@@ -10255,7 +10256,7 @@ declare const buildJsonReport: (input: BuildJsonReportInput) => JsonReportV3$1;
  * render diff-base mistakes (`GitBaseBranchInvalid` /
  * `GitBaseBranchMissing`) as clean user errors instead of crashes.
  */
-declare const getDiffInfo: (directory: string, explicitBaseBranch?: string) => Promise<DiffInfo | null>;
+declare const getDiffInfo: (directory: string, explicitBaseBranch?: string, includeUntracked?: boolean) => Promise<DiffInfo | null>;
 declare const filterSourceFiles: (filePaths: string[]) => string[];
 /**
  * Programmatic façade over `Git.changedLineRanges` (the `lines` scope). Diffs

package/dist/index.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="7a10d23c-04fd-53e1-a623-a3dc5d6d0830")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="2aa6fc3c-96ab-5a4c-8a52-e74d27fb4b5a")}catch(e){}}();
 import { r as __toESM$1, t as __commonJSMin$1 } from "./chunk-N93fKeF6.js";
 import { createRequire } from "node:module";
 import reactDoctorPlugin, { ALL_REACT_DOCTOR_RULE_KEYS, CROSS_FILE_DEPENDENCY_COLLECTORS, CROSS_FILE_RULE_IDS, FRAMEWORK_SPECIFIC_RULE_KEYS, FRAMEWORK_TOKENS, MOTION_LIBRARY_PACKAGES, REACT_COMPILER_RULES, REACT_DOCTOR_RULES, classifySecurityScanFile, collectCrossFileDependencyProbes, resetManifestCaches, shouldReadSecurityScanContent } from "oxlint-plugin-react-doctor";
@@ -32930,7 +32930,6 @@ const IGNORED_DIRECTORIES = new Set([
 	"out",
 	"storybook-static"
 ]);
-const JSX_FILE_PATTERN = /\.(tsx|jsx)$/;
 const MILLISECONDS_PER_SECOND = 1e3;
 const SCORE_API_URL = "https://www.react.doctor/api/score";
 const FETCH_TIMEOUT_MS = 1e4;
@@ -33143,13 +33142,15 @@ const listSourceFilesViaFilesystem = (rootDirectory) => {
 const listSourceFilesWithSize = (rootDirectory) => collectSizedSourceFiles(rootDirectory, (listSourceFilesViaGit(rootDirectory) ?? listSourceFilesViaFilesystem(rootDirectory)).sort());
 const listSourceFiles = (rootDirectory) => listSourceFilesWithSize(rootDirectory).map((entry) => entry.path);
 const countSourceFiles = (rootDirectory) => listSourceFilesWithSize(rootDirectory).length;
+const UTF8_BOM_CHARACTER = "";
+const stripUtf8Bom = (content) => content.startsWith(UTF8_BOM_CHARACTER) ? content.slice(1) : content;
 const cachedPackageJsons = /* @__PURE__ */ new Map();
 const clearPackageJsonCache = () => {
 	cachedPackageJsons.clear();
 };
 const readPackageJsonUncached = (packageJsonPath) => {
 	try {
-		return JSON.parse(NFS.readFileSync(packageJsonPath, "utf-8"));
+		return JSON.parse(stripUtf8Bom(NFS.readFileSync(packageJsonPath, "utf-8")));
 	} catch (error) {
 		if (error instanceof SyntaxError) return {};
 		if (isErrnoException(error)) {
@@ -36790,7 +36791,6 @@ const PNPM_WORKSPACE_FILE = "pnpm-workspace.yaml";
 const PNPM_LOCKFILE = "pnpm-lock.yaml";
 const PACKAGE_JSON_FILE = "package.json";
 const PNPM_HARDENING_RULE_KEY = "require-pnpm-hardening";
-const UTF8_BOM_CHAR = "";
 const HARDENING_SETTING_KEYS = new Set([
 	"minimumReleaseAge",
 	"blockExoticSubdeps",
@@ -36815,12 +36815,11 @@ const stripInlineComment = (rawValue) => {
 	return rawValue;
 };
 const unquote = (rawValue) => rawValue.replace(/^["']|["']$/g, "");
-const stripBom = (rawContent) => rawContent.startsWith(UTF8_BOM_CHAR) ? rawContent.slice(1) : rawContent;
 const parseHardeningSettings = (content) => {
 	let minimumReleaseAge = null;
 	let blockExoticSubdeps = null;
 	let trustPolicy = null;
-	const lines = stripBom(content).split(/\r?\n/);
+	const lines = stripUtf8Bom(content).split(/\r?\n/);
 	for (let lineIndex = 0; lineIndex < lines.length; lineIndex += 1) {
 		const lineText = lines[lineIndex];
 		if (lineText === void 0) continue;
@@ -36854,7 +36853,7 @@ const isPnpmManagedProject = (rootDirectory) => {
 	const packageJsonPath = Path.join(rootDirectory, PACKAGE_JSON_FILE);
 	if (!isFile(packageJsonPath)) return false;
 	try {
-		const packageJsonRaw = NFS.readFileSync(packageJsonPath, "utf-8");
+		const packageJsonRaw = stripUtf8Bom(NFS.readFileSync(packageJsonPath, "utf-8"));
 		const packageJson = JSON.parse(packageJsonRaw);
 		if (packageJson !== null && typeof packageJson === "object" && "packageManager" in packageJson && typeof packageJson.packageManager === "string" && packageJson.packageManager.startsWith("pnpm@")) return true;
 	} catch {
@@ -37516,9 +37515,7 @@ const highlighter = {
 	gray: import_picocolors.default.gray,
 	bold: import_picocolors.default.bold
 };
-const NEXT_ENTRY_FILE_PATTERN = /^(?:\.\/)?(?:src\/)?(?:middleware|proxy)\.(?:tsx?|jsx?|mts|mjs)$/;
-const shouldIncludeExplicitLintPath = (filePath, project) => JSX_FILE_PATTERN.test(filePath) || project?.framework === "nextjs" && NEXT_ENTRY_FILE_PATTERN.test(filePath);
-const computeExplicitLintIncludePaths = (includePaths, project) => includePaths.length > 0 ? includePaths.filter((filePath) => shouldIncludeExplicitLintPath(filePath, project)) : void 0;
+const computeExplicitLintIncludePaths = (includePaths) => includePaths.length > 0 ? includePaths.filter(isLintableSourceFile) : void 0;
 const LINGUIST_ATTRIBUTE_PATTERN = /^linguist-(?:vendored|generated)(?:=([a-zA-Z0-9]+))?$/i;
 const FALSY_VALUES = new Set([
 	"false",
@@ -38360,11 +38357,11 @@ const resolveDeadCodeTimeout = (input) => {
 		phaseTimeoutMs: workerTimeoutMs + DEAD_CODE_PHASE_TIMEOUT_OVER_WORKER_MS
 	};
 };
-const resolveLintIncludePaths = (rootDirectory, userConfig, project) => {
+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 (!shouldIncludeExplicitLintPath(filePath, project)) return false;
+		if (!isLintableSourceFile(filePath)) return false;
 		return !isFileIgnoredByPatterns(filePath, rootDirectory, ignoredPatterns);
 	});
 };
@@ -38582,6 +38579,7 @@ const parseGithubViewerPermission = (stdout) => {
 	return /^[A-Z_]+$/.test(value) ? value.toLowerCase() : null;
 };
 const splitNullSeparated = (value) => value.split("\0").filter((entry) => entry.length > 0);
+const UNTRACKED_FILE_LAST_LINE = Number.MAX_SAFE_INTEGER;
 /**
 * `Git` wraps every `git`-via-subprocess call react-doctor makes
 * behind a `Context.Service`. The production layer (`layerNode`)
@@ -38652,6 +38650,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			args,
 			directory
 		});
+		const listUntrackedFilePaths = (directory, includePaths = []) => runGit(directory, [
+			"ls-files",
+			"-z",
+			"--others",
+			"--exclude-standard",
+			...includePaths.length > 0 ? ["--", ...includePaths] : []
+		]).pipe(map$3((result) => result.status === 0 ? splitNullSeparated(result.stdout) : null));
+		const mergeUntracked = (directory, trackedFilePaths, includeUntracked) => includeUntracked ? listUntrackedFilePaths(directory).pipe(map$3((untracked) => untracked === null ? trackedFilePaths : [...new Set([...trackedFilePaths, ...untracked])])) : succeed$2(trackedFilePaths);
 		const currentBranch = (directory) => runGit(directory, [
 			"rev-parse",
 			"--abbrev-ref",
@@ -38774,7 +38780,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			githubViewerPermission,
 			branchExists,
 			mergeBase,
-			diffSelection: ({ directory, explicitBaseBranch }) => gen(function* () {
+			diffSelection: ({ directory, explicitBaseBranch, includeUntracked = false }) => gen(function* () {
 				if (explicitBaseBranch !== void 0 && explicitBaseBranch.trim().length === 0) return yield* fail$4(new ReactDoctorError({ reason: new GitBaseBranchInvalid({ detail: "Diff base branch cannot be empty." }) }));
 				if (explicitBaseBranch !== void 0) {
 					const range = parseGitDiffRange(explicitBaseBranch);
@@ -38803,7 +38809,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 						"HEAD"
 					]);
 					if (uncommitted.status !== 0) return null;
-					const files = splitNullSeparated(uncommitted.stdout);
+					const files = yield* mergeUntracked(directory, splitNullSeparated(uncommitted.stdout), includeUntracked);
 					if (files.length === 0) return null;
 					return {
 						currentBranch: resolvedCurrentBranch,
@@ -38833,7 +38839,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					currentBranch: resolvedCurrentBranch,
 					baseBranch,
 					diffBaseRef: mergeBaseRef,
-					changedFiles: splitNullSeparated(diff.stdout),
+					changedFiles: yield* mergeUntracked(directory, splitNullSeparated(diff.stdout), includeUntracked),
 					isCurrentChanges: false
 				};
 			}).pipe(withSpan("Git.diffSelection")),
@@ -38879,7 +38885,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					stdout: result.stdout
 				};
 			}).pipe(withSpan("Git.grep")),
-			changedLineRanges: ({ directory, baseRef, cached, files }) => gen(function* () {
+			changedLineRanges: ({ directory, baseRef, cached, files, includeUntracked = false }) => gen(function* () {
 				if (files.length === 0) return [];
 				if (baseRef !== void 0 && !isSafeGitRevision(baseRef)) return null;
 				const result = yield* runGit(directory, [
@@ -38893,7 +38899,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					...files
 				]);
 				if (result.status !== 0) return null;
-				return parseChangedLineRanges(result.stdout);
+				const changedLineRanges = parseChangedLineRanges(result.stdout);
+				if (cached || !includeUntracked) return changedLineRanges;
+				const untrackedFilePaths = yield* listUntrackedFilePaths(directory, files);
+				if (untrackedFilePaths === null) return changedLineRanges;
+				return [...changedLineRanges, ...untrackedFilePaths.map((file) => ({
+					file,
+					ranges: [[1, UNTRACKED_FILE_LAST_LINE]]
+				}))];
 			}).pipe(catch_$1((error) => error.reason._tag === "GitInvocationFailed" ? succeed$2(null) : fail$4(error)), withSpan("Git.changedLineRanges"))
 		});
 	})).pipe(provide$2(layer$2.pipe(provide$2(mergeAll$1(layer$1, layer)))));
@@ -39645,6 +39658,12 @@ const mapWithConcurrency = async (items, concurrency, task) => {
 	if (errors.length > 0) throw errors[0];
 	return results;
 };
+const lineOfUtf8Offset = (sourceBuffer, utf8Offset) => {
+	let lineNumber = 1;
+	const scanEnd = Math.min(utf8Offset, sourceBuffer.length);
+	for (let byteIndex = 0; byteIndex < scanEnd; byteIndex++) if (sourceBuffer[byteIndex] === 10) lineNumber++;
+	return lineNumber;
+};
 const REANIMATED_SHARED_VALUE_HINT = "If this is a Reanimated shared value, prefer its React Compiler-compatible `.get()` / `.set()` accessors over `.value` — https://docs.swmansion.com/react-native-reanimated/docs/core/useSharedValue/#react-compiler-support";
 const ACCESSORS_MIN_VERSION = "3.15.0";
 const supportsAccessors = (reanimatedVersion) => {
@@ -40216,13 +40235,6 @@ const findOutermostEnclosingFunctionRange = (sourceFile, targetLine) => {
 	visit(sourceFile);
 	return foundRange;
 };
-const NEWLINE_BYTE = 10;
-const lineOfUtf8Offset = (sourceBuffer, utf8Offset) => {
-	let lineNumber = 1;
-	const scanEnd = Math.min(utf8Offset, sourceBuffer.length);
-	for (let byteIndex = 0; byteIndex < scanEnd; byteIndex++) if (sourceBuffer[byteIndex] === NEWLINE_BYTE) lineNumber++;
-	return lineNumber;
-};
 /**
 * Drops `react-doctor/react-compiler-no-manual-memoization` diagnostics
 * whose enclosing function also carries a `react-hooks-js` (React
@@ -40403,11 +40415,11 @@ const buildRelatedLocations = (labels, filePath) => {
 	}
 	return related;
 };
-const isOxlintOutput = (value) => {
-	if (typeof value !== "object" || value === null) return false;
-	const candidate = value;
-	return Array.isArray(candidate.diagnostics);
-};
+const isOxlintSpan = (value) => isRecord(value) && typeof value.offset === "number" && typeof value.length === "number" && typeof value.line === "number" && typeof value.column === "number";
+const isOxlintLabel = (value) => isRecord(value) && isOxlintSpan(value.span);
+const isMappableOxlintDiagnostic = (value) => isRecord(value) && typeof value.code === "string" && value.code.length > 0 && typeof value.filename === "string" && value.filename.length > 0 && (value.severity === "warning" || value.severity === "error") && Array.isArray(value.labels) && value.labels.every(isOxlintLabel);
+const isEngineFailureDiagnostic = (value) => !isRecord(value) || typeof value.filename !== "string" || value.filename.length === 0;
+const isOxlintOutput = (value) => isRecord(value) && Array.isArray(value.diagnostics);
 /**
 * Parses one oxlint subprocess's stdout into a flat `Diagnostic[]`.
 * Tolerates the leading-notice-line shape oxlint sometimes prints
@@ -40426,23 +40438,59 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
+	const engineFailureDiagnostic = parsed.diagnostics.find(isEngineFailureDiagnostic);
+	if (engineFailureDiagnostic !== void 0) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: JSON.stringify(engineFailureDiagnostic).slice(0, 600) }) });
 	const minifiedFileCache = /* @__PURE__ */ new Map();
+	const sourceBufferCache = /* @__PURE__ */ new Map();
+	const sourceLinesCache = /* @__PURE__ */ new Map();
+	const resolveAbsolutePath = (filename) => Path.isAbsolute(filename) ? filename : Path.resolve(rootDirectory || ".", filename);
+	const readSourceBuffer = (filename) => {
+		const absolutePath = resolveAbsolutePath(filename);
+		const cached = sourceBufferCache.get(absolutePath);
+		if (cached !== void 0) return cached;
+		let sourceBuffer;
+		try {
+			sourceBuffer = NFS.readFileSync(absolutePath);
+		} catch {
+			sourceBuffer = null;
+		}
+		sourceBufferCache.set(absolutePath, sourceBuffer);
+		return sourceBuffer;
+	};
+	const readSourceLines = (filename) => {
+		const absolutePath = resolveAbsolutePath(filename);
+		const cached = sourceLinesCache.get(absolutePath);
+		if (cached !== void 0) return cached;
+		const sourceBuffer = readSourceBuffer(filename);
+		const sourceLines = sourceBuffer ? sourceBuffer.toString("utf8").split("\n") : null;
+		sourceLinesCache.set(absolutePath, sourceLines);
+		return sourceLines;
+	};
 	const isMinifiedDiagnosticFile = (filename) => {
-		const absolutePath = Path.isAbsolute(filename) ? filename : Path.resolve(rootDirectory || ".", filename);
+		const absolutePath = resolveAbsolutePath(filename);
 		const cached = minifiedFileCache.get(absolutePath);
 		if (cached !== void 0) return cached;
 		const minified = isMinifiedSource(absolutePath);
 		minifiedFileCache.set(absolutePath, minified);
 		return minified;
 	};
-	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => diagnostic.code && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
+	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => isMappableOxlintDiagnostic(diagnostic) && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
 		const { plugin, rule } = parseRuleCode(diagnostic.code);
 		const primaryLabel = diagnostic.labels[0];
 		const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule, project);
 		const normalizedFilePath = diagnostic.filename.replaceAll("\\", "/");
 		const primarySpan = primaryLabel?.span;
+		const sourceBuffer = primarySpan ? readSourceBuffer(diagnostic.filename) : null;
 		const relatedLocations = buildRelatedLocations(diagnostic.labels, normalizedFilePath);
 		const category = resolveDiagnosticCategory(plugin, rule);
+		const matchByOccurrence = resolveMatchByOccurrence(rule, category);
+		const sourceLines = primarySpan ? readSourceLines(diagnostic.filename) : null;
+		const primaryLineIndex = primarySpan ? primarySpan.line - 1 : -1;
+		const primaryLine = sourceLines?.[primaryLineIndex];
+		const primaryColumnIndex = primarySpan ? primarySpan.column - 1 : -1;
+		const isJsxTagLabel = primaryLine !== void 0 && primaryColumnIndex >= 0 && (primaryLine[primaryColumnIndex] === "<" || primaryLine[primaryColumnIndex - 1] === "<");
+		const jsxOpenerEndLineIndex = sourceLines && isJsxTagLabel ? findJsxOpenerSpan(sourceLines, primaryLineIndex) : null;
+		const primarySpanEndLine = jsxOpenerEndLineIndex !== null ? jsxOpenerEndLineIndex + 1 : primarySpan && sourceBuffer ? lineOfUtf8Offset(sourceBuffer, primarySpan.offset + Math.max(primarySpan.length - 1, 0)) : void 0;
 		return {
 			filePath: normalizedFilePath,
 			plugin,
@@ -40456,10 +40504,11 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 			column: primarySpan?.column ?? 0,
 			...primarySpan ? {
 				offset: primarySpan.offset,
-				length: primarySpan.length
+				length: primarySpan.length,
+				...primarySpanEndLine !== void 0 ? { endLine: primarySpanEndLine } : {}
 			} : {},
 			category,
-			...resolveMatchByOccurrence(rule, category) ? { matchByOccurrence: true } : {},
+			...matchByOccurrence ? { matchByOccurrence: true } : {},
 			...relatedLocations.length > 0 ? { relatedLocations } : {}
 		};
 	}), rootDirectory);
@@ -42246,7 +42295,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		directory: scanDirectory,
 		repo
 	}).pipe(orElseSucceed(() => null)) : succeed$2(null));
-	const lintIncludePaths = (input.skipJsxIncludeFilter ? input.includePaths.length > 0 ? [...input.includePaths] : void 0 : computeExplicitLintIncludePaths([...input.includePaths], project)) ?? resolveLintIncludePaths(scanDirectory, resolvedConfig.config, project);
+	const lintIncludePaths = (input.skipExplicitIncludePathFilter ? input.includePaths.length > 0 ? [...input.includePaths] : void 0 : computeExplicitLintIncludePaths([...input.includePaths])) ?? resolveLintIncludePaths(scanDirectory, resolvedConfig.config);
 	const fallbackScannedFilePaths = input.suppressScanSummary ? (lintIncludePaths ?? (yield* filesService.listSourceFiles(scanDirectory))).map((relativePath) => Path.resolve(scanDirectory, relativePath)) : [];
 	const beforeLint = hooks.beforeLint ?? NO_HOOKS.beforeLint;
 	const afterLint = hooks.afterLint ?? NO_HOOKS.afterLint;
@@ -42917,10 +42966,11 @@ const buildSkippedChecks = (input) => {
 * render diff-base mistakes (`GitBaseBranchInvalid` /
 * `GitBaseBranchMissing`) as clean user errors instead of crashes.
 */
-const getDiffInfo = (directory, explicitBaseBranch) => runPromise(gen(function* () {
+const getDiffInfo = (directory, explicitBaseBranch, includeUntracked) => runPromise(gen(function* () {
 	const selection = yield* (yield* Git).diffSelection({
 		directory,
-		explicitBaseBranch
+		explicitBaseBranch,
+		includeUntracked
 	});
 	if (selection === null) return null;
 	return {
@@ -43210,4 +43260,4 @@ const toJsonReport = (result, options) => buildJsonReport({
 export { AmbiguousProjectError, NoReactDependencyError, NotADirectoryError, PackageJsonNotFoundError, ProjectNotFoundError, ReactDoctorError, buildJsonReport, buildJsonReportError, clearCaches, defineConfig, diagnose, filterSourceFiles, getDiffInfo, hasReactRuntime, isProjectDiscoveryError, isReactDoctorError, summarizeDiagnostics, toJsonReport };
 
 //# sourceMappingURL=index.js.map
-//# debugId=7a10d23c-04fd-53e1-a623-a3dc5d6d0830
+//# debugId=2aa6fc3c-96ab-5a4c-8a52-e74d27fb4b5a

package/dist/lsp.js

@@ -32959,7 +32959,6 @@ const IGNORED_DIRECTORIES = new Set([
 	"out",
 	"storybook-static"
 ]);
-const JSX_FILE_PATTERN = /\.(tsx|jsx)$/;
 const MILLISECONDS_PER_SECOND = 1e3;
 const SCORE_API_URL = "https://www.react.doctor/api/score";
 const FETCH_TIMEOUT_MS = 1e4;
@@ -33195,13 +33194,15 @@ const listSourceFilesViaFilesystem = (rootDirectory) => {
 const listSourceFilesWithSize = (rootDirectory) => collectSizedSourceFiles(rootDirectory, (listSourceFilesViaGit(rootDirectory) ?? listSourceFilesViaFilesystem(rootDirectory)).sort());
 const listSourceFiles = (rootDirectory) => listSourceFilesWithSize(rootDirectory).map((entry) => entry.path);
 const countSourceFiles = (rootDirectory) => listSourceFilesWithSize(rootDirectory).length;
+const UTF8_BOM_CHARACTER = "";
+const stripUtf8Bom = (content) => content.startsWith(UTF8_BOM_CHARACTER) ? content.slice(1) : content;
 const cachedPackageJsons = /* @__PURE__ */ new Map();
 const clearPackageJsonCache = () => {
 	cachedPackageJsons.clear();
 };
 const readPackageJsonUncached = (packageJsonPath) => {
 	try {
-		return JSON.parse(NFS.readFileSync(packageJsonPath, "utf-8"));
+		return JSON.parse(stripUtf8Bom(NFS.readFileSync(packageJsonPath, "utf-8")));
 	} catch (error) {
 		if (error instanceof SyntaxError) return {};
 		if (isErrnoException(error)) {
@@ -36768,7 +36769,6 @@ const PNPM_WORKSPACE_FILE = "pnpm-workspace.yaml";
 const PNPM_LOCKFILE = "pnpm-lock.yaml";
 const PACKAGE_JSON_FILE = "package.json";
 const PNPM_HARDENING_RULE_KEY = "require-pnpm-hardening";
-const UTF8_BOM_CHAR = "";
 const HARDENING_SETTING_KEYS = new Set([
 	"minimumReleaseAge",
 	"blockExoticSubdeps",
@@ -36793,12 +36793,11 @@ const stripInlineComment = (rawValue) => {
 	return rawValue;
 };
 const unquote = (rawValue) => rawValue.replace(/^["']|["']$/g, "");
-const stripBom = (rawContent) => rawContent.startsWith(UTF8_BOM_CHAR) ? rawContent.slice(1) : rawContent;
 const parseHardeningSettings = (content) => {
 	let minimumReleaseAge = null;
 	let blockExoticSubdeps = null;
 	let trustPolicy = null;
-	const lines = stripBom(content).split(/\r?\n/);
+	const lines = stripUtf8Bom(content).split(/\r?\n/);
 	for (let lineIndex = 0; lineIndex < lines.length; lineIndex += 1) {
 		const lineText = lines[lineIndex];
 		if (lineText === void 0) continue;
@@ -36832,7 +36831,7 @@ const isPnpmManagedProject = (rootDirectory) => {
 	const packageJsonPath = Path.join(rootDirectory, PACKAGE_JSON_FILE);
 	if (!isFile(packageJsonPath)) return false;
 	try {
-		const packageJsonRaw = NFS.readFileSync(packageJsonPath, "utf-8");
+		const packageJsonRaw = stripUtf8Bom(NFS.readFileSync(packageJsonPath, "utf-8"));
 		const packageJson = JSON.parse(packageJsonRaw);
 		if (packageJson !== null && typeof packageJson === "object" && "packageManager" in packageJson && typeof packageJson.packageManager === "string" && packageJson.packageManager.startsWith("pnpm@")) return true;
 	} catch {
@@ -37494,9 +37493,7 @@ const highlighter = {
 	gray: import_picocolors.default.gray,
 	bold: import_picocolors.default.bold
 };
-const NEXT_ENTRY_FILE_PATTERN = /^(?:\.\/)?(?:src\/)?(?:middleware|proxy)\.(?:tsx?|jsx?|mts|mjs)$/;
-const shouldIncludeExplicitLintPath = (filePath, project) => JSX_FILE_PATTERN.test(filePath) || project?.framework === "nextjs" && NEXT_ENTRY_FILE_PATTERN.test(filePath);
-const computeExplicitLintIncludePaths = (includePaths, project) => includePaths.length > 0 ? includePaths.filter((filePath) => shouldIncludeExplicitLintPath(filePath, project)) : void 0;
+const computeExplicitLintIncludePaths = (includePaths) => includePaths.length > 0 ? includePaths.filter(isLintableSourceFile) : void 0;
 const LINGUIST_ATTRIBUTE_PATTERN = /^linguist-(?:vendored|generated)(?:=([a-zA-Z0-9]+))?$/i;
 const FALSY_VALUES = new Set([
 	"false",
@@ -38338,11 +38335,11 @@ const resolveDeadCodeTimeout = (input) => {
 		phaseTimeoutMs: workerTimeoutMs + DEAD_CODE_PHASE_TIMEOUT_OVER_WORKER_MS
 	};
 };
-const resolveLintIncludePaths = (rootDirectory, userConfig, project) => {
+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 (!shouldIncludeExplicitLintPath(filePath, project)) return false;
+		if (!isLintableSourceFile(filePath)) return false;
 		return !isFileIgnoredByPatterns(filePath, rootDirectory, ignoredPatterns);
 	});
 };
@@ -38560,6 +38557,7 @@ const parseGithubViewerPermission = (stdout) => {
 	return /^[A-Z_]+$/.test(value) ? value.toLowerCase() : null;
 };
 const splitNullSeparated = (value) => value.split("\0").filter((entry) => entry.length > 0);
+const UNTRACKED_FILE_LAST_LINE = Number.MAX_SAFE_INTEGER;
 /**
 * `Git` wraps every `git`-via-subprocess call react-doctor makes
 * behind a `Context.Service`. The production layer (`layerNode`)
@@ -38630,6 +38628,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			args,
 			directory
 		});
+		const listUntrackedFilePaths = (directory, includePaths = []) => runGit(directory, [
+			"ls-files",
+			"-z",
+			"--others",
+			"--exclude-standard",
+			...includePaths.length > 0 ? ["--", ...includePaths] : []
+		]).pipe(map$3((result) => result.status === 0 ? splitNullSeparated(result.stdout) : null));
+		const mergeUntracked = (directory, trackedFilePaths, includeUntracked) => includeUntracked ? listUntrackedFilePaths(directory).pipe(map$3((untracked) => untracked === null ? trackedFilePaths : [...new Set([...trackedFilePaths, ...untracked])])) : succeed$2(trackedFilePaths);
 		const currentBranch = (directory) => runGit(directory, [
 			"rev-parse",
 			"--abbrev-ref",
@@ -38752,7 +38758,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 			githubViewerPermission,
 			branchExists,
 			mergeBase,
-			diffSelection: ({ directory, explicitBaseBranch }) => gen(function* () {
+			diffSelection: ({ directory, explicitBaseBranch, includeUntracked = false }) => gen(function* () {
 				if (explicitBaseBranch !== void 0 && explicitBaseBranch.trim().length === 0) return yield* fail$4(new ReactDoctorError({ reason: new GitBaseBranchInvalid({ detail: "Diff base branch cannot be empty." }) }));
 				if (explicitBaseBranch !== void 0) {
 					const range = parseGitDiffRange(explicitBaseBranch);
@@ -38781,7 +38787,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 						"HEAD"
 					]);
 					if (uncommitted.status !== 0) return null;
-					const files = splitNullSeparated(uncommitted.stdout);
+					const files = yield* mergeUntracked(directory, splitNullSeparated(uncommitted.stdout), includeUntracked);
 					if (files.length === 0) return null;
 					return {
 						currentBranch: resolvedCurrentBranch,
@@ -38811,7 +38817,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					currentBranch: resolvedCurrentBranch,
 					baseBranch,
 					diffBaseRef: mergeBaseRef,
-					changedFiles: splitNullSeparated(diff.stdout),
+					changedFiles: yield* mergeUntracked(directory, splitNullSeparated(diff.stdout), includeUntracked),
 					isCurrentChanges: false
 				};
 			}).pipe(withSpan("Git.diffSelection")),
@@ -38857,7 +38863,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					stdout: result.stdout
 				};
 			}).pipe(withSpan("Git.grep")),
-			changedLineRanges: ({ directory, baseRef, cached, files }) => gen(function* () {
+			changedLineRanges: ({ directory, baseRef, cached, files, includeUntracked = false }) => gen(function* () {
 				if (files.length === 0) return [];
 				if (baseRef !== void 0 && !isSafeGitRevision(baseRef)) return null;
 				const result = yield* runGit(directory, [
@@ -38871,7 +38877,14 @@ var Git = class Git extends Service()("react-doctor/Git") {
 					...files
 				]);
 				if (result.status !== 0) return null;
-				return parseChangedLineRanges(result.stdout);
+				const changedLineRanges = parseChangedLineRanges(result.stdout);
+				if (cached || !includeUntracked) return changedLineRanges;
+				const untrackedFilePaths = yield* listUntrackedFilePaths(directory, files);
+				if (untrackedFilePaths === null) return changedLineRanges;
+				return [...changedLineRanges, ...untrackedFilePaths.map((file) => ({
+					file,
+					ranges: [[1, UNTRACKED_FILE_LAST_LINE]]
+				}))];
 			}).pipe(catch_$1((error) => error.reason._tag === "GitInvocationFailed" ? succeed$2(null) : fail$4(error)), withSpan("Git.changedLineRanges"))
 		});
 	})).pipe(provide$2(layer$2.pipe(provide$2(mergeAll$1(layer$1, layer)))));
@@ -39623,6 +39636,12 @@ const mapWithConcurrency = async (items, concurrency, task) => {
 	if (errors.length > 0) throw errors[0];
 	return results;
 };
+const lineOfUtf8Offset = (sourceBuffer, utf8Offset) => {
+	let lineNumber = 1;
+	const scanEnd = Math.min(utf8Offset, sourceBuffer.length);
+	for (let byteIndex = 0; byteIndex < scanEnd; byteIndex++) if (sourceBuffer[byteIndex] === 10) lineNumber++;
+	return lineNumber;
+};
 const REANIMATED_SHARED_VALUE_HINT = "If this is a Reanimated shared value, prefer its React Compiler-compatible `.get()` / `.set()` accessors over `.value` — https://docs.swmansion.com/react-native-reanimated/docs/core/useSharedValue/#react-compiler-support";
 const ACCESSORS_MIN_VERSION = "3.15.0";
 const supportsAccessors = (reanimatedVersion) => {
@@ -40194,13 +40213,6 @@ const findOutermostEnclosingFunctionRange = (sourceFile, targetLine) => {
 	visit(sourceFile);
 	return foundRange;
 };
-const NEWLINE_BYTE = 10;
-const lineOfUtf8Offset = (sourceBuffer, utf8Offset) => {
-	let lineNumber = 1;
-	const scanEnd = Math.min(utf8Offset, sourceBuffer.length);
-	for (let byteIndex = 0; byteIndex < scanEnd; byteIndex++) if (sourceBuffer[byteIndex] === NEWLINE_BYTE) lineNumber++;
-	return lineNumber;
-};
 /**
 * Drops `react-doctor/react-compiler-no-manual-memoization` diagnostics
 * whose enclosing function also carries a `react-hooks-js` (React
@@ -40381,11 +40393,11 @@ const buildRelatedLocations = (labels, filePath) => {
 	}
 	return related;
 };
-const isOxlintOutput = (value) => {
-	if (typeof value !== "object" || value === null) return false;
-	const candidate = value;
-	return Array.isArray(candidate.diagnostics);
-};
+const isOxlintSpan = (value) => isRecord(value) && typeof value.offset === "number" && typeof value.length === "number" && typeof value.line === "number" && typeof value.column === "number";
+const isOxlintLabel = (value) => isRecord(value) && isOxlintSpan(value.span);
+const isMappableOxlintDiagnostic = (value) => isRecord(value) && typeof value.code === "string" && value.code.length > 0 && typeof value.filename === "string" && value.filename.length > 0 && (value.severity === "warning" || value.severity === "error") && Array.isArray(value.labels) && value.labels.every(isOxlintLabel);
+const isEngineFailureDiagnostic = (value) => !isRecord(value) || typeof value.filename !== "string" || value.filename.length === 0;
+const isOxlintOutput = (value) => isRecord(value) && Array.isArray(value.diagnostics);
 /**
 * Parses one oxlint subprocess's stdout into a flat `Diagnostic[]`.
 * Tolerates the leading-notice-line shape oxlint sometimes prints
@@ -40404,23 +40416,59 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.slice(0, 600) }) });
+	const engineFailureDiagnostic = parsed.diagnostics.find(isEngineFailureDiagnostic);
+	if (engineFailureDiagnostic !== void 0) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: JSON.stringify(engineFailureDiagnostic).slice(0, 600) }) });
 	const minifiedFileCache = /* @__PURE__ */ new Map();
+	const sourceBufferCache = /* @__PURE__ */ new Map();
+	const sourceLinesCache = /* @__PURE__ */ new Map();
+	const resolveAbsolutePath = (filename) => Path.isAbsolute(filename) ? filename : Path.resolve(rootDirectory || ".", filename);
+	const readSourceBuffer = (filename) => {
+		const absolutePath = resolveAbsolutePath(filename);
+		const cached = sourceBufferCache.get(absolutePath);
+		if (cached !== void 0) return cached;
+		let sourceBuffer;
+		try {
+			sourceBuffer = NFS.readFileSync(absolutePath);
+		} catch {
+			sourceBuffer = null;
+		}
+		sourceBufferCache.set(absolutePath, sourceBuffer);
+		return sourceBuffer;
+	};
+	const readSourceLines = (filename) => {
+		const absolutePath = resolveAbsolutePath(filename);
+		const cached = sourceLinesCache.get(absolutePath);
+		if (cached !== void 0) return cached;
+		const sourceBuffer = readSourceBuffer(filename);
+		const sourceLines = sourceBuffer ? sourceBuffer.toString("utf8").split("\n") : null;
+		sourceLinesCache.set(absolutePath, sourceLines);
+		return sourceLines;
+	};
 	const isMinifiedDiagnosticFile = (filename) => {
-		const absolutePath = Path.isAbsolute(filename) ? filename : Path.resolve(rootDirectory || ".", filename);
+		const absolutePath = resolveAbsolutePath(filename);
 		const cached = minifiedFileCache.get(absolutePath);
 		if (cached !== void 0) return cached;
 		const minified = isMinifiedSource(absolutePath);
 		minifiedFileCache.set(absolutePath, minified);
 		return minified;
 	};
-	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => diagnostic.code && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
+	return suppressMemoizationInBailedOutFunctions(parsed.diagnostics.filter((diagnostic) => isMappableOxlintDiagnostic(diagnostic) && isLintableSourceFile(diagnostic.filename) && !isMinifiedDiagnosticFile(diagnostic.filename) && !shouldSuppressLocalUseHookDiagnostic(diagnostic, rootDirectory) && !shouldSuppressCompilerFindingInWorklet(diagnostic, project, rootDirectory)).map((diagnostic) => {
 		const { plugin, rule } = parseRuleCode(diagnostic.code);
 		const primaryLabel = diagnostic.labels[0];
 		const cleaned = cleanDiagnosticMessage(diagnostic.message, diagnostic.help, plugin, rule, project);
 		const normalizedFilePath = diagnostic.filename.replaceAll("\\", "/");
 		const primarySpan = primaryLabel?.span;
+		const sourceBuffer = primarySpan ? readSourceBuffer(diagnostic.filename) : null;
 		const relatedLocations = buildRelatedLocations(diagnostic.labels, normalizedFilePath);
 		const category = resolveDiagnosticCategory(plugin, rule);
+		const matchByOccurrence = resolveMatchByOccurrence(rule, category);
+		const sourceLines = primarySpan ? readSourceLines(diagnostic.filename) : null;
+		const primaryLineIndex = primarySpan ? primarySpan.line - 1 : -1;
+		const primaryLine = sourceLines?.[primaryLineIndex];
+		const primaryColumnIndex = primarySpan ? primarySpan.column - 1 : -1;
+		const isJsxTagLabel = primaryLine !== void 0 && primaryColumnIndex >= 0 && (primaryLine[primaryColumnIndex] === "<" || primaryLine[primaryColumnIndex - 1] === "<");
+		const jsxOpenerEndLineIndex = sourceLines && isJsxTagLabel ? findJsxOpenerSpan(sourceLines, primaryLineIndex) : null;
+		const primarySpanEndLine = jsxOpenerEndLineIndex !== null ? jsxOpenerEndLineIndex + 1 : primarySpan && sourceBuffer ? lineOfUtf8Offset(sourceBuffer, primarySpan.offset + Math.max(primarySpan.length - 1, 0)) : void 0;
 		return {
 			filePath: normalizedFilePath,
 			plugin,
@@ -40434,10 +40482,11 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 			column: primarySpan?.column ?? 0,
 			...primarySpan ? {
 				offset: primarySpan.offset,
-				length: primarySpan.length
+				length: primarySpan.length,
+				...primarySpanEndLine !== void 0 ? { endLine: primarySpanEndLine } : {}
 			} : {},
 			category,
-			...resolveMatchByOccurrence(rule, category) ? { matchByOccurrence: true } : {},
+			...matchByOccurrence ? { matchByOccurrence: true } : {},
 			...relatedLocations.length > 0 ? { relatedLocations } : {}
 		};
 	}), rootDirectory);
@@ -42224,7 +42273,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		directory: scanDirectory,
 		repo
 	}).pipe(orElseSucceed(() => null)) : succeed$2(null));
-	const lintIncludePaths = (input.skipJsxIncludeFilter ? input.includePaths.length > 0 ? [...input.includePaths] : void 0 : computeExplicitLintIncludePaths([...input.includePaths], project)) ?? resolveLintIncludePaths(scanDirectory, resolvedConfig.config, project);
+	const lintIncludePaths = (input.skipExplicitIncludePathFilter ? input.includePaths.length > 0 ? [...input.includePaths] : void 0 : computeExplicitLintIncludePaths([...input.includePaths])) ?? resolveLintIncludePaths(scanDirectory, resolvedConfig.config);
 	const fallbackScannedFilePaths = input.suppressScanSummary ? (lintIncludePaths ?? (yield* filesService.listSourceFiles(scanDirectory))).map((relativePath) => Path.resolve(scanDirectory, relativePath)) : [];
 	const beforeLint = hooks.beforeLint ?? NO_HOOKS.beforeLint;
 	const afterLint = hooks.afterLint ?? NO_HOOKS.afterLint;
@@ -42719,7 +42768,7 @@ const runEditorScan = async (input) => {
 		warnings,
 		isCi: false,
 		resolveLocalGithubViewerPermission: false,
-		skipJsxIncludeFilter: true
+		skipExplicitIncludePathFilter: true
 	}).pipe(withSpan("runEditorScan", { attributes: {
 		"editor.lint": lint,
 		"editor.runDeadCode": runDeadCode
@@ -44493,6 +44542,7 @@ const METRIC = {
 	cliInvoked: "cli.invoked",
 	cliError: "cli.error",
 	cliEnvironmentError: "cli.env_error",
+	stagedSnapshotDivergence: "staged.snapshot_divergence",
 	projectDetected: "project.detected",
 	projectPathSelected: "project.path_selected",
 	projectConfigSelected: "project.config_selected",
@@ -44847,5 +44897,5 @@ const startLanguageServer = () => {
 };
 //#endregion
 export { startLanguageServer };
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="56ea0b36-0904-532b-96d1-b4d9c867fe13")}catch(e){}}();
-//# debugId=56ea0b36-0904-532b-96d1-b4d9c867fe13
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="8ed74459-2a69-556c-bb95-8cdebdb094cd")}catch(e){}}();
+//# debugId=8ed74459-2a69-556c-bb95-8cdebdb094cd