react-doctor 0.7.6-dev.b36e439 → 0.7.6-dev.c1916d5

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]="58e54b02-7ba2-5f13-a535-98c236467a86")}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]="4c1e681e-4dee-5ffd-a4ba-69b876f47147")}catch(e){}}();
 import { createRequire } from "node:module";
 import * as NodeChildProcess from "node:child_process";
 import { execFile, execFileSync, spawn, spawnSync } from "node:child_process";
@@ -39594,6 +39594,49 @@ const assignFixGroups = (diagnostics) => {
 		};
 	});
 };
+const DERIVED_STATE_RULE_PRIORITY = new Map([
+	["no-initialize-state", 0],
+	["no-adjust-state-on-prop-change", 1],
+	["no-derived-state", 2],
+	["no-derived-state-effect", 3]
+]);
+const buildDiagnosticSiteKey = (diagnostic) => `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}`;
+const isReactDoctorRulesOfHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-doctor" && diagnostic.rule === "rules-of-hooks";
+const isReactCompilerHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-hooks-js" && diagnostic.rule === "hooks";
+const doDiagnosticSpansOverlap = (first, second) => {
+	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
+	if (first.offset !== void 0 && second.offset !== void 0) {
+		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
+		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
+		return first.offset < secondEnd && second.offset < firstEnd;
+	}
+	const firstEndLine = first.endLine ?? first.line;
+	const secondEndLine = second.endLine ?? second.line;
+	return first.line <= secondEndLine && second.line <= firstEndLine;
+};
+const keepHighestSeverity = (survivingDiagnostic, collapsedDiagnostic) => collapsedDiagnostic.severity === "error" && survivingDiagnostic.severity !== "error" ? {
+	...survivingDiagnostic,
+	severity: "error"
+} : survivingDiagnostic;
+const dedupeRelatedDiagnostics = (diagnostics) => {
+	const reactDoctorHookSites = new Set(diagnostics.filter(isReactDoctorRulesOfHooksDiagnostic).map(buildDiagnosticSiteKey));
+	const uniqueDiagnostics = [];
+	for (const diagnostic of diagnostics) {
+		if (isReactCompilerHooksDiagnostic(diagnostic) && reactDoctorHookSites.has(buildDiagnosticSiteKey(diagnostic))) continue;
+		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
+		if (priority !== void 0) {
+			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
+			if (overlappingDiagnosticIndex >= 0) {
+				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
+				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
+				if (existingDiagnostic && existingPriority !== void 0) uniqueDiagnostics[overlappingDiagnosticIndex] = priority < existingPriority ? keepHighestSeverity(diagnostic, existingDiagnostic) : keepHighestSeverity(existingDiagnostic, diagnostic);
+				continue;
+			}
+		}
+		uniqueDiagnostics.push(diagnostic);
+	}
+	return uniqueDiagnostics;
+};
 const compareStrings = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 const sortDiagnosticsStable = (diagnostics) => [...diagnostics].sort((left, right) => compareStrings(left.filePath, right.filePath) || left.line - right.line || left.column - right.column || compareStrings(left.plugin, right.plugin) || compareStrings(left.rule, right.rule) || compareStrings(left.severity, right.severity) || compareStrings(left.message, right.message));
 const getDirectDependencyNames = (packageJson) => new Set([...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]);
