@devasign/verify 1.3.2 → 1.5.0

package/dist/cli.js

@@ -86,15 +86,15 @@ var require_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    function visit_(key, node, visitor, path8) {
-      let ctrl = callVisitor(key, node, visitor, path8);
+    function visit_(key, node, visitor, path9) {
+      let ctrl = callVisitor(key, node, visitor, path9);
       if (identity.isNode(ctrl) || identity.isPair(ctrl))
-        return replaceNode(key, path8, ctrl), visit_(key, ctrl, visitor, path8);
+        return replaceNode(key, path9, ctrl), visit_(key, ctrl, visitor, path9);
       if (typeof ctrl != "symbol") {
         if (identity.isCollection(node)) {
-          path8 = Object.freeze(path8.concat(node));
+          path9 = Object.freeze(path9.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
-            let ci = visit_(i, node.items[i], visitor, path8);
+            let ci = visit_(i, node.items[i], visitor, path9);
             if (typeof ci == "number")
               i = ci - 1;
             else {
@@ -104,12 +104,12 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity.isPair(node)) {
-          path8 = Object.freeze(path8.concat(node));
-          let ck = visit_("key", node.key, visitor, path8);
+          path9 = Object.freeze(path9.concat(node));
+          let ck = visit_("key", node.key, visitor, path9);
           if (ck === BREAK)
             return BREAK;
           ck === REMOVE && (node.key = null);
-          let cv = visit_("value", node.value, visitor, path8);
+          let cv = visit_("value", node.value, visitor, path9);
           if (cv === BREAK)
             return BREAK;
           cv === REMOVE && (node.value = null);
@@ -124,15 +124,15 @@ var require_visit = __commonJS({
     visitAsync.BREAK = BREAK;
     visitAsync.SKIP = SKIP;
     visitAsync.REMOVE = REMOVE;
-    async function visitAsync_(key, node, visitor, path8) {
-      let ctrl = await callVisitor(key, node, visitor, path8);
+    async function visitAsync_(key, node, visitor, path9) {
+      let ctrl = await callVisitor(key, node, visitor, path9);
       if (identity.isNode(ctrl) || identity.isPair(ctrl))
-        return replaceNode(key, path8, ctrl), visitAsync_(key, ctrl, visitor, path8);
+        return replaceNode(key, path9, ctrl), visitAsync_(key, ctrl, visitor, path9);
       if (typeof ctrl != "symbol") {
         if (identity.isCollection(node)) {
-          path8 = Object.freeze(path8.concat(node));
+          path9 = Object.freeze(path9.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
-            let ci = await visitAsync_(i, node.items[i], visitor, path8);
+            let ci = await visitAsync_(i, node.items[i], visitor, path9);
             if (typeof ci == "number")
               i = ci - 1;
             else {
@@ -142,12 +142,12 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity.isPair(node)) {
-          path8 = Object.freeze(path8.concat(node));
-          let ck = await visitAsync_("key", node.key, visitor, path8);
+          path9 = Object.freeze(path9.concat(node));
+          let ck = await visitAsync_("key", node.key, visitor, path9);
           if (ck === BREAK)
             return BREAK;
           ck === REMOVE && (node.key = null);
-          let cv = await visitAsync_("value", node.value, visitor, path8);
+          let cv = await visitAsync_("value", node.value, visitor, path9);
           if (cv === BREAK)
             return BREAK;
           cv === REMOVE && (node.value = null);
@@ -170,22 +170,22 @@ var require_visit = __commonJS({
         Seq: visitor.Collection
       }, visitor) : visitor;
     }
-    function callVisitor(key, node, visitor, path8) {
+    function callVisitor(key, node, visitor, path9) {
       if (typeof visitor == "function")
-        return visitor(key, node, path8);
+        return visitor(key, node, path9);
       if (identity.isMap(node))
-        return visitor.Map?.(key, node, path8);
+        return visitor.Map?.(key, node, path9);
       if (identity.isSeq(node))
-        return visitor.Seq?.(key, node, path8);
+        return visitor.Seq?.(key, node, path9);
       if (identity.isPair(node))
-        return visitor.Pair?.(key, node, path8);
+        return visitor.Pair?.(key, node, path9);
       if (identity.isScalar(node))
-        return visitor.Scalar?.(key, node, path8);
+        return visitor.Scalar?.(key, node, path9);
       if (identity.isAlias(node))
-        return visitor.Alias?.(key, node, path8);
+        return visitor.Alias?.(key, node, path9);
     }
-    function replaceNode(key, path8, node) {
-      let parent = path8[path8.length - 1];
+    function replaceNode(key, path9, node) {
+      let parent = path9[path9.length - 1];
       if (identity.isCollection(parent))
         parent.items[key] = node;
       else if (identity.isPair(parent))
@@ -639,10 +639,10 @@ var require_Collection = __commonJS({
   "node_modules/yaml/dist/nodes/Collection.js"(exports) {
     "use strict";
     var createNode = require_createNode(), identity = require_identity(), Node = require_Node();
-    function collectionFromPath(schema, path8, value) {
+    function collectionFromPath(schema, path9, value) {
       let v = value;
-      for (let i = path8.length - 1; i >= 0; --i) {
-        let k = path8[i];
+      for (let i = path9.length - 1; i >= 0; --i) {
+        let k = path9[i];
         if (typeof k == "number" && Number.isInteger(k) && k >= 0) {
           let a = [];
           a[k] = v, v = a;
@@ -659,7 +659,7 @@ var require_Collection = __commonJS({
         sourceObjects: /* @__PURE__ */ new Map()
       });
     }
-    var isEmptyPath = (path8) => path8 == null || typeof path8 == "object" && !!path8[Symbol.iterator]().next().done, Collection = class extends Node.NodeBase {
+    var isEmptyPath = (path9) => path9 == null || typeof path9 == "object" && !!path9[Symbol.iterator]().next().done, Collection = class extends Node.NodeBase {
       constructor(type, schema) {
         super(type), Object.defineProperty(this, "schema", {
           value: schema,
@@ -682,11 +682,11 @@ var require_Collection = __commonJS({
        * be a Pair instance or a `{ key, value }` object, which may not have a key
        * that already exists in the map.
        */
-      addIn(path8, value) {
-        if (isEmptyPath(path8))
+      addIn(path9, value) {
+        if (isEmptyPath(path9))
           this.add(value);
         else {
-          let [key, ...rest] = path8, node = this.get(key, !0);
+          let [key, ...rest] = path9, node = this.get(key, !0);
           if (identity.isCollection(node))
             node.addIn(rest, value);
           else if (node === void 0 && this.schema)
@@ -699,8 +699,8 @@ var require_Collection = __commonJS({
        * Removes a value from the collection.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path8) {
-        let [key, ...rest] = path8;
+      deleteIn(path9) {
+        let [key, ...rest] = path9;
         if (rest.length === 0)
           return this.delete(key);
         let node = this.get(key, !0);
@@ -713,8 +713,8 @@ var require_Collection = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path8, keepScalar) {
-        let [key, ...rest] = path8, node = this.get(key, !0);
+      getIn(path9, keepScalar) {
+        let [key, ...rest] = path9, node = this.get(key, !0);
         return rest.length === 0 ? !keepScalar && identity.isScalar(node) ? node.value : node : identity.isCollection(node) ? node.getIn(rest, keepScalar) : void 0;
       }
       hasAllNullValues(allowScalar) {
@@ -728,8 +728,8 @@ var require_Collection = __commonJS({
       /**
        * Checks if the collection includes a value with the key `key`.
        */
-      hasIn(path8) {
-        let [key, ...rest] = path8;
+      hasIn(path9) {
+        let [key, ...rest] = path9;
         if (rest.length === 0)
           return this.has(key);
         let node = this.get(key, !0);
@@ -739,8 +739,8 @@ var require_Collection = __commonJS({
        * Sets a value in this collection. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path8, value) {
-        let [key, ...rest] = path8;
+      setIn(path9, value) {
+        let [key, ...rest] = path9;
         if (rest.length === 0)
           this.set(key, value);
         else {
@@ -2613,8 +2613,8 @@ var require_Document = __commonJS({
         assertCollection(this.contents) && this.contents.add(value);
       }
       /** Adds a value to the document. */
-      addIn(path8, value) {
-        assertCollection(this.contents) && this.contents.addIn(path8, value);
+      addIn(path9, value) {
+        assertCollection(this.contents) && this.contents.addIn(path9, value);
       }
       /**
        * Create a new `Alias` node, ensuring that the target `node` has the required anchor.
@@ -2675,8 +2675,8 @@ var require_Document = __commonJS({
        * Removes a value from the document.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path8) {
-        return Collection.isEmptyPath(path8) ? this.contents == null ? !1 : (this.contents = null, !0) : assertCollection(this.contents) ? this.contents.deleteIn(path8) : !1;
+      deleteIn(path9) {
+        return Collection.isEmptyPath(path9) ? this.contents == null ? !1 : (this.contents = null, !0) : assertCollection(this.contents) ? this.contents.deleteIn(path9) : !1;
       }
       /**
        * Returns item at `key`, or `undefined` if not found. By default unwraps
@@ -2691,8 +2691,8 @@ var require_Document = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path8, keepScalar) {
-        return Collection.isEmptyPath(path8) ? !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents : identity.isCollection(this.contents) ? this.contents.getIn(path8, keepScalar) : void 0;
+      getIn(path9, keepScalar) {
+        return Collection.isEmptyPath(path9) ? !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents : identity.isCollection(this.contents) ? this.contents.getIn(path9, keepScalar) : void 0;
       }
       /**
        * Checks if the document includes a value with the key `key`.
@@ -2703,8 +2703,8 @@ var require_Document = __commonJS({
       /**
        * Checks if the document includes a value at `path`.
        */
-      hasIn(path8) {
-        return Collection.isEmptyPath(path8) ? this.contents !== void 0 : identity.isCollection(this.contents) ? this.contents.hasIn(path8) : !1;
+      hasIn(path9) {
+        return Collection.isEmptyPath(path9) ? this.contents !== void 0 : identity.isCollection(this.contents) ? this.contents.hasIn(path9) : !1;
       }
       /**
        * Sets a value in this document. For `!!set`, `value` needs to be a
@@ -2717,8 +2717,8 @@ var require_Document = __commonJS({
        * Sets a value in this document. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path8, value) {
-        Collection.isEmptyPath(path8) ? this.contents = value : this.contents == null ? this.contents = Collection.collectionFromPath(this.schema, Array.from(path8), value) : assertCollection(this.contents) && this.contents.setIn(path8, value);
+      setIn(path9, value) {
+        Collection.isEmptyPath(path9) ? this.contents = value : this.contents == null ? this.contents = Collection.collectionFromPath(this.schema, Array.from(path9), value) : assertCollection(this.contents) && this.contents.setIn(path9, value);
       }
       /**
        * Change the YAML version and schema used by the document.
@@ -4113,9 +4113,9 @@ var require_cst_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    visit.itemAtPath = (cst, path8) => {
+    visit.itemAtPath = (cst, path9) => {
       let item = cst;
-      for (let [field, index] of path8) {
+      for (let [field, index] of path9) {
         let tok = item?.[field];
         if (tok && "items" in tok)
           item = tok.items[index];
@@ -4124,21 +4124,21 @@ var require_cst_visit = __commonJS({
       }
       return item;
     };
-    visit.parentCollection = (cst, path8) => {
-      let parent = visit.itemAtPath(cst, path8.slice(0, -1)), field = path8[path8.length - 1][0], coll = parent?.[field];
+    visit.parentCollection = (cst, path9) => {
+      let parent = visit.itemAtPath(cst, path9.slice(0, -1)), field = path9[path9.length - 1][0], coll = parent?.[field];
       if (coll && "items" in coll)
         return coll;
       throw new Error("Parent collection not found");
     };
-    function _visit(path8, item, visitor) {
-      let ctrl = visitor(item, path8);
+    function _visit(path9, item, visitor) {
+      let ctrl = visitor(item, path9);
       if (typeof ctrl == "symbol")
         return ctrl;
       for (let field of ["key", "value"]) {
         let token = item[field];
         if (token && "items" in token) {
           for (let i = 0; i < token.items.length; ++i) {
-            let ci = _visit(Object.freeze(path8.concat([[field, i]])), token.items[i], visitor);
+            let ci = _visit(Object.freeze(path9.concat([[field, i]])), token.items[i], visitor);
             if (typeof ci == "number")
               i = ci - 1;
             else {
@@ -4147,10 +4147,10 @@ var require_cst_visit = __commonJS({
               ci === REMOVE && (token.items.splice(i, 1), i -= 1);
             }
           }
-          typeof ctrl == "function" && field === "key" && (ctrl = ctrl(item, path8));
+          typeof ctrl == "function" && field === "key" && (ctrl = ctrl(item, path9));
         }
       }
-      return typeof ctrl == "function" ? ctrl(item, path8) : ctrl;
+      return typeof ctrl == "function" ? ctrl(item, path9) : ctrl;
     }
     exports.visit = visit;
   }
@@ -5584,7 +5584,7 @@ async function detectSetup(root, opts = {}) {
     ...new Set(
       paths.filter((p) => /^[^/]+\/[^/]+\/package\.json$/.test(p)).reduce((acc, p) => acc.concat(manifestNames(readText(root, p))), Object.keys(deps))
     )
-  ].sort() : void 0, langCounts = /* @__PURE__ */ new Map();
+  ].sort() : pkgText == null ? [] : void 0, langCounts = /* @__PURE__ */ new Map();
   for (let p of paths) {
     let lang = LANG_BY_EXT[p.split(".").pop()?.toLowerCase() || ""];
     lang && langCounts.set(lang, (langCounts.get(lang) || 0) + 1);
@@ -5713,11 +5713,11 @@ function staticTokenSource(token) {
 }
 
 // src/run.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync5, writeFileSync as writeFileSync3 } from "node:fs";
-import path7 from "node:path";
+import { appendFileSync as appendFileSync2, existsSync as existsSync6, writeFileSync as writeFileSync3 } from "node:fs";
+import path8 from "node:path";
 
 // src/types.ts
-var CLI_VERSION = "1.3.2";
+var CLI_VERSION = "1.5.0";
 
 // src/api.ts
 var ApiError = class extends Error {
@@ -5733,11 +5733,11 @@ var ApiError = class extends Error {
     this.fetchImpl = fetchImpl;
     this.baseUrl = baseUrl.replace(/\/+$/, "");
   }
-  async request(method, path8, body, attempts = 3) {
+  async request(method, path9, body, attempts = 3) {
     let lastErr;
     for (let i = 0; i < attempts; i++)
       try {
-        let res = await this.fetchImpl(`${this.baseUrl}${path8}`, {
+        let res = await this.fetchImpl(`${this.baseUrl}${path9}`, {
           method,
           headers: {
             Authorization: `Bearer ${await this.token()}`,
@@ -5887,10 +5887,65 @@ function readContext(opts = {}) {
   };
 }
 
+// src/module-type.ts
+import { existsSync as existsSync2, readFileSync as readFileSync4 } from "node:fs";
+import path3 from "node:path";
+var SCOPED_EXT = /\.[jt]sx?$/, ESM_SYNTAX = /^[ \t]*(?:import|export)(?:[ \t]+[A-Za-z_$*{"']|[ \t]*[{*"'])/m, CJS_SYNTAX = /(?:^|[^.\w$])require[ \t]*\(|^[ \t]*(?:module\.exports\b|exports\.[A-Za-z_$])/m;
+function stripNonCode(source) {
+  return source.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/^[ \t]*\/\/.*$/gm, "").replace(/`(?:\\[\s\S]|[^\\`])*`/g, "``");
+}
+function detectModuleSyntax(source) {
+  let code = stripNonCode(source);
+  return ESM_SYNTAX.test(code) ? "module" : CJS_SYNTAX.test(code) ? "commonjs" : null;
+}
+function inheritedModuleType(root, dirRel) {
+  let stop = path3.resolve(root);
+  for (let dir = path3.resolve(root, dirRel); ; dir = path3.dirname(dir)) {
+    let manifest = path3.join(dir, "package.json");
+    if (existsSync2(manifest))
+      try {
+        return JSON.parse(readFileSync4(manifest, "utf8")).type === "module" ? "module" : "commonjs";
+      } catch {
+        return "commonjs";
+      }
+    if (dir === stop || path3.dirname(dir) === dir) return "commonjs";
+  }
+}
+var posixDir = (p) => path3.posix.dirname(p.split(path3.sep).join("/"));
+function scopeOf(root, dir, decided) {
+  for (let d = dir; d && d !== "." && d !== "/"; d = path3.posix.dirname(d)) {
+    let shim = decided.get(d);
+    if (shim) return shim;
+  }
+  return inheritedModuleType(root, dir);
+}
+function planModuleTypeShims(root, tests) {
+  let wanted = /* @__PURE__ */ new Map();
+  for (let t of tests) {
+    if (t.origin !== "generated" || !SCOPED_EXT.test(t.path)) continue;
+    let dir = posixDir(t.path), needs = t.runner === "playwright" ? inheritedModuleType(root, dir) : t.content ? detectModuleSyntax(t.content) : null;
+    if (!needs) continue;
+    let counts = wanted.get(dir) ?? /* @__PURE__ */ new Map();
+    counts.set(needs, (counts.get(needs) ?? 0) + 1), wanted.set(dir, counts);
+  }
+  let decided = /* @__PURE__ */ new Map(), shims = [];
+  for (let dir of [...wanted.keys()].sort((a, b) => a.split("/").length - b.split("/").length || a.localeCompare(b))) {
+    let counts = wanted.get(dir), type = (counts.get("module") ?? 0) >= (counts.get("commonjs") ?? 0) ? "module" : "commonjs";
+    scopeOf(root, dir, decided) !== type && (decided.set(dir, type), shims.push({ dir, type }));
+  }
+  return shims;
+}
+function writeModuleTypeShims(ws, tests) {
+  let shims = planModuleTypeShims(ws.root, tests);
+  for (let s of shims) ws.write(path3.posix.join(s.dir, "package.json"), `${JSON.stringify({ type: s.type })}
+`);
+  return shims;
+}
+
 // src/runners/index.ts
 import { createRequire } from "node:module";
-import { existsSync as existsSync2 } from "node:fs";
-import path4 from "node:path";
+import { existsSync as existsSync3 } from "node:fs";
+import path5 from "node:path";
 
 // src/classify.ts
 var ASSERTION = {
@@ -6009,7 +6064,7 @@ function firstErrorLine(out) {
 // src/exec.ts
 import { spawn } from "node:child_process";
 import { mkdirSync, writeFileSync } from "node:fs";
-import path3 from "node:path";
+import path4 from "node:path";
 var MAX_CAPTURE = 5 * 1024 * 1024, DRAIN_MS = 2e3;
 async function runCommand(opts) {
   let started = Date.now();
@@ -6039,7 +6094,7 @@ async function runCommand(opts) {
       let full = { ...result, stdout, stderr, output, durationMs: Date.now() - started };
       if (opts.logFile)
         try {
-          mkdirSync(path3.dirname(opts.logFile), { recursive: !0 }), writeFileSync(opts.logFile, `$ ${opts.cmd} ${opts.args.join(" ")}
+          mkdirSync(path4.dirname(opts.logFile), { recursive: !0 }), writeFileSync(opts.logFile, `$ ${opts.cmd} ${opts.args.join(" ")}
 
 ${output}
 
@@ -6061,8 +6116,8 @@ function tsxLoader() {
   return require2.resolve("tsx/esm");
 }
 function bin(root, name) {
-  let p = path4.join(root, "node_modules", ".bin", name);
-  return existsSync2(p) ? p : null;
+  let p = path5.join(root, "node_modules", ".bin", name);
+  return existsSync3(p) ? p : null;
 }
 function commandForFile(runner, file, root) {
   switch (runner) {
@@ -6073,7 +6128,7 @@ function commandForFile(runner, file, root) {
     case "pytest":
       return { cmd: "python3", args: ["-m", "pytest", "-q", "-p", "no:cacheprovider", file] };
     case "go":
-      return { cmd: "go", args: ["test", "./" + path4.posix.dirname(file) + "/", "-run", ".", "-count=1"] };
+      return { cmd: "go", args: ["test", "./" + path5.posix.dirname(file) + "/", "-run", ".", "-count=1"] };
     case "node-test":
     case "bundled":
     default:
@@ -6086,7 +6141,7 @@ async function runFileTests(args) {
     let max = Math.max(1, args.maxAttempts(t)), attempts = [], attemptRefs = [];
     log.group(`${t.origin} ${t.level} ${t.path} (${t.runner})`);
     for (let n = 1; n <= max; n++) {
-      let { cmd, args: argv } = commandForFile(t.runner, t.path, args.ws.root), logFile = path4.join(args.ws.artifactsDir, "logs", `${t.id}-${n}.log`), r = await runCommand({ cmd, args: argv, cwd: args.ws.root, timeoutMs: args.timeoutMs, logFile, onLine: (l) => console.log(`  ${l}`) }), c = classifyAttempt(t.runner, r), ref = `log:${t.id}:${n}`;
+      let { cmd, args: argv } = commandForFile(t.runner, t.path, args.ws.root), logFile = path5.join(args.ws.artifactsDir, "logs", `${t.id}-${n}.log`), r = await runCommand({ cmd, args: argv, cwd: args.ws.root, timeoutMs: args.timeoutMs, logFile, onLine: (l) => console.log(`  ${l}`) }), c = classifyAttempt(t.runner, r), ref = `log:${t.id}:${n}`;
       if (args.artifacts.push({ clientRef: ref, kind: "log", path: logFile, displayPath: args.ws.relative(logFile), contentType: "text/plain", testId: t.id, criterionIds: t.criterionIds, attempt: n }), attempts.push({ n, status: c.status, durationMs: r.durationMs, error: c.error, artifactIds: [] }), attemptRefs.push([ref]), log.info(`attempt ${n}/${max}: ${c.status}${c.error ? ` \u2014 ${c.error}` : ""}`), c.status === "pass" && n === 1 || c.status === "pass" && n > 1 || c.status === "error" && max > 1 && n === 1 && /could not start|ENOENT|Cannot find module|Cannot find package|Failed to (?:load url|resolve import)/.test(c.error || "")) break;
     }
     log.endGroup();
@@ -6112,23 +6167,23 @@ async function runFileTests(args) {
 
 // src/runners/playwright.ts
 import { createRequire as createRequire2 } from "node:module";
-import { existsSync as existsSync3, readdirSync as readdirSync2, readFileSync as readFileSync4, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync4, readdirSync as readdirSync2, readFileSync as readFileSync5, statSync as statSync3 } from "node:fs";
 import { homedir } from "node:os";
-import path5 from "node:path";
+import path6 from "node:path";
 var require3 = createRequire2(import.meta.url);
 function playwrightCli(root) {
-  let local = path5.join(root, "node_modules", "@playwright", "test", "cli.js");
-  return existsSync3(local) ? { cmd: process.execPath, args: [local], ours: !1 } : { cmd: process.execPath, args: [require3.resolve("@playwright/test/cli")], ours: !0 };
+  let local = path6.join(root, "node_modules", "@playwright", "test", "cli.js");
+  return existsSync4(local) ? { cmd: process.execPath, args: [local], ours: !1 } : { cmd: process.execPath, args: [require3.resolve("@playwright/test/cli")], ours: !0 };
 }
 function ourPlaywrightDir() {
-  return path5.dirname(require3.resolve("@playwright/test/package.json"));
+  return path6.dirname(require3.resolve("@playwright/test/package.json"));
 }
 function generatePlaywrightConfig(a) {
   let j = (v) => JSON.stringify(v);
   return [
     "// Generated by @devasign/verify \u2014 disposable; the repository's own config is untouched.",
     'import { defineConfig } from "@playwright/test";',
-    a.baseConfigRel ? `import __base from ${j(path5.resolve(a.root, a.baseConfigRel))};` : "const __base: any = {};",
+    a.baseConfigRel ? `import __base from ${j(path6.resolve(a.root, a.baseConfigRel))};` : "const __base: any = {};",
     "const b: any = (__base as any)?.default ?? __base ?? {};",
     "// One browser project only: recordings once, and no browsers we did not install.",
     "// Project fields win over config fields in Playwright, so the customer's own",
@@ -6170,8 +6225,8 @@ function flattenSpecs(report) {
   return out;
 }
 function pathsMatch(reportFile, planned) {
-  let a = reportFile.split(path5.sep).join("/"), b = planned.split(path5.sep).join("/");
-  return a === b || a.endsWith("/" + b) || b.endsWith("/" + a) || path5.posix.basename(a) === path5.posix.basename(b);
+  let a = reportFile.split(path6.sep).join("/"), b = planned.split(path6.sep).join("/");
+  return a === b || a.endsWith("/" + b) || b.endsWith("/" + a) || path6.posix.basename(a) === path6.posix.basename(b);
 }
 function stripAnsi(s) {
   return s.replace(/\u001b\[[0-9;]*m/g, "");
@@ -6199,7 +6254,7 @@ function mapReport(report, tests, ws, artifacts, overallOutput) {
           let refs = [], videoRef = null, screenshotPath = null;
           for (let att of r.attachments || []) {
             let kind = KIND_BY_ATTACHMENT[att.name || ""];
-            if (!kind || !att.path || !existsSync3(att.path)) continue;
+            if (!kind || !att.path || !existsSync4(att.path)) continue;
             let ref = `${kind}:${t.id}:${n}:${refs.length}`;
             artifacts.push({ clientRef: ref, kind, path: att.path, displayPath: ws.relative(att.path), contentType: att.contentType || TYPE_BY_KIND[kind], testId: t.id, criterionIds: t.criterionIds, attempt: n }), refs.push(ref), kind === "video" && (videoRef = ref), kind === "screenshot" && !screenshotPath && (screenshotPath = att.path);
           }
@@ -6228,14 +6283,15 @@ function mapReport(report, tests, ws, artifacts, overallOutput) {
       status,
       attempts,
       durationMs: attempts.reduce((s, a) => s + a.durationMs, 0),
-      error: status === "pass" ? void 0 : attempts[attempts.length - 1]?.error,
+      // Not the last attempt: in a multi-test file that can be a sibling that passed.
+      error: attempts.find((a) => a.status === status)?.error,
       artifactIds: []
     });
   }
   return results;
 }
 function playwrightBrowsersRoot(env = process.env, home = homedir()) {
-  return env.PLAYWRIGHT_BROWSERS_PATH ? env.PLAYWRIGHT_BROWSERS_PATH : process.platform === "darwin" ? path5.join(home, "Library", "Caches", "ms-playwright") : process.platform === "win32" ? path5.join(env.LOCALAPPDATA || home, "ms-playwright") : path5.join(home, ".cache", "ms-playwright");
+  return env.PLAYWRIGHT_BROWSERS_PATH ? env.PLAYWRIGHT_BROWSERS_PATH : process.platform === "darwin" ? path6.join(home, "Library", "Caches", "ms-playwright") : process.platform === "win32" ? path6.join(env.LOCALAPPDATA || home, "ms-playwright") : path6.join(home, ".cache", "ms-playwright");
 }
 function hasChromium(root, read = readdirSync2) {
   try {
@@ -6249,37 +6305,37 @@ async function ensureBrowsers(root, ws) {
     return log.info("Chromium already installed; skipping download"), { ok: !0, log: "cached" };
   let cli = playwrightCli(root), args = [...cli.args, "install", ...process.platform === "linux" ? ["--with-deps"] : [], "chromium"];
   log.info("installing Chromium for Playwright");
-  let r = await runCommand({ cmd: cli.cmd, args, cwd: root, timeoutMs: 10 * 6e4, logFile: path5.join(ws.artifactsDir, "logs", "playwright-install.log") });
+  let r = await runCommand({ cmd: cli.cmd, args, cwd: root, timeoutMs: 10 * 6e4, logFile: path6.join(ws.artifactsDir, "logs", "playwright-install.log") });
   return { ok: r.code === 0, log: r.output };
 }
 async function runPlaywright(args) {
-  let { ws } = args, outputDir = path5.join(ws.artifactsDir, "pw", args.configName.replace(/\.config\.ts$/, "")), reportFile = path5.join(outputDir, "report.json"), cli = playwrightCli(ws.root);
+  let { ws } = args, outputDir = path6.join(ws.artifactsDir, "pw", args.configName.replace(/\.config\.ts$/, "")), reportFile = path6.join(outputDir, "report.json"), cli = playwrightCli(ws.root);
   if (cli.ours) {
     ws.linkPackage("@playwright/test", ourPlaywrightDir());
-    let pw = path5.join(ourPlaywrightDir(), "..", "..", "playwright");
-    existsSync3(pw) && ws.linkPackage("playwright", path5.resolve(pw));
+    let pw = path6.join(ourPlaywrightDir(), "..", "..", "playwright");
+    existsSync4(pw) && ws.linkPackage("playwright", path6.resolve(pw));
   }
-  let testDir = args.tests.every((t) => t.origin === "generated") ? path5.join(ws.testsDir, "e2e") : ws.root, cfgSource = generatePlaywrightConfig({ root: ws.root, baseConfigRel: args.baseConfigRel, testDir, outputDir, reportFile, retries: args.retries, webServer: webServerFromYml(args.yml) }), cfgPath = ws.write(path5.join(".devasign", args.configName), cfgSource), files = args.tests.map((t) => path5.resolve(ws.root, t.path));
+  let testDir = args.tests.every((t) => t.origin === "generated") ? path6.join(ws.testsDir, "e2e") : ws.root, cfgSource = generatePlaywrightConfig({ root: ws.root, baseConfigRel: args.baseConfigRel, testDir, outputDir, reportFile, retries: args.retries, webServer: webServerFromYml(args.yml) }), cfgPath = ws.write(path6.join(".devasign", args.configName), cfgSource), files = args.tests.map((t) => path6.resolve(ws.root, t.path));
   log.group(`playwright ${args.configName}: ${files.length} file(s)`);
-  let r = await runCommand({ cmd: cli.cmd, args: [...cli.args, "test", "--config", cfgPath, ...files], cwd: ws.root, timeoutMs: args.timeoutMs, logFile: path5.join(ws.artifactsDir, "logs", `${args.configName}.log`), onLine: (l) => console.log(`  ${l}`) });
+  let r = await runCommand({ cmd: cli.cmd, args: [...cli.args, "test", "--config", cfgPath, ...files], cwd: ws.root, timeoutMs: args.timeoutMs, logFile: path6.join(ws.artifactsDir, "logs", `${args.configName}.log`), onLine: (l) => console.log(`  ${l}`) });
   log.endGroup();
   let report = {};
-  if (existsSync3(reportFile) && statSync3(reportFile).size > 0)
+  if (existsSync4(reportFile) && statSync3(reportFile).size > 0)
     try {
-      report = JSON.parse(readFileSync4(reportFile, "utf8"));
+      report = JSON.parse(readFileSync5(reportFile, "utf8"));
     } catch (err) {
       log.warn(`could not parse the Playwright JSON report: ${err instanceof Error ? err.message : String(err)}`);
     }
   let logRef = `log:pw:${args.configName}`;
-  args.artifacts.push({ clientRef: logRef, kind: "log", path: path5.join(ws.artifactsDir, "logs", `${args.configName}.log`), displayPath: ws.relative(path5.join(ws.artifactsDir, "logs", `${args.configName}.log`)), contentType: "text/plain", criterionIds: [] });
+  args.artifacts.push({ clientRef: logRef, kind: "log", path: path6.join(ws.artifactsDir, "logs", `${args.configName}.log`), displayPath: ws.relative(path6.join(ws.artifactsDir, "logs", `${args.configName}.log`)), contentType: "text/plain", criterionIds: [] });
   let results = mapReport(report, args.tests, ws, args.artifacts, r.output);
   for (let res of results) res.artifactIds = [logRef];
   return { results, output: r.output, code: r.code };
 }
 
 // src/workspace.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, rmSync, symlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
-import path6 from "node:path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, rmSync, symlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
+import path7 from "node:path";
 var DEVASIGN_DIR = ".devasign", Workspace = class {
   root;
   dir;
@@ -6288,19 +6344,19 @@ var DEVASIGN_DIR = ".devasign", Workspace = class {
   created = [];
   preexistingDir;
   constructor(root) {
-    this.root = path6.resolve(root), this.dir = path6.join(this.root, DEVASIGN_DIR), this.artifactsDir = path6.join(this.dir, "artifacts"), this.testsDir = path6.join(this.dir, "tests"), this.preexistingDir = existsSync4(this.dir);
+    this.root = path7.resolve(root), this.dir = path7.join(this.root, DEVASIGN_DIR), this.artifactsDir = path7.join(this.dir, "artifacts"), this.testsDir = path7.join(this.dir, "tests"), this.preexistingDir = existsSync5(this.dir);
     for (let sub of ["tests", "artifacts", "node_modules", "playwright.config.ts", "playwright.existing.config.ts"])
-      rmSync(path6.join(this.dir, sub), { recursive: !0, force: !0 });
+      rmSync(path7.join(this.dir, sub), { recursive: !0, force: !0 });
   }
   /** Absolute path for a repo-relative path, refusing anything outside `.devasign/`. */
   resolveOwned(rel) {
-    let full = path6.resolve(this.root, rel);
-    if (!full.startsWith(this.dir + path6.sep)) throw new Error(`refusing to write outside ${DEVASIGN_DIR}/: ${rel}`);
+    let full = path7.resolve(this.root, rel);
+    if (!full.startsWith(this.dir + path7.sep)) throw new Error(`refusing to write outside ${DEVASIGN_DIR}/: ${rel}`);
     return full;
   }
   write(rel, content) {
     let full = this.resolveOwned(rel);
-    return mkdirSync2(path6.dirname(full), { recursive: !0 }), writeFileSync2(full, content), this.created.push(full), full;
+    return mkdirSync2(path7.dirname(full), { recursive: !0 }), writeFileSync2(full, content), this.created.push(full), full;
   }
   ensureDir(rel) {
     let full = this.resolveOwned(rel);
@@ -6308,16 +6364,16 @@ var DEVASIGN_DIR = ".devasign", Workspace = class {
   }
   /** Expose a package from our own install to files under `.devasign/` (never into the repo's node_modules). */
   linkPackage(name, target) {
-    let link = this.resolveOwned(path6.join(DEVASIGN_DIR, "node_modules", name));
-    existsSync4(link) || (mkdirSync2(path6.dirname(link), { recursive: !0 }), symlinkSync(target, link, "junction"), this.created.push(link));
+    let link = this.resolveOwned(path7.join(DEVASIGN_DIR, "node_modules", name));
+    existsSync5(link) || (mkdirSync2(path7.dirname(link), { recursive: !0 }), symlinkSync(target, link, "junction"), this.created.push(link));
   }
   relative(full) {
-    return path6.relative(this.root, full).split(path6.sep).join("/");
+    return path7.relative(this.root, full).split(path7.sep).join("/");
   }
   /** Remove what we created. A pre-existing `.devasign/` (hooks, config) stays. */
   cleanup() {
     for (let p of [...this.created].reverse()) rmSync(p, { recursive: !0, force: !0 });
-    for (let sub of ["tests", "artifacts", "node_modules"]) rmSync(path6.join(this.dir, sub), { recursive: !0, force: !0 });
+    for (let sub of ["tests", "artifacts", "node_modules"]) rmSync(path7.join(this.dir, sub), { recursive: !0, force: !0 });
     this.preexistingDir || rmSync(this.dir, { recursive: !0, force: !0 }), this.created = [];
   }
 };
@@ -6355,9 +6411,11 @@ async function executePlan(plan, ws, opts) {
     let full = ws.write(t.path, t.content);
     artifacts.push({ clientRef: `test_file:${t.id}`, kind: "test_file", path: full, displayPath: t.path, contentType: "text/plain", testId: t.id, criterionIds: t.criterionIds });
   }
+  for (let s of writeModuleTypeShims(ws, plan.tests))
+    log.info(`${s.dir}: declared "type": "${s.type}" so the tests relocated there load as they were written`);
   for (let t of plan.tests)
-    t.origin === "existing" && !existsSync5(path7.resolve(ws.root, t.path)) && results.push({ id: `r-${t.id}`, testId: t.id, criterionIds: t.criterionIds, test: t.path, runner: t.runner, level: t.level, origin: t.origin, status: "error", attempts: [], durationMs: 0, error: "existing test not found in the checkout", artifactIds: [] });
-  let runnable = plan.tests.filter((t) => !(t.origin === "existing" && !existsSync5(path7.resolve(ws.root, t.path)))), pw = runnable.filter((t) => t.runner === "playwright"), others = runnable.filter((t) => t.runner !== "playwright");
+    t.origin === "existing" && !existsSync6(path8.resolve(ws.root, t.path)) && results.push({ id: `r-${t.id}`, testId: t.id, criterionIds: t.criterionIds, test: t.path, runner: t.runner, level: t.level, origin: t.origin, status: "error", attempts: [], durationMs: 0, error: "existing test not found in the checkout", artifactIds: [] });
+  let runnable = plan.tests.filter((t) => !(t.origin === "existing" && !existsSync6(path8.resolve(ws.root, t.path)))), pw = runnable.filter((t) => t.runner === "playwright"), others = runnable.filter((t) => t.runner !== "playwright");
   if (results.push(...await runFileTests({ tests: others, ws, maxAttempts: (t) => t.origin === "generated" ? 1 + plan.retries.generated : 1, timeoutMs: opts.testTimeoutMs, artifacts })), pw.length) {
     let repoCfg = opts.setup?.frameworks.find((f) => f.name === "playwright")?.configPath ?? null;
     if (doctor = preflight({ tests: pw, setup: opts.setup, yml: opts.yml, repoHasPlaywrightConfig: !!repoCfg, env: process.env, nodeVersion: process.version }), doctor) {
@@ -6385,7 +6443,7 @@ function summaryTable(plan, results) {
   return ["| Criterion | Test | Outcome | Notes |", "|---|---|---|---|", ...plan.criteria.map((c) => {
     let mine = results.filter((r) => r.criterionIds.includes(c.id)), u = unverifiable.get(c.id);
     if (mine.length) {
-      let tests = mine.map((r) => `${r.level} ${r.origin} \`${cell(r.test)}\``).join("<br>"), outcome = mine.map((r) => `${r.status} (${r.attempts.length} attempt${r.attempts.length === 1 ? "" : "s"})`).join("<br>");
+      let tests = mine.map((r) => `${r.level} ${r.origin} \`${cell(r.test)}\``).join("<br>"), outcome = mine.map((r) => `${r.status} (${r.attempts.length} ${r.runner === "playwright" ? "result" : "attempt"}${r.attempts.length === 1 ? "" : "s"})`).join("<br>");
       return `| ${c.id}. ${cell(c.text)} | ${tests} | ${outcome} | |`;
     }
     let note = u ? `${cell(u.reason)}${u.fixUrl ? ` \u2014 [configure app start](${u.fixUrl})` : ""}` : "no test planned";
@@ -6423,9 +6481,10 @@ async function run(opts) {
     plan = resolved.plan, runId = resolved.runId, log.info(`plan ${plan.planId}: ${plan.tests.length} test(s) for ${plan.criteria.length} criteria (run ${runId})`), setOutput("run-id", runId);
   }
   announceUnverifiable(plan);
-  let failOn = opts.failOn ?? plan.failOn ?? "never";
+  let failOn = opts.failOn ?? plan.failOn ?? "never", bootYml = yml ?? plan.verifyConfig ?? null;
+  !yml && plan.verifyConfig && log.info("no verify block in this checkout's .devasign.yml; starting the app with the one the plan was made from");
   try {
-    let { results, artifacts, doctor } = await executePlan(plan, ws, { yml, testTimeoutMs: opts.testTimeoutMs, setup }), finalResults = results;
+    let { results, artifacts, doctor } = await executePlan(plan, ws, { yml: bootYml, testTimeoutMs: opts.testTimeoutMs, setup }), finalResults = results;
     if (api && ctx) {
       let ids = await uploadArtifacts(api, runId, artifacts, plan.uploadLimits, fetchImpl);
       if (finalResults = resolveArtifactRefs(results, ids), doctor?.logArtifactId === void 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devasign/verify",
-  "version": "1.3.2",
+  "version": "1.5.0",
   "description": "Runs DevAsign's generated acceptance tests inside your CI and reports per-criterion evidence.",
   "license": "GPL-3.0-or-later",
   "type": "module",