@nodegx/mcp 0.2.7 → 0.2.8

package/dist/render-harness/drive-steps.js

@@ -2964,6 +2964,62 @@ function matches(value, expected) {
   }
   return JSON.stringify(value) === JSON.stringify(expected);
 }
+function watchShape(step, n) {
+  const w = step.watch && typeof step.watch === "object" ? step.watch : {};
+  if (w.look === void 0) throw new UsageError(`Step ${n}: watch takes { look: T } or { look: [T, T, \u2026] }.`);
+  const unknown = Object.keys(w).filter((k) => !["look", "for_ms", "expect"].includes(k));
+  if (unknown.length) throw new UsageError(`Step ${n}: watch does not take ${unknown.map((k) => JSON.stringify(k)).join(", ")} \u2014 it takes look, for_ms and expect.`);
+  if (step.expect !== void 0 && w.expect !== void 0) throw new UsageError(`Step ${n}: give watch one expect, beside it or inside it, not both.`);
+  const many = Array.isArray(w.look);
+  const targets = many ? w.look : [w.look];
+  if (targets.length === 0 || targets.length > 8) throw new UsageError(`Step ${n}: watch looks at 1 to 8 targets.`);
+  return {
+    many,
+    targets,
+    forMs: Math.min(1e4, Math.max(100, Number(step.for_ms ?? w.for_ms ?? 1500))),
+    expect: step.expect !== void 0 ? step.expect : w.expect,
+    expr: `Promise.all([${targets.map((t) => lookExpression(t)).join(", ")}])`
+  };
+}
+function checkStep(step, n, { outDir } = {}) {
+  const verb = verbOf(step, n);
+  const at = (fn) => {
+    try {
+      return fn();
+    } catch (error) {
+      if (!error.usage) throw new UsageError(`Step ${n}: ${error instanceof Error ? error.message : String(error)}`);
+      throw error.message.startsWith("Step ") ? error : new UsageError(`Step ${n}: ${error.message}`);
+    }
+  };
+  if (verb === "tap") at(() => finder(step.tap));
+  else if (verb === "type") {
+    if (typeof step.type !== "string") throw new UsageError(`Step ${n}: type takes a string.`);
+    if (step.into !== void 0) at(() => finder(step.into));
+  } else if (verb === "key") {
+    if (!KEYS[step.key]) throw new UsageError(`Step ${n}: key "${step.key}" is not one of ${Object.keys(KEYS).join(", ")}.`);
+  } else if (verb === "wait_for") at(() => waitExpression(step.wait_for));
+  else if (verb === "read") {
+    const r = step.read && typeof step.read === "object" ? step.read : null;
+    if (!r || !RUN_READS.some((k) => r[k] !== void 0)) at(() => readExpression(step.read));
+  } else if (verb === "navigate") {
+    if (typeof step.navigate !== "string") throw new UsageError(`Step ${n}: navigate takes a route string.`);
+  } else if (verb === "watch") watchShape(step, n);
+  else if (verb === "viewport") at(() => parseViewports(String(step.viewport)));
+  else if (verb === "screenshot") {
+    if (!outDir) throw new UsageError(`Step ${n}: screenshot needs --out-dir (render_report's out_dir rule).`);
+  } else if (verb === "seed_storage") {
+    const seed = step.seed_storage;
+    if (typeof seed === "string") {
+      if (typeof step.edit !== "string") throw new UsageError(`Step ${n}: seed_storage "${seed}" edits a saved value and needs edit: "js that changes v".`);
+    } else if (!seed || typeof seed !== "object" || Array.isArray(seed)) {
+      throw new UsageError(`Step ${n}: seed_storage takes { key: value } or a key with edit: "js that changes v".`);
+    }
+  } else if (verb === "stub_route") parseStub(step, n);
+  else if (verb === "reduced_motion") {
+    if (typeof step.reduced_motion !== "boolean") throw new UsageError(`Step ${n}: reduced_motion takes true or false.`);
+  }
+  return verb;
+}
 async function runSteps(page, steps, { outDir, stubs = routeStubs(page), network, beforeBoot = 0 }) {
   const rows = [];
   const pendingSeeds = [];
@@ -3089,17 +3145,7 @@ async function runSteps(page, steps, { outDir, stubs = routeStubs(page), network
         }
         row.url = await evaluate("location.pathname + location.hash");
       } else if (verb === "watch") {
-        const w = step.watch && typeof step.watch === "object" ? step.watch : {};
-        if (w.look === void 0) throw new UsageError(`Step ${i + 1}: watch takes { look: T } or { look: [T, T, \u2026] }.`);
-        const unknown = Object.keys(w).filter((k) => !["look", "for_ms", "expect"].includes(k));
-        if (unknown.length) throw new UsageError(`Step ${i + 1}: watch does not take ${unknown.map((k) => JSON.stringify(k)).join(", ")} \u2014 it takes look, for_ms and expect.`);
-        if (step.expect !== void 0 && w.expect !== void 0) throw new UsageError(`Step ${i + 1}: give watch one expect, beside it or inside it, not both.`);
-        const forMs = Math.min(1e4, Math.max(100, Number(step.for_ms ?? w.for_ms ?? 1500)));
-        const expect = step.expect !== void 0 ? step.expect : w.expect;
-        const many = Array.isArray(w.look);
-        const targets = many ? w.look : [w.look];
-        if (targets.length === 0 || targets.length > 8) throw new UsageError(`Step ${i + 1}: watch looks at 1 to 8 targets.`);
-        const expr = `Promise.all([${targets.map((t) => lookExpression(t)).join(", ")}])`;
+        const { many, targets, forMs, expect, expr } = watchShape(step, i + 1);
         const keyOf = (v) => v && typeof v === "object" ? JSON.stringify({ text: v.text, visible: v.visible, backgroundName: v.backgroundName, colorName: v.colorName, opacity: v.opacity === void 0 ? void 0 : Math.round(v.opacity * 10) / 10 }) : "null";
         const states = targets.map(() => []);
         const t0 = Date.now();
@@ -3182,8 +3228,8 @@ async function main() {
     return i === -1 ? void 0 : argv[i + 1];
   };
   const projectDir = argv.find((a, i) => !a.startsWith("--") && !VALUE_FLAGS.has(argv[i - 1]));
-  const usage = (message) => {
-    process.stdout.write(JSON.stringify({ error: { message, problems: [message], actionable: true } }));
+  const usage = (message, problems2 = [message]) => {
+    process.stdout.write(JSON.stringify({ error: { message, problems: problems2, actionable: true } }));
     process.exit(2);
   };
   if (!projectDir) usage("drive-steps.js <project-dir> --steps <json|@file> [--page p] [--viewport v] [--out-dir d]");
@@ -3193,12 +3239,22 @@ async function main() {
     if (!raw) throw new UsageError("--steps is required: a JSON array of steps.");
     steps = JSON.parse(raw.startsWith("@") ? fs.readFileSync(raw.slice(1), "utf8") : raw);
     if (!Array.isArray(steps) || steps.length === 0) throw new UsageError("--steps must be a non-empty JSON array.");
-    steps.forEach((s, i) => {
-      if (verbOf(s, i + 1) === "stub_route") parseStub(s, i + 1);
-    });
   } catch (error) {
     usage(error.message);
   }
+  const problems = [];
+  steps.forEach((step, i) => {
+    try {
+      checkStep(step, i + 1, { outDir: flag("--out-dir") });
+    } catch (error) {
+      if (!error.usage) throw error;
+      problems.push(error.message);
+    }
+  });
+  if (problems.length) {
+    problems.push("No step ran: every step is checked before the first one does.");
+    usage(problems.join(" "), problems);
+  }
   let viewport;
   try {
     [viewport] = parseViewports(flag("--viewport") || "desktop");
@@ -3250,9 +3306,9 @@ async function main() {
     process.stdout.write(JSON.stringify(result));
   } catch (error) {
     if (error.usage) usage(error.message);
-    const problems = error.problems || [error instanceof Error ? error.message : String(error)];
-    process.stdout.write(JSON.stringify({ error: { message: problems.join(" "), problems, actionable: Boolean(error.actionable) } }));
+    const problems2 = error.problems || [error instanceof Error ? error.message : String(error)];
+    process.stdout.write(JSON.stringify({ error: { message: problems2.join(" "), problems: problems2, actionable: Boolean(error.actionable) } }));
   }
 }
 if (require.main === module) main();
-module.exports = { runSteps, locateExpression, routeStubs, networkLog, parseStub, VERBS };
+module.exports = { runSteps, checkStep, locateExpression, routeStubs, networkLog, parseStub, VERBS };