chalk-talk 0.14.0 → 0.15.0

package/scripts/browser.mjs

@@ -121,7 +121,7 @@ async function start(exe) {
 
 /** Opens `file` at `#mode` (with `query`) in a tab of its own and returns what the page wrote, parsed — { error } when
  * the page could not be opened or wrote nothing in `ms`. */
-async function open(b, file, mode, query, ms) {
+async function open(b, file, mode, query, ms, shot) {
   const until = Date.now() + ms
   let sessionId
   // Every call waits at most until the page's time is up: a page busy forever does not hold the build.
@@ -133,8 +133,24 @@ async function open(b, file, mode, query, ms) {
   const { targetId } = await ask('Target.createTarget', { url: 'about:blank' })
   try {
     ;({ sessionId } = await ask('Target.attachToTarget', { targetId, flatten: true }))
-    const nav = await ask('Page.navigate', { url: `${pathToFileURL(file).href}${query ? `?${query}` : ''}#${mode}` })
+    if (shot) await ask('Emulation.setDeviceMetricsOverride', { width: shot.width, height: shot.height, deviceScaleFactor: 1, mobile: false })
+    if (shot?.scheme) await ask('Emulation.setEmulatedMedia', { features: [{ name: 'prefers-color-scheme', value: shot.scheme }] })
+    const nav = await ask('Page.navigate', { url: `${pathToFileURL(file).href}${query ? `?${query}` : ''}${mode ? `#${mode}` : ''}` })
     if (nav.errorText) return { error: `the page did not open (${nav.errorText})` }
+    // A picture of the page as it is once loaded, its fonts in and (when it says so) data-ready on the body.
+    if (shot) {
+      const ready = "document.readyState === 'complete' && document.fonts.status === 'loaded' && (document.body?.dataset.ready ?? '1') === '1'"
+      while (Date.now() < until) {
+        const r = await ask('Runtime.evaluate', { expression: ready, returnByValue: true })
+        if (r.result?.value === true) {
+          await pause(shot.settle ?? 400)
+          const { data } = await ask('Page.captureScreenshot', { format: 'png' })
+          return { png: `data:image/png;base64,${data}` }
+        }
+        await pause(50)
+      }
+      throw new BrowserFailed(`the page was not ready in ${Math.round(ms / 1000)} s`)
+    }
     while (Date.now() < until) {
       const r = await ask('Runtime.evaluate', { expression: `document.getElementById('chalk-${mode}')?.textContent ?? null`, returnByValue: true })
       const text = r.result?.value
@@ -149,7 +165,8 @@ async function open(b, file, mode, query, ms) {
   }
 }
 
-/** Runs `jobs` ({ file, mode, query }) in one browser and returns their results in order, with the browser used —
+/** Runs `jobs` ({ file, mode, query, shot }) in one browser — `shot: { width, height }` answers with { png } (a
+ * picture of the page once loaded) instead of what the page wrote — and returns their results in order, with the browser used —
  * `results` null when there is no browser at all. A browser that fails (does not start, stops, or a page gets no answer
  * in `timeout` seconds) gives way to the next one, which runs every job again; when none works, each result is
  * { error } naming what was tried. */
@@ -162,7 +179,7 @@ export async function runPages(jobs, { timeout = 20 } = {}) {
     try {
       b = await start(exe)
       const results = []
-      for (const { file, mode, query = '' } of jobs) results.push(await open(b, file, mode, query, timeout * 1000))
+      for (const { file, mode = '', query = '', shot } of jobs) results.push(await open(b, file, mode, query, timeout * 1000, shot))
       return { results, used: exe, tried }
     } catch (e) {
       tried.push(`${exe}: ${e instanceof BrowserFailed ? e.message : e.message.split('\n')[0]}`)

package/scripts/contract.mjs

@@ -1,4 +1,4 @@
-// GENERATED by tools/assets.mjs from the drawing engine v0.254.0. Do not edit.
+// GENERATED by tools/assets.mjs from the drawing engine v0.255.0. Do not edit.
 var WORDS = ["and", "or", "not"];
 
 var PROP_NAMES = [
@@ -416,6 +416,7 @@ var hasFace = (name) => {
   return !!key && key in HEADS;
 };
 
+var MOTIONS = ["spin", "drive", "steam", "talk", "pulse", "float"];
 var MAX_DEFS = 8;
 var MAX_DEF_SHAPES = 24;
 function defaultValues(scene) {
@@ -453,7 +454,8 @@ var STEP_TYPES = [
   "note",
   "table",
   "bars",
-  "chain"
+  "chain",
+  "animate"
 ];
 var PLACEABLE = ["text", "prop", "card", "counter", "circle", "ellipse"];
 var ARRANGEMENTS = ["row", "column", "grid", "chain"];
@@ -514,7 +516,7 @@ function validateStep(step2, name, ids, inside, inRow = false) {
   for (const key of ["id", "say", "chapter"]) optionalText(step2[key], `${name}.${key}`);
   if (step2.duration !== void 0) finite(step2.duration, `${name}.duration`, 0, 3e4);
   if (step2.nudge !== void 0) {
-    if (["pause", "move", "link"].includes(step2.type)) throw new Error(`${name}.nudge: a ${step2.type} has no place of its own to move.`);
+    if (["pause", "move", "link", "animate"].includes(step2.type)) throw new Error(`${name}.nudge: a ${step2.type} has no place of its own to move.`);
     if (!Array.isArray(step2.nudge) || step2.nudge.length !== 2) throw new Error(`${name}.nudge: use [dx, dy].`);
     step2.nudge.forEach((v, k) => finite(v, `${name}.nudge[${k}]`, -900, 900));
   }
@@ -645,6 +647,13 @@ function validateStep(step2, name, ids, inside, inRow = false) {
       choice(step2.along, ["line", "curve"], `${name}.along`);
       if (step2.ms !== void 0) finite(step2.ms, `${name}.ms`, 200, 5e3);
       break;
+    case "animate":
+      text(step2.target, `${name}.target`);
+      if (!known(ids, String(step2.target))) throw new Error(`${name}.target: no earlier step has the id "${step2.target}".`);
+      choice(step2.effect, [...MOTIONS, "stop"], `${name}.effect`);
+      if (step2.effect === void 0) throw new Error(`${name}.effect: choose one of ${[...MOTIONS, "stop"].join(", ")}.`);
+      choice(step2.speed, ["slow", "fast"], `${name}.speed`);
+      break;
     case "link":
       for (const key of ["from", "to"]) {
         text(step2[key], `${name}.${key}`);
@@ -1014,7 +1023,8 @@ var STEP_WORDS = /* @__PURE__ */ new Set([
   "table",
   "bars",
   "json",
-  "chain"
+  "chain",
+  "animate"
 ]);
 var SIDES = { "right-of": "right", "left-of": "left", above: "above", below: "below" };
 var STYLE = ["color", "fill", "roughness", "bowing", "fillStyle", "opacity"];
@@ -1195,6 +1205,16 @@ function step(line2, props) {
       const inline = rest.slice(1);
       return { type: "when", if: value(cond, no), steps: inline.length ? [step({ ...line2, tokens: inline, children: [] }, props)] : kids() };
     }
+    case "animate": {
+      if (!rest[0] || !rest[1] || rest[1].includes("=")) throw new ChalkTextError(no, "write animate <id> spin|drive|steam|talk|pulse|float, or animate <id> stop.");
+      const s = { type: "animate", target: rest[0], effect: rest[1] };
+      for (const t of rest.slice(2)) {
+        const [k, v] = t.split("=");
+        if (k === "speed" && v) s.speed = v;
+        else throw new ChalkTextError(no, `did not understand \xAB${t}\xBB (an animate takes speed=slow or speed=fast).`);
+      }
+      return s;
+    }
     case "move": {
       if (rest[1] !== "to") throw new ChalkTextError(no, "write move <id> to x,y.");
       return attrs(rest.slice(3), { type: "move", target: rest[0], to: point2(rest[2], no) }, no);
@@ -1462,6 +1482,8 @@ function printStep(s, props, indent) {
       return line2(`${s.type} ${s.points.map(pt).join(" ")}`, ["points"]);
     case "link":
       return line2(`${s.from} -> ${s.to}${s.label !== void 0 ? ` ${q(s.label)}` : ""}`, ["from", "to", "label"]);
+    case "animate":
+      return [`${indent}animate ${s.target} ${s.effect}${s.speed ? ` speed=${s.speed}` : ""}`];
     case "balloon":
       return line2(`${s.to} ${s.kind === "thought" ? "thinks" : "says"} ${q(s.text)}`, ["to", "text", "kind"]);
     case "counter":