umwelt-js 0.2.1 → 0.2.2

package/dist/index.js

@@ -1,189 +1,189 @@
-import { createComponent as S, use as Ne, template as A, delegateEvents as at, insert as _, effect as L, setAttribute as Me, memo as pe, className as Ct, render as It } from "solid-js/web";
-import { createContext as W, createSignal as V, useContext as Y, createMemo as k, createEffect as P, onCleanup as H, Switch as Lt, Match as Be, For as ie, onMount as jt, Show as st } from "solid-js";
-import { isMultiSpec as ze, olliVis as qt } from "olli";
-import { VegaLiteAdapter as Mt } from "olli/adapters";
+import { createComponent as S, use as Ne, template as A, delegateEvents as ot, insert as _, effect as L, setAttribute as Be, memo as pe, className as Lt, render as jt } from "solid-js/web";
+import { createContext as W, createSignal as V, useContext as Y, createMemo as T, createEffect as P, onCleanup as X, untrack as ct, Switch as qt, Match as ze, For as ie, onMount as Mt, Show as lt } from "solid-js";
+import { isMultiSpec as Ge, olliVis as Bt } from "olli";
+import { VegaLiteAdapter as zt } from "olli/adapters";
 import he from "moize";
-import { getDomain as Bt, fetchAndParse as zt, typeCoerceData as Gt, getBins as Kt, serializeValue as Ht } from "@umwelt-data/umwelt-utils/data";
+import { getDomain as Gt, fetchAndParse as Kt, typeCoerceData as Ht, getBins as Xt, serializeValue as Jt } from "@umwelt-data/umwelt-utils/data";
 import { compile as Fe } from "vega-lite";
-import { evaluateVegaData as ot, extractOutputDatasets as ct, computeGuideTicks as Xt } from "@umwelt-data/umwelt-utils/vega";
+import { evaluateVegaData as ut, extractOutputDatasets as dt, computeGuideTicks as Ke } from "@umwelt-data/umwelt-utils/vega";
 import $e from "lodash.clonedeep";
-import { withExternalStateParam as Jt, selectionStoreToSelection as Wt, EXTERNAL_STATE_STORE as Ge, predicateToSelectionStore as Yt } from "@umwelt-data/umwelt-utils/vl-bridge";
+import { withExternalStateParam as Wt, selectionStoreToSelection as Yt, EXTERNAL_STATE_STORE as He, predicateToSelectionStore as Zt } from "@umwelt-data/umwelt-utils/vl-bridge";
 import "lz-string";
-import { parse as Zt, View as Qt } from "vega";
-import { debounce as en } from "@solid-primitives/scheduled";
-import { testDatum as tn } from "@umwelt-data/umwelt-utils/predicate";
+import { parse as Qt, View as en } from "vega";
+import { debounce as tn } from "@solid-primitives/scheduled";
+import { testDatum as nn } from "@umwelt-data/umwelt-utils/predicate";
 import { createStore as ye } from "solid-js/store";
-import { makeCommaSeparatedString as Pe, fmtValue as nn, describeField as K } from "@umwelt-data/umwelt-utils/description";
+import { makeCommaSeparatedString as Pe, fmtValue as rn, describeField as K } from "@umwelt-data/umwelt-utils/description";
 import * as $ from "tone";
-import { Storage as rn } from "versioned-storage";
-import { scaleTime as an, scaleLinear as sn, scaleOrdinal as on, scalePoint as cn } from "d3-scale";
-import ln from "fast-cartesian";
+import { Storage as an } from "versioned-storage";
+import { scaleTime as sn, scaleLinear as on, scaleOrdinal as cn, scalePoint as ln } from "d3-scale";
+import un from "fast-cartesian";
 import { styled as N } from "solid-styled-components";
