react-doctor 0.5.6-dev.937a7ca → 0.5.6-dev.a9d2713

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/lsp.js CHANGED
@@ -14,7 +14,7 @@ import * as NodeUrl from "node:url";
14
14
  import { fileURLToPath } from "node:url";
15
15
  import { createJiti } from "jiti";
16
16
  import * as Crypto from "node:crypto";
17
- import crypto from "node:crypto";
17
+ import crypto, { createHash } from "node:crypto";
18
18
  import { gzipSync } from "node:zlib";
19
19
  import { CodeActionKind, CodeActionTriggerKind, DidChangeWatchedFilesNotification, DocumentDiagnosticReportKind, FileChangeType, TextDocumentSyncKind, TextDocuments, createConnection } from "vscode-languageserver/node.js";
20
20
  import { TextDocument } from "vscode-languageserver-textdocument";
@@ -19286,7 +19286,8 @@ var Diagnostic = class extends Class("Diagnostic")({
19286
19286
  category: String$1,
19287
19287
  fileContext: optional(Literals(["test", "story"])),
19288
19288
  suppressionHint: optional(String$1),
19289
- relatedLocations: optional(ArraySchema(DiagnosticRelatedLocation))
19289
+ relatedLocations: optional(ArraySchema(DiagnosticRelatedLocation)),
19290
+ fixGroupId: optional(String$1)
19290
19291
  }) {};
