diff --git a/scripts/verify/architecture-guards.mjs b/scripts/verify/architecture-guards.mjs index 927fb95a45..8ce643f879 100644 --- a/scripts/verify/architecture-guards.mjs +++ b/scripts/verify/architecture-guards.mjs @@ -11,6 +11,7 @@ import { localCompletenessEnumCount } from "./completeness-enum-guard.mjs"; import { countKeyedFirstMatches } from "./keyed-first-match.mjs"; import { budgetArithmeticCount } from "./budget-arithmetic-guard.mjs"; import { localLimitErrorClassCount } from "./limit-class-guard.mjs"; +import { completedAbortReclassificationCount } from "./completed-abort-guard.mjs"; import { countDefaultValidationClients } from "./mcp-client-validation.mjs"; import { isComparisonOrCountFile, @@ -635,7 +636,7 @@ checkCounted( "completed result reclassified by a hand-read abort signal (finalize through runOwned in src/providers/runOwned)", "completed-abort-reclassification", files, - /\.ok\s*&&\s*(?:isAborted\(|[\w.?]*signal\??\.aborted)/gu, + completedAbortReclassificationCount, ["src/providers/runOwned.ts"], ); diff --git a/scripts/verify/baselines/completed-abort-reclassification.json b/scripts/verify/baselines/completed-abort-reclassification.json index a5ab4e9d34..101973cfc4 100644 --- a/scripts/verify/baselines/completed-abort-reclassification.json +++ b/scripts/verify/baselines/completed-abort-reclassification.json @@ -1,8 +1,6 @@ { "src/application/EvidenceInputResolver.ts": 1, "src/application/binary/BinarySession.ts": 1, - "src/application/desktop/DesktopApplicationState.ts": 1, - "src/application/frida/FridaInstrumentationService.ts": 1, "src/browser/CdpBrowserProvider.ts": 1, "src/browser/CdpElectronProvider.ts": 1, "src/browser/PlaywrightBrowserScenarioProvider.ts": 1, diff --git a/scripts/verify/completed-abort-guard.d.mts b/scripts/verify/completed-abort-guard.d.mts new file mode 100644 index 0000000000..762ea24688 --- /dev/null +++ b/scripts/verify/completed-abort-guard.d.mts @@ -0,0 +1 @@ +export function completedAbortReclassificationCount(content: string): number; diff --git a/scripts/verify/completed-abort-guard.mjs b/scripts/verify/completed-abort-guard.mjs new file mode 100644 index 0000000000..391ef7c142 --- /dev/null +++ b/scripts/verify/completed-abort-guard.mjs @@ -0,0 +1,18 @@ +// Counts completed results reclassified by a hand-read abort signal: +// `.ok && isAborted(…)` or `.ok && …signal.aborted`. +// The receiver chain must start the check, so a negated `!outcome.ok && …`, +// which attaches a secondary cancellation to a failed primary, is not +// counted. Receivers may use member, optional, private, element and call +// segments, or start with one parenthesized expression, and each part may +// carry a TypeScript non-null assertion (`result!.ok`). Parentheses may nest +// one level, as in `(await settle()).ok`; element brackets cannot nest. +const parenthesized = String.raw`\((?:[^()]|\([^()]*\))*\)`; +const segment = String.raw`(?:(?:\??\.#?[A-Za-z_$][\w$]*|(?:\?\.)?\[[^[\]]*\]|(?:\?\.)?${parenthesized})!?)`; +const completedAbortReclassification = new RegExp( + String.raw`(? + content.match(completedAbortReclassification)?.length ?? 0; diff --git a/tests/evaluation/completedAbortGuard.test.ts b/tests/evaluation/completedAbortGuard.test.ts new file mode 100644 index 0000000000..a4cdd36acc --- /dev/null +++ b/tests/evaluation/completedAbortGuard.test.ts @@ -0,0 +1,44 @@ +import { expect, it } from "vitest"; +import { completedAbortReclassificationCount } from "../../scripts/verify/completed-abort-guard.mjs"; + +it.each([ + "if (result.ok && isAborted(state.signal))", + "return result.ok && deadline.signal.aborted", + "(waited.ok && isAborted(signal))", + "if (result.ok && options?.signal?.aborted)", + "outcome?.ok && signal.aborted", + "this.#pending.result.ok && signal.aborted", + "results[0].ok && signal.aborted", + "results[index]?.ok && isAborted(signal)", + "getResult().ok && isAborted(signal)", + "this.readResult().outcome.ok && options.signal?.aborted", + "(await settle()).ok && signal.aborted", + "result!.ok && signal.aborted", + "getResult()!.ok && isAborted(signal)", + "results[0]!.outcome!.ok && options.signal?.aborted", +])("counts the completed-result check %s", (source) => { + expect(completedAbortReclassificationCount(source)).toBe(1); +}); + +it.each([ + "if (!outcome.ok && signal?.aborted)", + "if (! started.ok && signal?.aborted)", + "!this.#pending.result.ok && signal.aborted", + "!results[0].ok && signal.aborted", + "!this.readResult().outcome.ok && isAborted(signal)", + "!(await settle()).ok && signal.aborted", + "!result!.ok && signal.aborted", + "!getResult()!.ok && isAborted(signal)", + "if (result.ok) return isAborted(signal);", + "if (result.ok && signal === undefined)", +])("ignores %s", (source) => { + expect(completedAbortReclassificationCount(source)).toBe(0); +}); + +it("counts each check once", () => { + expect( + completedAbortReclassificationCount( + "if (first.ok && isAborted(signal)) a();\nif (second.ok && signal.aborted) b();", + ), + ).toBe(2); +});