react-doctor 0.7.6-dev.64950ba → 0.7.6-dev.81e6647

package/dist/cli.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]="5c7ed97b-60ef-5650-9ae3-4dabb2566efd")}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]="9a5c1a3c-7706-5a23-bca4-ddddd2f085af")}catch(e){}}();
 import { createRequire } from "node:module";
 import * as NodeChildProcess from "node:child_process";
 import { execFile, execFileSync, spawn, spawnSync } from "node:child_process";
@@ -36341,10 +36341,12 @@ 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 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)) {
@@ -40017,7 +40019,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",
@@ -40042,12 +40043,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;
@@ -40081,7 +40081,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 {
@@ -40762,9 +40762,7 @@ const setColorEnabled = (enabled) => {
 	highlighter.gray = colors.gray;
 	highlighter.bold = colors.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",
@@ -41603,11 +41601,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);
 	});
 };
@@ -42888,6 +42886,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) => {
@@ -43459,13 +43463,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
@@ -43670,8 +43667,33 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.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);
@@ -43684,8 +43706,17 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		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,
@@ -43699,10 +43730,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);
@@ -45489,7 +45521,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;
@@ -46667,7 +46699,7 @@ const makeNoopConsole = () => ({
 });
 //#endregion
 //#region src/cli/utils/version.ts
-const VERSION = "0.7.6-dev.64950ba";
+const VERSION = "0.7.6-dev.81e6647";
 //#endregion
 //#region src/cli/utils/json-mode.ts
 let context = null;
@@ -47036,13 +47068,13 @@ const isDevVersion = (version) => version === "0.0.0" || version.includes("-");
 * uploads source-map artifacts under, so stack frames symbolicate. Honors the
 * standard `SENTRY_RELEASE` override.
 */
-const resolveSentryRelease = () => process.env.SENTRY_RELEASE || `react-doctor@0.7.6-dev.64950ba`;
+const resolveSentryRelease = () => process.env.SENTRY_RELEASE || `react-doctor@0.7.6-dev.81e6647`;
 /**
 * Deployment environment shown in Sentry's environment filter. Defaults to
 * `production` for tagged releases and `development` for dev/unbuilt versions,
 * overridable via the standard `SENTRY_ENVIRONMENT` env var.
 */
