umwelt-js 0.2.0 → 0.2.1

package/dist/index.js

@@ -1,13 +1,13 @@
-import { createComponent as S, use as Ne, template as A, delegateEvents as at, insert as x, effect as L, setAttribute as Me, memo as pe, className as Vt, render as It } from "solid-js/web";
-import { createContext as Y, createSignal as R, useContext as X, 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 { 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 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 { compile as Fe } from "vega-lite";
-import { evaluateVegaData as ot, extractOutputDatasets as ct, computeGuideTicks as Jt } from "@umwelt-data/umwelt-utils/vega";
+import { evaluateVegaData as ot, extractOutputDatasets as ct, computeGuideTicks as Xt } from "@umwelt-data/umwelt-utils/vega";
 import $e from "lodash.clonedeep";
-import { withExternalStateParam as Wt, selectionStoreToSelection as Yt, EXTERNAL_STATE_STORE as Ge, predicateToSelectionStore as Xt } from "@umwelt-data/umwelt-utils/vl-bridge";
+import { withExternalStateParam as Jt, selectionStoreToSelection as Wt, EXTERNAL_STATE_STORE as Ge, predicateToSelectionStore as Yt } 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";
@@ -38,30 +38,30 @@ function vn(e) {
 function dt(e) {
   return pn.includes(e);
 }
-const ft = "None";
+const ft = "None", hn = "vis_unit_", yn = "audio_unit_", Sn = (e) => `${hn}${e}`, bn = (e) => `${yn}${e}`;
 function Ke(e) {
   return "units" in e;
 }
 function He(e) {
   return "units" in e;
 }
-const hn = "", J = (e, t) => `${t}_${e}`, j = (e) => [`${e}_bin_start`, `${e}_bin_end`], W = (e, t) => `${t}_${e}`, Se = (e) => {
-  const t = Ce([e]);
+const wn = "", X = (e, t) => `${t}_${e}`, j = (e) => [`${e}_bin_start`, `${e}_bin_end`], J = (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 = J(n, r.op));
-    else "bin" in i && !e.aggregate ? n = j(n)[0] : "timeUnit" in i && !e.aggregate && (n = W(n, i.timeUnit));
+        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));
   return n;
 }, mt = (e) => {
-  const t = Ce([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 = 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 = W(n, i.timeUnit) : n = [W(n[0], i.timeUnit), W(n[1], i.timeUnit)]);
+        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)]);
   if (typeof n == "string")
     throw new Error("Expected derived field name to be a tuple");
   return n;
@@ -71,14 +71,14 @@ const hn = "", J = (e, t) => `${t}_${e}`, j = (e) => [`${e}_bin_start`, `${e}_bi
   i.size && (r = e.map((s) => {
     const o = { ...s };
     for (const f of i) {
-      const [d, u] = j(f), c = yn(s[f], n[f]);
+      const [d, u] = j(f), c = En(s[f], n[f]);
       o[d] = c ? c[0] : null, o[u] = c ? c[1] : null;
     }
     return o;
   }));
-  const a = Ce(t, i);
+  const a = Re(t, i);
   return pt(r, a);
-}, yn = (e, t) => {
+}, En = (e, t) => {
   if (e == null) return;
   const n = Number(e);
   if (!isNaN(n))
@@ -87,11 +87,11 @@ const hn = "", J = (e, t) => `${t}_${e}`, j = (e) => [`${e}_bin_start`, `${e}_bi
       if (n >= r && (n < a || i === t.length - 1 && n <= a))
         return t[i];
     }