19291
19292
  /**
19292
19293
  * Deterministic identity string for a diagnostic. Same diagnostic
@@ -19335,6 +19336,7 @@ var JsonReportProjectEntry = class extends Class("JsonReportProjectEntry")({
19335
19336
  score: Unknown,
19336
19337
  skippedChecks: ArraySchema(String$1),
19337
19338
  skippedCheckReasons: optional(Record$1(String$1, String$1)),
19339
+ scannedFileCount: optional(Number$1),
19338
19340
  elapsedMilliseconds: Number$1
19339
19341
  }) {};
19340
19342
  /**
@@ -32761,6 +32763,7 @@ const isLargeMinifiedFile = (absolutePath) => {
32761
32763
  if (sizeBytes < 2e4) return false;
32762
32764
  return isMinifiedSource(absolutePath);
32763
32765
  };
32766
+ const isErrnoException = (error) => error instanceof Error && "code" in error;
32764
32767
  const IGNORABLE_READDIR_ERROR_CODES = new Set([
32765
32768
  "EACCES",
32766
32769
  "EPERM",
@@ -32770,11 +32773,7 @@ const IGNORABLE_READDIR_ERROR_CODES = new Set([
32770
32773
  "ELOOP",
32771
32774
  "ENAMETOOLONG"
32772
32775
  ]);
32773
- const isIgnorableReaddirError = (error) => {
32774
- if (typeof error !== "object" || error === null) return false;
32775
- const errorCode = error.code;
32776
- return typeof errorCode === "string" && IGNORABLE_READDIR_ERROR_CODES.has(errorCode);
32777
- };
32776
+ const isIgnorableReaddirError = (error) => isErrnoException(error) && typeof error.code === "string" && IGNORABLE_READDIR_ERROR_CODES.has(error.code);
32778
32777
  const readDirectoryEntries = (directoryPath) => {
32779
32778
  try {
32780
32779
  return NFS.readdirSync(directoryPath, { withFileTypes: true });
@@ -32824,7 +32823,7 @@ const readPackageJsonUncached = (packageJsonPath) => {
32824
32823
  return JSON.parse(NFS.readFileSync(packageJsonPath, "utf-8"));
32825
32824
  } catch (error) {
32826
32825
  if (error instanceof SyntaxError) return {};
32827
- if (error instanceof Error && "code" in error) {
32826
+ if (isErrnoException(error)) {
32828
32827
  const { code } = error;
32829
32828
  if (code === "EISDIR" || code === "EACCES" || code === "EPERM" || code === "ENOENT") return {};
32830
32829
  }
@@ -33549,17 +33548,13 @@ const isPackageJsonReactNativeAware = (packageJson) => {
33549
33548
  return false;
33550
33549
  };
33551
33550
  const hasReactNativeWorkspaceAnywhere = (rootDirectory, rootPackageJson) => someWorkspacePackageJson(rootDirectory, rootPackageJson, isPackageJsonReactNativeAware);
33552
- const getExpoDependencySpec = (packageJson) => {
33553
- const spec = packageJson.dependencies?.expo ?? packageJson.devDependencies?.expo ?? packageJson.peerDependencies?.expo ?? packageJson.optionalDependencies?.expo;
33551
+ const getDependencySpec = (packageJson, packageName) => {
33552
+ const spec = packageJson.dependencies?.[packageName] ?? packageJson.devDependencies?.[packageName] ?? packageJson.peerDependencies?.[packageName] ?? packageJson.optionalDependencies?.[packageName];
33554
33553
  return typeof spec === "string" ? spec : null;
33555
33554
  };
33556
- const findExpoVersion = (rootDirectory, rootPackageJson) => findInWorkspacePackageJsons(rootDirectory, rootPackageJson, getExpoDependencySpec);
33555
+ const findExpoVersion = (rootDirectory, rootPackageJson) => findInWorkspacePackageJsons(rootDirectory, rootPackageJson, (packageJson) => getDependencySpec(packageJson, "expo"));
33557
33556
  const SHOPIFY_FLASH_LIST_PACKAGE_NAME = "@shopify/flash-list";
33558
- const getShopifyFlashListDependencySpec = (packageJson) => {
33559
- const spec = packageJson.dependencies?.["@shopify/flash-list"] ?? packageJson.devDependencies?.["@shopify/flash-list"] ?? packageJson.peerDependencies?.["@shopify/flash-list"] ?? packageJson.optionalDependencies?.["@shopify/flash-list"];
33560
- return typeof spec === "string" ? spec : null;
33561
- };
33562
- const findShopifyFlashListVersion = (rootDirectory, rootPackageJson) => findInWorkspacePackageJsons(rootDirectory, rootPackageJson, getShopifyFlashListDependencySpec);
33557
+ const findShopifyFlashListVersion = (rootDirectory, rootPackageJson) => findInWorkspacePackageJsons(rootDirectory, rootPackageJson, (packageJson) => getDependencySpec(packageJson, SHOPIFY_FLASH_LIST_PACKAGE_NAME));
33563
33558
  const resolveCatalogBackedDependencyVersion = ({ rootDirectory, rootPackageJson, packageName, version }) => {
33564
33559
  if (version === null || !isCatalogReference(version)) return version;
33565
33560
  const catalogName = extractCatalogName(version);
@@ -33571,11 +33566,7 @@ const resolveCatalogBackedDependencyVersion = ({ rootDirectory, rootPackageJson,
33571
33566
  if (!isFile(monorepoPackageJsonPath)) return version;
33572
33567
  return resolveCatalogVersion(readPackageJson(monorepoPackageJsonPath), packageName, monorepoRoot, catalogName) ?? version;
33573
33568
  };
33574
- const getNextjsDependencySpec = (packageJson) => {
33575
- const spec = packageJson.dependencies?.next ?? packageJson.devDependencies?.next ?? packageJson.peerDependencies?.next ?? packageJson.optionalDependencies?.next;
33576
- return typeof spec === "string" ? spec : null;
33577
- };
33578
- const findNextjsVersion = (rootDirectory, rootPackageJson) => findInWorkspacePackageJsons(rootDirectory, rootPackageJson, getNextjsDependencySpec);
33569
+ const findNextjsVersion = (rootDirectory, rootPackageJson) => findInWorkspacePackageJsons(rootDirectory, rootPackageJson, (packageJson) => getDependencySpec(packageJson, "next"));
33579
33570
  const getPreactVersion = (packageJson) => {
33580
33571
  return {
33581
33572
  ...packageJson.peerDependencies,
@@ -33657,6 +33648,11 @@ const ES_TARGET_YEAR_BY_NAME = {
33657
33648
  esnext: 9999
33658
33649
  };
33659
33650
  /**
33651
+ * tsconfig filenames probed when resolving a project's TypeScript
33652
+ * compiler options — the root config first, then a monorepo base config.
33653
+ */
33654
+ const TSCONFIG_FILENAMES = ["tsconfig.json", "tsconfig.base.json"];
33655
+ /**
33660
33656
  * Project-config files that `StagedFiles.materialize` copies into
33661
33657
  * the temp directory alongside staged sources so oxlint resolves
33662
33658
  * `tsconfig` / `package.json` / lint configs the same way it would
@@ -33726,6 +33722,13 @@ const APP_ONLY_RULE_KEYS = new Set([
33726
33722
  ]);
33727
33723
  const COMPILER_CLEANUP_BUCKET = "compiler-cleanup";
33728
33724
  const COMPILER_CLEANUP_RULE_KEYS = new Set(["react-doctor/react-compiler-no-manual-memoization"]);
33725
+ const ROOT_CAUSE_GROUPABLE_RULE_KEYS = new Set([
33726
+ "react-doctor/no-derived-state",
33727
+ "react-doctor/no-derived-state-effect",
33728
+ "react-doctor/no-derived-useState",
33729
+ "react-doctor/no-adjust-state-on-prop-change",
33730
+ "react-doctor/no-reset-all-state-on-prop-change"
33731
+ ]);
33729
33732
  const MAX_GLOB_PATTERN_LENGTH_CHARS = 1024;
33730
33733
  const CONFIG_CACHE_TTL_MS = 300 * 1e3;
33731
33734
  const SOCKET_FREE_PURL_API_BASE = "https://firewall-api.socket.dev/purl";
@@ -34178,6 +34181,7 @@ const isTailwindAtLeast = (detected, required) => {
34178
34181
  if (detected.major !== required.major) return detected.major > required.major;
34179
34182
  return detected.minor >= required.minor;
34180
34183
  };
34184
+ const messageFromUnknown = (error) => error instanceof Error ? error.message : String(error);
34181
34185
  var InvalidGlobPatternError = class extends Error {
34182
34186
  pattern;
34183
34187
  reason;
@@ -34206,7 +34210,7 @@ const compileGlobPattern = (rawPattern) => {
34206
34210
  try {
34207
34211
  return import_picomatch.default.makeRe(normalizeGlobPattern(rawPattern), PICOMATCH_OPTIONS);
34208
34212
  } catch (caughtError) {
34209
- throw new InvalidGlobPatternError(rawPattern, caughtError instanceof Error ? caughtError.message : String(caughtError));
34213
+ throw new InvalidGlobPatternError(rawPattern, messageFromUnknown(caughtError));
34210
34214
  }
34211
34215
  };
34212
34216
  const compileGlobPatternsLenient = (patterns, onInvalid) => {
@@ -34302,115 +34306,6 @@ const buildRuleSeverityControls = (config) => {
34302
34306
  ...config.buckets !== void 0 ? { buckets: config.buckets } : {}
34303
34307
  };
34304
34308
  };
34305
- const JSX_OPENER_TAG_PATTERN = /<[A-Za-z][\w.]*/g;
34306
- const JSX_TAG_NAME_FOLLOW = /[A-Za-z]/;
34307
- const isOpenerMatchInsideLineComment = (line, openerCharIndex) => {
34308
- let stringDelimiter = null;
34309
- for (let charIndex = 0; charIndex < openerCharIndex; charIndex++) {
34310
- const character = line[charIndex];
34311
- if (stringDelimiter !== null) {
34312
- if (character === "\\") {
34313
- charIndex++;
34314
- continue;
34315
- }
34316
- if (character === stringDelimiter) stringDelimiter = null;
34317
- continue;
34318
- }
34319
- if (character === "\"" || character === "'" || character === "`") {
34320
- stringDelimiter = character;
34321
- continue;
34322
- }
34323
- if (character === "/" && line[charIndex + 1] === "/") return true;
34324
- }
34325
- return false;
34326
- };
34327
- const findOpenerTagOnLine = (line) => {
34328
- for (const match of line.matchAll(JSX_OPENER_TAG_PATTERN)) {
34329
- if (match.index === void 0) continue;
34330
- if (!isOpenerMatchInsideLineComment(line, match.index)) return { startCharIndex: match.index + match[0].length };
34331
- }
34332
- return null;
34333
- };
34334
- const findJsxOpenerSpan = (lines, openerLineIndex) => {
34335
- const openerLine = lines[openerLineIndex];
34336
- if (openerLine === void 0) return null;
34337
- const opener = findOpenerTagOnLine(openerLine);
34338
- if (!opener) return null;
34339
- const lookaheadLimit = Math.min(lines.length, openerLineIndex + 32);
34340
- let braceDepth = 0;
34341
- let innerAngleDepth = 0;
34342
- let stringDelimiter = null;
34343
- for (let lineIndex = openerLineIndex; lineIndex < lookaheadLimit; lineIndex++) {
34344
- const currentLine = lines[lineIndex];
34345
- const startCharForLine = lineIndex === openerLineIndex ? opener.startCharIndex : 0;
34346
- for (let charIndex = startCharForLine; charIndex < currentLine.length; charIndex++) {
34347
- const character = currentLine[charIndex];
34348
- if (stringDelimiter !== null) {
34349
- if (character === "\\") {
34350
- charIndex++;
34351
- continue;
34352
- }
34353
- if (character === stringDelimiter) stringDelimiter = null;
34354
- continue;
34355
- }
34356
- if (character === "\"" || character === "'" || character === "`") {
34357
- stringDelimiter = character;
34358
- continue;
34359
- }
34360
- if (character === "{") {
34361
- braceDepth++;
34362
- continue;
34363
- }
34364
- if (character === "}") {
34365
- braceDepth--;
34366
- continue;
34367
- }
34368
- if (braceDepth !== 0) continue;
34369
- if (character === "<") {
34370
- const followCharacter = currentLine[charIndex + 1];
34371
- if (followCharacter !== void 0 && JSX_TAG_NAME_FOLLOW.test(followCharacter)) innerAngleDepth++;
34372
- continue;
34373
- }
34374
- if (character !== ">") continue;
34375
- const previousCharacter = currentLine[charIndex - 1];
34376
- const nextCharacter = currentLine[charIndex + 1];
34377
- if (previousCharacter === "=" || nextCharacter === "=") continue;
34378
- if (innerAngleDepth > 0) {
34379
- innerAngleDepth--;
34380
- continue;
34381
- }
34382
- return lineIndex;
34383
- }
34384
- }
34385
- return null;
34386
- };
34387
- const findEnclosingMultilineJsxOpenerStart = (lines, diagnosticLineIndex) => {
34388
- for (let candidateIndex = diagnosticLineIndex - 1; candidateIndex >= 0 && diagnosticLineIndex - candidateIndex <= 32; candidateIndex--) {
34389
- const openerCloseIndex = findJsxOpenerSpan(lines, candidateIndex);
34390
- if (openerCloseIndex !== null && openerCloseIndex >= diagnosticLineIndex) return candidateIndex;
34391
- }
34392
- return null;
34393
- };
34394
- const DISABLE_NEXT_LINE_PATTERN = /(?:\/\/|\/\*)\s*react-doctor-disable-next-line\b(?:\s+([^\r\n]*?))?\s*(?:\*\/)?\s*\}?\s*$/;
34395
- const findStackedDisableCommentsAbove = (lines, anchorIndex) => {
34396
- const collected = [];
34397
- let isStillInChain = true;
34398
- for (let candidateIndex = anchorIndex - 1; candidateIndex >= 0 && anchorIndex - candidateIndex <= 10; candidateIndex--) {
34399
- const candidateLine = lines[candidateIndex];
34400
- if (candidateLine === void 0) break;
34401
- const match = candidateLine.match(DISABLE_NEXT_LINE_PATTERN);
34402
- if (match) {
34403
- collected.push({
34404
- commentLineIndex: candidateIndex,
34405
- ruleList: match[1],
34406
- isInChain: isStillInChain
34407
- });
34408
- continue;
34409
- }
34410
- isStillInChain = false;
34411
- }
34412
- return collected;
34413
- };
34414
34309
  const LEGACY_RULE_KEY_TO_NATIVE_RULE_KEY = {
34415
34310
  "effect/no-adjust-state-on-prop-change": "react-doctor/no-adjust-state-on-prop-change",
34416
34311
  "effect/no-chain-state-updates": "react-doctor/no-chain-state-updates",
@@ -34535,7 +34430,13 @@ for (const [legacyRuleKey, nativeRuleKey] of Object.entries(LEGACY_RULE_KEY_TO_N
34535
34430
  }
34536
34431
  const getLegacyRuleKeysForNative = (ruleKey) => NATIVE_RULE_KEY_TO_LEGACY_RULE_KEYS.get(ruleKey) ?? [];
34537
34432
  const canonicalizeRuleKey = (ruleKey) => LEGACY_RULE_KEY_TO_NATIVE_RULE_KEY[ruleKey] ?? ruleKey;
34538
- const isSameRuleKey = (candidateRuleKey, targetRuleKey) => canonicalizeRuleKey(candidateRuleKey) === canonicalizeRuleKey(targetRuleKey);
34433
+ const isReactDoctorShortIdOf = (bareRuleKey, qualifiedRuleKey) => !bareRuleKey.includes("/") && qualifiedRuleKey === `react-doctor/${bareRuleKey}`;
34434
+ const isSameRuleKey = (candidateRuleKey, targetRuleKey) => {
34435
+ const canonicalCandidate = canonicalizeRuleKey(candidateRuleKey);
34436
+ const canonicalTarget = canonicalizeRuleKey(targetRuleKey);
34437
+ if (canonicalCandidate === canonicalTarget) return true;
34438
+ return isReactDoctorShortIdOf(canonicalCandidate, canonicalTarget) || isReactDoctorShortIdOf(canonicalTarget, canonicalCandidate);
34439
+ };
34539
34440
  const getEquivalentRuleKeys = (ruleKey) => {
34540
34441
  const nativeRuleKey = canonicalizeRuleKey(ruleKey);
34541
34442
  return [nativeRuleKey, ...getLegacyRuleKeysForNative(nativeRuleKey)];
@@ -34545,12 +34446,182 @@ const stripDescriptionTail = (ruleList) => {
34545
34446
  if (!descriptionMatch || descriptionMatch.index === void 0) return ruleList;
34546
34447
  return ruleList.slice(0, descriptionMatch.index);
34547
34448
  };
34548
- const isRuleListedInComment = (ruleList, ruleId) => {
34449
+ const tokenizeRuleList = (ruleList) => {
34549
34450
  const trimmed = ruleList?.trim();
34550
- if (!trimmed) return true;
34451
+ if (!trimmed) return [];
34551
34452
  const ruleSection = stripDescriptionTail(trimmed).trim();
34552
- if (!ruleSection) return true;
34553
- return ruleSection.split(/[,\s]+/).some((token) => isSameRuleKey(token.trim(), ruleId));
34453
+ if (!ruleSection) return [];
34454
+ return ruleSection.split(/[,\s]+/).map((token) => token.trim()).filter(Boolean);
34455
+ };
34456
+ const FOREIGN_INLINE_DISABLE_PATTERN = /(?:\/\/|\/\*)[ \t]*(eslint|oxlint)-disable-(next-line|line)(?![\w-])([^\r\n]*)/;
34457
+ const FOREIGN_BLOCK_DISABLE_PATTERN = /\/\*[ \t]*(eslint|oxlint)-disable(?![\w-])([^*\r\n]*)/;
34458
+ const FOREIGN_BLOCK_ENABLE_PATTERN = /\/\*[ \t]*(?:eslint|oxlint)-enable(?![\w-])([^*\r\n]*)/;
34459
+ const buildHint = (tool, token, ruleId) => `oxlint matches plugin rules only by their full name, so \`${token}\` in your ${tool}-disable comment does not silence \`${ruleId}\` — change it to \`${ruleId}\`.`;
34460
+ const tokenMisnamesRule = (token, ruleId) => token !== ruleId && isSameRuleKey(token, ruleId);
34461
+ const detectInlineNearMiss = (lines, diagnosticLineIndex, ruleId) => {
34462
+ const candidates = [{
34463
+ line: lines[diagnosticLineIndex],
34464
+ requiredScope: "line"
34465
+ }, {
34466
+ line: lines[diagnosticLineIndex - 1],
34467
+ requiredScope: "next-line"
34468
+ }];
34469
+ for (const { line, requiredScope } of candidates) {
34470
+ const match = line?.match(FOREIGN_INLINE_DISABLE_PATTERN);
34471
+ if (!match) continue;
34472
+ const [, tool, scope, ruleList] = match;
34473
+ if (scope !== requiredScope) continue;
34474
+ const tokens = tokenizeRuleList(ruleList);
34475
+ if (tokens.includes(ruleId)) continue;
34476
+ for (const token of tokens) if (tokenMisnamesRule(token, ruleId)) return buildHint(tool, token, ruleId);
34477
+ }
34478
+ return null;
34479
+ };
34480
+ const detectBlockNearMiss = (lines, diagnosticLineIndex, ruleId) => {
34481
+ let openMisname = null;
34482
+ const lastLineIndex = Math.min(diagnosticLineIndex, lines.length - 1);
34483
+ for (let lineIndex = 0; lineIndex <= lastLineIndex; lineIndex++) {
34484
+ const line = lines[lineIndex];
34485
+ if (line === void 0 || !line.includes("-disable") && !line.includes("-enable")) continue;
34486
+ const disableMatch = line.match(FOREIGN_BLOCK_DISABLE_PATTERN);
34487
+ if (disableMatch) {
34488
+ const [, tool, ruleList] = disableMatch;
34489
+ const tokens = tokenizeRuleList(ruleList);
34490
+ if (tokens.includes(ruleId)) openMisname = null;
34491
+ else {
34492
+ const misnamed = tokens.find((token) => tokenMisnamesRule(token, ruleId));
34493
+ if (misnamed) openMisname = {
34494
+ tool,
34495
+ token: misnamed
34496
+ };
34497
+ }
34498
+ continue;
34499
+ }
34500
+ const enableMatch = line.match(FOREIGN_BLOCK_ENABLE_PATTERN);
34501
+ if (enableMatch) {
34502
+ const enabledRules = tokenizeRuleList(enableMatch[1]);
34503
+ if (enabledRules.length === 0 || enabledRules.some((rule) => isSameRuleKey(rule, ruleId))) openMisname = null;
34504
+ }
34505
+ }
34506
+ return openMisname ? buildHint(openMisname.tool, openMisname.token, ruleId) : null;
34507
+ };
34508
+ const detectForeignDisableNearMiss = (lines, diagnosticLineIndex, ruleId) => {
34509
+ if (!ruleId.startsWith("react-doctor/")) return null;
34510
+ return detectInlineNearMiss(lines, diagnosticLineIndex, ruleId) ?? detectBlockNearMiss(lines, diagnosticLineIndex, ruleId);
34511
+ };
34512
+ const JSX_OPENER_TAG_PATTERN = /<[A-Za-z][\w.]*/g;
34513
+ const JSX_TAG_NAME_FOLLOW = /[A-Za-z]/;
34514
+ const isOpenerMatchInsideLineComment = (line, openerCharIndex) => {
34515
+ let stringDelimiter = null;
34516
+ for (let charIndex = 0; charIndex < openerCharIndex; charIndex++) {
34517
+ const character = line[charIndex];
34518
+ if (stringDelimiter !== null) {
34519
+ if (character === "\\") {
34520
+ charIndex++;
34521
+ continue;
34522
+ }
34523
+ if (character === stringDelimiter) stringDelimiter = null;
34524
+ continue;
34525
+ }
34526
+ if (character === "\"" || character === "'" || character === "`") {
34527
+ stringDelimiter = character;
34528
+ continue;
34529
+ }
34530
+ if (character === "/" && line[charIndex + 1] === "/") return true;
34531
+ }
34532
+ return false;
34533
+ };
34534
+ const findOpenerTagOnLine = (line) => {
34535
+ for (const match of line.matchAll(JSX_OPENER_TAG_PATTERN)) {
34536
+ if (match.index === void 0) continue;
34537
+ if (!isOpenerMatchInsideLineComment(line, match.index)) return { startCharIndex: match.index + match[0].length };
34538
+ }
34539
+ return null;
34540
+ };
34541
+ const findJsxOpenerSpan = (lines, openerLineIndex) => {
34542
+ const openerLine = lines[openerLineIndex];
34543
+ if (openerLine === void 0) return null;
34544
+ const opener = findOpenerTagOnLine(openerLine);
34545
+ if (!opener) return null;
34546
+ const lookaheadLimit = Math.min(lines.length, openerLineIndex + 32);
34547
+ let braceDepth = 0;
34548
+ let innerAngleDepth = 0;
34549
+ let stringDelimiter = null;
34550
+ for (let lineIndex = openerLineIndex; lineIndex < lookaheadLimit; lineIndex++) {
34551
+ const currentLine = lines[lineIndex];
34552
+ const startCharForLine = lineIndex === openerLineIndex ? opener.startCharIndex : 0;
34553
+ for (let charIndex = startCharForLine; charIndex < currentLine.length; charIndex++) {
34554
+ const character = currentLine[charIndex];
34555
+ if (stringDelimiter !== null) {
34556
+ if (character === "\\") {
34557
+ charIndex++;
34558
+ continue;
34559
+ }
34560
+ if (character === stringDelimiter) stringDelimiter = null;
34561
+ continue;
34562
+ }
34563
+ if (character === "\"" || character === "'" || character === "`") {
34564
+ stringDelimiter = character;
34565
+ continue;
34566
+ }
34567
+ if (character === "{") {
34568
+ braceDepth++;
34569
+ continue;
34570
+ }
34571
+ if (character === "}") {
34572
+ braceDepth--;
34573
+ continue;
34574
+ }
34575
+ if (braceDepth !== 0) continue;
34576
+ if (character === "<") {
34577
+ const followCharacter = currentLine[charIndex + 1];
34578
+ if (followCharacter !== void 0 && JSX_TAG_NAME_FOLLOW.test(followCharacter)) innerAngleDepth++;
34579
+ continue;
34580
+ }
34581
+ if (character !== ">") continue;
34582
+ const previousCharacter = currentLine[charIndex - 1];
34583
+ const nextCharacter = currentLine[charIndex + 1];
34584
+ if (previousCharacter === "=" || nextCharacter === "=") continue;
34585
+ if (innerAngleDepth > 0) {
34586
+ innerAngleDepth--;
34587
+ continue;
34588
+ }
34589
+ return lineIndex;
34590
+ }
34591
+ }
34592
+ return null;
34593
+ };
34594
+ const findEnclosingMultilineJsxOpenerStart = (lines, diagnosticLineIndex) => {
34595
+ for (let candidateIndex = diagnosticLineIndex - 1; candidateIndex >= 0 && diagnosticLineIndex - candidateIndex <= 32; candidateIndex--) {
34596
+ const openerCloseIndex = findJsxOpenerSpan(lines, candidateIndex);
34597
+ if (openerCloseIndex !== null && openerCloseIndex >= diagnosticLineIndex) return candidateIndex;
34598
+ }
34599
+ return null;
34600
+ };
34601
+ const DISABLE_NEXT_LINE_PATTERN = /(?:\/\/|\/\*)\s*react-doctor-disable-next-line\b(?:\s+([^\r\n]*?))?\s*(?:\*\/)?\s*\}?\s*$/;
34602
+ const findStackedDisableCommentsAbove = (lines, anchorIndex) => {
34603
+ const collected = [];
34604
+ let isStillInChain = true;
34605
+ for (let candidateIndex = anchorIndex - 1; candidateIndex >= 0 && anchorIndex - candidateIndex <= 10; candidateIndex--) {
34606
+ const candidateLine = lines[candidateIndex];
34607
+ if (candidateLine === void 0) break;
34608
+ const match = candidateLine.match(DISABLE_NEXT_LINE_PATTERN);
34609
+ if (match) {
34610
+ collected.push({
34611
+ commentLineIndex: candidateIndex,
34612
+ ruleList: match[1],
34613
+ isInChain: isStillInChain
34614
+ });
34615
+ continue;
34616
+ }
34617
+ isStillInChain = false;
34618
+ }
34619
+ return collected;
34620
+ };
34621
+ const isRuleListedInComment = (ruleList, ruleId) => {
34622
+ const tokens = tokenizeRuleList(ruleList);
34623
+ if (tokens.length === 0) return true;
34624
+ return tokens.some((token) => isSameRuleKey(token, ruleId));
34554
34625
  };
34555
34626
  const DISABLE_LINE_PATTERN = /(?:\/\/|\/\*)\s*react-doctor-disable-line\b(?:\s+([^\r\n]*?))?\s*(?:\*\/)?\s*\}?\s*$/;
34556
34627
  const formatLineGap = (gapLineCount) => `${gapLineCount} line${gapLineCount === 1 ? "" : "s"}`;
@@ -34594,7 +34665,7 @@ const evaluateSuppression = (lines, diagnosticLineIndex, ruleId) => {
34594
34665
  };
34595
34666
  return {
34596
34667
  isSuppressed: false,
34597
- nearMissHint: classifyFromComments([directComments, openerComments], diagnosticLineIndex, ruleId)
34668
+ nearMissHint: classifyFromComments([directComments, openerComments], diagnosticLineIndex, ruleId) ?? detectForeignDisableNearMiss(lines, diagnosticLineIndex, ruleId)
34598
34669
  };
34599
34670
  };
34600
34671
  /**
@@ -35362,7 +35433,6 @@ const PACKAGE_JSON_FILENAME = "package.json";
35362
35433
  const PACKAGE_JSON_CONFIG_KEY = "reactDoctor";
35363
35434
  const LEGACY_CONFIG_FILENAME = "react-doctor.config.json";
35364
35435
  const jiti = createJiti(import.meta.url);
35365
- const formatError = (error) => error instanceof Error ? error.message : String(error);
35366
35436
  const importDefaultExport = async (jitiInstance, filePath) => {
35367
35437
  const imported = await jitiInstance.import(filePath);
35368
35438
  return imported?.default ?? imported;
@@ -35394,7 +35464,7 @@ const loadModuleConfig = async (filePath) => {
35394
35464
  try {
35395
35465
  return await importDefaultExport(aliasJiti, filePath);
35396
35466
  } catch (retryError) {
35397
- throw new Error(`${formatError(error)} (retry with ${SELF_PACKAGE_IMPORT_SPECIFIER} aliased to the running react-doctor package also failed: ${formatError(retryError)})`, { cause: retryError });
35467
+ throw new Error(`${messageFromUnknown(error)} (retry with ${SELF_PACKAGE_IMPORT_SPECIFIER} aliased to the running react-doctor package also failed: ${messageFromUnknown(retryError)})`, { cause: retryError });
35398
35468
  }
35399
35469
  }
35400
35470
  };
@@ -35443,7 +35513,7 @@ const loadLegacyConfig = (directory) => {
35443
35513
  }
35444
35514
  warn(`${LEGACY_CONFIG_FILENAME} must contain an object, ignoring.`);
35445
35515
  } catch (error) {
35446
- warn(`Failed to load ${LEGACY_CONFIG_FILENAME}: ${formatError(error)}`);
35516
+ warn(`Failed to load ${LEGACY_CONFIG_FILENAME}: ${messageFromUnknown(error)}`);
35447
35517
  }
35448
35518
  return {
35449
35519
  status: "invalid",
@@ -35470,7 +35540,7 @@ const loadConfigFromDirectory = async (directory) => {
35470
35540
  warn(`${CONFIG_BASENAME}.${extension} must export an object, ignoring.`);
35471
35541
  sawBrokenConfigFile = true;
35472
35542
  } catch (error) {
35473
- warn(`Failed to load ${CONFIG_BASENAME}.${extension}: ${formatError(error)}`);
35543
+ warn(`Failed to load ${CONFIG_BASENAME}.${extension}: ${messageFromUnknown(error)}`);
35474
35544
  sawBrokenConfigFile = true;
35475
35545
  }
35476
35546
  }
@@ -35524,6 +35594,29 @@ const resolveConfigRootDir = (config, configSourceDirectory) => {
35524
35594
  }
35525
35595
  return resolvedRootDir;
35526
35596
  };
35597
+ const buildFixGroupId = (diagnostic) => createHash("sha1").update(JSON.stringify([
35598
+ diagnostic.filePath,
35599
+ `${diagnostic.plugin}/${diagnostic.rule}`,
35600
+ diagnostic.message
35601
+ ])).digest("hex").slice(0, 16);
35602
+ const isGroupableRule = (diagnostic) => ROOT_CAUSE_GROUPABLE_RULE_KEYS.has(`${diagnostic.plugin}/${diagnostic.rule}`);
35603
+ const assignFixGroups = (diagnostics) => {
35604
+ const siteCountByGroupId = /* @__PURE__ */ new Map();
35605
+ for (const diagnostic of diagnostics) {
35606
+ if (!isGroupableRule(diagnostic)) continue;
35607
+ const groupId = buildFixGroupId(diagnostic);
35608
+ siteCountByGroupId.set(groupId, (siteCountByGroupId.get(groupId) ?? 0) + 1);
35609
+ }
35610
+ return diagnostics.map((diagnostic) => {
35611
+ if (!isGroupableRule(diagnostic)) return diagnostic;
35612
+ const groupId = buildFixGroupId(diagnostic);
35613
+ if ((siteCountByGroupId.get(groupId) ?? 0) < 2) return diagnostic;
35614
+ return {
35615
+ ...diagnostic,
35616
+ fixGroupId: groupId
35617
+ };
35618
+ });
35619
+ };
35527
35620
  const getDirectDependencyNames = (packageJson) => new Set([...Object.keys(packageJson.dependencies ?? {}), ...Object.keys(packageJson.devDependencies ?? {})]);