-const resolveSentryEnvironment = () => process.env.SENTRY_ENVIRONMENT || (isDevVersion("0.7.6-dev.64950ba") ? "development" : "production");
+const resolveSentryEnvironment = () => process.env.SENTRY_ENVIRONMENT || (isDevVersion("0.7.6-dev.81e6647") ? "development" : "production");
 /**
 * Performance-tracing sample rate in `[0, 1]`. Reads `SENTRY_TRACES_SAMPLE_RATE`
 * (set to `0` to disable tracing) and falls back to
@@ -50807,7 +50839,7 @@ const BLOCKING_SUMMARY = {
 const SCOPE_SUMMARY = {
 	full: "Scan the whole project on every run",
 	files: "Report every issue in changed files",
-	lines: "Report issues on changed lines",
+	lines: "Report issues whose source spans touch changed lines",
 	changed: "Report only the issues a change introduces"
 };
 const gatesEqual = (left, right) => left.blocking === right.blocking && left.scope === right.scope && left.comment === right.comment && left.reviewComments === right.reviewComments && left.commitStatus === right.commitStatus;
@@ -59676,7 +59708,9 @@ const buildScanAttributes = (input) => {
 		hasCustomConfig: input.hasCustomConfig,
 		rulesConfigured: ruleKeys.length,
 		rulesDisabled: ruleKeys.filter((key) => ruleOverrides[key] === "off").length,
-		fileCount: input.result?.scannedFileCount ?? null
+		fileCount: input.result?.scannedFileCount ?? null,
+		nonJsxFileCount: input.result?.analyzedFiles?.filter((filePath) => !JSX_FILE_PATTERN.test(filePath)).length ?? null,
+		multilineDiagnosticCount: input.result?.diagnostics.filter((diagnostic) => (diagnostic.endLine ?? diagnostic.line) > diagnostic.line).length ?? null
 	});
 };
 /**
@@ -59745,6 +59779,12 @@ const countDeadlineSkippedFiles = (lintPartialFailures) => sumFileCountsMatching
 const DROPPED_FILES_MESSAGE_PATTERN = /^(\d+) file\(s\) failed to lint and were skipped/;
 const countDroppedLintFiles = (lintPartialFailures) => sumFileCountsMatching(lintPartialFailures, DROPPED_FILES_MESSAGE_PATTERN);
 //#endregion
+//#region src/cli/utils/diagnostic-intersects-line-ranges.ts
+const diagnosticIntersectsLineRanges = (diagnostic, lineRanges) => {
+	const diagnosticEndLine = Math.max(diagnostic.line, diagnostic.endLine ?? diagnostic.line);
+	return lineRanges.some(([rangeStartLine, rangeEndLine]) => diagnostic.line <= rangeEndLine && diagnosticEndLine >= rangeStartLine);
+};
+//#endregion
 //#region src/cli/utils/materialize-baseline-files.ts
 /**
 * Materializes the `ref` version of `files` into `tempDirectory` (via
@@ -60930,7 +60970,7 @@ const buildChangedLineMatcher = (directory, changedLineRanges) => {
 		const relativePath = toForwardSlashes(path.isAbsolute(diagnostic.filePath) ? path.relative(directory, diagnostic.filePath) : diagnostic.filePath);
 		const ranges = rangesByFile.get(relativePath);
 		if (ranges === void 0) return false;
-		return ranges.some(([start, end]) => diagnostic.line >= start && diagnostic.line <= end);
+		return diagnosticIntersectsLineRanges(diagnostic, ranges);
 	};
 };
 const buildIgnoredTags = (userConfig) => {
@@ -65181,7 +65221,7 @@ ${highlighter.dim("Learn more:")}
   ${highlighter.info(CI_URL)}
 `;
 const collectCategoryOption = (value, previousValues) => [...previousValues ?? [], value];
-const program = new Command().name("react-doctor").description("Diagnose React codebase health").version(VERSION, "-v, --version", "display the version number").argument("[directory]", "project directory to scan", ".").option("--lint", "enable linting").option("--no-lint", "skip linting").option("--dead-code", "enable dead-code analysis (default)").option("--no-dead-code", "skip dead-code analysis (unused files / exports / dependencies, circular imports)").option("--supply-chain", "enable the dependency supply-chain scan (default)").option("--no-supply-chain", "skip the dependency supply-chain scan (Socket.dev dependency health checks)").option("--verbose", "show every rule and per-file details (default shows top 3 rules)").option("--debug", "force a Sentry trace and print its id at the end (paste it into a bug report)").option("--output-dir <dir>", "directory for the full diagnostics dump (default: a temp folder)").option("--score", "output only the score").option("--json", "output a single structured JSON report (suppresses other output)").option("--json-compact", "with --json, emit compact JSON (no indentation)").option("--json-out <path>", "with --json, write the report to a file instead of stdout").option("-y, --yes", "skip prompts, scan all workspace projects").option("--no-parallel", "lint serially with one worker (default: parallel across CPU cores; set the worker count with REACT_DOCTOR_PARALLEL)").option("--project <name>", "select projects: workspace names or directory paths (comma-separated for multiple); overrides the `projects` config field").option("--scope <value>", "how much to scan/report: full (default), files, changed (only new issues vs base), or lines (only changed lines)").option("--base <ref>", "base git ref for files/changed/lines scope (auto-detected when omitted)").addOption(new Option("--diff [base]", "[deprecated] alias for --scope changed (pass `false` to force a full scan)").hideHelp()).addOption(new Option("--changed-files-from <file>", "scan source files listed in a newline-delimited changed-files file").hideHelp()).option("--no-score", "skip the score API, the share URL, and crash reporting").addOption(new Option("--category <category>", "only show diagnostics in a category (repeatable; e.g. Security)").argParser(collectCategoryOption)).option("--no-telemetry", "alias for --no-score (skip the score API, share URL, and crash reporting)").option("--staged", "scan only staged (git index) files for pre-commit hooks").option("--max-duration <seconds>", "scan time budget for the whole run, shared across workspace projects: past it, remaining lint batches and dead-code are skipped and partial results are reported (skipped files are listed in the JSON report)").option("--blocking <level>", "severity that fails CI: error (default), warning, or none (advisory)").addOption(new Option("--fail-on <level>", "[deprecated] alias for --blocking <level>").hideHelp()).option("--no-respect-inline-disables", "audit mode: neutralize inline lint suppressions before scanning").option("--warnings", "show warning-severity diagnostics (default)").option("--no-warnings", "hide warning-severity diagnostics (errors only)").option("--color", "force colored output").option("--no-color", "disable colored output (also honors NO_COLOR)").addHelpText("after", renderRootHelpEpilog);
+const program = new Command().name("react-doctor").description("Diagnose React codebase health").version(VERSION, "-v, --version", "display the version number").argument("[directory]", "project directory to scan", ".").option("--lint", "enable linting").option("--no-lint", "skip linting").option("--dead-code", "enable dead-code analysis (default)").option("--no-dead-code", "skip dead-code analysis (unused files / exports / dependencies, circular imports)").option("--supply-chain", "enable the dependency supply-chain scan (default)").option("--no-supply-chain", "skip the dependency supply-chain scan (Socket.dev dependency health checks)").option("--verbose", "show every rule and per-file details (default shows top 3 rules)").option("--debug", "force a Sentry trace and print its id at the end (paste it into a bug report)").option("--output-dir <dir>", "directory for the full diagnostics dump (default: a temp folder)").option("--score", "output only the score").option("--json", "output a single structured JSON report (suppresses other output)").option("--json-compact", "with --json, emit compact JSON (no indentation)").option("--json-out <path>", "with --json, write the report to a file instead of stdout").option("-y, --yes", "skip prompts, scan all workspace projects").option("--no-parallel", "lint serially with one worker (default: parallel across CPU cores; set the worker count with REACT_DOCTOR_PARALLEL)").option("--project <name>", "select projects: workspace names or directory paths (comma-separated for multiple); overrides the `projects` config field").option("--scope <value>", "how much supported JS/TS source to scan/report: full (default), files, changed (only new issues vs base), or lines (issues whose source spans touch changed lines)").option("--base <ref>", "base git ref for files/changed/lines scope (auto-detected when omitted)").addOption(new Option("--diff [base]", "[deprecated] alias for --scope changed (pass `false` to force a full scan)").hideHelp()).addOption(new Option("--changed-files-from <file>", "scan source files listed in a newline-delimited changed-files file").hideHelp()).option("--no-score", "skip the score API, the share URL, and crash reporting").addOption(new Option("--category <category>", "only show diagnostics in a category (repeatable; e.g. Security)").argParser(collectCategoryOption)).option("--no-telemetry", "alias for --no-score (skip the score API, share URL, and crash reporting)").option("--staged", "scan only staged (git index) files for pre-commit hooks").option("--max-duration <seconds>", "scan time budget for the whole run, shared across workspace projects: past it, remaining lint batches and dead-code are skipped and partial results are reported (skipped files are listed in the JSON report)").option("--blocking <level>", "severity that fails CI: error (default), warning, or none (advisory)").addOption(new Option("--fail-on <level>", "[deprecated] alias for --blocking <level>").hideHelp()).option("--no-respect-inline-disables", "audit mode: neutralize inline lint suppressions before scanning").option("--warnings", "show warning-severity diagnostics (default)").option("--no-warnings", "hide warning-severity diagnostics (errors only)").option("--color", "force colored output").option("--no-color", "disable colored output (also honors NO_COLOR)").addHelpText("after", renderRootHelpEpilog);
 program.action(inspectAction);
 program.command("why <location>").description("Explain why a rule fired (or why a suppression didn't apply) at a file:line").option("--project <name>", "select projects: workspace names or directory paths (comma-separated for multiple)").option("-c, --cwd <cwd>", "working directory", process.cwd()).option("--color", "force colored output").option("--no-color", "disable colored output (also honors NO_COLOR)").action((location, options) => whyAction(location, options));
 program.command("install").alias("setup").description("Install the react-doctor skill into your coding agents and optional git hook").option("-y, --yes", "skip prompts, install for all detected agents").option("--dry-run", "show what would be installed without writing files").option("--agent-hooks", "install native non-blocking agent hooks for Claude Code and Cursor").option("-c, --cwd <cwd>", "working directory", process.cwd()).option("--color", "force colored output").option("--no-color", "disable colored output (also honors NO_COLOR)").addHelpText("after", renderInstallHelpEpilog).action(installAction);
@@ -65231,4 +65271,4 @@ Promise.resolve().then(() => assertNoRemovedFlags(process.argv)).then(() => prog
 export {};
 
 //# sourceMappingURL=cli.js.map
-//# debugId=5c7ed97b-60ef-5650-9ae3-4dabb2566efd
+//# debugId=9a5c1a3c-7706-5a23-bca4-ddddd2f085af

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`).

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]="11364a34-6c8b-5bd3-b9e8-aaa7c0ea264c")}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);
 	});
 };
@@ -39645,6 +39642,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 +40219,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
@@ -40427,8 +40423,33 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.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);
@@ -40441,8 +40462,17 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		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 +40486,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 +42277,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;
@@ -43210,4 +43241,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=11364a34-6c8b-5bd3-b9e8-aaa7c0ea264c

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);
 	});
 };
@@ -39623,6 +39620,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 +40197,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
@@ -40405,8 +40401,33 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 	}
 	if (!isOxlintOutput(parsed)) throw new ReactDoctorError({ reason: new OxlintOutputUnparseable({ preview: stdout.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);
@@ -40419,8 +40440,17 @@ const parseOxlintOutput = (stdout, project, rootDirectory) => {
 		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 +40464,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 +42255,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 +42750,7 @@ const runEditorScan = async (input) => {
 		warnings,
 		isCi: false,
 		resolveLocalGithubViewerPermission: false,
-		skipJsxIncludeFilter: true
+		skipExplicitIncludePathFilter: true
 	}).pipe(withSpan("runEditorScan", { attributes: {
 		"editor.lint": lint,
 		"editor.runDeadCode": runDeadCode
@@ -44847,5 +44878,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]="f9337714-b38f-5f28-ac00-c9d7d79ebaea")}catch(e){}}();
+//# debugId=f9337714-b38f-5f28-ac00-c9d7d79ebaea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-doctor",
-  "version": "0.7.6-dev.64950ba",
+  "version": "0.7.6-dev.81e6647",
   "description": "Your agent writes bad React. This catches it",
   "keywords": [
     "accessibility",
@@ -65,8 +65,8 @@
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
     "yaml": "^2.9.0",
-    "oxlint-plugin-react-doctor": "0.7.6-dev.64950ba",
-    "deslop-js": "0.7.6"
+    "deslop-js": "0.7.6",
+    "oxlint-plugin-react-doctor": "0.7.6-dev.81e6647"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.27.0",