umwelt-js 0.1.1 → 0.2.0

package/dist/index.js

@@ -1,286 +1,312 @@
-import { createComponent as p, use as ke, template as A, delegateEvents as Qe, insert as k, effect as q, setAttribute as Le, memo as ue, className as _t, render as Nt } from "solid-js/web";
-import { createContext as Z, createSignal as O, useContext as Q, createEffect as N, onCleanup as Y, createMemo as _, Switch as Pt, Match as je, For as te, onMount as Ft, Show as et } from "solid-js";
-import { isMultiSpec as qe, olliVis as Ot } from "olli";
-import { VegaLiteAdapter as Vt } from "olli/adapters";
-import me from "moize";
-import { getDomain as Rt, fetchAndParse as Ct, typeCoerceData as It, getBins as Lt, serializeValue as jt } from "@umwelt-data/umwelt-utils/data";
-import { compile as tt } from "vega-lite";
-import { evaluateVegaData as qt, extractOutputDatasets as Mt, computeGuideTicks as Bt } from "@umwelt-data/umwelt-utils/vega";
-import Ee from "lodash.clonedeep";
-import { withExternalStateParam as zt, selectionStoreToSelection as Gt, EXTERNAL_STATE_STORE as Me, predicateToSelectionStore as Kt } from "@umwelt-data/umwelt-utils/vl-bridge";
+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 { 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 $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 "lz-string";
-import { parse as Ht, View as Jt } from "vega";
-import { debounce as Yt } from "@solid-primitives/scheduled";
-import { createStore as ge } from "solid-js/store";
-import { makeCommaSeparatedString as xe, fmtValue as Xt, describeField as J } from "@umwelt-data/umwelt-utils/description";
-import { testDatum as Wt } from "@umwelt-data/umwelt-utils/predicate";
-import * as R from "tone";
-import { Storage as Zt } from "versioned-storage";
-import { scaleTime as Qt, scaleLinear as en, scaleOrdinal as tn } from "d3-scale";
-import nn from "fast-cartesian";
-import { styled as x } from "solid-styled-components";
-const rn = "_Viewer_1uzho_29", an = {
-  Viewer: rn
-}, sn = ["mean", "median", "min", "max", "sum", "count"];
-function nt(e) {
-  return sn.includes(e);
-}
-function on(e) {
+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 { createStore as ye } from "solid-js/store";
+import { makeCommaSeparatedString as Pe, fmtValue as nn, 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 { 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);
+}
+function mn(e) {
   return e && (typeof e.name == "string" || e.name === void 0) && Array.isArray(e.values);
 }
-function it(e) {
+function ut(e) {
   return e && (typeof e.name == "string" || e.name === void 0) && typeof e.url == "string";
 }
-const cn = ["x", "y", "color", "shape", "size", "opacity", "order", "facet"];
-function rt(e) {
-  return cn.includes(e);
+const pn = ["x", "y", "color", "shape", "size", "opacity", "order", "facet"], gn = ["pure", "bright", "hollow", "bell", "reed", "strings"];
+function vn(e) {
+  return gn.includes(e);
+}
+function dt(e) {
+  return pn.includes(e);
+}
+const ft = "None";
+function Ke(e) {
+  return "units" in e;
 }
-const at = "None", ln = "", X = (e, n) => `${n}_${e}`, M = (e) => [`${e}_bin_start`, `${e}_bin_end`], W = (e, n) => `${n}_${e}`, pe = (e) => {
-  const n = Ne([e]);
-  let t = e.field;
-  for (const i of n)
+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]);
+  let n = e.field;
+  for (const i of t)
     if ("aggregate" in i)
       for (const r of i.aggregate)
-        nt(r.op) && (t = X(t, r.op));
-    else "bin" in i && !e.aggregate ? t = M(t)[0] : "timeUnit" in i && !e.aggregate && (t = W(t, i.timeUnit));
-  return t;
-}, st = (e) => {
-  const n = Ne([e]);
-  let t = e.field;
-  for (const i of n)
+        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));
+  return n;
+}, mt = (e) => {
+  const t = Ce([e]);
+  let n = e.field;
+  for (const i of t)
     if ("aggregate" in i)
       for (const r of i.aggregate)
-        nt(r.op) && (typeof t == "string" ? t = X(t, r.op) : t = [X(t[0], r.op), X(t[1], r.op)]);
-    else "bin" in i && !e.aggregate ? typeof t == "string" ? t = M(t) : t = [M(t[0])[0], M(t[1])[1]] : "timeUnit" in i && !e.aggregate && (typeof t == "string" ? t = W(t, i.timeUnit) : t = [W(t[0], i.timeUnit), W(t[1], i.timeUnit)]);
-  if (typeof t == "string")
+        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)]);
+  if (typeof n == "string")
     throw new Error("Expected derived field name to be a tuple");
-  return t;
-}, _e = (e, n, t) => {
-  const i = new Set(n.filter((s) => s.bin && t?.[s.field]?.length).map((s) => s.field));
+  return n;
+}, Oe = (e, t, n) => {
+  const i = new Set(t.filter((s) => s.bin && n?.[s.field]?.length).map((s) => s.field));
   let r = e;
   i.size && (r = e.map((s) => {
-    const c = { ...s };
+    const o = { ...s };
     for (const f of i) {
-      const [u, o] = M(f), d = un(s[f], t[f]);
-      c[u] = d ? d[0] : null, c[o] = d ? d[1] : null;
+      const [d, u] = j(f), c = yn(s[f], n[f]);
+      o[d] = c ? c[0] : null, o[u] = c ? c[1] : null;
     }
-    return c;
+    return o;
   }));
-  const a = Ne(n, i);
-  return ot(r, a);
-}, un = (e, n) => {
+  const a = Ce(t, i);
+  return pt(r, a);
+}, yn = (e, t) => {
   if (e == null) return;
-  const t = Number(e);
-  if (!isNaN(t))
-    for (let i = 0; i < n.length; i++) {
-      const [r, a] = n[i];
-      if (t >= r && (t < a || i === n.length - 1 && t <= a))
-        return n[i];
+  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))
+        return t[i];
     }
-}, Ne = (e, n) => {
-  const t = [], i = [], r = [], a = /* @__PURE__ */ new Set();
+}, Ce = (e, t) => {
+  const n = [], i = [], r = [], a = /* @__PURE__ */ new Set();
   for (const l of e) {
-    const { field: s, timeUnit: c, bin: f, aggregate: u } = l;
-    u || (c && a.add(W(s, c)), f && M(s).forEach((o) => a.add(o)), !c && !f && a.add(s));
+    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));
   }
   for (const l of e) {
-    const { field: s, timeUnit: c, bin: f, aggregate: u } = l;
-    if (f && !n?.has(s)) {
-      const o = M(s);
+    const { field: s, timeUnit: o, bin: f, aggregate: d } = l;
+    if (f && !t?.has(s)) {
+      const u = j(s);
       i.push({
         bin: !0,
         field: s,
-        as: o
+        as: u
       });
     }
-    if (c) {
-      const o = f ? M(s)[0] : W(s, c);
-      t.push({
-        timeUnit: c,
+    if (o) {
+      const u = f ? j(s)[0] : W(s, o);
+      n.push({
+        timeUnit: o,
         field: s,
-        as: o
+        as: u
       });
     }
-    if (u) {
-      const o = f ? M(s)[0] : s, d = r.find((m) => m.groupby?.length === a.size && m.groupby?.every((v) => a.has(v)));
-      d ? d.aggregate.push({
-        op: u,
-        field: o,
-        as: X(s, 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)));
+      c ? c.aggregate.push({
+        op: d,
+        field: u,
+        as: J(s, d)
       }) : r.push({
         aggregate: [
           {
-            op: u,
-            field: o,
-            as: X(s, u)
+            op: d,
+            field: u,
+            as: J(s, d)
           }
         ],
         groupby: Array.from(a)
       });
     }
   }
-  return [...i, ...t, ...r];
+  return [...i, ...n, ...r];
 };
-function ot(e, n) {
-  const r = tt({
+function pt(e, t) {
+  const r = Fe({
     data: { values: e },
-    transform: n,
+    transform: t,
     mark: "point"
-  }).spec.data ?? [], a = qt(r), l = Mt(r, a);
+  }).spec.data ?? [], a = ot(r), l = ct(r, a);
   return l[l.length - 1] ?? [];
 }
-const ne = me((e, n, t) => {
-  const i = t ? pe(e) : e.field;
-  return Rt({ field: i, type: e.type, timeUnit: e.timeUnit }, n);
-}), dn = me((e, n) => {
+function Sn(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");
+    s && Object.keys(s).forEach((o) => a.add(o));
+  }
+  return [...a];
+}
+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) => {
   if (e.bin) {
-    const t = st(e);
-    return n.map((i) => {
-      const r = i[t[0]], a = i[t[1]];
+    const n = mt(e);
+    return t.map((i) => {
+      const r = i[n[0]], a = i[n[1]];
       return [r, a];
     }).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 [];
-}), fe = "dataset", fn = "https://raw.githubusercontent.com/vega/vega-datasets/master/data/", mn = Object.fromEntries(
-  ["stocks.csv", "cars.json", "weather.csv", "seattle-weather.csv", "penguins.json", "driving.json", "barley.json", "disasters.csv", "gapminder.json"].map((e) => [e, `${fn}${e}`])
+}), 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}`])
 );
-async function gn(e) {
-  if (on(e)) {
-    const n = e.name || fe;
-    return e.values.length ? { name: n, data: e.values } : void 0;
+async function Un(e) {
+  if (mn(e)) {
+    const t = e.name || ve;
+    return e.values.length ? { name: t, data: e.values } : void 0;
   }
-  if (it(e)) {
-    const n = e.name || e.url.split("/").pop() || fe, t = await Be(e.url);
-    return t.length ? { name: n, data: t, sourceUrl: e.url } : void 0;
+  if (ut(e)) {
+    const t = e.name || e.url.split("/").pop() || ve, n = await Je(e.url);
+    return n.length ? { name: t, data: n, sourceUrl: e.url } : void 0;
   }
   if (e.name) {
-    const n = mn[e.name];
-    if (!n) {
+    const t = En[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 t = await Be(n);
-    return t.length ? { name: e.name, data: t, sourceUrl: n } : void 0;
+    const n = await Je(t);
+    return n.length ? { name: e.name, data: n, sourceUrl: t } : void 0;
   }
 }
-const Be = me.promise(async (e) => {
+const Je = he.promise(async (e) => {
   try {
-    const n = await Ct(e);
-    return Array.isArray(n) ? n : [];
-  } catch (n) {
+    const t = await zt(e);
+    return Array.isArray(t) ? t : [];
+  } catch (t) {
     return console.warn(`Failed to load data from ${e} 
- ${n}`), [];
+ ${t}`), [];
   }
 });