35528
35621
  const buildExpoCheckContext = (rootDirectory, expoVersion) => {
35529
35622
  const packageJson = readPackageJson(Path.join(rootDirectory, "package.json"));
@@ -36650,7 +36743,7 @@ const readIgnoreFile = (filePath) => {
36650
36743
  try {
36651
36744
  content = NFS.readFileSync(filePath, "utf-8");
36652
36745
  } catch (error) {
36653
- const errnoCode = error?.code;
36746
+ const errnoCode = isErrnoException(error) ? error.code : void 0;
36654
36747
  if (errnoCode && errnoCode !== "ENOENT") runSync(warn$1(`Could not read ignore file ${filePath}: ${errnoCode}`));
36655
36748
  return [];
36656
36749
  }
@@ -36691,8 +36784,8 @@ const collectIgnorePatterns = (rootDirectory) => {
36691
36784
  cachedPatternsByRoot.set(rootDirectory, patterns);
36692
36785
  return patterns;
36693
36786
  };
36787
+ const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
36694
36788
  const KNIP_JSON_FILENAME = "knip.json";
36695
- const isRecord$1 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
36696
36789
  const readJsonFileSafe = (filePath) => {
36697
36790
  let rawContents;
36698
36791
  try {
@@ -36708,10 +36801,10 @@ const readJsonFileSafe = (filePath) => {
36708
36801
  };
36709
36802
  const readKnipConfig = (rootDirectory) => {
36710
36803
  const knipJson = readJsonFileSafe(path.join(rootDirectory, KNIP_JSON_FILENAME));
36711
- if (isRecord$1(knipJson)) return knipJson;
36804
+ if (isRecord(knipJson)) return knipJson;
36712
36805
  const packageJson = readJsonFileSafe(path.join(rootDirectory, "package.json"));
36713
- const packageKnipConfig = isRecord$1(packageJson) ? packageJson.knip : null;
36714
- return isRecord$1(packageKnipConfig) ? packageKnipConfig : null;
36806
+ const packageKnipConfig = isRecord(packageJson) ? packageJson.knip : null;
36807
+ return isRecord(packageKnipConfig) ? packageKnipConfig : null;
36715
36808
  };
36716
36809
  const normalizePatternList = (value) => {
36717
36810
  if (typeof value === "string" && value.length > 0) return [value];
@@ -36723,10 +36816,10 @@ const prefixWorkspacePatterns = (workspacePattern, patterns) => {
36723
36816
  return patterns.map((pattern) => pattern.startsWith("!") ? `!${normalizedWorkspacePattern}/${pattern.slice(1)}` : `${normalizedWorkspacePattern}/${pattern}`);
36724
36817
  };
36725
36818
  const collectKnipWorkspacePatterns = (workspaces, settingName) => {
36726
- if (!isRecord$1(workspaces)) return [];
36819
+ if (!isRecord(workspaces)) return [];
36727
36820
  const patterns = [];
36728
36821
  for (const [workspacePattern, workspaceConfig] of Object.entries(workspaces)) {
36729
- if (!isRecord$1(workspaceConfig)) continue;
36822
+ if (!isRecord(workspaceConfig)) continue;
36730
36823
  patterns.push(...prefixWorkspacePatterns(workspacePattern, normalizePatternList(workspaceConfig[settingName])));
36731
36824
  }
36732
36825
  return patterns;
@@ -36771,8 +36864,6 @@ const toCanonicalPath = (filePath) => {
36771
36864
  };
36772
36865
  const DEAD_CODE_PLUGIN = "deslop";
36773
36866
  const DEAD_CODE_CATEGORY = "Maintainability";
36774
- const TSCONFIG_FILENAMES$1 = ["tsconfig.json", "tsconfig.base.json"];
36775
- const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
36776
36867
  const DEAD_CODE_WORKER_SCRIPT = `
36777
36868
  const inputChunks = [];
36778
36869
  process.stdin.on("data", (chunk) => inputChunks.push(chunk));
@@ -36830,7 +36921,7 @@ process.stdin.on("end", () => {
36830
36921
  });
36831
36922
  `;
36832
36923
  const resolveTsConfigPath = (rootDirectory) => {
36833
- for (const filename of TSCONFIG_FILENAMES$1) {
36924
+ for (const filename of TSCONFIG_FILENAMES) {
36834
36925
  const candidate = Path.join(rootDirectory, filename);
36835
36926
  if (NFS.existsSync(candidate)) return candidate;
36836
36927
  }
@@ -37211,15 +37302,13 @@ var DeadCode = class DeadCode extends Service()("react-doctor/DeadCode") {
37211
37302
  })()) }));
37212
37303
  static layerOf = (diagnostics) => succeed$3(DeadCode, DeadCode.of({ run: () => fromIterable$1(diagnostics) }));
37213
37304
  };
37214
- const createNodeReadFileLinesSync = (rootDirectory) => {
37215
- return (filePath) => {
37216
- const absolutePath = Path.isAbsolute(filePath) ? filePath : Path.join(rootDirectory, filePath);
37217
- try {
37218
- return NFS.readFileSync(absolutePath, "utf-8").split("\n");
37219
- } catch {
37220
- return null;
37221
- }
37222
- };
37305
+ const createNodeReadFileLinesSync = (rootDirectory) => (filePath) => {
37306
+ const absolutePath = Path.isAbsolute(filePath) ? filePath : Path.join(rootDirectory, filePath);
37307
+ try {
37308
+ return NFS.readFileSync(absolutePath, "utf-8").split("\n");
37309
+ } catch {
37310
+ return null;
37311
+ }
37223
37312
  };
37224
37313
  var Files = class Files extends Service()("react-doctor/Files") {
37225
37314
  static layerNode = succeed$3(Files, Files.of({
@@ -37430,7 +37519,10 @@ var Git = class Git extends Service()("react-doctor/Git") {
37430
37519
  directory: input.directory,
37431
37520
  cause
37432
37521
  }) });
37433
- }));
37522
+ }), withSpan("git.exec", { attributes: {
37523
+ "git.command": input.command,
37524
+ "git.subcommand": input.args[0] ?? ""
37525
+ } }));
37434
37526
  const runGit = (directory, args) => runCommand({
37435
37527
  command: "git",
37436
37528
  args,
@@ -37458,7 +37550,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
37458
37550
  ]);