-const un = "_Viewer_1uzho_29", dn = {
-  Viewer: un
-}, fn = ["mean", "median", "min", "max", "sum", "count"];
-function lt(e) {
-  return fn.includes(e);
+const dn = "_Viewer_1uzho_29", fn = {
+  Viewer: dn
+}, mn = ["mean", "median", "min", "max", "sum", "count"];
+function ft(e) {
+  return mn.includes(e);
 }
-function mn(e) {
+function pn(e) {
   return e && (typeof e.name == "string" || e.name === void 0) && Array.isArray(e.values);
 }
-function ut(e) {
+function mt(e) {
   return e && (typeof e.name == "string" || e.name === void 0) && typeof e.url == "string";
 }
-const pn = ["x", "y", "color", "shape", "size", "opacity", "order", "facet"], gn = ["pure", "bright", "hollow", "bell", "reed", "strings"];
-function vn(e) {
-  return gn.includes(e);
+const gn = ["x", "y", "color", "shape", "size", "opacity", "order", "facet"], vn = ["pure", "bright", "hollow", "bell", "reed", "strings"];
+function hn(e) {
+  return vn.includes(e);
 }
-function dt(e) {
-  return pn.includes(e);
+function pt(e) {
+  return gn.includes(e);
 }
-const ft = "None", hn = "vis_unit_", yn = "audio_unit_", Sn = (e) => `${hn}${e}`, bn = (e) => `${yn}${e}`;
-function Ke(e) {
+const gt = "None", yn = "vis_unit_", Sn = "audio_unit_", bn = (e) => `${yn}${e}`, wn = (e) => `${Sn}${e}`;
+function Xe(e) {
   return "units" in e;
 }
-function He(e) {
+function Je(e) {
   return "units" in e;
 }
-const wn = "", X = (e, t) => `${t}_${e}`, j = (e) => [`${e}_bin_start`, `${e}_bin_end`], J = (e, t) => `${t}_${e}`, Se = (e) => {
+const En = "", J = (e, t) => `${t}_${e}`, j = (e) => [`${e}_bin_start`, `${e}_bin_end`], H = (e, t) => `${t}_${e}`, Se = (e) => {
   const t = Re([e]);
   let n = e.field;
   for (const i of t)
     if ("aggregate" in i)
       for (const r of i.aggregate)
-        lt(r.op) && (n = X(n, r.op));
-    else "bin" in i && !e.aggregate ? n = j(n)[0] : "timeUnit" in i && !e.aggregate && (n = J(n, i.timeUnit));
+        ft(r.op) && (n = J(n, r.op));
+    else "bin" in i && !e.aggregate ? n = j(n)[0] : "timeUnit" in i && !e.aggregate && (n = H(n, i.timeUnit));
   return n;
-}, mt = (e) => {
+}, vt = (e) => {
   const t = Re([e]);
   let n = e.field;
   for (const i of t)
     if ("aggregate" in i)
       for (const r of i.aggregate)
-        lt(r.op) && (typeof n == "string" ? n = X(n, r.op) : n = [X(n[0], r.op), X(n[1], r.op)]);
-    else "bin" in i && !e.aggregate ? typeof n == "string" ? n = j(n) : n = [j(n[0])[0], j(n[1])[1]] : "timeUnit" in i && !e.aggregate && (typeof n == "string" ? n = J(n, i.timeUnit) : n = [J(n[0], i.timeUnit), J(n[1], i.timeUnit)]);
+        ft(r.op) && (typeof n == "string" ? n = J(n, r.op) : n = [J(n[0], r.op), J(n[1], r.op)]);
+    else "bin" in i && !e.aggregate ? typeof n == "string" ? n = j(n) : n = [j(n[0])[0], j(n[1])[1]] : "timeUnit" in i && !e.aggregate && (typeof n == "string" ? n = H(n, i.timeUnit) : n = [H(n[0], i.timeUnit), H(n[1], i.timeUnit)]);
   if (typeof n == "string")
     throw new Error("Expected derived field name to be a tuple");
   return n;
 }, Oe = (e, t, n) => {
-  const i = new Set(t.filter((s) => s.bin && n?.[s.field]?.length).map((s) => s.field));
+  const i = new Set(t.filter((a) => a.bin && n?.[a.field]?.length).map((a) => a.field));
   let r = e;
-  i.size && (r = e.map((s) => {
-    const o = { ...s };
+  i.size && (r = e.map((a) => {
+    const o = { ...a };
     for (const f of i) {
-      const [d, u] = j(f), c = En(s[f], n[f]);
+      const [d, u] = j(f), c = Un(a[f], n[f]);
       o[d] = c ? c[0] : null, o[u] = c ? c[1] : null;
     }
     return o;
   }));
-  const a = Re(t, i);
-  return pt(r, a);
-}, En = (e, t) => {
+  const s = Re(t, i);
+  return Ve(r, s);
+}, Un = (e, t) => {
   if (e == null) return;
   const n = Number(e);
   if (!isNaN(n))
     for (let i = 0; i < t.length; i++) {
-      const [r, a] = t[i];
-      if (n >= r && (n < a || i === t.length - 1 && n <= a))
+      const [r, s] = t[i];
+      if (n >= r && (n < s || i === t.length - 1 && n <= s))
         return t[i];
     }
 }, Re = (e, t) => {
-  const n = [], i = [], r = [], a = /* @__PURE__ */ new Set();
+  const n = [], i = [], r = [], s = /* @__PURE__ */ new Set();
   for (const l of e) {
-    const { field: s, timeUnit: o, bin: f, aggregate: d } = l;
-    d || (o && a.add(J(s, o)), f && j(s).forEach((u) => a.add(u)), !o && !f && a.add(s));
+    const { field: a, timeUnit: o, bin: f, aggregate: d } = l;
+    d || (o && s.add(H(a, o)), f && j(a).forEach((u) => s.add(u)), !o && !f && s.add(a));
   }
   for (const l of e) {
-    const { field: s, timeUnit: o, bin: f, aggregate: d } = l;
-    if (f && !t?.has(s)) {
-      const u = j(s);
+    const { field: a, timeUnit: o, bin: f, aggregate: d } = l;
+    if (f && !t?.has(a)) {
+      const u = j(a);
       i.push({
         bin: !0,
-        field: s,
+        field: a,
         as: u
       });
     }
     if (o) {
-      const u = f ? j(s)[0] : J(s, o);
+      const u = f ? j(a)[0] : H(a, o);
       n.push({
         timeUnit: o,
-        field: s,
+        field: a,
         as: u
       });
     }
     if (d) {
-      const u = f ? j(s)[0] : s, c = r.find((p) => p.groupby?.length === a.size && p.groupby?.every((m) => a.has(m)));
+      const u = f ? j(a)[0] : a, c = r.find((p) => p.groupby?.length === s.size && p.groupby?.every((m) => s.has(m)));
       c ? c.aggregate.push({
         op: d,
         field: u,
-        as: X(s, d)
+        as: J(a, d)
       }) : r.push({
         aggregate: [
           {
             op: d,
             field: u,
-            as: X(s, d)
+            as: J(a, d)
           }
         ],
-        groupby: Array.from(a)
+        groupby: Array.from(s)
       });
     }
   }
   return [...i, ...n, ...r];
 };
-function pt(e, t) {
+function Ve(e, t) {
   const r = Fe({
     data: { values: e },
     transform: t,
     mark: "point"
-  }).spec.data ?? [], a = ot(r), l = ct(r, a);
+  }).spec.data ?? [], s = ut(r), l = dt(r, s);
   return l[l.length - 1] ?? [];
 }
-function Un(e) {
-  const n = Fe(e).spec.data ?? [], i = ot(n), r = ct(n, i), a = /* @__PURE__ */ new Set();
+function An(e) {
+  const n = Fe(e).spec.data ?? [], i = ut(n), r = dt(n, i), s = /* @__PURE__ */ new Set();
   for (const l of r) {
-    const s = l.find((o) => o && typeof o == "object");
-    s && Object.keys(s).forEach((o) => a.add(o));
+    const a = l.find((o) => o && typeof o == "object");
+    a && Object.keys(a).forEach((o) => s.add(o));
   }
-  return [...a];
+  return [...s];
 }
 const re = he((e, t, n) => {
   const i = n ? Se(e) : e.field;
-  return Bt({ field: i, type: e.type, timeUnit: e.timeUnit }, t);
-}), An = he((e, t) => {
+  return Gt({ field: i, type: e.type, timeUnit: e.timeUnit }, t);
+}), Dn = he((e, t) => {
   if (e.bin) {
-    const n = mt(e);
+    const n = vt(e);
     return t.map((i) => {
-      const r = i[n[0]], a = i[n[1]];
-      return [r, a];
+      const r = i[n[0]], s = i[n[1]];
+      return [r, s];
     }).sort((i, r) => typeof i[0] == "number" && typeof r[0] == "number" ? i[0] - r[0] : i[0] instanceof Date && r[0] instanceof Date ? i[0].getTime() - r[0].getTime() : typeof i[0] == "string" && typeof r[0] == "string" ? i[0].localeCompare(r[0]) : 0);
   }
   return [];
-}), ve = "dataset", Dn = "https://raw.githubusercontent.com/vega/vega-datasets/master/data/", $n = Object.fromEntries(
-  ["stocks.csv", "cars.json", "weather.csv", "seattle-weather.csv", "penguins.json", "driving.json", "barley.json", "disasters.csv", "gapminder.json"].map((e) => [e, `${Dn}${e}`])
+}), ve = "dataset", $n = "https://raw.githubusercontent.com/vega/vega-datasets/master/data/", Tn = Object.fromEntries(
+  ["stocks.csv", "cars.json", "weather.csv", "seattle-weather.csv", "penguins.json", "driving.json", "barley.json", "disasters.csv", "gapminder.json"].map((e) => [e, `${$n}${e}`])
 );
-async function Tn(e) {
-  if (mn(e)) {
+async function kn(e) {
+  if (pn(e)) {
     const t = e.name || ve;
     return e.values.length ? { name: t, data: e.values } : void 0;
   }
-  if (ut(e)) {
-    const t = e.name || e.url.split("/").pop() || ve, n = await Xe(e.url);
+  if (mt(e)) {
+    const t = e.name || e.url.split("/").pop() || ve, n = await We(e.url);
     return n.length ? { name: t, data: n, sourceUrl: e.url } : void 0;
   }
   if (e.name) {
-    const t = $n[e.name];
+    const t = Tn[e.name];
     if (!t) {
       console.error(`Unknown example dataset "${e.name}". A name-only data source must reference a built-in example dataset, or provide a url or values.`);
       return;
     }
-    const n = await Xe(t);
+    const n = await We(t);
     return n.length ? { name: e.name, data: n, sourceUrl: t } : void 0;
   }
 }
-const Xe = he.promise(async (e) => {
+const We = he.promise(async (e) => {
   try {
-    const t = await zt(e);
+    const t = await Kt(e);
     return Array.isArray(t) ? t : [];
   } catch (t) {
     return console.warn(`Failed to load data from ${e} 
@@ -192,85 +192,85 @@ const Xe = he.promise(async (e) => {
 });
 he.promise(async (e, t) => {
   try {
-    return pt(e, t);
+    return Ve(e, t);
   } catch (n) {
     return console.warn(`Failed to evaluate transforms 
  ${n}`), [];
   }
 });
-function kn(e, t) {
+function _n(e, t) {
   const n = t.map((i) => ({ name: i.name, type: i.type }));
-  return Gt(e, n);
+  return Ht(e, n);
 }
-function _n(e, t) {
-  return e.filter((n) => Object.entries(n).every(([i, r]) => t.find((a) => a.name === i) ? r != null : !0));
+function xn(e, t) {
+  return e.filter((n) => Object.entries(n).every(([i, r]) => t.find((s) => s.name === i) ? r != null : !0));
 }
 function D(e, t) {
   return e.fields.find((n) => n.name === t);
 }
 function x(e, t) {
-  const { active: n, name: i, encodings: r, ...a } = e, l = t ? {
-    ...a,
+  const { active: n, name: i, encodings: r, ...s } = e, l = t ? {
+    ...s,
     ...t
-  } : { field: i, ...a };
-  return Object.fromEntries(Object.entries(l).filter(([s, o]) => o !== ft));
+  } : { field: i, ...s };
+  return Object.fromEntries(Object.entries(l).filter(([a, o]) => o !== gt));
 }
-function Ve(e, t) {
-  const i = [...Object.values(t.encoding), ...t.traversal].flatMap((a) => {
-    const l = D(e, a.field);
-    return l ? [x(l, a)] : [];
+function Ce(e, t) {
+  const i = [...Object.values(t.encoding), ...t.traversal].flatMap((s) => {
+    const l = D(e, s.field);
+    return l ? [x(l, s)] : [];
   }), r = /* @__PURE__ */ new Set();
-  return i.filter((a) => {
-    const l = JSON.stringify(a);
+  return i.filter((s) => {
+    const l = JSON.stringify(s);
     return r.has(l) ? !1 : (r.add(l), !0);
   });
 }
-async function xn(e, t, n) {
+async function Nn(e, t, n) {
   if (!e.data || !(e.fields && e.fields.length))
     return;
   const i = e.data.name;
   if (i && t[i]?.data?.length)
-    return Je(e);
-  const r = await Tn(e.data);
+    return Ye(e);
+  const r = await kn(e.data);
   if (!r)
     return;
-  const a = Je(e), l = kn(r.data, a.fields), s = _n(l, a.fields);
-  if (s.length)
-    return n(r.name, s, r.sourceUrl), a;
+  const s = Ye(e), l = _n(r.data, s.fields), a = xn(l, s.fields);
+  if (a.length)
+    return n(r.name, a, r.sourceUrl), s;
 }
-function Nn(e) {
-  if (e.instrument !== void 0 && !vn(e.instrument)) {
+function Fn(e) {
+  if (e.instrument !== void 0 && !hn(e.instrument)) {
     console.warn(`Unknown audio instrument "${e.instrument}" on unit "${e.name}"; falling back to the default.`);
     const { instrument: t, ...n } = e;
     return n;
   }
   return e;
 }
-function Je(e) {
-  const t = (Ke(e.visual) ? e.visual.units : [e.visual]).map((s, o) => ({ ...s, name: s.name ?? Sn(o) })), n = Ke(e.visual) ? e.visual.composition : void 0, i = (He(e.audio) ? e.audio.units : [e.audio]).map((s, o) => ({ ...s, name: s.name ?? bn(o) })), r = He(e.audio) ? e.audio.composition : void 0, a = e.fields.map((s) => {
+function Ye(e) {
+  const t = (Xe(e.visual) ? e.visual.units : [e.visual]).map((a, o) => ({ ...a, name: a.name ?? bn(o) })), n = Xe(e.visual) ? e.visual.composition : void 0, i = (Je(e.audio) ? e.audio.units : [e.audio]).map((a, o) => ({ ...a, name: a.name ?? wn(o) })), r = Je(e.audio) ? e.audio.composition : void 0, s = e.fields.map((a) => {
     const o = [];
     return t.forEach((f) => {
       Object.entries(f.encoding).forEach(([d, u]) => {
-        dt(d) && u.field === s.name && o.push({ unit: f.name, property: d });
+        pt(d) && u.field === a.name && o.push({ unit: f.name, property: d });
       });
     }), i.forEach((f) => {
       Object.entries(f.encoding).forEach(([d, u]) => {
-        d === "pitch" && u.field === s.name && o.push({ unit: f.name, property: d });
+        d === "pitch" && u.field === a.name && o.push({ unit: f.name, property: d });
       });
-    }), { ...s, active: !0, encodings: o };
+    }), { ...a, active: !0, encodings: o };
   });
   return {
     ...e,
     data: {
-      name: e.data.name || (ut(e.data) ? e.data.url.split("/").pop() : ve) || ve
+      name: e.data.name || (mt(e.data) ? e.data.url.split("/").pop() : ve) || ve
     },
-    fields: a,
+    fields: s,
     visual: { units: t, composition: n || "layer" },
-    audio: { units: i.map(Nn), composition: r || "concat" },
+    audio: { units: i.map(Fn), composition: r || "concat" },
     // regenerate node ids on import so a serialized id can never collide with one
     // this session's counter later mints
     text: {
-      structures: e.text?.structures ? Object.fromEntries(Object.entries(e.text.structures).map(([s, o]) => [s, o.map(gt)])) : {}
+      structures: e.text?.structures ? Object.fromEntries(Object.entries(e.text.structures).map(([a, o]) => [a, o.map(ht)])) : {}
     }
   };
 }
@@ -287,7 +287,7 @@ function _e(e, t) {
     if (f.length === 1) {
       const d = f[0], u = $e(d.encoding);
       return u && Object.keys(u).forEach((c) => {
-        if (dt(c)) {
+        if (pt(c)) {
           const p = u[c];
           if (p) {
             const m = D(o, p.field);
@@ -318,7 +318,7 @@ function _e(e, t) {
         encoding: {
           ...u,
           color: {
-            ...a({ ...u.color || { value: "navy" }, scale: d.mark === "area" ? { scheme: "category20b" } : void 0 }, "brush", "grey")
+            ...s({ ...u.color || { value: "navy" }, scale: d.mark === "area" ? { scheme: "category20b" } : void 0 }, "brush", "grey")
           }
         }
       };
@@ -343,40 +343,40 @@ function _e(e, t) {
     const o = e.visual.units[0], f = o.encoding.y?.field, d = o.encoding.x?.field, u = D(e, f), c = D(e, d);
     u?.type === "quantitative" && c?.type !== "quantitative" ? i[0].select = { type: "interval", encodings: ["x"] } : c?.type === "quantitative" && u?.type !== "quantitative" && (i[0].select = { type: "interval", encodings: ["y"] });
   }
-  const a = (o, f, d, u) => ({
+  const s = (o, f, d, u) => ({
     condition: { param: f, empty: u || !0, ...o },
     value: d
   }), l = r(e);
-  let s;
-  return "mark" in l ? s = $e({
+  let a;
+  return "mark" in l ? a = $e({
     data: { values: t },
     params: i,
     ...l
-  }) : s = $e({
+  }) : a = $e({
     data: { values: t },
     ...l
-  }), Jt(s);
+  }), Wt(a);
 }
-async function Fn(e, t) {
+async function Pn(e, t) {
   let n;
   const i = e.text.structures, r = e.visual.units.map((o) => o.name);
   JSON.stringify(i);
-  const a = new Map(e.fields.map((o) => [o.name, o.type])), l = _e(e, t);
-  if (l ? n = await Mt(l) : n = {
+  const s = new Map(e.fields.map((o) => [o.name, o.type])), l = _e(e, t);
+  if (l ? n = await zt(l) : n = {
     data: t,
     fields: []
-  }, ze(n) ? n.units.forEach((o) => {
-    s(o, e);
-  }) : s(n, e), l)
-    (ze(n) ? n.units : [n]).forEach((f, d) => {
+  }, Ge(n) ? n.units.forEach((o) => {
+    a(o, e);
+  }) : a(n, e), l)
+    (Ge(n) ? n.units : [n]).forEach((f, d) => {
       const u = i[r[d]];
-      u?.length && Ye(f, u, a);
+      u?.length && Qe(f, u, s);
     });
   else {
-    const o = i[wn];
-    o?.length && Ye(n, o, a);
+    const o = i[En];
+    o?.length && Qe(n, o, s);
   }
-  function s(o, f) {
+  function a(o, f) {
     o.fields?.length === 0 && (delete o.mark, delete o.axes, delete o.legends), o.fields && f.fields.filter((d) => d.active).forEach((d) => {
       o.fields?.find((u) => u.field === d.name) || o.fields?.push({
         ...d,
@@ -387,12 +387,12 @@ async function Fn(e, t) {
   }
   return n;
 }
-let Pn = 0;
-function On() {
-  return `text_node_${Pn++}`;
+let On = 0;
+function Rn() {
+  return `text_node_${On++}`;
 }
-function gt(e) {
-  return { ...e, id: On(), children: e.children.map(gt) };
+function ht(e) {
+  return { ...e, id: Rn(), children: e.children.map(ht) };
 }
 function ge(e, t) {
   if (!e || typeof e != "object") return e;
@@ -407,8 +407,8 @@ function ge(e, t) {
   }
   return e;
 }
-function vt(e, t, n) {
-  const i = e.children.map((r) => vt(r, t, n));
+function yt(e, t, n) {
+  const i = e.children.map((r) => yt(r, t, n));
   if (e.nodeType === "group") {
     const r = e.groupby.map(n);
     return { groupby: r.length === 1 ? r[0] : r, ...i.length ? { children: i } : {} };
@@ -420,55 +420,55 @@ function vt(e, t, n) {
     ...i.length ? { children: i } : {}
   };
 }
-function We(e, t) {
+function Ze(e, t) {
   return {
     type: e.type ?? t?.type,
-    timeUnit: e.timeUnit === ft ? void 0 : e.timeUnit ?? t?.timeUnit,
+    timeUnit: e.timeUnit === gt ? void 0 : e.timeUnit ?? t?.timeUnit,
     bin: e.bin !== void 0 ? e.bin : !!t?.bin
   };
 }
 const Te = (e) => `${e.type ?? ""}|${e.timeUnit ?? ""}|${e.bin ? "bin" : ""}`;
-function Ye(e, t, n) {
-  const i = e.fields ?? (e.fields = []), r = e.data ?? [], a = (d) => i.find((u) => u.field === d), l = /* @__PURE__ */ new Map(), s = (d) => d.forEach((u) => {
+function Qe(e, t, n) {
+  const i = e.fields ?? (e.fields = []), r = e.data ?? [], s = (d) => i.find((u) => u.field === d), l = /* @__PURE__ */ new Map(), a = (d) => d.forEach((u) => {
     u.nodeType === "group" && u.groupby.forEach((c) => {
-      const p = We(c, a(c.field)), m = l.get(c.field) ?? /* @__PURE__ */ new Map();
+      const p = Ze(c, s(c.field)), m = l.get(c.field) ?? /* @__PURE__ */ new Map();
       m.set(Te(p), p), l.set(c.field, m);
-    }), s(u.children);
+    }), a(u.children);
   });
-  s(t);
+  a(t);
   const o = /* @__PURE__ */ new Map();
   l.forEach((d, u) => {
-    const c = a(u), p = c ? Te({ type: c.type, timeUnit: c.timeUnit, bin: !!c.bin }) : void 0, m = [...d.keys()], y = p && d.has(p) ? p : m[0];
+    const c = s(u), p = c ? Te({ type: c.type, timeUnit: c.timeUnit, bin: !!c.bin }) : void 0, m = [...d.keys()], y = p && d.has(p) ? p : m[0];
     d.forEach((w, O) => {
       if (O === y)
         c && (w.type && (c.type = w.type), c.timeUnit = w.timeUnit, c.bin = w.bin || void 0), o.set(`${u}|${O}`, u);
       else {
         const C = [w.type, w.timeUnit, w.bin ? "bin" : ""].filter(Boolean), R = `${u}__${C.join("_") || "raw"}`;
-        o.set(`${u}|${O}`, R), i.find((T) => T.field === R) || i.push({ field: R, label: u, type: w.type ?? n.get(u), timeUnit: w.timeUnit, bin: w.bin || void 0 }), r.forEach((T) => {
-          u in T && !(R in T) && (T[R] = T[u]);
+        o.set(`${u}|${O}`, R), i.find((k) => k.field === R) || i.push({ field: R, label: u, type: w.type ?? n.get(u), timeUnit: w.timeUnit, bin: w.bin || void 0 }), r.forEach((k) => {
+          u in k && !(R in k) && (k[R] = k[u]);
         });
       }
     });
   });
-  const f = (d) => o.get(`${d.field}|${Te(We(d, a(d.field)))}`) ?? d.field;
-  e.structure = t.map((d) => vt(d, n, f));
+  const f = (d) => o.get(`${d.field}|${Te(Ze(d, s(d.field)))}`) ?? d.field;
+  e.structure = t.map((d) => yt(d, n, f));
 }
-function Rn(e, t) {
-  const n = Fe(e).spec, i = Zt(n), r = new Qt(i, {
+function Vn(e, t) {
+  const n = Fe(e).spec, i = Qt(n), r = new en(i, {
     renderer: "canvas",
     container: t,
     hover: !0
   });
   return r.runAsync(), r;
 }
-const ht = W();
-function Vn(e) {
+const St = W();
+function Cn(e) {
   const [t, n] = V(void 0), i = {
     setSelection: (r) => {
       r && r.predicate && "and" in r.predicate && r.predicate.and.length === 0 && (r.predicate = void 0), n(r);
     }
   };
-  return S(ht.Provider, {
+  return S(St.Provider, {
     value: [t, i],
     get children() {
       return e.children;
@@ -476,71 +476,74 @@ function Vn(e) {
   });
 }
 function se() {
-  const e = Y(ht);
+  const e = Y(St);
   if (e === void 0)
     throw new Error("useUmweltSelection must be used within a UmweltSelectionProvider");
   return e;
 }
-function yt(e, t, n) {
+function bt(e, t, n) {
   const i = D(e, n);
   if (!i) return;
   const r = i.encodings.find((u) => u.property === "x" || u.property === "y");
   if (!r) return;
-  const a = e.visual.units.find((u) => u.name === r.unit), l = a?.encoding[r.property];
-  if (!a || !l) return;
-  const s = x(i, l), o = a.mark === "point" && s.type === "quantitative" ? !1 : s.scale?.zero, f = Array.isArray(s.scale?.domain) ? s.scale?.domain : void 0, d = {
+  const s = e.visual.units.find((u) => u.name === r.unit), l = s?.encoding[r.property];
+  if (!s || !l) return;
+  const a = x(i, l), o = s.mark === "point" && a.type === "quantitative" ? !1 : a.scale?.zero, f = Array.isArray(a.scale?.domain) ? a.scale?.domain : void 0, d = {
     field: n,
-    type: s.type,
-    bin: !!s.bin,
-    timeUnit: s.timeUnit,
+    type: a.type,
+    bin: !!a.bin,
     scaleZero: o,
     scaleDomain: f,
     // vega-lite sorts discrete scales ascending unless told otherwise
-    sort: s.sort === void 0 ? "ascending" : s.sort
+    sort: a.sort === void 0 ? "ascending" : a.sort
   };
-  return Xt(t, d);
+  if (a.type === "temporal" && a.timeUnit && !a.bin && !a.aggregate) {
+    const u = a.timeUnit, c = H(n, u), p = Ve(t, [{ timeUnit: u, field: n, as: c }]);
+    return Ke(p, { ...d, field: c });
+  }
+  return Ke(t, d);
 }
-function St(e, t) {
+function wt(e, t) {
   const n = D(e, t);
   if (!n) return;
   const i = n.encodings.find((l) => l.property === "x" || l.property === "y");
   if (!i) return;
-  const a = e.visual.units.find((l) => l.name === i.unit)?.encoding[i.property];
-  if (a)
-    return x(n, a);
+  const s = e.visual.units.find((l) => l.name === i.unit)?.encoding[i.property];
+  if (s)
+    return x(n, s);
 }
-function Cn(e, t) {
-  return !!St(e, t)?.bin;
+function In(e, t) {
+  return !!wt(e, t)?.bin;
 }
-function Ce(e, t, n, i) {
+function Ie(e, t, n, i) {
   const r = {};
-  for (const a of i)
-    if (a.bin && a.type === "quantitative" && !(a.field in r)) {
-      if (Cn(e, a.field)) continue;
-      const l = { field: a.field, type: a.type };
-      let s = Kt(l, n, yt(e, t, a.field));
-      if (s.length === 0) {
+  for (const s of i)
+    if (s.bin && s.type === "quantitative" && !(s.field in r)) {
+      if (In(e, s.field)) continue;
+      const l = { field: s.field, type: s.type };
+      let a = Xt(l, n, bt(e, t, s.field));
+      if (a.length === 0) {
         let o = 1 / 0, f = -1 / 0;
         for (const d of n) {
-          const u = d[a.field];
+          const u = d[s.field];
           if (u == null) continue;
           const c = Number(u);
           isNaN(c) || (c < o && (o = c), c > f && (f = c));
         }
-        o <= f && (s = [[o, f]]);
+        o <= f && (a = [[o, f]]);
       }
-      r[a.field] = s;
+      r[s.field] = a;
     }
   return r;
 }
-function Ie(e, t) {
-  return e.filter((n) => tn(n, t));
+function Le(e, t) {
+  return e.filter((n) => nn(n, t));
 }
-const Ze = (e) => e == null ? e : e instanceof Date ? e.getTime() : new Date(e).getTime();
-function In(e, t, n) {
+const et = (e) => e == null ? e : e instanceof Date ? e.getTime() : new Date(e).getTime();
+function Ln(e, t, n) {
   return e.aggregate ? `${e.aggregate}_${t}` : e.timeUnit ? `${e.timeUnit}_${t}` : e.bin ? n.find((i) => i.startsWith("bin") && i.includes(t) && !i.endsWith("_end")) ?? t : t;
 }
-function Ln(e, t, n) {
+function jn(e, t, n) {
   if (!t) return t;
   const i = (r) => {
     if (!r || typeof r != "object") return r;
@@ -548,73 +551,73 @@ function Ln(e, t, n) {
     if ("or" in r) return { or: r.or.map(i) };
     if ("not" in r) return { not: i(r.not) };
     if (!("field" in r)) return r;
-    const a = St(e, r.field);
-    if (!a) return r;
-    const l = In(a, r.field, n), s = l === r.field ? { ...r } : { ...r, field: l };
-    return a.type === "temporal" && ("equal" in s && (s.equal = Ze(s.equal)), "range" in s && Array.isArray(s.range) && (s.range = s.range.map(Ze))), s;
+    const s = wt(e, r.field);
+    if (!s) return r;
+    const l = Ln(s, r.field, n), a = l === r.field ? { ...r } : { ...r, field: l };
+    return s.type === "temporal" && ("equal" in a && (a.equal = et(a.equal)), "range" in a && Array.isArray(a.range) && (a.range = a.range.map(et))), a;
   };
   return i(t);
 }
-var jn = /* @__PURE__ */ A("<div class=uw-vl-container>");
-function qn(e) {
-  const [t, n] = se(), [i, r] = V(!1), [a, l] = V(null), [s, o] = V(null), f = en((u) => {
+var qn = /* @__PURE__ */ A("<div class=uw-vl-container>");
+function Mn(e) {
+  const [t, n] = se(), [i, r] = V(!1), [s, l] = V(null), [a, o] = V(null), f = tn((u) => {
     if (i()) {
-      const c = Wt(u);
+      const c = Yt(u);
       n.setSelection({
         source: "visualization",
         predicate: c
       });
     }
-  }, 250), d = k(() => {
+  }, 250), d = T(() => {
     const u = _e(e.spec, e.data);
-    return u ? Un(u) : [];
+    return u ? An(u) : [];
   });
   return P(() => {
-    const u = t(), c = a();
+    const u = t(), c = s();
     if (!u) {
-      c && c.data(Ge, []).run();
+      c && c.data(He, []).run();
       return;
     }
     if (c && (u.source === "sonification" || u.source === "text-navigation")) {
-      const p = u.source === "sonification" ? Ln(e.spec, u.predicate, d()) : u.predicate, m = Yt(p);
-      c.data(Ge, m ? [m] : []).run();
+      const p = u.source === "sonification" ? jn(e.spec, u.predicate, d()) : u.predicate, m = Zt(p);
+      c.data(He, m ? [m] : []).run();
     }
   }), P(() => {
-    const u = _e(e.spec, e.data), c = s();
+    const u = _e(e.spec, e.data), c = a();
     if (u && c)
       try {
-        const p = Rn(u, c);
+        const p = Vn(u, c);
         p.addDataListener("brush_store", (m, y) => {
           f(y);
         }), l(p);
       } catch (p) {
         console.error(p);
       }
-    H(() => {
-      a()?.finalize(), l(null);
-      const p = s();
+    X(() => {
+      s()?.finalize(), l(null);
+      const p = a();
       p && (p.innerHTML = "");
     });
   }), (() => {
-    var u = jn();
+    var u = qn();
     return u.addEventListener("mouseleave", () => r(!1)), u.addEventListener("mouseenter", () => r(!0)), Ne(o, u), u;
   })();
 }
-var Mn = /* @__PURE__ */ A("<div class=uw-olli-container>");
-function Bn(e) {
-  const [t, n] = se(), [i, r] = V(null), [a, l] = V(null);
-  let s = !1;
+var Bn = /* @__PURE__ */ A("<div class=uw-olli-container>");
+function zn(e) {
+  const [t, n] = se(), [i, r] = V(null), [s, l] = V(null);
+  let a = !1;
   return P(() => {
     let o = !1;
-    H(() => {
+    X(() => {
       o = !0;
-    }), Fn(e.spec, e.data).then((f) => {
+    }), Pn(e.spec, e.data).then((f) => {
       const d = i();
       if (o || !f || !d) return;
-      a()?.destroy(), d.innerHTML = "";
-      const u = qt(f, d);
+      s()?.destroy(), d.innerHTML = "";
+      const u = Bt(f, d);
       u.onFocusChange((c) => {
-        if (s) return;
+        if (a) return;
         const p = u.fullPredicate(c);
         "and" in p && p.and.length > 0 ? n.setSelection({
           source: "text-navigation",
@@ -631,45 +634,45 @@ function Bn(e) {
       }), l(u);
     });
   }), P(() => {
-    const o = t(), f = a();
-    o && f && o.source === "visualization" && (s = !0, f.setSelection(o.predicate ?? {
+    const o = t(), f = s();
+    o && f && o.source === "visualization" && (a = !0, f.setSelection(o.predicate ?? {
       and: []
     }), queueMicrotask(() => {
-      s = !1;
+      a = !1;
     }));
-  }), H(() => {
-    a()?.destroy();
+  }), X(() => {
+    s()?.destroy();
   }), (() => {
-    var o = Mn();
+    var o = Bn();
     return Ne(r, o), o;
   })();
 }
-const bt = W();
-function zn(e) {
+const Et = W();
+function Gn(e) {
   const [t] = se(), n = () => ({
     activeUnitName: void 0,
     selection: void 0
   }), [i, r] = ye(n());
-  let a = null;
+  let s = null;
   P(() => {
-    const s = t();
-    s && s.source !== "sonification" && l.setSelection(s.predicate);
+    const a = t();
+    a && a.source !== "sonification" && l.setSelection(a.predicate);
   });
   const l = {
-    setActiveUnit: (s) => {
-      r("activeUnitName", s);
+    setActiveUnit: (a) => {
+      r("activeUnitName", a);
     },
-    setSelection: (s) => {
-      r("selection", s);
+    setSelection: (a) => {
+      r("selection", a);
     },
-    registerPlayCallback: (s, o = !1) => {
-      (o || a === null) && (a = s);
+    registerPlayCallback: (a, o = !1) => {
+      (o || s === null) && (s = a);
     },
     triggerPlay: () => {
-      a?.();
+      s?.();
     }
   };
-  return S(bt.Provider, {
+  return S(Et.Provider, {
     value: [i, l],
     get children() {
       return e.children;
@@ -677,23 +680,23 @@ function zn(e) {
   });
 }
 function be() {
-  const e = Y(bt);
+  const e = Y(Et);
   if (e === void 0)
     throw new Error("useSonificationRuntime must be used within a SonificationRuntimeProvider");
   return e;
 }
-const B = (e, t) => Array.isArray(e) ? e.length === 2 && (t.type === "quantitative" || t.type === "temporal") ? e.map((n) => B(n, t)).join("–") : Pe(e.map((n) => B(n, t))) : nn(e, t), Gn = "umwelt", Kn = 1, Hn = {
+const B = (e, t) => Array.isArray(e) ? e.length === 2 && (t.type === "quantitative" || t.type === "temporal") ? e.map((n) => B(n, t)).join("–") : Pe(e.map((n) => B(n, t))) : rn(e, t), Kn = "umwelt", Hn = 1, Xn = {
   muted: !1,
   speakAxisTicks: !0,
   speechRate: 50,
   playbackRate: 1
-}, wt = () => new rn(Gn, Kn), Et = () => wt().read(), de = (e) => {
-  const t = Et() ?? Hn;
-  wt().write({
+}, Ut = () => new an(Kn, Hn), At = () => Ut().read(), de = (e) => {
+  const t = At() ?? Xn;
+  Ut().write({
     ...t,
     ...e
   });
-}, Qe = (e, t, n) => Math.min(Math.max(e, t), n), Xn = {
+}, tt = (e, t, n) => Math.min(Math.max(e, t), n), Jn = {
   // clean triangle beep — the historical default; most pitch-legible source
   pure: {
     create: () => new $.Synth({
@@ -810,10 +813,10 @@ const B = (e, t) => Array.isArray(e) ? e.length === 2 && (t.type === "quantitati
     }),
     gainTrim: -7
   }
-}, et = ["pure", "bell", "bright", "reed", "hollow", "strings"], Jn = (e) => et[e % et.length], ke = "default", ne = 0.1;
+}, nt = ["pure", "bell", "bright", "reed", "hollow", "strings"], Wn = (e) => nt[e % nt.length], ke = "default", ne = 0.1;
 let M = null;
-const ae = 120, Ut = W();
-function Wn(e) {
+const ae = 120, Dt = W();
+function Yn(e) {
   const t = /* @__PURE__ */ new Map(), n = {
     attack: 0.01,
     decay: 0,
@@ -824,16 +827,16 @@ function Wn(e) {
   }, r = (c, p) => {
     let m = t.get(c);
     if (m && p !== void 0 && m.instrument !== p && (i(m), t.delete(c), m = void 0), !m) {
-      const y = p ?? "pure", w = Xn[y], O = new $.Panner(0).toDestination(), C = w.create().connect(O), R = new $.NoiseSynth({
+      const y = p ?? "pure", w = Jn[y], O = new $.Panner(0).toDestination(), C = w.create().connect(O), R = new $.NoiseSynth({
         noise: {
           type: "pink"
         },
         envelope: n
-      }), T = new $.Gain(0.3);
-      R.connect(T), T.connect(O), m = {
+      }), k = new $.Gain(0.3);
+      R.connect(k), k.connect(O), m = {
         synth: C,
         noiseSynth: R,
-        noiseGain: T,
+        noiseGain: k,
         panner: O,
         instrument: y,
         gainTrim: w.gainTrim,
@@ -842,19 +845,19 @@ function Wn(e) {
       }, t.set(c, m);
     }
     return m;
-  }, a = (c) => {
+  }, s = (c) => {
     c.synth.triggerRelease(), c.noiseSynth.triggerRelease(), c.isSynthPlaying = !1, c.isNoisePlaying = !1;
   };
   P(() => {
     const c = () => {
       document.hidden && u.stopTransport();
     };
-    document.addEventListener("visibilitychange", c), H(() => {
+    document.addEventListener("visibilitychange", c), X(() => {
       document.removeEventListener("visibilitychange", c), t.forEach(i), t.clear(), M === d && (M = null, $.getTransport().cancel(), $.getTransport().stop());
     });
   });
   const l = () => {
-    const c = Et();
+    const c = At();
     return {
       transport: $.getTransport(),
       muted: c?.muted ?? !1,
@@ -864,9 +867,9 @@ function Wn(e) {
       pauseBetweenSections: 0.25,
       isPlaying: !1
     };
-  }, [s, o] = ye(l());
+  }, [a, o] = ye(l());
   P(() => {
-    s.transport.bpm.value = ae * s.playbackRate;
+    a.transport.bpm.value = ae * a.playbackRate;
   });
   const f = () => {
     o((c) => ({
@@ -896,10 +899,10 @@ function Wn(e) {
       }), o((p) => ({
         ...p,
         speakAxisTicks: c
-      })), c || (speechSynthesis.cancel(), s.isPlaying && $.getTransport().start());
+      })), c || (speechSynthesis.cancel(), a.isPlaying && $.getTransport().start());
     },
     setSpeechRate: (c) => {
-      const p = Qe(c, 1, 100);
+      const p = tt(c, 1, 100);
       de({
         speechRate: c
       }), o((m) => ({
@@ -908,7 +911,7 @@ function Wn(e) {
       }));
     },
     setPlaybackRate: (c) => {
-      const p = Qe(c, 0.1, 4);
+      const p = tt(c, 0.1, 4);
       de({
         playbackRate: p
       }), o((m) => ({
@@ -938,7 +941,7 @@ function Wn(e) {
     startOrRampSynth: (c, p = ke) => {
       const m = r(p);
       if (c.rest) {
-        a(m);
+        s(m);
         return;
       }
       if (c.pitch) {
@@ -951,25 +954,25 @@ function Wn(e) {
     releaseSynth: (c) => {
       if (c !== void 0) {
         const p = t.get(c);
-        p && a(p);
+        p && s(p);
       } else
-        t.forEach(a);
+        t.forEach(s);
     }
   };
-  return S(Ut.Provider, {
-    value: [s, u],
+  return S(Dt.Provider, {
+    value: [a, u],
     get children() {
       return e.children;
     }
   });
 }
 function Z() {
-  const e = Y(Ut);
+  const e = Y(Dt);
   if (e === void 0)
     throw new Error("useSonificationRuntime must be used within a SonificationRuntimeProvider");
   return e;
 }
-const At = W(), Yn = {
+const $t = W(), Zn = {
   pitch: [48, 84],
   // in MIDI. Three octaves from C3 to C6
   duration: [0.25, 1],
@@ -980,7 +983,7 @@ const At = W(), Yn = {
   // lateral without ever going fully single-channel — full pan drops the off ear
   // to silence (fatiguing on headphones, inaudible for single-sided hearing loss).
   pan: [-0.9, 0.9]
-}, tt = {
+}, it = {
   pitch: 60,
   // MIDI C4 middle C. We encode in MIDI because linear interpolations in Hz are not perceptually linear
   duration: 0.2,
@@ -990,54 +993,54 @@ const At = W(), Yn = {
   pan: 0
   // center
 };
-function Zn(e, t, n) {
+function Qn(e, t, n) {
   if (t.length === e.length) {
-    const a = on().domain(e).range(t);
-    return (l) => a(l);
+    const s = cn().domain(e).range(t);
+    return (l) => s(l);
   }
   const i = [Math.min(...t), Math.max(...t)];
   t.length !== 2 && console.warn(`Audio ${n} scale range has ${t.length} values for ${e.length} categories; ignoring it and spacing evenly across [${i[0]}, ${i[1]}].`);
-  const r = cn().domain(e.map(String)).range(i).align(0);
-  return (a) => r(String(a)) ?? i[0];
+  const r = ln().domain(e.map(String)).range(i).align(0);
+  return (s) => r(String(s)) ?? i[0];
 }
 function fe(e, t, n, i) {
   const r = n.encoding[i];
   if (!r)
-    return () => tt[i];
-  const a = D(e, r.field);
-  if (!a)
-    return console.warn(`Field ${r.field} not found in spec`), () => tt[i];
-  const l = x(a, r);
-  let s = l.scale?.domain;
-  if (!s) {
-    const f = l.aggregate === "count" || l.aggregate === "sum", d = Ve(e, n), u = f ? Oe(t, d, Ce(e, t, t, d)) : t;
-    switch (a.type) {
+    return () => it[i];
+  const s = D(e, r.field);
+  if (!s)
+    return console.warn(`Field ${r.field} not found in spec`), () => it[i];
+  const l = x(s, r);
+  let a = l.scale?.domain;
+  if (!a) {
+    const f = l.aggregate === "count" || l.aggregate === "sum", d = Ce(e, n), u = f ? Oe(t, d, Ie(e, t, t, d)) : t;
+    switch (s.type) {
       case "ordinal":
       case "nominal":
-        s = re(l, u, f);
+        a = re(l, u, f);
         break;
       case "quantitative":
       case "temporal":
-        s = re(l, u, f), s = [s[0], s[s.length - 1]];
+        a = re(l, u, f), a = [a[0], a[a.length - 1]];
         break;
       default:
         throw new Error(`Unsupported field type ${l.type}`);
     }
   }
-  const o = l.scale?.range || Yn[i];
+  const o = l.scale?.range || Zn[i];
   switch (l.type) {
     case "ordinal":
     case "nominal":
-      return Zn(s, o, i);
+      return Qn(a, o, i);
     case "quantitative":
-      return sn().domain(s).range(o);
+      return on().domain(a).range(o);
     case "temporal":
-      return an().domain(s).range(o);
+      return sn().domain(a).range(o);
     default:
       throw new Error(`Unsupported field type ${l.type}`);
   }
 }
-function Dt(e, t, n) {
+function Tt(e, t, n) {
   return {
     pitch: fe(e, t, n, "pitch"),
     duration: fe(e, t, n, "duration"),
@@ -1045,27 +1048,27 @@ function Dt(e, t, n) {
     pan: fe(e, t, n, "pan")
   };
 }
-function $t(e, t, n) {
-  return yt(e, t, n) ?? [];
+function kt(e, t, n) {
+  return bt(e, t, n) ?? [];
 }
-function Qn(e) {
-  const t = (r) => $t(e.spec, e.data, r.field), n = Dt(e.spec, e.data, e.audioUnitSpec), i = {
+function ei(e) {
+  const t = (r) => kt(e.spec, e.data, r.field), n = Tt(e.spec, e.data, e.audioUnitSpec), i = {
     getAxisTicks: t
   };
-  return S(At.Provider, {
+  return S($t.Provider, {
     value: [n, i],
     get children() {
       return e.children;
     }
   });
 }
-function ei() {
-  const e = Y(At);
+function ti() {
+  const e = Y($t);
   if (e === void 0)
     throw new Error("useSonificationRuntime must be used within a SonificationRuntimeProvider");
   return e;
 }
-const nt = {
+const rt = {
   pitch: 60,
   // MIDI C4 middle C. We encode in MIDI because linear interpolations in Hz are not perceptually linear
   duration: 0.2,
@@ -1077,31 +1080,31 @@ const nt = {
 };
 function me(e, t, n, i, r) {
   if (!n)
-    return nt[e];
-  const a = D(t, n.field);
-  if (!a)
-    return nt[e];
-  const l = x(a, n), s = Se(l);
-  return i(r[0][s]);
-}
-const Le = (e, t) => e.audioUnitSpec.traversal.find((n) => n.field === t);
+    return rt[e];
+  const s = D(t, n.field);
+  if (!s)
+    return rt[e];
+  const l = x(s, n), a = Se(l);
+  return i(r[0][a]);
+}
+const je = (e, t) => e.audioUnitSpec.traversal.find((n) => n.field === t);
 function we(e, t, n) {
-  const i = D(e.spec, t), r = x(i, Le(e, t)), a = e.fieldDomains[t];
+  const i = D(e.spec, t), r = x(i, je(e, t)), s = e.fieldDomains[t];
   if (r.bin && !r.aggregate) {
-    const [l, s] = mt(r), o = a[n], f = e.derivedData.find((d) => d[l] === o)?.[s] ?? null;
+    const [l, a] = vt(r), o = s[n], f = e.derivedData.find((d) => d[l] === o)?.[a] ?? null;
     return [o, f];
   } else
-    return a[n];
+    return s[n];
 }
-function Tt(e, t) {
+function _t(e, t) {
   return {
     and: Object.entries(t).map(([n, i]) => {
-      const r = we(e, n, i), a = e.fieldDomains[n].length - 1;
+      const r = we(e, n, i), s = e.fieldDomains[n].length - 1;
       return Array.isArray(r) ? {
         field: n,
         range: r,
         inclusiveLeft: !0,
-        inclusiveRight: i === a
+        inclusiveRight: i === s
       } : {
         field: n,
         equal: r
@@ -1112,19 +1115,19 @@ function Tt(e, t) {
 function xe(e, t) {
   const n = {
     and: Object.entries(t).map(([i, r]) => {
-      const a = e.fieldDomains[i][r], l = D(e.spec, i);
+      const s = e.fieldDomains[i][r], l = D(e.spec, i);
       if (!l)
-        return { field: i, equal: a };
-      const s = x(l, Le(e, i));
+        return { field: i, equal: s };
+      const a = x(l, je(e, i));
       return {
-        field: Se(s),
-        equal: Ht(a, l)
+        field: Se(a),
+        equal: Jt(s, l)
       };
     })
   };
-  return Ie(e.derivedData, n);
+  return Le(e.derivedData, n);
 }
-function ti(e, t) {
+function ni(e, t) {
   const n = e.audioUnitSpec.encoding;
   return {
     pitch: t.length ? me("pitch", e.spec, n.pitch, e.scales.pitch, t) : void 0,
@@ -1133,8 +1136,8 @@ function ti(e, t) {
     pan: me("pan", e.spec, n.pan, e.scales.pan, t)
   };
 }
-function ni(e, t) {
-  const n = Object.entries(t).map(([r, a]) => a === e.fieldDomains[r].length - 1 ? 1 : 0).reverse();
+function ii(e, t) {
+  const n = Object.entries(t).map(([r, s]) => s === e.fieldDomains[r].length - 1 ? 1 : 0).reverse();
   let i = 0;
   for (let r of n)
     if (r)
@@ -1142,29 +1145,29 @@ function ni(e, t) {
     else break;
   return i;
 }
-function ii(e) {
+function ri(e) {
   if (e.audioUnitSpec.traversal.length === 0)
     return !1;
   const t = e.audioUnitSpec.traversal[e.audioUnitSpec.traversal.length - 1].field, n = D(e.spec, t);
   return n?.type === "quantitative" || n?.type === "temporal";
 }
-function ri(e) {
-  const t = e.audioUnitSpec.traversal.map((r) => r.field), n = t.map((r) => Array.from({ length: e.fieldDomains[r].length }, (a, l) => l));
-  return ln(n).map((r) => {
-    const a = {};
-    return r.forEach((l, s) => {
-      a[t[s]] = l;
-    }), a;
+function ai(e) {
+  const t = e.audioUnitSpec.traversal.map((r) => r.field), n = t.map((r) => Array.from({ length: e.fieldDomains[r].length }, (s, l) => l));
+  return un(n).map((r) => {
+    const s = {};
+    return r.forEach((l, a) => {
+      s[t[a]] = l;
+    }), s;
   });
 }
-function ai(e, t, n, i) {
+function si(e, t, n, i) {
   if (!n)
     return !0;
   if (i.bin || i.type === "nominal" || i.type === "ordinal")
     return t[i.field] !== n[i.field];
-  const r = e.axisTicks[i.field] ?? [], a = xe(e, t), l = xe(e, n);
-  if (a.length && l.length) {
-    const s = Se(i), o = a[0][s], f = l[0][s];
+  const r = e.axisTicks[i.field] ?? [], s = xe(e, t), l = xe(e, n);
+  if (s.length && l.length) {
+    const a = Se(i), o = s[0][a], f = l[0][a];
     if (o && f) {
       const d = r.findIndex((c, p) => {
         const m = c instanceof Date ? c.getTime() : c, y = r[p + 1], w = y instanceof Date ? y.getTime() : y;
@@ -1178,94 +1181,94 @@ function ai(e, t, n, i) {
   }
   return !1;
 }
-function si(e, t, n) {
+function oi(e, t, n) {
   const i = [];
   return Object.entries(t).forEach(([r]) => {
     if (!e.fieldDomains[r].length) return;
-    const l = D(e.spec, r), s = x(l, Le(e, r));
-    ai(e, t, n, s) && i.push(B(we(e, r, t[r]), s));
+    const l = D(e.spec, r), a = x(l, je(e, r));
+    si(e, t, n, a) && i.push(B(we(e, r, t[r]), a));
   }), i.join(", ");
 }
-function kt(e) {
+function xt(e) {
   let t = 0;
-  const n = [], i = ri(e), r = ii(e);
-  let a;
+  const n = [], i = ai(e), r = ri(e);
+  let s;
   return i.forEach((l) => {
-    const s = xe(e, l), o = ti(e, s), f = ni(e, l), d = e.pauseBetweenSections * f;
+    const a = xe(e, l), o = ni(e, a), f = ii(e, l), d = e.pauseBetweenSections * f;
     n.push({
       ...o,
       time: t,
       pauseAfter: d,
       ramp: r,
-      rest: s.length === 0,
+      rest: a.length === 0,
       state: l,
-      speakBefore: si(e, l, a)
-    }), t += o.duration + d, a = l;
+      speakBefore: oi(e, l, s)
+    }), t += o.duration + d, s = l;
   }), n;
 }
-function oi(e) {
+function ci(e) {
   if (!e.length) return [];
   const t = e[0].notes.length, n = [];
   let i = 0;
   for (let r = 0; r < t; r++) {
-    const a = e.map((f) => ({ voiceId: f.voiceId, note: f.notes[r] })), l = Math.max(...a.map((f) => f.note.duration)), s = e[0].notes[r], o = s.pauseAfter ?? 0;
+    const s = e.map((f) => ({ voiceId: f.voiceId, note: f.notes[r] })), l = Math.max(...s.map((f) => f.note.duration)), a = e[0].notes[r], o = a.pauseAfter ?? 0;
     n.push({
-      state: s.state,
+      state: a.state,
       time: i,
       slotDuration: l,
       pauseAfter: o,
-      speakBefore: s.speakBefore,
-      ramp: s.ramp,
-      notes: a
+      speakBefore: a.speakBefore,
+      ramp: a.ramp,
+      notes: s
     }), i += l + o;
   }
   return n;
 }
-function _t(e) {
+function Nt(e) {
   return Pe(
     Object.entries(e.audioUnitSpec.encoding).map(([t, n]) => n ? `${K(x(D(e.spec, n.field), n))} as ${t}` : "").filter((t) => t)
   );
 }
-function xt(e) {
+function Ft(e) {
   if (!e.audioUnitSpec.traversal.length)
     return "";
   const t = e.audioUnitSpec.traversal[e.audioUnitSpec.traversal.length - 1], n = D(e.spec, t.field), i = x(n, t);
   let r;
-  i.bin ? r = An(i, e.derivedData) : r = e.fieldDomains[t.field];
-  let a = "";
-  r.length > 1 ? a = `${K(i)} from ${B(r[0], i)} to ${B(r[r.length - 1], i)}` : r.length === 1 ? a = `${K(i)} equals ${B(r[0], i)}` : a = K(i);
-  const l = e.audioUnitSpec.traversal.slice(0, -1).map((s) => {
-    const o = D(e.spec, s.field);
-    return K(x(o, s));
+  i.bin ? r = Dn(i, e.derivedData) : r = e.fieldDomains[t.field];
+  let s = "";
+  r.length > 1 ? s = `${K(i)} from ${B(r[0], i)} to ${B(r[r.length - 1], i)}` : r.length === 1 ? s = `${K(i)} equals ${B(r[0], i)}` : s = K(i);
+  const l = e.audioUnitSpec.traversal.slice(0, -1).map((a) => {
+    const o = D(e.spec, a.field);
+    return K(x(o, a));
   });
-  return l.length && (a += ` for each ${Pe(l)}`), a;
+  return l.length && (s += ` for each ${Pe(l)}`), s;
 }
-const je = W();
-function ci(e) {
-  const [t, n] = se(), [i, r] = ei(), [a, l] = be(), [s, o] = Z(), [f, d] = V(), u = () => {
+const qe = W();
+function li(e) {
+  const [t, n] = se(), [i, r] = ti(), [s, l] = be(), [a, o] = Z(), [f, d] = V(), u = () => {
     const E = speechSynthesis.getVoices(), b = E.find((h) => h.name === "Samantha"), g = E.find((h) => h.localService && h.default), v = E.find((h) => h.default);
     d(b ?? g ?? v);
   };
-  u(), speechSynthesis.addEventListener("voiceschanged", u), H(() => speechSynthesis.removeEventListener("voiceschanged", u));
+  u(), speechSynthesis.addEventListener("voiceschanged", u), X(() => speechSynthesis.removeEventListener("voiceschanged", u));
   const c = () => ({
     traversalState: Object.fromEntries(e.audioUnitSpec.traversal.map((E) => [E.field, 0]))
-  }), [p, m] = ye(c()), y = () => e.audioUnitSpec.name, w = () => e.audioUnitSpec.instrument ?? "pure", O = k(() => Ve(e.spec, e.audioUnitSpec)), C = k(() => a.selection ? Ie(e.data, a.selection) : e.data), R = k(() => Ce(e.spec, e.data, C(), O())), T = k(() => Oe(C(), O(), R())), z = k(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
-    const b = D(e.spec, E.field), g = x(b, E), v = re(g, T(), !0);
+  }), [p, m] = ye(c()), y = () => e.audioUnitSpec.name, w = () => e.audioUnitSpec.instrument ?? "pure", O = T(() => Ce(e.spec, e.audioUnitSpec)), C = T(() => s.selection ? Le(e.data, s.selection) : e.data), R = T(() => Ie(e.spec, e.data, C(), O())), k = T(() => Oe(C(), O(), R())), z = T(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
+    const b = D(e.spec, E.field), g = x(b, E), v = re(g, k(), !0);
     return [E.field, v];
-  }))), Ue = k(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
+  }))), Ue = T(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
     const b = D(e.spec, E.field), g = x(b, E);
     return [E.field, r.getAxisTicks(g)];
-  }))), q = k(() => ({
+  }))), q = T(() => ({
     spec: e.spec,
     audioUnitSpec: e.audioUnitSpec,
-    derivedData: T(),
+    derivedData: k(),
     fieldDomains: z(),
     axisTicks: Ue(),
     scales: i,
-    pauseBetweenSections: s.pauseBetweenSections
-  })), oe = k(() => kt(q())), Ae = (E, b) => we(q(), E, b), Q = k(() => Tt(q(), p.traversalState)), ce = (E) => oe().find((b) => Object.entries(E).every(([g, v]) => b.state[g] === v));
+    pauseBetweenSections: a.pauseBetweenSections
+  })), oe = T(() => xt(q())), Ae = (E, b) => we(q(), E, b), Q = T(() => _t(q(), p.traversalState)), ce = (E) => oe().find((b) => Object.entries(E).every(([g, v]) => b.state[g] === v));
   P(() => {
-    if (s.isPlaying) {
+    if (a.isPlaying) {
       const E = Q();
       n.setSelection({
         source: "sonification",
@@ -1289,7 +1292,7 @@ function ci(e) {
     }), v && (m((U) => ({
       ...U,
       traversalState: h
-    })), a.activeUnitName === e.audioUnitSpec.name && G.setupTransportSequence()), b;
+    })), s.activeUnitName === e.audioUnitSpec.name && G.setupTransportSequence()), b;
   }), P((E) => (E !== e.audioUnitSpec && G.setupTransportSequence(), e.audioUnitSpec));
   const G = {
     setTraversalIndex: (E, b) => {
@@ -1299,51 +1302,55 @@ function ci(e) {
           ...h.traversalState,
           [E]: b
         }
-      })), a.activeUnitName === e.audioUnitSpec.name && (l.setActiveUnit(e.audioUnitSpec.name), G.setupTransportSequence());
+      })), s.activeUnitName === e.audioUnitSpec.name && (l.setActiveUnit(e.audioUnitSpec.name), G.setupTransportSequence());
       const g = Q();
       n.setSelection({
         source: "sonification",
         predicate: g
       });
       const v = ce(p.traversalState);
-      v && (o.ensureVoice(y(), w()), s.transport.seconds = v.time, o.playNote(v, y()));
+      v && (o.ensureVoice(y(), w()), a.transport.seconds = v.time, o.playNote(v, y()));
     },
     getTraversalIndex: (E) => p.traversalState[E],
-    setupTransportSequence: () => {
-      s.transport.cancel(), o.ensureVoice(y(), w()), s.transport.bpm.value = ae;
+    // untrack: imperative scheduling action, not a derivation — effects that call
+    // it must not subscribe to the signals it reads (traversal state, notes, ...),
+    // or every step callback's state update re-runs the effect mid-playback.
+    // (See the same guard in AudioLayerGroupContext, where this actually bit.)
+    setupTransportSequence: () => ct(() => {
+      a.transport.cancel(), o.ensureVoice(y(), w()), a.transport.bpm.value = ae;
       const E = oe();
       E.forEach((b, g) => {
-        Object.entries(b.state).every(([v, h]) => p.traversalState[v] === h) && (s.transport.seconds = b.time), s.transport.schedule(() => {
-          if (s.isPlaying)
+        Object.entries(b.state).every(([v, h]) => p.traversalState[v] === h) && (a.transport.seconds = b.time), a.transport.schedule(() => {
+          if (a.isPlaying)
             if (m((v) => ({
               ...v,
               traversalState: b.state
-            })), b.speakBefore && s.speakAxisTicks && !s.muted) {
-              s.transport.pause(), o.releaseSynth(y()), speechSynthesis.cancel();
+            })), b.speakBefore && a.speakAxisTicks && !a.muted) {
+              a.transport.pause(), o.releaseSynth(y()), speechSynthesis.cancel();
               const v = new SpeechSynthesisUtterance(b.speakBefore);
-              v.voice = f() ?? null, v.rate = s.speechRate / 25, v.onend = () => {
-                s.isPlaying && (b.ramp ? o.startOrRampSynth(b, y()) : o.playNote(b, y()), s.transport.start());
+              v.voice = f() ?? null, v.rate = a.speechRate / 25, v.onend = () => {
+                a.isPlaying && (b.ramp ? o.startOrRampSynth(b, y()) : o.playNote(b, y()), a.transport.start());
               }, speechSynthesis.speak(v);
             } else
               b.ramp ? o.startOrRampSynth(b, y()) : o.playNote(b, y());
-        }, b.time), b.pauseAfter && s.transport.schedule(() => {
+        }, b.time), b.pauseAfter && a.transport.schedule(() => {
           o.releaseSynth(y());
-        }, b.time + b.duration), g === E.length - 1 && s.transport.schedule(() => {
+        }, b.time + b.duration), g === E.length - 1 && a.transport.schedule(() => {
           o.stopTransport();
         }, b.time + b.duration);
-      }), s.transport.bpm.value = ae * s.playbackRate;
-    },
+      }), a.transport.bpm.value = ae * a.playbackRate;
+    }),
     getFieldDomains: z,
-    getDerivedData: T,
+    getDerivedData: k,
     resetTraversalIfEnd: () => {
       const E = e.audioUnitSpec.traversal.map((v) => v.field), b = p.traversalState;
-      E.every((v) => b[v] === z()[v].length - 1) && (m(c()), s.transport.seconds = 0);
+      E.every((v) => b[v] === z()[v].length - 1) && (m(c()), a.transport.seconds = 0);
     },
     getDomainValue: Ae,
-    describeEncodings: () => _t(q()),
-    describePlaybackOrder: () => xt(q())
+    describeEncodings: () => Nt(q()),
+    describePlaybackOrder: () => Ft(q())
   };
-  return S(je.Provider, {
+  return S(qe.Provider, {
     value: [p, G],
     get children() {
       return e.children;
@@ -1351,12 +1358,12 @@ function ci(e) {
   });
 }
 function Ee() {
-  const e = Y(je);
+  const e = Y(qe);
   if (e === void 0)
     throw new Error("useAudioUnitState must be used within a AudioUnitStateProvider");
   return e;
 }
-const Nt = N("div")`
+const Pt = N("div")`
   margin-bottom: 3px;
 
   label {
@@ -1369,9 +1376,9 @@ const Nt = N("div")`
   label > * {
     justify-self: start;
   }
-`, qe = `
+`, Me = `
   font-family: monospace;
-`, Ft = N("div")`
+`, Ot = N("div")`
   border-left: 1px solid #ccc;
   padding-left: 1rem;
 `;
@@ -1410,14 +1417,14 @@ N("div")`
   margin-top: 1em;
 `;
 N("h4")`
-  ${qe}
+  ${Me}
 `;
 N("div")`
-  ${qe}
+  ${Me}
 `;
 N("table")`
   border: 1px solid #ccc;
-  ${qe}
+  ${Me}
 `;
 N("button")`
   margin-top: 1rem;
@@ -1427,45 +1434,45 @@ N("div")`
   align-items: center;
   gap: 8px;
 `;
-var li = /* @__PURE__ */ A("<select>"), ui = /* @__PURE__ */ A("<div><input aria-live=assertive type=range min=0><span>"), di = /* @__PURE__ */ A("<label><span>"), fi = /* @__PURE__ */ A("<option>");
-function Pt(e) {
-  const [t, n] = Ee(), [i, r] = Z(), a = () => D(e.spec, e.traversalFieldDef.field), l = () => x(a(), e.traversalFieldDef), s = () => n.getTraversalIndex(e.traversalFieldDef.field), o = (u) => {
+var ui = /* @__PURE__ */ A("<select>"), di = /* @__PURE__ */ A("<div><input aria-live=assertive type=range min=0><span>"), fi = /* @__PURE__ */ A("<label><span>"), mi = /* @__PURE__ */ A("<option>");
+function Rt(e) {
+  const [t, n] = Ee(), [i, r] = Z(), s = () => D(e.spec, e.traversalFieldDef.field), l = () => x(s(), e.traversalFieldDef), a = () => n.getTraversalIndex(e.traversalFieldDef.field), o = (u) => {
     r.startAudioContext(), n.setTraversalIndex(e.traversalFieldDef.field, u);
-  }, f = () => n.getFieldDomains()[e.traversalFieldDef.field], d = () => n.getDomainValue(e.traversalFieldDef.field, s());
-  return S(Nt, {
+  }, f = () => n.getFieldDomains()[e.traversalFieldDef.field], d = () => n.getDomainValue(e.traversalFieldDef.field, a());
+  return S(Pt, {
     get children() {
-      var u = di(), c = u.firstChild;
-      return _(c, () => K(l())), _(u, S(Lt, {
+      var u = fi(), c = u.firstChild;
+      return _(c, () => K(l())), _(u, S(qt, {
         get children() {
-          return [S(Be, {
+          return [S(ze, {
             get when() {
               return l().type === "nominal";
             },
             get children() {
-              var p = li();
+              var p = ui();
               return p.$$mousedown = () => r.stopTransport(), p.addEventListener("change", (m) => o(m.target.selectedIndex)), _(p, S(ie, {
                 get each() {
                   return f();
                 },
                 children: (m) => (() => {
-                  var y = fi();
+                  var y = mi();
                   return _(y, () => String(m)), L(() => y.value = String(m)), y;
                 })()
               })), L(() => p.value = String(d())), p;
             }
-          }), S(Be, {
+          }), S(ze, {
             get when() {
               return l().type !== "nominal";
             },
             get children() {
-              var p = ui(), m = p.firstChild, y = m.nextSibling;
+              var p = di(), m = p.firstChild, y = m.nextSibling;
               return m.$$mousedown = () => r.stopTransport(), m.$$input = (w) => o(w.currentTarget.valueAsNumber), _(y, () => B(d(), l())), L((w) => {
                 var O = B(d(), l()), C = f().length - 1;
-                return O !== w.e && Me(m, "aria-valuetext", w.e = O), C !== w.t && Me(m, "max", w.t = C), w;
+                return O !== w.e && Be(m, "aria-valuetext", w.e = O), C !== w.t && Be(m, "max", w.t = C), w;
               }, {
                 e: void 0,
                 t: void 0
-              }), L(() => m.value = s()), p;
+              }), L(() => m.value = a()), p;
             }
           })];
         }
@@ -1473,42 +1480,42 @@ function Pt(e) {
     }
   });
 }
-at(["mousedown", "input"]);
-var mi = /* @__PURE__ */ A("<button>Pause"), pi = /* @__PURE__ */ A("<div>"), gi = /* @__PURE__ */ A("<button>Play");
-function Ot(e) {
-  const [t, n] = Ee(), [i, r] = Z(), [a, l] = be();
-  function s() {
-    r.startAudioContext(), a.activeUnitName !== e.unitName && (l.setActiveUnit(e.unitName), n.setupTransportSequence()), n.resetTraversalIfEnd(), r.startTransport();
+ot(["mousedown", "input"]);
+var pi = /* @__PURE__ */ A("<button>Pause"), gi = /* @__PURE__ */ A("<div>"), vi = /* @__PURE__ */ A("<button>Play");
+function Vt(e) {
+  const [t, n] = Ee(), [i, r] = Z(), [s, l] = be();
+  function a() {
+    r.startAudioContext(), s.activeUnitName !== e.unitName && (l.setActiveUnit(e.unitName), n.setupTransportSequence()), n.resetTraversalIfEnd(), r.startTransport();
   }
-  return jt(() => l.registerPlayCallback(s)), P(() => {
-    a.activeUnitName === e.unitName && l.registerPlayCallback(s, !0);
+  return Mt(() => l.registerPlayCallback(a)), P(() => {
+    s.activeUnitName === e.unitName && l.registerPlayCallback(a, !0);
   }), (() => {
-    var o = pi();
-    return _(o, S(st, {
+    var o = gi();
+    return _(o, S(lt, {
       get when() {
-        return pe(() => !!i.isPlaying)() && a.activeUnitName === e.unitName;
+        return pe(() => !!i.isPlaying)() && s.activeUnitName === e.unitName;
       },
       get fallback() {
         return (() => {
-          var f = gi();
-          return f.$$click = () => s(), f;
+          var f = vi();
+          return f.$$click = () => a(), f;
         })();
       },
       get children() {
-        var f = mi();
+        var f = pi();
         return f.$$click = () => r.stopTransport(), f;
       }
     })), o;
   })();
 }
-at(["click"]);
-var vi = /* @__PURE__ */ A("<label> <input readonly>"), hi = /* @__PURE__ */ A("<p><br>playing ");
-const yi = N.div`
+ot(["click"]);
+var hi = /* @__PURE__ */ A("<label> <input readonly>"), yi = /* @__PURE__ */ A("<p><br>playing ");
+const Si = N.div`
   margin-bottom: 1em;
 `;
-function Si(e) {
+function bi(e) {
   function t() {
-    return S(yi, {
+    return S(Si, {
       get children() {
         return S(ie, {
           get each() {
@@ -1516,13 +1523,13 @@ function Si(e) {
           },
           children: ([i, r]) => {
             if (r) {
-              const a = D(e.spec, r.field);
-              if (a) {
-                const l = x(a, r);
-                return S(Nt, {
+              const s = D(e.spec, r.field);
+              if (s) {
+                const l = x(s, r);
+                return S(Pt, {
                   get children() {
-                    var s = vi(), o = s.firstChild, f = o.nextSibling;
-                    return _(s, i, o), L(() => f.value = K(l)), s;
+                    var a = hi(), o = a.firstChild, f = o.nextSibling;
+                    return _(a, i, o), L(() => f.value = K(l)), a;
                   }
                 });
               }
@@ -1535,13 +1542,13 @@ function Si(e) {
   function n() {
     const [i, r] = Ee();
     return (() => {
-      var a = hi(), l = a.firstChild;
-      return l.nextSibling, _(a, () => r.describeEncodings(), l), _(a, () => r.describePlaybackOrder(), null), a;
+      var s = yi(), l = s.firstChild;
+      return l.nextSibling, _(s, () => r.describeEncodings(), l), _(s, () => r.describePlaybackOrder(), null), s;
     })();
   }
-  return Object.keys(e.audioUnitSpec.encoding).length === 0 ? null : S(Ft, {
+  return Object.keys(e.audioUnitSpec.encoding).length === 0 ? null : S(Ot, {
     get children() {
-      return S(Qn, {
+      return S(ei, {
         get spec() {
           return e.spec;
         },
@@ -1552,7 +1559,7 @@ function Si(e) {
           return e.audioUnitSpec;
         },
         get children() {
-          return S(ci, {
+          return S(li, {
             get spec() {
               return e.spec;
             },
@@ -1567,13 +1574,13 @@ function Si(e) {
                 get each() {
                   return e.audioUnitSpec.traversal;
                 },
-                children: (i) => S(Pt, {
+                children: (i) => S(Rt, {
                   get spec() {
                     return e.spec;
                   },
                   traversalFieldDef: i
                 })
-              }), S(Ot, {
+              }), S(Vt, {
                 get unitName() {
                   return e.audioUnitSpec.name;
                 }
@@ -1585,51 +1592,51 @@ function Si(e) {
     }
   });
 }
-function bi(e) {
-  const [t, n] = se(), [i, r] = be(), [a, l] = Z(), [s, o] = V(), f = () => {
+function wi(e) {
+  const [t, n] = se(), [i, r] = be(), [s, l] = Z(), [a, o] = V(), f = () => {
     const g = speechSynthesis.getVoices(), v = g.find((F) => F.name === "Samantha"), h = g.find((F) => F.localService && F.default), U = g.find((F) => F.default);
     o(v ?? h ?? U);
   };
-  f(), speechSynthesis.addEventListener("voiceschanged", f), H(() => speechSynthesis.removeEventListener("voiceschanged", f));
+  f(), speechSynthesis.addEventListener("voiceschanged", f), X(() => speechSynthesis.removeEventListener("voiceschanged", f));
   const d = () => e.units[0], u = () => d().traversal, c = () => ({
     traversalState: Object.fromEntries(u().map((g) => [g.field, 0]))
-  }), [p, m] = ye(c()), y = k(() => {
+  }), [p, m] = ye(c()), y = T(() => {
     const g = i.selection;
     return e.units.map((v) => {
-      const h = Ve(e.spec, v), U = g ? Ie(e.data, g) : e.data, F = Ce(e.spec, e.data, U, h), I = Oe(U, h, F), ee = Dt(e.spec, e.data, v);
+      const h = Ce(e.spec, v), U = g ? Le(e.data, g) : e.data, F = Ie(e.spec, e.data, U, h), I = Oe(U, h, F), ee = Tt(e.spec, e.data, v);
       return {
         unit: v,
         derivedData: I,
         scales: ee
       };
     });
-  }), w = k(() => {
+  }), w = T(() => {
     const g = y().flatMap((v) => v.derivedData);
     return Object.fromEntries(u().map((v) => {
       const h = D(e.spec, v.field), U = x(h, v);
       return [v.field, re(U, g, !0)];
     }));
-  }), O = k(() => Object.fromEntries(u().map((g) => [g.field, $t(e.spec, e.data, g.field)]))), C = (g, v, h) => ({
+  }), O = T(() => Object.fromEntries(u().map((g) => [g.field, kt(e.spec, e.data, g.field)]))), C = (g, v, h) => ({
     spec: e.spec,
     audioUnitSpec: g,
     derivedData: v,
     fieldDomains: w(),
     axisTicks: O(),
     scales: h,
-    pauseBetweenSections: a.pauseBetweenSections
-  }), R = k(() => {
+    pauseBetweenSections: s.pauseBetweenSections
+  }), R = T(() => {
     const g = y()[0];
     return C(g.unit, g.derivedData, g.scales);
-  }), T = k(() => y().map((g, v) => ({
+  }), k = T(() => y().map((g, v) => ({
     voiceId: g.unit.name,
-    instrument: g.unit.instrument ?? Jn(v),
-    notes: kt(C(g.unit, g.derivedData, g.scales))
-  }))), z = k(() => oi(T().map((g) => ({
+    instrument: g.unit.instrument ?? Wn(v),
+    notes: xt(C(g.unit, g.derivedData, g.scales))
+  }))), z = T(() => ci(k().map((g) => ({
     voiceId: g.voiceId,
     notes: g.notes
-  })))), Ue = (g) => z().find((v) => Object.entries(g).every(([h, U]) => v.state[h] === U)), q = k(() => Tt(R(), p.traversalState)), oe = () => w(), Ae = (g, v) => we(R(), g, v), Q = () => i.activeUnitName === e.groupName;
+  })))), Ue = (g) => z().find((v) => Object.entries(g).every(([h, U]) => v.state[h] === U)), q = T(() => _t(R(), p.traversalState)), oe = () => w(), Ae = (g, v) => we(R(), g, v), Q = () => i.activeUnitName === e.groupName;
   P(() => {
-    a.isPlaying && n.setSelection({
+    s.isPlaying && n.setSelection({
       source: "sonification",
       predicate: q()
     });
@@ -1644,7 +1651,7 @@ function bi(e) {
     return Object.entries(v).forEach(([I, ee]) => {
       const te = h[I], ue = (g?.[I] ?? ee)[te];
       if (ue !== void 0) {
-        const De = ee.findIndex((Vt) => Vt === ue);
+        const De = ee.findIndex((It) => It === ue);
         De !== te && (F[I] = De !== -1 ? De : 0, U = !0);
       }
     }), U && (m((I) => ({
@@ -1652,7 +1659,7 @@ function bi(e) {
       traversalState: F
     })), Q() && b.setupTransportSequence()), v;
   }), P((g) => (g !== e.units && b.setupTransportSequence(), e.units));
-  const ce = () => T().forEach(({
+  const ce = () => k().forEach(({
     voiceId: g,
     instrument: v
   }) => l.ensureVoice(g, v)), G = (g) => {
@@ -1680,65 +1687,70 @@ function bi(e) {
         predicate: q()
       }), ce();
       const h = Ue(p.traversalState);
-      h && (a.transport.seconds = h.time, E(h));
+      h && (s.transport.seconds = h.time, E(h));
     },
     getTraversalIndex: (g) => p.traversalState[g],
     getFieldDomains: oe,
     getDerivedData: () => R().derivedData,
     getDomainValue: Ae,
-    setupTransportSequence: () => {
-      a.transport.cancel(), a.transport.bpm.value = ae, ce();
+    // untrack: this is an imperative scheduling action, not a derivation. Effects
+    // that call it must not subscribe to the signals it reads (traversal state,
+    // grid, ...) — otherwise every step callback's state update re-runs the
+    // effect mid-playback, rewinding the transport onto the slot that just fired
+    // and re-triggering its announcement and notes.
+    setupTransportSequence: () => ct(() => {
+      s.transport.cancel(), s.transport.bpm.value = ae, ce();
       const g = z();
       g.forEach((h) => {
-        Object.entries(h.state).every(([U, F]) => p.traversalState[U] === F) && (a.transport.seconds = h.time), a.transport.schedule(() => {
-          if (a.isPlaying)
+        Object.entries(h.state).every(([U, F]) => p.traversalState[U] === F) && (s.transport.seconds = h.time), s.transport.schedule(() => {
+          if (s.isPlaying)
             if (m((U) => ({
               ...U,
               traversalState: h.state
-            })), h.speakBefore && a.speakAxisTicks && !a.muted) {
-              a.transport.pause(), l.releaseSynth(), speechSynthesis.cancel();
+            })), h.speakBefore && s.speakAxisTicks && !s.muted) {
+              s.transport.pause(), l.releaseSynth(), speechSynthesis.cancel();
               const U = new SpeechSynthesisUtterance(h.speakBefore);
-              U.voice = s() ?? null, U.rate = a.speechRate / 25, U.onend = () => {
-                a.isPlaying && (G(h), a.transport.start());
+              U.voice = a() ?? null, U.rate = s.speechRate / 25, U.onend = () => {
+                s.isPlaying && (G(h), s.transport.start());
               }, speechSynthesis.speak(U);
             } else
               G(h);
-        }, h.time), h.pauseAfter && a.transport.schedule(() => l.releaseSynth(), h.time + h.slotDuration);
+        }, h.time), h.pauseAfter && s.transport.schedule(() => l.releaseSynth(), h.time + h.slotDuration);
       });
       const v = g[g.length - 1];
-      v && a.transport.schedule(() => l.stopTransport(), v.time + v.slotDuration), a.transport.bpm.value = ae * a.playbackRate;
-    },
+      v && s.transport.schedule(() => l.stopTransport(), v.time + v.slotDuration), s.transport.bpm.value = ae * s.playbackRate;
+    }),
     resetTraversalIfEnd: () => {
       const g = w();
-      u().every((h) => p.traversalState[h.field] === g[h.field].length - 1) && (m(c()), a.transport.seconds = 0);
+      u().every((h) => p.traversalState[h.field] === g[h.field].length - 1) && (m(c()), s.transport.seconds = 0);
     },
-    describeEncodings: () => e.units.map((g, v) => `layer ${v + 1}: ${_t(C(g, y()[v].derivedData, y()[v].scales))}`).join("; "),
-    describePlaybackOrder: () => xt(R())
+    describeEncodings: () => e.units.map((g, v) => `layer ${v + 1}: ${Nt(C(g, y()[v].derivedData, y()[v].scales))}`).join("; "),
+    describePlaybackOrder: () => Ft(R())
   };
-  return S(je.Provider, {
+  return S(qe.Provider, {
     value: [p, b],
     get children() {
       return e.children;
     }
   });
 }
-var wi = /* @__PURE__ */ A("<p><br>playing ");
-const it = "layer-group";
-function Ei() {
+var Ei = /* @__PURE__ */ A("<p><br>playing ");
+const at = "layer-group";
+function Ui() {
   const [e, t] = Ee();
   return (() => {
-    var n = wi(), i = n.firstChild;
+    var n = Ei(), i = n.firstChild;
     return i.nextSibling, _(n, () => t.describeEncodings(), i), _(n, () => t.describePlaybackOrder(), null), n;
   })();
 }
-function Ui(e) {
-  const t = () => e.units.filter((i) => Object.keys(i.encoding).length > 0);
+function Ai(e) {
+  const t = T(() => e.units.filter((i) => Object.keys(i.encoding).length > 0));
   if (t().length === 0)
     return null;
   const n = () => t()[0].traversal;
-  return S(Ft, {
+  return S(Ot, {
     get children() {
-      return S(bi, {
+      return S(wi, {
         get spec() {
           return e.spec;
         },
@@ -1748,93 +1760,93 @@ function Ui(e) {
         get units() {
           return t();
         },
-        groupName: it,
+        groupName: at,
         get children() {
-          return [S(Ei, {}), S(ie, {
+          return [S(Ui, {}), S(ie, {
             get each() {
               return n();
             },
-            children: (i) => S(Pt, {
+            children: (i) => S(Rt, {
               get spec() {
                 return e.spec;
               },
               traversalFieldDef: i
             })
-          }), S(Ot, {
-            unitName: it
+          }), S(Vt, {
+            unitName: at
           })];
         }
       });
     }
   });
 }
-var Ai = /* @__PURE__ */ A("<div><label>Playback rate <input type=number min=0.1 max=4 step=0.1 id=rate>x"), Di = /* @__PURE__ */ A("<label><input type=checkbox>Speak axis ticks"), $i = /* @__PURE__ */ A("<label><input type=number min=1 max=100 step=10 id=speechRate>speech rate"), Ti = /* @__PURE__ */ A("<div><label><input type=checkbox aria-live=polite>");
-const ki = N.div`
+var Di = /* @__PURE__ */ A("<div><label>Playback rate <input type=number min=0.1 max=4 step=0.1 id=rate>x"), $i = /* @__PURE__ */ A("<label><input type=checkbox>Speak axis ticks"), Ti = /* @__PURE__ */ A("<label><input type=number min=1 max=100 step=10 id=speechRate>speech rate"), ki = /* @__PURE__ */ A("<div><label><input type=checkbox aria-live=polite>");
+const _i = N.div`
   margin-top: 1rem;
-`, _i = N.div`
+`, xi = N.div`
   display: flex;
   gap: 3px;
 `;
-function xi(e) {
+function Ni(e) {
   const [t, n] = Z();
-  return S(ki, {
+  return S(_i, {
     get children() {
       return [(() => {
-        var i = Ai(), r = i.firstChild, a = r.firstChild, l = a.nextSibling;
-        return l.addEventListener("change", (s) => n.setPlaybackRate(Number(s.target.value))), L(() => l.value = t.playbackRate), i;
-      })(), S(_i, {
+        var i = Di(), r = i.firstChild, s = r.firstChild, l = s.nextSibling;
+        return l.addEventListener("change", (a) => n.setPlaybackRate(Number(a.target.value))), L(() => l.value = t.playbackRate), i;
+      })(), S(xi, {
         get children() {
           return [(() => {
-            var i = Di(), r = i.firstChild;
-            return r.addEventListener("change", (a) => n.setSpeakAxisTicks(a.target.checked)), L(() => r.checked = t.speakAxisTicks), i;
-          })(), (() => {
             var i = $i(), r = i.firstChild;
-            return r.addEventListener("change", (a) => n.setSpeechRate(Number(a.target.value))), L(() => r.value = t.speechRate), i;
+            return r.addEventListener("change", (s) => n.setSpeakAxisTicks(s.target.checked)), L(() => r.checked = t.speakAxisTicks), i;
+          })(), (() => {
+            var i = Ti(), r = i.firstChild;
+            return r.addEventListener("change", (s) => n.setSpeechRate(Number(s.target.value))), L(() => r.value = t.speechRate), i;
           })()];
         }
       }), (() => {
-        var i = Ti(), r = i.firstChild, a = r.firstChild;
-        return a.addEventListener("change", (l) => n.setMuted(l.target.checked)), _(r, () => t.muted ? "Muted" : "Unmuted", null), L(() => a.checked = t.muted), i;
+        var i = ki(), r = i.firstChild, s = r.firstChild;
+        return s.addEventListener("change", (l) => n.setMuted(l.target.checked)), _(r, () => t.muted ? "Muted" : "Unmuted", null), L(() => s.checked = t.muted), i;
       })()];
     }
   });
 }
-function Ni() {
+function Fi() {
   const e = document.activeElement;
   if (!e) return !1;
   const t = e.tagName.toLowerCase();
   return t === "input" || t === "select" || t === "textarea" || e.isContentEditable;
 }
-function Fi(e, t) {
+function Pi(e, t) {
   const n = (i) => {
-    if (Ni()) return;
+    if (Fi()) return;
     const r = e[i.key];
     r && (i.preventDefault(), r());
   };
   P(() => {
     const i = t ? t() : document;
-    i && (i.addEventListener("keydown", n), H(() => i.removeEventListener("keydown", n)));
+    i && (i.addEventListener("keydown", n), X(() => i.removeEventListener("keydown", n)));
   });
 }
-function Pi(e) {
+function Oi(e) {
   const [t, n] = Z(), [i, r] = be();
-  return Fi({
+  return Pi({
     p: () => {
       t.isPlaying ? n.stopTransport() : r.triggerPlay();
     }
   }, e.target), null;
 }
-function Oi(e) {
+function Ri(e) {
   const t = () => e.spec.audio.composition === "layer" && e.spec.audio.units.length > 1;
-  return S(zn, {
+  return S(Gn, {
     get children() {
-      return S(Wn, {
+      return S(Yn, {
         get children() {
-          return [S(Pi, {
+          return [S(Oi, {
             get target() {
               return e.keyEventTarget;
             }
-          }), S(st, {
+          }), S(lt, {
             get when() {
               return t();
             },
@@ -1843,7 +1855,7 @@ function Oi(e) {
                 get each() {
                   return e.spec.audio.units;
                 },
-                children: (n) => S(Si, {
+                children: (n) => S(bi, {
                   get spec() {
                     return e.spec;
                   },
@@ -1855,7 +1867,7 @@ function Oi(e) {
               });
             },
             get children() {
-              return S(Ui, {
+              return S(Ai, {
                 get spec() {
                   return e.spec;
                 },
@@ -1867,34 +1879,34 @@ function Oi(e) {
                 }
               });
             }
-          }), S(xi, {})];
+          }), S(Ni, {})];
         }
       });
     }
   });
 }
-var Ri = /* @__PURE__ */ A("<h2>Visualization"), Vi = /* @__PURE__ */ A("<h2>Description"), Ci = /* @__PURE__ */ A("<h2>Sonification"), Ii = /* @__PURE__ */ A('<div><div class=uw-viewer role=region aria-label="Umwelt Viewer">');
-function Li(e) {
+var Vi = /* @__PURE__ */ A("<h2>Visualization"), Ci = /* @__PURE__ */ A("<h2>Description"), Ii = /* @__PURE__ */ A("<h2>Sonification"), Li = /* @__PURE__ */ A('<div><div class=uw-viewer role=region aria-label="Umwelt Viewer">');
+function ji(e) {
   const [t, n] = V();
   return (() => {
-    var i = Ii(), r = i.firstChild;
-    return Ne(n, r), _(r, S(Vn, {
+    var i = Li(), r = i.firstChild;
+    return Ne(n, r), _(r, S(Cn, {
       get children() {
-        return [Ri(), S(qn, {
+        return [Vi(), S(Mn, {
           get spec() {
             return e.spec;
           },
           get data() {
             return e.data;
           }
-        }), Vi(), S(Bn, {
+        }), Ci(), S(zn, {
           get spec() {
             return e.spec;
           },
           get data() {
             return e.data;
           }
-        }), Ci(), S(Oi, {
+        }), Ii(), S(Ri, {
           get spec() {
             return e.spec;
           },
@@ -1904,26 +1916,26 @@ function Li(e) {
           keyEventTarget: t
         })];
       }
-    })), L(() => Ct(i, dn.Viewer)), i;
+    })), L(() => Lt(i, fn.Viewer)), i;
   })();
 }
-function rt(e, t, n = localStorage) {
-  const i = n.getItem(e) ? JSON.parse(n.getItem(e)) : t, [r, a] = V(i);
-  return [r, ((s) => {
-    if (s) {
-      const o = a(s);
+function st(e, t, n = localStorage) {
+  const i = n.getItem(e) ? JSON.parse(n.getItem(e)) : t, [r, s] = V(i);
+  return [r, ((a) => {
+    if (a) {
+      const o = s(a);
       return n.setItem(e, JSON.stringify(o)), o;
     }
   })];
 }
-const Rt = W();
-function ji(e) {
-  const t = e.persist !== !1, [n, i] = t ? rt("umweltDatastore", {}) : V({}), [r, a] = t ? rt("umweltSessionDatastore", {}, sessionStorage) : V({}), l = () => ({
+const Ct = W();
+function qi(e) {
+  const t = e.persist !== !1, [n, i] = t ? st("umweltDatastore", {}) : V({}), [r, s] = t ? st("umweltSessionDatastore", {}, sessionStorage) : V({}), l = () => ({
     ...n(),
     ...r()
-  }), s = {
+  }), a = {
     setDataset: (o, f, d, u) => {
-      u?.session ? a((c) => ({
+      u?.session ? s((c) => ({
         ...c,
         [o]: {
           data: f,
@@ -1943,10 +1955,10 @@ function ji(e) {
           ...f
         };
         return delete d[o], d;
-      }), s.removeSessionDataset(o);
+      }), a.removeSessionDataset(o);
     },
     removeSessionDataset: (o) => {
-      a((f) => {
+      s((f) => {
         const d = {
           ...f
         };
@@ -1954,22 +1966,22 @@ function ji(e) {
       });
     }
   };
-  return S(Rt.Provider, {
-    value: [l, s],
+  return S(Ct.Provider, {
+    value: [l, a],
     get children() {
       return e.children;
     }
   });
 }
-function qi() {
-  const e = Y(Rt);
+function Mi() {
+  const e = Y(Ct);
   if (e === void 0)
     throw new Error("useUmweltDatastore must be used within a UmweltDatastoreProvider");
   return e;
 }
-var Mi = /* @__PURE__ */ A("<div>"), Bi = /* @__PURE__ */ A("<div>Loading..."), zi = /* @__PURE__ */ A("<div role=alert>");
-function Gi(e) {
-  const [t, n] = qi(), [i, r] = V(), [a, l] = V(!0), [s, o] = V(), f = () => {
+var Bi = /* @__PURE__ */ A("<div>"), zi = /* @__PURE__ */ A("<div>Loading..."), Gi = /* @__PURE__ */ A("<div role=alert>");
+function Ki(e) {
+  const [t, n] = Mi(), [i, r] = V(), [s, l] = V(!0), [a, o] = V(), f = () => {
     const d = i();
     return d ? t()[d.data.name]?.data || [] : [];
   };
@@ -1977,7 +1989,7 @@ function Gi(e) {
     const d = e.exportableSpec;
     l(!0), o(void 0);
     try {
-      const u = await xn(d, t(), n.setDataset);
+      const u = await Nn(d, t(), n.setDataset);
       u ? r(u) : o("Failed to load Umwelt spec: the spec is invalid or its data source could not be resolved.");
     } catch (u) {
       console.error("Error loading spec:", u), o(`Failed to load Umwelt spec: ${u}`);
@@ -1985,19 +1997,19 @@ function Gi(e) {
       l(!1);
     }
   }), (() => {
-    var d = Mi();
+    var d = Bi();
     return _(d, (() => {
-      var u = pe(() => !!a());
-      return () => u() && Bi();
+      var u = pe(() => !!s());
+      return () => u() && zi();
     })(), null), _(d, (() => {
-      var u = pe(() => !!(!a() && s()));
+      var u = pe(() => !!(!s() && a()));
       return () => u() && (() => {
-        var c = zi();
-        return _(c, s), c;
+        var c = Gi();
+        return _(c, a), c;
       })();
     })(), null), _(d, (() => {
-      var u = pe(() => !!(!a() && !s() && i()));
-      return () => u() && S(Li, {
+      var u = pe(() => !!(!s() && !a() && i()));
+      return () => u() && S(ji, {
         get spec() {
           return i();
         },
@@ -2008,11 +2020,11 @@ function Gi(e) {
     })(), null), d;
   })();
 }
-function Ki(e) {
-  return S(ji, {
+function Hi(e) {
+  return S(qi, {
     persist: !1,
     get children() {
-      return S(Gi, {
+      return S(Ki, {
         get exportableSpec() {
           return e.exportableSpec;
         }
@@ -2020,7 +2032,7 @@ function Ki(e) {
     }
   });
 }
-class Hi {
+class Xi {
   constructor(t) {
     this.options = t, this.mount();
   }
@@ -2029,7 +2041,7 @@ class Hi {
   mount() {
     if (this.isDestroyed)
       throw new Error("Cannot mount a destroyed UmweltViewer. Create a new instance.");
-    this.disposal = It(() => Ki({ exportableSpec: this.options.spec }), this.options.container);
+    this.disposal = jt(() => Hi({ exportableSpec: this.options.spec }), this.options.container);
   }
   /**
    * Update the viewer with a new specification.
@@ -2069,10 +2081,10 @@ class Hi {
     return this.isDestroyed;
   }
 }
-function pr(e, t) {
-  return new Hi({ spec: e, container: t });
+function gr(e, t) {
+  return new Xi({ spec: e, container: t });
 }
 export {
-  Hi as UmweltViewer,
-  pr as createViewer
+  Xi as UmweltViewer,
+  gr as createViewer
 };