@phin-tech/dottie 0.10.0 → 0.11.0

package/dist/dottie.js

@@ -1,84 +1,334 @@
-/*! dottie.js 0.10.0 | Apache-2.0 | https://github.com/phin-tech/dottie */
+/*! dottie.js 0.11.0 | Apache-2.0 | https://github.com/phin-tech/dottie */
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value2) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value: value2 }) : obj[key] = value2;
 var __publicField = (obj, key, value2) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value2);
 
-// src/state.ts
+// src/expression.ts
+var METRIC_NAMES = ["throughput", "load", "delay", "backlog", "depth", "inFlight", "transit", "backup"];
+var FUNCTIONS = { min: null, max: null, abs: 1, floor: 1, ceil: 1, round: 1, clamp: 3 };
 var MAX_NAME = 64;
-function isName(name) {
-  return name.length <= MAX_NAME && /^[A-Za-z_][A-Za-z0-9_]*$/.test(name);
+var truthy = (v) => typeof v === "boolean" ? v : v !== 0 && !Number.isNaN(v);
+var num = (v) => typeof v === "boolean" ? v ? 1 : 0 : v;
+var parsed = /* @__PURE__ */ new Map();
+function parseExpr(text) {
+  const hit = parsed.get(text);
+  if (hit !== void 0) return hit;
+  const p = new Parser(text);
+  let e = p.or();
+  if (e && !p.atEnd()) e = null;
+  if (parsed.size > 4096) parsed.clear();
+  parsed.set(text, e);
+  return e;
 }
-var METRIC_NAMES = ["throughput", "load", "delay", "backlog", "depth", "inFlight", "transit", "backup"];
-var OPS = [">=", "<=", "==", "!=", ">", "<"];
-function metricTerm(term) {
-  const t = trim(term);
-  if (!t.includes("(")) {
-    const op2 = t.search(/[>=<!]/);
-    if (op2 < 0) return null;
-    const name2 = trim(t.slice(0, op2));
-    if (!METRIC_NAMES.includes(name2)) return null;
-    const m = metricTerm(name2 + "() " + t.slice(op2));
-    return m ? { ...m, target: "" } : null;
-  }
-  const open = t.indexOf("("), close = t.indexOf(")");
-  if (open < 0 || close < 0 || open >= close) return null;
-  const name = trim(t.slice(0, open)), target = trim(t.slice(open + 1, close));
-  let rest = trim(t.slice(close + 1));
-  if (!METRIC_NAMES.includes(name) || target.includes("(")) return null;
-  const op = OPS.find((o) => rest.startsWith(o));
-  if (op === void 0) return null;
-  rest = trim(rest.slice(op.length));
-  if (!/^-?[0-9]+(\.[0-9]+)?$/.test(rest)) return null;
-  return { metric: name, target, op, value: Number(rest) };
-}
-function passes(m, v) {
-  switch (m.op) {
-    case ">":
-      return v > m.value;
-    case ">=":
-      return v >= m.value;
-    case "<":
-      return v < m.value;
-    case "<=":
-      return v <= m.value;
-    case "==":
-      return v === m.value;
-    default:
-      return v !== m.value;
+function evaluate(e, state, metric = null) {
+  switch (e.k) {
+    case "lit":
+      return e.v;
+    case "name":
+      return state[e.name] ?? false;
+    case "metric":
+      return metric?.(e.metric, e.target) ?? NaN;
+    case "not":
+      return !truthy(evaluate(e.e, state, metric));
+    case "neg":
+      return -num(evaluate(e.e, state, metric));
+    case "call": {
+      const xs = e.args.map((a) => num(evaluate(a, state, metric)));
+      const fold = (better) => {
+        if (xs.some(Number.isNaN)) return NaN;
+        let out = xs[0];
+        for (const x of xs.slice(1)) if (better(x, out)) out = x;
+        return out;
+      };
+      switch (e.fn) {
+        case "min":
+          return fold((a, b) => a < b);
+        case "max":
+          return fold((a, b) => a > b);
+        case "abs":
+          return Math.abs(xs[0]);
+        case "floor":
+          return Math.floor(xs[0]);
+        case "ceil":
+          return Math.ceil(xs[0]);
+        case "round":
+          return Math.floor(xs[0] + 0.5);
+        default:
+          if (xs.some(Number.isNaN)) return NaN;
+          return xs[0] < xs[1] ? xs[1] : xs[0] > xs[2] ? xs[2] : xs[0];
+      }
+    }
+    case "bin": {
+      if (e.op === "&&") return truthy(evaluate(e.l, state, metric)) && truthy(evaluate(e.r, state, metric));
+      if (e.op === "||") return truthy(evaluate(e.l, state, metric)) || truthy(evaluate(e.r, state, metric));
+      const a = evaluate(e.l, state, metric), b = evaluate(e.r, state, metric);
+      const x = num(a), y = num(b);
+      switch (e.op) {
+        case "+":
+          return x + y;
+        case "-":
+          return x - y;
+        case "*":
+          return x * y;
+        case "/":
+          return x / y;
+        case "%":
+          return x % y;
+      }
+      if (Number.isNaN(x) || Number.isNaN(y)) return false;
+      switch (e.op) {
+        case "<":
+          return x < y;
+        case "<=":
+          return x <= y;
+        case ">":
+          return x > y;
+        case ">=":
+          return x >= y;
+        case "==":
+          return typeof a === "boolean" && typeof b === "boolean" ? a === b : x === y;
+        default:
+          return typeof a === "boolean" && typeof b === "boolean" ? a !== b : x !== y;
+      }
+    }
   }
 }
-function mentionsMetric(condition) {
-  return condition.split("||").some((any) => any.split("&&").some((all) => metricTerm(all) !== null));
+function exprNames(e) {
+  const out = [];
+  const walk = (x) => {
+    switch (x.k) {
+      case "name":
+        if (!out.includes(x.name)) out.push(x.name);
+        break;
+      case "not":
+      case "neg":
+        walk(x.e);
+        break;
+      case "bin":
+        walk(x.l);
+        walk(x.r);
+        break;
+      case "call":
+        x.args.forEach(walk);
+        break;
+    }
+  };
+  walk(e);
+  return out;
 }
-function conditionNames(condition) {
+function exprMetrics(e) {
   const out = [];
-  for (const any of condition.split("||")) {
-    for (const all of any.split("&&")) {
-      if (metricTerm(all) !== null) continue;
-      let term = trim(all);
-      if (term.startsWith("!")) term = trim(term.slice(1));
-      if (!isName(term)) return null;
-      out.push(term);
+  const walk = (x) => {
+    switch (x.k) {
+      case "metric":
+        out.push({ metric: x.metric, target: x.target });
+        break;
+      case "not":
+      case "neg":
+        walk(x.e);
+        break;
+      case "bin":
+        walk(x.l);
+        walk(x.r);
+        break;
+      case "call":
+        x.args.forEach(walk);
+        break;
     }
-  }
+  };
+  walk(e);
   return out;
 }
+var isDigit = (c) => c !== void 0 && c >= "0" && c <= "9";
+var isLetter = (c) => c !== void 0 && (c === "_" || c >= "a" && c <= "z" || c >= "A" && c <= "Z");
+var Parser = class {
+  constructor(text) {
+    __publicField(this, "s");
+    __publicField(this, "i", 0);
+    this.s = [...text];
+  }
+  atEnd() {
+    this.skip();
+    return this.i === this.s.length;
+  }
+  skip() {
+    while (this.i < this.s.length && " 	\n\r".includes(this.s[this.i])) this.i++;
+  }
+  eat(token) {
+    this.skip();
+    const t = [...token];
+    if (this.i + t.length > this.s.length) return false;
+    for (let k = 0; k < t.length; k++) if (this.s[this.i + k] !== t[k]) return false;
+    if (t.length === 1 && this.s[this.i + 1] === "=" && "<>!=".includes(t[0])) return false;
+    this.i += t.length;
+    return true;
+  }
+  or() {
+    let l = this.and();
+    if (!l) return null;
+    while (this.eat("||")) {
+      const r = this.and();
+      if (!r) return null;
+      l = { k: "bin", op: "||", l, r };
+    }
+    return l;
+  }
+  and() {
+    let l = this.compare();
+    if (!l) return null;
+    while (this.eat("&&")) {
+      const r = this.compare();
+      if (!r) return null;
+      l = { k: "bin", op: "&&", l, r };
+    }
+    return l;
+  }
+  compare() {
+    const l = this.sum();
+    if (!l) return null;
+    for (const op of ["<=", ">=", "==", "!=", "<", ">"]) {
+      if (this.eat(op)) {
+        const r = this.sum();
+        return r ? { k: "bin", op, l, r } : null;
+      }
+    }
+    return l;
+  }
+  sum() {
+    let l = this.product();
+    if (!l) return null;
+    for (; ; ) {
+      const op = this.eat("+") ? "+" : this.eat("-") ? "-" : null;
+      if (!op) return l;
+      const r = this.product();
+      if (!r) return null;
+      l = { k: "bin", op, l, r };
+    }
+  }
+  product() {
+    let l = this.unary();
+    if (!l) return null;
+    for (; ; ) {
+      const op = ["*", "/", "%"].find((o) => this.eat(o));
+      if (!op) return l;
+      const r = this.unary();
+      if (!r) return null;
+      l = { k: "bin", op, l, r };
+    }
+  }
+  unary() {
+    if (this.eat("!")) {
+      const e = this.unary();
+      return e ? { k: "not", e } : null;
+    }
+    if (this.eat("-")) {
+      const e = this.unary();
+      return e ? { k: "neg", e } : null;
+    }
+    return this.primary();
+  }
+  primary() {
+    this.skip();
+    if (this.i >= this.s.length) return null;
+    if (this.eat("(")) {
+      const e = this.or();
+      return e && this.eat(")") ? e : null;
+    }
+    const s = this.s;
+    const c = s[this.i];
+    if (isDigit(c)) {
+      const start3 = this.i;
+      while (isDigit(s[this.i])) this.i++;
+      if (s[this.i] === "." && isDigit(s[this.i + 1])) {
+        this.i++;
+        while (isDigit(s[this.i])) this.i++;
+      }
+      return { k: "lit", v: Number(s.slice(start3, this.i).join("")) };
+    }
+    if (!isLetter(c)) return null;
+    const start2 = this.i;
+    while (isLetter(s[this.i]) || isDigit(s[this.i])) this.i++;
+    const name = s.slice(start2, this.i).join("");
+    if (name.length > MAX_NAME) return null;
+    let j = this.i;
+    while (s[j] === " " || s[j] === "	") j++;
+    const called = s[j] === "(";
+    if (METRIC_NAMES.includes(name)) {
+      if (!called) return { k: "metric", metric: name, target: "" };
+      this.eat("(");
+      const from = this.i;
+      while (this.i < s.length && s[this.i] !== ")" && s[this.i] !== "(") this.i++;
+      if (s[this.i] !== ")") return null;
+      const target = s.slice(from, this.i).join("").replace(/^[ \t]+|[ \t]+$/g, "");
+      this.i++;
+      return { k: "metric", metric: name, target };
+    }
+    if (name in FUNCTIONS) {
+      if (!called || !this.eat("(")) return null;
+      const args = [];
+      if (!this.eat(")")) {
+        do {
+          const a = this.or();
+          if (!a) return null;
+          args.push(a);
+        } while (this.eat(","));
+        if (!this.eat(")")) return null;
+      }
+      const arity = FUNCTIONS[name];
+      if (arity !== null ? args.length !== arity : args.length === 0) return null;
+      return { k: "call", fn: name, args };
+    }
+    if (called) return null;
+    if (name === "true") return { k: "lit", v: true };
+    if (name === "false") return { k: "lit", v: false };
+    return { k: "name", name };
+  }
+};
+function describeVar(v) {
+  return typeof v === "boolean" ? v ? "true" : "false" : formatTwo(v);
+}
+function formatTwo(v) {
+  const n = Math.floor(Math.abs(v) * 100 + 0.5);
+  if (!(n < 1e15)) return v < 0 ? "-\u221E" : "\u221E";
+  const whole = Math.floor(n / 100), part = n - whole * 100;
+  let s = String(whole);
+  if (part > 0) s += "." + String(part).padStart(2, "0").replace(/0+$/, "");
+  return (v < 0 && n > 0 ? "-" : "") + s;
+}
+function filling(text, values) {
+  if (!text.includes("{")) return text;
+  let out = "", rest = text;
+  for (let open = rest.indexOf("{"); open >= 0; open = rest.indexOf("{")) {
+    out += rest.slice(0, open);
+    const close = rest.indexOf("}", open);
+    if (close < 0) {
+      out += rest.slice(open);
+      rest = "";
+      break;
+    }
+    const inner = rest.slice(open + 1, close);
+    const e = inner.includes("{") ? null : parseExpr(inner);
+    const names = e ? exprNames(e) : [];
+    if (e && exprMetrics(e).length === 0 && names.length > 0 && names.every((n) => values[n] !== void 0)) out += describeVar(evaluate(e, values));
+    else out += rest.slice(open, close + 1);
+    rest = rest.slice(close + 1);
+  }
+  return out + rest;
+}
+
+// src/state.ts
+var MAX_NAME2 = 64;
+function isName(name) {
+  return name.length <= MAX_NAME2 && /^[A-Za-z_][A-Za-z0-9_]*$/.test(name);
+}
+function mentionsMetric(condition) {
+  const e = parseExpr(condition);
+  return e !== null && exprMetrics(e).length > 0;
+}
 function holds(condition, state, metric = null) {
-  if (conditionNames(condition) === null) return false;
-  return condition.split("||").some((any) => any.split("&&").every((all) => {
-    const m = metricTerm(all);
-    if (m !== null) {
-      const v = metric ? metric(m) : null;
-      return v !== null && passes(m, v);
-    }
-    let term = trim(all);
-    let negated = false;
-    if (term.startsWith("!")) {
-      negated = true;
-      term = trim(term.slice(1));
-    }
-    return (state[term] ?? false) !== negated;
-  }));
+  const e = parseExpr(condition);
+  if (!e) return false;
+  return truthy(evaluate(e, state, metric ? (m, target) => metric({ metric: m, target, op: "", value: 0 }) : null));
 }
 function stateValues(page, choice) {
   if (choice === "all") return null;
@@ -117,7 +367,7 @@ function applyOverride(o, e) {
   return out;
 }
 function changesState(c) {
-  return !!c && (c.reset === true || Object.keys(c.set ?? {}).length > 0 || (c.toggle ?? []).length > 0);
+  return !!c && (c.reset === true || Object.keys(c.set ?? {}).length > 0 || (c.toggle ?? []).length > 0 || !!c.run);
 }
 function applyClick(c, state, initial = {}) {
   let out = { ...state };
@@ -126,12 +376,15 @@ function applyClick(c, state, initial = {}) {
     for (const k of Object.keys(state)) out[k] = false;
     Object.assign(out, initial);
   }
-  for (const [k, v] of Object.entries(c.set ?? {})) out[k] = v;
-  for (const k of c.toggle ?? []) out[k] = !(out[k] ?? false);
+  const before = { ...out };
+  for (const [k, v] of Object.entries(c.set ?? {})) out[k] = clickValue(v, before, before[k]);
+  for (const k of c.toggle ?? []) out[k] = !truthy(out[k] ?? false);
   return out;
 }
-function trim(s) {
-  return s.replace(/^[ \t ]+|[ \t ]+$/g, "");
+function clickValue(v, state, current) {
+  if (typeof v !== "string") return v;
+  const e = parseExpr(v);
+  return e ? evaluate(e, state) : current ?? false;
 }
 
 // src/theme.ts
@@ -193,12 +446,12 @@ function resolvingPalette(page) {
 }
 
 // src/model.ts
-var SUPPORTED_VERSION = 2;
+var SUPPORTED_VERSION = 3;
 var KINDS = ["rectangle", "ellipse", "diamond", "text", "connector", "freehand", "path", "note", "image", "symbol"];
 var EASES = ["linear", "easeIn", "easeOut", "easeInOut", "hold", "spring", "bounce", "elastic"];
 var KNOWN_FIELDS = {
   file: ["version", "pages", "images"],
-  page: ["id", "name", "layers", "elements", "theme", "customTheme", "guidesX", "guidesY", "guidesLocked", "timeline", "symbols", "variables", "flows"],
+  page: ["id", "name", "layers", "elements", "theme", "customTheme", "logic", "guidesX", "guidesY", "guidesLocked", "timeline", "symbols", "variables", "flows"],
   flow: ["id", "from", "to", "every", "speed", "color", "size", "when", "spread", "volume", "overrides"],
   flowOverride: ["when", "volume"],
   symbol: ["id", "name", "width", "height", "layers", "elements", "timeline", "button", "params"],
@@ -267,7 +520,7 @@ var KNOWN_FIELDS = {
   repeat: ["start", "end", "count"],
   cameraKey: ["t", "x", "y", "width", "height", "ease"],
   marker: ["t", "name", "loop"],
-  click: ["scene", "url", "set", "toggle", "reset"],
+  click: ["scene", "url", "set", "toggle", "reset", "run"],
   hover: ["stroke", "fill", "opacity"],
   override: ["when", "stroke", "fill", "textColor", "opacity", "strokeWidth", "dash", "text", "reroute", "offline", "cost", "capacity", "delay"]
 };
@@ -281,7 +534,7 @@ var inkOnDark = { r: 0.93, g: 0.93, b: 0.94, a: 1 };
 var DottieFormatError = class extends Error {
 };
 var isObj = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
-var num = (v) => typeof v === "number" && Number.isFinite(v) ? v : void 0;
+var num2 = (v) => typeof v === "number" && Number.isFinite(v) ? v : void 0;
 var str = (v) => typeof v === "string" ? v : void 0;
 var strings = (v) => isObj(v) && Object.values(v).every((x) => typeof x === "string") ? { ...v } : null;
 var bool = (v) => typeof v === "boolean" ? v : void 0;
@@ -305,9 +558,9 @@ function webLink(url) {
 }
 function rgba(v) {
   if (!isObj(v)) return void 0;
-  const r = num(v.r), g = num(v.g), b = num(v.b);
+  const r = num2(v.r), g = num2(v.g), b = num2(v.b);
   if (r === void 0 || g === void 0 || b === void 0) return void 0;
-  return { r, g, b, a: num(v.a) ?? 1 };
+  return { r, g, b, a: num2(v.a) ?? 1 };
 }
 var Reader = class {
   constructor() {
@@ -336,15 +589,15 @@ var Reader = class {
       stroke: rgba(s.stroke) ?? { ...black },
       fill: rgba(s.fill) ?? { ...clear },
       fillStyle: ["solid", "hachure", "crossHatch", "grid"].includes(fillStyle) ? fillStyle : "solid",
-      strokeWidth: num(s.strokeWidth) ?? 2,
+      strokeWidth: num2(s.strokeWidth) ?? 2,
       dash: ["solid", "dashed", "dotted"].includes(dash) ? dash : "solid",
-      roughness: num(s.roughness) ?? 1,
-      bowing: num(s.bowing) ?? 1,
-      fontSize: num(s.fontSize) ?? 18,
+      roughness: num2(s.roughness) ?? 1,
+      bowing: num2(s.bowing) ?? 1,
+      fontSize: num2(s.fontSize) ?? 18,
       font: str(s.font) || null,
-      gridSize: num(s.gridSize) ?? null,
-      opacity: num(s.opacity) ?? null,
-      dashOffset: num(s.dashOffset) ?? null,
+      gridSize: num2(s.gridSize) ?? null,
+      opacity: num2(s.opacity) ?? null,
+      dashOffset: num2(s.dashOffset) ?? null,
       textColor: rgba(s.textColor) ?? null,
       named: this.colorNames(s.named)
     };
@@ -378,13 +631,13 @@ var Reader = class {
   endpoint(v) {
     const e = isObj(v) ? v : {};
     const port = str(e.port);
-    const portIndex = num(e.portIndex);
+    const portIndex = num2(e.portIndex);
     return {
       elementID: uuid(e.elementID) ?? null,
       port: port && ["top", "right", "bottom", "left"].includes(port) ? port : null,
       portIndex: portIndex !== void 0 && Number.isInteger(portIndex) && portIndex >= 0 ? portIndex : null,
-      x: num(e.x) ?? 0,
-      y: num(e.y) ?? 0
+      x: num2(e.x) ?? 0,
+      y: num2(e.y) ?? 0
     };
   }
   connector(v) {
@@ -403,7 +656,7 @@ var Reader = class {
       endHead: head(v.endHead, "arrow"),
       waypoints: Array.isArray(v.waypoints) ? v.waypoints.filter(isObj).map((w) => {
         this.fields(w, "waypoint");
-        return { x: num(w.x) ?? 0, y: num(w.y) ?? 0 };
+        return { x: num2(w.x) ?? 0, y: num2(w.y) ?? 0 };
       }) : null,
       hops: typeof v.hops === "boolean" ? v.hops : null,
       avoid: typeof v.avoid === "boolean" ? v.avoid : null,
@@ -439,20 +692,20 @@ var Reader = class {
       id,
       kind,
       layerID,
-      x: num(v.x) ?? 0,
-      y: num(v.y) ?? 0,
-      width: num(v.width) ?? 0,
-      height: num(v.height) ?? 0,
+      x: num2(v.x) ?? 0,
+      y: num2(v.y) ?? 0,
+      width: num2(v.width) ?? 0,
+      height: num2(v.height) ?? 0,
       style: this.style(v.style),
-      seed: (num(v.seed) ?? 1) >>> 0,
+      seed: (num2(v.seed) ?? 1) >>> 0,
       text: str(v.text) ?? null,
       connector: this.connector(v.connector),
       groupID: uuid(v.groupID) ?? null,
-      points: Array.isArray(v.points) ? v.points.filter(isObj).map((p) => ({ x: num(p.x) ?? 0, y: num(p.y) ?? 0 })) : null,
+      points: Array.isArray(v.points) ? v.points.filter(isObj).map((p) => ({ x: num2(p.x) ?? 0, y: num2(p.y) ?? 0 })) : null,
       path: Array.isArray(v.path) ? v.path.filter((c) => typeof c === "number") : null,
       subpaths,
       evenOdd: bool(v.evenOdd) ?? null,
-      rotation: num(v.rotation) ?? null,
+      rotation: num2(v.rotation) ?? null,
       link: uuid(v.link) ?? null,
       url: str(v.url) ?? null,
       anchor: str(v.anchor) ?? null,
@@ -462,18 +715,18 @@ var Reader = class {
       overrides: this.overrides(v.overrides),
       symbol: uuid(v.symbol) ?? null,
       playback: this.playback(v.playback),
-      offset: num(v.offset) ?? null,
+      offset: num2(v.offset) ?? null,
       args: strings(v.args),
       image: this.image(v.image, images),
-      reveal: num(v.reveal) ?? null,
+      reveal: num2(v.reveal) ?? null,
       ports: Array.isArray(v.ports) ? v.ports.map((p) => {
         const o = isObj(p) ? p : {};
-        return { x: num(o.x) ?? 0, y: num(o.y) ?? 0 };
+        return { x: num2(o.x) ?? 0, y: num2(o.y) ?? 0 };
       }) : null,
       labelRect: this.labelRect(v.labelRect),
       extension: this.extension(v.extension),
-      capacity: num(v.capacity) ?? null,
-      delay: num(v.delay) ?? null,
+      capacity: num2(v.capacity) ?? null,
+      delay: num2(v.delay) ?? null,
       queue: v.queue === true ? true : null,
       gauge: this.gauge(v.gauge),
       containerID: uuid(v.containerID) ?? null,
@@ -498,7 +751,7 @@ var Reader = class {
   labelRect(v) {
     if (!isObj(v)) return null;
     this.fields(v, "normalizedRect");
-    return { x: num(v.x) ?? 0, y: num(v.y) ?? 0, width: num(v.width) ?? 0, height: num(v.height) ?? 0 };
+    return { x: num2(v.x) ?? 0, y: num2(v.y) ?? 0, width: num2(v.width) ?? 0, height: num2(v.height) ?? 0 };
   }
   extension(v) {
     if (!isObj(v)) return null;
@@ -519,7 +772,7 @@ var Reader = class {
   variables(v) {
     if (!isObj(v)) return null;
     const out = {};
-    for (const [k, b] of Object.entries(v)) if (typeof b === "boolean") out[k] = b;
+    for (const [k, b] of Object.entries(v)) if (typeof b === "boolean" || typeof b === "number" && Number.isFinite(b)) out[k] = b;
     return Object.keys(out).length > 0 ? out : null;
   }
   click(v) {
@@ -531,12 +784,22 @@ var Reader = class {
     let set = null;
     if (isObj(v.set)) {
       set = {};
-      for (const [k, b] of Object.entries(v.set)) if (typeof b === "boolean" && isName(k)) set[k] = b;
+      for (const [k, b] of Object.entries(v.set)) {
+        if (isName(k) && (typeof b === "boolean" || typeof b === "string" || typeof b === "number" && Number.isFinite(b))) set[k] = b;
+      }
       if (Object.keys(set).length === 0) set = null;
     }
     const raw = typeof v.toggle === "string" ? [v.toggle] : Array.isArray(v.toggle) && v.toggle.every((x) => typeof x === "string") ? v.toggle : null;
     const toggle = raw ? raw.filter(isName) : null;
-    return { scene: str(v.scene) ?? null, url: safe, set, toggle: toggle && toggle.length > 0 ? toggle : null, reset: v.reset === true ? true : null };
+    const run = str(v.run);
+    return {
+      scene: str(v.scene) ?? null,
+      url: safe,
+      set,
+      toggle: toggle && toggle.length > 0 ? toggle : null,
+      reset: v.reset === true ? true : null,
+      run: run !== void 0 && isName(run) ? run : null
+    };
   }
   playback(v) {
     const s = str(v);
@@ -552,7 +815,7 @@ var Reader = class {
       return null;
     }
     const size = (x) => {
-      const n = num(x);
+      const n = num2(x);
       return Math.max(1, n ?? 100);
     };
     const layers = (Array.isArray(v.layers) ? v.layers : []).filter(isObj).flatMap((l) => {
@@ -589,8 +852,8 @@ var Reader = class {
         stroke: rgba(o.stroke) ?? null,
         fill: rgba(o.fill) ?? null,
         textColor: rgba(o.textColor) ?? null,
-        opacity: num(o.opacity) ?? null,
-        strokeWidth: num(o.strokeWidth) ?? null,
+        opacity: num2(o.opacity) ?? null,
+        strokeWidth: num2(o.strokeWidth) ?? null,
         dash: dash !== void 0 && ["solid", "dashed", "dotted"].includes(dash) ? dash : null,
         text: str(o.text) ?? null,
         reroute,
@@ -604,7 +867,7 @@ var Reader = class {
   hover(v) {
     if (!isObj(v)) return null;
     this.fields(v, "hover");
-    return { stroke: rgba(v.stroke) ?? null, fill: rgba(v.fill) ?? null, opacity: num(v.opacity) ?? null };
+    return { stroke: rgba(v.stroke) ?? null, fill: rgba(v.fill) ?? null, opacity: num2(v.opacity) ?? null };
   }
   ease(v) {
     const s = str(v);
@@ -618,11 +881,11 @@ var Reader = class {
   keyframe(v) {
     if (!isObj(v)) return null;
     this.fields(v, "keyframe");
-    const t = num(v.t);
+    const t = num2(v.t);
     if (t === void 0) return null;
     const k = { t };
     for (const p of ["x", "y", "width", "height", "rotation", "strokeWidth", "reveal", "opacity"]) {
-      const n = num(v[p]);
+      const n = num2(v[p]);
       if (n !== void 0) k[p] = n;
     }
     const stroke = rgba(v.stroke), fill = rgba(v.fill), visible = bool(v.visible), ease = this.ease(v.ease);
@@ -640,39 +903,39 @@ var Reader = class {
     const keys = (Array.isArray(v.keys) ? v.keys : []).map((k) => this.keyframe(k)).filter((k) => k !== null && k.t >= 0 && k.t <= MAX_DURATION);
     stableSortBy(keys, (k) => k.t);
     const follow = Array.isArray(v.follow) ? v.follow.filter(isObj).flatMap((f) => {
-      const path = uuid(f.path), start2 = num(f.start), end = num(f.end);
+      const path = uuid(f.path), start2 = num2(f.start), end = num2(f.end);
       if (!path || start2 === void 0 || end === void 0 || start2 < 0 || end > MAX_DURATION) return [];
-      return [{ path, start: start2, end, ease: this.ease(f.ease), reverse: bool(f.reverse) ?? null, orient: bool(f.orient) ?? null, laps: num(f.laps) ?? null }];
+      return [{ path, start: start2, end, ease: this.ease(f.ease), reverse: bool(f.reverse) ?? null, orient: bool(f.orient) ?? null, laps: num2(f.laps) ?? null }];
     }) : null;
     const repeats = Array.isArray(v.repeats) ? v.repeats.filter(isObj).flatMap((r) => {
-      const start2 = num(r.start), end = num(r.end);
+      const start2 = num2(r.start), end = num2(r.end);
       if (start2 === void 0 || end === void 0) return [];
-      const count = num(r.count);
+      const count = num2(r.count);
       const rep = { start: start2, end, count: count === void 0 ? null : Math.trunc(count) };
       return repeatIsValid(rep) ? [rep] : [];
     }) : null;
-    return { element, keys, boil: bool(v.boil) ?? null, follow, repeats, march: clampMarch(num(v.march)) };
+    return { element, keys, boil: bool(v.boil) ?? null, follow, repeats, march: clampMarch(num2(v.march)) };
   }
   timeline(v) {
     if (!isObj(v)) return null;
     this.fields(v, "timeline");
-    const boil = num(v.boil);
+    const boil = num2(v.boil);
     const camera = Array.isArray(v.camera) ? v.camera.filter(isObj).flatMap((c) => {
-      const t = num(c.t), x = num(c.x), y = num(c.y), width = num(c.width), height = num(c.height);
+      const t = num2(c.t), x = num2(c.x), y = num2(c.y), width = num2(c.width), height = num2(c.height);
       if (t === void 0 || x === void 0 || y === void 0 || width === void 0 || height === void 0) return [];
       if (!(width > 1 && height > 1 && t >= 0)) return [];
       return [{ t, x, y, width, height, ease: this.ease(c.ease) }];
     }) : null;
     if (camera) stableSortBy(camera, (c) => c.t);
     const markers = Array.isArray(v.markers) ? v.markers.filter(isObj).flatMap((m) => {
-      const t = num(m.t);
+      const t = num2(m.t);
       return t !== void 0 && t >= 0 ? [{ t, name: str(m.name) ?? "", loop: bool(m.loop) ?? null }] : [];
     }) : null;
     if (markers) stableSortBy(markers, (m) => m.t);
-    const poster = num(v.poster);
+    const poster = num2(v.poster);
     return {
-      fps: clampFPS(num(v.fps) ?? 12),
-      duration: clampTime(num(v.duration) ?? 0),
+      fps: clampFPS(num2(v.fps) ?? 12),
+      duration: clampTime(num2(v.duration) ?? 0),
       boil: boil !== void 0 && Number.isInteger(boil) && boil > 0 ? Math.min(boil, 1e4) : null,
       settle: bool(v.settle) ?? null,
       poster: poster === void 0 ? null : clampTime(poster),
@@ -699,6 +962,7 @@ var Reader = class {
       elements: (Array.isArray(v.elements) ? v.elements : []).map((e) => this.element(e, images)).filter((e) => e !== null),
       theme: str(v.theme) ?? null,
       customTheme: this.customTheme(v.customTheme),
+      logic: typeof v.logic === "string" && v.logic.length > 0 ? v.logic : null,
       timeline: this.timeline(v.timeline),
       symbols: Array.isArray(v.symbols) ? v.symbols.map((x) => this.symbol(x, images)).filter((x) => x !== null) : null,
       variables: this.variables(v.variables),
@@ -710,7 +974,7 @@ var Reader = class {
     this.fields(f, "flow");
     const id = (x) => typeof x === "string" && UUID.test(x) ? x.toUpperCase() : NO_ID;
     const finite = (x) => {
-      const n = num(x);
+      const n = num2(x);
       return n !== void 0 && Number.isFinite(n) ? n : null;
     };
     return {
@@ -750,7 +1014,7 @@ function parseDottie(source) {
     }
   }
   if (!isObj(json)) throw new DottieFormatError("Not a Dottie drawing");
-  const version = num(json.version);
+  const version = num2(json.version);
   if (version === void 0) throw new DottieFormatError("Not a Dottie drawing (no version)");
   if (!Array.isArray(json.pages) || json.pages.length === 0) throw new DottieFormatError("A drawing needs at least one page");
   const reader = new Reader();
@@ -2998,7 +3262,7 @@ function hopCrossings(e, r, page, index) {
   for (const samples of segments) {
     const along = runningLengths(samples);
     const length = along[along.length - 1];
-    const found = [];
+    const found2 = [];
     const near = [];
     const whole = boxOf(samples);
     for (let n = 0; n < count; n++) if (touching(whole, lines[n].box)) near.push(lines[n]);
@@ -3015,12 +3279,12 @@ function hopCrossings(e, r, page, index) {
           if (Math.abs(det) < 1e-9) continue;
           const wx = a.x - p.x, wy = a.y - p.y;
           const t = (wx * ey - wy * ex) / det, s = (wx * dy - wy * dx) / det;
-          if (t > 0 && t < 1 && s >= 0 && s <= 1) found.push(along[i] + t * (along[i + 1] - along[i]));
+          if (t > 0 && t < 1 && s >= 0 && s <= 1) found2.push(along[i] + t * (along[i + 1] - along[i]));
         }
       }
     }
     const kept = [];
-    for (const at of found.sort((x, y) => x - y)) {
+    for (const at of found2.sort((x, y) => x - y)) {
       if (at < rad + 2 || at > length - rad - 2) continue;
       if (kept.length > 0 && at - kept[kept.length - 1] < 2 * rad + 2) continue;
       kept.push(at);
@@ -3234,7 +3498,7 @@ var lerpColor = (a, b, u) => ({
   b: mix01(a.b, b.b, u),
   a: mix01(a.a, b.a, u)
 });
-function num2(track, t, p, base2) {
+function num3(track, t, p, base2) {
   return value(track, t, (k) => k[p], base2, lerpNum);
 }
 function isChanging(track, t) {
@@ -3260,20 +3524,20 @@ function isVisible(track, t) {
 function applyTrack(track, e, t) {
   e = cloneElement(e);
   if (track.keys.some((k) => k.reveal !== void 0)) {
-    const r = num2(track, t, "reveal", e.reveal ?? 1);
+    const r = num3(track, t, "reveal", e.reveal ?? 1);
     e.reveal = r >= 1 ? null : Math.max(0, r);
   }
   if (track.keys.some((k) => k.opacity !== void 0)) {
-    const o = Math.min(Math.max(num2(track, t, "opacity", e.style.opacity ?? 1), 0), 1);
+    const o = Math.min(Math.max(num3(track, t, "opacity", e.style.opacity ?? 1), 0), 1);
     e.style.opacity = o >= 1 ? null : o;
   }
   if (e.kind === "connector") return e;
-  e.x = num2(track, t, "x", e.x);
-  e.y = num2(track, t, "y", e.y);
-  e.width = Math.max(0, num2(track, t, "width", e.width));
-  e.height = Math.max(0, num2(track, t, "height", e.height));
-  if (track.keys.some((k) => k.rotation !== void 0)) e.rotation = num2(track, t, "rotation", angle(e));
-  e.style.strokeWidth = Math.max(0, num2(track, t, "strokeWidth", e.style.strokeWidth));
+  e.x = num3(track, t, "x", e.x);
+  e.y = num3(track, t, "y", e.y);
+  e.width = Math.max(0, num3(track, t, "width", e.width));
+  e.height = Math.max(0, num3(track, t, "height", e.height));
+  if (track.keys.some((k) => k.rotation !== void 0)) e.rotation = num3(track, t, "rotation", angle(e));
+  e.style.strokeWidth = Math.max(0, num3(track, t, "strokeWidth", e.style.strokeWidth));
   e.style.stroke = value(track, t, (k) => k.stroke, e.style.stroke, lerpColor);
   e.style.fill = value(track, t, (k) => k.fill, e.style.fill, lerpColor);
   return e;
@@ -3349,7 +3613,8 @@ function posedWithMetrics(page, t, state = "initial", since = null, carried = {}
   }
   const flowing = (page.flows ?? []).length > 0;
   const measuring = flowing || page.elements.some((e) => e.gauge || (e.overrides ?? []).some((o) => mentionsMetric(o.when)));
-  const timeline = page.timeline ?? (off.size === 0 && active.size === 0 && !measuring ? null : EMPTY_TIMELINE);
+  const fills = values !== null && Object.keys(values).length > 0 && page.elements.some((e) => e.text?.includes("{") || (e.overrides ?? []).some((o) => o.text?.includes("{")));
+  const timeline = page.timeline ?? (off.size === 0 && active.size === 0 && !measuring && !fills ? null : EMPTY_TIMELINE);
   if (!timeline) return { frame: page, metrics: emptyMetrics() };
   t = clampTime(t);
   const tracks = trackMap(timeline);
@@ -3385,6 +3650,10 @@ function posedWithMetrics(page, t, state = "initial", since = null, carried = {}
     const track = tracks.get(e.id);
     let out = track ? applyTrack(track, e, t) : e;
     for (const o of active.get(e.id) ?? []) out = applyOverride(o, out);
+    if (fills && values && out.text) {
+      const text = filling(out.text, values);
+      if (text !== out.text) out = { ...out, text };
+    }
     const list = active.get(e.id);
     if (list) {
       const caps = list.map((o) => o.capacity).filter((c) => c !== null && Number.isFinite(c));
@@ -3702,7 +3971,12 @@ function clickTargets(page, file) {
   let pageOf = null;
   for (const e of page.elements) {
     const c = e.click;
-    const state = c && changesState(c) ? { ...c.set ? { set: c.set } : {}, ...c.toggle ? { toggle: c.toggle } : {}, ...c.reset ? { reset: true } : {} } : null;
+    const state = c && changesState(c) ? {
+      ...c.set ? { set: c.set } : {},
+      ...c.toggle ? { toggle: c.toggle } : {},
+      ...c.reset ? { reset: true } : {},
+      ...c.run ? { run: c.run } : {}
+    } : null;
     if (c?.scene) {
       const i = sceneNamed(c.scene, markers);
       if (i >= 0) {
@@ -4725,6 +4999,40 @@ function start() {
   return w;
 }
 
+// src/logic-loader.ts
+var scriptSrc = typeof document !== "undefined" ? document.currentScript?.src ?? null : null;
+var found = null;
+var present = () => globalThis.DottieLogic;
+function logicEngine() {
+  found ?? (found = (async () => {
+    if (!present()) {
+      const here = import.meta.url;
+      const base2 = here ?? scriptSrc;
+      if (!base2) throw new Error("No dottie-logic.min.js on the page, and no address to find it from");
+      const url = new URL("./dottie-logic.min.js", base2).href;
+      if (here) await import(
+        /* @vite-ignore */
+        url
+      );
+      else await new Promise((resolve2, reject) => {
+        const s = document.createElement("script");
+        s.src = url;
+        s.onload = () => resolve2();
+        s.onerror = () => reject(new Error(`Couldn't load ${url}`));
+        document.head.append(s);
+      });
+    }
+    const engine = present();
+    if (!engine) throw new Error("dottie-logic.min.js didn't load");
+    await engine.loadLogic();
+    return engine;
+  })());
+  found.catch(() => {
+    found = null;
+  });
+  return found;
+}
+
 // src/player.ts
 var WHITE = { r: 1, g: 1, b: 1, a: 1 };
 function pageIndex(file, spec) {
@@ -5066,6 +5374,9 @@ var DottiePlayer = class extends ElementBase {
     __publicField(this, "stillTime", null);
     __publicField(this, "visible", true);
     __publicField(this, "observer", null);
+    /** Runs handler `handler` from the page's logic for a click on `id` (DottieDocument.clicked). Clicks take turns, so
+     * each handler sees the state the one before left. */
+    __publicField(this, "logicQueue", Promise.resolve());
     this.root = this.attachShadow({ mode: "open" });
     this.root.innerHTML = `<style>${STYLE}</style><div class="stage" part="stage" role="img"></div>
 <div class="bar" part="controls" hidden>
@@ -5292,7 +5603,9 @@ var DottiePlayer = class extends ElementBase {
       this.scheduleReplay();
     }
     if (!click) return;
-    if (click.set || click.toggle || click.reset) {
+    if (click.run && p.page.logic && this.hasAttribute("allow-logic")) {
+      this.runLogic(click.run, id, click.reset === true);
+    } else if (click.set || click.toggle || click.reset) {
       this.setState(applyClick(
         { scene: null, url: null, set: click.set ?? null, toggle: click.toggle ?? null, reset: click.reset ?? null },
         p.state,
@@ -5314,6 +5627,35 @@ var DottiePlayer = class extends ElementBase {
       }
     }
   }
+  runLogic(handler, id, reset) {
+    const p = this.playback;
+    if (!p) return;
+    const e = p.page.elements.find((x) => x.id === id);
+    const s = p.sceneAt(p.frame);
+    const event = {
+      id,
+      anchor: e?.anchor ?? null,
+      text: e?.text?.split("\n")[0] ?? null,
+      time: this.currentTime,
+      scene: s < 0 ? null : p.sceneNames[s]
+    };
+    this.logicQueue = this.logicQueue.then(async () => {
+      const engine = await logicEngine();
+      const now = this.playback;
+      if (!now || now !== p || !now.page.logic) return;
+      let start2 = now.state;
+      if (reset) {
+        start2 = {};
+        for (const k of Object.keys(now.state)) start2[k] = false;
+        Object.assign(start2, now.page.variables ?? {});
+      }
+      const r = engine.runLogic(now.page.logic, handler, start2, event);
+      if (r.ok) this.setState({ ...start2, ...r.set });
+      else this.dispatchEvent(new CustomEvent("logicerror", { detail: { element: id, handler, error: r.error } }));
+    }).catch((err) => {
+      this.dispatchEvent(new CustomEvent("logicerror", { detail: { element: id, handler, error: err.message } }));
+    });
+  }
   /** The page's variables now. */
   get variables() {
     return { ...this.playback?.state ?? {} };
@@ -5420,7 +5762,7 @@ var DottiePlayer = class extends ElementBase {
     if (handled) e.preventDefault();
   }
 };
-__publicField(DottiePlayer, "observedAttributes", ["src", "page", "at", "clean", "no-controls", "label"]);
+__publicField(DottiePlayer, "observedAttributes", ["src", "page", "at", "clean", "no-controls", "label", "allow-logic"]);
 function clickable(target) {
   const el = target;
   return el && typeof el.closest === "function" ? el.closest(".dottie-a") : null;
@@ -5525,7 +5867,7 @@ function render(source, options = {}) {
 function isFile(v) {
   return typeof v === "object" && v !== null && Array.isArray(v.pages) && Array.isArray(v.warnings);
 }
-var VERSION = "0.10.0";
+var VERSION = "0.11.0";
 export {
   BOIL_DRAWINGS,
   BUNDLED_FONTS,