37459
37551
  if (candidates.status !== 0) return null;
37460
37552
  return trimOrNull(candidates.stdout.split("\n")[0] ?? "");
37461
- });
37553
+ }).pipe(withSpan("Git.defaultBranch"));
37462
37554
  const branchExists = (directory, branch) => runGit(directory, [
37463
37555
  "rev-parse",
37464
37556
  "--verify",
@@ -37505,7 +37597,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
37505
37597
  const result = resultOption.value;
37506
37598
  if (result.status !== 0) return null;
37507
37599
  return parseGithubViewerPermission(result.stdout);
37508
- }).pipe(catch_$1(() => succeed$2(null)));
37600
+ }).pipe(catch_$1(() => succeed$2(null)), withSpan("Git.githubViewerPermission"));
37509
37601
  /**
37510
37602
  * Resolves a `--diff A..B` / `A...B` commit range into a changed-file
37511
37603
  * selection. Each endpoint is validated with `isSafeGitRevision`
@@ -37619,7 +37711,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
37619
37711
  changedFiles: splitNullSeparated(diff.stdout),
37620
37712
  isCurrentChanges: false
37621
37713
  };
37622
- }),
37714
+ }).pipe(withSpan("Git.diffSelection")),
37623
37715
  stagedFilePaths: (directory) => runGit(directory, [
37624
37716
  "diff",
37625
37717
  "--cached",
@@ -37661,7 +37753,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
37661
37753
  status: result.status,
37662
37754
  stdout: result.stdout
37663
37755
  };
37664
- }),
37756
+ }).pipe(withSpan("Git.grep")),
37665
37757
  changedLineRanges: ({ directory, baseRef, cached, files }) => gen(function* () {
37666
37758
  if (files.length === 0) return [];
37667
37759
  if (baseRef !== void 0 && !isSafeGitRevision(baseRef)) return null;
@@ -37677,7 +37769,7 @@ var Git = class Git extends Service()("react-doctor/Git") {
37677
37769
  ]);
37678
37770
  if (result.status !== 0) return null;
37679
37771
  return parseChangedLineRanges(result.stdout);
37680
- })
37772
+ }).pipe(withSpan("Git.changedLineRanges"))
37681
37773
  });
37682
37774
  })).pipe(provide$2(layer$2.pipe(provide$2(mergeAll$1(layer$1, layer)))));
37683
37775
  /**
@@ -37892,7 +37984,7 @@ const neutralizeDisableDirectives = async (rootDirectory, includePaths) => {
37892
37984
  for (const [absolutePath, originalContent] of originalContents) try {
37893
37985
  NFS.writeFileSync(absolutePath, originalContent);
37894
37986
  } catch (error) {
37895
- process.stderr.write(`[react-doctor] Failed to restore inline disable directives in ${absolutePath}: ${error instanceof Error ? error.message : String(error)}\n[react-doctor] Run: git checkout -- ${absolutePath}\n`);
37987
+ process.stderr.write(`[react-doctor] Failed to restore inline disable directives in ${absolutePath}: ${messageFromUnknown(error)}\n[react-doctor] Run: git checkout -- ${absolutePath}\n`);
37896
37988
  }
37897
37989
  };
37898
37990
  const onExit = () => restore();
@@ -37998,7 +38090,7 @@ const resolveUserPlugin = (spec, configSourceDirectory) => {
37998
38090
  try {
37999
38091
  resolvedSpecifier = isRelative ? Path.resolve(configSourceDirectory, spec) : candidateRequire.resolve(spec);
38000
38092
  } catch (error) {
38001
- warnConfigIssue(`config.plugins entry "${spec}" could not be resolved from ${configSourceDirectory}: ${error instanceof Error ? error.message : String(error)}`);
38093
+ warnConfigIssue(`config.plugins entry "${spec}" could not be resolved from ${configSourceDirectory}: ${messageFromUnknown(error)}`);
38002
38094
  return null;
38003
38095
  }
38004
38096
  const { name, ruleNames } = readPluginShape(resolvedSpecifier, (target) => candidateRequire(target));
@@ -38131,7 +38223,6 @@ const resolveOxlintBinary = () => {
38131
38223
  return Path.join(oxlintPackageDirectory, "bin", "oxlint");
38132
38224
  };
38133
38225
  const resolvePluginPath = () => esmRequire.resolve("oxlint-plugin-react-doctor");
38134
- const TSCONFIG_FILENAMES = ["tsconfig.json", "tsconfig.base.json"];
38135
38226
  const resolveTsConfigRelativePath = (rootDirectory) => {
38136
38227
  for (const filename of TSCONFIG_FILENAMES) if (NFS.existsSync(Path.join(rootDirectory, filename))) return `./${filename}`;
38137
38228
  return null;
@@ -38503,7 +38594,7 @@ const scopeContainsNonImportBinding = (node, scopeNode, identifierName) => {
38503
38594
  const isIdentifierShadowedByLocalBinding = (identifier, sourceFile) => {
38504
38595
  let currentNode = identifier.parent;
38505
38596
  while (currentNode) {
38506
- if (isScopeNode(currentNode)) {
38597
+ if (isScopeBoundary(currentNode)) {
38507
38598
  if (scopeContainsNonImportBinding(currentNode, currentNode, identifier.text)) return true;
38508
38599
  }
38509
38600
  if (currentNode === sourceFile) return false;
@@ -38594,11 +38685,10 @@ const findResolutionInScope = (scopeNode, identifierName, reactImportBindings, s
38594
38685
  });
38595
38686
  return resolution;
38596
38687
  };
38597
- const isScopeNode = isScopeBoundary;
38598
38688
  const resolveIdentifierBinding = (identifier, reactImportBindings, sourceFile, visitedDeclarations = /* @__PURE__ */ new Set()) => {
38599
38689
  let currentNode = identifier.parent;
38600
38690
  while (currentNode) {
38601
- if (isScopeNode(currentNode)) {
38691
+ if (isScopeBoundary(currentNode)) {
38602
38692
  const resolution = findResolutionInScope(currentNode, identifier.text, reactImportBindings, sourceFile, visitedDeclarations);
38603
38693
  if (resolution) return resolution;
38604
38694
  }
@@ -38846,7 +38936,7 @@ const spawnOxlint = (args, rootDirectory, nodeBinaryPath, spawnTimeoutMs = OXLIN
38846
38936
  child.kill("SIGKILL");
38847
38937
  reject(new ReactDoctorError({ reason: new OxlintBatchExceeded({
38848
38938
  kind: "timeout",
38849
- detail: `${spawnTimeoutMs / 1e3}s budget exceeded`
38939
+ detail: `${spawnTimeoutMs / MILLISECONDS_PER_SECOND}s budget exceeded`
38850
38940
  }) }));
38851
38941
  }, spawnTimeoutMs);
38852
38942
  timeoutHandle.unref?.();
@@ -39968,17 +40058,17 @@ const runInspect = (input, hooks = {}) => gen(function* () {
39968
40058
  }))))))));