-}, Ce = (e, t) => {
+}, Re = (e, t) => {
   const n = [], i = [], r = [], a = /* @__PURE__ */ new Set();
   for (const l of e) {
     const { field: s, timeUnit: o, bin: f, aggregate: d } = l;
-    d || (o && a.add(W(s, o)), f && j(s).forEach((u) => a.add(u)), !o && !f && a.add(s));
+    d || (o && a.add(J(s, o)), f && j(s).forEach((u) => a.add(u)), !o && !f && a.add(s));
   }
   for (const l of e) {
     const { field: s, timeUnit: o, bin: f, aggregate: d } = l;
@@ -104,7 +104,7 @@ const hn = "", J = (e, t) => `${t}_${e}`, j = (e) => [`${e}_bin_start`, `${e}_bi
       });
     }
     if (o) {
-      const u = f ? j(s)[0] : W(s, o);
+      const u = f ? j(s)[0] : J(s, o);
       n.push({
         timeUnit: o,
         field: s,
@@ -116,13 +116,13 @@ const hn = "", J = (e, t) => `${t}_${e}`, j = (e) => [`${e}_bin_start`, `${e}_bi
       c ? c.aggregate.push({
         op: d,
         field: u,
-        as: J(s, d)
+        as: X(s, d)
       }) : r.push({
         aggregate: [
           {
             op: d,
             field: u,
-            as: J(s, d)
+            as: X(s, d)
           }
         ],
         groupby: Array.from(a)
@@ -139,7 +139,7 @@ function pt(e, t) {
   }).spec.data ?? [], a = ot(r), l = ct(r, a);
   return l[l.length - 1] ?? [];
 }
-function Sn(e) {
+function Un(e) {
   const n = Fe(e).spec.data ?? [], i = ot(n), r = ct(n, i), a = /* @__PURE__ */ new Set();
   for (const l of r) {
     const s = l.find((o) => o && typeof o == "object");
@@ -150,7 +150,7 @@ function Sn(e) {
 const re = he((e, t, n) => {
   const i = n ? Se(e) : e.field;
   return Bt({ field: i, type: e.type, timeUnit: e.timeUnit }, t);
-}), bn = he((e, t) => {
+}), An = he((e, t) => {
   if (e.bin) {
     const n = mt(e);
     return t.map((i) => {
@@ -159,29 +159,29 @@ const re = he((e, t, n) => {
     }).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", wn = "https://raw.githubusercontent.com/vega/vega-datasets/master/data/", En = Object.fromEntries(
-  ["stocks.csv", "cars.json", "weather.csv", "seattle-weather.csv", "penguins.json", "driving.json", "barley.json", "disasters.csv", "gapminder.json"].map((e) => [e, `${wn}${e}`])
+}), 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}`])
 );
-async function Un(e) {
+async function Tn(e) {
   if (mn(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 Je(e.url);
+    const t = e.name || e.url.split("/").pop() || ve, n = await Xe(e.url);
     return n.length ? { name: t, data: n, sourceUrl: e.url } : void 0;
   }
   if (e.name) {
-    const t = En[e.name];
+    const t = $n[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 Je(t);
+    const n = await Xe(t);
     return n.length ? { name: e.name, data: n, sourceUrl: t } : void 0;
   }
 }
-const Je = he.promise(async (e) => {
+const Xe = he.promise(async (e) => {
   try {
     const t = await zt(e);
     return Array.isArray(t) ? t : [];
@@ -198,47 +198,47 @@ he.promise(async (e, t) => {
  ${n}`), [];
   }
 });
-function An(e, t) {
+function kn(e, t) {
   const n = t.map((i) => ({ name: i.name, type: i.type }));
   return Gt(e, n);
 }
-function Dn(e, t) {
+function _n(e, t) {
   return e.filter((n) => Object.entries(n).every(([i, r]) => t.find((a) => a.name === i) ? r != null : !0));
 }
 function D(e, t) {
   return e.fields.find((n) => n.name === t);
 }
-function _(e, t) {
+function x(e, t) {
   const { active: n, name: i, encodings: r, ...a } = e, l = t ? {
     ...a,
     ...t
   } : { field: i, ...a };
   return Object.fromEntries(Object.entries(l).filter(([s, o]) => o !== ft));
 }
-function Re(e, t) {
+function Ve(e, t) {
   const i = [...Object.values(t.encoding), ...t.traversal].flatMap((a) => {
     const l = D(e, a.field);
-    return l ? [_(l, a)] : [];
+    return l ? [x(l, a)] : [];
   }), r = /* @__PURE__ */ new Set();
   return i.filter((a) => {
     const l = JSON.stringify(a);
     return r.has(l) ? !1 : (r.add(l), !0);
   });
 }
-async function $n(e, t, n) {
+async function xn(e, t, n) {
   if (!e.data || !(e.fields && e.fields.length))
     return;
   const i = e.data.name;
   if (i && t[i]?.data?.length)
-    return We(e);
-  const r = await Un(e.data);
+    return Je(e);
+  const r = await Tn(e.data);
   if (!r)
     return;
-  const a = We(e), l = An(r.data, a.fields), s = Dn(l, a.fields);
+  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;
 }
-function Tn(e) {
+function Nn(e) {
   if (e.instrument !== void 0 && !vn(e.instrument)) {
     console.warn(`Unknown audio instrument "${e.instrument}" on unit "${e.name}"; falling back to the default.`);
     const { instrument: t, ...n } = e;
@@ -246,8 +246,8 @@ function Tn(e) {
   }
   return e;
 }
-function We(e) {
-  const t = Ke(e.visual) ? e.visual.units : [e.visual], n = Ke(e.visual) ? e.visual.composition : void 0, i = He(e.audio) ? e.audio.units : [e.audio], r = He(e.audio) ? e.audio.composition : void 0, a = e.fields.map((s) => {
+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) => {
     const o = [];
     return t.forEach((f) => {
       Object.entries(f.encoding).forEach(([d, u]) => {
@@ -266,7 +266,7 @@ function We(e) {
     },
     fields: a,
     visual: { units: t, composition: n || "layer" },
-    audio: { units: i.map(Tn), composition: r || "concat" },
+    audio: { units: i.map(Nn), composition: r || "concat" },
     // regenerate node ids on import so a serialized id can never collide with one
     // this session's counter later mints
     text: {
@@ -274,7 +274,7 @@ function We(e) {
     }
   };
 }
-function xe(e, t) {
+function _e(e, t) {
   if (e.visual.units.length === 0 || e.visual.units.map((o) => Object.values(o.encoding).length).reduce((o, f) => o + f, 0) === 0) return;
   const i = [
     {
@@ -292,7 +292,7 @@ function xe(e, t) {
           if (p) {
             const m = D(o, p.field);
             if (m) {
-              const y = _(m, p);
+              const y = x(m, p);
               if (u[c] = {
                 ...y
               }, c === "facet") {
@@ -355,13 +355,13 @@ function xe(e, t) {
   }) : s = $e({
     data: { values: t },
     ...l
-  }), Wt(s);
+  }), Jt(s);
 }
-async function kn(e, t) {
+async function Fn(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 = xe(e, t);
+  const a = new Map(e.fields.map((o) => [o.name, o.type])), l = _e(e, t);
   if (l ? n = await Mt(l) : n = {
     data: t,
     fields: []
@@ -370,11 +370,11 @@ async function kn(e, t) {
   }) : s(n, e), l)
     (ze(n) ? n.units : [n]).forEach((f, d) => {
       const u = i[r[d]];
-      u?.length && Xe(f, u, a);
+      u?.length && Ye(f, u, a);
     });
   else {
-    const o = i[hn];
-    o?.length && Xe(n, o, a);
+    const o = i[wn];
+    o?.length && Ye(n, o, a);
   }
   function s(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) => {
@@ -387,12 +387,12 @@ async function kn(e, t) {
   }
   return n;
 }
-let xn = 0;
-function _n() {
-  return `text_node_${xn++}`;
+let Pn = 0;
+function On() {
+  return `text_node_${Pn++}`;
 }
 function gt(e) {
-  return { ...e, id: _n(), children: e.children.map(gt) };
+  return { ...e, id: On(), children: e.children.map(gt) };
 }
 function ge(e, t) {
   if (!e || typeof e != "object") return e;
@@ -420,7 +420,7 @@ function vt(e, t, n) {
     ...i.length ? { children: i } : {}
   };
 }
-function Ye(e, t) {
+function We(e, t) {
   return {
     type: e.type ?? t?.type,
     timeUnit: e.timeUnit === ft ? void 0 : e.timeUnit ?? t?.timeUnit,
@@ -428,10 +428,10 @@ function Ye(e, t) {
   };
 }
 const Te = (e) => `${e.type ?? ""}|${e.timeUnit ?? ""}|${e.bin ? "bin" : ""}`;
-function Xe(e, t, n) {
+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) => {
     u.nodeType === "group" && u.groupby.forEach((c) => {
-      const p = Ye(c, a(c.field)), m = l.get(c.field) ?? /* @__PURE__ */ new Map();
+      const p = We(c, a(c.field)), m = l.get(c.field) ?? /* @__PURE__ */ new Map();
       m.set(Te(p), p), l.set(c.field, m);
     }), s(u.children);
   });
@@ -443,17 +443,17 @@ function Xe(e, t, n) {
       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 V = [w.type, w.timeUnit, w.bin ? "bin" : ""].filter(Boolean), C = `${u}__${V.join("_") || "raw"}`;
-        o.set(`${u}|${O}`, C), i.find((T) => T.field === C) || i.push({ field: C, label: u, type: w.type ?? n.get(u), timeUnit: w.timeUnit, bin: w.bin || void 0 }), r.forEach((T) => {
-          u in T && !(C in T) && (T[C] = T[u]);
+        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]);
         });
       }
     });
   });
-  const f = (d) => o.get(`${d.field}|${Te(Ye(d, a(d.field)))}`) ?? d.field;
+  const f = (d) => o.get(`${d.field}|${Te(We(d, a(d.field)))}`) ?? d.field;
   e.structure = t.map((d) => vt(d, n, f));
 }
-function Nn(e, t) {
+function Rn(e, t) {
   const n = Fe(e).spec, i = Zt(n), r = new Qt(i, {
     renderer: "canvas",
     container: t,
@@ -461,9 +461,9 @@ function Nn(e, t) {
   });
   return r.runAsync(), r;
 }
-const ht = Y();
-function Fn(e) {
-  const [t, n] = R(void 0), i = {
+const ht = W();
+function Vn(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);
     }
@@ -476,7 +476,7 @@ function Fn(e) {
   });
 }
 function se() {
-  const e = X(ht);
+  const e = Y(ht);
   if (e === void 0)
     throw new Error("useUmweltSelection must be used within a UmweltSelectionProvider");
   return e;
@@ -488,7 +488,7 @@ function yt(e, t, n) {
   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 = _(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 = 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 = {
     field: n,
     type: s.type,
     bin: !!s.bin,
@@ -498,7 +498,7 @@ function yt(e, t, n) {
     // vega-lite sorts discrete scales ascending unless told otherwise
     sort: s.sort === void 0 ? "ascending" : s.sort
   };
-  return Jt(t, d);
+  return Xt(t, d);
 }
 function St(e, t) {
   const n = D(e, t);
@@ -507,16 +507,16 @@ function St(e, t) {
   if (!i) return;
   const a = e.visual.units.find((l) => l.name === i.unit)?.encoding[i.property];
   if (a)
-    return _(n, a);
+    return x(n, a);
 }
-function Pn(e, t) {
+function Cn(e, t) {
   return !!St(e, t)?.bin;
 }
-function Ve(e, t, n, i) {
+function Ce(e, t, n, i) {
   const r = {};
   for (const a of i)
     if (a.bin && a.type === "quantitative" && !(a.field in r)) {
-      if (Pn(e, a.field)) continue;
+      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) {
@@ -537,10 +537,10 @@ function Ie(e, t) {
   return e.filter((n) => tn(n, t));
 }
 const Ze = (e) => e == null ? e : e instanceof Date ? e.getTime() : new Date(e).getTime();
-function On(e, t, n) {
+function In(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 Cn(e, t, n) {
+function Ln(e, t, n) {
   if (!t) return t;
   const i = (r) => {
     if (!r || typeof r != "object") return r;
@@ -550,24 +550,24 @@ function Cn(e, t, n) {
     if (!("field" in r)) return r;
     const a = St(e, r.field);
     if (!a) return r;
-    const l = On(a, r.field, n), s = l === r.field ? { ...r } : { ...r, field: l };
+    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;
   };
   return i(t);
 }
-var Rn = /* @__PURE__ */ A("<div class=uw-vl-container>");
-function Vn(e) {
-  const [t, n] = se(), [i, r] = R(!1), [a, l] = R(null), [s, o] = R(null), f = en((u) => {
+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) => {
     if (i()) {
-      const c = Yt(u);
+      const c = Wt(u);
       n.setSelection({
         source: "visualization",
         predicate: c
       });
     }
   }, 250), d = k(() => {
-    const u = xe(e.spec, e.data);
-    return u ? Sn(u) : [];
+    const u = _e(e.spec, e.data);
+    return u ? Un(u) : [];
   });
   return P(() => {
     const u = t(), c = a();
@@ -576,14 +576,14 @@ function Vn(e) {
       return;
     }
     if (c && (u.source === "sonification" || u.source === "text-navigation")) {
-      const p = u.source === "sonification" ? Cn(e.spec, u.predicate, d()) : u.predicate, m = Xt(p);
+      const p = u.source === "sonification" ? Ln(e.spec, u.predicate, d()) : u.predicate, m = Yt(p);
       c.data(Ge, m ? [m] : []).run();
     }
   }), P(() => {
-    const u = xe(e.spec, e.data), c = s();
+    const u = _e(e.spec, e.data), c = s();
     if (u && c)
       try {
-        const p = Nn(u, c);
+        const p = Rn(u, c);
         p.addDataListener("brush_store", (m, y) => {
           f(y);
         }), l(p);
@@ -596,19 +596,19 @@ function Vn(e) {
       p && (p.innerHTML = "");
     });
   }), (() => {
-    var u = Rn();
+    var u = jn();
     return u.addEventListener("mouseleave", () => r(!1)), u.addEventListener("mouseenter", () => r(!0)), Ne(o, u), u;
   })();
 }
-var In = /* @__PURE__ */ A("<div class=uw-olli-container>");
-function Ln(e) {
-  const [t, n] = se(), [i, r] = R(null), [a, l] = R(null);
+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;
   return P(() => {
     let o = !1;
     H(() => {
       o = !0;
-    }), kn(e.spec, e.data).then((f) => {
+    }), Fn(e.spec, e.data).then((f) => {
       const d = i();
       if (o || !f || !d) return;
       a()?.destroy(), d.innerHTML = "";
@@ -640,12 +640,12 @@ function Ln(e) {
   }), H(() => {
     a()?.destroy();
   }), (() => {
-    var o = In();
+    var o = Mn();
     return Ne(r, o), o;
   })();
 }
-const bt = Y();
-function jn(e) {
+const bt = W();
+function zn(e) {
   const [t] = se(), n = () => ({
     activeUnitName: void 0,
     selection: void 0
@@ -677,23 +677,23 @@ function jn(e) {
   });
 }
 function be() {
-  const e = X(bt);
+  const e = Y(bt);
   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), qn = "umwelt", Mn = 1, Bn = {
+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 = {
   muted: !1,
   speakAxisTicks: !0,
   speechRate: 50,
   playbackRate: 1
-}, wt = () => new rn(qn, Mn), Et = () => wt().read(), de = (e) => {
-  const t = Et() ?? Bn;
+}, wt = () => new rn(Gn, Kn), Et = () => wt().read(), de = (e) => {
+  const t = Et() ?? Hn;
   wt().write({
     ...t,
     ...e
   });
-}, Qe = (e, t, n) => Math.min(Math.max(e, t), n), zn = {
+}, Qe = (e, t, n) => Math.min(Math.max(e, t), n), Xn = {
   // clean triangle beep — the historical default; most pitch-legible source
   pure: {
     create: () => new $.Synth({
@@ -810,10 +810,10 @@ const B = (e, t) => Array.isArray(e) ? e.length === 2 && (t.type === "quantitati
     }),
     gainTrim: -7
   }
-}, et = ["pure", "bell", "bright", "reed", "hollow", "strings"], Gn = (e) => et[e % et.length], ke = "default", ne = 0.1;
+}, et = ["pure", "bell", "bright", "reed", "hollow", "strings"], Jn = (e) => et[e % et.length], ke = "default", ne = 0.1;
 let M = null;
-const ae = 120, Ut = Y();
-function Kn(e) {
+const ae = 120, Ut = W();
+function Wn(e) {
   const t = /* @__PURE__ */ new Map(), n = {
     attack: 0.01,
     decay: 0,
@@ -824,15 +824,15 @@ function Kn(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 = zn[y], O = new $.Panner(0).toDestination(), V = w.create().connect(O), C = new $.NoiseSynth({
+      const y = p ?? "pure", w = Xn[y], O = new $.Panner(0).toDestination(), C = w.create().connect(O), R = new $.NoiseSynth({
         noise: {
           type: "pink"
         },
         envelope: n
       }), T = new $.Gain(0.3);
-      C.connect(T), T.connect(O), m = {
-        synth: V,
-        noiseSynth: C,
+      R.connect(T), T.connect(O), m = {
+        synth: C,
+        noiseSynth: R,
         noiseGain: T,
         panner: O,
         instrument: y,
@@ -964,12 +964,12 @@ function Kn(e) {
   });
 }
 function Z() {
-  const e = X(Ut);
+  const e = Y(Ut);
   if (e === void 0)
     throw new Error("useSonificationRuntime must be used within a SonificationRuntimeProvider");
   return e;
 }
-const At = Y(), Hn = {
+const At = W(), Yn = {
   pitch: [48, 84],
   // in MIDI. Three octaves from C3 to C6
   duration: [0.25, 1],
@@ -990,7 +990,7 @@ const At = Y(), Hn = {
   pan: 0
   // center
 };
-function Jn(e, t, n) {
+function Zn(e, t, n) {
   if (t.length === e.length) {
     const a = on().domain(e).range(t);
     return (l) => a(l);
@@ -1007,10 +1007,10 @@ function fe(e, t, n, i) {
   const a = D(e, r.field);
   if (!a)
     return console.warn(`Field ${r.field} not found in spec`), () => tt[i];
-  const l = _(a, r);
+  const l = x(a, r);
   let s = l.scale?.domain;
   if (!s) {
-    const f = l.aggregate === "count" || l.aggregate === "sum", d = Re(e, n), u = f ? Oe(t, d, Ve(e, t, t, d)) : t;
+    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) {
       case "ordinal":
       case "nominal":
@@ -1024,11 +1024,11 @@ function fe(e, t, n, i) {
         throw new Error(`Unsupported field type ${l.type}`);
     }
   }
-  const o = l.scale?.range || Hn[i];
+  const o = l.scale?.range || Yn[i];
   switch (l.type) {
     case "ordinal":
     case "nominal":
-      return Jn(s, o, i);
+      return Zn(s, o, i);
     case "quantitative":
       return sn().domain(s).range(o);
     case "temporal":
@@ -1048,7 +1048,7 @@ function Dt(e, t, n) {
 function $t(e, t, n) {
   return yt(e, t, n) ?? [];
 }
-function Wn(e) {
+function Qn(e) {
   const t = (r) => $t(e.spec, e.data, r.field), n = Dt(e.spec, e.data, e.audioUnitSpec), i = {
     getAxisTicks: t
   };
@@ -1059,8 +1059,8 @@ function Wn(e) {
     }
   });
 }
-function Yn() {
-  const e = X(At);
+function ei() {
+  const e = Y(At);
   if (e === void 0)
     throw new Error("useSonificationRuntime must be used within a SonificationRuntimeProvider");
   return e;
@@ -1081,12 +1081,12 @@ function me(e, t, n, i, r) {
   const a = D(t, n.field);
   if (!a)
     return nt[e];
-  const l = _(a, n), s = Se(l);
+  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);
 function we(e, t, n) {
-  const i = D(e.spec, t), r = _(i, Le(e, t)), a = e.fieldDomains[t];
+  const i = D(e.spec, t), r = x(i, Le(e, t)), a = 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;
     return [o, f];
@@ -1109,13 +1109,13 @@ function Tt(e, t) {
     })
   };
 }
-function _e(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);
       if (!l)
         return { field: i, equal: a };
-      const s = _(l, Le(e, i));
+      const s = x(l, Le(e, i));
       return {
         field: Se(s),
         equal: Ht(a, l)
@@ -1124,7 +1124,7 @@ function _e(e, t) {
   };
   return Ie(e.derivedData, n);
 }
-function Xn(e, t) {
+function ti(e, t) {
   const n = e.audioUnitSpec.encoding;
   return {
     pitch: t.length ? me("pitch", e.spec, n.pitch, e.scales.pitch, t) : void 0,
@@ -1133,7 +1133,7 @@ function Xn(e, t) {
     pan: me("pan", e.spec, n.pan, e.scales.pan, t)
   };
 }
-function Zn(e, t) {
+function ni(e, t) {
   const n = Object.entries(t).map(([r, a]) => a === e.fieldDomains[r].length - 1 ? 1 : 0).reverse();
   let i = 0;
   for (let r of n)
@@ -1142,13 +1142,13 @@ function Zn(e, t) {
     else break;
   return i;
 }
-function Qn(e) {
+function ii(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 ei(e) {
+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 = {};
@@ -1157,12 +1157,12 @@ function ei(e) {
     }), a;
   });
 }
-function ti(e, t, n, i) {
+function ai(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 = _e(e, t), l = _e(e, n);
+  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];
     if (o && f) {
@@ -1178,20 +1178,20 @@ function ti(e, t, n, i) {
   }
   return !1;
 }
-function ni(e, t, n) {
+function si(e, t, n) {
   const i = [];
   return Object.entries(t).forEach(([r]) => {
     if (!e.fieldDomains[r].length) return;
-    const l = D(e.spec, r), s = _(l, Le(e, r));
-    ti(e, t, n, s) && i.push(B(we(e, r, t[r]), s));
+    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));
   }), i.join(", ");
 }
 function kt(e) {
   let t = 0;
-  const n = [], i = ei(e), r = Qn(e);
+  const n = [], i = ri(e), r = ii(e);
   let a;
   return i.forEach((l) => {
-    const s = _e(e, l), o = Xn(e, s), f = Zn(e, l), d = e.pauseBetweenSections * f;
+    const s = xe(e, l), o = ti(e, s), f = ni(e, l), d = e.pauseBetweenSections * f;
     n.push({
       ...o,
       time: t,
@@ -1199,11 +1199,11 @@ function kt(e) {
       ramp: r,
       rest: s.length === 0,
       state: l,
-      speakBefore: ni(e, l, a)
+      speakBefore: si(e, l, a)
     }), t += o.duration + d, a = l;
   }), n;
 }
-function ii(e) {
+function oi(e) {
   if (!e.length) return [];
   const t = e[0].notes.length, n = [];
   let i = 0;
@@ -1221,39 +1221,39 @@ function ii(e) {
   }
   return n;
 }
-function xt(e) {
+function _t(e) {
   return Pe(
-    Object.entries(e.audioUnitSpec.encoding).map(([t, n]) => n ? `${K(_(D(e.spec, n.field), n))} as ${t}` : "").filter((t) => t)
+    Object.entries(e.audioUnitSpec.encoding).map(([t, n]) => n ? `${K(x(D(e.spec, n.field), n))} as ${t}` : "").filter((t) => t)
   );
 }
-function _t(e) {
+function xt(e) {
   if (!e.audioUnitSpec.traversal.length)
     return "";
-  const t = e.audioUnitSpec.traversal[e.audioUnitSpec.traversal.length - 1], n = D(e.spec, t.field), i = _(n, t);
+  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 = bn(i, e.derivedData) : r = e.fieldDomains[t.field];
+  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(_(o, s));
+    return K(x(o, s));
   });
   return l.length && (a += ` for each ${Pe(l)}`), a;
 }
-const je = Y();
-function ri(e) {
-  const [t, n] = se(), [i, r] = Yn(), [a, l] = be(), [s, o] = Z(), [f, d] = R(), u = () => {
+const je = W();
+function ci(e) {
+  const [t, n] = se(), [i, r] = ei(), [a, l] = be(), [s, 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));
   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(() => Re(e.spec, e.audioUnitSpec)), V = k(() => a.selection ? Ie(e.data, a.selection) : e.data), C = k(() => Ve(e.spec, e.data, V(), O())), T = k(() => Oe(V(), O(), C())), z = k(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
-    const b = D(e.spec, E.field), g = _(b, E), v = re(g, T(), !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);
     return [E.field, v];
   }))), Ue = k(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
-    const b = D(e.spec, E.field), g = _(b, E);
+    const b = D(e.spec, E.field), g = x(b, E);
     return [E.field, r.getAxisTicks(g)];
   }))), q = k(() => ({
     spec: e.spec,
@@ -1340,8 +1340,8 @@ function ri(e) {
       E.every((v) => b[v] === z()[v].length - 1) && (m(c()), s.transport.seconds = 0);
     },
     getDomainValue: Ae,
-    describeEncodings: () => xt(q()),
-    describePlaybackOrder: () => _t(q())
+    describeEncodings: () => _t(q()),
+    describePlaybackOrder: () => xt(q())
   };
   return S(je.Provider, {
     value: [p, G],
@@ -1351,7 +1351,7 @@ function ri(e) {
   });
 }
 function Ee() {
-  const e = X(je);
+  const e = Y(je);
   if (e === void 0)
     throw new Error("useAudioUnitState must be used within a AudioUnitStateProvider");
   return e;
@@ -1427,29 +1427,29 @@ N("div")`
   align-items: center;
   gap: 8px;
 `;
-var ai = /* @__PURE__ */ A("<select>"), si = /* @__PURE__ */ A("<div><input aria-live=assertive type=range min=0><span>"), oi = /* @__PURE__ */ A("<label><span>"), ci = /* @__PURE__ */ A("<option>");
+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 = () => _(a(), e.traversalFieldDef), s = () => n.getTraversalIndex(e.traversalFieldDef.field), o = (u) => {
+  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) => {
     r.startAudioContext(), n.setTraversalIndex(e.traversalFieldDef.field, u);
   }, f = () => n.getFieldDomains()[e.traversalFieldDef.field], d = () => n.getDomainValue(e.traversalFieldDef.field, s());
   return S(Nt, {
     get children() {
-      var u = oi(), c = u.firstChild;
-      return x(c, () => K(l())), x(u, S(Lt, {
+      var u = di(), c = u.firstChild;
+      return _(c, () => K(l())), _(u, S(Lt, {
         get children() {
           return [S(Be, {
             get when() {
               return l().type === "nominal";
             },
             get children() {
-              var p = ai();
-              return p.$$mousedown = () => r.stopTransport(), p.addEventListener("change", (m) => o(m.target.selectedIndex)), x(p, S(ie, {
+              var p = li();
+              return p.$$mousedown = () => r.stopTransport(), p.addEventListener("change", (m) => o(m.target.selectedIndex)), _(p, S(ie, {
                 get each() {
                   return f();
                 },
                 children: (m) => (() => {
-                  var y = ci();
-                  return x(y, () => String(m)), L(() => y.value = String(m)), y;
+                  var y = fi();
+                  return _(y, () => String(m)), L(() => y.value = String(m)), y;
                 })()
               })), L(() => p.value = String(d())), p;
             }
@@ -1458,10 +1458,10 @@ function Pt(e) {
               return l().type !== "nominal";
             },
             get children() {
-              var p = si(), m = p.firstChild, y = m.nextSibling;
-              return m.$$mousedown = () => r.stopTransport(), m.$$input = (w) => o(w.currentTarget.valueAsNumber), x(y, () => B(d(), l())), L((w) => {
-                var O = B(d(), l()), V = f().length - 1;
-                return O !== w.e && Me(m, "aria-valuetext", w.e = O), V !== w.t && Me(m, "max", w.t = V), w;
+              var p = ui(), 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;
               }, {
                 e: void 0,
                 t: void 0
@@ -1474,7 +1474,7 @@ function Pt(e) {
   });
 }
 at(["mousedown", "input"]);
-var li = /* @__PURE__ */ A("<button>Pause"), ui = /* @__PURE__ */ A("<div>"), di = /* @__PURE__ */ A("<button>Play");
+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() {
@@ -1483,32 +1483,32 @@ function Ot(e) {
   return jt(() => l.registerPlayCallback(s)), P(() => {
     a.activeUnitName === e.unitName && l.registerPlayCallback(s, !0);
   }), (() => {
-    var o = ui();
-    return x(o, S(st, {
+    var o = pi();
+    return _(o, S(st, {
       get when() {
         return pe(() => !!i.isPlaying)() && a.activeUnitName === e.unitName;
       },
       get fallback() {
         return (() => {
-          var f = di();
+          var f = gi();
           return f.$$click = () => s(), f;
         })();
       },
       get children() {
-        var f = li();
+        var f = mi();
         return f.$$click = () => r.stopTransport(), f;
       }
     })), o;
   })();
 }
 at(["click"]);
-var fi = /* @__PURE__ */ A("<label> <input readonly>"), mi = /* @__PURE__ */ A("<p><br>playing ");
-const pi = N.div`
+var vi = /* @__PURE__ */ A("<label> <input readonly>"), hi = /* @__PURE__ */ A("<p><br>playing ");
+const yi = N.div`
   margin-bottom: 1em;
 `;
-function gi(e) {
+function Si(e) {
   function t() {
-    return S(pi, {
+    return S(yi, {
       get children() {
         return S(ie, {
           get each() {
@@ -1518,11 +1518,11 @@ function gi(e) {
             if (r) {
               const a = D(e.spec, r.field);
               if (a) {
-                const l = _(a, r);
+                const l = x(a, r);
                 return S(Nt, {
                   get children() {
-                    var s = fi(), o = s.firstChild, f = o.nextSibling;
-                    return x(s, i, o), L(() => f.value = K(l)), s;
+                    var s = vi(), o = s.firstChild, f = o.nextSibling;
+                    return _(s, i, o), L(() => f.value = K(l)), s;
                   }
                 });
               }
@@ -1535,13 +1535,13 @@ function gi(e) {
   function n() {
     const [i, r] = Ee();
     return (() => {
-      var a = mi(), l = a.firstChild;
-      return l.nextSibling, x(a, () => r.describeEncodings(), l), x(a, () => r.describePlaybackOrder(), null), a;
+      var a = hi(), l = a.firstChild;
+      return l.nextSibling, _(a, () => r.describeEncodings(), l), _(a, () => r.describePlaybackOrder(), null), a;
     })();
   }
   return Object.keys(e.audioUnitSpec.encoding).length === 0 ? null : S(Ft, {
     get children() {
-      return S(Wn, {
+      return S(Qn, {
         get spec() {
           return e.spec;
         },
@@ -1552,7 +1552,7 @@ function gi(e) {
           return e.audioUnitSpec;
         },
         get children() {
-          return S(ri, {
+          return S(ci, {
             get spec() {
               return e.spec;
             },
@@ -1585,8 +1585,8 @@ function gi(e) {
     }
   });
 }
-function vi(e) {
-  const [t, n] = se(), [i, r] = be(), [a, l] = Z(), [s, o] = R(), f = () => {
+function bi(e) {
+  const [t, n] = se(), [i, r] = be(), [a, l] = Z(), [s, 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);
   };
@@ -1596,7 +1596,7 @@ function vi(e) {
   }), [p, m] = ye(c()), y = k(() => {
     const g = i.selection;
     return e.units.map((v) => {
-      const h = Re(e.spec, v), U = g ? Ie(e.data, g) : e.data, F = Ve(e.spec, e.data, U, h), I = Oe(U, h, F), ee = Dt(e.spec, e.data, 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);
       return {
         unit: v,
         derivedData: I,
@@ -1606,10 +1606,10 @@ function vi(e) {
   }), w = k(() => {
     const g = y().flatMap((v) => v.derivedData);
     return Object.fromEntries(u().map((v) => {
-      const h = D(e.spec, v.field), U = _(h, 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)]))), V = (g, v, h) => ({
+  }), O = k(() => Object.fromEntries(u().map((g) => [g.field, $t(e.spec, e.data, g.field)]))), C = (g, v, h) => ({
     spec: e.spec,
     audioUnitSpec: g,
     derivedData: v,
@@ -1617,17 +1617,17 @@ function vi(e) {
     axisTicks: O(),
     scales: h,
     pauseBetweenSections: a.pauseBetweenSections
-  }), C = k(() => {
+  }), R = k(() => {
     const g = y()[0];
-    return V(g.unit, g.derivedData, g.scales);
+    return C(g.unit, g.derivedData, g.scales);
   }), T = k(() => y().map((g, v) => ({
     voiceId: g.unit.name,
-    instrument: g.unit.instrument ?? Gn(v),
-    notes: kt(V(g.unit, g.derivedData, g.scales))
-  }))), z = k(() => ii(T().map((g) => ({
+    instrument: g.unit.instrument ?? Jn(v),
+    notes: kt(C(g.unit, g.derivedData, g.scales))
+  }))), z = k(() => oi(T().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(C(), p.traversalState)), oe = () => w(), Ae = (g, v) => we(C(), g, v), Q = () => i.activeUnitName === e.groupName;
+  })))), 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;
   P(() => {
     a.isPlaying && n.setSelection({
       source: "sonification",
@@ -1644,7 +1644,7 @@ function vi(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((Rt) => Rt === ue);
+        const De = ee.findIndex((Vt) => Vt === ue);
         De !== te && (F[I] = De !== -1 ? De : 0, U = !0);
       }
     }), U && (m((I) => ({
@@ -1684,7 +1684,7 @@ function vi(e) {
     },
     getTraversalIndex: (g) => p.traversalState[g],
     getFieldDomains: oe,
-    getDerivedData: () => C().derivedData,
+    getDerivedData: () => R().derivedData,
     getDomainValue: Ae,
     setupTransportSequence: () => {
       a.transport.cancel(), a.transport.bpm.value = ae, ce();
@@ -1712,8 +1712,8 @@ function vi(e) {
       const g = w();
       u().every((h) => p.traversalState[h.field] === g[h.field].length - 1) && (m(c()), a.transport.seconds = 0);
     },
-    describeEncodings: () => e.units.map((g, v) => `layer ${v + 1}: ${xt(V(g, y()[v].derivedData, y()[v].scales))}`).join("; "),
-    describePlaybackOrder: () => _t(C())
+    describeEncodings: () => e.units.map((g, v) => `layer ${v + 1}: ${_t(C(g, y()[v].derivedData, y()[v].scales))}`).join("; "),
+    describePlaybackOrder: () => xt(R())
   };
   return S(je.Provider, {
     value: [p, b],
@@ -1722,23 +1722,23 @@ function vi(e) {
     }
   });
 }
-var hi = /* @__PURE__ */ A("<p><br>playing ");
+var wi = /* @__PURE__ */ A("<p><br>playing ");
 const it = "layer-group";
-function yi() {
+function Ei() {
   const [e, t] = Ee();
   return (() => {
-    var n = hi(), i = n.firstChild;
-    return i.nextSibling, x(n, () => t.describeEncodings(), i), x(n, () => t.describePlaybackOrder(), null), n;
+    var n = wi(), i = n.firstChild;
+    return i.nextSibling, _(n, () => t.describeEncodings(), i), _(n, () => t.describePlaybackOrder(), null), n;
   })();
 }
-function Si(e) {
+function Ui(e) {
   const 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, {
     get children() {
-      return S(vi, {
+      return S(bi, {
         get spec() {
           return e.spec;
         },
@@ -1750,7 +1750,7 @@ function Si(e) {
         },
         groupName: it,
         get children() {
-          return [S(yi, {}), S(ie, {
+          return [S(Ei, {}), S(ie, {
             get each() {
               return n();
             },
@@ -1768,46 +1768,46 @@ function Si(e) {
     }
   });
 }
-var bi = /* @__PURE__ */ A("<div><label>Playback rate <input type=number min=0.1 max=4 step=0.1 id=rate>x"), wi = /* @__PURE__ */ A("<label><input type=checkbox>Speak axis ticks"), Ei = /* @__PURE__ */ A("<label><input type=number min=1 max=100 step=10 id=speechRate>speech rate"), Ui = /* @__PURE__ */ A("<div><label><input type=checkbox aria-live=polite>");
-const Ai = N.div`
+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`
   margin-top: 1rem;
-`, Di = N.div`
+`, _i = N.div`
   display: flex;
   gap: 3px;
 `;
-function $i(e) {
+function xi(e) {
   const [t, n] = Z();
-  return S(Ai, {
+  return S(ki, {
     get children() {
       return [(() => {
-        var i = bi(), r = i.firstChild, a = r.firstChild, l = a.nextSibling;
+        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(Di, {
+      })(), S(_i, {
         get children() {
           return [(() => {
-            var i = wi(), r = i.firstChild;
+            var i = Di(), r = i.firstChild;
             return r.addEventListener("change", (a) => n.setSpeakAxisTicks(a.target.checked)), L(() => r.checked = t.speakAxisTicks), i;
           })(), (() => {
-            var i = Ei(), r = i.firstChild;
+            var i = $i(), r = i.firstChild;
             return r.addEventListener("change", (a) => n.setSpeechRate(Number(a.target.value))), L(() => r.value = t.speechRate), i;
           })()];
         }
       }), (() => {
-        var i = Ui(), r = i.firstChild, a = r.firstChild;
-        return a.addEventListener("change", (l) => n.setMuted(l.target.checked)), x(r, () => t.muted ? "Muted" : "Unmuted", null), L(() => a.checked = t.muted), 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;
       })()];
     }
   });
 }
-function Ti() {
+function Ni() {
   const e = document.activeElement;
   if (!e) return !1;
   const t = e.tagName.toLowerCase();
   return t === "input" || t === "select" || t === "textarea" || e.isContentEditable;
 }
-function ki(e, t) {
+function Fi(e, t) {
   const n = (i) => {
-    if (Ti()) return;
+    if (Ni()) return;
     const r = e[i.key];
     r && (i.preventDefault(), r());
   };
@@ -1816,21 +1816,21 @@ function ki(e, t) {
     i && (i.addEventListener("keydown", n), H(() => i.removeEventListener("keydown", n)));
   });
 }
-function xi(e) {
+function Pi(e) {
   const [t, n] = Z(), [i, r] = be();
-  return ki({
+  return Fi({
     p: () => {
       t.isPlaying ? n.stopTransport() : r.triggerPlay();
     }
   }, e.target), null;
 }
-function _i(e) {
+function Oi(e) {
   const t = () => e.spec.audio.composition === "layer" && e.spec.audio.units.length > 1;
-  return S(jn, {
+  return S(zn, {
     get children() {
-      return S(Kn, {
+      return S(Wn, {
         get children() {
-          return [S(xi, {
+          return [S(Pi, {
             get target() {
               return e.keyEventTarget;
             }
@@ -1843,7 +1843,7 @@ function _i(e) {
                 get each() {
                   return e.spec.audio.units;
                 },
-                children: (n) => S(gi, {
+                children: (n) => S(Si, {
                   get spec() {
                     return e.spec;
                   },
@@ -1855,7 +1855,7 @@ function _i(e) {
               });
             },
             get children() {
-              return S(Si, {
+              return S(Ui, {
                 get spec() {
                   return e.spec;
                 },
@@ -1867,34 +1867,34 @@ function _i(e) {
                 }
               });
             }
-          }), S($i, {})];
+          }), S(xi, {})];
         }
       });
     }
   });
 }
-var Ni = /* @__PURE__ */ A("<h2>Visualization"), Fi = /* @__PURE__ */ A("<h2>Description"), Pi = /* @__PURE__ */ A("<h2>Sonification"), Oi = /* @__PURE__ */ A('<div><div class=uw-viewer role=region aria-label="Umwelt Viewer">');
-function Ci(e) {
-  const [t, n] = R();
+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) {
+  const [t, n] = V();
   return (() => {
-    var i = Oi(), r = i.firstChild;
-    return Ne(n, r), x(r, S(Fn, {
+    var i = Ii(), r = i.firstChild;
+    return Ne(n, r), _(r, S(Vn, {
       get children() {
-        return [Ni(), S(Vn, {
+        return [Ri(), S(qn, {
           get spec() {
             return e.spec;
           },
           get data() {
             return e.data;
           }
-        }), Fi(), S(Ln, {
+        }), Vi(), S(Bn, {
           get spec() {
             return e.spec;
           },
           get data() {
             return e.data;
           }
-        }), Pi(), S(_i, {
+        }), Ci(), S(Oi, {
           get spec() {
             return e.spec;
           },
@@ -1904,11 +1904,11 @@ function Ci(e) {
           keyEventTarget: t
         })];
       }
-    })), L(() => Vt(i, dn.Viewer)), i;
+    })), L(() => Ct(i, dn.Viewer)), i;
   })();
 }
 function rt(e, t, n = localStorage) {
-  const i = n.getItem(e) ? JSON.parse(n.getItem(e)) : t, [r, a] = R(i);
+  const i = n.getItem(e) ? JSON.parse(n.getItem(e)) : t, [r, a] = V(i);
   return [r, ((s) => {
     if (s) {
       const o = a(s);
@@ -1916,9 +1916,9 @@ function rt(e, t, n = localStorage) {
     }
   })];
 }
-const Ct = Y();
-function Ri(e) {
-  const t = e.persist !== !1, [n, i] = t ? rt("umweltDatastore", {}) : R({}), [r, a] = t ? rt("umweltSessionDatastore", {}, sessionStorage) : R({}), l = () => ({
+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 = () => ({
     ...n(),
     ...r()
   }), s = {
@@ -1954,22 +1954,22 @@ function Ri(e) {
       });
     }
   };
-  return S(Ct.Provider, {
+  return S(Rt.Provider, {
     value: [l, s],
     get children() {
       return e.children;
     }
   });
 }
-function Vi() {
-  const e = X(Ct);
+function qi() {
+  const e = Y(Rt);
   if (e === void 0)
     throw new Error("useUmweltDatastore must be used within a UmweltDatastoreProvider");
   return e;
 }
-var Ii = /* @__PURE__ */ A("<div>"), Li = /* @__PURE__ */ A("<div>Loading..."), ji = /* @__PURE__ */ A("<div role=alert>");
-function qi(e) {
-  const [t, n] = Vi(), [i, r] = R(), [a, l] = R(!0), [s, o] = R(), f = () => {
+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 = () => {
     const d = i();
     return d ? t()[d.data.name]?.data || [] : [];
   };
@@ -1977,7 +1977,7 @@ function qi(e) {
     const d = e.exportableSpec;
     l(!0), o(void 0);
     try {
-      const u = await $n(d, t(), n.setDataset);
+      const u = await xn(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 +1985,19 @@ function qi(e) {
       l(!1);
     }
   }), (() => {
-    var d = Ii();
-    return x(d, (() => {
+    var d = Mi();
+    return _(d, (() => {
       var u = pe(() => !!a());
-      return () => u() && Li();
-    })(), null), x(d, (() => {
+      return () => u() && Bi();
+    })(), null), _(d, (() => {
       var u = pe(() => !!(!a() && s()));
       return () => u() && (() => {
-        var c = ji();
-        return x(c, s), c;
+        var c = zi();
+        return _(c, s), c;
       })();
-    })(), null), x(d, (() => {
+    })(), null), _(d, (() => {
       var u = pe(() => !!(!a() && !s() && i()));
-      return () => u() && S(Ci, {
+      return () => u() && S(Li, {
         get spec() {
           return i();
         },
@@ -2008,11 +2008,11 @@ function qi(e) {
     })(), null), d;
   })();
 }
-function Mi(e) {
-  return S(Ri, {
+function Ki(e) {
+  return S(ji, {
     persist: !1,
     get children() {
-      return S(qi, {
+      return S(Gi, {
         get exportableSpec() {
           return e.exportableSpec;
         }
@@ -2020,7 +2020,7 @@ function Mi(e) {
     }
   });
 }
-class Bi {
+class Hi {
   constructor(t) {
     this.options = t, this.mount();
   }
@@ -2029,7 +2029,7 @@ class Bi {
   mount() {
     if (this.isDestroyed)
       throw new Error("Cannot mount a destroyed UmweltViewer. Create a new instance.");
-    this.disposal = It(() => Mi({ exportableSpec: this.options.spec }), this.options.container);
+    this.disposal = It(() => Ki({ exportableSpec: this.options.spec }), this.options.container);
   }
   /**
    * Update the viewer with a new specification.
@@ -2069,10 +2069,10 @@ class Bi {
     return this.isDestroyed;
   }
 }
-function ur(e, t) {
-  return new Bi({ spec: e, container: t });
+function pr(e, t) {
+  return new Hi({ spec: e, container: t });
 }
 export {
-  Bi as UmweltViewer,
-  ur as createViewer
+  Hi as UmweltViewer,
+  pr as createViewer
 };