as-test 1.1.10 → 1.3.0

package/bin/commands/run-core.js

@@ -8,6 +8,8 @@ import {
   formatTime,
   getExec,
   loadConfig,
+  resolveArtifactPath,
+  resolveSpecRelativePath,
   tokenizeCommand,
 } from "../util.js";
 import * as path from "path";
@@ -23,7 +25,7 @@ import { persistCrashRecord } from "../crash-store.js";
 import { describeCoveragePoint } from "../coverage-points.js";
 const DEFAULT_CONFIG_PATH = path.join(process.cwd(), "./as-test.config.json");
 class SnapshotStore {
-  constructor(specFile, snapshotDir, duplicateSpecBasenames = new Set()) {
+  constructor(specFile, snapshotDir, inputPatterns) {
     this.dirty = false;
     this.created = 0;
     this.updated = 0;
@@ -32,27 +34,19 @@ class SnapshotStore {
     this.warnedMissing = new Set();
     this.specBasename = path.basename(specFile);
     const dir = path.join(process.cwd(), snapshotDir);
-    const relative = resolveArtifactRelativePath(specFile, "__tests__").replace(
-      /\.ts$/,
+    const relative = resolveSpecRelativePath(specFile, inputPatterns).replace(
+      /\.ts$/i,
       ".snap",
     );
     this.filePath = path.join(dir, relative);
-    const sourcePath =
-      resolveSnapshotSourcePath(
-        specFile,
-        dir,
-        duplicateSpecBasenames,
-        this.filePath,
-      ) ?? null;
+    const sourcePath = existsSync(this.filePath) ? this.filePath : null;
     const loaded = sourcePath
       ? readSnapshotFile(sourcePath, specFile)
       : { data: {}, normalized: false, preamble: "" };
     this.data = loaded.data;
     this.preamble = loaded.preamble;
-    this.existed = Boolean(sourcePath && existsSync(sourcePath));
-    this.dirty = Boolean(
-      (sourcePath && sourcePath != this.filePath) || loaded.normalized,
-    );
+    this.existed = Boolean(sourcePath);
+    this.dirty = Boolean(loaded.normalized);
   }
   assert(key, actual, allowSnapshot, createSnapshots, overwriteSnapshots) {
     key = canonicalizeSnapshotKey(key);
@@ -103,26 +97,6 @@ class SnapshotStore {
     );
   }
 }
-function resolveSnapshotSourcePath(
-  specFile,
-  snapshotDir,
-  duplicateSpecBasenames,
-  preferredPath,
-) {
-  if (existsSync(preferredPath)) return preferredPath;
-  const base = path.basename(specFile, ".ts");
-  const legacyFlat = path.join(snapshotDir, `${base}.snap.json`);
-  if (existsSync(legacyFlat)) return legacyFlat;
-  const disambiguator = resolveDisambiguator(specFile, duplicateSpecBasenames);
-  if (disambiguator.length) {
-    const legacyDisambiguated = path.join(
-      snapshotDir,
-      `${base}.${disambiguator}.snap.json`,
-    );
-    if (existsSync(legacyDisambiguated)) return legacyDisambiguated;
-  }
-  return null;
-}
 function readSnapshotFile(filePath, specFile) {
   const raw = readFileSync(filePath, "utf8");
   if (filePath.endsWith(".json")) {
@@ -267,17 +241,11 @@ function trimSnapshotPreamble(lines) {
   while (end > 0 && !(lines[end - 1] ?? "").trim().length) end--;
   return lines.slice(0, end).join("\n");
 }
+// Only the basename of the returned path matters — callers feed this into
+// `path.basename(...)` to localize snapshot keys (strip the "${basename}::"
+// prefix). The full path is therefore synthetic but stable.
 function resolveSnapshotSpecFile(filePath) {
-  const normalized = filePath.replace(/\\/g, "/");
-  const marker = "/snapshots/";
-  const markerIndex = normalized.lastIndexOf(marker);
-  const suffix =
-    markerIndex >= 0
-      ? normalized.slice(markerIndex + marker.length)
-      : path.basename(normalized);
-  const withoutMode = suffix.replace(/^default\//, "");
-  const relative = withoutMode.replace(/\.snap$/, ".ts");
-  return `assembly/__tests__/${relative}`;
+  return path.basename(filePath).replace(/\.snap$/, ".ts");
 }
 function localizeSnapshotKey(specFile, key) {
   const prefix = `${path.basename(specFile)}::`;
@@ -315,24 +283,18 @@ function canonicalizeSnapshotLocalKey(localKey) {
   }
   return localKey;
 }
-function resolveArtifactRelativePath(sourceFile, segment) {
-  const normalized = sourceFile.replace(/\\/g, "/");
-  const marker = `/${segment}/`;
-  const index = normalized.lastIndexOf(marker);
-  if (index >= 0) return normalized.slice(index + marker.length);
-  return path.basename(normalized);
-}
 function writeReadableLog(
   logRoot,
   file,
+  inputPatterns,
   suites,
   modeName,
   buildCommand,
   runCommand,
   snapshotSummary,
 ) {
-  const relative = resolveArtifactRelativePath(file, "__tests__").replace(
-    /\.ts$/,
+  const relative = resolveSpecRelativePath(file, inputPatterns).replace(
+    /\.ts$/i,
     ".log",
   );
   const filePath = path.join(logRoot, relative);
@@ -605,9 +567,6 @@ export async function run(
   const inputFiles = (await glob(inputPatterns)).sort((a, b) =>
     a.localeCompare(b),
   );
-  const duplicateSpecBasenames = await resolveDuplicateSpecBasenames(
-    config.input,
-  );
   const snapshotEnabled = flags.snapshot !== false;
   const createSnapshots = Boolean(flags.createSnapshots);
   const overwriteSnapshots = Boolean(flags.overwriteSnapshots);
@@ -685,12 +644,7 @@ export async function run(
       const file = inputFiles[i];
       const outFile = path.join(
         config.outDir,
-        resolveArtifactFileName(
-          file,
-          config.buildOptions.target,
-          options.modeName,
-          duplicateSpecBasenames,
-        ),
+        resolveArtifactPath(file, config.input),
       );
       if (!existsSync(outFile)) {
         const buildStartedAt = Date.now();
@@ -725,7 +679,7 @@ export async function run(
       const snapshotStore = new SnapshotStore(
         file,
         config.snapshotDir,
-        duplicateSpecBasenames,
+        config.input,
       );
       let report;
       try {
@@ -739,11 +693,16 @@ export async function run(
               ? { BROWSER: config.runOptions.runtime.browser.trim() }
               : {}),
         };
+        const crashEntryKey = resolveSpecRelativePath(
+          file,
+          config.input,
+        ).replace(/\.ts$/i, "");
         report = webSession
           ? await runWebSessionProcess(
               webSession,
               file,
               config.fuzz.crashDir,
+              crashEntryKey,
               options.modeName,
               snapshotStore,
               snapshotEnabled,
@@ -757,6 +716,7 @@ export async function run(
               invocation,
               file,
               config.fuzz.crashDir,
+              crashEntryKey,
               options.modeName,
               snapshotStore,
               snapshotEnabled,
@@ -815,6 +775,7 @@ export async function run(
       writeReadableLog(
         logRoot,
         report.file,
+        config.input,
         report.suites,
         options.modeName,
         options.buildCommandsByFile?.[report.file] ??
@@ -842,16 +803,12 @@ export async function run(
     coverageSummary.files.length > 0
   ) {
     const resolvedCoverageDir = path.join(process.cwd(), coverageDir);
-    if (!existsSync(resolvedCoverageDir)) {
-      mkdirSync(resolvedCoverageDir, { recursive: true });
-    }
-    writeFileSync(
-      path.join(
-        resolvedCoverageDir,
-        options.coverageFileName ?? "coverage.log.json",
-      ),
-      JSON.stringify(coverageSummary, null, 2),
+    const coverageFilePath = path.join(
+      resolvedCoverageDir,
+      options.coverageFileName ?? "coverage.log.json",
     );
+    mkdirSync(path.dirname(coverageFilePath), { recursive: true });
+    writeFileSync(coverageFilePath, JSON.stringify(coverageSummary, null, 2));
   }
   if (options.emitRunComplete !== false) {
     const totalModes = Math.max(options.modeSummaryTotal ?? 1, 1);
@@ -1091,53 +1048,6 @@ instantiate(imports)
   }
   return null;
 }
-function resolveArtifactFileName(
-  file,
-  target,
-  modeName,
-  duplicateSpecBasenames = new Set(),
-) {
-  const base = path
-    .basename(file)
-    .replace(/\.spec\.ts$/, "")
-    .replace(/\.ts$/, "");
-  const legacy = !modeName
-    ? `${path.basename(file).replace(".ts", ".wasm")}`
-    : `${base}.${modeName}.${target}.wasm`;
-  if (!duplicateSpecBasenames.has(path.basename(file))) {
-    return legacy;
-  }
-  const disambiguator = resolveDisambiguator(file, duplicateSpecBasenames);
-  if (!disambiguator.length) {
-    return legacy;
-  }
-  const ext = path.extname(legacy);
-  const stem = ext.length ? legacy.slice(0, -ext.length) : legacy;
-  return `${stem}.${disambiguator}${ext}`;
-}
-async function resolveDuplicateSpecBasenames(configured) {
-  const patterns = Array.isArray(configured) ? configured : [configured];
-  const files = await glob(patterns);
-  const counts = new Map();
-  for (const file of files) {
-    const base = path.basename(file);
-    counts.set(base, (counts.get(base) ?? 0) + 1);
-  }
-  const duplicates = new Set();
-  for (const [base, count] of counts) {
-    if (count > 1) duplicates.add(base);
-  }
-  return duplicates;
-}
-function resolveDisambiguator(file, duplicateSpecBasenames) {
-  if (!duplicateSpecBasenames.has(path.basename(file))) return "";
-  const relDir = path.dirname(path.relative(process.cwd(), file));
-  if (!relDir.length || relDir == ".") return "";
-  return relDir
-    .replace(/[\\/]+/g, "__")
-    .replace(/[^A-Za-z0-9._-]/g, "_")
-    .replace(/^_+|_+$/g, "");
-}
 function resolveRuntimeTargetEnv(target, wasmPath) {
   if (target == "bindings") {
     return resolveBindingsRuntimeEnv(wasmPath);
@@ -1757,6 +1667,7 @@ async function runProcess(
   invocation,
   specFile,
   crashDir,
+  crashEntryKey,
   modeName,
   snapshots,
   snapshotEnabled,
@@ -1975,6 +1886,7 @@ async function runProcess(
     persistCrashRecord(crashDir, {
       kind: "test",
       file: specFile,
+      entryKey: crashEntryKey,
       mode: modeName ?? "default",
       error: errorText,
       stdout: stdoutBuffer,
@@ -2031,6 +1943,7 @@ async function runProcess(
     persistCrashRecord(crashDir, {
       kind: "test",
       file: specFile,
+      entryKey: crashEntryKey,
       mode: modeName ?? "default",
       error: fullError,
       stdout: stdoutBuffer,
@@ -2075,6 +1988,7 @@ async function runProcess(
         persistCrashRecord(crashDir, {
           kind: "test",
           file: specFile,
+          entryKey: crashEntryKey,
           mode: modeName ?? "default",
           error: errorText || "runtime reported an unknown error",
           stdout: stdoutBuffer,
@@ -2105,6 +2019,7 @@ async function runProcess(
     persistCrashRecord(crashDir, {
       kind: "test",
       file: specFile,
+      entryKey: crashEntryKey,
       mode: modeName ?? "default",
       error: fullError,
       stdout: stdoutBuffer,
@@ -2132,6 +2047,7 @@ async function runProcess(
     persistCrashRecord(crashDir, {
       kind: "test",
       file: specFile,
+      entryKey: crashEntryKey,
       mode: modeName ?? "default",
       error: errorText || "runtime reported an unknown error",
       stdout: stdoutBuffer,
@@ -2155,6 +2071,7 @@ async function runWebSessionProcess(
   session,
   specFile,
   crashDir,
+  crashEntryKey,
   modeName,
   snapshots,
   snapshotEnabled,
@@ -2407,6 +2324,7 @@ async function runWebSessionProcess(
     persistCrashRecord(crashDir, {
       kind: "test",
       file: specFile,
+      entryKey: crashEntryKey,
       mode: modeName ?? "default",
       error: fullError,
       stdout: stdoutBuffer,
@@ -2462,6 +2380,7 @@ async function runWebSessionProcess(
     persistCrashRecord(crashDir, {
       kind: "test",
       file: specFile,
+      entryKey: crashEntryKey,
       mode: modeName ?? "default",
       error: fullError,
       stdout: stdoutBuffer,

package/bin/commands/test.js

@@ -11,8 +11,8 @@ export async function executeTestCommand(
   const listFlags = deps.resolveListFlags(rawArgs, "test");
   const featureToggles = deps.resolveFeatureToggles(rawArgs, "test");
   const buildFeatureToggles = {
-    tryAs: featureToggles.tryAs,
     coverage: featureToggles.coverage,
+    featureOverrides: featureToggles.featureOverrides,
   };
   const showCoverageMode = deps.resolveShowCoverageMode(rawArgs, "test");
   const runFlags = {

package/bin/commands/web-session.js

@@ -56,6 +56,10 @@ export class PersistentWebSessionHost {
       ? env.AS_TEST_HELPER_PATH
       : null;
     const jobId = String(this.nextJobId++);
+    // URL paths use only the basename — that is safe because each job has
+    // exactly one wasm and one helper, scoped by the jobId path component.
+    // Nested directory artifacts (e.g. nested/array.spec.wasm) are read
+    // from disk via `wasmPath`/`helperPath`, not via these URLs.
     const browserEnv = {
       ...env,
       AS_TEST_WASM_PATH: `/job/${jobId}/${path.basename(wasmPath)}`,

package/bin/crash-store.js

@@ -5,9 +5,9 @@ export function persistCrashRecord(rootDir, record) {
     ? record.entryKey
     : crashEntryKey(record.file);
   const dir = path.resolve(process.cwd(), rootDir);
-  mkdirSync(dir, { recursive: true });
   const jsonPath = path.join(dir, `${entry}.json`);
   const logPath = path.join(dir, `${entry}.log`);
+  mkdirSync(path.dirname(jsonPath), { recursive: true });
   const payload = {
     timestamp: new Date().toISOString(),
     ...record,