39969
40059
  const deadCodeFailureState = yield* get$2(deadCodeFailure);
39970
40060
  const scanElapsedMilliseconds = Date.now() - scanStartTime;
39971
- const scanElapsedSeconds = (scanElapsedMilliseconds / 1e3).toFixed(1);
40061
+ const scanElapsedSeconds = (scanElapsedMilliseconds / MILLISECONDS_PER_SECOND).toFixed(1);
39972
40062
  if (!lintFailureState.didFail) if (deadCodeFailureState.didFail) yield* scanProgress.fail(DEAD_CODE_FAIL_TEXT);
39973
40063
  else if (input.suppressScanSummary) yield* scanProgress.stop();
39974
40064
  else yield* scanProgress.succeed(`Scanned ${scannedFilesLabel} in ${scanElapsedSeconds}s${workerCountSuffix}`);
39975
40065
  yield* reporterService.finalize;
39976
- const finalDiagnostics = [
40066
+ const finalDiagnostics = assignFixGroups([
39977
40067
  ...envCollected,
39978
40068
  ...supplyChainCollected,
39979
40069
  ...lintCollected,
39980
40070
  ...deadCodeCollected
39981
- ];
40071
+ ]);
39982
40072
  const githubViewerPermission = yield* join(githubViewerPermissionFiber);
