chalk-talk 0.12.0 → 0.13.0

package/scripts/contract.mjs

@@ -1,4 +1,4 @@
-// GENERATED by tools/assets.mjs from the drawing engine v0.252.0. Do not edit.
+// GENERATED by tools/assets.mjs from the drawing engine v0.253.0. Do not edit.
 var WORDS = ["and", "or", "not"];
 
 var PROP_NAMES = [
@@ -31,7 +31,24 @@ var PROP_NAMES = [
   "bulb",
   "gear",
   "database",
-  "robot"
+  "robot",
+  // Onda B (spec 2026-11-01, chalk-talk): logistics, cloud, school
+  "ship",
+  "container",
+  "warehouse",
+  "box",
+  "pallet",
+  "shop",
+  "shelf",
+  "field",
+  "cup",
+  "function",
+  "api-gateway",
+  "cache",
+  "cluster",
+  "board",
+  "book",
+  "pencil"
 ];
 var PROP_ALIASES = {
   pessoa: "person",
@@ -69,7 +86,9 @@ var C = {
   bus: "#E9C46A",
   green: "#7DBE8A",
   dark: "#4A4A4A",
-  metal: "#C9D3DD"
+  metal: "#C9D3DD",
+  board: "#2F4F3F",
+  chalk: "#F2EFE6"
 };
 var rect = (x, y, w, h, fill, main) => ({
   kind: "polygon",
@@ -275,6 +294,115 @@ var PROPS = {
     line([0.28, -0.55], [0.42, -0.35]),
     rect(-0.2, -0.2, 0.12, 0.2, C.device),
     rect(0.08, -0.2, 0.12, 0.2, C.device)
+  ],
+  // Onda B (spec 2026-11-01, chalk-talk): logistics
+  ship: [
+    { kind: "polygon", points: [[-0.48, -0.3], [0.48, -0.3], [0.36, -0.04], [-0.4, -0.04]], fill: C.car, main: true },
+    rect(-0.42, -0.62, 0.14, 0.32, C.wall),
+    rect(-0.24, -0.5, 0.2, 0.2, C.roof),
+    rect(-0.02, -0.5, 0.2, 0.2, C.bus),
+    rect(0.2, -0.5, 0.2, 0.2, C.green),
+    { kind: "curve", points: [[-0.5, 0], [-0.3, -0.04], [-0.1, 0], [0.1, -0.04], [0.3, 0], [0.5, -0.04]] }
+  ],
+  container: [
+    rect(-0.46, -0.52, 0.92, 0.52, C.roof, true),
+    ...[-0.3, -0.15, 0, 0.15, 0.3].map((x) => line([x, -0.48], [x, -0.04]))
+  ],
+  warehouse: [
+    { kind: "polygon", points: [[-0.46, 0], [0.46, 0], [0.46, -0.55], [0, -0.82], [-0.46, -0.55]], fill: C.wall, main: true },
+    rect(-0.2, -0.38, 0.4, 0.38, C.metal),
+    line([-0.2, -0.26], [0.2, -0.26]),
+    line([-0.2, -0.13], [0.2, -0.13])
+  ],
+  box: [
+    rect(-0.36, -0.5, 0.52, 0.5, C.wood, true),
+    { kind: "polygon", points: [[-0.36, -0.5], [0.16, -0.5], [0.36, -0.64], [-0.16, -0.64]], fill: C.wood },
+    { kind: "polygon", points: [[0.16, 0], [0.36, -0.14], [0.36, -0.64], [0.16, -0.5]], fill: C.wood },
+    line([-0.1, -0.5], [0.1, -0.64])
+  ],
+  pallet: [
+    rect(-0.46, -0.12, 0.92, 0.06, C.wood),
+    ...[-0.42, -0.05, 0.32].map((x) => rect(x, -0.06, 0.1, 0.06, C.wood)),
+    rect(-0.42, -0.5, 0.4, 0.38, C.wood, true),
+    rect(0.02, -0.5, 0.4, 0.38, C.wood),
+    rect(-0.2, -0.82, 0.4, 0.32, C.wood)
+  ],
+  shop: [
+    rect(-0.42, -0.6, 0.84, 0.6, C.wall, true),
+    { kind: "polygon", points: [[-0.48, -0.6], [0.48, -0.6], [0.42, -0.78], [-0.42, -0.78]], fill: C.roof },
+    rect(-0.34, -0.48, 0.34, 0.26, C.screen),
+    rect(0.08, -0.42, 0.24, 0.42, C.wood)
+  ],
+  shelf: [
+    rect(-0.4, -0.92, 0.8, 0.92, C.paper, true),
+    line([-0.4, -0.62], [0.4, -0.62]),
+    line([-0.4, -0.32], [0.4, -0.32]),
+    rect(-0.32, -0.8, 0.16, 0.18, C.roof),
+    rect(-0.1, -0.78, 0.14, 0.16, C.bus),
+    rect(0.1, -0.5, 0.22, 0.18, C.green),
+    rect(-0.3, -0.2, 0.24, 0.2, C.wood)
+  ],
+  field: [
+    line([-0.48, 0], [0.48, 0]),
+    ...[-0.3, 0, 0.3].flatMap((x) => [
+      { kind: "curve", points: [[x, 0], [x - 0.02, -0.25], [x, -0.5]] },
+      { kind: "circle", c: [x - 0.08, -0.32], r: 0.07, fill: C.green, main: true },
+      { kind: "circle", c: [x + 0.08, -0.42], r: 0.07, fill: C.green, main: true },
+      { kind: "circle", c: [x, -0.52], r: 0.06, fill: C.roof }
+    ])
+  ],
+  cup: [
+    { kind: "polygon", points: [[-0.26, -0.52], [0.26, -0.52], [0.2, -0.1], [-0.2, -0.1]], fill: C.paper, main: true },
+    { kind: "curve", points: [[0.24, -0.44], [0.4, -0.38], [0.22, -0.2]] },
+    { kind: "polygon", points: [[-0.46, -0.1], [0.46, -0.1], [0.36, 0], [-0.36, 0]], fill: C.paper },
+    { kind: "curve", points: [[-0.08, -0.62], [-0.02, -0.72], [-0.08, -0.84]] },
+    { kind: "curve", points: [[0.08, -0.62], [0.14, -0.72], [0.08, -0.84]] }
+  ],
+  // cloud
+  function: [
+    rect(-0.38, -0.72, 0.76, 0.62, C.screen, true),
+    line([-0.14, -0.62], [0, -0.62], [0.14, -0.2]),
+    line([0.02, -0.42], [-0.14, -0.2])
+  ],
+  "api-gateway": [
+    rect(-0.12, -0.8, 0.24, 0.8, C.metal, true),
+    line([-0.48, -0.55], [-0.16, -0.55]),
+    line([-0.24, -0.62], [-0.16, -0.55], [-0.24, -0.48]),
+    line([0.16, -0.3], [0.48, -0.3]),
+    line([0.4, -0.37], [0.48, -0.3], [0.4, -0.23])
+  ],
+  cache: [
+    rect(-0.34, -0.66, 0.68, 0.66, C.metal, true),
+    { kind: "polygon", points: [[0.04, -0.58], [-0.12, -0.3], [0, -0.3], [-0.06, -0.08], [0.14, -0.38], [0.02, -0.38]], fill: C.gold }
+  ],
+  // a cluster: three machines inside a rounded outline (a generic drawing, not any product's logo)
+  cluster: [
+    { kind: "curve", points: [[-0.4, -0.8], [0, -0.86], [0.4, -0.8], [0.48, -0.45], [0.4, -0.1], [0, -0.04], [-0.4, -0.1], [-0.48, -0.45], [-0.4, -0.8]] },
+    rect(-0.3, -0.7, 0.24, 0.2, C.screen, true),
+    rect(0.06, -0.7, 0.24, 0.2, C.screen, true),
+    rect(-0.12, -0.38, 0.24, 0.2, C.screen, true)
+  ],
+  // school: the chalk on the board is light, so it is drawn as thin light strips
+  board: [
+    rect(-0.48, -0.9, 0.96, 0.6, C.board, true),
+    rect(-0.34, -0.76, 0.42, 0.03, C.chalk),
+    rect(-0.34, -0.62, 0.58, 0.03, C.chalk),
+    rect(-0.34, -0.48, 0.3, 0.03, C.chalk),
+    line([-0.3, -0.3], [-0.36, 0]),
+    line([0.3, -0.3], [0.36, 0])
+  ],
+  book: [
+    { kind: "polygon", points: [[0, -0.62], [-0.46, -0.7], [-0.46, -0.1], [0, -0.04]], fill: C.paper, main: true },
+    { kind: "polygon", points: [[0, -0.62], [0.46, -0.7], [0.46, -0.1], [0, -0.04]], fill: C.paper, main: true },
+    line([-0.36, -0.52], [-0.1, -0.48]),
+    line([-0.36, -0.38], [-0.1, -0.34]),
+    line([0.1, -0.48], [0.36, -0.52]),
+    line([0.1, -0.34], [0.36, -0.38])
+  ],
+  pencil: [
+    { kind: "polygon", points: [[-0.38, -0.12], [0.22, -0.72], [0.34, -0.6], [-0.26, 0]], fill: C.bus, main: true },
+    { kind: "polygon", points: [[0.22, -0.72], [0.34, -0.6], [0.44, -0.86]], fill: C.wood },
+    { kind: "polygon", points: [[-0.38, -0.12], [-0.26, 0], [-0.46, -0.02]], fill: C.roof }
   ]
 };
 var MOODS = ["happy", "sad", "surprised", "worried", "idea"];
@@ -288,6 +416,8 @@ var hasFace = (name) => {
   return !!key && key in HEADS;
 };
 
+var MAX_DEFS = 8;
+var MAX_DEF_SHAPES = 24;
 function defaultValues(scene) {
   const values = {};
   for (const [k, p] of Object.entries(scene.params ?? {})) values[k] = p.value;
@@ -322,10 +452,11 @@ var STEP_TYPES = [
   "brace",
   "note",
   "table",
-  "bars"
+  "bars",
+  "chain"
 ];
 var PLACEABLE = ["text", "prop", "card", "counter", "circle", "ellipse"];
-var ARRANGEMENTS = ["row", "column", "grid"];
+var ARRANGEMENTS = ["row", "column", "grid", "chain"];
 var MAX_REPEAT = 50;
 function object(value2, name) {
   if (!value2 || typeof value2 !== "object" || Array.isArray(value2)) throw new Error(`${name}: expected an object.`);
@@ -476,8 +607,9 @@ function validateStep(step2, name, ids, inside, inRow = false) {
       optionalText(step2.ask, `${name}.ask`);
       break;
     case "prop":
-      if (!isPropName(step2.name)) {
-        throw new Error(`${name}.name: unknown prop "${String(step2.name)}"; use one of ${PROP_NAMES.join(", ")}.`);
+      if (!isPropName(step2.name) && !ids.figures.has(String(step2.name))) {
+        const own = ids.figures.size ? `, or one the recipe defines (${[...ids.figures].join(", ")})` : "";
+        throw new Error(`${name}.name: unknown prop "${String(step2.name)}"; use one of ${PROP_NAMES.join(", ")}${own}.`);
       }
       pointOrPlaced(step2, "at", name, placed);
       if (step2.size !== void 0) {
@@ -550,6 +682,27 @@ function validateStep(step2, name, ids, inside, inRow = false) {
         validateStep(inner, `${name}.steps[${j}]`, ids, step2.type);
       });
       break;
+    case "chain":
+      if (arranged) throw new Error(`${name}: a chain cannot go inside a ${inside}.`);
+      pointOrPlaced(step2, "at", name, false);
+      if (step2.gap !== void 0 && step2.gap !== "auto") finite(step2.gap, `${name}.gap`, 0, 400);
+      choice(step2.direction, ["right", "down"], `${name}.direction`);
+      if (step2.wrap !== void 0 && typeof step2.wrap !== "boolean") throw new Error(`${name}.wrap: expected true or false.`);
+      optionalText(step2.forward, `${name}.forward`);
+      optionalText(step2.back, `${name}.back`);
+      if (step2.size !== void 0) {
+        numeric(step2.size, `${name}.size`);
+        if (typeof step2.size === "number") finite(step2.size, `${name}.size`, 10, 1e3);
+      }
+      if (!Array.isArray(step2.steps) || step2.steps.length < 2 || step2.steps.length > 12) {
+        throw new Error(`${name}.steps: a chain joins 2 to 12 pieces.`);
+      }
+      step2.steps.forEach((inner, j) => {
+        object(inner, `${name}.steps[${j}]`);
+        if (!PLACEABLE.includes(inner.type)) throw new Error(`${name}.steps[${j}]: a chain holds only ${PLACEABLE.join(", ")}.`);
+        validateStep(inner, `${name}.steps[${j}]`, ids, "chain");
+      });
+      break;
     case "axis":
     case "timeline":
       point(step2.from, `${name}.from`);
@@ -636,6 +789,38 @@ function validateStep(step2, name, ids, inside, inRow = false) {
   }
   if (typeof step2.id === "string") (inside === "repeat" ? ids.repeated : ids.exact).add(step2.id);
 }
+function validateFigure(key, def) {
+  const name = `defs.${key}`;
+  if (!/^[a-z][a-z0-9-]{1,30}$/.test(key)) throw new Error(`${name}: a figure's name is 2 to 31 lowercase letters, digits or -, starting with a letter.`);
+  if (propKey(key) || Object.hasOwn(PROP_ALIASES, key) || STEP_TYPES.includes(key) || ["define", "title", "param", "switch", "var"].includes(key)) {
+    throw new Error(`${name}: "${key}" is already a prop or a step; choose another name.`);
+  }
+  object(def, name);
+  if (!Array.isArray(def.shapes) || def.shapes.length === 0 || def.shapes.length > MAX_DEF_SHAPES) {
+    throw new Error(`${name}.shapes: expected 1 to ${MAX_DEF_SHAPES} shapes.`);
+  }
+  const grid = (v, at) => {
+    if (typeof v !== "number" || !Number.isInteger(v) || v < 0 || v > 100) throw new Error(`${at}: expected a whole number from 0 to 100 (the figure's grid, y down; it stands at 50,100).`);
+  };
+  def.shapes.forEach((shape, j) => {
+    const at = `${name}.shapes[${j}]`;
+    object(shape, at);
+    if (shape.fill !== void 0 && (typeof shape.fill !== "string" || !/^(#[0-9a-fA-F]{3,8}|[a-z]{3,20})$/.test(shape.fill))) throw new Error(`${at}.fill: a colour, as hex or a plain name.`);
+    if (shape.kind === "circle") {
+      if (!Array.isArray(shape.c) || shape.c.length !== 2) throw new Error(`${at}.c: expected [x, y].`);
+      shape.c.forEach((v, k) => grid(v, `${at}.c[${k}]`));
+      grid(shape.r, `${at}.r`);
+      return;
+    }
+    if (!["polygon", "polyline", "curve"].includes(shape.kind)) throw new Error(`${at}.kind: choose one of polygon, polyline, curve, circle.`);
+    const least = shape.kind === "polygon" ? 3 : 2;
+    if (!Array.isArray(shape.points) || shape.points.length < least || shape.points.length > 40) throw new Error(`${at}.points: a ${shape.kind} takes ${least} to 40 points.`);
+    shape.points.forEach((p, k) => {
+      if (!Array.isArray(p) || p.length !== 2) throw new Error(`${at}.points[${k}]: expected [x, y].`);
+      p.forEach((v, n) => grid(v, `${at}.points[${k}][${n}]`));
+    });
+  });
+}
 function validateScene(data) {
   object(data, "The recipe");
   const s = data;
@@ -701,7 +886,17 @@ function validateScene(data) {
   if (!Array.isArray(s.steps) || s.steps.length === 0 || s.steps.length > 250) {
     throw new Error("A recipe needs 1 to 250 steps.");
   }
-  const ids = { exact: /* @__PURE__ */ new Set(), repeated: /* @__PURE__ */ new Set(), count: 0 };
+  const figures = /* @__PURE__ */ new Set();
+  if (s.defs !== void 0) {
+    object(s.defs, "defs");
+    const entries = Object.entries(s.defs);
+    if (entries.length > MAX_DEFS) throw new Error(`defs: at most ${MAX_DEFS} figures.`);
+    for (const [key, def] of entries) {
+      validateFigure(key, def);
+      figures.add(key);
+    }
+  }
+  const ids = { exact: /* @__PURE__ */ new Set(), repeated: /* @__PURE__ */ new Set(), count: 0, figures };
   s.steps.forEach((step2, i) => validateStep(step2, `Step ${i + 1}`, ids, null));
   return {
     ...s,
@@ -818,12 +1013,13 @@ var STEP_WORDS = /* @__PURE__ */ new Set([
   "note",
   "table",
   "bars",
-  "json"
+  "json",
+  "chain"
 ]);
 var SIDES = { "right-of": "right", "left-of": "left", above: "above", below: "below" };
 var STYLE = ["color", "fill", "roughness", "bowing", "fillStyle", "opacity"];
 var SPACED = /* @__PURE__ */ new Set(["gap", "size", "r", "rx", "ry", "w", "h", "columns", "ms", "thickness"]);
-var FLAGS = /* @__PURE__ */ new Set(["dashed", "flip", "noheader"]);
+var FLAGS = /* @__PURE__ */ new Set(["dashed", "flip", "noheader", "wrap"]);
 function attrs(tokens, step2, no) {
   const style = {};
   for (let i = 0; i < tokens.length; i++) {
@@ -833,6 +1029,7 @@ function attrs(tokens, step2, no) {
     if (FLAGS.has(t)) {
       if (t === "dashed") style.dashed = true;
       else if (t === "flip") step2.flip = true;
+      else if (t === "wrap") step2.wrap = true;
       else step2.header = false;
       continue;
     }
@@ -845,7 +1042,7 @@ function attrs(tokens, step2, no) {
     else if (key === "nudge") step2.nudge = point2(raw, no).map(Number);
     else if (key === "ticks") step2.ticks = raw.includes(",") ? parts(raw).map(Number) : Number(raw);
     else if (key === "labels") step2.labels = parts(raw).map(unquote);
-    else if (key === "id" || key === "anchor" || key === "font" || key === "mood" || key === "along" || key === "side" || key === "kind" || key === "var" || key === "align" || key === "label" || key === "format" || key === "fn") step2[key] = unquote(raw);
+    else if (key === "id" || key === "anchor" || key === "font" || key === "mood" || key === "along" || key === "side" || key === "kind" || key === "var" || key === "align" || key === "label" || key === "format" || key === "fn" || key === "forward" || key === "back" || key === "direction") step2[key] = unquote(raw);
     else step2[key] = value(raw, no);
   }
   if (Object.keys(style).length) step2.style = style;
@@ -974,7 +1171,8 @@ function step(line2, props) {
     }
     case "row":
     case "column":
-    case "grid": {
+    case "grid":
+    case "chain": {
       const s = { type: w };
       const more = placement(rest, s, "at", no);
       attrs(more, s, no);
@@ -1063,6 +1261,50 @@ function step(line2, props) {
   }
   throw new ChalkTextError(no, `\xAB${w}\xBB is not a step, a prop or an id followed by -> / says.`);
 }
+function links(line2) {
+  const { no, tokens } = line2;
+  const out = [];
+  let from = tokens[0];
+  let i = 1;
+  while (tokens[i] === "->") {
+    const to = tokens[i + 1];
+    if (!to || isQuoted(to)) throw new ChalkTextError(no, 'write a -> b "label" -> c "label".');
+    const s = { type: "link", from, to };
+    i += 2;
+    if (tokens[i] && isQuoted(tokens[i])) s.label = unquote(tokens[i++]);
+    out.push(s);
+    from = to;
+  }
+  const more = tokens.slice(i);
+  return out.map((s) => attrs([...more], s, no));
+}
+function figureShape(line2) {
+  const { no, tokens } = line2;
+  const [kind, ...rest] = tokens;
+  const grid = (t) => {
+    const m = t?.match(/^(\d{1,3}),(\d{1,3})$/);
+    if (!m || Number(m[1]) > 100 || Number(m[2]) > 100) throw new ChalkTextError(no, `on a figure's grid a point is two whole numbers from 0 to 100, like 24,48 (got ${t ?? "nothing"}).`);
+    return [Number(m[1]), Number(m[2])];
+  };
+  const shape = { kind };
+  let more = rest;
+  if (kind === "circle") {
+    if (more[0] === "at") more = more.slice(1);
+    shape.c = grid(more[0]);
+    more = more.slice(1);
+  } else if (kind === "polygon" || kind === "polyline" || kind === "curve") {
+    const pts = more.filter((t) => t.includes(",") && !t.includes("="));
+    shape.points = pts.map(grid);
+    more = more.slice(pts.length);
+  } else throw new ChalkTextError(no, `a figure is made of polygon, polyline, curve and circle lines, not \xAB${kind}\xBB.`);
+  for (const t of more) {
+    const [k, v] = t.split("=");
+    if (k === "fill" && v) shape.fill = unquote(v);
+    else if (k === "r" && v && /^\d{1,3}$/.test(v)) shape.r = Number(v);
+    else throw new ChalkTextError(no, `did not understand \xAB${t}\xBB in a figure (only fill=\u2026 and, on a circle, r=\u2026).`);
+  }
+  return shape;
+}
 function parseChalk(text2, props) {
   const names = new Set(props);
   const scene = { id: "lesson", title: "", width: 900, height: 560 };
@@ -1136,6 +1378,13 @@ function parseChalk(text2, props) {
         scene.learning = { ...scene.learning, [part]: unquote(t ?? "") };
         continue;
       }
+      case "define": {
+        const name = rest[0];
+        if (!name) throw new ChalkTextError(no, "write define <name> and its shapes under it.");
+        scene.defs = { ...scene.defs, [name]: { shapes: line2.children.map(figureShape) } };
+        names.add(name);
+        continue;
+      }
       case "quiz": {
         scene.quiz = {
           question: unquote(rest[0] ?? ""),
@@ -1150,10 +1399,11 @@ function parseChalk(text2, props) {
         continue;
       }
     }
-    const s = step(line2, names);
+    const made = rest[0] === "->" && rest.indexOf("->", 1) > 0 ? links(line2) : [step(line2, names)];
+    const [s] = made;
     if (chapter !== void 0) [s.chapter, chapter] = [chapter, void 0];
     if (say !== void 0) [s.say, say] = [say, void 0];
-    steps.push(s);
+    steps.push(...made);
   }
   scene.steps = steps;
   return scene;
@@ -1174,8 +1424,8 @@ function printAttrs(s, skip) {
         else return null;
       }
     } else if (k === "nudge") out.push(`nudge=${v.join(",")}`);
-    else if (k === "flip") {
-      if (v === true) out.push("flip");
+    else if (k === "flip" || k === "wrap") {
+      if (v === true) out.push(k);
     } else if (typeof v === "number" || typeof v === "string") out.push(`${k}=${typeof v === "number" ? v : num(v)}`);
     else return null;
   }
@@ -1231,7 +1481,8 @@ function printStep(s, props, indent) {
     }
     case "row":
     case "column":
-    case "grid": {
+    case "grid":
+    case "chain": {
       const head = line2(`${s.type} ${place(s, "at")}`, ["steps", ...placedSkip]);
       if (head[0].trimStart().startsWith("json")) return head;
       return [...head, ...s.steps.flatMap((c) => printStep(c, props, `${indent}  `))];
@@ -1247,6 +1498,7 @@ function printStep(s, props, indent) {
 }
 function printChalk(scene, props) {
   const names = new Set(props);
+  for (const name of Object.keys(scene.defs ?? {})) names.add(name);
   const out = [];
   if (scene.id !== void 0) out.push(`id ${scene.id}`);
   if (scene.title !== void 0) out.push(`title ${scene.title}`);
@@ -1258,6 +1510,13 @@ function printChalk(scene, props) {
   for (const [k, sw] of Object.entries(scene.switches ?? {})) out.push(`switch ${k} ${q(sw.label)} ${sw.on ? "on" : "off"}`);
   for (const [k, v] of Object.entries(scene.vars ?? {})) out.push(`var ${k} = ${num(v)}`);
   for (const [k, v] of Object.entries(scene.learning ?? {})) out.push(`learning ${k} ${q(v)}`);
+  for (const [name, def] of Object.entries(scene.defs ?? {})) {
+    out.push("", `define ${name}`);
+    for (const sh of def.shapes) {
+      const fill = sh.fill !== void 0 ? ` fill=${sh.fill}` : "";
+      out.push(sh.kind === "circle" ? `  circle at ${sh.c.join(",")} r=${sh.r}${fill}` : `  ${sh.kind} ${sh.points.map((p) => p.join(",")).join(" ")}${fill}`);
+    }
+  }
   for (const s of scene.steps ?? []) {
     if (s.chapter !== void 0 || s.say !== void 0) out.push("");
     if (s.chapter !== void 0) out.push(`# ${s.chapter}`);