@@ -42735,13 +42778,13 @@ const encodeSidecarFileEntry = (entry) => ({
 	diagnostics: entry.diagnostics
 });
 const emptyCache = () => ({
-	version: 1,
+	version: 2,
 	rulesets: {}
 });
 const loadRulesetEntries = (cacheFilePath, rulesetHash) => {
 	const entries = /* @__PURE__ */ new Map();
 	const persisted = failOpenReadJson(cacheFilePath, emptyCache());
-	if (persisted.version !== 1 || !isRecord$1(persisted.rulesets)) return entries;
+	if (persisted.version !== 2 || !isRecord$1(persisted.rulesets)) return entries;
 	const bucket = persisted.rulesets[rulesetHash];
 	if (!isRecord$1(bucket) || !isRecord$1(bucket.files)) return entries;
 	for (const [fileKey, rawEntry] of Object.entries(bucket.files)) {
@@ -42761,7 +42804,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 		},
 		persist: () => {
 			const onDisk = failOpenReadJson(cacheFilePath, emptyCache());
-			const rulesets = onDisk.version === 1 && isRecord$1(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
+			const rulesets = onDisk.version === 2 && isRecord$1(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
 			const existingBucket = rulesets[rulesetHash];
 			const existingFiles = isRecord$1(existingBucket) && isRecord$1(existingBucket.files) ? existingBucket.files : {};
 			const ourFiles = {};
@@ -42775,7 +42818,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 				files: Object.fromEntries(cappedEntries)
 			};
 			atomicWriteJson(cacheFilePath, {
-				version: 1,
+				version: 2,
 				rulesets: Object.fromEntries(Object.entries(rulesets).filter(([, bucket]) => isRecord$1(bucket) && typeof bucket.updatedAtMs === "number").sort(([, first], [, second]) => second.updatedAtMs - first.updatedAtMs).slice(0, 8))
 			});
 		}
@@ -42826,23 +42869,6 @@ const resolveTsConfigRelativePath = (rootDirectory) => {
 	for (const filename of TSCONFIG_FILENAMES) if (NFS.existsSync(Path.join(rootDirectory, filename))) return `./${filename}`;
 	return null;
 };
-const DERIVED_STATE_RULE_PRIORITY = new Map([
-	["no-initialize-state", 0],
-	["no-adjust-state-on-prop-change", 1],
-	["no-derived-state", 2],
-	["no-derived-state-effect", 3]
-]);
-const doDiagnosticSpansOverlap = (first, second) => {
-	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
-	if (first.offset !== void 0 && second.offset !== void 0) {
-		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
-		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
-		return first.offset < secondEnd && second.offset < firstEnd;
-	}
-	const firstEndLine = first.endLine ?? first.line;
-	const secondEndLine = second.endLine ?? second.line;
-	return first.line <= secondEndLine && second.line <= firstEndLine;
-};
 const dedupeDiagnostics = (diagnostics) => {
 	const seenKeys = /* @__PURE__ */ new Set();
 	const uniqueDiagnostics = [];
@@ -42850,16 +42876,6 @@ const dedupeDiagnostics = (diagnostics) => {
 		const key = `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}\u0000${diagnostic.plugin}\u0000${diagnostic.rule}\u0000${diagnostic.severity}\u0000${diagnostic.message}`;
 		if (seenKeys.has(key)) continue;
 		seenKeys.add(key);
-		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
-		if (priority !== void 0) {
-			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && candidate.severity === diagnostic.severity && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
-			if (overlappingDiagnosticIndex >= 0) {
-				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
-				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
-				if (existingPriority !== void 0 && priority < existingPriority) uniqueDiagnostics[overlappingDiagnosticIndex] = diagnostic;
-				continue;
-			}
-		}
 		uniqueDiagnostics.push(diagnostic);
 	}
 	return uniqueDiagnostics;
@@ -45553,7 +45569,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		respectInlineDisables: input.respectInlineDisables,
 		showWarnings
 	});
-	const applyPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)), tap((diagnostic) => reporterService.emit(diagnostic)));
+	const filterPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)));
+	const applyPerElementPipeline = (rawStream) => filterPerElementPipeline(rawStream).pipe(tap((diagnostic) => reporterService.emit(diagnostic)));
 	const envCollected = yield* runCollect(applyPerElementPipeline(fromIterable$1(isDiffMode ? [] : [
 		...checkReducedMotion(scanDirectory),
 		...checkPnpmHardening(scanDirectory),
@@ -45682,7 +45699,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		});
 		return empty$4;
 	}))));
-	const lintCollected = yield* runCollect(applyPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
+	const lintCollected = dedupeRelatedDiagnostics(yield* runCollect(filterPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
 		onNone: () => set(lintFailure, {
 			didFail: true,
 			reason: `Lint analysis exceeded ${lintPhaseTimeoutMs / MILLISECONDS_PER_SECOND}s and was skipped.`,
@@ -45690,7 +45707,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 			reasonKind: null
 		}).pipe(as([])),
 		onSome: succeed$2
-	})));
+	}))));
+	yield* forEach$1(lintCollected, reporterService.emit, { discard: true });
 	const lintFailureState = yield* get$2(lintFailure);
 	yield* afterLint(lintFailureState.didFail);
 	if (lintFailureState.didFail) yield* scanProgress.fail(formatLintFailText(lintFailureState.reasonTag, process.version));