39983
40073
  const scoreMetadata = {
39984
40074
  ...repo !== null ? { repo } : {},
@@ -40182,7 +40272,7 @@ const materializeSourceTree = (input) => gen(function* () {
40182
40272
  static layerNode = effect(StagedFiles, gen(function* () {
40183
40273
  const git = yield* Git;
40184
40274
  return StagedFiles.of({
40185
- discoverSourceFiles: (directory) => git.stagedFilePaths(directory).pipe(map$3((entries) => entries.filter(isLintableSourceFile))),
40275
+ discoverSourceFiles: (directory) => git.stagedFilePaths(directory).pipe(map$3((entries) => entries.filter(isLintableSourceFile)), withSpan("StagedFiles.discoverSourceFiles")),
40186
40276
  materialize: ({ directory, stagedFiles, tempDirectory }) => materializeSourceTree({
40187
40277
  directory,
40188
40278
  files: stagedFiles,
@@ -40192,7 +40282,7 @@ const materializeSourceTree = (input) => gen(function* () {
40192
40282
  tempDirectory: tree.tempDirectory,
40193
40283
  stagedFiles: tree.materializedFiles,
40194
40284
  cleanup: tree.cleanup
40195
- })))
40285
+ })), withSpan("StagedFiles.materialize"))
40196
40286
  });
40197
40287
  }));
