@marimo-team/islands 0.23.15-dev50 → 0.23.15-dev55

package/dist/{react-vega-B0sAlDTL.js → react-vega-DfJOSnj6.js}

@@ -12,24 +12,24 @@ var _e, _a, _b;
 import { r as __export, s as __toESM } from "./chunk-BNovOVIE.js";
 import { t as require_react } from "./react-DA-nE2FX.js";
 import { t as require_jsx_runtime } from "./jsx-runtime-DebpN0FN.js";
-import { $ as clampRange, $t as zoomLinear, A as timeOffset, At as mergeConfig, B as week, Bt as span, C as TIME_UNITS, Ct as isRegExp, D as dayofyear, Dt as logger, E as bin$1, Et as lerp, F as utcInterval, Ft as panPow, G as Info, Gt as toSet, H as Debug, Ht as toBoolean, I as utcOffset, It as panSymlog, J as accessor, Jt as truthy, K as None$2, Kt as toString, L as utcSequence, Lt as peek, M as timeUnitSpecifier, Mt as pad, N as timeUnits, Nt as panLinear, O as timeFloor, Ot as lruCache, P as utcFloor, Pt as panLog, Q as ascending, Qt as zero$2, R as utcdayofyear, Rt as quarter, S as SECONDS, St as isObject, T as YEAR, Tt as key, U as DisallowedObjectProperties, Ut as toDate, V as $, Vt as splitAccessPath, W as Error$1, Wt as toNumber, X as accessorName, Xt as visitArray, Y as accessorFields, Yt as utcquarter, Z as array, Zt as writeConfig, _ as HOURS, _t as isBoolean, a as loader, at as extent, b as MONTH, bt as isIterable, c as typeParsers, ct as fastmap, d as numberFormatDefaultLocale, dt as has, en as zoomLog, et as compare$1, f as resetDefaultLocale, ft as id, g as DAYOFYEAR, gt as isArray, h as DAY, ht as inrange, i as inferTypes, it as extend, j as timeSequence, jt as one$1, k as timeInterval, kt as merge$3, l as defaultLocale, lt as field$1, m as DATE, mt as inherits, n as formats$1, nn as zoomSymlog, nt as debounce, o as read, ot as extentIndex, p as timeFormatDefaultLocale, pt as identity, q as Warn, qt as truncate, r as inferType, rt as error$1, s as responseType, st as falsy, t as format$3, tn as zoomPow, tt as constant, u as locale, ut as flush, v as MILLISECONDS, vt as isDate, w as WEEK, wt as isString, x as QUARTER, xt as isNumber, y as MINUTES, yt as isFunction, z as utcweek, zt as repeat } from "./vega-loader.browser-CZ-J8Py3.js";
-import { a as tickStep, c as ascending$2, o as ticks, s as bisector } from "./precisionRound-Tqb4mg-H.js";
-import { a as copy$2, c as number$4, d as bisect_default, f as number$5, l as bisectLeft$1, n as linearish, o as identity$1, p as numbers$2, r as tickFormat$1, s as transformer$3, t as linear$1, u as bisectRight$1 } from "./linear-B5-AFRiR.js";
-import { n as ordinal, r as InternSet, t as implicit } from "./ordinal-ArJavP1Q.js";
-import { a as utcTicks, i as utcTickInterval, n as time$1, o as min$1, r as nice$1, s as max, t as calendar } from "./time-CsmIF9YZ.js";
-import { t as range$3 } from "./range-C-rmrM1O.js";
-import { i as formatSpecifier, t as format$2 } from "./defaultLocale-u-3osm0P.js";
-import { S as utcHour, T as second, _ as utcSunday, b as utcDay, l as utcMonth, r as utcFormat$1, s as utcYear, w as utcMinute } from "./defaultLocale-BoHTsDG6.js";
-import { n as path, r as constant_default$2, t as withPath } from "./path-BGaWgPKg.js";
-import { f as sqrt$3, p as tau$3, u as pi$2 } from "./math-DFcdCCU8.js";
-import { t as arc_default } from "./arc-DfkSnvZm.js";
-import { t as array_default$1 } from "./array-tvvEqPy7.js";
-import { _ as basis_default, a as monotoneX, c as catmullRomOpen_default, d as cardinalOpen_default, f as cardinalClosed_default, g as basisClosed_default, h as basisOpen_default, i as natural_default, l as catmullRomClosed_default, m as bundle_default, n as stepBefore, o as monotoneY, p as cardinal_default, r as step_default, s as linearClosed_default, t as stepAfter, u as catmullRom_default, v as linear_default } from "./step-CWipAYTY.js";
-import { n as x$3, r as y$4, t as line_default$1 } from "./line-C5s_12ee.js";
-import { n as initRange, t as initInterpolator } from "./init-uv0kkh4g.js";
-import { a as src_exports$1, d as value_default, g as lab, h as hcl, i as dispatch_default, n as now, o as piecewise, r as timer$1, t as Timer$1, u as round_default$1, v as hsl, y as rgb } from "./timer-YZl28NYN.js";
-import { t as colors_default } from "./colors-CQAOa8cK.js";
-import { a as slice_default, c as constantZero, d as Node, f as computeHeight, i as squarify_default, l as constant_default, n as phi, o as dice_default, p as hierarchy, r as squarifyRatio, s as round_default, t as treemap_default, u as optional } from "./treemap-D-ka1hvx.js";
+import { $ as array, $t as writeConfig, A as timeOffset, At as lruCache, B as week, Bt as quarter, C as TIME_UNITS, Ct as isNumber, D as dayofyear, Dt as key, E as bin$1, Et as isString, F as utcInterval, Ft as panLinear, G as DisallowedObjectProperties, Gt as toDate, Ht as span, I as utcOffset, It as panLog, J as None$2, Jt as toString, K as Error$1, Kt as toNumber, L as utcSequence, Lt as panPow, M as timeUnitSpecifier, Mt as mergeConfig, N as timeUnits, Nt as one$1, O as timeFloor, Ot as lerp, P as utcFloor, Pt as pad, Q as accessorName, Qt as visitArray, R as utcdayofyear, Rt as panSymlog, S as SECONDS, St as isIterable, T as YEAR, Tt as isRegExp, U as $, Ut as splitAccessPath, Vt as repeat, W as Debug, Wt as toBoolean, X as accessor, Xt as truthy, Y as Warn, Yt as truncate, Z as accessorFields, Zt as utcquarter, _ as HOURS, _t as inrange, a as loader, at as error$1, b as MONTH, bt as isDate, c as typeParsers, ct as extentIndex, d as numberFormatDefaultLocale, dt as field$1, en as zero$2, et as ascending, f as resetDefaultLocale, ft as flush, g as DAYOFYEAR, gt as inherits, h as DAY, ht as identity, i as inferTypes, in as zoomSymlog, it as debounce, j as timeSequence, jt as merge$3, k as timeInterval, kt as logger, l as defaultLocale, lt as falsy, m as DATE, mt as id, n as formats$1, nn as zoomLog, nt as compare$1, o as read, ot as extend, p as timeFormatDefaultLocale, pt as has, q as Info, qt as toSet, r as inferType, rn as zoomPow, rt as constant, s as responseType, st as extent, t as format$3, tn as zoomLinear, tt as clampRange, u as locale, ut as fastmap, v as MILLISECONDS, vt as isArray, w as WEEK, wt as isObject, x as QUARTER, xt as isFunction, y as MINUTES, yt as isBoolean, z as utcweek, zt as peek } from "./vega-loader.browser-IU8eTDwM.js";
+import { a as tickStep, c as ascending$2, o as ticks, s as bisector } from "./precisionRound-CnHPY_5v.js";
+import { a as copy$2, c as number$4, d as bisect_default, f as number$5, l as bisectLeft$1, n as linearish, o as identity$1, p as numbers$2, r as tickFormat$1, s as transformer$3, t as linear$1, u as bisectRight$1 } from "./linear-H_vsH9ao.js";
+import { n as ordinal, r as InternSet, t as implicit } from "./ordinal-Bkv2-veX.js";
+import { a as utcTicks, i as utcTickInterval, n as time$1, o as min$1, r as nice$1, s as max, t as calendar } from "./time-Bb4A7I6a.js";
+import { t as range$3 } from "./range-BOiA8qqU.js";
+import { i as formatSpecifier, t as format$2 } from "./defaultLocale-BpsHxBd7.js";
+import { S as utcHour, T as second, _ as utcSunday, b as utcDay, l as utcMonth, r as utcFormat$1, s as utcYear, w as utcMinute } from "./defaultLocale-DoeErsX2.js";
+import { n as path, r as constant_default$2, t as withPath } from "./path-DwWbhZFI.js";
+import { f as sqrt$3, p as tau$3, u as pi$2 } from "./math-CBNc2Ib0.js";
+import { t as arc_default } from "./arc-CTIpFoOn.js";
+import { t as array_default$1 } from "./array-O78LT16Y.js";
+import { _ as basis_default, a as monotoneX, c as catmullRomOpen_default, d as cardinalOpen_default, f as cardinalClosed_default, g as basisClosed_default, h as basisOpen_default, i as natural_default, l as catmullRomClosed_default, m as bundle_default, n as stepBefore, o as monotoneY, p as cardinal_default, r as step_default, s as linearClosed_default, t as stepAfter, u as catmullRom_default, v as linear_default } from "./step-BqHnkgWE.js";
+import { n as x$3, r as y$4, t as line_default$1 } from "./line-C43FIPBd.js";
+import { n as initRange, t as initInterpolator } from "./init-DNBbYZd_.js";
+import { a as src_exports$1, d as value_default, g as lab, h as hcl, i as dispatch_default, n as now, o as piecewise, r as timer$1, t as Timer$1, u as round_default$1, v as hsl, y as rgb } from "./timer-BpI_FKSA.js";
+import { t as colors_default } from "./colors-DmiH1bIH.js";
+import { a as slice_default, c as constantZero, d as Node, f as computeHeight, i as squarify_default, l as constant_default, n as phi, o as dice_default, p as hierarchy, r as squarifyRatio, s as round_default, t as treemap_default, u as optional } from "./treemap-DY3NBr79.js";
 function variance(t35, n) {
   let r = 0, a, o = 0, s = 0;
   if (n === void 0) for (let n2 of t35) n2 != null && (n2 = +n2) >= n2 && (a = n2 - o, o += a / ++r, s += a * (n2 - o));
@@ -247,7 +247,7 @@ function isChangeSet(t35) {
   return t35 && t35.constructor === changeset;
 }
 function changeset() {
-  let t35 = [], n = [], r = [], a = [], o = [], s = null, l = false;
+  let t35 = [], n = [], r = [], a = [], s = [], l = null, u = false;
   return {
     constructor: changeset,
     insert(n2) {
@@ -256,19 +256,19 @@ function changeset() {
       return this;
     },
     remove(t36) {
-      let r2 = isFunction(t36) ? a : n, o2 = array(t36), s2 = o2.length;
-      for (let t37 = 0; t37 < s2; ++t37) r2.push(o2[t37]);
+      let r2 = isFunction(t36) ? a : n, s2 = array(t36), l2 = s2.length;
+      for (let t37 = 0; t37 < l2; ++t37) r2.push(s2[t37]);
       return this;
     },
     modify(t36, n2, a2) {
-      let s2 = {
+      let o = {
         field: n2,
         value: constant(a2)
       };
-      return isFunction(t36) ? (s2.filter = t36, o.push(s2)) : (s2.tuple = t36, r.push(s2)), this;
+      return isFunction(t36) ? (o.filter = t36, s.push(o)) : (o.tuple = t36, r.push(o)), this;
     },
     encode(t36, n2) {
-      return isFunction(t36) ? o.push({
+      return isFunction(t36) ? s.push({
         filter: t36,
         field: n2
       }) : r.push({
@@ -277,30 +277,30 @@ function changeset() {
       }), this;
     },
     clean(t36) {
-      return s = t36, this;
+      return l = t36, this;
     },
     reflow() {
-      return l = true, this;
+      return u = true, this;
     },
-    pulse(u, f) {
+    pulse(o, f) {
       let p = {}, _ = {}, S, T, E, O, k, A;
       for (S = 0, T = f.length; S < T; ++S) p[tupleid(f[S])] = 1;
       for (S = 0, T = n.length; S < T; ++S) k = n[S], p[tupleid(k)] = -1;
       for (S = 0, T = a.length; S < T; ++S) O = a[S], f.forEach((t36) => {
         O(t36) && (p[tupleid(t36)] = -1);
       });
-      for (S = 0, T = t35.length; S < T; ++S) k = t35[S], A = tupleid(k), p[A] ? p[A] = 1 : u.add.push(ingest$1(t35[S]));
-      for (S = 0, T = f.length; S < T; ++S) k = f[S], p[tupleid(k)] < 0 && u.rem.push(k);
+      for (S = 0, T = t35.length; S < T; ++S) k = t35[S], A = tupleid(k), p[A] ? p[A] = 1 : o.add.push(ingest$1(t35[S]));
+      for (S = 0, T = f.length; S < T; ++S) k = f[S], p[tupleid(k)] < 0 && o.rem.push(k);
       function N(t36, n2, r2) {
-        r2 ? t36[n2] = r2(t36) : u.encode = n2, l || (_[tupleid(t36)] = t36);
+        r2 ? t36[n2] = r2(t36) : o.encode = n2, u || (_[tupleid(t36)] = t36);
       }
-      for (S = 0, T = r.length; S < T; ++S) E = r[S], k = E.tuple, O = E.field, A = p[tupleid(k)], A > 0 && (N(k, O, E.value), u.modifies(O));
-      for (S = 0, T = o.length; S < T; ++S) E = o[S], O = E.filter, f.forEach((t36) => {
+      for (S = 0, T = r.length; S < T; ++S) E = r[S], k = E.tuple, O = E.field, A = p[tupleid(k)], A > 0 && (N(k, O, E.value), o.modifies(O));
+      for (S = 0, T = s.length; S < T; ++S) E = s[S], O = E.filter, f.forEach((t36) => {
         O(t36) && p[tupleid(t36)] > 0 && N(t36, E.field, E.value);
-      }), u.modifies(E.field);
-      if (l) u.mod = n.length || a.length ? f.filter((t36) => p[tupleid(t36)] > 0) : f.slice();
-      else for (A in _) u.mod.push(_[A]);
-      return (s || s == null && (n.length || a.length)) && u.clean(true), u;
+      }), o.modifies(E.field);
+      if (u) o.mod = n.length || a.length ? f.filter((t36) => p[tupleid(t36)] > 0) : f.slice();
+      else for (A in _) o.mod.push(_[A]);
+      return (l || l == null && (n.length || a.length)) && o.clean(true), o;
     }
   };
 }
@@ -354,19 +354,19 @@ Operator.prototype = {
   modified: flag(MODIFIED),
   parameters(t35, n, r) {
     n = n !== false;
-    let a = this._argval = this._argval || new Parameters(), o = this._argops = this._argops || [], s = [], l, u, f, p, _ = (t36, r2, l2) => {
-      l2 instanceof Operator ? (l2 !== this && (n && l2.targets().add(this), s.push(l2)), o.push({
-        op: l2,
+    let a = this._argval = this._argval || new Parameters(), s = this._argops = this._argops || [], l = [], u, f, p, _, S = (t36, r2, o) => {
+      o instanceof Operator ? (o !== this && (n && o.targets().add(this), l.push(o)), s.push({
+        op: o,
         name: t36,
         index: r2
-      })) : a.set(t36, r2, l2);
+      })) : a.set(t36, r2, o);
     };
-    for (l in t35) if (u = t35[l], l === PULSE) array(u).forEach((t36) => {
-      t36 instanceof Operator ? t36 !== this && (t36.targets().add(this), s.push(t36)) : error$1("Pulse parameters must be operator instances.");
-    }), this.source = u;
-    else if (isArray(u)) for (a.set(l, -1, Array(f = u.length)), p = 0; p < f; ++p) _(l, p, u[p]);
-    else _(l, -1, u);
-    return this.marshall().clear(), r && (o.initonly = true), s;
+    for (u in t35) if (f = t35[u], u === PULSE) array(f).forEach((t36) => {
+      t36 instanceof Operator ? t36 !== this && (t36.targets().add(this), l.push(t36)) : error$1("Pulse parameters must be operator instances.");
+    }), this.source = f;
+    else if (isArray(f)) for (a.set(u, -1, Array(p = f.length)), _ = 0; _ < p; ++_) S(u, _, f[_]);
+    else S(u, -1, f);
+    return this.marshall().clear(), r && (s.initonly = true), l;
   },
   marshall(t35) {
     let n = this._argval || NO_PARAMS, r = this._argops, a, o, s, l;
@@ -470,20 +470,20 @@ EventStream.prototype = {
   }
 };
 function events$1(t35, n, r, a) {
-  let o = this, s = stream(r, a), l = function(t36) {
-    t36.dataflow = o;
+  let s = this, l = stream(r, a), u = function(t36) {
+    t36.dataflow = s;
     try {
-      s.receive(t36);
+      l.receive(t36);
     } catch (t37) {
-      o.error(t37);
+      s.error(t37);
     } finally {
-      o.run();
+      s.run();
     }
-  }, u;
-  u = typeof t35 == "string" && typeof document < "u" ? document.querySelectorAll(t35) : array(t35);
-  let f = u.length;
-  for (let t36 = 0; t36 < f; ++t36) u[t36].addEventListener(n, l);
-  return s;
+  }, f;
+  f = typeof t35 == "string" && typeof document < "u" ? document.querySelectorAll(t35) : array(t35);
+  let p = f.length;
+  for (let t36 = 0; t36 < p; ++t36) f[t36].addEventListener(n, u);
+  return l;
 }
 function parse$5(t35, n) {
   let r = this.locale();
@@ -1762,21 +1762,21 @@ Aggregate$1.Definition = {
   },
   init(t35) {
     let n = this._inputs = [], r = this._outputs = [], a = {};
-    function o(t36) {
-      let r2 = array(accessorFields(t36)), o2 = r2.length, s2 = 0, l2;
-      for (; s2 < o2; ++s2) a[l2 = r2[s2]] || (a[l2] = 1, n.push(l2));
+    function s(t36) {
+      let r2 = array(accessorFields(t36)), s2 = r2.length, l2 = 0, u2;
+      for (; l2 < s2; ++l2) a[u2 = r2[l2]] || (a[u2] = 1, n.push(u2));
     }
     this._dims = array(t35.groupby), this._dnames = this._dims.map((t36) => {
       let n2 = accessorName(t36);
-      return o(t36), r.push(n2), n2;
+      return s(t36), r.push(n2), n2;
     }), this.cellkey = t35.key ? t35.key : groupkey(this._dims), this._countOnly = true, this._counts = [], this._measures = [];
-    let s = t35.fields || [null], l = t35.ops || ["count"], u = t35.aggregate_params || [null], f = t35.as || [], p = s.length, _ = {}, S, T, E, O, k, A, N;
-    for (p !== l.length && error$1("Unmatched number of fields and aggregate ops."), N = 0; N < p; ++N) {
-      if (S = s[N], T = l[N], E = u[N] || null, S == null && T !== "count" && error$1("Null aggregate field specified."), k = accessorName(S), A = measureName(T, k, f[N]), r.push(A), T === "count") {
-        this._counts.push(A);
+    let l = t35.fields || [null], u = t35.ops || ["count"], f = t35.aggregate_params || [null], p = t35.as || [], _ = l.length, S = {}, T, E, O, k, A, N, P;
+    for (_ !== u.length && error$1("Unmatched number of fields and aggregate ops."), P = 0; P < _; ++P) {
+      if (T = l[P], E = u[P], O = f[P] || null, T == null && E !== "count" && error$1("Null aggregate field specified."), A = accessorName(T), N = measureName(E, A, p[P]), r.push(N), E === "count") {
+        this._counts.push(N);
         continue;
       }
-      O = _[k], O || (o(S), O = _[k] = [], O.field = S, this._measures.push(O)), T !== "count" && (this._countOnly = false), O.push(createMeasure(T, E, A));
+      k = S[A], k || (s(T), k = S[A] = [], k.field = T, this._measures.push(k)), E !== "count" && (this._countOnly = false), k.push(createMeasure(E, O, N));
     }
     return this._measures = this._measures.map((t36) => compileMeasures(t36, t36.field)), /* @__PURE__ */ Object.create(null);
   },
@@ -3267,23 +3267,23 @@ function find$2(t35, n, r) {
 }
 var ValidWindowOps = Object.keys(WindowOps);
 function WindowState(t35) {
-  let n = array(t35.ops), r = array(t35.fields), a = array(t35.params), o = array(t35.aggregate_params), s = array(t35.as), l = this.outputs = [], u = this.windows = [], f = {}, p = {}, _ = [], S = [], T = true;
-  function E(t36) {
-    array(accessorFields(t36)).forEach((t37) => f[t37] = 1);
+  let n = array(t35.ops), r = array(t35.fields), a = array(t35.params), s = array(t35.aggregate_params), l = array(t35.as), u = this.outputs = [], f = this.windows = [], p = {}, _ = {}, S = [], T = [], E = true;
+  function O(t36) {
+    array(accessorFields(t36)).forEach((t37) => p[t37] = 1);
   }
-  E(t35.sort), n.forEach((t36, n2) => {
-    let f2 = r[n2], O = a[n2], k = o[n2] || null, A = accessorName(f2), N = measureName(t36, A, s[n2]);
-    if (E(f2), l.push(N), has(WindowOps, t36)) u.push(WindowOp(t36, f2, O, N));
+  O(t35.sort), n.forEach((t36, n2) => {
+    let o = r[n2], p2 = a[n2], k = s[n2] || null, A = accessorName(o), N = measureName(t36, A, l[n2]);
+    if (O(o), u.push(N), has(WindowOps, t36)) f.push(WindowOp(t36, o, p2, N));
     else {
-      if (f2 == null && t36 !== "count" && error$1("Null aggregate field specified."), t36 === "count") {
-        _.push(N);
+      if (o == null && t36 !== "count" && error$1("Null aggregate field specified."), t36 === "count") {
+        S.push(N);
         return;
       }
-      T = false;
-      let n3 = p[A];
-      n3 || (n3 = p[A] = [], n3.field = f2, S.push(n3)), n3.push(createMeasure(t36, k, N));
+      E = false;
+      let n3 = _[A];
+      n3 || (n3 = _[A] = [], n3.field = o, T.push(n3)), n3.push(createMeasure(t36, k, N));
     }
-  }), (_.length || S.length) && (this.cell = cell(S, _, T)), this.inputs = Object.keys(f);
+  }), (S.length || T.length) && (this.cell = cell(T, S, E)), this.inputs = Object.keys(p);
 }
 var prototype = WindowState.prototype;
 prototype.init = function() {
@@ -7195,9 +7195,9 @@ function configureDomain(t35, n, r) {
 function rawDomain(t35, n, r) {
   return n ? (t35.domain(domainCheck(t35.type, n, r)), n.length) : -1;
 }
-function padDomain(t35, n, r, a, o, l) {
-  var u = Math.abs(peek(r) - r[0]), f = u / (u - 2 * a), p = t35 === "log" ? zoomLog(n, null, f) : t35 === "sqrt" ? zoomPow(n, null, f, 0.5) : t35 === "pow" ? zoomPow(n, null, f, o || 1) : t35 === "symlog" ? zoomSymlog(n, null, f, l || 1) : zoomLinear(n, null, f);
-  return n = n.slice(), n[0] = p[0], n[n.length - 1] = p[1], n;
+function padDomain(t35, n, r, a, o, s) {
+  var l = Math.abs(peek(r) - r[0]), u = l / (l - 2 * a), f = t35 === "log" ? zoomLog(n, null, u) : t35 === "sqrt" ? zoomPow(n, null, u, 0.5) : t35 === "pow" ? zoomPow(n, null, u, o || 1) : t35 === "symlog" ? zoomSymlog(n, null, u, s || 1) : zoomLinear(n, null, u);
+  return n = n.slice(), n[0] = f[0], n[n.length - 1] = f[1], n;
 }
 function domainCheck(t35, n, r) {
   return isLogarithmic(t35) && Math.abs(n.reduce((t36, n2) => t36 + (n2 < 0 ? -1 : n2 > 0 ? 1 : 0), 0)) !== n.length && r.warn("Log scale domain includes zero: " + $(n)), n;
@@ -9095,41 +9095,41 @@ function number$2(t35) {
   return isFunction(t35) ? t35 : constant(+t35);
 }
 function density2D() {
-  var t35 = (t36) => t36[0], n = (t36) => t36[1], r = one$1, a = [-1, -1], o = 960, s = 500, l = 2;
-  function u(u2, f) {
-    let p = radius(a[0], u2, t35) >> l, _ = radius(a[1], u2, n) >> l, S = p ? p + 2 : 0, T = _ ? _ + 2 : 0, E = 2 * S + (o >> l), O = 2 * T + (s >> l), k = new Float32Array(E * O), A = new Float32Array(E * O), N = k;
-    u2.forEach((a2) => {
-      let o2 = S + (+t35(a2) >> l), s2 = T + (+n(a2) >> l);
+  var t35 = (t36) => t36[0], n = (t36) => t36[1], r = one$1, a = [-1, -1], s = 960, l = 500, u = 2;
+  function f(o, f2) {
+    let p = radius(a[0], o, t35) >> u, _ = radius(a[1], o, n) >> u, S = p ? p + 2 : 0, T = _ ? _ + 2 : 0, E = 2 * S + (s >> u), O = 2 * T + (l >> u), k = new Float32Array(E * O), A = new Float32Array(E * O), N = k;
+    o.forEach((a2) => {
+      let o2 = S + (+t35(a2) >> u), s2 = T + (+n(a2) >> u);
       o2 >= 0 && o2 < E && s2 >= 0 && s2 < O && (k[o2 + s2 * E] += +r(a2));
     }), p > 0 && _ > 0 ? (blurX(E, O, k, A, p), blurY(E, O, A, k, _), blurX(E, O, k, A, p), blurY(E, O, A, k, _), blurX(E, O, k, A, p), blurY(E, O, A, k, _)) : p > 0 ? (blurX(E, O, k, A, p), blurX(E, O, A, k, p), blurX(E, O, k, A, p), N = A) : _ > 0 && (blurY(E, O, k, A, _), blurY(E, O, A, k, _), blurY(E, O, k, A, _), N = A);
-    let P = f ? 2 ** (-2 * l) : 1 / sum$1(N);
+    let P = f2 ? 2 ** (-2 * u) : 1 / sum$1(N);
     for (let t36 = 0, n2 = E * O; t36 < n2; ++t36) N[t36] *= P;
     return {
       values: N,
-      scale: 1 << l,
+      scale: 1 << u,
       width: E,
       height: O,
       x1: S,
       y1: T,
-      x2: S + (o >> l),
-      y2: T + (s >> l)
+      x2: S + (s >> u),
+      y2: T + (l >> u)
     };
   }
-  return u.x = function(n2) {
-    return arguments.length ? (t35 = number$2(n2), u) : t35;
-  }, u.y = function(t36) {
-    return arguments.length ? (n = number$2(t36), u) : n;
-  }, u.weight = function(t36) {
-    return arguments.length ? (r = number$2(t36), u) : r;
-  }, u.size = function(t36) {
-    if (!arguments.length) return [o, s];
+  return f.x = function(n2) {
+    return arguments.length ? (t35 = number$2(n2), f) : t35;
+  }, f.y = function(t36) {
+    return arguments.length ? (n = number$2(t36), f) : n;
+  }, f.weight = function(t36) {
+    return arguments.length ? (r = number$2(t36), f) : r;
+  }, f.size = function(t36) {
+    if (!arguments.length) return [s, l];
     var n2 = +t36[0], r2 = +t36[1];
-    return n2 >= 0 && r2 >= 0 || error$1("invalid size"), o = n2, s = r2, u;
-  }, u.cellSize = function(t36) {
-    return arguments.length ? ((t36 = +t36) >= 1 || error$1("invalid cell size"), l = Math.floor(Math.log(t36) / Math.LN2), u) : 1 << l;
-  }, u.bandwidth = function(t36) {
-    return arguments.length ? (t36 = array(t36), t36.length === 1 && (t36 = [+t36[0], +t36[0]]), t36.length !== 2 && error$1("invalid bandwidth"), a = t36, u) : a;
-  }, u;
+    return n2 >= 0 && r2 >= 0 || error$1("invalid size"), s = n2, l = r2, f;
+  }, f.cellSize = function(t36) {
+    return arguments.length ? ((t36 = +t36) >= 1 || error$1("invalid cell size"), u = Math.floor(Math.log(t36) / Math.LN2), f) : 1 << u;
+  }, f.bandwidth = function(t36) {
+    return arguments.length ? (t36 = array(t36), t36.length === 1 && (t36 = [+t36[0], +t36[0]]), t36.length !== 2 && error$1("invalid bandwidth"), a = t36, f) : a;
+  }, f;
 }
 function blurX(t35, n, r, a, o) {
   let s = (o << 1) + 1;
@@ -10292,11 +10292,11 @@ function simulation(t35, n) {
   return r.stopped = () => s, r.restart = () => (s = false, o()), r.stop = () => (s = true, a()), setup(r, n, true).on("end", () => s = true);
 }
 function setup(t35, n, r, a) {
-  var o = array(n.forces), s, l, u, f;
-  for (s = 0, l = ForceParams.length; s < l; ++s) u = ForceParams[s], u !== Forces && n.modified(u) && t35[u](n[u]);
-  for (s = 0, l = o.length; s < l; ++s) f = Forces + s, u = r || n.modified(Forces, s) ? getForce(o[s]) : a && modified(o[s], a) ? t35.force(f) : null, u && t35.force(f, u);
-  for (l = t35.numForces || 0; s < l; ++s) t35.force(Forces + s, null);
-  return t35.numForces = o.length, t35;
+  var s = array(n.forces), l, u, f, p;
+  for (l = 0, u = ForceParams.length; l < u; ++l) f = ForceParams[l], f !== Forces && n.modified(f) && t35[f](n[f]);
+  for (l = 0, u = s.length; l < u; ++l) p = Forces + l, f = r || n.modified(Forces, l) ? getForce(s[l]) : a && modified(s[l], a) ? t35.force(p) : null, f && t35.force(p, f);
+  for (u = t35.numForces || 0; l < u; ++l) t35.force(Forces + l, null);
+  return t35.numForces = s.length, t35;
 }
 function modified(t35, n) {
   var r, a;
@@ -10748,12 +10748,12 @@ Nest.Definition = {
 var children$1 = (t35) => t35.values;
 inherits(Nest, Transform, { transform(t35, n) {
   n.source || error$1("Nest transform requires an upstream data source.");
-  var r = t35.generate, a = t35.modified(), o = n.clone(), s = this.value;
-  return (!s || a || n.changed()) && (s && s.each((t36) => {
-    t36.children && isTuple(t36.data) && o.rem.push(t36.data);
-  }), this.value = s = hierarchy({ values: array(t35.keys).reduce((t36, n2) => (t36.key(n2), t36), nest()).entries(o.source) }, children$1), r && s.each((t36) => {
-    t36.children && (t36 = ingest$1(t36.data), o.add.push(t36), o.source.push(t36));
-  }), lookup$2(s, tupleid, tupleid)), o.source.root = s, o;
+  var r = t35.generate, a = t35.modified(), s = n.clone(), l = this.value;
+  return (!l || a || n.changed()) && (l && l.each((t36) => {
+    t36.children && isTuple(t36.data) && s.rem.push(t36.data);
+  }), this.value = l = hierarchy({ values: array(t35.keys).reduce((t36, n2) => (t36.key(n2), t36), nest()).entries(s.source) }, children$1), r && l.each((t36) => {
+    t36.children && (t36 = ingest$1(t36.data), s.add.push(t36), s.source.push(t36));
+  }), lookup$2(l, tupleid, tupleid)), s.source.root = l, s;
 } });
 function nest() {
   let t35 = [], n = {
@@ -11514,11 +11514,11 @@ Label$1.Definition = {
   let a = t35.modified();
   if (!(a || n.changed(n.ADD_REM) || r("sort"))) return;
   (!t35.size || t35.size.length !== 2) && error$1("Size parameter should be specified as a [width, height] array.");
-  let o = t35.as || Output$1;
+  let s = t35.as || Output$1;
   return labelLayout(n.materialize(n.SOURCE).source || [], t35.size, t35.sort, array(t35.offset == null ? 1 : t35.offset), array(t35.anchor || Anchors), t35.avoidMarks || [], t35.avoidBaseMark !== false, t35.lineAnchor || "end", t35.markIndex || 0, t35.padding === void 0 ? 0 : t35.padding, t35.method || "naive").forEach((t36) => {
     let n2 = t36.datum;
-    n2[o[0]] = t36.x, n2[o[1]] = t36.y, n2[o[2]] = t36.opacity, n2[o[3]] = t36.align, n2[o[4]] = t36.baseline;
-  }), n.reflow(a).modifies(o);
+    n2[s[0]] = t36.x, n2[s[1]] = t36.y, n2[s[2]] = t36.opacity, n2[s[3]] = t36.align, n2[s[4]] = t36.baseline;
+  }), n.reflow(a).modifies(s);
 } });
 var vega_regression_exports = /* @__PURE__ */ __export({
   loess: () => Loess,
@@ -13724,17 +13724,17 @@ function selectionTuples(t35, n) {
   return isArray(t35) || error$1("First argument to selectionTuples must be an array."), isObject(n) || error$1("Second argument to selectionTuples must be an object."), t35.map((t36) => extend(n.fields ? { values: n.fields.map((n2) => getter(n2)(t36.datum)) } : { [SelectionId]: $selectionId(t36.datum) }, n));
 }
 function selectionResolve(t35, n, r, a) {
-  for (var o = this.context.data[t35], s = o ? o.values.value : [], l = {}, u = {}, f = {}, p, _, S, T, E, O, k, A, N, P, F = s.length, I = 0, L, R; I < F; ++I) if (p = s[I], T = p.unit, _ = p.fields, S = p.values, _ && S) {
-    for (L = 0, R = _.length; L < R; ++L) E = _[L], k = l[E.field] || (l[E.field] = {}), A = k[T] || (k[T] = []), f[E.field] = N = E.type.charAt(0), P = ops[`${N}_union`], k[T] = P(A, array(S[L]));
-    r && (A = u[T] || (u[T] = []), A.push(array(S).reduce((t36, n2, r2) => (t36[_[r2].field] = n2, t36), {})));
-  } else E = SelectionId, O = $selectionId(p), k = l[E] || (l[E] = {}), A = k[T] || (k[T] = []), A.push(O), r && (A = u[T] || (u[T] = []), A.push({ [SelectionId]: O }));
-  if (n || (n = Union), l[SelectionId] ? l[SelectionId] = ops[`${SelectionId}_${n}`](...Object.values(l[SelectionId])) : Object.keys(l).forEach((t36) => {
-    l[t36] = Object.keys(l[t36]).map((n2) => l[t36][n2]).reduce((r2, a2) => r2 === void 0 ? a2 : ops[`${f[t36]}_${n}`](r2, a2));
-  }), s = Object.keys(u), r && s.length) {
+  for (var s = this.context.data[t35], l = s ? s.values.value : [], u = {}, f = {}, p = {}, _, S, T, E, O, k, A, N, P, F, I = l.length, L = 0, R, z; L < I; ++L) if (_ = l[L], E = _.unit, S = _.fields, T = _.values, S && T) {
+    for (R = 0, z = S.length; R < z; ++R) O = S[R], A = u[O.field] || (u[O.field] = {}), N = A[E] || (A[E] = []), p[O.field] = P = O.type.charAt(0), F = ops[`${P}_union`], A[E] = F(N, array(T[R]));
+    r && (N = f[E] || (f[E] = []), N.push(array(T).reduce((t36, n2, r2) => (t36[S[r2].field] = n2, t36), {})));
+  } else O = SelectionId, k = $selectionId(_), A = u[O] || (u[O] = {}), N = A[E] || (A[E] = []), N.push(k), r && (N = f[E] || (f[E] = []), N.push({ [SelectionId]: k }));
+  if (n || (n = Union), u[SelectionId] ? u[SelectionId] = ops[`${SelectionId}_${n}`](...Object.values(u[SelectionId])) : Object.keys(u).forEach((t36) => {
+    u[t36] = Object.keys(u[t36]).map((n2) => u[t36][n2]).reduce((r2, a2) => r2 === void 0 ? a2 : ops[`${p[t36]}_${n}`](r2, a2));
+  }), l = Object.keys(f), r && l.length) {
     let t36 = a ? VlPoint : VlMulti;
-    l[t36] = n === Union ? { [Or]: s.reduce((t37, n2) => (t37.push(...u[n2]), t37), []) } : { [And]: s.map((t37) => ({ [Or]: u[t37] })) };
+    u[t36] = n === Union ? { [Or]: l.reduce((t37, n2) => (t37.push(...f[n2]), t37), []) } : { [And]: l.map((t37) => ({ [Or]: f[t37] })) };
   }
-  return l;
+  return u;
 }
 var ops = {
   [`${SelectionId}_union`]: union,
@@ -14045,8 +14045,8 @@ function filter(t35) {
 }
 function lassoAppend(t35, n, r, a = 5) {
   t35 = array(t35);
-  let o = t35[t35.length - 1];
-  return o === void 0 || Math.hypot(o[0] - n, o[1] - r) > a ? [...t35, [n, r]] : t35;
+  let s = t35[t35.length - 1];
+  return s === void 0 || Math.hypot(s[0] - n, s[1] - r) > a ? [...t35, [n, r]] : t35;
 }
 function lassoPath(t35) {
   return array(t35).reduce((n, [r, a], o) => n += o == 0 ? `M ${r},${a} ` : o === t35.length - 1 ? " Z" : `L ${r},${a} `, "");
@@ -15227,14 +15227,14 @@ function has$1(t35, n) {
   return n && (n.enter && n.enter[t35] || n.update && n.update[t35]);
 }
 var FrameRole = "frame", ScopeRole = "scope", AxisRole = "axis", AxisDomainRole = "axis-domain", AxisGridRole = "axis-grid", AxisLabelRole = "axis-label", AxisTickRole = "axis-tick", AxisTitleRole = "axis-title", LegendRole = "legend", LegendBandRole = "legend-band", LegendEntryRole = "legend-entry", LegendGradientRole = "legend-gradient", LegendLabelRole = "legend-label", LegendSymbolRole = "legend-symbol", LegendTitleRole = "legend-title", TitleRole = "title", TitleTextRole = "title-text", TitleSubtitleRole = "title-subtitle";
-function applyDefaults(t35, n, r, a, o) {
-  let s = {}, l = {}, u, f, p, _;
-  for (f in f = "lineBreak", n === "text" && o[f] != null && !has$1(f, t35) && applyDefault(s, f, o[f]), (r == "legend" || String(r).startsWith("axis")) && (r = null), _ = r === "frame" ? o.group : r === "mark" ? extend({}, o.mark, o[n]) : null, _) p = has$1(f, t35) || (f === "fill" || f === "stroke") && (has$1("fill", t35) || has$1("stroke", t35)), p || applyDefault(s, f, _[f]);
-  for (f in array(a).forEach((n2) => {
-    let r2 = o.style && o.style[n2];
-    for (let n3 in r2) has$1(n3, t35) || applyDefault(s, n3, r2[n3]);
-  }), t35 = extend({}, t35), s) _ = s[f], _.signal ? (u || (u = {}))[f] = _ : l[f] = _;
-  return t35.enter = extend(l, t35.enter), u && (t35.update = extend(u, t35.update)), t35;
+function applyDefaults(t35, n, r, a, s) {
+  let l = {}, u = {}, f, p, _, S;
+  for (p in p = "lineBreak", n === "text" && s[p] != null && !has$1(p, t35) && applyDefault(l, p, s[p]), (r == "legend" || String(r).startsWith("axis")) && (r = null), S = r === "frame" ? s.group : r === "mark" ? extend({}, s.mark, s[n]) : null, S) _ = has$1(p, t35) || (p === "fill" || p === "stroke") && (has$1("fill", t35) || has$1("stroke", t35)), _ || applyDefault(l, p, S[p]);
+  for (p in array(a).forEach((n2) => {
+    let r2 = s.style && s.style[n2];
+    for (let n3 in r2) has$1(n3, t35) || applyDefault(l, n3, r2[n3]);
+  }), t35 = extend({}, t35), l) S = l[p], S.signal ? (f || (f = {}))[p] = S : u[p] = S;
+  return t35.enter = extend(u, t35.enter), f && (t35.update = extend(f, t35.update)), t35;
 }
 function applyDefault(t35, n, r) {
   t35[n] = r && r.signal ? { signal: r.signal } : { value: r };
@@ -15429,11 +15429,11 @@ var OP_VALUE_EXPR = {
   }
 };
 function parseUpdate(t35, n, r) {
-  let a = t35.encode, o = { target: r }, s = t35.events, l = t35.update, u = [];
-  s || error$1("Signal update missing events specification."), isString(s) && (s = eventSelector(s, n.isSubscope() ? Scope$1 : View$1)), s = array(s).filter((t36) => t36.signal || t36.scale ? (u.push(t36), 0) : 1), u.length > 1 && (u = [mergeSources(u)]), s.length && u.push(s.length > 1 ? { merge: s } : s[0]), a != null && (l && error$1("Signal encode and update are mutually exclusive."), l = "encode(item()," + $(a) + ")"), o.update = isString(l) ? parser$1(l, n) : l.expr == null ? l.value == null ? l.signal == null ? error$1("Invalid signal update specification.") : {
+  let a = t35.encode, s = { target: r }, l = t35.events, u = t35.update, f = [];
+  l || error$1("Signal update missing events specification."), isString(l) && (l = eventSelector(l, n.isSubscope() ? Scope$1 : View$1)), l = array(l).filter((t36) => t36.signal || t36.scale ? (f.push(t36), 0) : 1), f.length > 1 && (f = [mergeSources(f)]), l.length && f.push(l.length > 1 ? { merge: l } : l[0]), a != null && (u && error$1("Signal encode and update are mutually exclusive."), u = "encode(item()," + $(a) + ")"), s.update = isString(u) ? parser$1(u, n) : u.expr == null ? u.value == null ? u.signal == null ? error$1("Invalid signal update specification.") : {
     $expr: OP_VALUE_EXPR,
-    $params: { $value: n.signalRef(l.signal) }
-  } : l.value : parser$1(l.expr, n), t35.force && (o.options = { force: true }), u.forEach((t36) => n.addUpdate(extend(streamSource(t36, n), o)));
+    $params: { $value: n.signalRef(u.signal) }
+  } : u.value : parser$1(u.expr, n), t35.force && (s.options = { force: true }), f.forEach((t36) => n.addUpdate(extend(streamSource(t36, n), s)));
 }
 function streamSource(t35, n) {
   return { source: t35.signal ? n.signalRef(t35.signal) : t35.scale ? n.scaleRef(t35.scale) : parseStream(t35, n) };
@@ -15955,14 +15955,14 @@ function parseSubParameter(t35, n, r) {
 }
 var outerExpr = (t35) => t35 && t35.expr, outerField = (t35) => t35 && t35.field, isData = (t35) => t35 === "data", isExpr = (t35) => t35 === "expr", isField = (t35) => t35 === "field", isCompare = (t35) => t35 === "compare";
 function parseData$1(t35, n, r) {
-  let a, o, s, l, u;
-  return t35 ? (a = t35.facet) && (n || error$1("Only group marks can be faceted."), a.field == null ? (t35.data ? u = ref(r.getData(t35.data).aggregate) : (s = parseTransform(extend({
+  let a, s, l, u, f;
+  return t35 ? (a = t35.facet) && (n || error$1("Only group marks can be faceted."), a.field == null ? (t35.data ? f = ref(r.getData(t35.data).aggregate) : (l = parseTransform(extend({
     type: "aggregate",
     groupby: array(a.groupby)
-  }, a.aggregate), r), s.params.key = r.keyRef(a.groupby), s.params.pulse = getDataRef(a, r), l = u = ref(r.add(s))), o = r.keyRef(a.groupby, true)) : l = u = getDataRef(a, r)) : l = ref(r.add(Collect(null, [{}]))), l || (l = getDataRef(t35, r)), {
-    key: o,
-    pulse: l,
-    parent: u
+  }, a.aggregate), r), l.params.key = r.keyRef(a.groupby), l.params.pulse = getDataRef(a, r), u = f = ref(r.add(l))), s = r.keyRef(a.groupby, true)) : u = f = getDataRef(a, r)) : u = ref(r.add(Collect(null, [{}]))), u || (u = getDataRef(t35, r)), {
+    key: s,
+    pulse: u,
+    parent: f
   };
 }
 function getDataRef(t35, n) {
@@ -16307,18 +16307,18 @@ function parseData$2(t35, n) {
   }), n.addDataPipeline(t35.name, analyze(t35, n, r));
 }
 function analyze(t35, n, r) {
-  let a = [], o = null, s = false, l = false, u, f, p, _, S;
-  for (t35.values ? isSignal(t35.values) || hasSignal(t35.format) ? (a.push(load(n, t35)), a.push(o = collect())) : a.push(o = collect({
+  let a = [], s = null, l = false, u = false, f, p, _, S, T;
+  for (t35.values ? isSignal(t35.values) || hasSignal(t35.format) ? (a.push(load(n, t35)), a.push(s = collect())) : a.push(s = collect({
     $ingest: t35.values,
     $format: t35.format
-  })) : t35.url ? hasSignal(t35.url) || hasSignal(t35.format) ? (a.push(load(n, t35)), a.push(o = collect())) : a.push(o = collect({
+  })) : t35.url ? hasSignal(t35.url) || hasSignal(t35.format) ? (a.push(load(n, t35)), a.push(s = collect())) : a.push(s = collect({
     $request: t35.url,
     $format: t35.format
-  })) : t35.source && (o = u = array(t35.source).map((t36) => ref(n.getData(t36).output)), a.push(null)), f = 0, p = r.length; f < p; ++f) _ = r[f], S = _.metadata, !o && !S.source && a.push(o = collect()), a.push(_), S.generates && (l = true), S.modifies && !l && (s = true), S.source ? o = _ : S.changes && (o = null);
-  return u && (p = u.length - 1, a[0] = Relay({
-    derive: s,
-    pulse: p ? u : u[0]
-  }), (s || p) && a.splice(1, 0, collect())), o || a.push(collect()), a.push(Sieve({})), a;
+  })) : t35.source && (s = f = array(t35.source).map((t36) => ref(n.getData(t36).output)), a.push(null)), p = 0, _ = r.length; p < _; ++p) S = r[p], T = S.metadata, !s && !T.source && a.push(s = collect()), a.push(S), T.generates && (u = true), T.modifies && !u && (l = true), T.source ? s = S : T.changes && (s = null);
+  return f && (_ = f.length - 1, a[0] = Relay({
+    derive: l,
+    pulse: _ ? f : f[0]
+  }), (l || _) && a.splice(1, 0, collect())), s || a.push(collect()), a.push(Sieve({})), a;
 }
 function collect(t35) {
   let n = Collect({}, t35);
@@ -16658,8 +16658,8 @@ function buildAxisEncode(t35, n) {
   }), r;
 }
 function parseScope(t35, n, r) {
-  let a = array(t35.signals), o = array(t35.scales);
-  return r || a.forEach((t36) => parseSignal(t36, n)), array(t35.projections).forEach((t36) => parseProjection$1(t36, n)), o.forEach((t36) => initScale(t36, n)), array(t35.data).forEach((t36) => parseData$2(t36, n)), o.forEach((t36) => parseScale(t36, n)), (r || a).forEach((t36) => parseSignalUpdates(t36, n)), array(t35.axes).forEach((t36) => parseAxis$1(t36, n)), array(t35.marks).forEach((t36) => parseMark(t36, n)), array(t35.legends).forEach((t36) => parseLegend$1(t36, n)), t35.title && parseTitle(t35.title, n), n.parseLambdas(), n;
+  let a = array(t35.signals), s = array(t35.scales);
+  return r || a.forEach((t36) => parseSignal(t36, n)), array(t35.projections).forEach((t36) => parseProjection$1(t36, n)), s.forEach((t36) => initScale(t36, n)), array(t35.data).forEach((t36) => parseData$2(t36, n)), s.forEach((t36) => parseScale(t36, n)), (r || a).forEach((t36) => parseSignalUpdates(t36, n)), array(t35.axes).forEach((t36) => parseAxis$1(t36, n)), array(t35.marks).forEach((t36) => parseMark(t36, n)), array(t35.legends).forEach((t36) => parseLegend$1(t36, n)), t35.title && parseTitle(t35.title, n), n.parseLambdas(), n;
 }
 var rootEncode = (t35) => extendEncode({
   enter: {
@@ -16704,11 +16704,11 @@ function collectSignals(t35, n) {
     signalObject("padding", parsePadding(r("padding"))),
     signalObject("width", r("width") || 0),
     signalObject("height", r("height") || 0)
-  ], o = a.reduce((t36, n2) => (t36[n2.name] = n2, t36), {}), s = {};
+  ], s = a.reduce((t36, n2) => (t36[n2.name] = n2, t36), {}), l = {};
   return array(t35.signals).forEach((t36) => {
-    has(o, t36.name) ? t36 = extend(o[t36.name], t36) : a.push(t36), s[t36.name] = t36;
+    has(s, t36.name) ? t36 = extend(s[t36.name], t36) : a.push(t36), l[t36.name] = t36;
   }), array(n.signals).forEach((t36) => {
-    !has(s, t36.name) && !has(o, t36.name) && a.push(t36);
+    !has(l, t36.name) && !has(s, t36.name) && a.push(t36);
   }), a;
 }
 function Scope(t35, n) {
@@ -16797,14 +16797,14 @@ Scope.prototype = Subscope.prototype = {
     return a;
   },
   compareRef(t35) {
-    let n = false, r = (t36) => isSignal(t36) ? (n = true, this.signalRef(t36.signal)) : isExpr$1(t36) ? (n = true, this.exprRef(t36.expr)) : t36, a = array(t35.field).map(r), o = array(t35.order).map(r);
+    let n = false, r = (t36) => isSignal(t36) ? (n = true, this.signalRef(t36.signal)) : isExpr$1(t36) ? (n = true, this.exprRef(t36.expr)) : t36, a = array(t35.field).map(r), s = array(t35.order).map(r);
     return n ? ref(this.add(Compare({
       fields: a,
-      orders: o
-    }))) : compareRef(a, o);
+      orders: s
+    }))) : compareRef(a, s);
   },
   keyRef(t35, n) {
-    let r = false, a = (t36) => isSignal(t36) ? (r = true, ref(o[t36.signal])) : t36, o = this.signals;
+    let r = false, a = (t36) => isSignal(t36) ? (r = true, ref(s[t36.signal])) : t36, s = this.signals;
     return t35 = array(t35).map(a), r ? ref(this.add(Key({
       fields: t35,
       flat: n
@@ -20623,54 +20623,54 @@ function markChannelCompatible(t35, n, r) {
 }
 function initEncoding(t35, n, r, a) {
   var _a2;
-  let o = {};
+  let s = {};
   for (let n2 of keys(t35)) isChannel(n2) || warn(invalidEncodingChannel(n2));
-  for (let s of UNIT_CHANNELS) {
-    if (!t35[s]) continue;
-    let l = t35[s];
-    if (isXorYOffset(s)) {
-      let t36 = getMainChannelFromOffsetChannel(s), n2 = o[t36];
-      if (isFieldDef(n2) && isContinuous(n2.type) && isFieldDef(l) && !n2.timeUnit) {
+  for (let l of UNIT_CHANNELS) {
+    if (!t35[l]) continue;
+    let u = t35[l];
+    if (isXorYOffset(l)) {
+      let t36 = getMainChannelFromOffsetChannel(l), n2 = s[t36];
+      if (isFieldDef(n2) && isContinuous(n2.type) && isFieldDef(u) && !n2.timeUnit) {
         warn(offsetNestedInsideContinuousPositionScaleDropped(t36));
         continue;
       }
     }
-    if (s === "angle" && n === "arc" && !t35.theta && (warn(REPLACE_ANGLE_WITH_THETA), s = THETA), !markChannelCompatible(t35, s, n)) {
-      warn(incompatibleChannel(s, n));
+    if (l === "angle" && n === "arc" && !t35.theta && (warn(REPLACE_ANGLE_WITH_THETA), l = THETA), !markChannelCompatible(t35, l, n)) {
+      warn(incompatibleChannel(l, n));
       continue;
     }
-    if (s === SIZE && n === "line" && ((_a2 = getFieldDef(t35[s])) == null ? void 0 : _a2.aggregate)) {
+    if (l === SIZE && n === "line" && ((_a2 = getFieldDef(t35[l])) == null ? void 0 : _a2.aggregate)) {
       warn(LINE_WITH_VARYING_SIZE);
       continue;
     }
-    if (s === COLOR && (r ? "fill" in t35 : "stroke" in t35)) {
+    if (l === COLOR && (r ? "fill" in t35 : "stroke" in t35)) {
       warn(droppingColor("encoding", {
         fill: "fill" in t35,
         stroke: "stroke" in t35
       }));
       continue;
     }
-    if (s === DETAIL || s === ORDER && !isArray(l) && !isValueDef(l) || s === TOOLTIP && isArray(l)) {
-      if (l) {
-        if (s === ORDER) {
-          let n2 = t35[s];
+    if (l === DETAIL || l === ORDER && !isArray(u) && !isValueDef(u) || l === TOOLTIP && isArray(u)) {
+      if (u) {
+        if (l === ORDER) {
+          let n2 = t35[l];
           if (isOrderOnlyDef(n2)) {
-            o[s] = n2;
+            s[l] = n2;
             continue;
           }
         }
-        o[s] = array(l).reduce((t36, n2) => (isFieldDef(n2) ? t36.push(initFieldDef(n2, s)) : warn(emptyFieldDef(n2, s)), t36), []);
+        s[l] = array(u).reduce((t36, n2) => (isFieldDef(n2) ? t36.push(initFieldDef(n2, l)) : warn(emptyFieldDef(n2, l)), t36), []);
       }
     } else {
-      if (s === TOOLTIP && l === null) o[s] = null;
-      else if (!isFieldDef(l) && !isDatumDef(l) && !isValueDef(l) && !isConditionalDef(l) && !isSignalRef(l)) {
-        warn(emptyFieldDef(l, s));
+      if (l === TOOLTIP && u === null) s[l] = null;
+      else if (!isFieldDef(u) && !isDatumDef(u) && !isValueDef(u) && !isConditionalDef(u) && !isSignalRef(u)) {
+        warn(emptyFieldDef(u, l));
         continue;
       }
-      o[s] = initChannelDef(l, s, a);
+      s[l] = initChannelDef(u, l, a);
     }
   }
-  return o;
+  return s;
 }
 function normalizeEncoding(t35, n) {
   let r = {};
@@ -20680,8 +20680,8 @@ function normalizeEncoding(t35, n) {
 function fieldDefs(t35) {
   let n = [];
   for (let r of keys(t35)) if (channelHasField(t35, r)) {
-    let a = t35[r], o = array(a);
-    for (let t36 of o) isFieldDef(t36) ? n.push(t36) : hasConditionalFieldDef(t36) && n.push(t36.condition);
+    let a = t35[r], s = array(a);
+    for (let t36 of s) isFieldDef(t36) ? n.push(t36) : hasConditionalFieldDef(t36) && n.push(t36.condition);
   }
   return n;
 }
@@ -21811,25 +21811,25 @@ var configPropsWithExpr = [
   "view"
 ];
 function initConfig(t35 = {}) {
-  let { color: n, font: r, fontSize: a, selection: o, ...s } = t35, l = mergeConfig({}, duplicate(defaultConfig), r ? fontConfig(r) : {}, n ? colorSignalConfig(n) : {}, a ? fontSizeSignalConfig(a) : {}, s || {});
-  o && writeConfig(l, "selection", o, true);
-  let f = omit(l, configPropsWithExpr);
+  let { color: n, font: r, fontSize: a, selection: o, ...l } = t35, u = mergeConfig({}, duplicate(defaultConfig), r ? fontConfig(r) : {}, n ? colorSignalConfig(n) : {}, a ? fontSizeSignalConfig(a) : {}, l || {});
+  o && writeConfig(u, "selection", o, true);
+  let f = omit(u, configPropsWithExpr);
   for (let t36 of [
     "background",
     "lineBreak",
     "padding"
-  ]) l[t36] && (f[t36] = signalRefOrValue(l[t36]));
-  for (let t36 of MARK_CONFIGS) l[t36] && (f[t36] = replaceExprRef(l[t36]));
-  for (let t36 of AXIS_CONFIGS) l[t36] && (f[t36] = getAxisConfigInternal(l[t36]));
-  for (let t36 of HEADER_CONFIGS) l[t36] && (f[t36] = replaceExprRef(l[t36]));
-  if (l.legend && (f.legend = replaceExprRef(l.legend)), l.scale) {
-    let { invalid: t36, ...n2 } = l.scale, r2 = replaceExprRef(t36, { level: 1 });
+  ]) u[t36] && (f[t36] = signalRefOrValue(u[t36]));
+  for (let t36 of MARK_CONFIGS) u[t36] && (f[t36] = replaceExprRef(u[t36]));
+  for (let t36 of AXIS_CONFIGS) u[t36] && (f[t36] = getAxisConfigInternal(u[t36]));
+  for (let t36 of HEADER_CONFIGS) u[t36] && (f[t36] = replaceExprRef(u[t36]));
+  if (u.legend && (f.legend = replaceExprRef(u.legend)), u.scale) {
+    let { invalid: t36, ...n2 } = u.scale, r2 = replaceExprRef(t36, { level: 1 });
     f.scale = {
       ...replaceExprRef(n2),
       ...keys(r2).length > 0 ? { invalid: r2 } : {}
     };
   }
-  return l.style && (f.style = getStyleConfigInternal(l.style)), l.title && (f.title = replaceExprRef(l.title)), l.view && (f.view = replaceExprRef(l.view)), f;
+  return u.style && (f.style = getStyleConfigInternal(u.style)), u.title && (f.title = replaceExprRef(u.title)), u.view && (f.view = replaceExprRef(u.view)), f;
 }
 var MARK_STYLES = /* @__PURE__ */ new Set(["view", ...PRIMITIVE_MARKS]), VL_ONLY_CONFIG_PROPERTIES = /* @__PURE__ */ "color.fontSize.background.padding.facet.concat.numberFormat.numberFormatType.normalizedNumberFormat.normalizedNumberFormatType.timeFormat.countTitle.header.axisQuantitative.axisTemporal.axisDiscrete.axisPoint.axisXBand.axisXPoint.axisXDiscrete.axisXQuantitative.axisXTemporal.axisYBand.axisYPoint.axisYDiscrete.axisYQuantitative.axisYTemporal.scale.selection.overlay".split("."), VL_ONLY_ALL_MARK_SPECIFIC_CONFIG_PROPERTY_INDEX = {
   view: [
@@ -21995,37 +21995,37 @@ function stack(t35, n) {
   var _a2, _b2;
   let r = isMarkDef(t35) ? t35 : { type: t35 }, a = r.type;
   if (!STACKABLE_MARKS.has(a)) return null;
-  let o = potentialStackedChannel(n, "x", r) || potentialStackedChannel(n, "theta", r);
-  if (!o) return null;
-  let s = n[o], l = isFieldDef(s) ? vgField(s, {}) : void 0, u = getDimensionChannel(o), f = [], p = /* @__PURE__ */ new Set();
-  if (n[u]) {
-    let t36 = n[u], r2 = isFieldDef(t36) ? vgField(t36, {}) : void 0;
-    r2 && r2 !== l && (f.push(u), p.add(r2));
-  }
-  let _ = u === "x" ? "xOffset" : "yOffset", S = n[_], T = isFieldDef(S) ? vgField(S, {}) : void 0;
-  T && T !== l && (f.push(_), p.add(T));
-  let E = NONPOSITION_CHANNELS.reduce((t36, r2) => {
+  let s = potentialStackedChannel(n, "x", r) || potentialStackedChannel(n, "theta", r);
+  if (!s) return null;
+  let l = n[s], u = isFieldDef(l) ? vgField(l, {}) : void 0, f = getDimensionChannel(s), p = [], _ = /* @__PURE__ */ new Set();
+  if (n[f]) {
+    let t36 = n[f], r2 = isFieldDef(t36) ? vgField(t36, {}) : void 0;
+    r2 && r2 !== u && (p.push(f), _.add(r2));
+  }
+  let S = f === "x" ? "xOffset" : "yOffset", T = n[S], E = isFieldDef(T) ? vgField(T, {}) : void 0;
+  E && E !== u && (p.push(S), _.add(E));
+  let O = NONPOSITION_CHANNELS.reduce((t36, r2) => {
     if (r2 !== "tooltip" && channelHasField(n, r2)) {
       let a2 = n[r2];
       for (let n2 of array(a2)) {
         let a3 = getFieldDef(n2);
         if (a3.aggregate) continue;
-        let o2 = vgField(a3, {});
-        (!o2 || !p.has(o2)) && t36.push({
+        let o = vgField(a3, {});
+        (!o || !_.has(o)) && t36.push({
           channel: r2,
           fieldDef: a3
         });
       }
     }
     return t36;
-  }, []), O;
-  return s.stack === void 0 ? STACK_BY_DEFAULT_MARKS.has(a) && (O = "zero") : O = isBoolean(s.stack) ? s.stack ? "zero" : null : s.stack, !O || !isStackOffset(O) || isAggregate$1(n) && E.length === 0 ? null : (((_a2 = s == null ? void 0 : s.scale) == null ? void 0 : _a2.type) && ((_b2 = s == null ? void 0 : s.scale) == null ? void 0 : _b2.type) !== ScaleType.LINEAR && (s == null ? void 0 : s.stack) && warn(stackNonLinearScale(s.scale.type)), isFieldOrDatumDef(n[getSecondaryRangeChannel(o)]) ? (s.stack !== void 0 && warn(cannotStackRangedMark(o)), null) : (isFieldDef(s) && s.aggregate && !SUM_OPS.has(s.aggregate) && warn(stackNonSummativeAggregate(s.aggregate)), {
-    groupbyChannels: f,
-    groupbyFields: p,
-    fieldChannel: o,
-    impute: s.impute === null ? false : isPathMark(a),
-    stackBy: E,
-    offset: O
+  }, []), k;
+  return l.stack === void 0 ? STACK_BY_DEFAULT_MARKS.has(a) && (k = "zero") : k = isBoolean(l.stack) ? l.stack ? "zero" : null : l.stack, !k || !isStackOffset(k) || isAggregate$1(n) && O.length === 0 ? null : (((_a2 = l == null ? void 0 : l.scale) == null ? void 0 : _a2.type) && ((_b2 = l == null ? void 0 : l.scale) == null ? void 0 : _b2.type) !== ScaleType.LINEAR && (l == null ? void 0 : l.stack) && warn(stackNonLinearScale(l.scale.type)), isFieldOrDatumDef(n[getSecondaryRangeChannel(s)]) ? (l.stack !== void 0 && warn(cannotStackRangedMark(s)), null) : (isFieldDef(l) && l.aggregate && !SUM_OPS.has(l.aggregate) && warn(stackNonSummativeAggregate(l.aggregate)), {
+    groupbyChannels: p,
+    groupbyFields: _,
+    fieldChannel: s,
+    impute: l.impute === null ? false : isPathMark(a),
+    stackBy: O,
+    offset: k
   }));
 }
 function initMarkdef(t35, n, r) {
@@ -23129,16 +23129,16 @@ var TUPLE_FIELDS = "_tuple_fields", SelectionProjectionComponent = class {
 }, project = {
   defined: () => true,
   parse: (t35, n, r) => {
-    let a = n.name, o = n.project ?? (n.project = new SelectionProjectionComponent()), s = {}, l = {}, u = /* @__PURE__ */ new Set(), f = (t36, n2) => {
-      let r2 = n2 === "visual" ? t36.channel : t36.field, o2 = varName(`${a}_${r2}`);
-      for (let t37 = 1; u.has(o2); t37++) o2 = varName(`${a}_${r2}_${t37}`);
-      return u.add(o2), { [n2]: o2 };
-    }, p = n.type, _ = t35.config.selection[p], S = r.value === void 0 ? null : array(r.value), { fields: T, encodings: E } = isObject(r.select) ? r.select : {};
-    if (!T && !E && S) {
-      for (let t36 of S) if (isObject(t36)) for (let n2 of keys(t36)) isSingleDefUnitChannel(n2) ? (E || (E = [])).push(n2) : p === "interval" ? (warn(INTERVAL_INITIALIZED_WITH_POS), E = _.encodings) : (T ?? (T = [])).push(n2);
-    }
-    !T && !E && (E = _.encodings, "fields" in _ && (T = _.fields));
-    for (let n2 of E ?? []) {
+    let a = n.name, s = n.project ?? (n.project = new SelectionProjectionComponent()), l = {}, u = {}, f = /* @__PURE__ */ new Set(), p = (t36, n2) => {
+      let r2 = n2 === "visual" ? t36.channel : t36.field, o = varName(`${a}_${r2}`);
+      for (let t37 = 1; f.has(o); t37++) o = varName(`${a}_${r2}_${t37}`);
+      return f.add(o), { [n2]: o };
+    }, _ = n.type, S = t35.config.selection[_], T = r.value === void 0 ? null : array(r.value), { fields: E, encodings: O } = isObject(r.select) ? r.select : {};
+    if (!E && !O && T) {
+      for (let t36 of T) if (isObject(t36)) for (let n2 of keys(t36)) isSingleDefUnitChannel(n2) ? (O || (O = [])).push(n2) : _ === "interval" ? (warn(INTERVAL_INITIALIZED_WITH_POS), O = S.encodings) : (E ?? (E = [])).push(n2);
+    }
+    !E && !O && (O = S.encodings, "fields" in S && (E = S.fields));
+    for (let n2 of O ?? []) {
       let r2 = t35.fieldDef(n2);
       if (r2) {
         let a2 = r2.field;
@@ -23151,37 +23151,37 @@ var TUPLE_FIELDS = "_tuple_fields", SelectionProjectionComponent = class {
         }
         if (r2.timeUnit && !isBinnedTimeUnit(r2.timeUnit)) {
           a2 = t35.vgField(n2);
-          let o2 = {
+          let o = {
             timeUnit: r2.timeUnit,
             as: a2,
             field: r2.field
           };
-          l[hash(o2)] = o2;
+          u[hash(o)] = o;
         }
-        if (!s[a2]) {
-          let l2 = p === "interval" && isScaleChannel(n2) && hasContinuousDomain(t35.getScaleComponent(n2).get("type")) ? "R" : r2.bin ? "R-RE" : "E", u2 = {
+        if (!l[a2]) {
+          let o = _ === "interval" && isScaleChannel(n2) && hasContinuousDomain(t35.getScaleComponent(n2).get("type")) ? "R" : r2.bin ? "R-RE" : "E", u2 = {
             field: a2,
             channel: n2,
-            type: l2,
-            index: o.items.length
+            type: o,
+            index: s.items.length
           };
           u2.signals = {
-            ...f(u2, "data"),
-            ...f(u2, "visual")
-          }, o.items.push(s[a2] = u2), o.hasField[a2] = s[a2], o.hasSelectionId = o.hasSelectionId || a2 === SELECTION_ID, isGeoPositionChannel(n2) ? (u2.geoChannel = n2, u2.channel = getPositionChannelFromLatLong(n2), o.hasChannel[u2.channel] = s[a2]) : o.hasChannel[n2] = s[a2];
+            ...p(u2, "data"),
+            ...p(u2, "visual")
+          }, s.items.push(l[a2] = u2), s.hasField[a2] = l[a2], s.hasSelectionId = s.hasSelectionId || a2 === SELECTION_ID, isGeoPositionChannel(n2) ? (u2.geoChannel = n2, u2.channel = getPositionChannelFromLatLong(n2), s.hasChannel[u2.channel] = l[a2]) : s.hasChannel[n2] = l[a2];
         }
       } else warn(cannotProjectOnChannelWithoutField(n2));
     }
-    for (let t36 of T ?? []) {
-      if (o.hasField[t36]) continue;
+    for (let t36 of E ?? []) {
+      if (s.hasField[t36]) continue;
       let n2 = {
         type: "E",
         field: t36,
-        index: o.items.length
+        index: s.items.length
       };
-      n2.signals = { ...f(n2, "data") }, o.items.push(n2), o.hasField[t36] = n2, o.hasSelectionId = o.hasSelectionId || t36 === SELECTION_ID;
+      n2.signals = { ...p(n2, "data") }, s.items.push(n2), s.hasField[t36] = n2, s.hasSelectionId = s.hasSelectionId || t36 === SELECTION_ID;
     }
-    S && (n.init = S.map((t36) => o.items.map((n2) => isObject(t36) ? t36[n2.geoChannel || n2.channel] === void 0 ? t36[n2.field] : t36[n2.geoChannel || n2.channel] : t36))), isEmpty(l) || (o.timeUnit = new TimeUnitNode(null, l));
+    T && (n.init = T.map((t36) => s.items.map((n2) => isObject(t36) ? t36[n2.geoChannel || n2.channel] === void 0 ? t36[n2.field] : t36[n2.geoChannel || n2.channel] : t36))), isEmpty(u) || (s.timeUnit = new TimeUnitNode(null, u));
   },
   signals: (t35, n, r) => {
     let a = n.name + TUPLE_FIELDS;
@@ -23592,16 +23592,16 @@ function channelSignals(t35, n, r, a) {
     }];
   }
 }
-function wrapCondition({ model: t35, channelDef: n, vgChannel: r, invalidValueRef: a, mainRefFn: o }) {
-  let s = isConditionalDef(n) && n.condition, l = [];
-  s && (l = array(s).map((n2) => {
-    let r2 = o(n2);
+function wrapCondition({ model: t35, channelDef: n, vgChannel: r, invalidValueRef: a, mainRefFn: s }) {
+  let l = isConditionalDef(n) && n.condition, u = [];
+  l && (u = array(l).map((n2) => {
+    let r2 = s(n2);
     if (isConditionalParameter(n2)) {
-      let { param: a2, empty: o2 } = n2;
+      let { param: a2, empty: o } = n2;
       return {
         test: parseSelectionPredicate(t35, {
           param: a2,
-          empty: o2
+          empty: o
         }),
         ...r2
       };
@@ -23609,9 +23609,9 @@ function wrapCondition({ model: t35, channelDef: n, vgChannel: r, invalidValueRe
       test: expression$1(t35, n2.test),
       ...r2
     };
-  })), a !== void 0 && l.push(a);
-  let u = o(n);
-  return u !== void 0 && l.push(u), l.length > 1 || l.length === 1 && l[0].test ? { [r]: l } : l.length === 1 ? { [r]: l[0] } : {};
+  })), a !== void 0 && u.push(a);
+  let f = s(n);
+  return f !== void 0 && u.push(f), u.length > 1 || u.length === 1 && u[0].test ? { [r]: u } : u.length === 1 ? { [r]: u[0] } : {};
 }
 function text$1(t35, n = "text") {
   let r = t35.encoding[n];
@@ -23660,45 +23660,45 @@ function tooltip(t35, n = {}) {
   }
 }
 function tooltipData(t35, n, r, { reactiveGeom: a } = {}) {
-  let o = {
+  let s = {
     ...r,
     ...r.tooltipFormat
-  }, s = /* @__PURE__ */ new Set(), l = a ? "datum.datum" : "datum", u = [];
-  function f(r2, a2) {
-    let f2 = getMainRangeChannel(a2), p2 = isTypedFieldDef(r2) ? r2 : {
+  }, l = /* @__PURE__ */ new Set(), u = a ? "datum.datum" : "datum", f = [];
+  function p(r2, a2) {
+    let p2 = getMainRangeChannel(a2), _2 = isTypedFieldDef(r2) ? r2 : {
       ...r2,
-      type: t35[f2].type
-    }, _ = array(p2.title || defaultTitle(p2, o)).join(", ").replaceAll(/"/g, '\\"'), S;
+      type: t35[p2].type
+    }, S = array(_2.title || defaultTitle(_2, s)).join(", ").replaceAll(/"/g, '\\"'), T;
     if (isXorY(a2)) {
       let n2 = a2 === "x" ? "x2" : "y2", r3 = getFieldDef(t35[n2]);
-      if (isBinned(p2.bin) && r3) {
-        let t36 = vgField(p2, { expr: l }), a3 = vgField(r3, { expr: l }), { format: u2, formatType: f3 } = getFormatMixins(p2);
-        S = binFormatExpression(t36, a3, u2, f3, o), s.add(n2);
+      if (isBinned(_2.bin) && r3) {
+        let t36 = vgField(_2, { expr: u }), a3 = vgField(r3, { expr: u }), { format: o, formatType: f2 } = getFormatMixins(_2);
+        T = binFormatExpression(t36, a3, o, f2, s), l.add(n2);
       }
     }
     if ((isXorY(a2) || a2 === THETA || a2 === RADIUS) && n && n.fieldChannel === a2 && n.offset === "normalize") {
-      let { format: t36, formatType: n2 } = getFormatMixins(p2);
-      S = formatSignalRef({
-        fieldOrDatumDef: p2,
+      let { format: t36, formatType: n2 } = getFormatMixins(_2);
+      T = formatSignalRef({
+        fieldOrDatumDef: _2,
         format: t36,
         formatType: n2,
-        expr: l,
-        config: o,
+        expr: u,
+        config: s,
         normalizeStack: true
       }).signal;
     }
-    S ?? (S = addLineBreaksToTooltip(p2, o, l).signal), u.push({
+    T ?? (T = addLineBreaksToTooltip(_2, s, u).signal), f.push({
       channel: a2,
-      key: _,
-      value: S
+      key: S,
+      value: T
     });
   }
   forEach(t35, (t36, n2) => {
-    isFieldDef(t36) ? f(t36, n2) : hasConditionalFieldDef(t36) && f(t36.condition, n2);
+    isFieldDef(t36) ? p(t36, n2) : hasConditionalFieldDef(t36) && p(t36.condition, n2);
   });
-  let p = {};
-  for (let { channel: t36, key: n2, value: r2 } of u) !s.has(t36) && !p[n2] && (p[n2] = r2);
-  return p;
+  let _ = {};
+  for (let { channel: t36, key: n2, value: r2 } of f) !l.has(t36) && !_[n2] && (_[n2] = r2);
+  return _;
 }
 function tooltipRefForEncoding(t35, n, r, { reactiveGeom: a } = {}) {
   let o = entries$1(tooltipData(t35, n, r, { reactiveGeom: a })).map(([t36, n2]) => `"${t36}": ${n2}`);
@@ -24367,8 +24367,8 @@ var VORONOI = "voronoi", nearest = {
       let t36 = 'event.item && indexof(event.item.mark.role, "legend") < 0';
       for (let r2 of n.events) r2.filter = array(r2.filter ?? []), r2.filter.includes(t36) || r2.filter.push(t36);
     }
-    let o = isLegendStreamBinding(n.bind) ? n.bind.legend : "click";
-    n.bind = { legend: { merge: isString(o) ? eventSelector(o, "view") : array(o) } };
+    let s = isLegendStreamBinding(n.bind) ? n.bind.legend : "click";
+    n.bind = { legend: { merge: isString(s) ? eventSelector(s, "view") : array(s) } };
   },
   topLevelSignals: (t35, n, r) => {
     let a = n.name, o = isLegendStreamBinding(n.bind) && n.bind.legend, s = (t36) => (n2) => {
@@ -24556,29 +24556,29 @@ var FilterNode = class t6 extends DataFlowNode {
 function parseUnitSelection(t35, n) {
   let r = {}, a = t35.config.selection;
   if (!n || !n.length) return r;
-  let o = 0;
-  for (let s of n) {
-    let n2 = varName(s.name), l = s.select, u = isString(l) ? l : l.type, f = isObject(l) ? duplicate(l) : { type: u }, p = a[u];
-    for (let t36 in p) t36 === "fields" || t36 === "encodings" || (t36 === "mark" && (f.mark = {
-      ...p.mark,
-      ...f.mark
-    }), (f[t36] === void 0 || f[t36] === true) && (f[t36] = duplicate(p[t36] ?? f[t36])));
-    let _ = r[n2] = {
-      ...f,
+  let s = 0;
+  for (let l of n) {
+    let n2 = varName(l.name), u = l.select, f = isString(u) ? u : u.type, p = isObject(u) ? duplicate(u) : { type: f }, _ = a[f];
+    for (let t36 in _) t36 === "fields" || t36 === "encodings" || (t36 === "mark" && (p.mark = {
+      ..._.mark,
+      ...p.mark
+    }), (p[t36] === void 0 || p[t36] === true) && (p[t36] = duplicate(_[t36] ?? p[t36])));
+    let S = r[n2] = {
+      ...p,
       name: n2,
-      type: u,
-      init: s.value,
-      bind: s.bind,
-      events: isString(f.on) ? eventSelector(f.on, "scope") : array(duplicate(f.on))
+      type: f,
+      init: l.value,
+      bind: l.bind,
+      events: isString(p.on) ? eventSelector(p.on, "scope") : array(duplicate(p.on))
     };
-    if (isTimerSelection(_) && (o++, o > 1)) {
+    if (isTimerSelection(S) && (s++, s > 1)) {
       delete r[n2];
       continue;
     }
-    let S = duplicate(s);
-    for (let n3 of selectionCompilers) n3.defined(_) && n3.parse && n3.parse(t35, _, S);
+    let T = duplicate(l);
+    for (let n3 of selectionCompilers) n3.defined(S) && n3.parse && n3.parse(t35, S, T);
   }
-  return o > 1 && warn(MULTIPLE_TIMER_ANIMATION_SELECTION), r;
+  return s > 1 && warn(MULTIPLE_TIMER_ANIMATION_SELECTION), r;
 }
 function parseSelectionPredicate(t35, n, r, a = "datum") {
   let o = isString(n) ? n : n.param, s = varName(o), l = $(s + STORE), u;
@@ -24626,72 +24626,72 @@ function setAxisEncode(t35, n, r, a) {
 }
 function assembleAxis(t35, n, r, a = { header: false }) {
   var _a2, _b2;
-  let { disable: o, orient: s, scale: l, labelExpr: u, title: f, zindex: p, ..._ } = t35.combine();
-  if (!o) {
-    for (let t36 in _) {
-      let r2 = t36, a2 = AXIS_PROPERTY_TYPE[r2], o2 = _[r2];
-      if (a2 && a2 !== n && a2 !== "both") delete _[r2];
-      else if (isConditionalAxisValue(o2)) {
-        let { condition: t37, ...n2 } = o2, a3 = array(t37), s2 = CONDITIONAL_AXIS_PROP_INDEX[r2];
-        if (s2) {
-          let { vgProp: t38, part: o3 } = s2;
-          setAxisEncode(_, o3, t38, [...a3.map((t39) => {
+  let { disable: s, orient: l, scale: u, labelExpr: f, title: p, zindex: _, ...S } = t35.combine();
+  if (!s) {
+    for (let t36 in S) {
+      let r2 = t36, a2 = AXIS_PROPERTY_TYPE[r2], s2 = S[r2];
+      if (a2 && a2 !== n && a2 !== "both") delete S[r2];
+      else if (isConditionalAxisValue(s2)) {
+        let { condition: t37, ...n2 } = s2, a3 = array(t37), l2 = CONDITIONAL_AXIS_PROP_INDEX[r2];
+        if (l2) {
+          let { vgProp: t38, part: o } = l2;
+          setAxisEncode(S, o, t38, [...a3.map((t39) => {
             let { test: n3, ...r3 } = t39;
             return {
               test: expression$1(null, n3),
               ...r3
             };
-          }), n2]), delete _[r2];
-        } else s2 === null && (_[r2] = { signal: a3.map((t38) => {
+          }), n2]), delete S[r2];
+        } else l2 === null && (S[r2] = { signal: a3.map((t38) => {
           let { test: n3, ...r3 } = t38;
           return `${expression$1(null, n3)} ? ${exprFromValueRefOrSignalRef(r3)} : `;
         }).join("") + exprFromValueRefOrSignalRef(n2) });
-      } else if (isSignalRef(o2)) {
+      } else if (isSignalRef(s2)) {
         let t37 = CONDITIONAL_AXIS_PROP_INDEX[r2];
         if (t37) {
           let { vgProp: n2, part: a3 } = t37;
-          setAxisEncode(_, a3, n2, o2), delete _[r2];
+          setAxisEncode(S, a3, n2, s2), delete S[r2];
         }
       }
-      contains(["labelAlign", "labelBaseline"], r2) && _[r2] === null && delete _[r2];
+      contains(["labelAlign", "labelBaseline"], r2) && S[r2] === null && delete S[r2];
     }
     if (n === "grid") {
-      if (!_.grid) return;
-      if (_.encode) {
-        let { grid: t36 } = _.encode;
-        _.encode = { ...t36 ? { grid: t36 } : {} }, isEmpty(_.encode) && delete _.encode;
+      if (!S.grid) return;
+      if (S.encode) {
+        let { grid: t36 } = S.encode;
+        S.encode = { ...t36 ? { grid: t36 } : {} }, isEmpty(S.encode) && delete S.encode;
       }
       return {
-        scale: l,
-        orient: s,
-        ..._,
+        scale: u,
+        orient: l,
+        ...S,
         domain: false,
         labels: false,
         aria: false,
         maxExtent: 0,
         minExtent: 0,
         ticks: false,
-        zindex: getFirstDefined(p, 0)
+        zindex: getFirstDefined(_, 0)
       };
     } else {
       if (!a.header && t35.mainExtracted) return;
-      if (u !== void 0) {
-        let t36 = u;
-        ((_b2 = (_a2 = _.encode) == null ? void 0 : _a2.labels) == null ? void 0 : _b2.update) && isSignalRef(_.encode.labels.update.text) && (t36 = replaceAll(u, "datum.label", _.encode.labels.update.text.signal)), setAxisEncode(_, "labels", "text", { signal: t36 });
+      if (f !== void 0) {
+        let t36 = f;
+        ((_b2 = (_a2 = S.encode) == null ? void 0 : _a2.labels) == null ? void 0 : _b2.update) && isSignalRef(S.encode.labels.update.text) && (t36 = replaceAll(f, "datum.label", S.encode.labels.update.text.signal)), setAxisEncode(S, "labels", "text", { signal: t36 });
       }
-      if (_.labelAlign === null && delete _.labelAlign, _.encode) {
-        for (let n3 of AXIS_PARTS) t35.hasAxisPart(n3) || delete _.encode[n3];
-        isEmpty(_.encode) && delete _.encode;
+      if (S.labelAlign === null && delete S.labelAlign, S.encode) {
+        for (let n3 of AXIS_PARTS) t35.hasAxisPart(n3) || delete S.encode[n3];
+        isEmpty(S.encode) && delete S.encode;
       }
-      let n2 = assembleTitle(f, r);
+      let n2 = assembleTitle(p, r);
       return {
-        scale: l,
-        orient: s,
+        scale: u,
+        orient: l,
         grid: false,
         ...n2 ? { title: n2 } : {},
-        ..._,
+        ...S,
         ...r.aria === false ? { aria: false } : {},
-        zindex: getFirstDefined(p, 0)
+        zindex: getFirstDefined(_, 0)
       };
     }
   }
@@ -31901,11 +31901,11 @@ async function embed(t35, n, r = {}) {
   isString(n) ? (o = createLoader(r.loader), a = JSON.parse(await o.load(n))) : a = n;
   let s = embedOptionsFromUsermeta(a), l = s.loader;
   (!o || l) && (o = createLoader(r.loader ?? l));
-  let f = await loadOpts(s, o), p = await loadOpts(r, o), _ = {
-    ...mergeDeep(p, f),
-    config: mergeConfig(p.config ?? {}, f.config ?? {})
+  let u = await loadOpts(s, o), f = await loadOpts(r, o), p = {
+    ...mergeDeep(f, u),
+    config: mergeConfig(f.config ?? {}, u.config ?? {})
   };
-  return await _embed(t35, a, _, o);
+  return await _embed(t35, a, p, o);
 }
 async function loadOpts(t35, n) {
   let r = isString(t35.config) ? JSON.parse(await n.load(t35.config)) : t35.config ?? {}, a = isString(t35.patch) ? JSON.parse(await n.load(t35.patch)) : t35.patch;
@@ -31929,85 +31929,85 @@ async function _embed(t35, n, r = {}, a) {
   let o = r.theme ? mergeConfig(build_exports$1[r.theme], r.config ?? {}) : r.config, s = isBoolean(r.actions) ? r.actions : mergeDeep({}, DEFAULT_ACTIONS, r.actions ?? {}), l = {
     ...I18N,
     ...r.i18n
-  }, f = r.renderer ?? "svg", p = r.logger ?? logger(vega.Warn);
-  r.logLevel !== void 0 && p.level(r.logLevel);
-  let _ = r.downloadFileName ?? "visualization", S = typeof t35 == "string" ? document.querySelector(t35) : t35;
-  if (!S) throw Error(`${t35} does not exist`);
+  }, u = r.renderer ?? "svg", f = r.logger ?? logger(vega.Warn);
+  r.logLevel !== void 0 && f.level(r.logLevel);
+  let p = r.downloadFileName ?? "visualization", _ = typeof t35 == "string" ? document.querySelector(t35) : t35;
+  if (!_) throw Error(`${t35} does not exist`);
   if (r.defaultStyle !== false) {
-    let t36 = "vega-embed-style", { root: n2, rootContainer: a2 } = getRoot(S);
+    let t36 = "vega-embed-style", { root: n2, rootContainer: a2 } = getRoot(_);
     if (!n2.getElementById(t36)) {
       let n3 = document.createElement("style");
       n3.id = t36, n3.innerHTML = r.defaultStyle === void 0 || r.defaultStyle === true ? embedStyle.toString() : r.defaultStyle, a2.appendChild(n3);
     }
   }
-  let T = guessMode(n, p, r.mode), O = PREPROCESSOR[T](n, p, o);
-  if (T === "vega-lite" && O.$schema) {
-    let t36 = e(O.$schema);
-    satisfies(VERSION.vega, `^${t36.version.slice(1)}`) || p.warn(`The compiled spec uses Vega ${t36.version}, but current version is v${VERSION.vega}.`);
+  let S = guessMode(n, f, r.mode), T = PREPROCESSOR[S](n, f, o);
+  if (S === "vega-lite" && T.$schema) {
+    let t36 = e(T.$schema);
+    satisfies(VERSION.vega, `^${t36.version.slice(1)}`) || f.warn(`The compiled spec uses Vega ${t36.version}, but current version is v${VERSION.vega}.`);
   }
-  S.classList.add("vega-embed"), s && S.classList.add("has-actions"), S.innerHTML = "";
-  let k = S;
+  _.classList.add("vega-embed"), s && _.classList.add("has-actions"), _.innerHTML = "";
+  let E = _;
   if (s) {
     let t36 = document.createElement("div");
-    t36.classList.add(CHART_WRAPPER_CLASS), S.appendChild(t36), k = t36;
+    t36.classList.add(CHART_WRAPPER_CLASS), _.appendChild(t36), E = t36;
   }
-  let A = r.patch;
-  if (A && (O = A instanceof Function ? A(O) : applyPatch(O, A, true, false).newDocument), r.formatLocale && vega.formatLocale(r.formatLocale), r.timeFormatLocale && vega.timeFormatLocale(r.timeFormatLocale), r.expressionFunctions) for (let t36 in r.expressionFunctions) {
+  let O = r.patch;
+  if (O && (T = O instanceof Function ? O(T) : applyPatch(T, O, true, false).newDocument), r.formatLocale && vega.formatLocale(r.formatLocale), r.timeFormatLocale && vega.timeFormatLocale(r.timeFormatLocale), r.expressionFunctions) for (let t36 in r.expressionFunctions) {
     let n2 = r.expressionFunctions[t36];
     "fn" in n2 ? vega.expressionFunction(t36, n2.fn, n2.visitor) : n2 instanceof Function && vega.expressionFunction(t36, n2);
   }
-  let { ast: N } = r, P = vega.parse(O, T === "vega-lite" ? {} : o, { ast: N }), F = new (r.viewClass || vega.View)(P, {
+  let { ast: k } = r, A = vega.parse(T, S === "vega-lite" ? {} : o, { ast: k }), N = new (r.viewClass || vega.View)(A, {
     loader: a,
-    logger: p,
-    renderer: f,
-    ...N ? { expr: vega.expressionInterpreter ?? r.expr ?? expression } : {}
+    logger: f,
+    renderer: u,
+    ...k ? { expr: vega.expressionInterpreter ?? r.expr ?? expression } : {}
   });
-  if (F.addSignalListener("autosize", (t36, n2) => {
+  if (N.addSignalListener("autosize", (t36, n2) => {
     let { type: r2 } = n2;
-    r2 == "fit-x" ? (k.classList.add("fit-x"), k.classList.remove("fit-y")) : r2 == "fit-y" ? (k.classList.remove("fit-x"), k.classList.add("fit-y")) : r2 == "fit" ? k.classList.add("fit-x", "fit-y") : k.classList.remove("fit-x", "fit-y");
+    r2 == "fit-x" ? (E.classList.add("fit-x"), E.classList.remove("fit-y")) : r2 == "fit-y" ? (E.classList.remove("fit-x"), E.classList.add("fit-y")) : r2 == "fit" ? E.classList.add("fit-x", "fit-y") : E.classList.remove("fit-x", "fit-y");
   }), r.tooltip !== false) {
     let { loader: t36, tooltip: n2 } = r, a2 = t36 && !isLoader(t36) ? t36 == null ? void 0 : t36.baseURL : void 0, o2 = isTooltipHandler(n2) ? n2 : new Handler({
       baseURL: a2,
       ...n2 === true ? {} : n2
     }).call;
-    F.tooltip(o2);
+    N.tooltip(o2);
   }
-  let { hover: I } = r;
-  if (I === void 0 && (I = T === "vega"), I) {
-    let { hoverSet: t36, updateSet: n2 } = typeof I == "boolean" ? {} : I;
-    F.hover(t36, n2);
+  let { hover: P } = r;
+  if (P === void 0 && (P = S === "vega"), P) {
+    let { hoverSet: t36, updateSet: n2 } = typeof P == "boolean" ? {} : P;
+    N.hover(t36, n2);
   }
-  r && (r.width != null && F.width(r.width), r.height != null && F.height(r.height), r.padding != null && F.padding(r.padding)), await F.initialize(k, r.bind).runAsync();
-  let L;
+  r && (r.width != null && N.width(r.width), r.height != null && N.height(r.height), r.padding != null && N.padding(r.padding)), await N.initialize(E, r.bind).runAsync();
+  let F;
   if (s !== false) {
-    let t36 = S;
+    let t36 = _;
     if (r.defaultStyle !== false || r.forceActionsMenu) {
       let n2 = document.createElement("details");
-      n2.title = l.CLICK_TO_VIEW_ACTIONS, S.append(n2), t36 = n2;
+      n2.title = l.CLICK_TO_VIEW_ACTIONS, _.append(n2), t36 = n2;
       let r2 = document.createElement("summary");
-      r2.innerHTML = SVG_CIRCLES, n2.append(r2), L = (t37) => {
+      r2.innerHTML = SVG_CIRCLES, n2.append(r2), F = (t37) => {
         n2.contains(t37.target) || n2.removeAttribute("open");
-      }, document.addEventListener("click", L);
+      }, document.addEventListener("click", F);
     }
     let a2 = document.createElement("div");
     if (t36.append(a2), a2.classList.add("vega-actions"), s === true || s.export !== false) {
       for (let t37 of ["svg", "png"]) if (s === true || s.export === true || s.export[t37]) {
         let n2 = l[`${t37.toUpperCase()}_ACTION`], o2 = document.createElement("a"), s2 = isObject(r.scaleFactor) ? r.scaleFactor[t37] : r.scaleFactor;
-        o2.text = n2, o2.href = "#", o2.target = "_blank", o2.download = `${_}.${t37}`, o2.addEventListener("mousedown", async function(n3) {
-          n3.preventDefault(), this.href = await F.toImageURL(t37, s2);
+        o2.text = n2, o2.href = "#", o2.target = "_blank", o2.download = `${p}.${t37}`, o2.addEventListener("mousedown", async function(n3) {
+          n3.preventDefault(), this.href = await N.toImageURL(t37, s2);
         }), a2.append(o2);
       }
     }
     if (s === true || s.source !== false) {
       let t37 = document.createElement("a");
       t37.text = l.SOURCE_ACTION, t37.href = "#", t37.addEventListener("click", function(t38) {
-        viewSource(stringify(n), r.sourceHeader ?? "", r.sourceFooter ?? "", T), t38.preventDefault();
+        viewSource(stringify(n), r.sourceHeader ?? "", r.sourceFooter ?? "", S), t38.preventDefault();
       }), a2.append(t37);
     }
-    if (T === "vega-lite" && (s === true || s.compiled !== false)) {
+    if (S === "vega-lite" && (s === true || s.compiled !== false)) {
       let t37 = document.createElement("a");
       t37.text = l.COMPILED_ACTION, t37.href = "#", t37.addEventListener("click", function(t38) {
-        viewSource(stringify(O), r.sourceHeader ?? "", r.sourceFooter ?? "", "vega"), t38.preventDefault();
+        viewSource(stringify(T), r.sourceHeader ?? "", r.sourceFooter ?? "", "vega"), t38.preventDefault();
       }), a2.append(t37);
     }
     if (s === true || s.editor !== false) {
@@ -32015,21 +32015,21 @@ async function _embed(t35, n, r = {}, a) {
       s2.text = l.EDITOR_ACTION, s2.href = "#", s2.addEventListener("click", function(r2) {
         post(window, t37, {
           config: o,
-          mode: A ? "vega" : T,
-          renderer: f,
-          spec: stringify(A ? O : n)
+          mode: O ? "vega" : S,
+          renderer: u,
+          spec: stringify(O ? T : n)
         }), r2.preventDefault();
       }), a2.append(s2);
     }
   }
-  function R() {
-    L && document.removeEventListener("click", L), F.finalize();
+  function I() {
+    F && document.removeEventListener("click", F), N.finalize();
   }
   return {
-    view: F,
+    view: N,
     spec: n,
-    vgSpec: O,
-    finalize: R,
+    vgSpec: T,
+    finalize: I,
     embedOptions: r
   };
 }