@@ -46756,7 +46774,7 @@ const makeNoopConsole = () => ({
 });
 //#endregion
 //#region src/cli/utils/version.ts
-const VERSION = "0.7.6-dev.b36e439";
+const VERSION = "0.7.6-dev.c1916d5";
 //#endregion
 //#region src/cli/utils/json-mode.ts
 let context = null;
@@ -47125,13 +47143,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.b36e439`;
+const resolveSentryRelease = () => process.env.SENTRY_RELEASE || `react-doctor@0.7.6-dev.c1916d5`;
 /**
 * 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.b36e439") ? "development" : "production");
+const resolveSentryEnvironment = () => process.env.SENTRY_ENVIRONMENT || (isDevVersion("0.7.6-dev.c1916d5") ? "development" : "production");
 /**
 * Performance-tracing sample rate in `[0, 1]`. Reads `SENTRY_TRACES_SAMPLE_RATE`
 * (set to `0` to disable tracing) and falls back to
@@ -65397,4 +65415,4 @@ Promise.resolve().then(() => assertNoRemovedFlags(process.argv)).then(() => prog
 export {};
 
 //# sourceMappingURL=cli.js.map
-//# debugId=58e54b02-7ba2-5f13-a535-98c236467a86
+//# debugId=4c1e681e-4dee-5ffd-a4ba-69b876f47147

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]="2aa6fc3c-96ab-5a4c-8a52-e74d27fb4b5a")}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]="4da79386-f10f-5bae-95ac-7333b2d6c4e8")}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";
@@ -36366,6 +36366,49 @@ const assignFixGroups = (diagnostics) => {
 		};
 	});
 };
+const DERIVED_STATE_RULE_PRIORITY = new Map([
+	["no-initialize-state", 0],
+	["no-adjust-state-on-prop-change", 1],
+	["no-derived-state", 2],
+	["no-derived-state-effect", 3]
+]);
+const buildDiagnosticSiteKey = (diagnostic) => `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}`;
+const isReactDoctorRulesOfHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-doctor" && diagnostic.rule === "rules-of-hooks";
+const isReactCompilerHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-hooks-js" && diagnostic.rule === "hooks";
+const doDiagnosticSpansOverlap = (first, second) => {
+	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
+	if (first.offset !== void 0 && second.offset !== void 0) {
+		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
+		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
+		return first.offset < secondEnd && second.offset < firstEnd;
+	}
+	const firstEndLine = first.endLine ?? first.line;
+	const secondEndLine = second.endLine ?? second.line;
+	return first.line <= secondEndLine && second.line <= firstEndLine;
+};
+const keepHighestSeverity = (survivingDiagnostic, collapsedDiagnostic) => collapsedDiagnostic.severity === "error" && survivingDiagnostic.severity !== "error" ? {
+	...survivingDiagnostic,
+	severity: "error"
+} : survivingDiagnostic;
+const dedupeRelatedDiagnostics = (diagnostics) => {
+	const reactDoctorHookSites = new Set(diagnostics.filter(isReactDoctorRulesOfHooksDiagnostic).map(buildDiagnosticSiteKey));
+	const uniqueDiagnostics = [];
+	for (const diagnostic of diagnostics) {
+		if (isReactCompilerHooksDiagnostic(diagnostic) && reactDoctorHookSites.has(buildDiagnosticSiteKey(diagnostic))) continue;
+		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
+		if (priority !== void 0) {
+			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
+			if (overlappingDiagnosticIndex >= 0) {
+				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
+				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
+				if (existingDiagnostic && existingPriority !== void 0) uniqueDiagnostics[overlappingDiagnosticIndex] = priority < existingPriority ? keepHighestSeverity(diagnostic, existingDiagnostic) : keepHighestSeverity(existingDiagnostic, diagnostic);
+				continue;
+			}
+		}
+		uniqueDiagnostics.push(diagnostic);
+	}
+	return uniqueDiagnostics;
+};
 const compareStrings = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 const sortDiagnosticsStable = (diagnostics) => [...diagnostics].sort((left, right) => compareStrings(left.filePath, right.filePath) || left.line - right.line || left.column - right.column || compareStrings(left.plugin, right.plugin) || compareStrings(left.rule, right.rule) || compareStrings(left.severity, right.severity) || compareStrings(left.message, right.message));
 const getDirectDependencyNames = (packageJson) => new Set([...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]);
@@ -39491,13 +39534,13 @@ const encodeSidecarFileEntry = (entry) => ({
 	diagnostics: entry.diagnostics
 });
 const emptyCache = () => ({
-	version: 1,
+	version: 2,
 	rulesets: {}
 });
 const loadRulesetEntries = (cacheFilePath, rulesetHash) => {
 	const entries = /* @__PURE__ */ new Map();
 	const persisted = failOpenReadJson(cacheFilePath, emptyCache());
-	if (persisted.version !== 1 || !isRecord(persisted.rulesets)) return entries;
+	if (persisted.version !== 2 || !isRecord(persisted.rulesets)) return entries;
 	const bucket = persisted.rulesets[rulesetHash];
 	if (!isRecord(bucket) || !isRecord(bucket.files)) return entries;
 	for (const [fileKey, rawEntry] of Object.entries(bucket.files)) {
@@ -39517,7 +39560,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 		},
 		persist: () => {
 			const onDisk = failOpenReadJson(cacheFilePath, emptyCache());
-			const rulesets = onDisk.version === 1 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
+			const rulesets = onDisk.version === 2 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
 			const existingBucket = rulesets[rulesetHash];
 			const existingFiles = isRecord(existingBucket) && isRecord(existingBucket.files) ? existingBucket.files : {};
 			const ourFiles = {};
@@ -39531,7 +39574,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 				files: Object.fromEntries(cappedEntries)
 			};
 			atomicWriteJson(cacheFilePath, {
-				version: 1,
+				version: 2,
 				rulesets: Object.fromEntries(Object.entries(rulesets).filter(([, bucket]) => isRecord(bucket) && typeof bucket.updatedAtMs === "number").sort(([, first], [, second]) => second.updatedAtMs - first.updatedAtMs).slice(0, 8))
 			});
 		}
@@ -39582,23 +39625,6 @@ const resolveTsConfigRelativePath = (rootDirectory) => {
 	for (const filename of TSCONFIG_FILENAMES) if (NFS.existsSync(Path.join(rootDirectory, filename))) return `./${filename}`;
 	return null;
 };
-const DERIVED_STATE_RULE_PRIORITY = new Map([
-	["no-initialize-state", 0],
-	["no-adjust-state-on-prop-change", 1],
-	["no-derived-state", 2],
-	["no-derived-state-effect", 3]
-]);
-const doDiagnosticSpansOverlap = (first, second) => {
-	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
-	if (first.offset !== void 0 && second.offset !== void 0) {
-		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
-		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
-		return first.offset < secondEnd && second.offset < firstEnd;
-	}
-	const firstEndLine = first.endLine ?? first.line;
-	const secondEndLine = second.endLine ?? second.line;
-	return first.line <= secondEndLine && second.line <= firstEndLine;
-};
 const dedupeDiagnostics = (diagnostics) => {
 	const seenKeys = /* @__PURE__ */ new Set();
 	const uniqueDiagnostics = [];
@@ -39606,16 +39632,6 @@ const dedupeDiagnostics = (diagnostics) => {
 		const key = `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}\u0000${diagnostic.plugin}\u0000${diagnostic.rule}\u0000${diagnostic.severity}\u0000${diagnostic.message}`;
 		if (seenKeys.has(key)) continue;
 		seenKeys.add(key);
-		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
-		if (priority !== void 0) {
-			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && candidate.severity === diagnostic.severity && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
-			if (overlappingDiagnosticIndex >= 0) {
-				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
-				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
-				if (existingPriority !== void 0 && priority < existingPriority) uniqueDiagnostics[overlappingDiagnosticIndex] = diagnostic;
-				continue;
-			}
-		}
 		uniqueDiagnostics.push(diagnostic);
 	}
 	return uniqueDiagnostics;
@@ -42309,7 +42325,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		respectInlineDisables: input.respectInlineDisables,
 		showWarnings
 	});
-	const applyPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)), tap((diagnostic) => reporterService.emit(diagnostic)));
+	const filterPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)));
+	const applyPerElementPipeline = (rawStream) => filterPerElementPipeline(rawStream).pipe(tap((diagnostic) => reporterService.emit(diagnostic)));
 	const envCollected = yield* runCollect(applyPerElementPipeline(fromIterable$1(isDiffMode ? [] : [
 		...checkReducedMotion(scanDirectory),
 		...checkPnpmHardening(scanDirectory),
@@ -42438,7 +42455,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		});
 		return empty$4;
 	}))));
-	const lintCollected = yield* runCollect(applyPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
+	const lintCollected = dedupeRelatedDiagnostics(yield* runCollect(filterPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
 		onNone: () => set(lintFailure, {
 			didFail: true,
 			reason: `Lint analysis exceeded ${lintPhaseTimeoutMs / MILLISECONDS_PER_SECOND}s and was skipped.`,
@@ -42446,7 +42463,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 			reasonKind: null
 		}).pipe(as([])),
 		onSome: succeed$2
-	})));
+	}))));
+	yield* forEach$1(lintCollected, reporterService.emit, { discard: true });
 	const lintFailureState = yield* get$2(lintFailure);
 	yield* afterLint(lintFailureState.didFail);
 	if (lintFailureState.didFail) yield* scanProgress.fail(formatLintFailText(lintFailureState.reasonTag, process.version));
@@ -43260,4 +43278,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=2aa6fc3c-96ab-5a4c-8a52-e74d27fb4b5a
+//# debugId=4da79386-f10f-5bae-95ac-7333b2d6c4e8

package/dist/lsp.js

@@ -36344,6 +36344,49 @@ const assignFixGroups = (diagnostics) => {
 		};
 	});
 };
+const DERIVED_STATE_RULE_PRIORITY = new Map([
+	["no-initialize-state", 0],
+	["no-adjust-state-on-prop-change", 1],
+	["no-derived-state", 2],
+	["no-derived-state-effect", 3]
+]);
+const buildDiagnosticSiteKey = (diagnostic) => `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}`;
+const isReactDoctorRulesOfHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-doctor" && diagnostic.rule === "rules-of-hooks";
+const isReactCompilerHooksDiagnostic = (diagnostic) => diagnostic.plugin === "react-hooks-js" && diagnostic.rule === "hooks";
+const doDiagnosticSpansOverlap = (first, second) => {
+	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
+	if (first.offset !== void 0 && second.offset !== void 0) {
+		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
+		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
+		return first.offset < secondEnd && second.offset < firstEnd;
+	}
+	const firstEndLine = first.endLine ?? first.line;
+	const secondEndLine = second.endLine ?? second.line;
+	return first.line <= secondEndLine && second.line <= firstEndLine;
+};
+const keepHighestSeverity = (survivingDiagnostic, collapsedDiagnostic) => collapsedDiagnostic.severity === "error" && survivingDiagnostic.severity !== "error" ? {
+	...survivingDiagnostic,
+	severity: "error"
+} : survivingDiagnostic;
+const dedupeRelatedDiagnostics = (diagnostics) => {
+	const reactDoctorHookSites = new Set(diagnostics.filter(isReactDoctorRulesOfHooksDiagnostic).map(buildDiagnosticSiteKey));
+	const uniqueDiagnostics = [];
+	for (const diagnostic of diagnostics) {
+		if (isReactCompilerHooksDiagnostic(diagnostic) && reactDoctorHookSites.has(buildDiagnosticSiteKey(diagnostic))) continue;
+		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
+		if (priority !== void 0) {
+			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
+			if (overlappingDiagnosticIndex >= 0) {
+				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
+				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
+				if (existingDiagnostic && existingPriority !== void 0) uniqueDiagnostics[overlappingDiagnosticIndex] = priority < existingPriority ? keepHighestSeverity(diagnostic, existingDiagnostic) : keepHighestSeverity(existingDiagnostic, diagnostic);
+				continue;
+			}
+		}
+		uniqueDiagnostics.push(diagnostic);
+	}
+	return uniqueDiagnostics;
+};
 const compareStrings = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 const sortDiagnosticsStable = (diagnostics) => [...diagnostics].sort((left, right) => compareStrings(left.filePath, right.filePath) || left.line - right.line || left.column - right.column || compareStrings(left.plugin, right.plugin) || compareStrings(left.rule, right.rule) || compareStrings(left.severity, right.severity) || compareStrings(left.message, right.message));
 const getDirectDependencyNames = (packageJson) => new Set([...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]);
@@ -39469,13 +39512,13 @@ const encodeSidecarFileEntry = (entry) => ({
 	diagnostics: entry.diagnostics
 });
 const emptyCache = () => ({
-	version: 1,
+	version: 2,
 	rulesets: {}
 });
 const loadRulesetEntries = (cacheFilePath, rulesetHash) => {
 	const entries = /* @__PURE__ */ new Map();
 	const persisted = failOpenReadJson(cacheFilePath, emptyCache());
-	if (persisted.version !== 1 || !isRecord(persisted.rulesets)) return entries;
+	if (persisted.version !== 2 || !isRecord(persisted.rulesets)) return entries;
 	const bucket = persisted.rulesets[rulesetHash];
 	if (!isRecord(bucket) || !isRecord(bucket.files)) return entries;
 	for (const [fileKey, rawEntry] of Object.entries(bucket.files)) {
@@ -39495,7 +39538,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 		},
 		persist: () => {
 			const onDisk = failOpenReadJson(cacheFilePath, emptyCache());
-			const rulesets = onDisk.version === 1 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
+			const rulesets = onDisk.version === 2 && isRecord(onDisk.rulesets) ? { ...onDisk.rulesets } : {};
 			const existingBucket = rulesets[rulesetHash];
 			const existingFiles = isRecord(existingBucket) && isRecord(existingBucket.files) ? existingBucket.files : {};
 			const ourFiles = {};
@@ -39509,7 +39552,7 @@ const createSidecarLintCache = (cacheDirectory, rulesetHash) => {
 				files: Object.fromEntries(cappedEntries)
 			};
 			atomicWriteJson(cacheFilePath, {
-				version: 1,
+				version: 2,
 				rulesets: Object.fromEntries(Object.entries(rulesets).filter(([, bucket]) => isRecord(bucket) && typeof bucket.updatedAtMs === "number").sort(([, first], [, second]) => second.updatedAtMs - first.updatedAtMs).slice(0, 8))
 			});
 		}
@@ -39560,23 +39603,6 @@ const resolveTsConfigRelativePath = (rootDirectory) => {
 	for (const filename of TSCONFIG_FILENAMES) if (NFS.existsSync(Path.join(rootDirectory, filename))) return `./${filename}`;
 	return null;
 };
-const DERIVED_STATE_RULE_PRIORITY = new Map([
-	["no-initialize-state", 0],
-	["no-adjust-state-on-prop-change", 1],
-	["no-derived-state", 2],
-	["no-derived-state-effect", 3]
-]);
-const doDiagnosticSpansOverlap = (first, second) => {
-	if (first.filePath !== second.filePath || first.plugin !== second.plugin) return false;
-	if (first.offset !== void 0 && second.offset !== void 0) {
-		const firstEnd = first.offset + Math.max(first.length ?? 1, 1);
-		const secondEnd = second.offset + Math.max(second.length ?? 1, 1);
-		return first.offset < secondEnd && second.offset < firstEnd;
-	}
-	const firstEndLine = first.endLine ?? first.line;
-	const secondEndLine = second.endLine ?? second.line;
-	return first.line <= secondEndLine && second.line <= firstEndLine;
-};
 const dedupeDiagnostics = (diagnostics) => {
 	const seenKeys = /* @__PURE__ */ new Set();
 	const uniqueDiagnostics = [];
@@ -39584,16 +39610,6 @@ const dedupeDiagnostics = (diagnostics) => {
 		const key = `${diagnostic.filePath}\u0000${diagnostic.line}\u0000${diagnostic.column}\u0000${diagnostic.plugin}\u0000${diagnostic.rule}\u0000${diagnostic.severity}\u0000${diagnostic.message}`;
 		if (seenKeys.has(key)) continue;
 		seenKeys.add(key);
-		const priority = DERIVED_STATE_RULE_PRIORITY.get(diagnostic.rule);
-		if (priority !== void 0) {
-			const overlappingDiagnosticIndex = uniqueDiagnostics.findIndex((candidate) => candidate.rule !== diagnostic.rule && candidate.severity === diagnostic.severity && DERIVED_STATE_RULE_PRIORITY.has(candidate.rule) && doDiagnosticSpansOverlap(candidate, diagnostic));
-			if (overlappingDiagnosticIndex >= 0) {
-				const existingDiagnostic = uniqueDiagnostics[overlappingDiagnosticIndex];
-				const existingPriority = existingDiagnostic ? DERIVED_STATE_RULE_PRIORITY.get(existingDiagnostic.rule) : void 0;
-				if (existingPriority !== void 0 && priority < existingPriority) uniqueDiagnostics[overlappingDiagnosticIndex] = diagnostic;
-				continue;
-			}
-		}
 		uniqueDiagnostics.push(diagnostic);
 	}
 	return uniqueDiagnostics;
@@ -42287,7 +42303,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		respectInlineDisables: input.respectInlineDisables,
 		showWarnings
 	});
-	const applyPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)), tap((diagnostic) => reporterService.emit(diagnostic)));
+	const filterPerElementPipeline = (rawStream) => rawStream.pipe(filterMap(filterMapNullable(transform.apply)));
+	const applyPerElementPipeline = (rawStream) => filterPerElementPipeline(rawStream).pipe(tap((diagnostic) => reporterService.emit(diagnostic)));
 	const envCollected = yield* runCollect(applyPerElementPipeline(fromIterable$1(isDiffMode ? [] : [
 		...checkReducedMotion(scanDirectory),
 		...checkPnpmHardening(scanDirectory),
@@ -42416,7 +42433,7 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 		});
 		return empty$4;
 	}))));
-	const lintCollected = yield* runCollect(applyPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
+	const lintCollected = dedupeRelatedDiagnostics(yield* runCollect(filterPerElementPipeline(shouldOverlapDeadCode ? baseLintStream.pipe(provideService(OxlintConcurrency, lintConcurrency)) : baseLintStream)).pipe(timeoutOption(lintPhaseTimeoutMs), flatMap$2(match$3({
 		onNone: () => set(lintFailure, {
 			didFail: true,
 			reason: `Lint analysis exceeded ${lintPhaseTimeoutMs / MILLISECONDS_PER_SECOND}s and was skipped.`,
@@ -42424,7 +42441,8 @@ const runInspect = (input, hooks = {}) => gen(function* () {
 			reasonKind: null
 		}).pipe(as([])),
 		onSome: succeed$2
-	})));
+	}))));
+	yield* forEach$1(lintCollected, reporterService.emit, { discard: true });
 	const lintFailureState = yield* get$2(lintFailure);
 	yield* afterLint(lintFailureState.didFail);
 	if (lintFailureState.didFail) yield* scanProgress.fail(formatLintFailText(lintFailureState.reasonTag, process.version));
@@ -44897,5 +44915,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]="8ed74459-2a69-556c-bb95-8cdebdb094cd")}catch(e){}}();
-//# debugId=8ed74459-2a69-556c-bb95-8cdebdb094cd
+!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]="b75c36e9-f19d-5127-be1a-89ac93910ff0")}catch(e){}}();
+//# debugId=b75c36e9-f19d-5127-be1a-89ac93910ff0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-doctor",
-  "version": "0.7.6-dev.b36e439",
+  "version": "0.7.6-dev.c1916d5",
   "description": "Your agent writes bad React. This catches it",
   "keywords": [
     "accessibility",
@@ -66,7 +66,7 @@
     "vscode-uri": "^3.1.0",
     "yaml": "^2.9.0",
     "deslop-js": "0.7.6",
-    "oxlint-plugin-react-doctor": "0.7.6-dev.b36e439"
+    "oxlint-plugin-react-doctor": "0.7.6-dev.c1916d5"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.27.0",