@specific.dev/spectest 0.91.2 → 0.92.0

package/dist/daemon.js

@@ -45,7 +45,9 @@ import { summarizeBuildKit } from "./harness/buildkit-progress.js";
 import { LOG_DELTA_MAX_BYTES, capMiddle, streamDelta } from "./harness/log-delta.js";
 import { resolveHostPath as resolveVolumeHostPath, sanitizeSegment, } from "./harness/volume-paths.js";
 import { pollUntilReady } from "./harness/ready-poll.js";
-import { fsUsageDiagnostics, runWrapperRules } from "./harness/wrapper-rules.js";
+import { fsUsageDiagnostics } from "./harness/wrapper-rules.js";
+import { runTypecheck } from "./harness/typecheck.js";
+import { evaluateChecked } from "./harness/eval-typecheck.js";
 import { cpus } from "node:os";
 import { APP_DIR, WORKSPACE, resolveExistingProjectPath, resolveProjectPath, takeProjectReads } from "./project-files.js";
 import { compactReach, projectReach, renderReachRules, renderReadsLcov } from "./harness/reach.js";
@@ -5209,7 +5211,8 @@ async function evalCode(code) {
         filePath = path.join(EVAL_DIR, `${randomUUID()}.ts`);
         await fs.writeFile(filePath, prepared.code);
         const moduleUrl = pathToFileURL(filePath).href;
-        const mod = (await runInstrumented(fetchScope, () => import(moduleUrl)));
+        const mod = await evaluateChecked({ file: filePath, appDir: APP_DIR, typecheckDir: TYPECHECK_DIR, run: shx,
+            projectEntry: loaded ? resolveEntry() : undefined }, (text) => { chunks.push(text); }, () => runInstrumented(fetchScope, () => import(moduleUrl)));
         outcome = { ok: true, result: safeSerialize(mod.default) };
     }
     catch (err) {
@@ -5292,12 +5295,10 @@ async function evalCode(code) {
  *  blocking rules, which always use THIS copy rather than the project's own —
  *  can be driven outside a VM. */
 const TYPECHECK_DIR = process.env.SPECTEST_TYPECHECK_DIR ?? "/opt/spectest/typecheck";
-/** Cap on errors shipped in the report; `totalErrors` carries the true count. */
-const TYPECHECK_ERROR_CAP = 50;
 let TYPECHECK = null;
 /** Fire-and-forget kickoff; the promise is parked for POST /typecheck. */
 function startTypecheck() {
-    TYPECHECK = runTypecheck().catch((err) => ({
+    TYPECHECK = runProjectTypecheck().catch((err) => ({
         status: "failed",
         errors: [],
         totalErrors: 0,
@@ -5307,141 +5308,9 @@ function startTypecheck() {
     // Parked promises must never surface as unhandled rejections.
     TYPECHECK.catch(() => { });
 }
-/** The tsconfig used when the project doesn't ship its own. `lib` is left to
- *  the target default (which includes DOM — browser.evaluate callbacks
- *  reference `document`); `types` pulls Bun's ambient globals from the baked
- *  install via `typeRoots` (the walk-up from APP_DIR never reaches it). */
-function generatedTsconfig() {
-    return JSON.stringify({
-        compilerOptions: {
-            target: "esnext",
-            module: "esnext",
-            moduleResolution: "bundler",
-            strict: true,
-            noEmit: true,
-            skipLibCheck: true,
-            esModuleInterop: true,
-            resolveJsonModule: true,
-            jsx: "react-jsx",
-            types: ["bun"],
-            typeRoots: [
-                path.join(APP_DIR, "node_modules", "@types"),
-                path.join(TYPECHECK_DIR, "node_modules", "@types"),
-            ],
-        },
-        include: ["**/*.ts", "**/*.tsx"],
-        exclude: ["node_modules"],
-    }, null, 2);
-}
-/** Parse `--pretty false` tsc output: `file(line,col): error TScode: msg`,
- *  with indented elaboration lines folded into the preceding error. */
-function parseTscOutput(output) {
-    const errors = [];
-    let total = 0;
-    let suppressed = 0;
-    let last = null;
-    for (const line of output.split("\n")) {
-        const m = /^(.+?)\((\d+),(\d+)\): error (TS\d+): (.*)$/.exec(line);
-        if (!m) {
-            // Elaboration lines are indented; fold them into the last kept error.
-            if (last && /^\s+\S/.test(line))
-                last.message += `\n${line.trimEnd()}`;
-            continue;
-        }
-        const [, rawFile, ln, col, code, message] = m;
-        // Keep only diagnostics in the user's files. tsc runs with cwd=APP_DIR
-        // (the daemon's cwd), so project files come out relative ("tests/x.ts")
-        // and anything outside — the SDK at /opt/spectest/sdk, node_modules —
-        // is `../…` or absolute. Errors in our own SDK are ours to fix, not the
-        // user's to read.
-        const abs = path.resolve(APP_DIR, rawFile);
-        const inApp = abs.startsWith(APP_DIR + path.sep) && !abs.includes(`${path.sep}node_modules${path.sep}`);
-        if (!inApp) {
-            suppressed += 1;
-            last = null;
-            continue;
-        }
-        total += 1;
-        const err = {
-            file: path.relative(APP_DIR, abs),
-            line: Number(ln),
-            column: Number(col),
-            code: code,
-            message: message,
-        };
-        if (errors.length < TYPECHECK_ERROR_CAP) {
-            errors.push(err);
-            last = err;
-        }
-        else {
-            last = null;
-        }
-    }
-    return { errors, total, suppressed };
-}
-async function runTypecheck() {
-    const started = Date.now();
-    // The project's own typescript wins over the baked copy.
-    const tsc = [
-        path.join(APP_DIR, "node_modules", "typescript", "bin", "tsc"),
-        path.join(TYPECHECK_DIR, "node_modules", "typescript", "bin", "tsc"),
-    ].find((p) => existsSync(p));
-    if (!tsc) {
-        return {
-            status: "skipped",
-            errors: [],
-            totalErrors: 0,
-            durationMs: 0,
-            detail: "typescript is not installed (base image predates the baked typechecker)",
-        };
-    }
-    let config = path.join(APP_DIR, "tsconfig.json");
-    if (!existsSync(config)) {
-        config = path.join(APP_DIR, ".spectest-tsconfig.json");
-        await fs.writeFile(config, generatedTsconfig());
-    }
-    const res = await shx(process.execPath, [tsc, "--noEmit", "--pretty", "false", "-p", config], 120_000);
-    const durationMs = Date.now() - started;
-    if (res.code === 124) {
-        return { status: "failed", errors: [], totalErrors: 0, durationMs, detail: "typecheck timed out" };
-    }
-    const { errors, total, suppressed } = parseTscOutput(res.stdout + res.stderr);
-    const wrapper = [...(await runWrapperRulesReport(config)), ...(await rawFsReport())];
-    const strip = ({ file, line, column, code, message }) => ({
-        file,
-        line,
-        column,
-        code,
-        message,
-    });
-    const blocking = wrapper.filter((d) => d.blocking).map(strip);
-    const advisory = wrapper.filter((d) => !d.blocking).map(strip);
-    if (errors.length === 0 && wrapper.length === 0) {
-        // Exit 0 → clean. Non-zero with no *user-file* diagnostics is either
-        // all-suppressed (still ok from the user's perspective) or a compiler
-        // crash (config not found, OOM) — surface the latter.
-        if (res.code !== 0 && suppressed === 0) {
-            const tail = (res.stderr || res.stdout).trim().split("\n").slice(-5).join("\n");
-            return { status: "failed", errors: [], totalErrors: 0, durationMs, detail: tail || `tsc exited ${res.code}` };
-        }
-        if (suppressed > 0) {
-            console.warn(`[typecheck] ${suppressed} diagnostic(s) outside the project suppressed`);
-        }
-        return { status: "ok", errors: [], totalErrors: 0, durationMs };
-    }
-    // The wrapper findings ride the same list the CLI and the dashboard already
-    // render; `blocking` is a second view of the ones that also fail the run, so
-    // nothing has to learn a new shape to show them. Blocking leads, because
-    // `errors` is capped and the entries that stopped the run must never be the
-    // ones the cap drops.
-    const all = [...blocking, ...advisory, ...errors];
-    return {
-        status: "errors",
-        errors: all.slice(0, TYPECHECK_ERROR_CAP),
-        totalErrors: total + wrapper.length,
-        durationMs,
-        ...(blocking.length > 0 ? { blocking } : {}),
-    };
+async function runProjectTypecheck() {
+    return runTypecheck({ appDir: APP_DIR, typecheckDir: TYPECHECK_DIR, run: shx,
+        projectEntry: loaded ? resolveEntry() : undefined, extraDiagnostics: rawFsReport });
 }
 /**
  * The raw-fs rule (`SPECTEST2003`, advisory) over the test tree: a test
@@ -5468,38 +5337,6 @@ async function rawFsReport() {
         return [];
     }
 }
-/**
- * The blocking rules, run against the BAKED compiler whatever the project
- * pins. Best-effort in every direction: an install that predates the API, a
- * config the rules cannot open, or a throw from `typescript/unstable/*` all
- * yield no findings, so a run proceeds exactly as it does today. Only a
- * definite finding can stop one.
- */
-async function runWrapperRulesReport(config) {
-    const typescriptDir = path.join(TYPECHECK_DIR, "node_modules", "typescript");
-    if (!existsSync(path.join(typescriptDir, "dist", "api", "async", "api.js")))
-        return [];
-    try {
-        const run = await runWrapperRules({
-            typescriptDir,
-            configFile: config,
-            appDir: APP_DIR,
-            readFile: (f) => fs.readFile(f, "utf8"),
-            relative: path.relative,
-            join: path.join,
-            dirname: path.dirname,
-        });
-        if (run.status !== "ok") {
-            console.warn(`[typecheck] wrapper rules ${run.status}: ${run.detail ?? "no detail"}`);
-            return [];
-        }
-        return run.diagnostics;
-    }
-    catch (err) {
-        console.warn(`[typecheck] wrapper rules threw: ${err?.message ?? err}`);
-        return [];
-    }
-}
 /** Run `job` under a mutual-exclusion slot, refusing if one is held. */
 async function exclusive(state, slot, busy, job) {
     if (state[slot])

package/dist/harness/eval-typecheck.d.ts

@@ -0,0 +1,9 @@
+import { type TypecheckOptions, type TypecheckReport } from "./typecheck.js";
+interface EvalTypecheckOptions extends Pick<TypecheckOptions, "appDir" | "typecheckDir" | "run"> {
+    file: string;
+    projectEntry?: string;
+}
+export declare function checkEval(opts: EvalTypecheckOptions): Promise<TypecheckReport>;
+/** The same advisory/blocking policy as a managed test, before module import. */
+export declare function evaluateChecked<T>(opts: EvalTypecheckOptions, log: (text: string) => void, evaluate: () => Promise<T>): Promise<T>;
+export {};

package/dist/harness/eval-typecheck.js

@@ -0,0 +1,93 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { generatedTsconfig, projectTypecheckConfig, runTypecheck } from "./typecheck.js";
+/** Describe the globals installed by evalCode, without importing/executing the project. */
+function globals(projectEntry) {
+    return `import type * as SDK from "@specific.dev/spectest";
+${projectEntry ? `import type project from ${JSON.stringify(projectEntry)};` : ""}
+type EvalContext = ${projectEntry
+        ? "typeof project extends SDK.Project<infer S, infer F> ? SDK.TestContext<undefined, S, F> : SDK.TestContext<undefined>"
+        : "SDK.TestContext<undefined>"};
+declare global {
+  var ctx: EvalContext;
+  var expect: typeof SDK.expect;
+  var expectRaw: typeof SDK.expectRaw;
+  var assert: typeof SDK.assert;
+  var state: Record<string, unknown>;
+}
+`;
+}
+export async function checkEval(opts) {
+    const started = Date.now();
+    let scratch;
+    try {
+        scratch = await fs.mkdtemp(path.join(path.dirname(opts.file), "check-"));
+        const declarations = path.join(scratch, "globals.d.ts");
+        await fs.writeFile(declarations, globals(opts.projectEntry));
+        const projectConfig = projectTypecheckConfig(opts);
+        const defaults = JSON.parse(generatedTsconfig(opts.appDir, opts.typecheckDir));
+        const config = {
+            ...(projectConfig ? { extends: projectConfig } : defaults),
+            compilerOptions: {
+                ...(!projectConfig ? defaults.compilerOptions : {}),
+                // Bun runs eval as ESM TypeScript, regardless of the app's build output.
+                noEmit: true,
+                skipLibCheck: true,
+                target: "esnext",
+                module: "esnext",
+                moduleResolution: "bundler",
+                moduleDetection: "force",
+                allowImportingTsExtensions: true,
+                composite: false,
+                incremental: false,
+                rootDir: opts.appDir,
+            },
+            // Project includes/excludes may omit hidden files or include the entire
+            // application. Check this snippet, with imports resolved normally.
+            files: [opts.file, declarations],
+            include: [],
+            exclude: [],
+        };
+        const configFile = path.join(scratch, "tsconfig.json");
+        await fs.writeFile(configFile, JSON.stringify(config));
+        const report = await runTypecheck({ ...opts, configFile, diagnosticFile: opts.file });
+        // Stable, snippet-relative locations; don't expose random temporary paths.
+        const normalize = (d) => ({ ...d, file: "eval.ts" });
+        return {
+            ...report,
+            errors: report.errors.map(normalize),
+            ...(report.blocking ? { blocking: report.blocking.map(normalize) } : {}),
+        };
+    }
+    catch (error) {
+        // Match managed tests: unavailable/broken checkers report their failure,
+        // while only a definite blocking finding prevents execution.
+        return {
+            status: "failed", errors: [], totalErrors: 0, durationMs: Date.now() - started,
+            detail: error instanceof Error ? error.message : String(error),
+        };
+    }
+    finally {
+        if (scratch)
+            await fs.rm(scratch, { recursive: true, force: true });
+    }
+}
+/** The same advisory/blocking policy as a managed test, before module import. */
+export async function evaluateChecked(opts, log, evaluate) {
+    const report = await checkEval(opts);
+    if (report.status === "failed" || report.status === "skipped") {
+        log(`[typecheck] ${report.status}: ${report.detail ?? "unavailable"}\n`);
+    }
+    else if (report.totalErrors > 0) {
+        log(`[typecheck] ${report.totalErrors} diagnostic(s)${report.blocking?.length ? "" : " (advisory)"}\n`);
+        for (const d of report.errors)
+            log(`${d.file}:${d.line}:${d.column}: ${d.code}: ${d.message}\n`);
+        if (report.totalErrors > report.errors.length) {
+            log(`[typecheck] ${report.totalErrors - report.errors.length} more diagnostic(s)\n`);
+        }
+    }
+    if (report.blocking?.length) {
+        throw new Error(`Typecheck: ${report.blocking.length} blocking error(s) in eval — the snippet did not run. Fix the diagnostics above before retrying.`);
+    }
+    return evaluate();
+}

package/dist/harness/typecheck.d.ts

@@ -0,0 +1,53 @@
+import { type WrapperDiagnostic } from "./wrapper-rules.js";
+export interface TypecheckOptions {
+    appDir: string;
+    typecheckDir: string;
+    projectEntry?: string;
+    run: (file: string, args: string[], timeoutMs: number) => Promise<{
+        code: number;
+        stdout: string;
+        stderr: string;
+    }>;
+    configFile?: string;
+    /** Eval reports only the submitted snippet, not unrelated imported project code. */
+    diagnosticFile?: string;
+    extraDiagnostics?: () => Promise<WrapperDiagnostic[]>;
+}
+/** Both entry points honor the same project config before generating defaults. */
+export declare function projectTypecheckConfig(opts: Pick<TypecheckOptions, "appDir" | "projectEntry">): string | undefined;
+export interface TypecheckError {
+    /** Path relative to the project's spectest/ dir (e.g. `tests/checkout.ts`). */
+    file: string;
+    line: number;
+    column: number;
+    /** `TS2345` from the compiler, or a `SPECTEST….` rule code. */
+    code: string;
+    message: string;
+}
+export interface TypecheckReport {
+    status: "ok" | "errors" | "skipped" | "failed";
+    errors: TypecheckError[];
+    totalErrors: number;
+    durationMs: number;
+    /** Why the check was skipped / how it failed. */
+    detail?: string;
+    /**
+     * Findings that FAIL the run, as opposed to `errors`, which only advise.
+     * A diagnostic qualifies only when it is true of the program that runs
+     * rather than of the declared types alone — see `harness/wrapper-rules.ts`
+     * for why no `tsc` code can be in here and why these can.
+     *
+     * The list is the rollout mechanism as well as the payload: an older SDK
+     * never sends the field, `#[serde(default)]` leaves it empty on the server,
+     * and the gate is inert for every project that has not moved to a version
+     * carrying it. The version a project runs is already its own choice
+     * (`sdk.rs` honours the declared lower bound), so the bump is the consent.
+     */
+    blocking?: TypecheckError[];
+}
+/** The tsconfig used when the project doesn't ship its own. `lib` is left to
+ *  the target default (which includes DOM — browser.evaluate callbacks
+ *  reference `document`); `types` pulls Bun's ambient globals from the baked
+ *  install via `typeRoots` (the walk-up from APP_DIR never reaches it). */
+export declare function generatedTsconfig(appDir: string, typecheckDir: string): string;
+export declare function runTypecheck(opts: TypecheckOptions): Promise<TypecheckReport>;

package/dist/harness/typecheck.js

@@ -0,0 +1,184 @@
+import fs from "node:fs/promises";
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { runWrapperRules } from "./wrapper-rules.js";
+/** Both entry points honor the same project config before generating defaults. */
+export function projectTypecheckConfig(opts) {
+    return [
+        path.join(opts.appDir, "tsconfig.json"),
+        ...(opts.projectEntry ? [path.join(path.dirname(opts.projectEntry), "tsconfig.json")] : []),
+    ].find(existsSync);
+}
+/** Cap on errors shipped in the report; `totalErrors` carries the true count. */
+const TYPECHECK_ERROR_CAP = 50;
+/** The tsconfig used when the project doesn't ship its own. `lib` is left to
+ *  the target default (which includes DOM — browser.evaluate callbacks
+ *  reference `document`); `types` pulls Bun's ambient globals from the baked
+ *  install via `typeRoots` (the walk-up from APP_DIR never reaches it). */
+export function generatedTsconfig(appDir, typecheckDir) {
+    return JSON.stringify({
+        compilerOptions: {
+            target: "esnext",
+            module: "esnext",
+            moduleResolution: "bundler",
+            strict: true,
+            noEmit: true,
+            skipLibCheck: true,
+            esModuleInterop: true,
+            resolveJsonModule: true,
+            jsx: "react-jsx",
+            types: ["bun"],
+            typeRoots: [
+                path.join(appDir, "node_modules", "@types"),
+                path.join(typecheckDir, "node_modules", "@types"),
+            ],
+        },
+        include: ["**/*.ts", "**/*.tsx"],
+        exclude: ["node_modules", ".spectest-eval"],
+    }, null, 2);
+}
+/** Parse `--pretty false` tsc output: `file(line,col): error TScode: msg`,
+ *  with indented elaboration lines folded into the preceding error. */
+function parseTscOutput(output, appDir, diagnosticFile) {
+    const errors = [];
+    let total = 0;
+    let suppressed = 0;
+    let last = null;
+    for (const line of output.split("\n")) {
+        const m = /^(.+?)\((\d+),(\d+)\): error (TS\d+): (.*)$/.exec(line);
+        if (!m) {
+            // Elaboration lines are indented; fold them into the last kept error.
+            if (last && /^\s+\S/.test(line))
+                last.message += `\n${line.trimEnd()}`;
+            continue;
+        }
+        const [, rawFile, ln, col, code, message] = m;
+        // Keep only diagnostics in the user's files. tsc runs with cwd=APP_DIR
+        // (the daemon's cwd), so project files come out relative ("tests/x.ts")
+        // and anything outside — the SDK at /opt/spectest/sdk, node_modules —
+        // is `../…` or absolute. Errors in our own SDK are ours to fix, not the
+        // user's to read.
+        const abs = path.resolve(appDir, rawFile);
+        const inApp = abs.startsWith(appDir + path.sep) && !abs.includes(`${path.sep}node_modules${path.sep}`);
+        if (!inApp || (diagnosticFile && abs !== diagnosticFile)) {
+            suppressed += 1;
+            last = null;
+            continue;
+        }
+        total += 1;
+        const err = {
+            file: path.relative(appDir, abs),
+            line: Number(ln),
+            column: Number(col),
+            code: code,
+            message: message,
+        };
+        if (errors.length < TYPECHECK_ERROR_CAP) {
+            errors.push(err);
+            last = err;
+        }
+        else {
+            last = null;
+        }
+    }
+    return { errors, total, suppressed };
+}
+export async function runTypecheck(opts) {
+    const { appDir, typecheckDir, run } = opts;
+    const started = Date.now();
+    // The project's own typescript wins over the baked copy.
+    const tsc = [
+        path.join(appDir, "node_modules", "typescript", "bin", "tsc"),
+        path.join(typecheckDir, "node_modules", "typescript", "bin", "tsc"),
+    ].find((p) => existsSync(p));
+    if (!tsc) {
+        return {
+            status: "skipped",
+            errors: [],
+            totalErrors: 0,
+            durationMs: 0,
+            detail: "typescript is not installed (base image predates the baked typechecker)",
+        };
+    }
+    let config = opts.configFile ?? projectTypecheckConfig(opts);
+    if (!config) {
+        config = path.join(appDir, ".spectest-tsconfig.json");
+        await fs.writeFile(config, generatedTsconfig(appDir, typecheckDir));
+    }
+    const res = await run(process.execPath, [tsc, "--noEmit", "--pretty", "false", "-p", config], 120_000);
+    const durationMs = Date.now() - started;
+    if (res.code === 124) {
+        return { status: "failed", errors: [], totalErrors: 0, durationMs, detail: "typecheck timed out" };
+    }
+    const { errors, total, suppressed } = parseTscOutput(res.stdout + res.stderr, appDir, opts.diagnosticFile);
+    const wrapper = [...(await runWrapperRulesReport(config, opts)), ...(await opts.extraDiagnostics?.() ?? [])];
+    const strip = ({ file, line, column, code, message }) => ({
+        file,
+        line,
+        column,
+        code,
+        message,
+    });
+    const blocking = wrapper.filter((d) => d.blocking).map(strip);
+    const advisory = wrapper.filter((d) => !d.blocking).map(strip);
+    if (errors.length === 0 && wrapper.length === 0) {
+        // Exit 0 → clean. Non-zero with no *user-file* diagnostics is either
+        // all-suppressed (still ok from the user's perspective) or a compiler
+        // crash (config not found, OOM) — surface the latter.
+        if (res.code !== 0 && suppressed === 0) {
+            const tail = (res.stderr || res.stdout).trim().split("\n").slice(-5).join("\n");
+            return { status: "failed", errors: [], totalErrors: 0, durationMs, detail: tail || `tsc exited ${res.code}` };
+        }
+        if (suppressed > 0) {
+            console.warn(`[typecheck] ${suppressed} diagnostic(s) outside the project suppressed`);
+        }
+        return { status: "ok", errors: [], totalErrors: 0, durationMs };
+    }
+    // The wrapper findings ride the same list the CLI and the dashboard already
+    // render; `blocking` is a second view of the ones that also fail the run, so
+    // nothing has to learn a new shape to show them. Blocking leads, because
+    // `errors` is capped and the entries that stopped the run must never be the
+    // ones the cap drops.
+    const all = [...blocking, ...advisory, ...errors];
+    return {
+        status: "errors",
+        errors: all.slice(0, TYPECHECK_ERROR_CAP),
+        totalErrors: total + wrapper.length,
+        durationMs,
+        ...(blocking.length > 0 ? { blocking } : {}),
+    };
+}
+/**
+ * The blocking rules, run against the BAKED compiler whatever the project
+ * pins. Best-effort in every direction: an install that predates the API, a
+ * config the rules cannot open, or a throw from `typescript/unstable/*` all
+ * yield no findings, so a run proceeds exactly as it does today. Only a
+ * definite finding can stop one.
+ */
+async function runWrapperRulesReport(config, opts) {
+    const { appDir, typecheckDir } = opts;
+    const typescriptDir = path.join(typecheckDir, "node_modules", "typescript");
+    if (!existsSync(path.join(typescriptDir, "dist", "api", "async", "api.js")))
+        return [];
+    try {
+        const run = await runWrapperRules({
+            typescriptDir,
+            configFile: config,
+            appDir,
+            diagnosticFile: opts.diagnosticFile,
+            readFile: (f) => fs.readFile(f, "utf8"),
+            relative: path.relative,
+            join: path.join,
+            dirname: path.dirname,
+        });
+        if (run.status !== "ok") {
+            console.warn(`[typecheck] wrapper rules ${run.status}: ${run.detail ?? "no detail"}`);
+            return [];
+        }
+        return run.diagnostics;
+    }
+    catch (err) {
+        console.warn(`[typecheck] wrapper rules threw: ${err?.message ?? err}`);
+        return [];
+    }
+}

package/dist/harness/wrapper-rules.d.ts

@@ -154,6 +154,8 @@ export declare function runWrapperRules(opts: {
     configFile: string;
     /** Only files under here produce diagnostics. */
     appDir: string;
+    /** Restrict eval findings to its submitted module. */
+    diagnosticFile?: string;
     readFile: (p: string) => Promise<string>;
     relative: (from: string, to: string) => string;
     join: (...parts: string[]) => string;

package/dist/harness/wrapper-rules.js

@@ -266,10 +266,6 @@ export function equalityMessage(expr, typeText, negated) {
         `comparison is ${verdict}. Call \`.unwrap()\` first, or assert with ` +
         `\`expect(...)\`, which unwraps for you.`);
 }
-/** `TypeFlags.Object | TypeFlags.Union` — the only shapes a carrier can wear.
- *  Filtering on the flags the batch call already returned keeps the printed
- *  name (one round trip each) off every ordinary `boolean` condition. */
-const OBJECT_OR_UNION = (1 << 19) | (1 << 20);
 const SYNTAX = {
     If: "IfStatement",
     While: "WhileStatement",
@@ -343,6 +339,11 @@ export async function runWrapperRules(opts) {
         const base = opts.join(opts.typescriptDir, "dist");
         const apiMod = (await import(opts.join(base, "api", "async", "api.js")));
         const utils = (await import(opts.join(base, "ast", "utils.js")));
+        // Native TypeScript's flag values differ from the JavaScript compiler's.
+        // Read them from the compiler serving this API; hard-coded TS 5 flags
+        // silently miss wrapped boolean unions in TS 7.
+        const { TypeFlags } = await import(opts.join(base, "enums", "typeFlags.js"));
+        const objectOrUnion = TypeFlags.Object | TypeFlags.Union;
         const visitor = (await import(opts.join(base, "ast", "visitor.js")));
         const inst = new apiMod.API({ cwd: opts.dirname(opts.configFile) });
         api = inst;
@@ -379,7 +380,8 @@ export async function runWrapperRules(opts) {
             }
         };
         const names = await project.program.getSourceFileNames();
-        const files = names.filter((f) => f.startsWith(`${opts.appDir}/`) && !f.includes("/node_modules/") && !f.endsWith(".d.ts"));
+        const files = names.filter((f) => f.startsWith(`${opts.appDir}/`) && !f.includes("/node_modules/") && !f.endsWith(".d.ts") &&
+            (!opts.diagnosticFile || f === opts.diagnosticFile));
         const diagnostics = [];
         for (const file of files) {
             const sf = await project.program.getSourceFile(file);
@@ -395,7 +397,7 @@ export async function runWrapperRules(opts) {
             const printed = new Map();
             for (let i = 0; i < nodes.length; i += 1) {
                 const t = types[i];
-                if (t && (t.flags & OBJECT_OR_UNION) !== 0) {
+                if (t && (t.flags & objectOrUnion) !== 0) {
                     printed.set(i, await project.checker.typeToString(t));
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@specific.dev/spectest",
-  "version": "0.91.2",
+  "version": "0.92.0",
   "description": "Spectest SDK for defining test environments in TypeScript.",
   "type": "module",
   "main": "./dist/index.js",