-me.promise(async (e, n) => {
+he.promise(async (e, t) => {
   try {
-    return ot(e, n);
-  } catch (t) {
+    return pt(e, t);
+  } catch (n) {
     return console.warn(`Failed to evaluate transforms 
- ${t}`), [];
+ ${n}`), [];
   }
 });
-function pn(e, n) {
-  const t = n.map((i) => ({ name: i.name, type: i.type }));
-  return It(e, t);
+function An(e, t) {
+  const n = t.map((i) => ({ name: i.name, type: i.type }));
+  return Gt(e, n);
 }
-function vn(e, n) {
-  return e.filter((t) => Object.entries(t).every(([i, r]) => n.find((a) => a.name === i) ? r != null : !0));
+function Dn(e, t) {
+  return e.filter((n) => Object.entries(n).every(([i, r]) => t.find((a) => a.name === i) ? r != null : !0));
 }
-function $(e, n) {
-  return e.fields.find((t) => t.name === n);
+function D(e, t) {
+  return e.fields.find((n) => n.name === t);
 }
-function P(e, n) {
-  const { active: t, name: i, encodings: r, ...a } = e, l = n ? {
+function _(e, t) {
+  const { active: n, name: i, encodings: r, ...a } = e, l = t ? {
     ...a,
-    ...n
+    ...t
   } : { field: i, ...a };
-  return Object.fromEntries(Object.entries(l).filter(([s, c]) => c !== at));
+  return Object.fromEntries(Object.entries(l).filter(([s, o]) => o !== ft));
 }
-function Pe(e, n) {
-  const i = [...Object.values(n.encoding), ...n.traversal].flatMap((a) => {
-    const l = $(e, a.field);
-    return l ? [P(l, a)] : [];
+function Re(e, t) {
+  const i = [...Object.values(t.encoding), ...t.traversal].flatMap((a) => {
+    const l = D(e, a.field);
+    return l ? [_(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 hn(e, n, t) {
+async function $n(e, t, n) {
   if (!e.data || !(e.fields && e.fields.length))
     return;
   const i = e.data.name;
-  if (i && n[i]?.data?.length)
-    return ze(e);
-  const r = await gn(e.data);
+  if (i && t[i]?.data?.length)
+    return We(e);
+  const r = await Un(e.data);
   if (!r)
     return;
-  const a = ze(e), l = pn(r.data, a.fields), s = vn(l, a.fields);
+  const a = We(e), l = An(r.data, a.fields), s = Dn(l, a.fields);
   if (s.length)
-    return t(r.name, s, r.sourceUrl), a;
-}
-function ze(e) {
-  const n = e.fields.map((i) => {
-    const r = [];
-    return e.visual.units.forEach((a) => {
-      Object.entries(a.encoding).forEach(([l, s]) => {
-        rt(l) && s.field === i.name && r.push({ unit: a.name, property: l });
+    return n(r.name, s, r.sourceUrl), a;
+}
+function Tn(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;
+    return n;
+  }
+  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) => {
+    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 });
       });
-    }), e.audio.units.forEach((a) => {
-      Object.entries(a.encoding).forEach(([l, s]) => {
-        l === "pitch" && s.field === i.name && r.push({ unit: a.name, property: l });
+    }), i.forEach((f) => {
+      Object.entries(f.encoding).forEach(([d, u]) => {
+        d === "pitch" && u.field === s.name && o.push({ unit: f.name, property: d });
       });
-    }), { ...i, active: !0, encodings: r };
+    }), { ...s, active: !0, encodings: o };
   });
   return {
     ...e,
     data: {
-      name: e.data.name || (it(e.data) ? e.data.url.split("/").pop() : fe) || fe
+      name: e.data.name || (ut(e.data) ? e.data.url.split("/").pop() : ve) || ve
     },
-    fields: n,
-    visual: { units: e.visual.units, composition: e.visual.composition || "layer" },
-    audio: { units: e.audio.units, composition: e.audio.composition || "concat" },
+    fields: a,
+    visual: { units: t, composition: n || "layer" },
+    audio: { units: i.map(Tn), 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(([i, r]) => [i, r.map(lt)])) : {}
+      structures: e.text?.structures ? Object.fromEntries(Object.entries(e.text.structures).map(([s, o]) => [s, o.map(gt)])) : {}
     }
   };
 }
-function ct(e, n) {
-  if (e.visual.units.length === 0 || e.visual.units.map((c) => Object.values(c.encoding).length).reduce((c, f) => c + f, 0) === 0) return;
+function xe(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 = [
     {
       name: "brush",
       select: "interval"
     }
   ];
-  function r(c) {
-    const f = c.visual.units;
+  function r(o) {
+    const f = o.visual.units;
     if (f.length === 1) {
-      const u = f[0], o = Ee(u.encoding);
-      return o && Object.keys(o).forEach((d) => {
-        if (rt(d)) {
-          const m = o[d];
-          if (m) {
-            const v = $(c, m.field);
-            if (v) {
-              const w = P(v, m);
-              if (o[d] = {
-                ...w
-              }, d === "facet") {
-                const b = ne(w, n);
-                o[d] = {
-                  ...w,
-                  columns: b.length === 3 ? 3 : 2
+      const d = f[0], u = $e(d.encoding);
+      return u && Object.keys(u).forEach((c) => {
+        if (dt(c)) {
+          const p = u[c];
+          if (p) {
+            const m = D(o, p.field);
+            if (m) {
+              const y = _(m, p);
+              if (u[c] = {
+                ...y
+              }, c === "facet") {
+                const w = re(y, t);
+                u[c] = {
+                  ...y,
+                  columns: w.length === 3 ? 3 : 2
                   // TODO do something better
                 };
               }
-              u.mark === "point" && (d === "x" || d === "y") && w.type === "quantitative" && (o[d] = {
-                ...w,
+              d.mark === "point" && (c === "x" || c === "y") && y.type === "quantitative" && (u[c] = {
+                ...y,
                 scale: {
-                  ...w.scale,
+                  ...y.scale,
                   zero: !1
                 }
               });
@@ -288,268 +314,345 @@ function ct(e, n) {
           }
         }
       }), {
-        mark: u.mark,
+        mark: d.mark,
         encoding: {
-          ...o,
+          ...u,
           color: {
-            ...a({ ...o.color || { value: "navy" }, scale: u.mark === "area" ? { scheme: "category20b" } : void 0 }, "brush", "grey")
+            ...a({ ...u.color || { value: "navy" }, scale: d.mark === "area" ? { scheme: "category20b" } : void 0 }, "brush", "grey")
           }
         }
       };
     } else if (f.length > 1) {
-      const u = c.visual.composition || "layer";
+      const d = o.visual.composition || "layer";
       return {
-        columns: u === "concat" ? f.length < 3 ? 1 : 2 : void 0,
-        [u]: f.map((o, d) => {
-          const m = r({
-            ...c,
+        columns: d === "concat" ? f.length < 3 ? 1 : 2 : void 0,
+        [d]: f.map((u, c) => {
+          const p = r({
+            ...o,
             visual: {
-              units: [o],
-              composition: u
+              units: [u],
+              composition: d
             }
           });
-          return d === 0 && (m.params = i), m;
+          return c === 0 && (p.params = i), p;
         })
       };
     }
   }
   if (e.visual.units[0].mark === "line" || e.visual.units[0].mark === "bar") {
-    const c = e.visual.units[0], f = c.encoding.y?.field, u = c.encoding.x?.field, o = $(e, f), d = $(e, u);
-    o?.type === "quantitative" && d?.type !== "quantitative" ? i[0].select = { type: "interval", encodings: ["x"] } : d?.type === "quantitative" && o?.type !== "quantitative" && (i[0].select = { type: "interval", encodings: ["y"] });
+    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 = (c, f, u, o) => ({
-    condition: { param: f, empty: o || !0, ...c },
-    value: u
+  const a = (o, f, d, u) => ({
+    condition: { param: f, empty: u || !0, ...o },
+    value: d
   }), l = r(e);
   let s;
-  return "mark" in l ? s = Ee({
-    data: { values: n },
+  return "mark" in l ? s = $e({
+    data: { values: t },
     params: i,
     ...l
-  }) : s = Ee({
-    data: { values: n },
+  }) : s = $e({
+    data: { values: t },
     ...l
-  }), zt(s);
+  }), Wt(s);
 }
-async function yn(e, n) {
-  let t;
-  const i = e.text.structures, r = e.visual.units.map((c) => c.name);
+async function kn(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((c) => [c.name, c.type])), l = ct(e, n);
-  if (l ? t = await Vt(l) : t = {
-    data: n,
+  const a = new Map(e.fields.map((o) => [o.name, o.type])), l = xe(e, t);
+  if (l ? n = await Mt(l) : n = {
+    data: t,
     fields: []
-  }, qe(t) ? t.units.forEach((c) => {
-    s(c, e);
-  }) : s(t, e), l)
-    (qe(t) ? t.units : [t]).forEach((f, u) => {
-      const o = i[r[u]];
-      o?.length && Ke(f, o, a);
+  }, ze(n) ? n.units.forEach((o) => {
+    s(o, e);
+  }) : s(n, e), l)
+    (ze(n) ? n.units : [n]).forEach((f, d) => {
+      const u = i[r[d]];
+      u?.length && Xe(f, u, a);
     });
   else {
-    const c = i[ln];
-    c?.length && Ke(t, c, a);
+    const o = i[hn];
+    o?.length && Xe(n, o, a);
   }
-  function s(c, f) {
-    c.fields?.length === 0 && (delete c.mark, delete c.axes, delete c.legends), c.fields && f.fields.filter((u) => u.active).forEach((u) => {
-      c.fields?.find((o) => o.field === u.name) || c.fields?.push({
-        ...u,
-        field: u.name,
-        timeUnit: u.timeUnit
+  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) => {
+      o.fields?.find((u) => u.field === d.name) || o.fields?.push({
+        ...d,
+        field: d.name,
+        timeUnit: d.timeUnit
       });
     });
   }
-  return t;
+  return n;
 }
-let Sn = 0;
-function bn() {
-  return `text_node_${Sn++}`;
+let xn = 0;
+function _n() {
+  return `text_node_${xn++}`;
 }
-function lt(e) {
-  return { ...e, id: bn(), children: e.children.map(lt) };
+function gt(e) {
+  return { ...e, id: _n(), children: e.children.map(gt) };
 }
-function de(e, n) {
+function ge(e, t) {
   if (!e || typeof e != "object") return e;
-  if ("and" in e) return { and: e.and.map((t) => de(t, n)) };
-  if ("or" in e) return { or: e.or.map((t) => de(t, n)) };
-  if ("not" in e) return { not: de(e.not, n) };
-  if ("field" in e && n.get(e.field) === "temporal") {
-    const t = (r) => r instanceof Date || r == null ? r : new Date(r), i = { ...e };
+  if ("and" in e) return { and: e.and.map((n) => ge(n, t)) };
+  if ("or" in e) return { or: e.or.map((n) => ge(n, t)) };
+  if ("not" in e) return { not: ge(e.not, t) };
+  if ("field" in e && t.get(e.field) === "temporal") {
+    const n = (r) => r instanceof Date || r == null ? r : new Date(r), i = { ...e };
     for (const r of ["equal", "lt", "lte", "gt", "gte"])
-      r in i && (i[r] = t(i[r]));
-    return "range" in i && Array.isArray(i.range) && (i.range = i.range.map(t)), "oneOf" in i && Array.isArray(i.oneOf) && (i.oneOf = i.oneOf.map(t)), i;
+      r in i && (i[r] = n(i[r]));
+    return "range" in i && Array.isArray(i.range) && (i.range = i.range.map(n)), "oneOf" in i && Array.isArray(i.oneOf) && (i.oneOf = i.oneOf.map(n)), i;
   }
   return e;
 }
-function ut(e, n, t) {
-  const i = e.children.map((r) => ut(r, n, t));
+function vt(e, t, n) {
+  const i = e.children.map((r) => vt(r, t, n));
   if (e.nodeType === "group") {
-    const r = e.groupby.map(t);
+    const r = e.groupby.map(n);
     return { groupby: r.length === 1 ? r[0] : r, ...i.length ? { children: i } : {} };
   }
   return {
-    predicate: de(e.predicate, n),
+    predicate: ge(e.predicate, t),
     ...e.name ? { name: e.name } : {},
     ...e.reasoning ? { reasoning: e.reasoning } : {},
     ...i.length ? { children: i } : {}
   };
 }
-function Ge(e, n) {
+function Ye(e, t) {
   return {
-    type: e.type ?? n?.type,
-    timeUnit: e.timeUnit === at ? void 0 : e.timeUnit ?? n?.timeUnit,
-    bin: e.bin !== void 0 ? e.bin : !!n?.bin
+    type: e.type ?? t?.type,
+    timeUnit: e.timeUnit === ft ? void 0 : e.timeUnit ?? t?.timeUnit,
+    bin: e.bin !== void 0 ? e.bin : !!t?.bin
   };
 }
-const we = (e) => `${e.type ?? ""}|${e.timeUnit ?? ""}|${e.bin ? "bin" : ""}`;
-function Ke(e, n, t) {
-  const i = e.fields ?? (e.fields = []), r = e.data ?? [], a = (u) => i.find((o) => o.field === u), l = /* @__PURE__ */ new Map(), s = (u) => u.forEach((o) => {
-    o.nodeType === "group" && o.groupby.forEach((d) => {
-      const m = Ge(d, a(d.field)), v = l.get(d.field) ?? /* @__PURE__ */ new Map();
-      v.set(we(m), m), l.set(d.field, v);
-    }), s(o.children);
+const Te = (e) => `${e.type ?? ""}|${e.timeUnit ?? ""}|${e.bin ? "bin" : ""}`;
+function Xe(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();
+      m.set(Te(p), p), l.set(c.field, m);
+    }), s(u.children);
   });
-  s(n);
-  const c = /* @__PURE__ */ new Map();
-  l.forEach((u, o) => {
-    const d = a(o), m = d ? we({ type: d.type, timeUnit: d.timeUnit, bin: !!d.bin }) : void 0, v = [...u.keys()], w = m && u.has(m) ? m : v[0];
-    u.forEach((b, L) => {
-      if (L === w)
-        d && (b.type && (d.type = b.type), d.timeUnit = b.timeUnit, d.bin = b.bin || void 0), c.set(`${o}|${L}`, o);
+  s(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];
+    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 = [b.type, b.timeUnit, b.bin ? "bin" : ""].filter(Boolean), F = `${o}__${C.join("_") || "raw"}`;
-        c.set(`${o}|${L}`, F), i.find((I) => I.field === F) || i.push({ field: F, label: o, type: b.type ?? t.get(o), timeUnit: b.timeUnit, bin: b.bin || void 0 }), r.forEach((I) => {
-          o in I && !(F in I) && (I[F] = I[o]);
+        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 f = (u) => c.get(`${u.field}|${we(Ge(u, a(u.field)))}`) ?? u.field;
-  e.structure = n.map((u) => ut(u, t, f));
+  const f = (d) => o.get(`${d.field}|${Te(Ye(d, a(d.field)))}`) ?? d.field;
+  e.structure = t.map((d) => vt(d, n, f));
 }
-function En(e, n) {
-  const t = tt(e).spec, i = Ht(t), r = new Jt(i, {
+function Nn(e, t) {
+  const n = Fe(e).spec, i = Zt(n), r = new Qt(i, {
     renderer: "canvas",
-    container: n,
+    container: t,
     hover: !0
   });
   return r.runAsync(), r;
 }
-const dt = Z();
-function wn(e) {
-  const [n, t] = O(void 0), i = {
+const ht = Y();
+function Fn(e) {
+  const [t, n] = R(void 0), i = {
     setSelection: (r) => {
-      r && r.predicate && "and" in r.predicate && r.predicate.and.length === 0 && (r.predicate = void 0), t(r);
+      r && r.predicate && "and" in r.predicate && r.predicate.and.length === 0 && (r.predicate = void 0), n(r);
     }
   };
-  return p(dt.Provider, {
-    value: [n, i],
+  return S(ht.Provider, {
+    value: [t, i],
     get children() {
       return e.children;
     }
   });
 }
-function re() {
-  const e = Q(dt);
+function se() {
+  const e = X(ht);
   if (e === void 0)
     throw new Error("useUmweltSelection must be used within a UmweltSelectionProvider");
   return e;
 }
-var Dn = /* @__PURE__ */ A("<div class=uw-vl-container>");
-function Un(e) {
-  const [n, t] = re(), [i, r] = O(!1), [a, l] = O(null), [s, c] = O(null), f = Yt((u) => {
+function yt(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 = _(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,
+    timeUnit: s.timeUnit,
+    scaleZero: o,
+    scaleDomain: f,
+    // vega-lite sorts discrete scales ascending unless told otherwise
+    sort: s.sort === void 0 ? "ascending" : s.sort
+  };
+  return Jt(t, d);
+}
+function St(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 _(n, a);
+}
+function Pn(e, t) {
+  return !!St(e, t)?.bin;
+}
+function Ve(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;
+      const l = { field: a.field, type: a.type };
+      let s = Kt(l, n, yt(e, t, a.field));
+      if (s.length === 0) {
+        let o = 1 / 0, f = -1 / 0;
+        for (const d of n) {
+          const u = d[a.field];
+          if (u == null) continue;
+          const c = Number(u);
+          isNaN(c) || (c < o && (o = c), c > f && (f = c));
+        }
+        o <= f && (s = [[o, f]]);
+      }
+      r[a.field] = s;
+    }
+  return r;
+}
+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) {
+  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) {
+  if (!t) return t;
+  const i = (r) => {
+    if (!r || typeof r != "object") return r;
+    if ("and" in r) return { and: r.and.map(i) };
+    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 = On(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) => {
     if (i()) {
-      const o = Gt(u);
-      t.setSelection({
+      const c = Yt(u);
+      n.setSelection({
         source: "visualization",
-        predicate: o
+        predicate: c
       });
     }
-  }, 250);
-  return N(() => {
-    const u = n(), o = a();
+  }, 250), d = k(() => {
+    const u = xe(e.spec, e.data);
+    return u ? Sn(u) : [];
+  });
+  return P(() => {
+    const u = t(), c = a();
     if (!u) {
-      o && o.data(Me, []).run();
+      c && c.data(Ge, []).run();
       return;
     }
-    if (o && (u.source === "sonification" || u.source === "text-navigation")) {
-      const d = Kt(u.predicate);
-      o.data(Me, d ? [d] : []).run();
+    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);
+      c.data(Ge, m ? [m] : []).run();
     }
-  }), N(() => {
-    const u = ct(e.spec, e.data), o = s();
-    if (u && o)
+  }), P(() => {
+    const u = xe(e.spec, e.data), c = s();
+    if (u && c)
       try {
-        const d = En(u, o);
-        d.addDataListener("brush_store", (m, v) => {
-          f(v);
-        }), l(d);
-      } catch (d) {
-        console.error(d);
+        const p = Nn(u, c);
+        p.addDataListener("brush_store", (m, y) => {
+          f(y);
+        }), l(p);
+      } catch (p) {
+        console.error(p);
       }
-    Y(() => {
+    H(() => {
       a()?.finalize(), l(null);
-      const d = s();
-      d && (d.innerHTML = "");
+      const p = s();
+      p && (p.innerHTML = "");
     });
   }), (() => {
-    var u = Dn();
-    return u.addEventListener("mouseleave", () => r(!1)), u.addEventListener("mouseenter", () => r(!0)), ke(c, u), u;
+    var u = Rn();
+    return u.addEventListener("mouseleave", () => r(!1)), u.addEventListener("mouseenter", () => r(!0)), Ne(o, u), u;
   })();
 }
-var An = /* @__PURE__ */ A("<div class=uw-olli-container>");
-function $n(e) {
-  const [n, t] = re(), [i, r] = O(null), [a, l] = O(null);
+var In = /* @__PURE__ */ A("<div class=uw-olli-container>");
+function Ln(e) {
+  const [t, n] = se(), [i, r] = R(null), [a, l] = R(null);
   let s = !1;
-  return N(() => {
-    let c = !1;
-    Y(() => {
-      c = !0;
-    }), yn(e.spec, e.data).then((f) => {
-      const u = i();
-      if (c || !f || !u) return;
-      a()?.destroy(), u.innerHTML = "";
-      const o = Ot(f, u);
-      o.onFocusChange((d) => {
+  return P(() => {
+    let o = !1;
+    H(() => {
+      o = !0;
+    }), kn(e.spec, e.data).then((f) => {
+      const d = i();
+      if (o || !f || !d) return;
+      a()?.destroy(), d.innerHTML = "";
+      const u = qt(f, d);
+      u.onFocusChange((c) => {
         if (s) return;
-        const m = o.fullPredicate(d);
-        "and" in m && m.and.length > 0 ? t.setSelection({
+        const p = u.fullPredicate(c);
+        "and" in p && p.and.length > 0 ? n.setSelection({
           source: "text-navigation",
-          predicate: m
-        }) : t.setSelection({
+          predicate: p
+        }) : n.setSelection({
           source: "text-navigation",
           predicate: void 0
         });
-      }), o.onSelectionChange((d) => {
-        t.setSelection({
+      }), u.onSelectionChange((c) => {
+        n.setSelection({
           source: "text-filter",
-          predicate: d
+          predicate: c
         });
-      }), l(o);
+      }), l(u);
     });
-  }), N(() => {
-    const c = n(), f = a();
-    c && f && c.source === "visualization" && (s = !0, f.setSelection(c.predicate ?? {
+  }), P(() => {
+    const o = t(), f = a();
+    o && f && o.source === "visualization" && (s = !0, f.setSelection(o.predicate ?? {
       and: []
     }), queueMicrotask(() => {
       s = !1;
     }));
-  }), Y(() => {
+  }), H(() => {
     a()?.destroy();
   }), (() => {
-    var c = An();
-    return ke(r, c), c;
+    var o = In();
+    return Ne(r, o), o;
   })();
 }
-const ft = Z();
-function Tn(e) {
-  const [n] = re(), t = () => ({
+const bt = Y();
+function jn(e) {
+  const [t] = se(), n = () => ({
     activeUnitName: void 0,
     selection: void 0
-  }), [i, r] = ge(t());
+  }), [i, r] = ye(n());
   let a = null;
-  N(() => {
-    const s = n();
+  P(() => {
+    const s = t();
     s && s.source !== "sonification" && l.setSelection(s.predicate);
   });
   const l = {
@@ -559,609 +662,701 @@ function Tn(e) {
     setSelection: (s) => {
       r("selection", s);
     },
-    registerPlayCallback: (s, c = !1) => {
-      (c || a === null) && (a = s);
+    registerPlayCallback: (s, o = !1) => {
+      (o || a === null) && (a = s);
     },
     triggerPlay: () => {
       a?.();
     }
   };
-  return p(ft.Provider, {
+  return S(bt.Provider, {
     value: [i, l],
     get children() {
       return e.children;
     }
   });
 }
-function ve() {
-  const e = Q(ft);
+function be() {
+  const e = X(bt);
   if (e === void 0)
     throw new Error("useSonificationRuntime must be used within a SonificationRuntimeProvider");
   return e;
 }
-const K = (e, n) => Array.isArray(e) ? e.length === 2 && (n.type === "quantitative" || n.type === "temporal") ? e.map((t) => K(t, n)).join("–") : xe(e.map((t) => K(t, n))) : Xt(e, n);
-function Fe(e, n) {
-  return e.filter((t) => Wt(t, n));
-}
-const kn = "umwelt", xn = 1, _n = {
+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 = {
   muted: !1,
   speakAxisTicks: !0,
   speechRate: 50,
   playbackRate: 1
-}, mt = () => new Zt(kn, xn), gt = () => mt().read(), le = (e) => {
-  const n = gt() ?? _n;
-  mt().write({
-    ...n,
+}, wt = () => new rn(qn, Mn), Et = () => wt().read(), de = (e) => {
+  const t = Et() ?? Bn;
+  wt().write({
+    ...t,
     ...e
   });
-}, He = (e, n, t) => Math.min(Math.max(e, n), t), Je = ["triangle", "sawtooth", "square", "sine"], Nn = (e) => Je[e % Je.length], De = "default", Ue = 0.1;
-let G = null;
-const ie = 120, pt = Z();
-function Pn(e) {
-  const n = /* @__PURE__ */ new Map(), t = {
+}, Qe = (e, t, n) => Math.min(Math.max(e, t), n), zn = {
+  // clean triangle beep — the historical default; most pitch-legible source
+  pure: {
+    create: () => new $.Synth({
+      oscillator: {
+        type: "triangle"
+      },
+      envelope: {
+        attack: 0.01,
+        decay: 0,
+        sustain: 1,
+        release: 0.01
+      }
+    }),
+    gainTrim: 0
+  },
+  // buzzy sawtooth: bright, fast attack, no inharmonicity
+  bright: {
+    create: () => new $.Synth({
+      oscillator: {
+        type: "sawtooth"
+      },
+      envelope: {
+        attack: 0.01,
+        decay: 0,
+        sustain: 1,
+        release: 0.05
+      }
+    }),
+    gainTrim: -6
+  },
+  // clarinet-ish square with a slow attack (breaks the saw/square confusion by
+  // differing on attack as well as spectrum)
+  hollow: {
+    create: () => new $.Synth({
+      oscillator: {
+        type: "square"
+      },
+      envelope: {
+        attack: 0.08,
+        decay: 0,
+        sustain: 1,
+        release: 0.05
+      }
+    }),
+    gainTrim: -8
+  },
+  // electric bell: FM with inharmonic partials, fast attack
+  bell: {
+    create: () => new $.FMSynth({
+      harmonicity: 3.01,
+      modulationIndex: 12,
+      oscillator: {
+        type: "sine"
+      },
+      envelope: {
+        attack: 5e-3,
+        decay: 0,
+        sustain: 1,
+        release: 0.1
+      },
+      modulation: {
+        type: "sine"
+      },
+      modulationEnvelope: {
+        attack: 5e-3,
+        decay: 0,
+        sustain: 1,
+        release: 0.1
+      }
+    }),
+    gainTrim: -2
+  },
+  // reedy AM tone: amplitude-modulation roughness, medium attack
+  reed: {
+    create: () => new $.AMSynth({
+      harmonicity: 2,
+      oscillator: {
+        type: "square"
+      },
+      envelope: {
+        attack: 0.06,
+        decay: 0,
+        sustain: 1,
+        release: 0.05
+      },
+      modulation: {
+        type: "square"
+      },
+      modulationEnvelope: {
+        attack: 0.06,
+        decay: 0,
+        sustain: 1,
+        release: 0.05
+      }
+    }),
+    // AM output reads quieter by ear than the amplitude suggests; lifted from -6,
+    // and again to 0 as it still read a touch under bell/strings.
+    gainTrim: 0
+  },
+  // detuned-unison pad: chorus/beating flux, slow attack
+  strings: {
+    create: () => new $.Synth({
+      oscillator: {
+        type: "fatsawtooth",
+        count: 3,
+        spread: 20
+      },
+      envelope: {
+        attack: 0.15,
+        decay: 0,
+        sustain: 1,
+        release: 0.2
+      }
+    }),
+    gainTrim: -7
+  }
+}, et = ["pure", "bell", "bright", "reed", "hollow", "strings"], Gn = (e) => et[e % et.length], ke = "default", ne = 0.1;
+let M = null;
+const ae = 120, Ut = Y();
+function Kn(e) {
+  const t = /* @__PURE__ */ new Map(), n = {
     attack: 0.01,
     decay: 0,
     sustain: 1,
     release: 0.01
-  }, i = (o, d = "triangle") => {
-    let m = n.get(o);
-    if (!m) {
-      const v = new R.Synth({
-        oscillator: {
-          type: d
-        },
-        envelope: t
-      }).toDestination(), w = new R.NoiseSynth({
+  }, i = (c) => {
+    c.synth.dispose(), c.noiseSynth.dispose(), c.noiseGain.dispose(), c.panner.dispose();
+  }, 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({
         noise: {
           type: "pink"
         },
-        envelope: t
-      }), b = new R.Gain(0.3).toDestination();
-      w.connect(b), m = {
-        synth: v,
-        noiseSynth: w,
-        noiseGain: b,
+        envelope: n
+      }), T = new $.Gain(0.3);
+      C.connect(T), T.connect(O), m = {
+        synth: V,
+        noiseSynth: C,
+        noiseGain: T,
+        panner: O,
+        instrument: y,
+        gainTrim: w.gainTrim,
         isSynthPlaying: !1,
         isNoisePlaying: !1
-      }, n.set(o, m);
+      }, t.set(c, m);
     }
     return m;
-  }, r = (o) => {
-    o.synth.triggerRelease(), o.noiseSynth.triggerRelease(), o.isSynthPlaying = !1, o.isNoisePlaying = !1;
+  }, a = (c) => {
+    c.synth.triggerRelease(), c.noiseSynth.triggerRelease(), c.isSynthPlaying = !1, c.isNoisePlaying = !1;
   };
-  N(() => {
-    const o = () => {
+  P(() => {
+    const c = () => {
       document.hidden && u.stopTransport();
     };
-    document.addEventListener("visibilitychange", o), Y(() => {
-      document.removeEventListener("visibilitychange", o), n.forEach((d) => {
-        d.synth.dispose(), d.noiseSynth.dispose(), d.noiseGain.dispose();
-      }), n.clear(), G === f && (G = null, R.getTransport().cancel(), R.getTransport().stop());
+    document.addEventListener("visibilitychange", c), H(() => {
+      document.removeEventListener("visibilitychange", c), t.forEach(i), t.clear(), M === d && (M = null, $.getTransport().cancel(), $.getTransport().stop());
     });
   });
-  const a = () => {
-    const o = gt();
+  const l = () => {
+    const c = Et();
     return {
-      transport: R.getTransport(),
-      muted: o?.muted ?? !1,
-      speakAxisTicks: o?.speakAxisTicks ?? !0,
-      speechRate: o?.speechRate ?? 50,
-      playbackRate: o?.playbackRate ?? 1,
+      transport: $.getTransport(),
+      muted: c?.muted ?? !1,
+      speakAxisTicks: c?.speakAxisTicks ?? !0,
+      speechRate: c?.speechRate ?? 50,
+      playbackRate: c?.playbackRate ?? 1,
       pauseBetweenSections: 0.25,
       isPlaying: !1
     };
-  }, [l, s] = ge(a());
-  N(() => {
-    l.transport.bpm.value = ie * l.playbackRate;
+  }, [s, o] = ye(l());
+  P(() => {
+    s.transport.bpm.value = ae * s.playbackRate;
   });
-  const c = () => {
-    s((o) => ({
-      ...o,
+  const f = () => {
+    o((c) => ({
+      ...c,
       isPlaying: !1
-    })), speechSynthesis.cancel(), R.getTransport().pause(), u.releaseSynth();
-  }, f = {
-    deactivate: c
+    })), speechSynthesis.cancel(), $.getTransport().pause(), u.releaseSynth();
+  }, d = {
+    deactivate: f
   }, u = {
     startAudioContext: async () => {
-      await R.start(), i(De);
+      await $.start(), r(ke);
     },
-    ensureVoice: (o, d) => {
-      i(o, d);
+    ensureVoice: (c, p) => {
+      r(c, p);
     },
-    setMuted: (o) => {
-      le({
-        muted: o
-      }), s((d) => ({
-        ...d,
-        muted: o
-      })), R.getDestination().mute = o;
+    setMuted: (c) => {
+      de({
+        muted: c
+      }), o((p) => ({
+        ...p,
+        muted: c
+      })), $.getDestination().mute = c;
     },
-    setSpeakAxisTicks: (o) => {
-      le({
-        speakAxisTicks: o
-      }), s((d) => ({
-        ...d,
-        speakAxisTicks: o
-      })), o || (speechSynthesis.cancel(), l.isPlaying && R.getTransport().start());
+    setSpeakAxisTicks: (c) => {
+      de({
+        speakAxisTicks: c
+      }), o((p) => ({
+        ...p,
+        speakAxisTicks: c
+      })), c || (speechSynthesis.cancel(), s.isPlaying && $.getTransport().start());
     },
-    setSpeechRate: (o) => {
-      const d = He(o, 1, 100);
-      le({
-        speechRate: o
-      }), s((m) => ({
+    setSpeechRate: (c) => {
+      const p = Qe(c, 1, 100);
+      de({
+        speechRate: c
+      }), o((m) => ({
         ...m,
-        speechRate: d
+        speechRate: p
       }));
     },
-    setPlaybackRate: (o) => {
-      const d = He(o, 0.1, 4);
-      le({
-        playbackRate: d
-      }), s((m) => ({
+    setPlaybackRate: (c) => {
+      const p = Qe(c, 0.1, 4);
+      de({
+        playbackRate: p
+      }), o((m) => ({
         ...m,
-        playbackRate: d
+        playbackRate: p
       }));
     },
     startTransport: async () => {
-      G && G !== f && G.deactivate(), G = f, s((o) => ({
-        ...o,
+      M && M !== d && M.deactivate(), M = d, o((c) => ({
+        ...c,
         isPlaying: !0
-      })), R.getTransport().start();
+      })), $.getTransport().start();
     },
     stopTransport: () => {
-      c(), G === f && (G = null);
+      f(), M === d && (M = null);
     },
-    playNote: (o, d = De) => {
-      const m = i(d);
-      if (m.noiseSynth.triggerRelease(), m.synth.triggerRelease(), m.isSynthPlaying = !1, m.isNoisePlaying = !1, !o.rest)
-        if (o.pitch) {
-          m.synth.volume.value = o.volume;
-          const v = R.Frequency(o.pitch, "midi").toFrequency();
-          m.synth.triggerAttackRelease(v, o.duration);
+    playNote: (c, p = ke) => {
+      const m = r(p);
+      if (m.noiseSynth.triggerRelease(), m.synth.triggerRelease(), m.isSynthPlaying = !1, m.isNoisePlaying = !1, !c.rest)
+        if (m.panner.pan.value = c.pan, c.pitch) {
+          m.synth.volume.value = c.volume + m.gainTrim;
+          const y = $.Frequency(c.pitch, "midi").toFrequency();
+          m.synth.triggerAttackRelease(y, c.duration);
         } else
-          m.noiseSynth.volume.value = o.volume, m.noiseSynth.triggerAttackRelease(o.duration);
+          m.noiseSynth.volume.value = c.volume, m.noiseSynth.triggerAttackRelease(c.duration);
     },
-    startOrRampSynth: (o, d = De) => {
-      const m = i(d);
-      if (o.rest) {
-        r(m);
+    startOrRampSynth: (c, p = ke) => {
+      const m = r(p);
+      if (c.rest) {
+        a(m);
         return;
       }
-      if (o.pitch) {
+      if (c.pitch) {
         m.noiseSynth.triggerRelease(), m.isNoisePlaying = !1;
-        const v = R.Frequency(o.pitch, "midi").toFrequency();
-        m.isSynthPlaying ? (m.synth.volume.rampTo(o.volume, Ue), m.synth.frequency.rampTo(v, Ue)) : (m.synth.volume.value = o.volume, m.isSynthPlaying = !0, m.synth.triggerAttack(v));
+        const y = $.Frequency(c.pitch, "midi").toFrequency();
+        m.isSynthPlaying ? (m.synth.volume.rampTo(c.volume + m.gainTrim, ne), m.synth.frequency.rampTo(y, ne), m.panner.pan.rampTo(c.pan, ne)) : (m.synth.volume.value = c.volume + m.gainTrim, m.panner.pan.value = c.pan, m.isSynthPlaying = !0, m.synth.triggerAttack(y));
       } else
-        m.synth.triggerRelease(), m.isSynthPlaying = !1, m.isNoisePlaying ? m.noiseSynth.volume.rampTo(o.volume, Ue) : (m.noiseSynth.volume.value = o.volume, m.isNoisePlaying = !0, m.noiseSynth.triggerAttack());
+        m.synth.triggerRelease(), m.isSynthPlaying = !1, m.isNoisePlaying ? (m.noiseSynth.volume.rampTo(c.volume, ne), m.panner.pan.rampTo(c.pan, ne)) : (m.noiseSynth.volume.value = c.volume, m.panner.pan.value = c.pan, m.isNoisePlaying = !0, m.noiseSynth.triggerAttack());
     },
-    releaseSynth: (o) => {
-      if (o !== void 0) {
-        const d = n.get(o);
-        d && r(d);
+    releaseSynth: (c) => {
+      if (c !== void 0) {
+        const p = t.get(c);
+        p && a(p);
       } else
-        n.forEach(r);
+        t.forEach(a);
     }
   };
-  return p(pt.Provider, {
-    value: [l, u],
+  return S(Ut.Provider, {
+    value: [s, u],
     get children() {
       return e.children;
     }
   });
 }
-function ee() {
-  const e = Q(pt);
+function Z() {
+  const e = X(Ut);
   if (e === void 0)
     throw new Error("useSonificationRuntime must be used within a SonificationRuntimeProvider");
   return e;
 }
-function vt(e, n, t) {
-  const i = $(e, t);
-  if (!i) return;
-  const r = i.encodings.find((o) => o.property === "x" || o.property === "y");
-  if (!r) return;
-  const a = e.visual.units.find((o) => o.name === r.unit), l = a?.encoding[r.property];
-  if (!a || !l) return;
-  const s = P(i, l), c = a.mark === "point" && s.type === "quantitative" ? !1 : s.scale?.zero, f = Array.isArray(s.scale?.domain) ? s.scale?.domain : void 0, u = {
-    field: t,
-    type: s.type,
-    bin: !!s.bin,
-    timeUnit: s.timeUnit,
-    scaleZero: c,
-    scaleDomain: f,
-    // vega-lite sorts discrete scales ascending unless told otherwise
-    sort: s.sort === void 0 ? "ascending" : s.sort
-  };
-  return Bt(n, u);
-}
-function Oe(e, n, t, i) {
-  const r = {};
-  for (const a of i)
-    if (a.bin && a.type === "quantitative" && !(a.field in r)) {
-      const l = { field: a.field, type: a.type };
-      let s = Lt(l, t, vt(e, n, a.field));
-      if (s.length === 0) {
-        let c = 1 / 0, f = -1 / 0;
-        for (const u of t) {
-          const o = u[a.field];
-          if (o == null) continue;
-          const d = Number(o);
-          isNaN(d) || (d < c && (c = d), d > f && (f = d));
-        }
-        c <= f && (s = [[c, f]]);
-      }
-      r[a.field] = s;
-    }
-  return r;
-}
-const ht = Z(), Fn = {
+const At = Y(), Hn = {
   pitch: [48, 84],
   // in MIDI. Three octaves from C3 to C6
   duration: [0.25, 1],
   // in seconds
-  volume: [-20, 0]
+  volume: [-20, 0],
   // in decibels
-}, Ye = {
+  // stereo position. ±0.9 rather than ±1 so the extremes stay unambiguously
+  // 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 = {
   pitch: 60,
   // MIDI C4 middle C. We encode in MIDI because linear interpolations in Hz are not perceptually linear
   duration: 0.2,
   // seconds
-  volume: -10
+  volume: -10,
   // dB
+  pan: 0
+  // center
 };
-function Ae(e, n, t, i) {
-  const r = t.encoding[i];
+function Jn(e, t, n) {
+  if (t.length === e.length) {
+    const a = on().domain(e).range(t);
+    return (l) => a(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];
+}
+function fe(e, t, n, i) {
+  const r = n.encoding[i];
   if (!r)
-    return () => Ye[i];
-  const a = $(e, r.field);
+    return () => tt[i];
+  const a = D(e, r.field);
   if (!a)
-    return console.warn(`Field ${r.field} not found in spec`), () => Ye[i];
-  const l = P(a, r);
+    return console.warn(`Field ${r.field} not found in spec`), () => tt[i];
+  const l = _(a, r);
   let s = l.scale?.domain;
   if (!s) {
-    const f = l.aggregate === "count" || l.aggregate === "sum", u = Pe(e, t), o = f ? _e(n, u, Oe(e, n, n, u)) : n;
+    const f = l.aggregate === "count" || l.aggregate === "sum", d = Re(e, n), u = f ? Oe(t, d, Ve(e, t, t, d)) : t;
     switch (a.type) {
       case "ordinal":
       case "nominal":
-        s = ne(l, o, f);
+        s = re(l, u, f);
         break;
       case "quantitative":
       case "temporal":
-        s = ne(l, o, f), s = [s[0], s[s.length - 1]];
+        s = re(l, u, f), s = [s[0], s[s.length - 1]];
         break;
       default:
         throw new Error(`Unsupported field type ${l.type}`);
     }
   }
-  const c = l.scale?.range || Fn[i];
+  const o = l.scale?.range || Hn[i];
   switch (l.type) {
     case "ordinal":
     case "nominal":
-      return tn().domain(s).range(c);
+      return Jn(s, o, i);
     case "quantitative":
-      return en().domain(s).range(c);
+      return sn().domain(s).range(o);
     case "temporal":
-      return Qt().domain(s).range(c);
+      return an().domain(s).range(o);
     default:
       throw new Error(`Unsupported field type ${l.type}`);
   }
 }
-function yt(e, n, t) {
+function Dt(e, t, n) {
   return {
-    pitch: Ae(e, n, t, "pitch"),
-    duration: Ae(e, n, t, "duration"),
-    volume: Ae(e, n, t, "volume")
+    pitch: fe(e, t, n, "pitch"),
+    duration: fe(e, t, n, "duration"),
+    volume: fe(e, t, n, "volume"),
+    pan: fe(e, t, n, "pan")
   };
 }
-function St(e, n, t) {
-  return vt(e, n, t) ?? [];
+function $t(e, t, n) {
+  return yt(e, t, n) ?? [];
 }
-function On(e) {
-  const n = (r) => St(e.spec, e.data, r.field), t = yt(e.spec, e.data, e.audioUnitSpec), i = {
-    getAxisTicks: n
+function Wn(e) {
+  const t = (r) => $t(e.spec, e.data, r.field), n = Dt(e.spec, e.data, e.audioUnitSpec), i = {
+    getAxisTicks: t
   };
-  return p(ht.Provider, {
-    value: [t, i],
+  return S(At.Provider, {
+    value: [n, i],
     get children() {
       return e.children;
     }
   });
 }
-function Vn() {
-  const e = Q(ht);
+function Yn() {
+  const e = X(At);
   if (e === void 0)
     throw new Error("useSonificationRuntime must be used within a SonificationRuntimeProvider");
   return e;
 }
-const Xe = {
+const nt = {
   pitch: 60,
   // MIDI C4 middle C. We encode in MIDI because linear interpolations in Hz are not perceptually linear
   duration: 0.2,
   // seconds
-  volume: -15
+  volume: -15,
   // dB
+  pan: 0
+  // center
 };
-function $e(e, n, t, i, r) {
-  if (!t)
-    return Xe[e];
-  const a = $(n, t.field);
+function me(e, t, n, i, r) {
+  if (!n)
+    return nt[e];
+  const a = D(t, n.field);
   if (!a)
-    return Xe[e];
-  const l = P(a, t), s = pe(l);
+    return nt[e];
+  const l = _(a, n), s = Se(l);
   return i(r[0][s]);
 }
-const Ve = (e, n) => e.audioUnitSpec.traversal.find((t) => t.field === n);
-function he(e, n, t) {
-  const i = $(e.spec, n), r = P(i, Ve(e, n)), a = e.fieldDomains[n];
+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];
   if (r.bin && !r.aggregate) {
-    const [l, s] = st(r), c = a[t], f = e.derivedData.find((u) => u[l] === c)?.[s] ?? null;
-    return [c, f];
+    const [l, s] = mt(r), o = a[n], f = e.derivedData.find((d) => d[l] === o)?.[s] ?? null;
+    return [o, f];
   } else
-    return a[t];
+    return a[n];
 }
-function bt(e, n) {
+function Tt(e, t) {
   return {
-    and: Object.entries(n).map(([t, i]) => {
-      const r = he(e, t, i), a = e.fieldDomains[t].length - 1;
+    and: Object.entries(t).map(([n, i]) => {
+      const r = we(e, n, i), a = e.fieldDomains[n].length - 1;
       return Array.isArray(r) ? {
-        field: t,
+        field: n,
         range: r,
         inclusiveLeft: !0,
         inclusiveRight: i === a
       } : {
-        field: t,
+        field: n,
         equal: r
       };
     })
   };
 }
-function Te(e, n) {
-  const t = {
-    and: Object.entries(n).map(([i, r]) => {
-      const a = e.fieldDomains[i][r], l = $(e.spec, i);
+function _e(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 = P(l, Ve(e, i));
+      const s = _(l, Le(e, i));
       return {
-        field: pe(s),
-        equal: jt(a, l)
+        field: Se(s),
+        equal: Ht(a, l)
       };
     })
   };
-  return Fe(e.derivedData, t);
+  return Ie(e.derivedData, n);
 }
-function Rn(e, n) {
-  const t = e.audioUnitSpec.encoding;
+function Xn(e, t) {
+  const n = e.audioUnitSpec.encoding;
   return {
-    pitch: n.length ? $e("pitch", e.spec, t.pitch, e.scales.pitch, n) : void 0,
-    volume: $e("volume", e.spec, t.volume, e.scales.volume, n),
-    duration: $e("duration", e.spec, t.duration, e.scales.duration, n)
+    pitch: t.length ? me("pitch", e.spec, n.pitch, e.scales.pitch, t) : void 0,
+    volume: me("volume", e.spec, n.volume, e.scales.volume, t),
+    duration: me("duration", e.spec, n.duration, e.scales.duration, t),
+    pan: me("pan", e.spec, n.pan, e.scales.pan, t)
   };
 }
-function Cn(e, n) {
-  const t = Object.entries(n).map(([r, a]) => a === e.fieldDomains[r].length - 1 ? 1 : 0).reverse();
+function Zn(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 t)
+  for (let r of n)
     if (r)
       i++;
     else break;
   return i;
 }
-function In(e) {
+function Qn(e) {
   if (e.audioUnitSpec.traversal.length === 0)
     return !1;
-  const n = e.audioUnitSpec.traversal[e.audioUnitSpec.traversal.length - 1].field, t = $(e.spec, n);
-  return t?.type === "quantitative" || t?.type === "temporal";
+  const t = e.audioUnitSpec.traversal[e.audioUnitSpec.traversal.length - 1].field, n = D(e.spec, t);
+  return n?.type === "quantitative" || n?.type === "temporal";
 }
-function Ln(e) {
-  const n = e.audioUnitSpec.traversal.map((r) => r.field), t = n.map((r) => Array.from({ length: e.fieldDomains[r].length }, (a, l) => l));
-  return nn(t).map((r) => {
+function ei(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[n[s]] = l;
+      a[t[s]] = l;
     }), a;
   });
 }
-function jn(e, n, t, i) {
-  if (!t)
+function ti(e, t, n, i) {
+  if (!n)
     return !0;
   if (i.bin || i.type === "nominal" || i.type === "ordinal")
-    return n[i.field] !== t[i.field];
-  const r = e.axisTicks[i.field] ?? [], a = Te(e, n), l = Te(e, t);
+    return t[i.field] !== n[i.field];
+  const r = e.axisTicks[i.field] ?? [], a = _e(e, t), l = _e(e, n);
   if (a.length && l.length) {
-    const s = pe(i), c = a[0][s], f = l[0][s];
-    if (c && f) {
-      const u = r.findIndex((d, m) => {
-        const v = d instanceof Date ? d.getTime() : d, w = r[m + 1], b = w instanceof Date ? w.getTime() : w;
-        return v && c >= v && c < (b || 1 / 0);
-      }), o = r.findIndex((d, m) => {
-        const v = d instanceof Date ? d.getTime() : d, w = r[m + 1], b = w instanceof Date ? w.getTime() : w;
-        return v && f >= v && f < (b || 1 / 0);
+    const s = Se(i), o = a[0][s], f = l[0][s];
+    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;
+        return m && o >= m && o < (w || 1 / 0);
+      }), u = r.findIndex((c, p) => {
+        const m = c instanceof Date ? c.getTime() : c, y = r[p + 1], w = y instanceof Date ? y.getTime() : y;
+        return m && f >= m && f < (w || 1 / 0);
       });
-      return u !== o;
+      return d !== u;
     }
   }
   return !1;
 }
-function qn(e, n, t) {
+function ni(e, t, n) {
   const i = [];
-  return Object.entries(n).forEach(([r]) => {
+  return Object.entries(t).forEach(([r]) => {
     if (!e.fieldDomains[r].length) return;
-    const l = $(e.spec, r), s = P(l, Ve(e, r));
-    jn(e, n, t, s) && i.push(K(he(e, r, n[r]), s));
+    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));
   }), i.join(", ");
 }
-function Et(e) {
-  let n = 0;
-  const t = [], i = Ln(e), r = In(e);
+function kt(e) {
+  let t = 0;
+  const n = [], i = ei(e), r = Qn(e);
   let a;
   return i.forEach((l) => {
-    const s = Te(e, l), c = Rn(e, s), f = Cn(e, l), u = e.pauseBetweenSections * f;
-    t.push({
-      ...c,
-      time: n,
-      pauseAfter: u,
+    const s = _e(e, l), o = Xn(e, s), f = Zn(e, l), d = e.pauseBetweenSections * f;
+    n.push({
+      ...o,
+      time: t,
+      pauseAfter: d,
       ramp: r,
       rest: s.length === 0,
       state: l,
-      speakBefore: qn(e, l, a)
-    }), n += c.duration + u, a = l;
-  }), t;
+      speakBefore: ni(e, l, a)
+    }), t += o.duration + d, a = l;
+  }), n;
 }
-function Mn(e) {
+function ii(e) {
   if (!e.length) return [];
-  const n = e[0].notes.length, t = [];
+  const t = e[0].notes.length, n = [];
   let i = 0;
-  for (let r = 0; r < n; 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], c = s.pauseAfter ?? 0;
-    t.push({
+  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;
+    n.push({
       state: s.state,
       time: i,
       slotDuration: l,
-      pauseAfter: c,
+      pauseAfter: o,
       speakBefore: s.speakBefore,
       ramp: s.ramp,
       notes: a
-    }), i += l + c;
+    }), i += l + o;
   }
-  return t;
+  return n;
 }
-function wt(e) {
-  return xe(
-    Object.entries(e.audioUnitSpec.encoding).map(([n, t]) => t ? `${J(P($(e.spec, t.field), t))} as ${n}` : "").filter((n) => n)
+function xt(e) {
+  return Pe(
+    Object.entries(e.audioUnitSpec.encoding).map(([t, n]) => n ? `${K(_(D(e.spec, n.field), n))} as ${t}` : "").filter((t) => t)
   );
 }
-function Dt(e) {
+function _t(e) {
   if (!e.audioUnitSpec.traversal.length)
     return "";
-  const n = e.audioUnitSpec.traversal[e.audioUnitSpec.traversal.length - 1], t = $(e.spec, n.field), i = P(t, n);
+  const t = e.audioUnitSpec.traversal[e.audioUnitSpec.traversal.length - 1], n = D(e.spec, t.field), i = _(n, t);
   let r;
-  i.bin ? r = dn(i, e.derivedData) : r = e.fieldDomains[n.field];
+  i.bin ? r = bn(i, e.derivedData) : r = e.fieldDomains[t.field];
   let a = "";
-  r.length > 1 ? a = `${J(i)} from ${K(r[0], i)} to ${K(r[r.length - 1], i)}` : r.length === 1 ? a = `${J(i)} equals ${K(r[0], i)}` : a = J(i);
+  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 c = $(e.spec, s.field);
-    return J(P(c, s));
+    const o = D(e.spec, s.field);
+    return K(_(o, s));
   });
-  return l.length && (a += ` for each ${xe(l)}`), a;
+  return l.length && (a += ` for each ${Pe(l)}`), a;
 }
-const Re = Z();
-function Bn(e) {
-  const [n, t] = re(), [i, r] = Vn(), [a, l] = ve(), [s, c] = ee(), [f, u] = O(), o = () => {
-    const E = speechSynthesis.getVoices(), S = E.find((g) => g.name === "Samantha"), T = E.find((g) => g.localService && g.default), D = E.find((g) => g.default);
-    u(S ?? T ?? D);
+const je = Y();
+function ri(e) {
+  const [t, n] = se(), [i, r] = Yn(), [a, l] = be(), [s, o] = Z(), [f, d] = R(), 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);
   };
-  o(), speechSynthesis.addEventListener("voiceschanged", o), Y(() => speechSynthesis.removeEventListener("voiceschanged", o));
-  const d = () => ({
+  u(), speechSynthesis.addEventListener("voiceschanged", u), H(() => speechSynthesis.removeEventListener("voiceschanged", u));
+  const c = () => ({
     traversalState: Object.fromEntries(e.audioUnitSpec.traversal.map((E) => [E.field, 0]))
-  }), [m, v] = ge(d()), w = _(() => Pe(e.spec, e.audioUnitSpec)), b = _(() => a.selection ? Fe(e.data, a.selection) : e.data), L = _(() => Oe(e.spec, e.data, b(), w())), C = _(() => _e(b(), w(), L())), F = _(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
-    const S = $(e.spec, E.field), T = P(S, E), D = ne(T, C(), !0);
-    return [E.field, D];
-  }))), I = _(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
-    const S = $(e.spec, E.field), T = P(S, E);
-    return [E.field, r.getAxisTicks(T)];
-  }))), B = _(() => ({
+  }), [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);
+    return [E.field, v];
+  }))), Ue = k(() => Object.fromEntries(e.audioUnitSpec.traversal.map((E) => {
+    const b = D(e.spec, E.field), g = _(b, E);
+    return [E.field, r.getAxisTicks(g)];
+  }))), q = k(() => ({
     spec: e.spec,
     audioUnitSpec: e.audioUnitSpec,
-    derivedData: C(),
-    fieldDomains: F(),
-    axisTicks: I(),
+    derivedData: T(),
+    fieldDomains: z(),
+    axisTicks: Ue(),
     scales: i,
     pauseBetweenSections: s.pauseBetweenSections
-  })), ae = _(() => Et(B())), se = (E, S) => he(B(), E, S), oe = _(() => bt(B(), m.traversalState)), Se = (E) => ae().find((S) => Object.entries(E).every(([T, D]) => S.state[T] === D));
-  N(() => {
+  })), 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));
+  P(() => {
     if (s.isPlaying) {
-      const E = oe();
-      t.setSelection({
+      const E = Q();
+      n.setSelection({
         source: "sonification",
         predicate: E
       });
     }
-  }), N((E) => {
-    const S = F(), T = {
-      ...m.traversalState
+  }), P((E) => {
+    const b = z(), g = {
+      ...p.traversalState
     };
-    let D = !1;
-    const g = {
-      ...T
+    let v = !1;
+    const h = {
+      ...g
     };
-    return Object.entries(S).forEach(([h, y]) => {
-      const U = T[h], j = (E?.[h] ?? y)[U];
-      if (j !== void 0) {
-        const z = y.findIndex((ce) => ce === j);
-        z !== U && (g[h] = z !== -1 ? z : 0, D = !0);
+    return Object.entries(b).forEach(([U, F]) => {
+      const I = g[U], te = (E?.[U] ?? F)[I];
+      if (te !== void 0) {
+        const le = F.findIndex((ue) => ue === te);
+        le !== I && (h[U] = le !== -1 ? le : 0, v = !0);
       }
-    }), D && (v((h) => ({
-      ...h,
-      traversalState: g
-    })), a.activeUnitName === e.audioUnitSpec.name && H.setupTransportSequence()), S;
-  }), N((E) => (E !== e.audioUnitSpec && H.setupTransportSequence(), e.audioUnitSpec));
-  const H = {
-    setTraversalIndex: (E, S) => {
-      c.stopTransport(), v((g) => ({
-        ...g,
+    }), v && (m((U) => ({
+      ...U,
+      traversalState: h
+    })), a.activeUnitName === e.audioUnitSpec.name && G.setupTransportSequence()), b;
+  }), P((E) => (E !== e.audioUnitSpec && G.setupTransportSequence(), e.audioUnitSpec));
+  const G = {
+    setTraversalIndex: (E, b) => {
+      o.stopTransport(), m((h) => ({
+        ...h,
         traversalState: {
-          ...g.traversalState,
-          [E]: S
+          ...h.traversalState,
+          [E]: b
         }
-      })), a.activeUnitName === e.audioUnitSpec.name && (l.setActiveUnit(e.audioUnitSpec.name), H.setupTransportSequence());
-      const T = oe();
-      t.setSelection({
+      })), a.activeUnitName === e.audioUnitSpec.name && (l.setActiveUnit(e.audioUnitSpec.name), G.setupTransportSequence());
+      const g = Q();
+      n.setSelection({
         source: "sonification",
-        predicate: T
+        predicate: g
       });
-      const D = Se(m.traversalState);
-      D && (s.transport.seconds = D.time, c.playNote(D));
+      const v = ce(p.traversalState);
+      v && (o.ensureVoice(y(), w()), s.transport.seconds = v.time, o.playNote(v, y()));
     },
-    getTraversalIndex: (E) => m.traversalState[E],
+    getTraversalIndex: (E) => p.traversalState[E],
     setupTransportSequence: () => {
-      s.transport.cancel(), s.transport.bpm.value = ie;
-      const E = ae();
-      E.forEach((S, T) => {
-        Object.entries(S.state).every(([D, g]) => m.traversalState[D] === g) && (s.transport.seconds = S.time), s.transport.schedule(() => {
+      s.transport.cancel(), o.ensureVoice(y(), w()), s.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)
-            if (v((D) => ({
-              ...D,
-              traversalState: S.state
-            })), S.speakBefore && s.speakAxisTicks && !s.muted) {
-              s.transport.pause(), c.releaseSynth(), speechSynthesis.cancel();
-              const D = new SpeechSynthesisUtterance(S.speakBefore);
-              D.voice = f() ?? null, D.rate = s.speechRate / 25, D.onend = () => {
-                s.isPlaying && (S.ramp ? c.startOrRampSynth(S) : c.playNote(S), s.transport.start());
-              }, speechSynthesis.speak(D);
+            if (m((v) => ({
+              ...v,
+              traversalState: b.state
+            })), b.speakBefore && s.speakAxisTicks && !s.muted) {
+              s.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());
+              }, speechSynthesis.speak(v);
             } else
-              S.ramp ? c.startOrRampSynth(S) : c.playNote(S);
-        }, S.time), S.pauseAfter && s.transport.schedule(() => {
-          c.releaseSynth();
-        }, S.time + S.duration), T === E.length - 1 && s.transport.schedule(() => {
-          c.stopTransport();
-        }, S.time + S.duration);
-      }), s.transport.bpm.value = ie * s.playbackRate;
+              b.ramp ? o.startOrRampSynth(b, y()) : o.playNote(b, y());
+        }, b.time), b.pauseAfter && s.transport.schedule(() => {
+          o.releaseSynth(y());
+        }, b.time + b.duration), g === E.length - 1 && s.transport.schedule(() => {
+          o.stopTransport();
+        }, b.time + b.duration);
+      }), s.transport.bpm.value = ae * s.playbackRate;
     },
-    getFieldDomains: F,
-    getDerivedData: C,
+    getFieldDomains: z,
+    getDerivedData: T,
     resetTraversalIfEnd: () => {
-      const E = e.audioUnitSpec.traversal.map((D) => D.field), S = m.traversalState;
-      E.every((D) => S[D] === F()[D].length - 1) && (v(d()), s.transport.seconds = 0);
+      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);
     },
-    getDomainValue: se,
-    describeEncodings: () => wt(B()),
-    describePlaybackOrder: () => Dt(B())
+    getDomainValue: Ae,
+    describeEncodings: () => xt(q()),
+    describePlaybackOrder: () => _t(q())
   };
-  return p(Re.Provider, {
-    value: [m, H],
+  return S(je.Provider, {
+    value: [p, G],
     get children() {
       return e.children;
     }
   });
 }
-function ye() {
-  const e = Q(Re);
+function Ee() {
+  const e = X(je);
   if (e === void 0)
     throw new Error("useAudioUnitState must be used within a AudioUnitStateProvider");
   return e;
 }
-const Ut = x("div")`
+const Nt = N("div")`
   margin-bottom: 3px;
 
   label {
@@ -1174,25 +1369,25 @@ const Ut = x("div")`
   label > * {
     justify-self: start;
   }
-`, Ce = `
+`, qe = `
   font-family: monospace;
-`, At = x("div")`
+`, Ft = N("div")`
   border-left: 1px solid #ccc;
   padding-left: 1rem;
 `;
-x("form")`
+N("form")`
   display: flex;
   gap: 8px;
   margin-bottom: 8px;
 `;
-x("input")`
+N("input")`
   flex: 1;
 `;
-x("div")`
+N("div")`
   color: red;
   font-size: 14px;
 `;
-x("div")`
+N("div")`
   margin-top: 0.5rem;
   display: grid;
   grid-template-columns: 25% auto;
@@ -1202,132 +1397,132 @@ x("div")`
     margin: 0;
   }
 `;
-x("div")`
+N("div")`
   > * {
     margin-bottom: 3px;
   }
 `;
-x("div")`
+N("div")`
   display: flex;
   gap: 3px;
 `;
-x("div")`
+N("div")`
   margin-top: 1em;
 `;
-x("h4")`
-  ${Ce}
+N("h4")`
+  ${qe}
 `;
-x("div")`
-  ${Ce}
+N("div")`
+  ${qe}
 `;
-x("table")`
+N("table")`
   border: 1px solid #ccc;
-  ${Ce}
+  ${qe}
 `;
-x("button")`
+N("button")`
   margin-top: 1rem;
 `;
-x("div")`
+N("div")`
   display: flex;
   align-items: center;
   gap: 8px;
 `;
-var zn = /* @__PURE__ */ A("<select>"), Gn = /* @__PURE__ */ A("<div><input aria-live=assertive type=range min=0><span>"), Kn = /* @__PURE__ */ A("<label><span>"), Hn = /* @__PURE__ */ A("<option>");
-function $t(e) {
-  const [n, t] = ye(), [i, r] = ee(), a = () => $(e.spec, e.traversalFieldDef.field), l = () => P(a(), e.traversalFieldDef), s = () => t.getTraversalIndex(e.traversalFieldDef.field), c = (o) => {
-    r.startAudioContext(), t.setTraversalIndex(e.traversalFieldDef.field, o);
-  }, f = () => t.getFieldDomains()[e.traversalFieldDef.field], u = () => t.getDomainValue(e.traversalFieldDef.field, s());
-  return p(Ut, {
+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>");
+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) => {
+    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 o = Kn(), d = o.firstChild;
-      return k(d, () => J(l())), k(o, p(Pt, {
+      var u = oi(), c = u.firstChild;
+      return x(c, () => K(l())), x(u, S(Lt, {
         get children() {
-          return [p(je, {
+          return [S(Be, {
             get when() {
               return l().type === "nominal";
             },
             get children() {
-              var m = zn();
-              return m.$$mousedown = () => r.stopTransport(), m.addEventListener("change", (v) => c(v.target.selectedIndex)), k(m, p(te, {
+              var p = ai();
+              return p.$$mousedown = () => r.stopTransport(), p.addEventListener("change", (m) => o(m.target.selectedIndex)), x(p, S(ie, {
                 get each() {
                   return f();
                 },
-                children: (v) => (() => {
-                  var w = Hn();
-                  return k(w, () => String(v)), q(() => w.value = String(v)), w;
+                children: (m) => (() => {
+                  var y = ci();
+                  return x(y, () => String(m)), L(() => y.value = String(m)), y;
                 })()
-              })), q(() => m.value = String(u())), m;
+              })), L(() => p.value = String(d())), p;
             }
-          }), p(je, {
+          }), S(Be, {
             get when() {
               return l().type !== "nominal";
             },
             get children() {
-              var m = Gn(), v = m.firstChild, w = v.nextSibling;
-              return v.$$mousedown = () => r.stopTransport(), v.$$input = (b) => c(b.currentTarget.valueAsNumber), k(w, () => K(u(), l())), q((b) => {
-                var L = K(u(), l()), C = f().length - 1;
-                return L !== b.e && Le(v, "aria-valuetext", b.e = L), C !== b.t && Le(v, "max", b.t = C), b;
+              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;
               }, {
                 e: void 0,
                 t: void 0
-              }), q(() => v.value = s()), m;
+              }), L(() => m.value = s()), p;
             }
           })];
         }
-      }), null), o;
+      }), null), u;
     }
   });
 }
-Qe(["mousedown", "input"]);
-var Jn = /* @__PURE__ */ A("<button>Pause"), Yn = /* @__PURE__ */ A("<div>"), Xn = /* @__PURE__ */ A("<button>Play");
-function Tt(e) {
-  const [n, t] = ye(), [i, r] = ee(), [a, l] = ve();
+at(["mousedown", "input"]);
+var li = /* @__PURE__ */ A("<button>Pause"), ui = /* @__PURE__ */ A("<div>"), di = /* @__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), t.setupTransportSequence()), t.resetTraversalIfEnd(), r.startTransport();
+    r.startAudioContext(), a.activeUnitName !== e.unitName && (l.setActiveUnit(e.unitName), n.setupTransportSequence()), n.resetTraversalIfEnd(), r.startTransport();
   }
-  return Ft(() => l.registerPlayCallback(s)), N(() => {
+  return jt(() => l.registerPlayCallback(s)), P(() => {
     a.activeUnitName === e.unitName && l.registerPlayCallback(s, !0);
   }), (() => {
-    var c = Yn();
-    return k(c, p(et, {
+    var o = ui();
+    return x(o, S(st, {
       get when() {
-        return ue(() => !!i.isPlaying)() && a.activeUnitName === e.unitName;
+        return pe(() => !!i.isPlaying)() && a.activeUnitName === e.unitName;
       },
       get fallback() {
         return (() => {
-          var f = Xn();
+          var f = di();
           return f.$$click = () => s(), f;
         })();
       },
       get children() {
-        var f = Jn();
+        var f = li();
         return f.$$click = () => r.stopTransport(), f;
       }
-    })), c;
+    })), o;
   })();
 }
-Qe(["click"]);
-var Wn = /* @__PURE__ */ A("<label> <input readonly>"), Zn = /* @__PURE__ */ A("<p><br>playing ");
-const Qn = x.div`
+at(["click"]);
+var fi = /* @__PURE__ */ A("<label> <input readonly>"), mi = /* @__PURE__ */ A("<p><br>playing ");
+const pi = N.div`
   margin-bottom: 1em;
 `;
-function ei(e) {
-  function n() {
-    return p(Qn, {
+function gi(e) {
+  function t() {
+    return S(pi, {
       get children() {
-        return p(te, {
+        return S(ie, {
           get each() {
             return Object.entries(e.audioUnitSpec.encoding);
           },
           children: ([i, r]) => {
             if (r) {
-              const a = $(e.spec, r.field);
+              const a = D(e.spec, r.field);
               if (a) {
-                const l = P(a, r);
-                return p(Ut, {
+                const l = _(a, r);
+                return S(Nt, {
                   get children() {
-                    var s = Wn(), c = s.firstChild, f = c.nextSibling;
-                    return k(s, i, c), q(() => f.value = J(l)), s;
+                    var s = fi(), o = s.firstChild, f = o.nextSibling;
+                    return x(s, i, o), L(() => f.value = K(l)), s;
                   }
                 });
               }
@@ -1337,16 +1532,16 @@ function ei(e) {
       }
     });
   }
-  function t() {
-    const [i, r] = ye();
+  function n() {
+    const [i, r] = Ee();
     return (() => {
-      var a = Zn(), l = a.firstChild;
-      return l.nextSibling, k(a, () => r.describeEncodings(), l), k(a, () => r.describePlaybackOrder(), null), a;
+      var a = mi(), l = a.firstChild;
+      return l.nextSibling, x(a, () => r.describeEncodings(), l), x(a, () => r.describePlaybackOrder(), null), a;
     })();
   }
-  return Object.keys(e.audioUnitSpec.encoding).length === 0 ? null : p(At, {
+  return Object.keys(e.audioUnitSpec.encoding).length === 0 ? null : S(Ft, {
     get children() {
-      return p(On, {
+      return S(Wn, {
         get spec() {
           return e.spec;
         },
@@ -1357,7 +1552,7 @@ function ei(e) {
           return e.audioUnitSpec;
         },
         get children() {
-          return p(Bn, {
+          return S(ri, {
             get spec() {
               return e.spec;
             },
@@ -1368,17 +1563,17 @@ function ei(e) {
               return e.audioUnitSpec;
             },
             get children() {
-              return [p(t, {}), p(n, {}), p(te, {
+              return [S(n, {}), S(t, {}), S(ie, {
                 get each() {
                   return e.audioUnitSpec.traversal;
                 },
-                children: (i) => p($t, {
+                children: (i) => S(Pt, {
                   get spec() {
                     return e.spec;
                   },
                   traversalFieldDef: i
                 })
-              }), p(Tt, {
+              }), S(Ot, {
                 get unitName() {
                   return e.audioUnitSpec.name;
                 }
@@ -1390,160 +1585,160 @@ function ei(e) {
     }
   });
 }
-function ti(e) {
-  const [n, t] = re(), [i, r] = ve(), [a, l] = ee(), [s, c] = O(), f = () => {
-    const g = speechSynthesis.getVoices(), h = g.find((V) => V.name === "Samantha"), y = g.find((V) => V.localService && V.default), U = g.find((V) => V.default);
-    c(h ?? y ?? U);
+function vi(e) {
+  const [t, n] = se(), [i, r] = be(), [a, l] = Z(), [s, o] = R(), 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), Y(() => speechSynthesis.removeEventListener("voiceschanged", f));
-  const u = () => e.units[0], o = () => u().traversal, d = () => ({
-    traversalState: Object.fromEntries(o().map((g) => [g.field, 0]))
-  }), [m, v] = ge(d()), w = _(() => {
+  f(), speechSynthesis.addEventListener("voiceschanged", f), H(() => 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(() => {
     const g = i.selection;
-    return e.units.map((h) => {
-      const y = Pe(e.spec, h), U = g ? Fe(e.data, g) : e.data, V = Oe(e.spec, e.data, U, y), j = _e(U, y, V), z = yt(e.spec, e.data, h);
+    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);
       return {
-        unit: h,
-        derivedData: j,
-        scales: z
+        unit: v,
+        derivedData: I,
+        scales: ee
       };
     });
-  }), b = _(() => {
-    const g = w().flatMap((h) => h.derivedData);
-    return Object.fromEntries(o().map((h) => {
-      const y = $(e.spec, h.field), U = P(y, h);
-      return [h.field, ne(U, g, !0)];
+  }), 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);
+      return [v.field, re(U, g, !0)];
     }));
-  }), L = _(() => Object.fromEntries(o().map((g) => [g.field, St(e.spec, e.data, g.field)]))), C = (g, h, y) => ({
+  }), O = k(() => Object.fromEntries(u().map((g) => [g.field, $t(e.spec, e.data, g.field)]))), V = (g, v, h) => ({
     spec: e.spec,
     audioUnitSpec: g,
-    derivedData: h,
-    fieldDomains: b(),
-    axisTicks: L(),
-    scales: y,
+    derivedData: v,
+    fieldDomains: w(),
+    axisTicks: O(),
+    scales: h,
     pauseBetweenSections: a.pauseBetweenSections
-  }), F = _(() => {
-    const g = w()[0];
-    return C(g.unit, g.derivedData, g.scales);
-  }), I = _(() => w().map((g, h) => ({
+  }), C = k(() => {
+    const g = y()[0];
+    return V(g.unit, g.derivedData, g.scales);
+  }), T = k(() => y().map((g, v) => ({
     voiceId: g.unit.name,
-    oscType: Nn(h),
-    notes: Et(C(g.unit, g.derivedData, g.scales))
-  }))), B = _(() => Mn(I().map((g) => ({
+    instrument: g.unit.instrument ?? Gn(v),
+    notes: kt(V(g.unit, g.derivedData, g.scales))
+  }))), z = k(() => ii(T().map((g) => ({
     voiceId: g.voiceId,
     notes: g.notes
-  })))), ae = (g) => B().find((h) => Object.entries(g).every(([y, U]) => h.state[y] === U)), se = _(() => bt(F(), m.traversalState)), oe = () => b(), Se = (g, h) => he(F(), g, h), H = () => i.activeUnitName === e.groupName;
-  N(() => {
-    a.isPlaying && t.setSelection({
+  })))), 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;
+  P(() => {
+    a.isPlaying && n.setSelection({
       source: "sonification",
-      predicate: se()
+      predicate: q()
     });
-  }), N((g) => {
-    const h = b(), y = {
-      ...m.traversalState
+  }), P((g) => {
+    const v = w(), h = {
+      ...p.traversalState
     };
     let U = !1;
-    const V = {
-      ...y
+    const F = {
+      ...h
     };
-    return Object.entries(h).forEach(([j, z]) => {
-      const ce = y[j], Ie = (g?.[j] ?? z)[ce];
-      if (Ie !== void 0) {
-        const be = z.findIndex((xt) => xt === Ie);
-        be !== ce && (V[j] = be !== -1 ? be : 0, U = !0);
+    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);
+        De !== te && (F[I] = De !== -1 ? De : 0, U = !0);
       }
-    }), U && (v((j) => ({
-      ...j,
-      traversalState: V
-    })), H() && D.setupTransportSequence()), h;
-  }), N((g) => (g !== e.units && D.setupTransportSequence(), e.units));
-  const E = () => I().forEach(({
+    }), U && (m((I) => ({
+      ...I,
+      traversalState: F
+    })), Q() && b.setupTransportSequence()), v;
+  }), P((g) => (g !== e.units && b.setupTransportSequence(), e.units));
+  const ce = () => T().forEach(({
     voiceId: g,
-    oscType: h
-  }) => l.ensureVoice(g, h)), S = (g) => {
+    instrument: v
+  }) => l.ensureVoice(g, v)), G = (g) => {
     g.notes.forEach(({
-      voiceId: h,
-      note: y
+      voiceId: v,
+      note: h
     }) => {
-      g.ramp ? l.startOrRampSynth(y, h) : l.playNote(y, h);
+      g.ramp ? l.startOrRampSynth(h, v) : l.playNote(h, v);
     });
-  }, T = (g) => {
+  }, E = (g) => {
     g.notes.forEach(({
-      voiceId: h,
-      note: y
-    }) => l.playNote(y, h));
-  }, D = {
-    setTraversalIndex: (g, h) => {
-      l.stopTransport(), v((U) => ({
+      voiceId: v,
+      note: h
+    }) => l.playNote(h, v));
+  }, b = {
+    setTraversalIndex: (g, v) => {
+      l.stopTransport(), m((U) => ({
         ...U,
         traversalState: {
           ...U.traversalState,
-          [g]: h
+          [g]: v
         }
-      })), H() && (r.setActiveUnit(e.groupName), D.setupTransportSequence()), t.setSelection({
+      })), Q() && (r.setActiveUnit(e.groupName), b.setupTransportSequence()), n.setSelection({
         source: "sonification",
-        predicate: se()
-      }), E();
-      const y = ae(m.traversalState);
-      y && (a.transport.seconds = y.time, T(y));
+        predicate: q()
+      }), ce();
+      const h = Ue(p.traversalState);
+      h && (a.transport.seconds = h.time, E(h));
     },
-    getTraversalIndex: (g) => m.traversalState[g],
+    getTraversalIndex: (g) => p.traversalState[g],
     getFieldDomains: oe,
-    getDerivedData: () => F().derivedData,
-    getDomainValue: Se,
+    getDerivedData: () => C().derivedData,
+    getDomainValue: Ae,
     setupTransportSequence: () => {
-      a.transport.cancel(), a.transport.bpm.value = ie, E();
-      const g = B();
-      g.forEach((y) => {
-        Object.entries(y.state).every(([U, V]) => m.traversalState[U] === V) && (a.transport.seconds = y.time), a.transport.schedule(() => {
+      a.transport.cancel(), a.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)
-            if (v((U) => ({
+            if (m((U) => ({
               ...U,
-              traversalState: y.state
-            })), y.speakBefore && a.speakAxisTicks && !a.muted) {
+              traversalState: h.state
+            })), h.speakBefore && a.speakAxisTicks && !a.muted) {
               a.transport.pause(), l.releaseSynth(), speechSynthesis.cancel();
-              const U = new SpeechSynthesisUtterance(y.speakBefore);
+              const U = new SpeechSynthesisUtterance(h.speakBefore);
               U.voice = s() ?? null, U.rate = a.speechRate / 25, U.onend = () => {
-                a.isPlaying && (S(y), a.transport.start());
+                a.isPlaying && (G(h), a.transport.start());
               }, speechSynthesis.speak(U);
             } else
-              S(y);
-        }, y.time), y.pauseAfter && a.transport.schedule(() => l.releaseSynth(), y.time + y.slotDuration);
+              G(h);
+        }, h.time), h.pauseAfter && a.transport.schedule(() => l.releaseSynth(), h.time + h.slotDuration);
       });
-      const h = g[g.length - 1];
-      h && a.transport.schedule(() => l.stopTransport(), h.time + h.slotDuration), a.transport.bpm.value = ie * a.playbackRate;
+      const v = g[g.length - 1];
+      v && a.transport.schedule(() => l.stopTransport(), v.time + v.slotDuration), a.transport.bpm.value = ae * a.playbackRate;
     },
     resetTraversalIfEnd: () => {
-      const g = b();
-      o().every((y) => m.traversalState[y.field] === g[y.field].length - 1) && (v(d()), a.transport.seconds = 0);
+      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, h) => `layer ${h + 1}: ${wt(C(g, w()[h].derivedData, w()[h].scales))}`).join("; "),
-    describePlaybackOrder: () => Dt(F())
+    describeEncodings: () => e.units.map((g, v) => `layer ${v + 1}: ${xt(V(g, y()[v].derivedData, y()[v].scales))}`).join("; "),
+    describePlaybackOrder: () => _t(C())
   };
-  return p(Re.Provider, {
-    value: [m, D],
+  return S(je.Provider, {
+    value: [p, b],
     get children() {
       return e.children;
     }
   });
 }
-var ni = /* @__PURE__ */ A("<p><br>playing ");
-const We = "layer-group";
-function ii() {
-  const [e, n] = ye();
+var hi = /* @__PURE__ */ A("<p><br>playing ");
+const it = "layer-group";
+function yi() {
+  const [e, t] = Ee();
   return (() => {
-    var t = ni(), i = t.firstChild;
-    return i.nextSibling, k(t, () => n.describeEncodings(), i), k(t, () => n.describePlaybackOrder(), null), t;
+    var n = hi(), i = n.firstChild;
+    return i.nextSibling, x(n, () => t.describeEncodings(), i), x(n, () => t.describePlaybackOrder(), null), n;
   })();
 }
-function ri(e) {
-  const n = () => e.units.filter((i) => Object.keys(i.encoding).length > 0);
-  if (n().length === 0)
+function Si(e) {
+  const t = () => e.units.filter((i) => Object.keys(i.encoding).length > 0);
+  if (t().length === 0)
     return null;
-  const t = () => n()[0].traversal;
-  return p(At, {
+  const n = () => t()[0].traversal;
+  return S(Ft, {
     get children() {
-      return p(ti, {
+      return S(vi, {
         get spec() {
           return e.spec;
         },
@@ -1551,116 +1746,116 @@ function ri(e) {
           return e.data;
         },
         get units() {
-          return n();
+          return t();
         },
-        groupName: We,
+        groupName: it,
         get children() {
-          return [p(ii, {}), p(te, {
+          return [S(yi, {}), S(ie, {
             get each() {
-              return t();
+              return n();
             },
-            children: (i) => p($t, {
+            children: (i) => S(Pt, {
               get spec() {
                 return e.spec;
               },
               traversalFieldDef: i
             })
-          }), p(Tt, {
-            unitName: We
+          }), S(Ot, {
+            unitName: it
           })];
         }
       });
     }
   });
 }
-var ai = /* @__PURE__ */ A("<div><label>Playback rate <input type=number min=0.1 max=4 step=0.1 id=rate>x"), si = /* @__PURE__ */ A("<label><input type=checkbox>Speak axis ticks"), oi = /* @__PURE__ */ A("<label><input type=number min=1 max=100 step=10 id=speechRate>speech rate"), ci = /* @__PURE__ */ A("<div><label><input type=checkbox aria-live=polite>");
-const li = x.div`
+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`
   margin-top: 1rem;
-`, ui = x.div`
+`, Di = N.div`
   display: flex;
   gap: 3px;
 `;
-function di(e) {
-  const [n, t] = ee();
-  return p(li, {
+function $i(e) {
+  const [t, n] = Z();
+  return S(Ai, {
     get children() {
       return [(() => {
-        var i = ai(), r = i.firstChild, a = r.firstChild, l = a.nextSibling;
-        return l.addEventListener("change", (s) => t.setPlaybackRate(Number(s.target.value))), q(() => l.value = n.playbackRate), i;
-      })(), p(ui, {
+        var i = bi(), 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, {
         get children() {
           return [(() => {
-            var i = si(), r = i.firstChild;
-            return r.addEventListener("change", (a) => t.setSpeakAxisTicks(a.target.checked)), q(() => r.checked = n.speakAxisTicks), i;
+            var i = wi(), r = i.firstChild;
+            return r.addEventListener("change", (a) => n.setSpeakAxisTicks(a.target.checked)), L(() => r.checked = t.speakAxisTicks), i;
           })(), (() => {
-            var i = oi(), r = i.firstChild;
-            return r.addEventListener("change", (a) => t.setSpeechRate(Number(a.target.value))), q(() => r.value = n.speechRate), i;
+            var i = Ei(), r = i.firstChild;
+            return r.addEventListener("change", (a) => n.setSpeechRate(Number(a.target.value))), L(() => r.value = t.speechRate), i;
           })()];
         }
       }), (() => {
-        var i = ci(), r = i.firstChild, a = r.firstChild;
-        return a.addEventListener("change", (l) => t.setMuted(l.target.checked)), k(r, () => n.muted ? "Muted" : "Unmuted", null), q(() => a.checked = n.muted), 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;
       })()];
     }
   });
 }
-function fi() {
+function Ti() {
   const e = document.activeElement;
   if (!e) return !1;
-  const n = e.tagName.toLowerCase();
-  return n === "input" || n === "select" || n === "textarea" || e.isContentEditable;
+  const t = e.tagName.toLowerCase();
+  return t === "input" || t === "select" || t === "textarea" || e.isContentEditable;
 }
-function mi(e, n) {
-  const t = (i) => {
-    if (fi()) return;
+function ki(e, t) {
+  const n = (i) => {
+    if (Ti()) return;
     const r = e[i.key];
     r && (i.preventDefault(), r());
   };
-  N(() => {
-    const i = n ? n() : document;
-    i && (i.addEventListener("keydown", t), Y(() => i.removeEventListener("keydown", t)));
+  P(() => {
+    const i = t ? t() : document;
+    i && (i.addEventListener("keydown", n), H(() => i.removeEventListener("keydown", n)));
   });
 }
-function gi(e) {
-  const [n, t] = ee(), [i, r] = ve();
-  return mi({
+function xi(e) {
+  const [t, n] = Z(), [i, r] = be();
+  return ki({
     p: () => {
-      n.isPlaying ? t.stopTransport() : r.triggerPlay();
+      t.isPlaying ? n.stopTransport() : r.triggerPlay();
     }
   }, e.target), null;
 }
-function pi(e) {
-  const n = () => e.spec.audio.composition === "layer" && e.spec.audio.units.length > 1;
-  return p(Tn, {
+function _i(e) {
+  const t = () => e.spec.audio.composition === "layer" && e.spec.audio.units.length > 1;
+  return S(jn, {
     get children() {
-      return p(Pn, {
+      return S(Kn, {
         get children() {
-          return [p(gi, {
+          return [S(xi, {
             get target() {
               return e.keyEventTarget;
             }
-          }), p(et, {
+          }), S(st, {
             get when() {
-              return n();
+              return t();
             },
             get fallback() {
-              return p(te, {
+              return S(ie, {
                 get each() {
                   return e.spec.audio.units;
                 },
-                children: (t) => p(ei, {
+                children: (n) => S(gi, {
                   get spec() {
                     return e.spec;
                   },
                   get data() {
                     return e.data;
                   },
-                  audioUnitSpec: t
+                  audioUnitSpec: n
                 })
               });
             },
             get children() {
-              return p(ri, {
+              return S(Si, {
                 get spec() {
                   return e.spec;
                 },
@@ -1672,137 +1867,137 @@ function pi(e) {
                 }
               });
             }
-          }), p(di, {})];
+          }), S($i, {})];
         }
       });
     }
   });
 }
-var vi = /* @__PURE__ */ A("<h2>Visualization"), hi = /* @__PURE__ */ A("<h2>Description"), yi = /* @__PURE__ */ A("<h2>Sonification"), Si = /* @__PURE__ */ A('<div><div class=uw-viewer role=region aria-label="Umwelt Viewer">');
-function bi(e) {
-  const [n, t] = O();
+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();
   return (() => {
-    var i = Si(), r = i.firstChild;
-    return ke(t, r), k(r, p(wn, {
+    var i = Oi(), r = i.firstChild;
+    return Ne(n, r), x(r, S(Fn, {
       get children() {
-        return [vi(), p(Un, {
+        return [Ni(), S(Vn, {
           get spec() {
             return e.spec;
           },
           get data() {
             return e.data;
           }
-        }), hi(), p($n, {
+        }), Fi(), S(Ln, {
           get spec() {
             return e.spec;
           },
           get data() {
             return e.data;
           }
-        }), yi(), p(pi, {
+        }), Pi(), S(_i, {
           get spec() {
             return e.spec;
           },
           get data() {
             return e.data;
           },
-          keyEventTarget: n
+          keyEventTarget: t
         })];
       }
-    })), q(() => _t(i, an.Viewer)), i;
+    })), L(() => Vt(i, dn.Viewer)), i;
   })();
 }
-function Ze(e, n, t = localStorage) {
-  const i = t.getItem(e) ? JSON.parse(t.getItem(e)) : n, [r, a] = O(i);
+function rt(e, t, n = localStorage) {
+  const i = n.getItem(e) ? JSON.parse(n.getItem(e)) : t, [r, a] = R(i);
   return [r, ((s) => {
     if (s) {
-      const c = a(s);
-      return t.setItem(e, JSON.stringify(c)), c;
+      const o = a(s);
+      return n.setItem(e, JSON.stringify(o)), o;
     }
   })];
 }
-const kt = Z();
-function Ei(e) {
-  const n = e.persist !== !1, [t, i] = n ? Ze("umweltDatastore", {}) : O({}), [r, a] = n ? Ze("umweltSessionDatastore", {}, sessionStorage) : O({}), l = () => ({
-    ...t(),
+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 = () => ({
+    ...n(),
     ...r()
   }), s = {
-    setDataset: (c, f, u, o) => {
-      o?.session ? a((d) => ({
-        ...d,
-        [c]: {
+    setDataset: (o, f, d, u) => {
+      u?.session ? a((c) => ({
+        ...c,
+        [o]: {
           data: f,
-          sourceUrl: u
+          sourceUrl: d
         }
-      })) : i((d) => ({
-        ...d,
-        [c]: {
+      })) : i((c) => ({
+        ...c,
+        [o]: {
           data: f,
-          sourceUrl: d[c]?.sourceUrl || u
+          sourceUrl: c[o]?.sourceUrl || d
         }
       }));
     },
-    removeDataset: (c) => {
+    removeDataset: (o) => {
       i((f) => {
-        const u = {
+        const d = {
           ...f
         };
-        return delete u[c], u;
-      }), s.removeSessionDataset(c);
+        return delete d[o], d;
+      }), s.removeSessionDataset(o);
     },
-    removeSessionDataset: (c) => {
+    removeSessionDataset: (o) => {
       a((f) => {
-        const u = {
+        const d = {
           ...f
         };
-        return delete u[c], u;
+        return delete d[o], d;
       });
     }
   };
-  return p(kt.Provider, {
+  return S(Ct.Provider, {
     value: [l, s],
     get children() {
       return e.children;
     }
   });
 }
-function wi() {
-  const e = Q(kt);
+function Vi() {
+  const e = X(Ct);
   if (e === void 0)
     throw new Error("useUmweltDatastore must be used within a UmweltDatastoreProvider");
   return e;
 }
-var Di = /* @__PURE__ */ A("<div>"), Ui = /* @__PURE__ */ A("<div>Loading..."), Ai = /* @__PURE__ */ A("<div role=alert>");
-function $i(e) {
-  const [n, t] = wi(), [i, r] = O(), [a, l] = O(!0), [s, c] = O(), f = () => {
-    const u = i();
-    return u ? n()[u.data.name]?.data || [] : [];
+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 = () => {
+    const d = i();
+    return d ? t()[d.data.name]?.data || [] : [];
   };
-  return N(async () => {
-    const u = e.exportableSpec;
-    l(!0), c(void 0);
+  return P(async () => {
+    const d = e.exportableSpec;
+    l(!0), o(void 0);
     try {
-      const o = await hn(u, n(), t.setDataset);
-      o ? r(o) : c("Failed to load Umwelt spec: the spec is invalid or its data source could not be resolved.");
-    } catch (o) {
-      console.error("Error loading spec:", o), c(`Failed to load Umwelt spec: ${o}`);
+      const u = await $n(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}`);
     } finally {
       l(!1);
     }
   }), (() => {
-    var u = Di();
-    return k(u, (() => {
-      var o = ue(() => !!a());
-      return () => o() && Ui();
-    })(), null), k(u, (() => {
-      var o = ue(() => !!(!a() && s()));
-      return () => o() && (() => {
-        var d = Ai();
-        return k(d, s), d;
+    var d = Ii();
+    return x(d, (() => {
+      var u = pe(() => !!a());
+      return () => u() && Li();
+    })(), null), x(d, (() => {
+      var u = pe(() => !!(!a() && s()));
+      return () => u() && (() => {
+        var c = ji();
+        return x(c, s), c;
       })();
-    })(), null), k(u, (() => {
-      var o = ue(() => !!(!a() && !s() && i()));
-      return () => o() && p(bi, {
+    })(), null), x(d, (() => {
+      var u = pe(() => !!(!a() && !s() && i()));
+      return () => u() && S(Ci, {
         get spec() {
           return i();
         },
@@ -1810,14 +2005,14 @@ function $i(e) {
           return f();
         }
       });
-    })(), null), u;
+    })(), null), d;
   })();
 }
-function Ti(e) {
-  return p(Ei, {
+function Mi(e) {
+  return S(Ri, {
     persist: !1,
     get children() {
-      return p($i, {
+      return S(qi, {
         get exportableSpec() {
           return e.exportableSpec;
         }
@@ -1825,25 +2020,25 @@ function Ti(e) {
     }
   });
 }
-class ki {
-  constructor(n) {
-    this.options = n, this.mount();
+class Bi {
+  constructor(t) {
+    this.options = t, this.mount();
   }
   disposal;
   isDestroyed = !1;
   mount() {
     if (this.isDestroyed)
       throw new Error("Cannot mount a destroyed UmweltViewer. Create a new instance.");
-    this.disposal = Nt(() => Ti({ exportableSpec: this.options.spec }), this.options.container);
+    this.disposal = It(() => Mi({ exportableSpec: this.options.spec }), this.options.container);
   }
   /**
    * Update the viewer with a new specification.
    * This will re-render the entire viewer with the new data and configuration.
    */
-  updateSpec(n) {
+  updateSpec(t) {
     if (this.isDestroyed)
       throw new Error("Cannot update a destroyed UmweltViewer.");
-    this.cleanup(), this.options.spec = n, this.mount();
+    this.cleanup(), this.options.spec = t, this.mount();
   }
   /**
    * Get the current specification.
@@ -1874,10 +2069,10 @@ class ki {
     return this.isDestroyed;
   }
 }
-function Xi(e, n) {
-  return new ki({ spec: e, container: n });
+function ur(e, t) {
+  return new Bi({ spec: e, container: t });
 }
 export {
-  ki as UmweltViewer,
-  Xi as createViewer
+  Bi as UmweltViewer,
+  ur as createViewer
 };