as-test 1.1.1 → 1.1.3

package/bin/commands/run-core.js

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import { spawn } from "child_process";
 import { glob } from "glob";
 import { Channel, MessageType } from "../wipc.js";
-import { applyMode, formatTime, getExec, loadConfig, tokenizeCommand, } from "../util.js";
+import { applyMode, formatSpecDisplayPath, formatTime, getExec, loadConfig, tokenizeCommand, } from "../util.js";
 import * as path from "path";
 import { pathToFileURL } from "url";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -390,7 +390,7 @@ function resolveSuiteSelectionMatches(suites, selectors, file) {
         if (normalized.includes("/")) {
             const resolved = resolveExplicitSuitePath(suites, normalized);
             if (!resolved) {
-                throw new Error(`No suites matched "${selector}" in ${path.basename(file)}.`);
+                throw new Error(`No suites matched "${selector}" in ${formatSpecDisplayPath(file)}.`);
             }
             matches.push({
                 kind: "path",
@@ -402,7 +402,7 @@ function resolveSuiteSelectionMatches(suites, selectors, file) {
         }
         const resolved = resolveBareSuiteSelector(suites, normalized);
         if (!resolved) {
-            throw new Error(`No suites matched "${selector}" in ${path.basename(file)}.`);
+            throw new Error(`No suites matched "${selector}" in ${formatSpecDisplayPath(file)}.`);
         }
         matches.push({
             kind: "bare",
@@ -437,7 +437,9 @@ function resolveBareSuiteSelector(suites, selector) {
         return null;
     const matches = [];
     walkSuites(suites, (suite, depth) => {
-        const leaf = String(suite.path ?? "").split("/").pop() ?? "";
+        const leaf = String(suite.path ?? "")
+            .split("/")
+            .pop() ?? "";
         if (leaf == slug) {
             matches.push({ path: String(suite.path), depth });
         }
@@ -457,7 +459,9 @@ function walkSuites(suites, visitor, depth = 0) {
     for (const suite of suites) {
         if (visitor(suite, depth))
             return true;
-        const childSuites = Array.isArray(suite?.suites) ? suite.suites : [];
+        const childSuites = Array.isArray(suite?.suites)
+            ? suite.suites
+            : [];
         if (walkSuites(childSuites, visitor, depth + 1))
             return true;
     }
@@ -466,7 +470,9 @@ function walkSuites(suites, visitor, depth = 0) {
 function cloneSelectedSuites(suites, selected, file, modeName) {
     const out = [];
     for (const suite of suites) {
-        const childSuites = Array.isArray(suite.suites) ? suite.suites : [];
+        const childSuites = Array.isArray(suite.suites)
+            ? suite.suites
+            : [];
         const selectedChildren = cloneSelectedSuites(childSuites, selected, file, modeName);
         const keep = selected.has(String(suite.path ?? "")) || selectedChildren.length > 0;
         if (!keep)
@@ -506,8 +512,8 @@ function collectReadableFailures(suites, file, pathParts) {
             out.push({
                 title: `${nextPath.join(" > ")}#${i + 1}`,
                 where: String(test.location ?? "").length
-                    ? `${path.basename(file)}:${String(test.location ?? "")}`
-                    : path.basename(file),
+                    ? `${formatSpecDisplayPath(file)}:${String(test.location ?? "")}`
+                    : formatSpecDisplayPath(file),
                 message: String(test.message ?? ""),
                 left: JSON.stringify(test.left ?? ""),
                 right: JSON.stringify(test.right ?? ""),
@@ -648,7 +654,7 @@ export async function run(flags = {}, configPath = DEFAULT_CONFIG_PATH, selector
             catch (error) {
                 const modeLabel = options.modeName ?? "default";
                 const details = error instanceof Error ? error.message : String(error);
-                throw new Error(`Failed to run ${path.basename(file)} in mode ${modeLabel} with ${details}`);
+                throw new Error(`Failed to run ${formatSpecDisplayPath(file)} in mode ${modeLabel} with ${details}`);
             }
             const normalized = normalizeReport(report);
             const selectedSuites = options.suiteSelectors?.length
@@ -665,6 +671,7 @@ export async function run(flags = {}, configPath = DEFAULT_CONFIG_PATH, selector
                 suites: selectedSuites,
                 coverage: normalized.coverage,
                 runCommand: runCommandForLog,
+                buildCommand: options.buildCommandsByFile?.[file] ?? options.buildCommand ?? "",
                 snapshotSummary: {
                     matched: snapshotStore.matched,
                     created: snapshotStore.created,
@@ -712,6 +719,8 @@ export async function run(flags = {}, configPath = DEFAULT_CONFIG_PATH, selector
             clean: cleanOutput,
             snapshotEnabled,
             showCoverage,
+            showCoverageAll: Boolean(flags.showCoverageAll),
+            verbose: Boolean(flags.verbose),
             buildTime,
             snapshotSummary,
             coverageSummary,
@@ -1197,6 +1206,10 @@ function normalizeCoverage(value) {
             column: Number(p.column ?? 0),
             type: String(p.type ?? ""),
             executed: Boolean(p.executed),
+            parentHash: String(p.parentHash ?? ""),
+            scopeKind: String(p.scopeKind ?? ""),
+            scopeName: String(p.scopeName ?? ""),
+            depth: Number(p.depth ?? 0),
         };
     })
         .filter((point) => point.file.length > 0);
@@ -1468,10 +1481,14 @@ function matchesCoverageTextPattern(value, pattern) {
     return globPatternToRegExp(normalized).test(value);
 }
 function compareCoveragePoints(a, b) {
+    const depthA = a.depth ?? 0;
+    const depthB = b.depth ?? 0;
     if (a.line !== b.line)
         return a.line - b.line;
     if (a.column !== b.column)
         return a.column - b.column;
+    if (depthA !== depthB)
+        return depthA - depthB;
     if (a.type !== b.type)
         return a.type.localeCompare(b.type);
     return a.hash.localeCompare(b.hash);
@@ -1492,7 +1509,7 @@ async function runProcess(invocation, specFile, crashDir, modeName, snapshots, s
     const runtimeEvents = {
         sawFileStart: false,
         sawFileEnd: false,
-        fileName: path.basename(specFile),
+        fileName: formatSpecDisplayPath(specFile),
         fileVerdict: "none",
         fileTime: "",
         suiteStarts: 0,
@@ -1667,7 +1684,8 @@ async function runProcess(invocation, specFile, crashDir, modeName, snapshots, s
     const code = await new Promise((resolve) => {
         child.on("close", (exitCode) => resolve(exitCode ?? 1));
     });
-    if (stderrPendingLine.length && !shouldSuppressWasiWarningLine(stderrPendingLine)) {
+    if (stderrPendingLine.length &&
+        !shouldSuppressWasiWarningLine(stderrPendingLine)) {
         stderrBuffer += stderrPendingLine;
     }
     const processSpawnError = spawnError;
@@ -1686,8 +1704,7 @@ async function runProcess(invocation, specFile, crashDir, modeName, snapshots, s
     if (reportStream.sawChunkStart) {
         if (!reportStream.sawChunkEnd) {
             parseError =
-                parseError ??
-                    "missing report:end marker for chunked report payload";
+                parseError ?? "missing report:end marker for chunked report payload";
         }
         else {
             const chunkedPayload = reportStream.chunks.join("");
@@ -1806,7 +1823,7 @@ async function runWebSessionProcess(session, specFile, crashDir, modeName, snaps
     const runtimeEvents = {
         sawFileStart: false,
         sawFileEnd: false,
-        fileName: path.basename(specFile),
+        fileName: formatSpecDisplayPath(specFile),
         fileVerdict: "none",
         fileTime: "",
         suiteStarts: 0,
@@ -1968,7 +1985,7 @@ async function runWebSessionProcess(session, specFile, crashDir, modeName, snaps
     });
     let code = 0;
     try {
-        await session.runJob(Object.fromEntries(Object.entries(env).filter((entry) => typeof entry[1] == "string")), path.basename(specFile), (frame) => {
+        await session.runJob(Object.fromEntries(Object.entries(env).filter((entry) => typeof entry[1] == "string")), formatSpecDisplayPath(specFile), (frame) => {
             input.write(frame);
         });
     }
@@ -1976,8 +1993,9 @@ async function runWebSessionProcess(session, specFile, crashDir, modeName, snaps
         code = 1;
         await session.close(error instanceof Error ? error : new Error(String(error)));
         stderrBuffer +=
-            (error instanceof Error ? error.stack ?? error.message : String(error)) +
-                "\n";
+            (error instanceof Error
+                ? (error.stack ?? error.message)
+                : String(error)) + "\n";
     }
     finally {
         input.end();
@@ -1986,8 +2004,7 @@ async function runWebSessionProcess(session, specFile, crashDir, modeName, snaps
     if (reportStream.sawChunkStart) {
         if (!reportStream.sawChunkEnd) {
             parseError =
-                parseError ??
-                    "missing report:end marker for chunked report payload";
+                parseError ?? "missing report:end marker for chunked report payload";
         }
         else {
             const chunkedPayload = reportStream.chunks.join("");
@@ -2091,7 +2108,7 @@ function synthesizeReportFromRuntimeEvents(specFile, runtimeEvents) {
         suites: [
             {
                 file: specFile,
-                description: runtimeEvents.fileName || path.basename(specFile),
+                description: runtimeEvents.fileName || formatSpecDisplayPath(specFile),
                 depth: 0,
                 kind: "file",
                 verdict,
@@ -2136,7 +2153,7 @@ function appendRuntimeFailureReport(report, specFile, modeName, title, details,
     const suites = Array.isArray(report?.suites) ? report.suites : [];
     suites.push({
         file: specFile,
-        description: path.basename(specFile),
+        description: formatSpecDisplayPath(specFile),
         depth: 0,
         kind: "runtime-error",
         verdict: "fail",
@@ -2221,9 +2238,11 @@ function readFileReport(stats, fileReport) {
             : [];
     const file = String(fileReportAny.file ?? "");
     const modeName = String(fileReportAny.modeName ?? "");
+    const runCommand = String(fileReportAny.runCommand ?? "");
+    const buildCommand = String(fileReportAny.buildCommand ?? "");
     let fileVerdict = "none";
     for (const suite of suites) {
-        fileVerdict = mergeVerdict(fileVerdict, readSuite(stats, suite, file, modeName));
+        fileVerdict = mergeVerdict(fileVerdict, readSuite(stats, suite, file, modeName, runCommand, buildCommand));
     }
     if (fileVerdict == "fail") {
         stats.failedFiles++;
@@ -2235,7 +2254,7 @@ function readFileReport(stats, fileReport) {
         stats.skippedFiles++;
     }
 }
-function readSuite(stats, suite, file, modeName) {
+function readSuite(stats, suite, file, modeName, runCommand, buildCommand) {
     const suiteAny = suite;
     const kind = String(suiteAny.kind ?? "");
     let verdict = normalizeVerdict(suiteAny.verdict);
@@ -2247,7 +2266,7 @@ function readSuite(stats, suite, file, modeName) {
         ? suiteAny.suites
         : [];
     for (const subSuite of subSuites) {
-        verdict = mergeVerdict(verdict, readSuite(stats, subSuite, file, modeName));
+        verdict = mergeVerdict(verdict, readSuite(stats, subSuite, file, modeName, runCommand, buildCommand));
     }
     const tests = Array.isArray(suiteAny.tests)
         ? suiteAny.tests
@@ -2285,6 +2304,8 @@ function readSuite(stats, suite, file, modeName) {
             ...suiteAny,
             file,
             modeName,
+            runCommand,
+            buildCommand,
         });
     }
     else if (verdict == "ok") {

package/bin/commands/run.js

@@ -4,12 +4,14 @@ export async function executeRunCommand(rawArgs, flags, configPath, selectedMode
     const suiteSelectors = deps.resolveSuiteSelectors(rawArgs, "run");
     const listFlags = deps.resolveListFlags(rawArgs, "run");
     const featureToggles = deps.resolveFeatureToggles(rawArgs, "run");
+    const showCoverageMode = deps.resolveShowCoverageMode(rawArgs, "run");
     const runFlags = {
         snapshot: !flags.includes("--no-snapshot"),
         createSnapshots: flags.includes("--create-snapshots"),
         overwriteSnapshots: flags.includes("--overwrite-snapshots"),
         clean: flags.includes("--clean"),
-        showCoverage: flags.includes("--show-coverage"),
+        showCoverage: showCoverageMode != undefined,
+        showCoverageAll: showCoverageMode == "all",
         verbose: flags.includes("--verbose"),
         ...deps.resolveParallelJobs(rawArgs, "run"),
         coverage: featureToggles.coverage,

package/bin/commands/test.js

@@ -8,12 +8,14 @@ export async function executeTestCommand(rawArgs, flags, configPath, selectedMod
         tryAs: featureToggles.tryAs,
         coverage: featureToggles.coverage,
     };
+    const showCoverageMode = deps.resolveShowCoverageMode(rawArgs, "test");
     const runFlags = {
         snapshot: !flags.includes("--no-snapshot"),
         createSnapshots: flags.includes("--create-snapshots"),
         overwriteSnapshots: flags.includes("--overwrite-snapshots"),
         clean: flags.includes("--clean"),
-        showCoverage: flags.includes("--show-coverage"),
+        showCoverage: showCoverageMode != undefined,
+        showCoverageAll: showCoverageMode == "all",
         verbose: flags.includes("--verbose"),
         ...deps.resolveParallelJobs(rawArgs, "test"),
         coverage: featureToggles.coverage,

package/bin/commands/web-runner-source.js

@@ -1,21 +1,21 @@
 export function buildWebRunnerSource() {
     return `// Feel free to edit this file!
-  // Runner files use the name <mode>.<type>.js, where <type> is bindings, wasi, or web.
-  // To create a runner for another mode, copy this file to <new-mode>.<type>.js.
+// Runner files use the name <mode>.<type>.js, where <type> is bindings, wasi, or web.
+// To create a runner for another mode, copy this file to <new-mode>.<type>.js.
 
-  import { instantiate } from "as-test/lib";
+import { instantiate } from "as-test/lib";
 
-  let exports = null;
-  const imports = {};
+let exports = null;
+const imports = {};
 
-  instantiate(imports)
-    .then((instance) => {
-      exports = instance.exports;
-      instance.exports.start?.();
-      // Add extra startup logic here when needed.
-    })
-    .catch((error) => {
-      throw new Error("Failed to run web module: " + String(error));
-    });
+instantiate(imports)
+  .then((instance) => {
+    exports = instance.exports;
+    instance.exports.start?.();
+    // Add extra startup logic here when needed.
+  })
+  .catch((error) => {
+    throw new Error("Failed to run web module: " + String(error));
+  });
 `;
 }

package/bin/commands/web-session.js

@@ -488,7 +488,12 @@ function resolveHeadlessFlags(commandValue) {
     const lower = commandValue.toLowerCase();
     if (lower.includes("firefox"))
         return ["-headless"];
-    return ["--headless=new", "--disable-gpu", "--no-first-run", "--no-default-browser-check"];
+    return [
+        "--headless=new",
+        "--disable-gpu",
+        "--no-first-run",
+        "--no-default-browser-check",
+    ];
 }
 function hasExecutable(command) {
     if (!command.length)

package/bin/coverage-points.js

@@ -13,7 +13,61 @@ export function describeCoveragePoint(file, line, column, fallbackType) {
             highlightEnd: 0,
         };
     }
-    const declaration = detectCoverageDeclaration(context.visible);
+    const parameter = detectCoverageParameter(context.visible, context.focus, fallbackType);
+    if (parameter) {
+        return {
+            displayType: parameter.type,
+            subjectName: parameter.name,
+            visible: context.visible,
+            focus: context.focus,
+            highlightStart: parameter.start,
+            highlightEnd: parameter.end,
+        };
+    }
+    const ternary = detectCoverageTernary(context.visible, context.focus, fallbackType);
+    if (ternary) {
+        return {
+            displayType: ternary.type,
+            subjectName: null,
+            visible: context.visible,
+            focus: context.focus,
+            highlightStart: ternary.start,
+            highlightEnd: ternary.end,
+        };
+    }
+    const ifBranch = detectCoverageIfBranch(context.visible, fallbackType);
+    if (ifBranch) {
+        return {
+            displayType: ifBranch.type,
+            subjectName: null,
+            visible: context.visible,
+            focus: context.focus,
+            highlightStart: ifBranch.start,
+            highlightEnd: ifBranch.end,
+        };
+    }
+    const assignment = detectCoverageAssignment(context.visible, fallbackType);
+    if (assignment) {
+        return {
+            displayType: assignment.type,
+            subjectName: null,
+            visible: context.visible,
+            focus: context.focus,
+            highlightStart: assignment.start,
+            highlightEnd: assignment.end,
+        };
+    }
+    const declarationAllowed = fallbackType == "Expression" ||
+        fallbackType == "Block" ||
+        fallbackType == "Function" ||
+        fallbackType == "Method" ||
+        fallbackType == "Constructor" ||
+        fallbackType == "Variable" ||
+        fallbackType == "Property" ||
+        fallbackType == "Call";
+    const declaration = declarationAllowed
+        ? detectCoverageDeclaration(context.visible)
+        : null;
     if (declaration) {
         const [highlightStart, highlightEnd] = resolveCoverageHighlightSpan(context.visible, context.focus);
         return {
@@ -25,7 +79,10 @@ export function describeCoveragePoint(file, line, column, fallbackType) {
             highlightEnd,
         };
     }
-    const call = detectCoverageCall(context.visible, context.focus);
+    const callAllowed = fallbackType == "Expression" || fallbackType == "Call";
+    const call = callAllowed
+        ? detectCoverageCall(context.visible, context.focus)
+        : null;
     if (call) {
         return {
             displayType: "Call",
@@ -130,6 +187,147 @@ function detectCoverageDeclaration(visible) {
     }
     return null;
 }
+function detectCoverageParameter(visible, focus, fallbackType) {
+    const inlineParameter = detectCoverageInlineParameter(visible, focus, fallbackType);
+    if (inlineParameter) {
+        return inlineParameter;
+    }
+    const openParen = visible.indexOf("(");
+    const closeParen = visible.lastIndexOf(")");
+    if (openParen == -1 || closeParen == -1 || closeParen <= openParen) {
+        return null;
+    }
+    if (focus <= openParen || focus >= closeParen) {
+        return null;
+    }
+    const params = visible.slice(openParen + 1, closeParen);
+    const matches = [
+        ...params.matchAll(/([A-Za-z_]\w*)\s*:\s*[^,)=]+(?:=\s*[^,)]*)?/g),
+    ];
+    if (!matches.length)
+        return null;
+    for (const match of matches) {
+        const localStart = match.index ?? -1;
+        if (localStart == -1)
+            continue;
+        const localEnd = localStart + match[0].length;
+        const absoluteStart = openParen + 1 + localStart;
+        const absoluteEnd = openParen + 1 + localEnd;
+        if (focus < absoluteStart || focus > absoluteEnd)
+            continue;
+        const name = match[1] ?? null;
+        if (!name)
+            return null;
+        const nameOffset = match[0].indexOf(name);
+        const equalsOffset = match[0].indexOf("=");
+        if (fallbackType == "DefaultValue" && equalsOffset != -1) {
+            const valueStart = absoluteStart + equalsOffset + 1;
+            const valueVisibleStart = skipCoverageWhitespace(visible, valueStart);
+            const [start, end] = resolveCoverageHighlightSpan(visible, Math.max(valueVisibleStart, focus));
+            return {
+                type: "DefaultValue",
+                name,
+                start,
+                end,
+            };
+        }
+        return {
+            type: fallbackType == "Parameter" ? "Parameter" : "Property",
+            name,
+            start: absoluteStart + nameOffset,
+            end: absoluteStart + nameOffset + name.length,
+        };
+    }
+    return null;
+}
+function detectCoverageInlineParameter(visible, focus, fallbackType) {
+    const match = visible.match(/^([A-Za-z_]\w*)\s*:\s*[^=,]+(?:=\s*[^,]+)?[,]?$/);
+    if (!match)
+        return null;
+    const name = match[1] ?? null;
+    if (!name)
+        return null;
+    const nameStart = visible.indexOf(name);
+    const nameEnd = nameStart + name.length;
+    const equalsIndex = visible.indexOf("=");
+    if (fallbackType == "DefaultValue" && equalsIndex != -1) {
+        const valueStart = skipCoverageWhitespace(visible, equalsIndex + 1);
+        const [start, end] = resolveCoverageHighlightSpan(visible, Math.max(valueStart, focus));
+        return {
+            type: "DefaultValue",
+            name,
+            start,
+            end,
+        };
+    }
+    return {
+        type: fallbackType == "Parameter" ? "Parameter" : "Property",
+        name,
+        start: nameStart,
+        end: nameEnd,
+    };
+}
+function detectCoverageTernary(visible, focus, fallbackType) {
+    if (fallbackType != "Ternary" && fallbackType != "LogicalBranch") {
+        return null;
+    }
+    const q = visible.indexOf("?");
+    if (q == -1)
+        return null;
+    if (fallbackType == "LogicalBranch") {
+        const [start, end] = resolveCoverageHighlightSpan(visible, focus);
+        return { type: "LogicalBranch", start, end };
+    }
+    const colon = visible.indexOf(":", q + 1);
+    if (colon == -1) {
+        const [start, end] = resolveCoverageHighlightSpan(visible, focus);
+        return { type: "Ternary", start, end };
+    }
+    const branchStart = focus <= colon ? q + 1 : colon + 1;
+    const normalizedStart = skipCoverageWhitespace(visible, branchStart);
+    const [start, end] = resolveCoverageHighlightSpan(visible, Math.max(normalizedStart, focus));
+    return { type: "Ternary", start, end };
+}
+function detectCoverageIfBranch(visible, fallbackType) {
+    if (fallbackType != "IfBranch")
+        return null;
+    const match = visible.match(/^if\s*\(([^)]*)\)/);
+    if (!match)
+        return null;
+    const full = match[0];
+    const condition = match[1] ?? "";
+    const openParen = full.indexOf("(");
+    const conditionPadding = condition.length
+        ? condition.length - condition.trimStart().length
+        : 0;
+    const conditionStart = openParen == -1 ? -1 : openParen + 1 + conditionPadding;
+    if (conditionStart == -1 || !condition.length) {
+        return { type: "IfBranch", start: 0, end: full.length };
+    }
+    return {
+        type: "IfBranch",
+        start: conditionStart,
+        end: conditionStart + condition.length,
+    };
+}
+function detectCoverageAssignment(visible, fallbackType) {
+    if (fallbackType != "Assignment")
+        return null;
+    const match = visible.match(/([A-Za-z_]\w*(?:\.[A-Za-z_]\w*|\[[^\]]+\])?)\s*(=|\+=|-=|\*=|\*\*=|\/=|%=|<<=|>>=|>>>=|&=|\|=|\^=)/);
+    if (!match)
+        return null;
+    const full = match[0];
+    const lhs = match[1] ?? "";
+    const operator = match[2] ?? "=";
+    const fullStart = visible.indexOf(full);
+    const lhsStart = fullStart + full.indexOf(lhs);
+    const operatorStart = fullStart + full.lastIndexOf(operator);
+    return {
+        type: "Assignment",
+        start: lhsStart,
+        end: operatorStart + operator.length,
+    };
+}
 function detectCoverageCall(visible, focus) {
     const matches = [...visible.matchAll(/\b([A-Za-z_]\w*)(?:<[^>()]+>)?\s*\(/g)];
     if (!matches.length)
@@ -171,3 +369,10 @@ function detectCoverageCall(visible, focus) {
 function isCoverageBoundary(ch) {
     return /[\s()[\]{}.,;:+\-*/%&|^!?=<>]/.test(ch);
 }
+function skipCoverageWhitespace(visible, index) {
+    let current = Math.max(0, Math.min(visible.length - 1, index));
+    while (current < visible.length - 1 && /\s/.test(visible.charAt(current))) {
+        current++;
+    }
+    return current;
+}

package/bin/crash-store.js

@@ -1,7 +1,9 @@
 import { mkdirSync, writeFileSync } from "fs";
 import * as path from "path";
 export function persistCrashRecord(rootDir, record) {
-    const entry = record.entryKey?.length ? record.entryKey : crashEntryKey(record.file);
+    const entry = record.entryKey?.length
+        ? record.entryKey
+        : crashEntryKey(record.file);
     const dir = path.resolve(process.cwd(), rootDir);
     mkdirSync(dir, { recursive: true });
     const jsonPath = path.join(dir, `${entry}.json`);