@weasel-js/animator 1.15.1 → 1.16.0

package/dist/{chunk-H7WENFPC.js → chunk-TXKTFZIW.js}

@@ -1,6 +1,6 @@
 import { isPlainObject, createEmitter } from '@weasel-js/registry';
+import { wrapAngle, resolveEasing } from '@weasel-js/geom';
 import { keys } from '@msb235/blits';
-import { resolveEasing } from '@weasel-js/geom';
 
 // src/engine/axes.ts
 function fieldByField(keys) {
@@ -269,204 +269,6 @@ function createTarget(opts) {
   states.set(target, s);
   return target;
 }
-
-// src/engine/offsets.ts
-var TAU = Math.PI * 2;
-function axesFor(axes, value, what) {
-  const a = axes.to(value);
-  if (a.length !== axes.count || !a.every((x) => typeof x === "number" && !Number.isNaN(x))) {
-    throw new Error(`animator: \`${what}\` is not the target's shape`);
-  }
-  return a;
-}
-function shortWay(x) {
-  x %= TAU;
-  if (x > Math.PI) return x - TAU;
-  if (x <= -Math.PI) return x + TAU;
-  return x;
-}
-function travel(axes, a, b) {
-  const d = a.map((x, i) => x - b[i]);
-  for (const i of axes.angles ?? []) d[i] = shortWay(d[i]);
-  return d;
-}
-var plus = (a, b) => a.map((x, i) => x + b[i]);
-var minus = (a, b) => a.map((x, i) => x - b[i]);
-var norm = (a) => Math.hypot(...a);
-function bump(s, delta, sign) {
-  for (let i = 0; i < delta.length; i++) s.adjust[i] = s.adjust[i] + sign * delta[i];
-  stale(s);
-  s.row?.table.mark(s.row.index);
-}
-function bumpBehind(s, b, delta, sign) {
-  const adjust = b.adjust ??= new Array(delta.length).fill(0);
-  for (let i = 0; i < delta.length; i++) adjust[i] = adjust[i] + sign * delta[i];
-  stale(s);
-  s.row?.table.mark(s.row.index);
-}
-function seat(s, holder, slot) {
-  const was = holder.slot;
-  if (was && was !== slot && was.refs === 0) {
-    const n = s.axes.count;
-    const adjust = holder.adjust ??= new Array(n).fill(0);
-    for (let i = 0; i < n; i++) adjust[i] = adjust[i] + was.cols[was.at + i];
-    stale(s);
-  }
-  holder.slot = slot;
-}
-function setBeside(s, beside) {
-  s.beside = beside;
-  s.row?.table.beside(s.row.index, beside);
-}
-function stale(s) {
-  if (s.stale || !s.owner) return;
-  s.stale = true;
-  s.owner.adjusted(s);
-}
-function absorb(s, delta) {
-  if (s.discard) return;
-  s.set(s.axes.from(plus(s.axes.to(s.get()), delta)));
-}
-function shareBehind(axes, committed, to, start) {
-  return travel(axes, committed, to).map((m, i) => start[i] === 0 ? 0 : m / start[i]);
-}
-var times = (a, b) => a.map((x, i) => x * b[i]);
-function goBehind(s, own, left, share2) {
-  const b = {
-    own,
-    left,
-    share: share2,
-    kept: null,
-    slot: null,
-    adjust: null,
-    move: s.row ? s.row.table.move(s.row.index, share2) : null
-  };
-  s.behind.push(b);
-  return b;
-}
-var runsOn = (s, b) => b.move ? b : s;
-function bumpOn(s, b, delta, sign) {
-  if (b.move) bumpBehind(s, b, delta, sign);
-  else bump(s, delta, sign);
-}
-function comeOut(s, b, left) {
-  const at = s.behind.indexOf(b);
-  if (at >= 0) s.behind.splice(at, 1);
-  b.move?.leave();
-  if (b.kept) {
-    s.dimmed = false;
-    for (const other of s.behind) if (other.kept) s.dimmed = true;
-  }
-  return b.kept ? times(left, b.kept) : left.slice();
-}
-function commitOffset(s, own, left, shown) {
-  const top = minus(own, left);
-  if (s.held === 0) {
-    keep(s, plus(shown, top));
-    return;
-  }
-  if (shown.some((x) => x !== 0)) absorb(s, shown);
-  if (top.some((x) => x !== 0)) keep(s, top);
-}
-function keep(s, delta) {
-  if (s.discard) return;
-  if (s.held === 0) absorb(s, delta);
-  else setBeside(s, s.beside ? plus(s.beside, delta) : delta.slice());
-  s.row?.table.mark(s.row.index);
-}
-function takeUp(s) {
-  const committed = s.axes.to(s.get());
-  const beside = s.beside;
-  if (beside) setBeside(s, null);
-  return beside ? plus(committed, beside) : committed;
-}
-function createTargetBook(owner) {
-  const adjusted = [];
-  const token = { ...owner, adjusted: (s) => {
-    adjusted.push(s);
-  } };
-  const showing2 = /* @__PURE__ */ new Set();
-  const rested = /* @__PURE__ */ new Set();
-  const publishes = /* @__PURE__ */ new Set();
-  const tables2 = /* @__PURE__ */ new Map();
-  const stores = /* @__PURE__ */ new Map();
-  const shown = (s, value) => {
-    s.show(value);
-    if (s.publish) publishes.add(s.publish);
-  };
-  const publish = () => {
-    for (const p of publishes) p();
-    publishes.clear();
-  };
-  return {
-    attach(s) {
-      if (s.owner && s.owner !== token) {
-        throw new Error("animator: this target is being moved by another animator");
-      }
-      s.owner = token;
-      s.live += 1;
-      if (s.show) showing2.add(s);
-      rested.delete(s);
-      if (s.row) {
-        tables2.set(s.row.table, (tables2.get(s.row.table) ?? 0) + 1);
-        s.row.table.mark(s.row.index);
-      }
-    },
-    detach(s) {
-      s.live -= 1;
-      if (s.row) {
-        tables2.set(s.row.table, tables2.get(s.row.table) - 1);
-        s.row.table.mark(s.row.index);
-      }
-      if (s.live > 0) return;
-      s.owner = null;
-      s.slot = null;
-      if (s.beside) setBeside(s, null);
-      for (const b of s.behind) b.move?.leave();
-      s.behind.length = 0;
-      s.dimmed = false;
-      s.adjust.fill(0);
-      s.stale = false;
-      if (s.show && showing2.delete(s)) rested.add(s);
-    },
-    settle() {
-      for (const s of adjusted) {
-        if (!s.stale || s.owner !== token) continue;
-        s.adjust.fill(0);
-        for (const b of s.behind) b.adjust = null;
-        s.stale = false;
-      }
-      adjusted.length = 0;
-      for (const store of stores.keys()) store.frame();
-      for (const t of tables2.keys()) t.settle();
-    },
-    holding(store, by) {
-      const count = (stores.get(store) ?? 0) + by;
-      if (count > 0) stores.set(store, count);
-      else stores.delete(store);
-    },
-    show() {
-      for (const s of showing2) shown(s, readTarget(s));
-      for (const s of rested) shown(s, s.get());
-      rested.clear();
-      for (const [t, moving] of tables2) {
-        t.fill(owner.columns);
-        if (moving === 0) tables2.delete(t);
-      }
-      publish();
-    },
-    showNow(s) {
-      if (!s.show) return;
-      shown(s, readTarget(s));
-      publish();
-    },
-    get resting() {
-      return rested.size > 0;
-    }
-  };
-}
-
-// src/engine/holdStore.ts
 var share = (w) => w > 0 ? Math.min(w, 1) : 0;
 function wider(a, length, fill = 0) {
   const b = new a.constructor(length);
@@ -525,7 +327,7 @@ function foldRow(layers, angle, n, row, committed, at, skip, delta, total) {
         const w = holds(l, a);
         if (!(w > 0)) continue;
         const v = l.values[base + a];
-        sum += w * (mean === null ? shortWay(v - c) : shortWay(mean - c) + shortWay(v - mean));
+        sum += w * (mean === null ? wrapAngle(v - c) : wrapAngle(mean - c) + wrapAngle(v - mean));
       }
     }
     total[a] = weight;
@@ -920,12 +722,11 @@ function createTargetTable(opts) {
   tables.set(table, rows);
   return table;
 }
-
-// src/colorRegistry.ts
 var ColorOverrideRegistry = class {
   map = /* @__PURE__ */ new Map();
   slots = /* @__PURE__ */ new Map();
   tables = /* @__PURE__ */ new Map();
+  listeners = createEmitter();
   _version = 0;
   set(id, channel, override) {
     let entry = this.map.get(id);
@@ -934,7 +735,7 @@ var ColorOverrideRegistry = class {
       this.map.set(id, entry);
     }
     entry[channel] = override;
-    this._version++;
+    this.changed();
   }
   /** Drops `id`'s override on `channel`, and the colors a finished or canceled animation on its
    *  {@link target} left painted. An animation still running goes on. */
@@ -945,7 +746,7 @@ var ColorOverrideRegistry = class {
     if (!(channel in entry)) return;
     delete entry[channel];
     if (!entry.fill && !entry.stroke) this.map.delete(id);
-    this._version++;
+    this.changed();
   }
   clearAll() {
     for (const [id, node] of this.slots) {
@@ -953,7 +754,7 @@ var ColorOverrideRegistry = class {
     }
     if (this.map.size === 0) return;
     this.map.clear();
-    this._version++;
+    this.changed();
   }
   /** What `set` stored for `id`'s `channel`; failing that, the colors its {@link target} paints. */
   get(id, channel) {
@@ -962,9 +763,12 @@ var ColorOverrideRegistry = class {
     const slot = this.slots.get(id)?.[channel];
     return slot?.painted ? shownOf(slot) : void 0;
   }
-  /** Whether anything overrides `id`, on either channel. */
+  /** Whether anything paints over `id`, on either channel: an override from `set`, or a target
+   *  an animation has committed. A target asked for and never moved does not count. */
   has(id) {
-    return this.map.has(id) || this.slots.has(id);
+    if (this.map.has(id)) return true;
+    const node = this.slots.get(id);
+    return node !== void 0 && (node.fill?.painted === true || node.stroke?.painted === true);
   }
   /**
    * The {@link Target} for `id`'s colors on `channel`: `length` numbers, flat RGBA per anchor.
@@ -1009,7 +813,8 @@ var ColorOverrideRegistry = class {
       set: (row) => {
         const slot = rows[row];
         if (slot) slot.painted = true;
-        this._version++;
+        if (table.target(row).active) this._version++;
+        else this.changed();
       },
       show: () => {
         this._version++;
@@ -1034,7 +839,7 @@ var ColorOverrideRegistry = class {
     delete node[channel];
     if (!node.fill && !node.stroke) this.slots.delete(id);
     this.drop(slot);
-    if (slot.painted) this._version++;
+    if (slot.painted) this.changed();
   }
   /**
    * The colors to paint on `id`'s `channel`, given the colors the painter would
@@ -1057,9 +862,18 @@ var ColorOverrideRegistry = class {
     const result = override(base, tMs);
     return result.length === base.length ? result : base;
   }
+  /** Calls `listener` after a `set`, `clear`, or release changes what paints; an animation's
+   *  frames reach a painter through `animator.onTick` instead. Returns an unsubscribe. */
+  subscribe(listener) {
+    return this.listeners.subscribe(listener);
+  }
   version() {
     return this._version;
   }
+  changed() {
+    this._version++;
+    this.listeners.emit();
+  }
 };
 function shownOf(slot) {
   const { shown } = slot.table;
@@ -1068,6 +882,306 @@ function shownOf(slot) {
   for (let i = 0; i < out.length; i++) out[i] = shown[at + i];
   return out;
 }
+var EDGES = ["start", "end"];
+var TrimOverrideRegistry = class {
+  map = /* @__PURE__ */ new Map();
+  slots = /* @__PURE__ */ new Map();
+  listeners = createEmitter();
+  _version = 0;
+  set(id, override) {
+    this.map.set(id, { ...override });
+    this.changed();
+  }
+  /** Drops `id`'s override, and the edges a finished or canceled animation on its
+   *  {@link target}s left painted. An animation still running goes on. */
+  clear(id) {
+    for (const edge of EDGES) this.release(id, edge);
+    if (this.map.delete(id)) this.changed();
+  }
+  clearAll() {
+    for (const [id, node] of [...this.slots]) {
+      for (const edge of Object.keys(node)) this.release(id, edge);
+    }
+    if (this.map.size === 0) return;
+    this.map.clear();
+    this.changed();
+  }
+  /** What paints on `id`'s edges now: see {@link resolve}. */
+  get(id) {
+    return this.resolve(id);
+  }
+  /** Whether anything paints over `id`'s trim: an override from `set`, or a target an
+   *  animation has committed. A target asked for and never moved does not count. */
+  has(id) {
+    if (this.map.has(id)) return true;
+    const node = this.slots.get(id);
+    return node !== void 0 && (node.start?.painted === true || node.end?.painted === true);
+  }
+  /**
+   * The {@link Target} for `id`'s `edge`, committed at the whole stroke's (`start` 0, `end` 1)
+   * until something moves it. Every caller for one node and edge gets the same one, so their
+   * animations add. The registry holds its committed value and nothing writes the scene.
+   *
+   * What it paints, on its own edge only: with no override from `set` on that edge, its value in
+   * place of the stroke's own; over one, only what its animations have left to travel, added on
+   * top. Ask again for each animation rather than keeping it: {@link release} and {@link clear}
+   * drop a resting one, and the target it had throws from then on.
+   */
+  target(id, edge) {
+    let node = this.slots.get(id);
+    const held = node?.[edge];
+    if (held) return held.target;
+    const state = { value: edge === "start" ? 0 : 1, painted: false, released: false };
+    const target = createTarget({
+      get: () => state.value,
+      set: (value) => {
+        if (state.released) throw new Error(`trim overrides: ${id}'s ${edge} target was released`);
+        state.value = value;
+        state.painted = true;
+        if (target.active) this._version++;
+        else this.changed();
+      },
+      show: () => {
+        this._version++;
+      }
+    });
+    if (!node) {
+      node = {};
+      this.slots.set(id, node);
+    }
+    node[edge] = Object.assign(state, { target });
+    return target;
+  }
+  /** Drops the value `id`'s {@link target} on `edge` left painted, unless an animation is still
+   *  moving it. An override from `set` stays. */
+  release(id, edge) {
+    const node = this.slots.get(id);
+    const slot = node?.[edge];
+    if (!node || !slot || slot.target.active) return;
+    delete node[edge];
+    if (!node.start && !node.end) this.slots.delete(id);
+    slot.released = true;
+    if (slot.painted) this.changed();
+  }
+  /**
+   * The edges to paint on `id`'s stroke, each on its own: the override from `set` for that
+   * edge plus what its {@link target} has left to travel; failing a `set` value, the target's
+   * value once an animation has committed it. An edge with neither is left out, so the stroke's
+   * own stands. `undefined` when neither edge is overridden.
+   */
+  resolve(id) {
+    const override = this.map.get(id);
+    const node = this.slots.get(id);
+    const start = edgeOf(override?.start, node?.start);
+    const end = edgeOf(override?.end, node?.end);
+    if (start === void 0 && end === void 0) return void 0;
+    return { ...start !== void 0 ? { start } : {}, ...end !== void 0 ? { end } : {} };
+  }
+  /** Calls `listener` after a `set`, `clear`, or release changes what paints; an animation's
+   *  frames reach a painter through `animator.onTick` instead. Returns an unsubscribe. */
+  subscribe(listener) {
+    return this.listeners.subscribe(listener);
+  }
+  version() {
+    return this._version;
+  }
+  changed() {
+    this._version++;
+    this.listeners.emit();
+  }
+};
+function edgeOf(set, slot) {
+  const painted = slot?.painted === true;
+  if (set === void 0) return painted ? slot.target.read() : void 0;
+  return painted && slot.target.active ? set + slot.target.read() - slot.value : set;
+}
+function axesFor(axes, value, what) {
+  const a = axes.to(value);
+  if (a.length !== axes.count || !a.every((x) => typeof x === "number" && !Number.isNaN(x))) {
+    throw new Error(`animator: \`${what}\` is not the target's shape`);
+  }
+  return a;
+}
+function travel(axes, a, b) {
+  const d = a.map((x, i) => x - b[i]);
+  for (const i of axes.angles ?? []) d[i] = wrapAngle(d[i]);
+  return d;
+}
+var plus = (a, b) => a.map((x, i) => x + b[i]);
+var minus = (a, b) => a.map((x, i) => x - b[i]);
+var norm = (a) => Math.hypot(...a);
+function bump(s, delta, sign) {
+  for (let i = 0; i < delta.length; i++) s.adjust[i] = s.adjust[i] + sign * delta[i];
+  stale(s);
+  s.row?.table.mark(s.row.index);
+}
+function bumpBehind(s, b, delta, sign) {
+  const adjust = b.adjust ??= new Array(delta.length).fill(0);
+  for (let i = 0; i < delta.length; i++) adjust[i] = adjust[i] + sign * delta[i];
+  stale(s);
+  s.row?.table.mark(s.row.index);
+}
+function seat(s, holder, slot) {
+  const was = holder.slot;
+  if (was && was !== slot && was.refs === 0) {
+    const n = s.axes.count;
+    const adjust = holder.adjust ??= new Array(n).fill(0);
+    for (let i = 0; i < n; i++) adjust[i] = adjust[i] + was.cols[was.at + i];
+    stale(s);
+  }
+  holder.slot = slot;
+}
+function setBeside(s, beside) {
+  s.beside = beside;
+  s.row?.table.beside(s.row.index, beside);
+}
+function stale(s) {
+  if (s.stale || !s.owner) return;
+  s.stale = true;
+  s.owner.adjusted(s);
+}
+function absorb(s, delta) {
+  if (s.discard) return;
+  s.set(s.axes.from(plus(s.axes.to(s.get()), delta)));
+}
+function shareBehind(axes, committed, to, start) {
+  return travel(axes, committed, to).map((m, i) => start[i] === 0 ? 0 : m / start[i]);
+}
+var times = (a, b) => a.map((x, i) => x * b[i]);
+function goBehind(s, own, left, share2) {
+  const b = {
+    own,
+    left,
+    share: share2,
+    kept: null,
+    slot: null,
+    adjust: null,
+    move: s.row ? s.row.table.move(s.row.index, share2) : null
+  };
+  s.behind.push(b);
+  return b;
+}
+var runsOn = (s, b) => b.move ? b : s;
+function bumpOn(s, b, delta, sign) {
+  if (b.move) bumpBehind(s, b, delta, sign);
+  else bump(s, delta, sign);
+}
+function comeOut(s, b, left) {
+  const at = s.behind.indexOf(b);
+  if (at >= 0) s.behind.splice(at, 1);
+  b.move?.leave();
+  if (b.kept) {
+    s.dimmed = false;
+    for (const other of s.behind) if (other.kept) s.dimmed = true;
+  }
+  return b.kept ? times(left, b.kept) : left.slice();
+}
+function commitOffset(s, own, left, shown) {
+  const top = minus(own, left);
+  if (s.held === 0) {
+    keep(s, plus(shown, top));
+    return;
+  }
+  if (shown.some((x) => x !== 0)) absorb(s, shown);
+  if (top.some((x) => x !== 0)) keep(s, top);
+}
+function keep(s, delta) {
+  if (s.discard) return;
+  if (s.held === 0) absorb(s, delta);
+  else setBeside(s, s.beside ? plus(s.beside, delta) : delta.slice());
+  s.row?.table.mark(s.row.index);
+}
+function takeUp(s) {
+  const committed = s.axes.to(s.get());
+  const beside = s.beside;
+  if (beside) setBeside(s, null);
+  return beside ? plus(committed, beside) : committed;
+}
+function createTargetBook(owner) {
+  const adjusted = [];
+  const token = { ...owner, adjusted: (s) => {
+    adjusted.push(s);
+  } };
+  const showing2 = /* @__PURE__ */ new Set();
+  const rested = /* @__PURE__ */ new Set();
+  const publishes = /* @__PURE__ */ new Set();
+  const tables2 = /* @__PURE__ */ new Map();
+  const stores = /* @__PURE__ */ new Map();
+  const shown = (s, value) => {
+    s.show(value);
+    if (s.publish) publishes.add(s.publish);
+  };
+  const publish = () => {
+    for (const p of publishes) p();
+    publishes.clear();
+  };
+  return {
+    attach(s) {
+      if (s.owner && s.owner !== token) {
+        throw new Error("animator: this target is being moved by another animator");
+      }
+      s.owner = token;
+      s.live += 1;
+      if (s.show) showing2.add(s);
+      rested.delete(s);
+      if (s.row) {
+        tables2.set(s.row.table, (tables2.get(s.row.table) ?? 0) + 1);
+        s.row.table.mark(s.row.index);
+      }
+    },
+    detach(s) {
+      s.live -= 1;
+      if (s.row) {
+        tables2.set(s.row.table, tables2.get(s.row.table) - 1);
+        s.row.table.mark(s.row.index);
+      }
+      if (s.live > 0) return;
+      s.owner = null;
+      s.slot = null;
+      if (s.beside) setBeside(s, null);
+      for (const b of s.behind) b.move?.leave();
+      s.behind.length = 0;
+      s.dimmed = false;
+      s.adjust.fill(0);
+      s.stale = false;
+      if (s.show && showing2.delete(s)) rested.add(s);
+    },
+    settle() {
+      for (const s of adjusted) {
+        if (!s.stale || s.owner !== token) continue;
+        s.adjust.fill(0);
+        for (const b of s.behind) b.adjust = null;
+        s.stale = false;
+      }
+      adjusted.length = 0;
+      for (const store of stores.keys()) store.frame();
+      for (const t of tables2.keys()) t.settle();
+    },
+    holding(store, by) {
+      const count = (stores.get(store) ?? 0) + by;
+      if (count > 0) stores.set(store, count);
+      else stores.delete(store);
+    },
+    show() {
+      for (const s of showing2) shown(s, readTarget(s));
+      for (const s of rested) shown(s, s.get());
+      rested.clear();
+      for (const [t, moving] of tables2) {
+        t.fill(owner.columns);
+        if (moving === 0) tables2.delete(t);
+      }
+      publish();
+    },
+    showNow(s) {
+      if (!s.show) return;
+      shown(s, readTarget(s));
+      publish();
+    },
+    get resting() {
+      return rested.size > 0;
+    }
+  };
+}
 
 // src/timeline/targetStops.ts
 function targetStops(track) {
@@ -1620,6 +1734,6 @@ function createTimeline(register, id, opts, report, hold) {
   };
 }
 
-export { ColorOverrideRegistry, absorb, axesFor, axesOf, axisIndexes, bump, bumpOn, comeOut, commitOffset, committedInto, createHoldStore, createTarget, createTargetBook, createTargetTable, createTimeline, goBehind, isTarget, minus, norm, plus, rowTableOf, runsOn, sampleTrack, seat, setBeside, shareBehind, shortWay, stateOf, takeUp, times, travel };
-//# sourceMappingURL=chunk-H7WENFPC.js.map
-//# sourceMappingURL=chunk-H7WENFPC.js.map
+export { ColorOverrideRegistry, TrimOverrideRegistry, absorb, axesFor, axesOf, axisIndexes, bump, bumpOn, comeOut, commitOffset, committedInto, createHoldStore, createTarget, createTargetBook, createTargetTable, createTimeline, goBehind, isTarget, minus, norm, plus, rowTableOf, runsOn, sampleTrack, seat, setBeside, shareBehind, stateOf, takeUp, times, travel };
+//# sourceMappingURL=chunk-TXKTFZIW.js.map
+//# sourceMappingURL=chunk-TXKTFZIW.js.map