40198
40288
  /**
@@ -40260,7 +40350,10 @@ const runEditorScan = async (input) => {
40260
40350
  isCi: false,
40261
40351
  resolveLocalGithubViewerPermission: false,
40262
40352
  skipJsxIncludeFilter: true
40263
- }).pipe(provide(layers), provide(layerOtlp)));
40353
+ }).pipe(withSpan("runEditorScan", { attributes: {
40354
+ "editor.lint": lint,
40355
+ "editor.runDeadCode": runDeadCode
40356
+ } }), provide(layers), provide(layerOtlp)));
40264
40357
  if (isSuccess(exit)) {
40265
40358
  const output = exit.value;
40266
40359
  return {
@@ -40290,7 +40383,7 @@ const runEditorScan = async (input) => {
40290
40383
  didDeadCodeFail: false,
40291
40384
  deadCodeFailureReason: null,
40292
40385
  lintPartialFailures: [],
40293
- error: error instanceof Error ? error.message : String(error)
40386
+ error: messageFromUnknown(error)
40294
40387
  };
40295
40388
  };
40296
40389
  /**
@@ -40572,7 +40665,6 @@ const toLspDiagnostic = (input) => {
40572
40665
  data
40573
40666
  };
40574
40667
  };
40575
- const toUri = (absoluteFilePath) => fsPathToUri(absoluteFilePath);
40576
40668
  /**
40577
40669
  * Owns the published-diagnostic state. Maps scan outcomes to LSP
40578
40670
  * diagnostics, publishes complete per-URI replacement sets (so the
@@ -40602,7 +40694,7 @@ var DiagnosticsManager = class {
40602
40694
  const isProtectedPath = (fsPath) => protectOpen && this.isOpen(fsPath);
40603
40695
  for (const [fsPath, coreDiagnostics] of outcome.byFile) {
40604
40696
  if (isProtectedPath(fsPath)) continue;
40605
- const uri = toUri(fsPath);
40697
+ const uri = fsPathToUri(fsPath);
40606
40698
  const text = this.textProvider(fsPath);
40607
40699
  const lspDiagnostics = coreDiagnostics.map((diagnostic) => toLspDiagnostic({
40608
40700
  diagnostic,
@@ -40624,7 +40716,7 @@ var DiagnosticsManager = class {
40624
40716
  for (const fsPath of outcome.requestedPaths) {
40625
40717
  if (isProtectedPath(fsPath)) continue;
40626
40718
  if (outcome.byFile.has(fsPath)) continue;
40627
- const uri = toUri(fsPath);
40719
+ const uri = fsPathToUri(fsPath);
40628
40720
  if (this.byUri.has(uri)) this.byUri.delete(uri);
40629
40721
  this.publish(uri, []);
40630
40722
  }
@@ -40649,7 +40741,7 @@ var DiagnosticsManager = class {
40649
40741
  const set = this.projectUris.get(project) ?? /* @__PURE__ */ new Set();
40650
40742
  for (const uri of liveUris) set.add(uri);
40651
40743
  for (const fsPath of outcome.requestedPaths) {
40652
- const uri = toUri(fsPath);
40744
+ const uri = fsPathToUri(fsPath);
40653
40745
  if (!liveUris.has(uri)) set.delete(uri);
40654
40746
  }
40655
40747
  this.projectUris.set(project, set);
@@ -40677,7 +40769,7 @@ var DiagnosticsManager = class {
40677
40769
  const tracked = this.projectUris.get(project);
40678
40770
  if (!tracked) return;
40679
40771
  const liveUris = /* @__PURE__ */ new Set();
40680
- for (const fsPath of liveFsPaths) liveUris.add(toUri(fsPath));
40772
+ for (const fsPath of liveFsPaths) liveUris.add(fsPathToUri(fsPath));
40681
40773
  for (const uri of [...tracked]) {
40682
40774
  if (liveUris.has(uri)) continue;
40683
40775
  this.byUri.delete(uri);
@@ -40974,7 +41066,7 @@ const createProjectGraph = (options) => {
40974
41066
  });
40975
41067
  }
40976
41068
  } catch (error) {
40977
- logger.warn(`Project discovery failed for ${root}: ${error instanceof Error ? error.message : String(error)}`);
41069
+ logger.warn(`Project discovery failed for ${root}: ${messageFromUnknown(error)}`);
40978
41070
  }
40979
41071
  return [...seen.values()].sort((first, second) => second.directory.length - first.directory.length);
40980
41072
  };
@@ -41002,6 +41094,11 @@ const createProjectGraph = (options) => {
41002
41094
  }
41003
41095
  };
41004
41096
  };
41097
+ const toProjectRelative = (projectDirectory, filePath) => {
41098
+ const relative = Path.relative(projectDirectory, filePath).replace(/\\/g, "/");
41099
+ if (relative.length === 0 || relative.startsWith("../") || Path.isAbsolute(relative)) return null;
41100
+ return relative;
41101
+ };
41005
41102
  const resolveCacheFilePath = (projectDirectory) => {
41006
41103
  const nodeModules = path.join(projectDirectory, "node_modules");
41007
41104
  if (fs.existsSync(nodeModules)) return path.join(nodeModules, ".cache", "react-doctor", "lint-cache.json");
@@ -41036,7 +41133,7 @@ const createLintCache = (input) => {
41036
41133
  fs.writeFileSync(tempPath, JSON.stringify(payload));
41037
41134
  fs.renameSync(tempPath, cacheFilePath);
41038
41135
  } catch (error) {
41039
- logger.warn(`Failed to persist lint cache: ${error instanceof Error ? error.message : String(error)}`);
41136
+ logger.warn(`Failed to persist lint cache: ${messageFromUnknown(error)}`);
41040
41137
  }
41041
41138
  };
41042
41139
  return {
@@ -41062,11 +41159,6 @@ const createLintCache = (input) => {
41062
41159
  };
41063
41160
  const OVERLAY_TEMP_PREFIX = "react-doctor-lsp-";
41064
41161
  const OVERLAY_CONFIG_FILENAMES = [...new Set([...STAGED_FILES_PROJECT_CONFIG_FILENAMES, ...ADOPTABLE_LINT_CONFIG_FILENAMES])];
41065
- const toProjectRelative$1 = (projectDirectory, filePath) => {
41066
- const relative = path.relative(projectDirectory, filePath).replace(/\\/g, "/");
41067
- if (relative.length === 0 || relative.startsWith("../") || path.isAbsolute(relative)) return null;
41068
- return relative;
41069
- };
41070
41162
  /**
41071
41163
  * Writes the live (possibly unsaved) content of the target files into a
41072
41164
  * throwaway temp tree that mirrors the project, alongside the well-known
@@ -41080,7 +41172,7 @@ const materializeOverlay = (input) => {
41080
41172
  const relativePaths = [];
41081
41173
  try {
41082
41174
  for (const filePath of input.files) {
41083
- const relative = toProjectRelative$1(input.projectDirectory, filePath);
41175
+ const relative = toProjectRelative(input.projectDirectory, filePath);
41084
41176
  if (relative === null) continue;
41085
41177
  const content = input.readText(filePath);
41086
41178
  if (content === null) continue;
@@ -41128,11 +41220,6 @@ const materializeOverlay = (input) => {
41128
41220
  throw error;
41129
41221
  }
41130
41222
  };
41131
- const toProjectRelative = (projectDirectory, filePath) => {
41132
- const relative = path.relative(projectDirectory, filePath).replace(/\\/g, "/");
41133
- if (relative.length === 0 || relative.startsWith("../") || path.isAbsolute(relative)) return null;
41134
- return relative;
41135
- };
41136
41223
  /**
41137
41224
  * Resolves a diagnostic's (possibly relative, possibly overlay-temp)
41138
41225
  * file path back to the canonical absolute path inside the real project.
@@ -41354,7 +41441,7 @@ const createScheduler = (options) => {
41354
41441
  if (outcome && !token.isCancelled) options.onResult(outcome);
41355
41442
  }).catch((error) => {
41356
41443
  if (options.onError) options.onError(error, request);
41357
- else logger.error(`Scan failed: ${error instanceof Error ? error.message : String(error)}`);
41444
+ else logger.error(`Scan failed: ${messageFromUnknown(error)}`);
41358
41445
  }).finally(() => {
41359
41446
  running -= 1;
41360
41447
  if (isBackground) runningBackground -= 1;
@@ -41741,7 +41828,7 @@ const createServer = (connection, options = {}) => {
41741
41828
  maybeWarnLintUnavailable(outcome);
41742
41829
  if (outcome.request.priority === "background") scanTelemetry.accumulate(outcome);
41743
41830
  },
41744
- onError: (error, request) => logger.error(`Scan of ${request.projectDirectory} threw: ${error instanceof Error ? error.message : String(error)}`),
41831
+ onError: (error, request) => logger.error(`Scan of ${request.projectDirectory} threw: ${messageFromUnknown(error)}`),
41745
41832
  onIdleChange: (idle) => {
41746
41833
  setBusy(!idle);
41747
41834
  if (idle) scanTelemetry.finish();
@@ -42389,5 +42476,5 @@ const startLanguageServer = () => {
42389
42476
  };
42390
42477
  //#endregion
42391
42478
  export { startLanguageServer };
42392
- !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]="7deadb2d-94c2-54e2-bd0d-808ee8d4c380")}catch(e){}}();
42393
- //# debugId=7deadb2d-94c2-54e2-bd0d-808ee8d4c380
42479
+ !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]="6fbf847f-43b8-5c5c-ba97-c26c2e08e250")}catch(e){}}();
42480
+ //# debugId=6fbf847f-43b8-5c5c-ba97-c26c2e08e250