@asgard-js/react 0.2.11 → 0.2.12

package/dist/index.js

@@ -1,6 +1,6 @@
-import { jsx as k, jsxs as Y, Fragment as Ts } from "react/jsx-runtime";
+import { jsx as k, jsxs as Y, Fragment as Ka } from "react/jsx-runtime";
 import * as me from "react";
-import ya, { useRef as Qt, useEffect as Ye, useState as Ne, useMemo as we, useCallback as pe, createContext as qg, useContext as Wg, useImperativeHandle as RL, memo as rt, forwardRef as DL } from "react";
+import ma, { useRef as Qt, useEffect as Ye, useState as Ne, useMemo as we, useCallback as pe, createContext as qg, useContext as Wg, useImperativeHandle as RL, memo as rt, forwardRef as DL } from "react";
 import { AsgardServiceClient as OL, EventType as yl, Conversation as Pk, Channel as LL, MessageTemplateType as zi } from "@asgard-js/core";
 function zk(e) {
   return e !== null && typeof e == "object" && !Array.isArray(e);
@@ -236,7 +236,7 @@ function qy(e, t) {
   return e === t;
 }
 function Bk(e, t) {
-  const n = Qt(), i = Qt();
+  const n = Qt(void 0), i = Qt(void 0);
   return (!i.current || !qy(i.current, t)) && (i.current = t, n.current = e()), n.current;
 }
 function Jbe(e, t = 50) {
@@ -973,7 +973,7 @@ const pI = "_chatbot_body_wrapper_13zns_1", gI = "_chatbot_body_13zns_1", mI = "
   chatbot_body_wrapper: pI,
   chatbot_body: gI,
   chatbot_body__content: mI
-}, yI = "_template_box_rjm7y_1", Hs = {
+}, yI = "_template_box_rjm7y_1", Ws = {
   template_box: yI,
   "template_box--bot": "_template_box--bot_rjm7y_7",
   "template_box--horizontal": "_template_box--horizontal_rjm7y_7",
@@ -982,11 +982,11 @@ const pI = "_chatbot_body_wrapper_13zns_1", gI = "_chatbot_body_13zns_1", mI = "
   "template_box--empty": "_template_box--empty_rjm7y_18"
 };
 function dn(e) {
-  const { type: t, children: n, style: i, className: r } = e, o = e.type === "bot" ? e.direction : "horizontal", s = e.type === "bot" ? e.isEmpty : !1, a = we(() => t === "user" ? Me(Hs.template_box, Hs["template_box--user"]) : Me(
-    Hs.template_box,
-    Hs["template_box--bot"],
-    o === "horizontal" ? Hs["template_box--horizontal"] : Hs["template_box--vertical"],
-    s && Hs["template_box--empty"]
+  const { type: t, children: n, style: i, className: r } = e, o = e.type === "bot" ? e.direction : "horizontal", s = e.type === "bot" ? e.isEmpty : !1, a = we(() => t === "user" ? Me(Ws.template_box, Ws["template_box--user"]) : Me(
+    Ws.template_box,
+    Ws["template_box--bot"],
+    o === "horizontal" ? Ws["template_box--horizontal"] : Ws["template_box--vertical"],
+    s && Ws["template_box--empty"]
   ), [o, t, s]);
   return /* @__PURE__ */ k("div", { className: Me("asgard-template-box", a, r), style: i, children: n });
 }
@@ -1498,7 +1498,7 @@ function $P(e) {
     }
   );
 }
-const AP = "_hint_root_1hmle_1", MP = "_error_hint_title_1hmle_17", TP = "_error_hint_message_1hmle_23", NP = "_hint_text_1hmle_32", FP = "_time_1hmle_36", Gs = {
+const AP = "_hint_root_1hmle_1", MP = "_error_hint_title_1hmle_17", TP = "_error_hint_message_1hmle_23", NP = "_hint_text_1hmle_32", FP = "_time_1hmle_36", Hs = {
   hint_root: AP,
   error_hint_title: MP,
   error_hint_message: TP,
@@ -1511,12 +1511,12 @@ function Kk(e) {
   }, [t, i]);
   if (t.type === "user") return null;
   if (t.type === "error")
-    return /* @__PURE__ */ k("div", { className: Me("asgard-hint-template asgard-hint-template--error", Gs.hint_root), children: r?.(t) ?? /* @__PURE__ */ Y(Ts, { children: [
-      /* @__PURE__ */ Y("div", { className: Gs.error_hint_title, children: [
-        /* @__PURE__ */ k("span", { className: Gs.time, children: Wy(t.time) }),
+    return /* @__PURE__ */ k("div", { className: Me("asgard-hint-template asgard-hint-template--error", Hs.hint_root), children: r?.(t) ?? /* @__PURE__ */ Y(Ka, { children: [
+      /* @__PURE__ */ Y("div", { className: Hs.error_hint_title, children: [
+        /* @__PURE__ */ k("span", { className: Hs.time, children: Wy(t.time) }),
         /* @__PURE__ */ k("span", { children: "Unexpected error" })
       ] }),
-      i && /* @__PURE__ */ Y("div", { className: Gs.error_hint_message, onClick: o, children: [
+      i && /* @__PURE__ */ Y("div", { className: Hs.error_hint_message, onClick: o, children: [
         "Click ",
         /* @__PURE__ */ k("span", { children: "here" }),
         " to view the report."
@@ -1527,11 +1527,11 @@ function Kk(e) {
   return s.type !== zi.HINT ? null : /* @__PURE__ */ Y(
     "div",
     {
-      className: Me("asgard-hint-template asgard-hint-template--hint", Gs.hint_root),
+      className: Me("asgard-hint-template asgard-hint-template--hint", Hs.hint_root),
       style: n?.HintMessageTemplate?.style,
       children: [
-        /* @__PURE__ */ k("div", { className: Gs.time, style: n?.time?.style, children: Wy(t.time) }),
-        /* @__PURE__ */ k("div", { className: Gs.hint_text, style: n?.HintMessageTemplate?.style, children: s.text })
+        /* @__PURE__ */ k("div", { className: Hs.time, style: n?.time?.style, children: Wy(t.time) }),
+        /* @__PURE__ */ k("div", { className: Hs.hint_text, style: n?.HintMessageTemplate?.style, children: s.text })
       ]
     }
   );
@@ -2462,7 +2462,7 @@ function ms(e, t, n) {
   const i = t < e, r = i ? Vy(t, e, n) : Vy(e, t, n);
   return (i ? -1 : 1) * (r < 0 ? 1 / -r : r);
 }
-function ba(e, t) {
+function ya(e, t) {
   let n;
   if (t === void 0)
     for (const i of e)
@@ -2510,8 +2510,8 @@ function cc(e, t, n) {
 function Xy(e, t, n) {
   if (e = Float64Array.from(rz(e, n)), !(!(i = e.length) || isNaN(t = +t))) {
     if (t <= 0 || i < 2) return Yy(e);
-    if (t >= 1) return ba(e);
-    var i, r = (i - 1) * t, o = Math.floor(r), s = ba(i4(e, o).subarray(0, o + 1)), a = Yy(e.subarray(o + 1));
+    if (t >= 1) return ya(e);
+    var i, r = (i - 1) * t, o = Math.floor(r), s = ya(i4(e, o).subarray(0, o + 1)), a = Yy(e.subarray(o + 1));
     return s + (a - s) * (r - o);
   }
 }
@@ -2606,7 +2606,7 @@ function vz(e) {
   };
 }
 var xz = /^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i;
-function Aa(e) {
+function $a(e) {
   if (!(t = xz.exec(e))) throw new Error("invalid format: " + e);
   var t;
   return new Ev({
@@ -2622,7 +2622,7 @@ function Aa(e) {
     type: t[10]
   });
 }
-Aa.prototype = Ev.prototype;
+$a.prototype = Ev.prototype;
 function Ev(e) {
   this.fill = e.fill === void 0 ? " " : e.fill + "", this.align = e.align === void 0 ? ">" : e.align + "", this.sign = e.sign === void 0 ? "-" : e.sign + "", this.symbol = e.symbol === void 0 ? "" : e.symbol + "", this.zero = !!e.zero, this.width = e.width === void 0 ? void 0 : +e.width, this.comma = !!e.comma, this.precision = e.precision === void 0 ? void 0 : +e.precision, this.trim = !!e.trim, this.type = e.type === void 0 ? "" : e.type + "";
 }
@@ -2680,7 +2680,7 @@ var oC = Array.prototype.map, sC = ["y", "z", "a", "f", "p", "n", "µ", "m", "",
 function l4(e) {
   var t = e.grouping === void 0 || e.thousands === void 0 ? rC : _z(oC.call(e.grouping, Number), e.thousands + ""), n = e.currency === void 0 ? "" : e.currency[0] + "", i = e.currency === void 0 ? "" : e.currency[1] + "", r = e.decimal === void 0 ? "." : e.decimal + "", o = e.numerals === void 0 ? rC : vz(oC.call(e.numerals, String)), s = e.percent === void 0 ? "%" : e.percent + "", a = e.minus === void 0 ? "−" : e.minus + "", l = e.nan === void 0 ? "NaN" : e.nan + "";
   function u(f, d) {
-    f = Aa(f);
+    f = $a(f);
     var h = f.fill, p = f.align, g = f.sign, m = f.symbol, y = f.zero, b = f.width, _ = f.comma, v = f.precision, w = f.trim, E = f.type;
     E === "n" ? (_ = !0, E = "g") : iC[E] || (v === void 0 && (v = 12), w = !0, E = "g"), (y || h === "0" && p === "=") && (y = !0, h = "0", p = "=");
     var x = (d && d.prefix !== void 0 ? d.prefix : "") + (m === "$" ? n : m === "#" && /[boxX]/.test(E) ? "0" + E.toLowerCase() : ""), C = (m === "$" ? i : /[%p]/.test(E) ? s : "") + (d && d.suffix !== void 0 ? d.suffix : ""), S = iC[E], A = /[defgprs%]/.test(E);
@@ -2723,7 +2723,7 @@ function l4(e) {
     }, M;
   }
   function c(f, d) {
-    var h = Math.max(-8, Math.min(8, Math.floor(Zl(d) / 3))) * 3, p = Math.pow(10, -h), g = u((f = Aa(f), f.type = "f", f), { suffix: sC[8 + h / 3] });
+    var h = Math.max(-8, Math.min(8, Math.floor(Zl(d) / 3))) * 3, p = Math.pow(10, -h), g = u((f = $a(f), f.type = "f", f), { suffix: sC[8 + h / 3] });
     return function(m) {
       return g(p * m);
     };
@@ -2972,9 +2972,9 @@ function p4(e, t) {
       }
   return o.trim();
 }
-const la = /* @__PURE__ */ new Date();
+const aa = /* @__PURE__ */ new Date();
 function Av(e) {
-  return la.setFullYear(e), la.setMonth(0), la.setDate(1), la.setHours(0, 0, 0, 0), la;
+  return aa.setFullYear(e), aa.setMonth(0), aa.setDate(1), aa.setHours(0, 0, 0, 0), aa;
 }
 function g4(e) {
   return y4(new Date(e));
@@ -3013,7 +3013,7 @@ function Jy(e) {
   return Uu.count(t - 1, e);
 }
 function Qy(e) {
-  return la.setTime(Date.UTC(e, 0, 1)), la.getUTCDay();
+  return aa.setTime(Date.UTC(e, 0, 1)), aa.getUTCDay();
 }
 function zz(e, t, n, i, r, o, s) {
   if (0 <= e && e < 100) {
@@ -3650,7 +3650,7 @@ function B4(e) {
     format: t,
     formatPrefix: n,
     formatFloat(i) {
-      const r = Aa(i || ",");
+      const r = $a(i || ",");
       if (r.precision == null) {
         switch (r.precision = 12, r.type) {
           case "%":
@@ -3670,7 +3670,7 @@ function B4(e) {
         return t(r);
     },
     formatSpan(i, r, o, s) {
-      s = Aa(s ?? ",f");
+      s = $a(s ?? ",f");
       const a = ms(i, r, o), l = Math.max(Math.abs(i), Math.abs(r));
       let u;
       if (s.precision == null)
@@ -6709,7 +6709,7 @@ const Kd = {
   median: o4,
   mean: hz,
   min: Yy,
-  max: ba
+  max: ya
 }, Nj = [];
 function gx(e) {
   O.call(this, [], e);
@@ -7704,14 +7704,14 @@ function We(e) {
     return e;
   };
 }
-const RC = Math.abs, rn = Math.atan2, Vs = Math.cos, Jj = Math.max, d1 = Math.min, mr = Math.sin, ha = Math.sqrt, sn = 1e-12, iu = Math.PI, bp = iu / 2, V5 = 2 * iu;
+const RC = Math.abs, rn = Math.atan2, Gs = Math.cos, Jj = Math.max, d1 = Math.min, mr = Math.sin, da = Math.sqrt, sn = 1e-12, iu = Math.PI, bp = iu / 2, V5 = 2 * iu;
 function Qj(e) {
   return e > 1 ? 0 : e < -1 ? iu : Math.acos(e);
 }
 function DC(e) {
   return e >= 1 ? bp : e <= -1 ? -bp : Math.asin(e);
 }
-const sb = Math.PI, ab = 2 * sb, oa = 1e-6, eq = ab - oa;
+const sb = Math.PI, ab = 2 * sb, ra = 1e-6, eq = ab - ra;
 function Y5(e) {
   this._ += e[0];
   for (let t = 1, n = e.length; t < n; ++t)
@@ -7753,17 +7753,17 @@ let Sx = class {
     let s = this._x1, a = this._y1, l = i - t, u = r - n, c = s - t, f = a - n, d = c * c + f * f;
     if (this._x1 === null)
       this._append`M${this._x1 = t},${this._y1 = n}`;
-    else if (d > oa) if (!(Math.abs(f * l - u * c) > oa) || !o)
+    else if (d > ra) if (!(Math.abs(f * l - u * c) > ra) || !o)
       this._append`L${this._x1 = t},${this._y1 = n}`;
     else {
       let h = i - s, p = r - a, g = l * l + u * u, m = h * h + p * p, y = Math.sqrt(g), b = Math.sqrt(d), _ = o * Math.tan((sb - Math.acos((g + d - m) / (2 * y * b))) / 2), v = _ / b, w = _ / y;
-      Math.abs(v - 1) > oa && this._append`L${t + v * c},${n + v * f}`, this._append`A${o},${o},0,0,${+(f * h > c * p)},${this._x1 = t + w * l},${this._y1 = n + w * u}`;
+      Math.abs(v - 1) > ra && this._append`L${t + v * c},${n + v * f}`, this._append`A${o},${o},0,0,${+(f * h > c * p)},${this._x1 = t + w * l},${this._y1 = n + w * u}`;
     }
   }
   arc(t, n, i, r, o, s) {
     if (t = +t, n = +n, i = +i, s = !!s, i < 0) throw new Error(`negative radius: ${i}`);
     let a = i * Math.cos(r), l = i * Math.sin(r), u = t + a, c = n + l, f = 1 ^ s, d = s ? r - o : o - r;
-    this._x1 === null ? this._append`M${u},${c}` : (Math.abs(this._x1 - u) > oa || Math.abs(this._y1 - c) > oa) && this._append`L${u},${c}`, i && (d < 0 && (d = d % ab + ab), d > eq ? this._append`A${i},${i},0,1,${f},${t - a},${n - l}A${i},${i},0,1,${f},${this._x1 = u},${this._y1 = c}` : d > oa && this._append`A${i},${i},0,${+(d >= sb)},${f},${this._x1 = t + i * Math.cos(o)},${this._y1 = n + i * Math.sin(o)}`);
+    this._x1 === null ? this._append`M${u},${c}` : (Math.abs(this._x1 - u) > ra || Math.abs(this._y1 - c) > ra) && this._append`L${u},${c}`, i && (d < 0 && (d = d % ab + ab), d > eq ? this._append`A${i},${i},0,1,${f},${t - a},${n - l}A${i},${i},0,1,${f},${this._x1 = u},${this._y1 = c}` : d > ra && this._append`A${i},${i},0,${+(d >= sb)},${f},${this._x1 = t + i * Math.cos(o)},${this._y1 = n + i * Math.sin(o)}`);
   }
   rect(t, n, i, r) {
     this._append`M${this._x0 = this._x1 = +t},${this._y0 = this._y1 = +n}h${i = +i}v${+r}h${-i}Z`;
@@ -7811,7 +7811,7 @@ function aq(e, t, n, i, r, o, s, a) {
     return d = (c * (t - o) - f * (e - r)) / d, [e + d * l, t + d * u];
 }
 function Zd(e, t, n, i, r, o, s) {
-  var a = e - n, l = t - i, u = (s ? o : -o) / ha(a * a + l * l), c = u * l, f = -u * a, d = e + c, h = t + f, p = n + c, g = i + f, m = (d + p) / 2, y = (h + g) / 2, b = p - d, _ = g - h, v = b * b + _ * _, w = r - o, E = d * g - p * h, x = (_ < 0 ? -1 : 1) * ha(Jj(0, w * w * v - E * E)), C = (E * _ - b * x) / v, S = (-E * b - _ * x) / v, A = (E * _ + b * x) / v, M = (-E * b + _ * x) / v, F = C - m, R = S - y, T = A - m, $ = M - y;
+  var a = e - n, l = t - i, u = (s ? o : -o) / da(a * a + l * l), c = u * l, f = -u * a, d = e + c, h = t + f, p = n + c, g = i + f, m = (d + p) / 2, y = (h + g) / 2, b = p - d, _ = g - h, v = b * b + _ * _, w = r - o, E = d * g - p * h, x = (_ < 0 ? -1 : 1) * da(Jj(0, w * w * v - E * E)), C = (E * _ - b * x) / v, S = (-E * b - _ * x) / v, A = (E * _ + b * x) / v, M = (-E * b + _ * x) / v, F = C - m, R = S - y, T = A - m, $ = M - y;
   return F * F + R * R > T * T + $ * $ && (C = A, S = M), {
     cx: C,
     cy: S,
@@ -7827,19 +7827,19 @@ function lq() {
     var c, f, d = +e.apply(this, arguments), h = +t.apply(this, arguments), p = r.apply(this, arguments) - bp, g = o.apply(this, arguments) - bp, m = RC(g - p), y = g > p;
     if (a || (a = c = l()), h < d && (f = h, h = d, d = f), !(h > sn)) a.moveTo(0, 0);
     else if (m > V5 - sn)
-      a.moveTo(h * Vs(p), h * mr(p)), a.arc(0, 0, h, p, g, !y), d > sn && (a.moveTo(d * Vs(g), d * mr(g)), a.arc(0, 0, d, g, p, y));
+      a.moveTo(h * Gs(p), h * mr(p)), a.arc(0, 0, h, p, g, !y), d > sn && (a.moveTo(d * Gs(g), d * mr(g)), a.arc(0, 0, d, g, p, y));
     else {
-      var b = p, _ = g, v = p, w = g, E = m, x = m, C = s.apply(this, arguments) / 2, S = C > sn && (i ? +i.apply(this, arguments) : ha(d * d + h * h)), A = d1(RC(h - d) / 2, +n.apply(this, arguments)), M = A, F = A, R, T;
+      var b = p, _ = g, v = p, w = g, E = m, x = m, C = s.apply(this, arguments) / 2, S = C > sn && (i ? +i.apply(this, arguments) : da(d * d + h * h)), A = d1(RC(h - d) / 2, +n.apply(this, arguments)), M = A, F = A, R, T;
       if (S > sn) {
         var $ = DC(S / d * mr(C)), N = DC(S / h * mr(C));
         (E -= $ * 2) > sn ? ($ *= y ? 1 : -1, v += $, w -= $) : (E = 0, v = w = (p + g) / 2), (x -= N * 2) > sn ? (N *= y ? 1 : -1, b += N, _ -= N) : (x = 0, b = _ = (p + g) / 2);
       }
-      var D = h * Vs(b), B = h * mr(b), I = d * Vs(w), V = d * mr(w);
+      var D = h * Gs(b), B = h * mr(b), I = d * Gs(w), V = d * mr(w);
       if (A > sn) {
-        var ue = h * Vs(_), oe = h * mr(_), ye = d * Vs(v), qe = d * mr(v), be;
+        var ue = h * Gs(_), oe = h * mr(_), ye = d * Gs(v), qe = d * mr(v), be;
         if (m < iu)
           if (be = aq(D, B, ye, qe, ue, oe, I, V)) {
-            var It = D - be[0], io = B - be[1], gr = ue - be[0], ne = oe - be[1], _e = 1 / mr(Qj((It * gr + io * ne) / (ha(It * It + io * io) * ha(gr * gr + ne * ne))) / 2), ke = ha(be[0] * be[0] + be[1] * be[1]);
+            var It = D - be[0], io = B - be[1], gr = ue - be[0], ne = oe - be[1], _e = 1 / mr(Qj((It * gr + io * ne) / (da(It * It + io * io) * da(gr * gr + ne * ne))) / 2), ke = da(be[0] * be[0] + be[1] * be[1]);
             M = d1(A, (d - ke) / (_e - 1)), F = d1(A, (h - ke) / (_e + 1));
           } else
             M = F = 0;
@@ -7850,7 +7850,7 @@ function lq() {
   }
   return u.centroid = function() {
     var c = (+e.apply(this, arguments) + +t.apply(this, arguments)) / 2, f = (+r.apply(this, arguments) + +o.apply(this, arguments)) / 2 - iu / 2;
-    return [Vs(f) * c, mr(f) * c];
+    return [Gs(f) * c, mr(f) * c];
   }, u.innerRadius = function(c) {
     return arguments.length ? (e = typeof c == "function" ? c : We(+c), u) : e;
   }, u.outerRadius = function(c) {
@@ -7981,7 +7981,7 @@ function eN(e, t, n) {
 }
 const uq = {
   draw(e, t) {
-    const n = ha(t / iu);
+    const n = da(t / iu);
     e.moveTo(n, 0), e.arc(0, 0, n, 0, V5);
   }
 };
@@ -8714,7 +8714,7 @@ function Hr(e, t) {
   }
   return this;
 }
-function Ns(e, t) {
+function Ts(e, t) {
   switch (arguments.length) {
     case 0:
       break;
@@ -8762,9 +8762,9 @@ function td(e, t) {
   for (var i in t) n[i] = t[i];
   return n;
 }
-function Fs() {
+function Ns() {
 }
-var Ma = 0.7, ru = 1 / Ma, jl = "\\s*([+-]?\\d+)\\s*", kf = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*", Mr = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*", Mq = /^#([0-9a-f]{3,8})$/, Tq = new RegExp(`^rgb\\(${jl},${jl},${jl}\\)$`), Nq = new RegExp(`^rgb\\(${Mr},${Mr},${Mr}\\)$`), Fq = new RegExp(`^rgba\\(${jl},${jl},${jl},${kf}\\)$`), Rq = new RegExp(`^rgba\\(${Mr},${Mr},${Mr},${kf}\\)$`), Dq = new RegExp(`^hsl\\(${kf},${Mr},${Mr}\\)$`), Oq = new RegExp(`^hsla\\(${kf},${Mr},${Mr},${kf}\\)$`), zC = {
+var Aa = 0.7, ru = 1 / Aa, jl = "\\s*([+-]?\\d+)\\s*", kf = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*", Mr = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*", Mq = /^#([0-9a-f]{3,8})$/, Tq = new RegExp(`^rgb\\(${jl},${jl},${jl}\\)$`), Nq = new RegExp(`^rgb\\(${Mr},${Mr},${Mr}\\)$`), Fq = new RegExp(`^rgba\\(${jl},${jl},${jl},${kf}\\)$`), Rq = new RegExp(`^rgba\\(${Mr},${Mr},${Mr},${kf}\\)$`), Dq = new RegExp(`^hsl\\(${kf},${Mr},${Mr}\\)$`), Oq = new RegExp(`^hsla\\(${kf},${Mr},${Mr},${kf}\\)$`), zC = {
   aliceblue: 15792383,
   antiquewhite: 16444375,
   aqua: 65535,
@@ -8914,7 +8914,7 @@ var Ma = 0.7, ru = 1 / Ma, jl = "\\s*([+-]?\\d+)\\s*", kf = "\\s*([+-]?(?:\\d*\\
   yellow: 16776960,
   yellowgreen: 10145074
 };
-Hu(Fs, Cf, {
+Hu(Ns, Cf, {
   copy(e) {
     return Object.assign(new this.constructor(), this, e);
   },
@@ -8952,7 +8952,7 @@ function Jd(e, t, n, i) {
   return i <= 0 && (e = t = n = NaN), new zt(e, t, n, i);
 }
 function Rx(e) {
-  return e instanceof Fs || (e = Cf(e)), e ? (e = e.rgb(), new zt(e.r, e.g, e.b, e.opacity)) : new zt();
+  return e instanceof Ns || (e = Cf(e)), e ? (e = e.rgb(), new zt(e.r, e.g, e.b, e.opacity)) : new zt();
 }
 function _s(e, t, n, i) {
   return arguments.length === 1 ? Rx(e) : new zt(e, t, n, i ?? 1);
@@ -8960,18 +8960,18 @@ function _s(e, t, n, i) {
 function zt(e, t, n, i) {
   this.r = +e, this.g = +t, this.b = +n, this.opacity = +i;
 }
-Hu(zt, _s, td(Fs, {
+Hu(zt, _s, td(Ns, {
   brighter(e) {
     return e = e == null ? ru : Math.pow(ru, e), new zt(this.r * e, this.g * e, this.b * e, this.opacity);
   },
   darker(e) {
-    return e = e == null ? Ma : Math.pow(Ma, e), new zt(this.r * e, this.g * e, this.b * e, this.opacity);
+    return e = e == null ? Aa : Math.pow(Aa, e), new zt(this.r * e, this.g * e, this.b * e, this.opacity);
   },
   rgb() {
     return this;
   },
   clamp() {
-    return new zt(_a(this.r), _a(this.g), _a(this.b), wp(this.opacity));
+    return new zt(ba(this.r), ba(this.g), ba(this.b), wp(this.opacity));
   },
   displayable() {
     return -0.5 <= this.r && this.r < 255.5 && -0.5 <= this.g && this.g < 255.5 && -0.5 <= this.b && this.b < 255.5 && 0 <= this.opacity && this.opacity <= 1;
@@ -8984,30 +8984,30 @@ Hu(zt, _s, td(Fs, {
   toString: WC
 }));
 function qC() {
-  return `#${pa(this.r)}${pa(this.g)}${pa(this.b)}`;
+  return `#${ha(this.r)}${ha(this.g)}${ha(this.b)}`;
 }
 function Pq() {
-  return `#${pa(this.r)}${pa(this.g)}${pa(this.b)}${pa((isNaN(this.opacity) ? 1 : this.opacity) * 255)}`;
+  return `#${ha(this.r)}${ha(this.g)}${ha(this.b)}${ha((isNaN(this.opacity) ? 1 : this.opacity) * 255)}`;
 }
 function WC() {
   const e = wp(this.opacity);
-  return `${e === 1 ? "rgb(" : "rgba("}${_a(this.r)}, ${_a(this.g)}, ${_a(this.b)}${e === 1 ? ")" : `, ${e})`}`;
+  return `${e === 1 ? "rgb(" : "rgba("}${ba(this.r)}, ${ba(this.g)}, ${ba(this.b)}${e === 1 ? ")" : `, ${e})`}`;
 }
 function wp(e) {
   return isNaN(e) ? 1 : Math.max(0, Math.min(1, e));
 }
-function _a(e) {
+function ba(e) {
   return Math.max(0, Math.min(255, Math.round(e) || 0));
 }
-function pa(e) {
-  return e = _a(e), (e < 16 ? "0" : "") + e.toString(16);
+function ha(e) {
+  return e = ba(e), (e < 16 ? "0" : "") + e.toString(16);
 }
 function HC(e, t, n, i) {
   return i <= 0 ? e = t = n = NaN : n <= 0 || n >= 1 ? e = t = NaN : t <= 0 && (e = NaN), new Gi(e, t, n, i);
 }
 function fN(e) {
   if (e instanceof Gi) return new Gi(e.h, e.s, e.l, e.opacity);
-  if (e instanceof Fs || (e = Cf(e)), !e) return new Gi();
+  if (e instanceof Ns || (e = Cf(e)), !e) return new Gi();
   if (e instanceof Gi) return e;
   e = e.rgb();
   var t = e.r / 255, n = e.g / 255, i = e.b / 255, r = Math.min(t, n, i), o = Math.max(t, n, i), s = NaN, a = o - r, l = (o + r) / 2;
@@ -9019,12 +9019,12 @@ function Ep(e, t, n, i) {
 function Gi(e, t, n, i) {
   this.h = +e, this.s = +t, this.l = +n, this.opacity = +i;
 }
-Hu(Gi, Ep, td(Fs, {
+Hu(Gi, Ep, td(Ns, {
   brighter(e) {
     return e = e == null ? ru : Math.pow(ru, e), new Gi(this.h, this.s, this.l * e, this.opacity);
   },
   darker(e) {
-    return e = e == null ? Ma : Math.pow(Ma, e), new Gi(this.h, this.s, this.l * e, this.opacity);
+    return e = e == null ? Aa : Math.pow(Aa, e), new Gi(this.h, this.s, this.l * e, this.opacity);
   },
   rgb() {
     var e = this.h % 360 + (this.h < 0) * 360, t = isNaN(e) || isNaN(this.s) ? 0 : this.s, n = this.l, i = n + (n < 0.5 ? n : 1 - n) * t, r = 2 * n - i;
@@ -9069,7 +9069,7 @@ function Cp(e, t, n, i) {
 function Tr(e, t, n, i) {
   this.l = +e, this.a = +t, this.b = +n, this.opacity = +i;
 }
-Hu(Tr, Cp, td(Fs, {
+Hu(Tr, Cp, td(Ns, {
   brighter(e) {
     return new Tr(this.l + kp * (e ?? 1), this.a, this.b, this.opacity);
   },
@@ -9115,7 +9115,7 @@ function vN(e) {
   var t = e.h * dN;
   return new Tr(e.l, Math.cos(t) * e.c, Math.sin(t) * e.c, e.opacity);
 }
-Hu(yo, Sp, td(Fs, {
+Hu(yo, Sp, td(Ns, {
   brighter(e) {
     return new yo(this.h, this.c, this.l + kp * (e ?? 1), this.opacity);
   },
@@ -9128,23 +9128,23 @@ Hu(yo, Sp, td(Fs, {
 }));
 var xN = -0.14861, Dx = 1.78277, Ox = -0.29227, mm = -0.90649, Sf = 1.97294, VC = Sf * mm, YC = Sf * Dx, XC = Dx * Ox - mm * xN;
 function Uq(e) {
-  if (e instanceof va) return new va(e.h, e.s, e.l, e.opacity);
+  if (e instanceof _a) return new _a(e.h, e.s, e.l, e.opacity);
   e instanceof zt || (e = Rx(e));
   var t = e.r / 255, n = e.g / 255, i = e.b / 255, r = (XC * i + VC * t - YC * n) / (XC + VC - YC), o = i - r, s = (Sf * (n - r) - Ox * o) / mm, a = Math.sqrt(s * s + o * o) / (Sf * r * (1 - r)), l = a ? Math.atan2(s, o) * hN - 120 : NaN;
-  return new va(l < 0 ? l + 360 : l, a, r, e.opacity);
+  return new _a(l < 0 ? l + 360 : l, a, r, e.opacity);
 }
 function ub(e, t, n, i) {
-  return arguments.length === 1 ? Uq(e) : new va(e, t, n, i ?? 1);
+  return arguments.length === 1 ? Uq(e) : new _a(e, t, n, i ?? 1);
 }
-function va(e, t, n, i) {
+function _a(e, t, n, i) {
   this.h = +e, this.s = +t, this.l = +n, this.opacity = +i;
 }
-Hu(va, ub, td(Fs, {
+Hu(_a, ub, td(Ns, {
   brighter(e) {
-    return e = e == null ? ru : Math.pow(ru, e), new va(this.h, this.s, this.l * e, this.opacity);
+    return e = e == null ? ru : Math.pow(ru, e), new _a(this.h, this.s, this.l * e, this.opacity);
   },
   darker(e) {
-    return e = e == null ? Ma : Math.pow(Ma, e), new va(this.h, this.s, this.l * e, this.opacity);
+    return e = e == null ? Aa : Math.pow(Aa, e), new _a(this.h, this.s, this.l * e, this.opacity);
   },
   rgb() {
     var e = isNaN(this.h) ? 0 : (this.h + 120) * dN, t = +this.l, n = isNaN(this.s) ? 0 : this.s * t * (1 - t), i = Math.cos(e), r = Math.sin(e);
@@ -9235,7 +9235,7 @@ function Gq(e, t) {
 }
 function AN(e, t) {
   var n = t ? t.length : 0, i = e ? Math.min(n, e.length) : 0, r = new Array(i), o = new Array(n), s;
-  for (s = 0; s < i; ++s) r[s] = Rs(e[s], t[s]);
+  for (s = 0; s < i; ++s) r[s] = Fs(e[s], t[s]);
   for (; s < n; ++s) o[s] = t[s];
   return function(a) {
     for (s = 0; s < i; ++s) o[s] = r[s](a);
@@ -9257,7 +9257,7 @@ function TN(e, t) {
   var n = {}, i = {}, r;
   (e === null || typeof e != "object") && (e = {}), (t === null || typeof t != "object") && (t = {});
   for (r in t)
-    r in e ? n[r] = Rs(e[r], t[r]) : i[r] = t[r];
+    r in e ? n[r] = Fs(e[r], t[r]) : i[r] = t[r];
   return function(o) {
     for (r in n) i[r] = n[r](o);
     return i;
@@ -9283,7 +9283,7 @@ function NN(e, t) {
     return a.join("");
   });
 }
-function Rs(e, t) {
+function Fs(e, t) {
   var n = typeof t, i;
   return t == null || n === "boolean" ? ym(t) : (n === "number" ? Wi : n === "string" ? (i = Cf(t)) ? (t = i, cb) : NN : t instanceof Cf ? cb : t instanceof Date ? MN : $N(t) ? Lx : Array.isArray(t) ? AN : typeof t.valueOf != "function" && typeof t.toString != "function" || isNaN(t) ? TN : Wi)(e, t);
 }
@@ -9442,7 +9442,7 @@ function LN(e) {
 const cW = LN(bm);
 var fW = LN(Bt);
 function Ix(e, t) {
-  t === void 0 && (t = e, e = Rs);
+  t === void 0 && (t = e, e = Fs);
   for (var n = 0, i = t.length - 1, r = t[0], o = new Array(i < 0 ? 0 : i); n < i; ) o[n] = e(r, r = t[++n]);
   return function(s) {
     var a = Math.max(0, Math.min(i - 1, Math.floor(s *= i)));
@@ -9455,7 +9455,7 @@ function dW(e, t) {
 }
 const hW = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  interpolate: Rs,
+  interpolate: Fs,
   interpolateArray: Gq,
   interpolateBasis: EN,
   interpolateBasisClosed: kN,
@@ -9525,7 +9525,7 @@ function id(e, t) {
   return t.domain(e.domain()).range(e.range()).interpolate(e.interpolate()).clamp(e.clamp()).unknown(e.unknown());
 }
 function _m() {
-  var e = JC, t = JC, n = Rs, i, r, o, s = Un, a, l, u;
+  var e = JC, t = JC, n = Fs, i, r, o, s = Un, a, l, u;
   function c() {
     var d = Math.min(e.length, t.length);
     return s !== Un && (s = gW(e[0], e[d - 1])), a = d > 2 ? yW : mW, l = u = null, f;
@@ -9556,7 +9556,7 @@ function IN() {
 }
 function PN(e, t, n, i) {
   var r = ms(e, t, n), o;
-  switch (i = Aa(i ?? ",f"), i.type) {
+  switch (i = $a(i ?? ",f"), i.type) {
     case "s": {
       var s = Math.max(Math.abs(e), Math.abs(t));
       return i.precision == null && !isNaN(o = c4(r, s)) && (i.precision = o), kv(i, s);
@@ -9687,7 +9687,7 @@ function Px(e) {
       y = Gy(d, h, Math.min(h - d, m)).map(o);
     return f ? y.reverse() : y;
   }, t.tickFormat = (a, l) => {
-    if (a == null && (a = 10), l == null && (l = i === 10 ? "s" : ","), typeof l != "function" && (!(i % 1) && (l = Aa(l)).precision == null && (l.trim = !0), l = Yg(l)), a === 1 / 0) return l;
+    if (a == null && (a = 10), l == null && (l = i === 10 ? "s" : ","), typeof l != "function" && (!(i % 1) && (l = $a(l)).precision == null && (l.trim = !0), l = Yg(l)), a === 1 / 0) return l;
     const u = Math.max(1, i * a / t.ticks().length);
     return (c) => {
       let f = c / o(Math.round(r(c)));
@@ -9878,38 +9878,38 @@ function vm() {
       return arguments.length ? ([h, p] = d, s = f(h, p), u) : [s(0), s(1)];
     };
   }
-  return u.range = c(Rs), u.rangeRound = c(nd), u.unknown = function(f) {
+  return u.range = c(Fs), u.rangeRound = c(nd), u.unknown = function(f) {
     return arguments.length ? (l = f, u) : l;
   }, function(f) {
     return o = f, n = f(e), i = f(t), r = n === i ? 0 : 1 / (i - n), u;
   };
 }
-function Ds(e, t) {
+function Rs(e, t) {
   return t.domain(e.domain()).interpolator(e.interpolator()).clamp(e.clamp()).unknown(e.unknown());
 }
 function qx() {
   var e = il(vm()(Un));
   return e.copy = function() {
-    return Ds(e, qx());
-  }, Ns.apply(e, arguments);
+    return Rs(e, qx());
+  }, Ts.apply(e, arguments);
 }
 function VN() {
   var e = Px(vm()).domain([1, 10]);
   return e.copy = function() {
-    return Ds(e, VN()).base(e.base());
-  }, Ns.apply(e, arguments);
+    return Rs(e, VN()).base(e.base());
+  }, Ts.apply(e, arguments);
 }
 function YN() {
   var e = zx(vm());
   return e.copy = function() {
-    return Ds(e, YN()).constant(e.constant());
-  }, Ns.apply(e, arguments);
+    return Rs(e, YN()).constant(e.constant());
+  }, Ts.apply(e, arguments);
 }
 function Wx() {
   var e = Bx(vm());
   return e.copy = function() {
-    return Ds(e, Wx()).exponent(e.exponent());
-  }, Ns.apply(e, arguments);
+    return Rs(e, Wx()).exponent(e.exponent());
+  }, Ts.apply(e, arguments);
 }
 function TW() {
   return Wx.apply(null, arguments).exponent(0.5);
@@ -9932,7 +9932,7 @@ function xm() {
       return arguments.length ? ([y, b, _] = m, u = Ix(g, [y, b, _]), h) : [u(0), u(0.5), u(1)];
     };
   }
-  return h.range = p(Rs), h.rangeRound = p(nd), h.unknown = function(g) {
+  return h.range = p(Fs), h.rangeRound = p(nd), h.unknown = function(g) {
     return arguments.length ? (d = g, h) : d;
   }, function(g) {
     return c = g, r = g(e), o = g(t), s = g(n), a = r === o ? 0 : 0.5 / (o - r), l = o === s ? 0 : 0.5 / (s - o), i = o < r ? -1 : 1, h;
@@ -9941,26 +9941,26 @@ function xm() {
 function XN() {
   var e = il(xm()(Un));
   return e.copy = function() {
-    return Ds(e, XN());
-  }, Ns.apply(e, arguments);
+    return Rs(e, XN());
+  }, Ts.apply(e, arguments);
 }
 function KN() {
   var e = Px(xm()).domain([0.1, 1, 10]);
   return e.copy = function() {
-    return Ds(e, KN()).base(e.base());
-  }, Ns.apply(e, arguments);
+    return Rs(e, KN()).base(e.base());
+  }, Ts.apply(e, arguments);
 }
 function ZN() {
   var e = zx(xm());
   return e.copy = function() {
-    return Ds(e, ZN()).constant(e.constant());
-  }, Ns.apply(e, arguments);
+    return Rs(e, ZN()).constant(e.constant());
+  }, Ts.apply(e, arguments);
 }
 function Hx() {
   var e = Bx(xm());
   return e.copy = function() {
-    return Ds(e, Hx()).exponent(e.exponent());
-  }, Ns.apply(e, arguments);
+    return Rs(e, Hx()).exponent(e.exponent());
+  }, Ts.apply(e, arguments);
 }
 function NW() {
   return Hx.apply(null, arguments).exponent(0.5);
@@ -9974,7 +9974,7 @@ function Gx(e, t, n) {
   const i = e - t + n * 2;
   return e ? i > 0 ? i : 1 : 0;
 }
-const jW = "identity", ou = "linear", Mo = "log", rd = "pow", od = "sqrt", wm = "symlog", Ta = "time", Na = "utc", Nr = "sequential", Gu = "diverging", su = "quantile", Em = "quantize", km = "threshold", Vx = "ordinal", gb = "point", JN = "band", Yx = "bin-ordinal", Lt = "continuous", sd = "discrete", ad = "discretizing", Ri = "interpolating", Xx = "temporal";
+const jW = "identity", ou = "linear", Mo = "log", rd = "pow", od = "sqrt", wm = "symlog", Ma = "time", Ta = "utc", Nr = "sequential", Gu = "diverging", su = "quantile", Em = "quantize", km = "threshold", Vx = "ordinal", gb = "point", JN = "band", Yx = "bin-ordinal", Lt = "continuous", sd = "discrete", ad = "discretizing", Ri = "interpolating", Xx = "temporal";
 function qW(e) {
   return function(t) {
     let n = t[0], i = t[1], r;
@@ -10087,8 +10087,8 @@ Ue(Mo, jN, [Lt, Mo]);
 Ue(rd, Ux, Lt);
 Ue(od, CW, Lt);
 Ue(wm, qN, Lt);
-Ue(Ta, AW, [Lt, Xx]);
-Ue(Na, MW, [Lt, Xx]);
+Ue(Ma, AW, [Lt, Xx]);
+Ue(Ta, MW, [Lt, Xx]);
 Ue(Nr, qx, [Lt, Ri]);
 Ue(`${Nr}-${ou}`, qx, [Lt, Ri]);
 Ue(`${Nr}-${Mo}`, VN, [Lt, Ri, Mo]);
@@ -10252,7 +10252,7 @@ function Qx(e, t) {
 const Ph = "symbol", tH = "discrete", nH = "gradient", iH = (e) => z(e) ? e.map((t) => String(t)) : String(e), rH = (e, t) => e[1] - t[1], oH = (e, t) => t[1] - e[1];
 function e2(e, t, n) {
   let i;
-  return ze(t) && (e.bins && (t = Math.max(t, e.bins.length)), n != null && (t = Math.min(t, Math.floor(Zf(e.domain()) / n || 1) + 1))), Z(t) && (i = t.step, t = t.interval), J(t) && (t = e.type === Ta ? ju(t) : e.type == Na ? qu(t) : L("Only time and utc scales accept interval strings."), i && (t = t.every(i))), t;
+  return ze(t) && (e.bins && (t = Math.max(t, e.bins.length)), n != null && (t = Math.min(t, Math.floor(Zf(e.domain()) / n || 1) + 1))), Z(t) && (i = t.step, t = t.interval), J(t) && (t = e.type === Ma ? ju(t) : e.type == Ta ? qu(t) : L("Only time and utc scales accept interval strings."), i && (t = t.every(i))), t;
 }
 function d6(e, t, n) {
   let i = e.range(), r = i[0], o = Re(i), s = rH;
@@ -10270,9 +10270,9 @@ function t2(e, t) {
 function h6(e, t, n, i, r, o) {
   const s = t.type;
   let a = iH;
-  if (s === Ta || r === Ta)
+  if (s === Ma || r === Ma)
     a = e.timeFormat(i);
-  else if (s === Na || r === Na)
+  else if (s === Ta || r === Ta)
     a = e.utcFormat(i);
   else if (r6(s)) {
     const l = e.formatFloat(i);
@@ -10323,7 +10323,7 @@ function lH(e) {
 }
 const uH = (e) => yb[e.type] || e.bins;
 function y6(e, t, n, i, r, o, s) {
-  const a = g6[t.type] && o !== Ta && o !== Na ? sH(e, t, r) : h6(e, t, n, r, o, s);
+  const a = g6[t.type] && o !== Ma && o !== Ta ? sH(e, t, r) : h6(e, t, n, r, o, s);
   return i === Ph && uH(t) ? cH(a) : i === tH ? fH(a) : dH(a);
 }
 const cH = (e) => (t, n, i) => {
@@ -10341,7 +10341,7 @@ function hH(e) {
 }
 function pH(e, t, n, i) {
   const r = i || t.type;
-  return J(n) && KW(r) && (n = n.replace(/%a/g, "%A").replace(/%b/g, "%B")), !n && r === Ta ? e.timeFormat("%A, %d %B %Y, %X") : !n && r === Na ? e.utcFormat("%A, %d %B %Y, %X UTC") : y6(e, t, 5, null, n, i, !0);
+  return J(n) && KW(r) && (n = n.replace(/%a/g, "%A").replace(/%b/g, "%B")), !n && r === Ma ? e.timeFormat("%A, %d %B %Y, %X") : !n && r === Ta ? e.utcFormat("%A, %d %B %Y, %X UTC") : y6(e, t, 5, null, n, i, !0);
 }
 function b6(e, t, n) {
   n = n || {};
@@ -10501,7 +10501,7 @@ function xH(e, t, n) {
     }
   return i;
 }
-const vs = Math.PI / 180, wH = 1e-14, ua = Math.PI / 2, Cr = Math.PI * 2, vl = Math.sqrt(3) / 2;
+const vs = Math.PI / 180, wH = 1e-14, la = Math.PI / 2, Cr = Math.PI * 2, vl = Math.sqrt(3) / 2;
 var v1 = {}, x1 = {}, w6 = [].join;
 function EH(e, t, n, i, r, o, s, a, l) {
   const u = w6.call(arguments);
@@ -10520,7 +10520,7 @@ function EH(e, t, n, i, r, o, s, a, l) {
   const M = 0.5 * (v + E) - A * (x - w), F = 0.5 * (w + x) + A * (E - v), R = Math.atan2(w - F, v - M);
   let $ = Math.atan2(x - F, E - M) - R;
   $ < 0 && o === 1 ? $ += Cr : $ > 0 && o === 0 && ($ -= Cr);
-  const N = Math.ceil(Math.abs($ / (ua + 1e-3))), D = [];
+  const N = Math.ceil(Math.abs($ / (la + 1e-3))), D = [];
   for (let B = 0; B < N; ++B) {
     const I = R + B * $ / N, V = R + (B + 1) * $ / N;
     D[B] = [M, F, I, V, n, i, f, d];
@@ -11001,10 +11001,10 @@ function lG(e, t) {
   return e.strokeJoin && e.strokeJoin !== "miter" ? 0 : t;
 }
 const uG = Cr - 1e-8;
-let Mm, zh, Bh, ga, bb, Uh, _b, vb;
-const es = (e, t) => Mm.add(e, t), jh = (e, t) => es(zh = e, Bh = t), pS = (e) => es(e, Mm.y1), gS = (e) => es(Mm.x1, e), ca = (e, t) => bb * e + _b * t, fa = (e, t) => Uh * e + vb * t, E1 = (e, t) => es(ca(e, t), fa(e, t)), k1 = (e, t) => jh(ca(e, t), fa(e, t));
+let Mm, zh, Bh, pa, bb, Uh, _b, vb;
+const es = (e, t) => Mm.add(e, t), jh = (e, t) => es(zh = e, Bh = t), pS = (e) => es(e, Mm.y1), gS = (e) => es(Mm.x1, e), ua = (e, t) => bb * e + _b * t, ca = (e, t) => Uh * e + vb * t, E1 = (e, t) => es(ua(e, t), ca(e, t)), k1 = (e, t) => jh(ua(e, t), ca(e, t));
 function fd(e, t) {
-  return Mm = e, t ? (ga = t * vs, bb = vb = Math.cos(ga), Uh = Math.sin(ga), _b = -Uh) : (bb = vb = 1, ga = Uh = _b = 0), cG;
+  return Mm = e, t ? (pa = t * vs, bb = vb = Math.cos(pa), Uh = Math.sin(pa), _b = -Uh) : (bb = vb = 1, pa = Uh = _b = 0), cG;
 }
 const cG = {
   beginPath() {
@@ -11014,27 +11014,27 @@ const cG = {
   moveTo: k1,
   lineTo: k1,
   rect(e, t, n, i) {
-    ga ? (E1(e + n, t), E1(e + n, t + i), E1(e, t + i), k1(e, t)) : (es(e + n, t + i), jh(e, t));
+    pa ? (E1(e + n, t), E1(e + n, t + i), E1(e, t + i), k1(e, t)) : (es(e + n, t + i), jh(e, t));
   },
   quadraticCurveTo(e, t, n, i) {
-    const r = ca(e, t), o = fa(e, t), s = ca(n, i), a = fa(n, i);
+    const r = ua(e, t), o = ca(e, t), s = ua(n, i), a = ca(n, i);
     mS(zh, r, s, pS), mS(Bh, o, a, gS), jh(s, a);
   },
   bezierCurveTo(e, t, n, i, r, o) {
-    const s = ca(e, t), a = fa(e, t), l = ca(n, i), u = fa(n, i), c = ca(r, o), f = fa(r, o);
+    const s = ua(e, t), a = ca(e, t), l = ua(n, i), u = ca(n, i), c = ua(r, o), f = ca(r, o);
     yS(zh, s, l, c, pS), yS(Bh, a, u, f, gS), jh(c, f);
   },
   arc(e, t, n, i, r, o) {
-    if (i += ga, r += ga, zh = n * Math.cos(r) + e, Bh = n * Math.sin(r) + t, Math.abs(r - i) > uG)
+    if (i += pa, r += pa, zh = n * Math.cos(r) + e, Bh = n * Math.sin(r) + t, Math.abs(r - i) > uG)
       es(e - n, t - n), es(e + n, t + n);
     else {
       const s = (u) => es(n * Math.cos(u) + e, n * Math.sin(u) + t);
       let a, l;
       if (s(i), s(r), r !== i)
         if (i = i % Cr, i < 0 && (i += Cr), r = r % Cr, r < 0 && (r += Cr), r < i && (o = !o, a = i, i = r, r = a), o)
-          for (r -= Cr, a = i - i % ua, l = 0; l < 4 && a > r; ++l, a -= ua) s(a);
+          for (r -= Cr, a = i - i % la, l = 0; l < 4 && a > r; ++l, a -= la) s(a);
         else
-          for (a = i - i % ua + ua, l = 0; l < 4 && a < r; ++l, a = a + ua) s(a);
+          for (a = i - i % la + la, l = 0; l < 4 && a < r; ++l, a = a + la) s(a);
     }
   }
 };
@@ -11209,7 +11209,7 @@ function dd(e, t) {
 function c2(e) {
   return Tm(dd(e));
 }
-function xa(e, t) {
+function va(e, t) {
   return "translate(" + e + "," + t + ")";
 }
 function f2(e) {
@@ -11219,13 +11219,13 @@ function gG(e, t) {
   return "scale(" + e + "," + t + ")";
 }
 function F6(e) {
-  return xa(e.x || 0, e.y || 0);
+  return va(e.x || 0, e.y || 0);
 }
 function mG(e) {
-  return xa(e.x || 0, e.y || 0) + (e.angle ? " " + f2(e.angle) : "");
+  return va(e.x || 0, e.y || 0) + (e.angle ? " " + f2(e.angle) : "");
 }
 function yG(e) {
-  return xa(e.x || 0, e.y || 0) + (e.angle ? " " + f2(e.angle) : "") + (e.scaleX || e.scaleY ? " " + gG(e.scaleX || 1, e.scaleY || 1) : "");
+  return va(e.x || 0, e.y || 0) + (e.angle ? " " + f2(e.angle) : "") + (e.scaleX || e.scaleY ? " " + gG(e.scaleX || 1, e.scaleY || 1) : "");
 }
 function d2(e, t, n) {
   function i(s, a) {
@@ -11407,7 +11407,7 @@ function Fm(e, t) {
 }
 function LG(e, t, n) {
   const i = p2(t, n), r = g2(t, i), o = m2(t, i), s = (t.x || 0) - Nm(t.align, r), a = (t.y || 0) - Fm(t.baseline, o), l = !i.src && i.toDataURL ? i.toDataURL() : i.src || "";
-  e("href", l, Mf["xmlns:xlink"], "xlink:href"), e("transform", xa(s, a)), e("width", r), e("height", o), e("preserveAspectRatio", t.aspect === !1 ? "none" : "xMidYMid");
+  e("href", l, Mf["xmlns:xlink"], "xlink:href"), e("transform", va(s, a)), e("width", r), e("height", o), e("preserveAspectRatio", t.aspect === !1 ? "none" : "xMidYMid");
 }
 function IG(e, t) {
   const n = t.image, i = g2(t, n), r = m2(t, n), o = (t.x || 0) - Nm(t.align, i), s = (t.y || 0) - Fm(t.baseline, r);
@@ -11600,11 +11600,11 @@ const iV = {
 }, of = new St();
 function Dm(e) {
   var t = e.x || 0, n = e.y || 0, i = e.radius || 0, r;
-  return i && (r = (e.theta || 0) - ua, t += i * Math.cos(r), n += i * Math.sin(r)), of.x1 = t, of.y1 = n, of;
+  return i && (r = (e.theta || 0) - la, t += i * Math.cos(r), n += i * Math.sin(r)), of.x1 = t, of.y1 = n, of;
 }
 function rV(e, t) {
   var n = t.dx || 0, i = (t.dy || 0) + _2(t), r = Dm(t), o = r.x1, s = r.y1, a = t.angle || 0, l;
-  e("text-anchor", iV[t.align] || "start"), a ? (l = xa(o, s) + " " + f2(a), (n || i) && (l += " " + xa(n, i))) : l = xa(o + n, s + i), e("transform", l);
+  e("text-anchor", iV[t.align] || "start"), a ? (l = va(o, s) + " " + f2(a), (n || i) && (l += " " + va(n, i))) : l = va(o + n, s + i), e("transform", l);
 }
 function v2(e, t, n) {
   var i = oi.height(t), r = t.align, o = Dm(t), s = o.x1, a = o.y1, l = t.dx || 0, u = (t.dy || 0) + _2(t) - Math.round(0.8 * i), c = hd(t), f;
@@ -13033,25 +13033,25 @@ const dF = "canvas", hF = "hybrid", pF = "png", gF = "svg", mF = "none", is = {
   SVG: gF,
   Hybrid: hF,
   None: mF
-}, Fa = {};
-Fa[dF] = Fa[pF] = {
+}, Na = {};
+Na[dF] = Na[pF] = {
   renderer: Pp,
   headless: Pp,
   handler: md
 };
-Fa[gF] = {
+Na[gF] = {
   renderer: A2,
   headless: cF,
   handler: J6
 };
-Fa[hF] = {
+Na[hF] = {
   renderer: $b,
   headless: $b,
   handler: fF
 };
-Fa[mF] = {};
+Na[mF] = {};
 function Lm(e, t) {
-  return e = String(e || "").toLowerCase(), arguments.length > 1 ? (Fa[e] = t, this) : Fa[e];
+  return e = String(e || "").toLowerCase(), arguments.length > 1 ? (Na[e] = t, this) : Na[e];
 }
 function yF(e, t, n) {
   const i = [], r = new St().union(t), o = e.marktype;
@@ -13973,7 +13973,7 @@ function VY(e) {
 }
 function YY(e) {
   const t = e.type;
-  return Zx(t) && t !== Ta && t !== Na && (e.scheme || e.range && e.range.length && e.range.every(J));
+  return Zx(t) && t !== Ma && t !== Ta && (e.scheme || e.range && e.range.length && e.range.every(J));
 }
 function XY(e, t, n) {
   const i = KY(e, t.domainRaw, n);
@@ -14021,7 +14021,7 @@ function QY(e, t, n) {
   }
   if (o && o6(i))
     return e.interpolator(Cm(Tb(o, t.reverse), t.interpolate, t.interpolateGamma));
-  o && t.interpolate && e.interpolate ? e.interpolate(Jx(t.interpolate, t.interpolateGamma)) : ve(e.round) ? e.round(r) : ve(e.rangeRound) && e.interpolate(r ? nd : Rs), o && e.range(Tb(o, t.reverse));
+  o && t.interpolate && e.interpolate ? e.interpolate(Jx(t.interpolate, t.interpolateGamma)) : ve(e.round) ? e.round(r) : ve(e.rangeRound) && e.interpolate(r ? nd : Fs), o && e.range(Tb(o, t.reverse));
 }
 function eX(e, t, n) {
   e !== JN && e !== gb && L("Only band and point scales support rangeStep.");
@@ -14220,7 +14220,7 @@ function cX(e) {
 function Vp(e) {
   return [Ti(e[1], e[0]), Hn(e[2])];
 }
-function Ra(e) {
+function Fa(e) {
   var t = e[0], n = e[1], i = fe(n);
   return [i * fe(t), i * le(t), le(n)];
 }
@@ -14240,7 +14240,7 @@ function Yp(e) {
   var t = Fn(e[0] * e[0] + e[1] * e[1] + e[2] * e[2]);
   e[0] /= t, e[1] /= t, e[2] /= t;
 }
-var ct, zn, ht, Qn, sa, rR, oR, Wl, lf, Ko, To, uo = {
+var ct, zn, ht, Qn, oa, rR, oR, Wl, lf, Ko, To, uo = {
   point: Lb,
   lineStart: YS,
   lineEnd: XS,
@@ -14258,15 +14258,15 @@ function Lb(e, t) {
   Ko.push(To = [ct = e, ht = e]), t < zn && (zn = t), t > Qn && (Qn = t);
 }
 function sR(e, t) {
-  var n = Ra([e * $e, t * $e]);
+  var n = Fa([e * $e, t * $e]);
   if (Wl) {
     var i = du(Wl, n), r = [i[1], -i[0], 0], o = du(r, i);
     Yp(o), o = Vp(o);
-    var s = e - sa, a = s > 0 ? 1 : -1, l = o[0] * bt * a, u, c = Fe(s) > 180;
-    c ^ (a * sa < l && l < a * e) ? (u = o[1] * bt, u > Qn && (Qn = u)) : (l = (l + 360) % 360 - 180, c ^ (a * sa < l && l < a * e) ? (u = -o[1] * bt, u < zn && (zn = u)) : (t < zn && (zn = t), t > Qn && (Qn = t))), c ? e < sa ? Jn(ct, e) > Jn(ct, ht) && (ht = e) : Jn(e, ht) > Jn(ct, ht) && (ct = e) : ht >= ct ? (e < ct && (ct = e), e > ht && (ht = e)) : e > sa ? Jn(ct, e) > Jn(ct, ht) && (ht = e) : Jn(e, ht) > Jn(ct, ht) && (ct = e);
+    var s = e - oa, a = s > 0 ? 1 : -1, l = o[0] * bt * a, u, c = Fe(s) > 180;
+    c ^ (a * oa < l && l < a * e) ? (u = o[1] * bt, u > Qn && (Qn = u)) : (l = (l + 360) % 360 - 180, c ^ (a * oa < l && l < a * e) ? (u = -o[1] * bt, u < zn && (zn = u)) : (t < zn && (zn = t), t > Qn && (Qn = t))), c ? e < oa ? Jn(ct, e) > Jn(ct, ht) && (ht = e) : Jn(e, ht) > Jn(ct, ht) && (ct = e) : ht >= ct ? (e < ct && (ct = e), e > ht && (ht = e)) : e > oa ? Jn(ct, e) > Jn(ct, ht) && (ht = e) : Jn(e, ht) > Jn(ct, ht) && (ct = e);
   } else
     Ko.push(To = [ct = e, ht = e]);
-  t < zn && (zn = t), t > Qn && (Qn = t), Wl = n, sa = e;
+  t < zn && (zn = t), t > Qn && (Qn = t), Wl = n, oa = e;
 }
 function YS() {
   uo.point = sR;
@@ -14276,7 +14276,7 @@ function XS() {
 }
 function aR(e, t) {
   if (Wl) {
-    var n = e - sa;
+    var n = e - oa;
     lf.add(Fe(n) > 180 ? n + (n > 0 ? 360 : -360) : n);
   } else
     rR = e, oR = t;
@@ -14423,7 +14423,7 @@ function wX(e, t, n, i, r, o) {
   }
 }
 function n$(e, t) {
-  t = Ra(t), t[0] -= e, Yp(t);
+  t = Fa(t), t[0] -= e, Yp(t);
   var n = eR(-t[1]);
   return ((-t[2] < 0 ? -n : n) + Nn - ce) % Nn;
 }
@@ -14511,7 +14511,7 @@ function EX(e, t) {
       for (var f, d, h = f[d - 1], p = M1(h), g = h[1] / 2 + jp, m = le(g), y = fe(g), b = 0; b < d; ++b, p = v, m = E, y = x, h = _) {
         var _ = f[b], v = M1(_), w = _[1] / 2 + jp, E = le(w), x = fe(w), C = v - p, S = C >= 0 ? 1 : -1, A = S * C, M = A > Ae, F = m * E;
         if (l.add(Ti(F * S * le(A), y * x + F * fe(A))), s += M ? C + S * Nn : C, M ^ p >= n ^ v >= n) {
-          var R = du(Ra(h), Ra(_));
+          var R = du(Fa(h), Fa(_));
           Yp(R);
           var T = du(o, R);
           Yp(T);
@@ -14655,7 +14655,7 @@ function MX(e) {
     };
   }
   function l(c, f, d) {
-    var h = Ra(c), p = Ra(f), g = [1, 0, 0], m = du(h, p), y = ah(m, m), b = m[0], _ = y - b * b;
+    var h = Fa(c), p = Fa(f), g = [1, 0, 0], m = du(h, p), y = ah(m, m), b = m[0], _ = y - b * b;
     if (!_) return !d && c;
     var v = t * y / _, w = -t * b / _, E = du(g, m), x = lh(g, v), C = lh(m, w);
     A1(x, C);
@@ -14888,35 +14888,35 @@ function OX(e, t) {
   e < hu && (hu = e), e > Nf && (Nf = e), t < ng && (ng = t), t > ig && (ig = t);
 }
 var Hb = 0, Gb = 0, Gc = 0, og = 0, sg = 0, Il = 0, Vb = 0, Yb = 0, Vc = 0, _R, vR, Sr, $r, _i = {
-  point: Da,
+  point: Ra,
   lineStart: a$,
   lineEnd: l$,
   polygonStart: function() {
     _i.lineStart = PX, _i.lineEnd = zX;
   },
   polygonEnd: function() {
-    _i.point = Da, _i.lineStart = a$, _i.lineEnd = l$;
+    _i.point = Ra, _i.lineStart = a$, _i.lineEnd = l$;
   },
   result: function() {
     var e = Vc ? [Vb / Vc, Yb / Vc] : Il ? [og / Il, sg / Il] : Gc ? [Hb / Gc, Gb / Gc] : [NaN, NaN];
     return Hb = Gb = Gc = og = sg = Il = Vb = Yb = Vc = 0, e;
   }
 };
-function Da(e, t) {
+function Ra(e, t) {
   Hb += e, Gb += t, ++Gc;
 }
 function a$() {
   _i.point = LX;
 }
 function LX(e, t) {
-  _i.point = IX, Da(Sr = e, $r = t);
+  _i.point = IX, Ra(Sr = e, $r = t);
 }
 function IX(e, t) {
   var n = e - Sr, i = t - $r, r = Fn(n * n + i * i);
-  og += r * (Sr + e) / 2, sg += r * ($r + t) / 2, Il += r, Da(Sr = e, $r = t);
+  og += r * (Sr + e) / 2, sg += r * ($r + t) / 2, Il += r, Ra(Sr = e, $r = t);
 }
 function l$() {
-  _i.point = Da;
+  _i.point = Ra;
 }
 function PX() {
   _i.point = BX;
@@ -14925,11 +14925,11 @@ function zX() {
   xR(_R, vR);
 }
 function BX(e, t) {
-  _i.point = xR, Da(_R = Sr = e, vR = $r = t);
+  _i.point = xR, Ra(_R = Sr = e, vR = $r = t);
 }
 function xR(e, t) {
   var n = e - Sr, i = t - $r, r = Fn(n * n + i * i);
-  og += r * (Sr + e) / 2, sg += r * ($r + t) / 2, Il += r, r = $r * e - Sr * t, Vb += r * (Sr + e), Yb += r * ($r + t), Vc += r * 3, Da(Sr = e, $r = t);
+  og += r * (Sr + e) / 2, sg += r * ($r + t) / 2, Il += r, r = $r * e - Sr * t, Vb += r * (Sr + e), Yb += r * ($r + t), Vc += r * 3, Ra(Sr = e, $r = t);
 }
 function wR(e) {
   this._context = e;
@@ -15183,7 +15183,7 @@ function HX(e, t) {
       f = NaN, m.point = _, i.lineStart();
     }
     function _(C, S) {
-      var A = Ra([C, S]), M = e(C, S);
+      var A = Fa([C, S]), M = e(C, S);
       n(f, d, c, h, p, g, f = M[0], d = M[1], c = C, h = A[0], p = A[1], g = A[2], h$, i), i.point(f, d);
     }
     function v() {
@@ -15876,7 +15876,7 @@ X(Y2, O, {
 });
 function NK(e, t, n) {
   const i = qR(n.levels || 10, n.nice, n.zero !== !1);
-  return n.resolve !== "shared" ? i : i(e.map((r) => ba(t(r).values)));
+  return n.resolve !== "shared" ? i : i(e.map((r) => ya(t(r).values)));
 }
 function FK(e, t, n, i) {
   let r = i.scale || t.scale, o = i.translate || t.translate;
@@ -16342,11 +16342,11 @@ X(iw, O, {
       $x: 0,
       $y: 0,
       $value: 0,
-      $max: i ? ba(n.map((u) => ba(r(u).values))) : 0
+      $max: i ? ya(n.map((u) => ya(r(u).values))) : 0
     };
     return n.forEach((u) => {
       const c = r(u), f = xe({}, u, l);
-      i || (f.$max = ba(c.values || [])), u[a] = BK(c, f, s.dep ? s : bn(s(f)), o.dep ? o : bn(o(f)));
+      i || (f.$max = ya(c.values || [])), u[a] = BK(c, f, s.dep ? s : bn(s(f)), o.dep ? o : bn(o(f)));
     }), t.reflow(!0).modifies(a);
   }
 });
@@ -16794,14 +16794,14 @@ function w$(e, t, n) {
     }
   return n != null && e.push({ name: t, value: n }), e;
 }
-var pu = 0, Kc = 0, xc = 0, ZR = 1e3, hg, Zc, pg = 0, Oa = 0, Um = 0, Rf = typeof performance == "object" && performance.now ? performance : Date, JR = typeof window == "object" && window.requestAnimationFrame ? window.requestAnimationFrame.bind(window) : function(e) {
+var pu = 0, Kc = 0, xc = 0, ZR = 1e3, hg, Zc, pg = 0, Da = 0, Um = 0, Rf = typeof performance == "object" && performance.now ? performance : Date, JR = typeof window == "object" && window.requestAnimationFrame ? window.requestAnimationFrame.bind(window) : function(e) {
   setTimeout(e, 17);
 };
 function sw() {
-  return Oa || (JR(yZ), Oa = Rf.now() + Um);
+  return Da || (JR(yZ), Da = Rf.now() + Um);
 }
 function yZ() {
-  Oa = 0;
+  Da = 0;
 }
 function gg() {
   this._call = this._time = this._next = null;
@@ -16823,15 +16823,15 @@ function QR(e, t, n) {
 function bZ() {
   sw(), ++pu;
   for (var e = hg, t; e; )
-    (t = Oa - e._time) >= 0 && e._call.call(void 0, t), e = e._next;
+    (t = Da - e._time) >= 0 && e._call.call(void 0, t), e = e._next;
   --pu;
 }
 function E$() {
-  Oa = (pg = Rf.now()) + Um, pu = Kc = 0;
+  Da = (pg = Rf.now()) + Um, pu = Kc = 0;
   try {
     bZ();
   } finally {
-    pu = 0, vZ(), Oa = 0;
+    pu = 0, vZ(), Da = 0;
   }
 }
 function _Z() {
@@ -16846,7 +16846,7 @@ function vZ() {
 function t_(e) {
   if (!pu) {
     Kc && (Kc = clearTimeout(Kc));
-    var t = e - Oa;
+    var t = e - Da;
     t > 24 ? (e < 1 / 0 && (Kc = setTimeout(E$, e - Rf.now() - Um)), xc && (xc = clearInterval(xc))) : (xc || (pg = Rf.now(), xc = setInterval(_Z, ZR)), pu = 1, JR(E$));
   }
 }
@@ -17441,7 +17441,7 @@ function iD(e) {
   if (typeof e != "function") throw new Error();
   return e;
 }
-function da() {
+function fa() {
   return 0;
 }
 function Nl(e) {
@@ -17577,10 +17577,10 @@ function EJ(e) {
   return Math.sqrt(e.value);
 }
 function kJ() {
-  var e = null, t = 1, n = 1, i = da;
+  var e = null, t = 1, n = 1, i = fa;
   function r(o) {
     const s = gJ();
-    return o.x = t / 2, o.y = n / 2, e ? o.eachBefore(T$(e)).eachAfter(D1(i, 0.5, s)).eachBefore(N$(1)) : o.eachBefore(T$(EJ)).eachAfter(D1(da, 1, s)).eachAfter(D1(i, o.r / Math.min(t, n), s)).eachBefore(N$(Math.min(t, n) / (2 * o.r))), o;
+    return o.x = t / 2, o.y = n / 2, e ? o.eachBefore(T$(e)).eachAfter(D1(i, 0.5, s)).eachBefore(N$(1)) : o.eachBefore(T$(EJ)).eachAfter(D1(fa, 1, s)).eachAfter(D1(i, o.r / Math.min(t, n), s)).eachBefore(N$(Math.min(t, n) / (2 * o.r))), o;
   }
   return r.radius = function(o) {
     return arguments.length ? (e = Xh(o), r) : e;
@@ -17818,7 +17818,7 @@ const uD = (function e(t) {
   }, n;
 })(aD);
 function LJ() {
-  var e = uD, t = !1, n = 1, i = 1, r = [0], o = da, s = da, a = da, l = da, u = da;
+  var e = uD, t = !1, n = 1, i = 1, r = [0], o = fa, s = fa, a = fa, l = fa, u = fa;
   function c(d) {
     return d.x0 = d.y0 = 0, d.x1 = n, d.y1 = i, d.eachBefore(f), r = [0], t && d.eachBefore(sD), d;
   }
@@ -19024,7 +19024,7 @@ function SQ(e) {
   return e[1];
 }
 const j$ = 1e-6;
-class ma {
+class ga {
   constructor() {
     this._x0 = this._y0 = // start of current subpath
     this._x1 = this._y1 = null, this._ = "";
@@ -19102,7 +19102,7 @@ let $Q = class {
       l = n[g], u = c, f = d, h = p, c = l * 4, d = t[2 * l], p = t[2 * l + 1], r[u + 2] = r[c] = h - p, r[u + 3] = r[c + 1] = d - f;
   }
   render(t) {
-    const n = t == null ? t = new ma() : void 0, { delaunay: { halfedges: i, inedges: r, hull: o }, circumcenters: s, vectors: a } = this;
+    const n = t == null ? t = new ga() : void 0, { delaunay: { halfedges: i, inedges: r, hull: o }, circumcenters: s, vectors: a } = this;
     if (o.length <= 1) return null;
     for (let c = 0, f = i.length; c < f; ++c) {
       const d = i[c];
@@ -19119,11 +19119,11 @@ let $Q = class {
     return n && n.value();
   }
   renderBounds(t) {
-    const n = t == null ? t = new ma() : void 0;
+    const n = t == null ? t = new ga() : void 0;
     return t.rect(this.xmin, this.ymin, this.xmax - this.xmin, this.ymax - this.ymin), n && n.value();
   }
   renderCell(t, n) {
-    const i = n == null ? n = new ma() : void 0, r = this._clip(t);
+    const i = n == null ? n = new ga() : void 0, r = this._clip(t);
     if (r === null || !r.length) return;
     n.moveTo(r[0], r[1]);
     let o = r.length;
@@ -19397,7 +19397,7 @@ class _w {
     return c;
   }
   render(t) {
-    const n = t == null ? t = new ma() : void 0, { points: i, halfedges: r, triangles: o } = this;
+    const n = t == null ? t = new ga() : void 0, { points: i, halfedges: r, triangles: o } = this;
     for (let s = 0, a = r.length; s < a; ++s) {
       const l = r[s];
       if (l < s) continue;
@@ -19408,7 +19408,7 @@ class _w {
   }
   renderPoints(t, n) {
     n === void 0 && (!t || typeof t.moveTo != "function") && (n = t, t = null), n = n == null ? 2 : +n;
-    const i = t == null ? t = new ma() : void 0, { points: r } = this;
+    const i = t == null ? t = new ga() : void 0, { points: r } = this;
     for (let o = 0, s = r.length; o < s; o += 2) {
       const a = r[o], l = r[o + 1];
       t.moveTo(a + n, l), t.arc(a, l, n, 0, AQ);
@@ -19416,7 +19416,7 @@ class _w {
     return i && i.value();
   }
   renderHull(t) {
-    const n = t == null ? t = new ma() : void 0, { hull: i, points: r } = this, o = i[0] * 2, s = i.length;
+    const n = t == null ? t = new ga() : void 0, { hull: i, points: r } = this, o = i[0] * 2, s = i.length;
     t.moveTo(r[o], r[o + 1]);
     for (let a = 1; a < s; ++a) {
       const l = 2 * i[a];
@@ -19429,7 +19429,7 @@ class _w {
     return this.renderHull(t), t.value();
   }
   renderTriangle(t, n) {
-    const i = n == null ? n = new ma() : void 0, { points: r, triangles: o } = this, s = o[t *= 3] * 2, a = o[t + 1] * 2, l = o[t + 2] * 2;
+    const i = n == null ? n = new ga() : void 0, { points: r, triangles: o } = this, s = o[t *= 3] * 2, a = o[t + 1] * 2, l = o[t + 2] * 2;
     return n.moveTo(r[s], r[s + 1]), n.lineTo(r[a], r[a + 1]), n.lineTo(r[l], r[l + 1]), n.closePath(), i && i.value();
   }
   *trianglePolygons() {
@@ -19582,21 +19582,21 @@ function zQ() {
   }, f.size = function(p) {
     return arguments.length ? (e = [+p[0], +p[1]], f) : e;
   }, f.font = function(p) {
-    return arguments.length ? (n = Ys(p), f) : n;
+    return arguments.length ? (n = Vs(p), f) : n;
   }, f.fontStyle = function(p) {
-    return arguments.length ? (r = Ys(p), f) : r;
+    return arguments.length ? (r = Vs(p), f) : r;
   }, f.fontWeight = function(p) {
-    return arguments.length ? (o = Ys(p), f) : o;
+    return arguments.length ? (o = Vs(p), f) : o;
   }, f.rotate = function(p) {
-    return arguments.length ? (s = Ys(p), f) : s;
+    return arguments.length ? (s = Vs(p), f) : s;
   }, f.text = function(p) {
-    return arguments.length ? (t = Ys(p), f) : t;
+    return arguments.length ? (t = Vs(p), f) : t;
   }, f.spiral = function(p) {
     return arguments.length ? (l = GQ[p] || p, f) : l;
   }, f.fontSize = function(p) {
-    return arguments.length ? (i = Ys(p), f) : i;
+    return arguments.length ? (i = Vs(p), f) : i;
   }, f.padding = function(p) {
-    return arguments.length ? (a = Ys(p), f) : a;
+    return arguments.length ? (a = Vs(p), f) : a;
   }, f.random = function(p) {
     return arguments.length ? (c = p, f) : c;
   }, f;
@@ -19680,7 +19680,7 @@ function HQ(e) {
   for (var t = [], n = -1; ++n < e; ) t[n] = 0;
   return t;
 }
-function Ys(e) {
+function Vs(e) {
   return typeof e == "function" ? e : function() {
     return e;
   };
@@ -20071,7 +20071,7 @@ const tee = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
   __proto__: null,
   crossfilter: ww,
   resolvefilter: Ew
-}, Symbol.toStringTag, { value: "Module" })), nee = "RawCode", La = "Literal", iee = "Property", ree = "Identifier", oee = "ArrayExpression", see = "BinaryExpression", pD = "CallExpression", aee = "ConditionalExpression", lee = "LogicalExpression", uee = "MemberExpression", cee = "ObjectExpression", fee = "UnaryExpression";
+}, Symbol.toStringTag, { value: "Module" })), nee = "RawCode", Oa = "Literal", iee = "Property", ree = "Identifier", oee = "ArrayExpression", see = "BinaryExpression", pD = "CallExpression", aee = "ConditionalExpression", lee = "LogicalExpression", uee = "MemberExpression", cee = "ObjectExpression", fee = "UnaryExpression";
 function ar(e) {
   this.type = e;
 }
@@ -20101,18 +20101,18 @@ function dee(e) {
     case fee:
       return [e.argument];
     case ree:
-    case La:
+    case Oa:
     case nee:
     default:
       return [];
   }
 }
-var Xr, ie, P, gn, Xe, qm = 1, xd = 2, Ia = 3, Os = 4, Wm = 5, ol = 6, Pn = 7, wd = 8, hee = 9;
+var Xr, ie, P, gn, Xe, qm = 1, xd = 2, La = 3, Ds = 4, Wm = 5, ol = 6, Pn = 7, wd = 8, hee = 9;
 Xr = {};
 Xr[qm] = "Boolean";
 Xr[xd] = "<end>";
-Xr[Ia] = "Identifier";
-Xr[Os] = "Keyword";
+Xr[La] = "Identifier";
+Xr[Ds] = "Keyword";
 Xr[Wm] = "Null";
 Xr[ol] = "Numeric";
 Xr[Pn] = "Punctuator";
@@ -20238,7 +20238,7 @@ function Oee() {
 }
 function Lee() {
   var e, t, n;
-  return e = P, t = ie.charCodeAt(P) === 92 ? bD() : Oee(), t.length === 1 ? n = Ia : Ree.hasOwnProperty(t) ? n = Os : t === "null" ? n = Wm : t === "true" || t === "false" ? n = qm : n = Ia, {
+  return e = P, t = ie.charCodeAt(P) === 92 ? bD() : Oee(), t.length === 1 ? n = La : Ree.hasOwnProperty(t) ? n = Ds : t === "null" ? n = Wm : t === "true" || t === "false" ? n = qm : n = La, {
     type: n,
     value: t,
     start: e,
@@ -20513,7 +20513,7 @@ function qee() {
   };
 }
 function Wee(e) {
-  return e.type === Ia || e.type === Os || e.type === qm || e.type === Wm;
+  return e.type === La || e.type === Ds || e.type === qm || e.type === Wm;
 }
 function _D() {
   if (yD(), P >= gn)
@@ -20578,7 +20578,7 @@ function Pe(e, t) {
   throw n = new Error(r), n.index = P, n.description = r, n;
 }
 function Gm(e) {
-  e.type === xd && Pe(e, Aee), e.type === ol && Pe(e, kee), e.type === wd && Pe(e, Cee), e.type === Ia && Pe(e, See), e.type === Os && Pe(e, $ee), Pe(e, Ut, e.value);
+  e.type === xd && Pe(e, Aee), e.type === ol && Pe(e, kee), e.type === wd && Pe(e, Cee), e.type === La && Pe(e, See), e.type === Ds && Pe(e, $ee), Pe(e, Ut, e.value);
 }
 function mn(e) {
   const t = Bn();
@@ -20588,12 +20588,12 @@ function nt(e) {
   return Xe.type === Pn && Xe.value === e;
 }
 function Z1(e) {
-  return Xe.type === Os && Xe.value === e;
+  return Xe.type === Ds && Xe.value === e;
 }
 function Kee() {
   const e = [];
   for (P = Xe.start, mn("["); !nt("]"); )
-    nt(",") ? (Bn(), e.push(null)) : (e.push(Pa()), nt("]") || mn(","));
+    nt(",") ? (Bn(), e.push(null)) : (e.push(Ia()), nt("]") || mn(","));
   return Bn(), Hee(e);
 }
 function X$() {
@@ -20603,12 +20603,12 @@ function X$() {
 }
 function Zee() {
   var e, t, n, i;
-  if (P = Xe.start, e = Xe, e.type === Ia)
-    return n = X$(), mn(":"), i = Pa(), Y$("init", n, i);
+  if (P = Xe.start, e = Xe, e.type === La)
+    return n = X$(), mn(":"), i = Ia(), Y$("init", n, i);
   if (e.type === xd || e.type === Pn)
     Gm(e);
   else
-    return t = X$(), mn(":"), i = Pa(), Y$("init", t, i);
+    return t = X$(), mn(":"), i = Ia(), Y$("init", t, i);
 }
 function Jee() {
   var e = [], t, n, i, r = {}, o = String;
@@ -20632,12 +20632,12 @@ function tte() {
     return Kee();
   if (nt("{"))
     return Jee();
-  if (e = Xe.type, P = Xe.start, e === Ia || ete[Xe.value])
+  if (e = Xe.type, P = Xe.start, e === La || ete[Xe.value])
     n = Cw(Bn().value);
   else if (e === wd || e === ol)
     Xe.octal && Pe(Xe, mD), n = tf(Bn());
   else {
-    if (e === Os)
+    if (e === Ds)
       throw new Error(Of);
     e === qm ? (t = Bn(), t.value = t.value === "true", n = tf(t)) : e === Wm ? (t = Bn(), t.value = null, n = tf(t)) : nt("/") || nt("/=") ? (n = tf(qee()), vD()) : Gm(Bn());
   }
@@ -20646,7 +20646,7 @@ function tte() {
 function nte() {
   const e = [];
   if (mn("("), !nt(")"))
-    for (; P < gn && (e.push(Pa()), !nt(")")); )
+    for (; P < gn && (e.push(Ia()), !nt(")")); )
       mn(",");
   return mn(")"), e;
 }
@@ -20684,7 +20684,7 @@ function K$() {
 }
 function Qh() {
   var e, t;
-  if (Xe.type !== Pn && Xe.type !== Os)
+  if (Xe.type !== Pn && Xe.type !== Ds)
     t = K$();
   else {
     if (nt("++") || nt("--"))
@@ -20701,7 +20701,7 @@ function Qh() {
 }
 function Z$(e) {
   let t = 0;
-  if (e.type !== Pn && e.type !== Os)
+  if (e.type !== Pn && e.type !== Ds)
     return 0;
   switch (e.value) {
     case "||":
@@ -20763,12 +20763,12 @@ function ate() {
     t.pop(), n = G$(o[u - 1].value, o[u - 2], n), u -= 2;
   return n;
 }
-function Pa() {
+function Ia() {
   var e, t, n;
-  return e = ate(), nt("?") && (Bn(), t = Pa(), mn(":"), n = Pa(), e = Vee(e, t, n)), e;
+  return e = ate(), nt("?") && (Bn(), t = Ia(), mn(":"), n = Ia(), e = Vee(e, t, n)), e;
 }
 function Sw() {
-  const e = Pa();
+  const e = Ia();
   if (nt(","))
     throw new Error(Of);
   return e;
@@ -21039,7 +21039,7 @@ var J1 = {
 };
 const Mte = ":", Tte = "@";
 function Mw(e, t, n, i) {
-  t[0].type !== La && L("First argument to selection functions must be a string literal.");
+  t[0].type !== Oa && L("First argument to selection functions must be a string literal.");
   const r = t[0].value, o = t.length >= 2 && Re(t).value, s = "unit", a = Tte + s, l = Mte + r;
   o === Aw && !ee(i, a) && (i[a] = n.getData(r).indataRef(n, s)), ee(i, l) || (i[l] = n.getData(r).tuplesRef());
 }
@@ -21083,7 +21083,7 @@ function Ute(e) {
 }
 const jte = ":", qte = "@", p_ = "%", AD = "$";
 function Tw(e, t, n, i) {
-  t[0].type !== La && L("First argument to data functions must be a string literal.");
+  t[0].type !== Oa && L("First argument to data functions must be a string literal.");
   const r = t[0].value, o = jte + r;
   if (!ee(o, i))
     try {
@@ -21092,12 +21092,12 @@ function Tw(e, t, n, i) {
     }
 }
 function Wte(e, t, n, i) {
-  t[0].type !== La && L("First argument to indata must be a string literal."), t[1].type !== La && L("Second argument to indata must be a string literal.");
+  t[0].type !== Oa && L("First argument to indata must be a string literal."), t[1].type !== Oa && L("Second argument to indata must be a string literal.");
   const r = t[0].value, o = t[1].value, s = qte + o;
   ee(s, i) || (i[s] = n.getData(r).indataRef(n, o));
 }
 function Tn(e, t, n, i) {
-  if (t[0].type === La)
+  if (t[0].type === Oa)
     nA(n, i, t[0].value);
   else
     for (e in n.scales)
@@ -21120,7 +21120,7 @@ function Kr(e, t) {
 }
 function Hte(e, t, n) {
   t.__bandwidth = (r) => r && r.bandwidth ? r.bandwidth() : 0, n._bandwidth = Tn, n._range = Tn, n._scale = Tn;
-  const i = (r) => "_[" + (r.type === La ? G(p_ + r.value) : G(p_) + "+" + e(r)) + "]";
+  const i = (r) => "_[" + (r.type === Oa ? G(p_ + r.value) : G(p_) + "+" + e(r)) + "]";
   return {
     _bandwidth: (r) => `this.__bandwidth(${i(r[0])})`,
     _range: (r) => `${i(r[0])}.range()`,
@@ -22532,7 +22532,7 @@ const nre = "view", wg = "[", Eg = "]", JD = "{", QD = "}", ire = ":", e8 = ",",
   trail: 1
 };
 let t8, n8;
-function Ls(e, t, n) {
+function Os(e, t, n) {
   return t8 = t || nre, n8 = n || are, i8(e.trim()).map(b_);
 }
 function lre(e) {
@@ -22828,7 +22828,7 @@ function tp(e) {
 function qi(e, t) {
   return e ?? t;
 }
-function wa(e) {
+function xa(e) {
   return e && e.signal || e;
 }
 const vA = "timer";
@@ -22881,7 +22881,7 @@ function Zre(e, t, n) {
     target: n
   };
   let o = e.events, s = e.update, a = [];
-  o || L("Signal update missing events specification."), J(o) && (o = Ls(o, t.isSubscope() ? jw : x_)), o = Q(o).filter((l) => l.signal || l.scale ? (a.push(l), 0) : 1), a.length > 1 && (a = [Qre(a)]), o.length && a.push(o.length > 1 ? {
+  o || L("Signal update missing events specification."), J(o) && (o = Os(o, t.isSubscope() ? jw : x_)), o = Q(o).filter((l) => l.signal || l.scale ? (a.push(l), 0) : 1), a.length > 1 && (a = [Qre(a)]), o.length && a.push(o.length > 1 ? {
     merge: o
   } : o[0]), i != null && (s && L("Signal encode and update are mutually exclusive."), s = "encode(item()," + G(i) + ")"), r.update = J(s) ? Br(s, t) : s.expr != null ? Br(s.expr, t) : s.value != null ? s.value : s.signal != null ? {
     $expr: Kre,
@@ -23558,15 +23558,15 @@ function vse(e, t, n) {
 function rp(e, t) {
   return e.$ref ? e : e.data && e.data.$ref ? e.data : se(t.getData(e.data).output);
 }
-function za(e, t, n, i, r) {
+function Pa(e, t, n, i, r) {
   this.scope = e, this.input = t, this.output = n, this.values = i, this.aggregate = r, this.index = {};
 }
-za.fromEntries = function(e, t) {
+Pa.fromEntries = function(e, t) {
   const n = t.length, i = t[n - 1], r = t[n - 2];
   let o = t[0], s = null, a = 1;
   for (o && o.type === "load" && (o = t[1]), e.add(t[0]); a < n; ++a)
     t[a].params.pulse = se(t[a - 1]), e.add(t[a]), t[a].type === "aggregate" && (s = t[a]);
-  return new za(e, o, r, i, s);
+  return new Pa(e, o, r, i, s);
 };
 function S8(e) {
   return J(e) ? e : null;
@@ -23596,7 +23596,7 @@ function Sc(e, t, n, i, r, o, s) {
   }
   return c;
 }
-za.prototype = {
+Pa.prototype = {
   countsRef(e, t, n) {
     const i = this, r = i.counts || (i.counts = {}), o = S8(t);
     let s, a, l;
@@ -23643,7 +23643,7 @@ function xse(e, t, n) {
   const a = t.fork(), l = a.add(lr()), u = a.add(sl({
     pulse: se(l)
   }));
-  a.addData(r, new za(a, l, l, u)), a.addSignal("parent", null), s.params.subflow = {
+  a.addData(r, new Pa(a, l, l, u)), a.addSignal("parent", null), s.params.subflow = {
     $subflow: a.parse(e).toRuntime()
   };
 }
@@ -23711,7 +23711,7 @@ function r0(e, t) {
   })), w = t.add(sl({
     pulse: se(v)
   }, void 0, t.parent()));
-  e.name != null && (f = e.name, t.addData(f, new za(t, u, v, w)), e.on && e.on.forEach((E) => {
+  e.name != null && (f = e.name, t.addData(f, new Pa(t, u, v, w)), e.on && e.on.forEach((E) => {
     (E.insert || E.remove || E.toggle) && L("Marks only support modify triggers."), $8(E, t, f);
   }));
 }
@@ -23757,7 +23757,7 @@ function kse(e, t) {
     formatType: t.property(e.formatType),
     formatSpecifier: t.property(e.format)
   })));
-  return p === ip ? (h = [Zoe(e, c, n, i.gradient), EA(e, n, i.labels, b)], d.count = d.count || t.signalRef(`max(2,2*floor((${wa(r.gradientLength())})/100))`)) : p === k_ ? h = [Joe(e, c, n, i.gradient, b), EA(e, n, i.labels, b)] : (f = nse(e, n), h = [tse(e, n, i, b, wa(f.columns))], d.size = Ase(e, t, h[0].marks)), h = [Uf({
+  return p === ip ? (h = [Zoe(e, c, n, i.gradient), EA(e, n, i.labels, b)], d.count = d.count || t.signalRef(`max(2,2*floor((${xa(r.gradientLength())})/100))`)) : p === k_ ? h = [Joe(e, c, n, i.gradient, b), EA(e, n, i.labels, b)] : (f = nse(e, n), h = [tse(e, n, i, b, xa(f.columns))], d.size = Ase(e, t, h[0].marks)), h = [Uf({
     role: Ere,
     from: m,
     encode: y,
@@ -23807,7 +23807,7 @@ function $se(e, t, n) {
   }), i;
 }
 function Ase(e, t, n) {
-  const i = wa(TA("size", e, n)), r = wa(TA("strokeWidth", e, n)), o = wa(Mse(n[1].encode, t, Cd));
+  const i = xa(TA("size", e, n)), r = xa(TA("strokeWidth", e, n)), o = xa(Mse(n[1].encode, t, Cd));
   return Br(`max(ceil(sqrt(${i})+${r}),${o})`, t);
 }
 function TA(e, t, n) {
@@ -23972,20 +23972,20 @@ function Lse(e, t) {
 function Ise(e, t, n) {
   const i = [];
   let r = null, o = !1, s = !1, a, l, u, c, f;
-  for (e.values ? Rt(e.values) || tp(e.format) ? (i.push(NA(t, e)), i.push(r = Xs())) : i.push(r = Xs({
+  for (e.values ? Rt(e.values) || tp(e.format) ? (i.push(NA(t, e)), i.push(r = Ys())) : i.push(r = Ys({
     $ingest: e.values,
     $format: e.format
-  })) : e.url ? tp(e.url) || tp(e.format) ? (i.push(NA(t, e)), i.push(r = Xs())) : i.push(r = Xs({
+  })) : e.url ? tp(e.url) || tp(e.format) ? (i.push(NA(t, e)), i.push(r = Ys())) : i.push(r = Ys({
     $request: e.url,
     $format: e.format
   })) : e.source && (r = a = Q(e.source).map((d) => se(t.getData(d).output)), i.push(null)), l = 0, u = n.length; l < u; ++l)
-    c = n[l], f = c.metadata, !r && !f.source && i.push(r = Xs()), i.push(c), f.generates && (s = !0), f.modifies && !s && (o = !0), f.source ? r = c : f.changes && (r = null);
+    c = n[l], f = c.metadata, !r && !f.source && i.push(r = Ys()), i.push(c), f.generates && (s = !0), f.modifies && !s && (o = !0), f.source ? r = c : f.changes && (r = null);
   return a && (u = a.length - 1, i[0] = moe({
     derive: o,
     pulse: u ? a : a[0]
-  }), (o || u) && i.splice(1, 0, Xs())), r || i.push(Xs()), i.push(sl({})), i;
+  }), (o || u) && i.splice(1, 0, Ys())), r || i.push(Ys()), i.push(sl({})), i;
 }
-function Xs(e) {
+function Ys(e) {
   const t = lr({}, e);
   return t.metadata = {
     source: !0
@@ -24234,7 +24234,7 @@ function ry(e, t, n, i, r) {
   };
 }
 function Zse(e, t, n, i, r, o) {
-  const s = Kn(e, t), a = e.orient, l = e.scale, u = o0(a, -1, 1), c = wa(s("labelFlush")), f = wa(s("labelFlushOffset")), d = s("labelAlign"), h = s("labelBaseline");
+  const s = Kn(e, t), a = e.orient, l = e.scale, u = o0(a, -1, 1), c = xa(s("labelFlush")), f = xa(s("labelFlushOffset")), d = s("labelAlign"), h = s("labelBaseline");
   let p = c === 0 || !!c, g;
   const m = jt(r);
   m.mult = u, m.offset = jt(s("labelPadding") || 0), m.offset.mult = u;
@@ -24453,7 +24453,7 @@ function iae(e, t) {
     pulse: se(l)
   })), l = t.add(sl({
     pulse: se(l)
-  })), t.addData("root", new za(t, o, o, l)), t;
+  })), t.addData("root", new Pa(t, o, o, l)), t;
 }
 function $c(e, t) {
   return t && t.signal ? {
@@ -24683,7 +24683,7 @@ F8.prototype = OA.prototype = {
     return this.data[e] || L("Undefined data set name: " + G(e)), this.data[e];
   },
   addDataPipeline(e, t) {
-    return ee(this.data, e) && L("Duplicate data set name: " + G(e)), this.addData(e, za.fromEntries(this, t));
+    return ee(this.data, e) && L("Duplicate data set name: " + G(e)), this.addData(e, Pa.fromEntries(this, t));
   }
 };
 function Qw(e) {
@@ -25063,7 +25063,7 @@ const cae = uae, fae = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defi
   panSymlog: IT,
   parse: lae,
   parseExpression: $w,
-  parseSelector: Ls,
+  parseSelector: Os,
   path: dm,
   pathCurves: i2,
   pathEqual: wF,
@@ -25204,7 +25204,7 @@ var hae = {
   "~": (e) => ~e,
   "!": (e) => !e
 };
-const mae = Array.prototype.slice, Ks = (e, t, n) => {
+const mae = Array.prototype.slice, Xs = (e, t, n) => {
   const i = n ? n(t[0]) : t[0];
   return i[e].apply(i, mae.call(t, 1));
 }, yae = (e, t = 0, n = 1, i = 0, r = 0, o = 0, s = 0) => J(e) ? new Date(e) : new Date(e, t, n, i, r, o, s);
@@ -25256,16 +25256,16 @@ var bae = {
   // sequence functions
   length: (e) => e.length,
   join: function() {
-    return Ks("join", arguments);
+    return Xs("join", arguments);
   },
   indexof: function() {
-    return Ks("indexOf", arguments);
+    return Xs("indexOf", arguments);
   },
   lastindexof: function() {
-    return Ks("lastIndexOf", arguments);
+    return Xs("lastIndexOf", arguments);
   },
   slice: function() {
-    return Ks("slice", arguments);
+    return Xs("slice", arguments);
   },
   reverse: (e) => e.slice().reverse(),
   sort: (e) => e.slice().sort(Iu),
@@ -25275,13 +25275,13 @@ var bae = {
   upper: (e) => String(e).toUpperCase(),
   lower: (e) => String(e).toLowerCase(),
   substring: function() {
-    return Ks("substring", arguments, String);
+    return Xs("substring", arguments, String);
   },
   split: function() {
-    return Ks("split", arguments, String);
+    return Xs("split", arguments, String);
   },
   replace: function() {
-    return Ks("replace", arguments, String);
+    return Xs("replace", arguments, String);
   },
   trim: (e) => String(e).trim(),
   // Base64 encode/decode
@@ -25560,7 +25560,7 @@ function Sae(e) {
 function Ni(e) {
   return `${Wr(e).map(Sae).join("\\.")}`;
 }
-function Ba(e, t, n) {
+function za(e, t, n) {
   return e.replace(new RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&"), "g"), n);
 }
 function Ju(e) {
@@ -25687,7 +25687,7 @@ function Ke(e) {
 function j(e, t) {
   return Z(e) && ee(e, t) && e[t] !== void 0;
 }
-const Eo = "row", ko = "column", a0 = "facet", lt = "x", Gt = "y", cr = "x2", Zr = "y2", Is = "xOffset", Qu = "yOffset", fr = "radius", Lo = "radius2", Di = "theta", Io = "theta2", dr = "latitude", hr = "longitude", pr = "latitude2", Fi = "longitude2", Ps = "time", Gn = "color", Jr = "fill", Qr = "stroke", Vn = "shape", Po = "size", ll = "angle", zo = "opacity", zs = "fillOpacity", Bs = "strokeOpacity", Us = "strokeWidth", js = "strokeDash", Ad = "text", xu = "order", Md = "detail", l0 = "key", Ua = "tooltip", u0 = "href", c0 = "url", f0 = "description", Aae = {
+const Eo = "row", ko = "column", a0 = "facet", lt = "x", Gt = "y", cr = "x2", Zr = "y2", Ls = "xOffset", Qu = "yOffset", fr = "radius", Lo = "radius2", Di = "theta", Io = "theta2", dr = "latitude", hr = "longitude", pr = "latitude2", Fi = "longitude2", Is = "time", Gn = "color", Jr = "fill", Qr = "stroke", Vn = "shape", Po = "size", ll = "angle", zo = "opacity", Ps = "fillOpacity", zs = "strokeOpacity", Bs = "strokeWidth", Us = "strokeDash", Ad = "text", xu = "order", Md = "detail", l0 = "key", Ba = "tooltip", u0 = "href", c0 = "url", f0 = "description", Aae = {
   x: 1,
   y: 1,
   x2: 1,
@@ -25936,13 +25936,13 @@ function jae(e) {
     case Po:
     case Vn:
     case zo:
+    case Bs:
     case Us:
-    case js:
       return !0;
+    case Ps:
     case zs:
-    case Bs:
     case ll:
-    case Ps:
+    case Is:
       return !1;
   }
 }
@@ -25984,14 +25984,14 @@ function Hae(e) {
     case f0:
     case Md:
     case l0:
-    case Ua:
+    case Ba:
     case u0:
     case xu:
     // TODO: revise (order might not support rect, which is not stackable?)
     case zo:
+    case Ps:
     case zs:
     case Bs:
-    case Us:
     // falls through
     case a0:
     case Eo:
@@ -26000,11 +26000,11 @@ function Hae(e) {
       return Q8;
     case lt:
     case Gt:
-    case Is:
+    case Ls:
     case Qu:
     case dr:
     case hr:
-    case Ps:
+    case Is:
       return Wae;
     case cr:
     case Zr:
@@ -26035,7 +26035,7 @@ function Hae(e) {
         line: "always",
         trail: "always"
       };
-    case js:
+    case Us:
       return {
         line: "always",
         point: "always",
@@ -26069,15 +26069,15 @@ function sy(e) {
     case Gt:
     case Di:
     case fr:
-    case Is:
+    case Ls:
     case Qu:
     case Po:
     case ll:
-    case Us:
-    case zo:
-    case zs:
     case Bs:
+    case zo:
     case Ps:
+    case zs:
+    case Is:
     // X2 and Y2 use X and Y scales, so they similarly have continuous range. [falls through]
     case cr:
     case Zr:
@@ -26088,10 +26088,10 @@ function sy(e) {
     case Eo:
     case ko:
     case Vn:
-    case js:
+    case Us:
     // TEXT, TOOLTIP, URL, and HREF have no scale but have discrete output [falls through]
     case Ad:
-    case Ua:
+    case Ba:
     case u0:
     case c0:
     case f0:
@@ -26146,7 +26146,7 @@ const Gae = {
 function No(e) {
   return j(e, "argmin");
 }
-function qs(e) {
+function js(e) {
   return j(e, "argmax");
 }
 function gE(e) {
@@ -26202,16 +26202,16 @@ function IA(e) {
     case Gn:
     case Jr:
     case Qr:
-    case Us:
+    case Bs:
     case zo:
+    case Ps:
     case zs:
-    case Bs:
     // Facets and Size shouldn't have too many bins
     // We choose 6 like shape to simplify the rule [falls through]
     case Vn:
       return 6;
     // Vega's "shape" has 6 distinct values
-    case js:
+    case Us:
       return 4;
     // We only provide 5 different stroke dash values (but 4 is more effective)
     default:
@@ -26705,21 +26705,21 @@ function cue(e) {
   return `Domain for ${e} is required for threshold scale.`;
 }
 const mO = Hg(dv);
-let ja = mO;
+let Ua = mO;
 function fue(e) {
-  return ja = e, ja;
+  return Ua = e, Ua;
 }
 function due() {
-  return ja = mO, ja;
+  return Ua = mO, Ua;
 }
 function _E(...e) {
-  ja.error(...e);
+  Ua.error(...e);
 }
 function W(...e) {
-  ja.warn(...e);
+  Ua.warn(...e);
 }
 function hue(...e) {
-  ja.debug(...e);
+  Ua.debug(...e);
 }
 function dl(e) {
   if (e && Z(e)) {
@@ -26797,7 +26797,7 @@ function vE(e, t) {
   }
   return n;
 }
-function qa(e) {
+function ja(e) {
   const n = vE(e, !0).join(", ");
   return e.utc ? `utc(${n})` : `datetime(${n})`;
 }
@@ -26909,7 +26909,7 @@ function kO(e, t = (n) => n) {
       ...r,
       [s]: +r[s] + o
     };
-    return `${t(qa(a))} - ${t(qa(r))}`;
+    return `${t(ja(a))} - ${t(ja(r))}`;
   }
 }
 const $ue = {
@@ -27037,12 +27037,12 @@ function Rue(e) {
 function TE(e) {
   return e === "ordinal" || e === "nominal";
 }
-const Wa = Fd.quantitative, NE = Fd.ordinal, wu = Fd.temporal, FE = Fd.nominal, ec = Fd.geojson;
+const qa = Fd.quantitative, NE = Fd.ordinal, wu = Fd.temporal, FE = Fd.nominal, ec = Fd.geojson;
 function Due(e) {
   if (e)
     switch (e = e.toLowerCase(), e) {
       case "q":
-      case Wa:
+      case qa:
         return "quantitative";
       case "t":
       case wu:
@@ -27306,7 +27306,7 @@ function RO(e, t) {
   }
 }
 function Gue(e, t) {
-  return Te([NE, FE], t) ? e === void 0 || yt(e) : t === wu ? Te([Xt.TIME, Xt.UTC, void 0], e) : t === Wa ? TO(e) || Eu(e) || e === void 0 : !0;
+  return Te([NE, FE], t) ? e === void 0 || yt(e) : t === wu ? Te([Xt.TIME, Xt.UTC, void 0], e) : t === qa ? TO(e) || Eu(e) || e === void 0 : !0;
 }
 function Vue(e, t, n = !1) {
   if (!to(e))
@@ -27314,19 +27314,19 @@ function Vue(e, t, n = !1) {
   switch (e) {
     case lt:
     case Gt:
-    case Is:
+    case Ls:
     case Qu:
     case Di:
     case fr:
       return Ar(t) || t === "band" ? !0 : t === "point" ? !n : !1;
-    case Ps:
+    case Is:
       return Te(["linear", "band"], t);
     case Po:
     // TODO: size and opacity can support ordinal with more modification
-    case Us:
+    case Bs:
     case zo:
+    case Ps:
     case zs:
-    case Bs:
     case ll:
       return Ar(t) || Eu(t) || Te(["band", "point", "ordinal"], t);
     case Gn:
@@ -27334,7 +27334,7 @@ function Vue(e, t, n = !1) {
     case Qr:
       return t !== "band";
     // band does not make sense with color
-    case js:
+    case Us:
     case Vn:
       return t === "ordinal" || Eu(t);
   }
@@ -27358,7 +27358,7 @@ const On = {
   square: "square",
   geoshape: "geoshape"
 }, DO = On.arc, b0 = On.area, _0 = On.bar, Xue = On.image, v0 = On.line, x0 = On.point, Kue = On.rect, Ag = On.rule, OO = On.text, RE = On.tick, Zue = On.trail, DE = On.circle, OE = On.square, LO = On.geoshape;
-function Ws(e) {
+function qs(e) {
   return ["line", "area", "trail"].includes(e);
 }
 function qf(e) {
@@ -27424,7 +27424,7 @@ const Que = [
   trail: 1,
   geoshape: 1
 }, IO = U(oce);
-function Ha(e) {
+function Wa(e) {
   return j(e, "band");
 }
 const sce = {
@@ -27452,7 +27452,7 @@ function IE({ markDef: e, config: t, scaleChannel: n, scaleType: i, isCountAggre
   if (!i || !ir(i) || r)
     return "always-valid";
   const o = PO(He("invalid", e, t), {
-    isPath: Ws(e.type)
+    isPath: qs(e.type)
   });
   return t.scale?.invalid?.[n] !== void 0 ? "show" : o;
 }
@@ -27509,13 +27509,13 @@ function PE(e) {
 }
 function hce(e) {
   const { datum: t } = e;
-  return dl(t) ? qa(t) : `${Ke(t)}`;
+  return dl(t) ? ja(t) : `${Ke(t)}`;
 }
-function Ea(e, t, n, i) {
+function wa(e, t, n, i) {
   const r = {};
   if (t && (r.scale = t), no(e)) {
     const { datum: o } = e;
-    dl(o) ? r.signal = qa(o) : re(o) ? r.signal = o.signal : Nd(o) ? r.signal = o.expr : r.value = o;
+    dl(o) ? r.signal = ja(o) : re(o) ? r.signal = o.signal : Nd(o) ? r.signal = o.expr : r.value = o;
   } else
     r.field = K(e, n);
   if (i) {
@@ -27553,7 +27553,7 @@ function zE({ channel: e, channelDef: t, channel2Def: n, markDef: i, config: r,
         });
         const { bin: d, timeUnit: h, type: p } = t;
         if (tt(d) || c && h && p === wu)
-          return a?.impute ? Ea(t, o, { binSuffix: "mid" }, { offset: l }) : c && !yt(f) ? Mg({ scaleName: o, fieldOrDatumDef: t, bandPosition: c, offset: l }) : Ea(t, o, Id(t, e) ? { binSuffix: "range" } : {}, {
+          return a?.impute ? wa(t, o, { binSuffix: "mid" }, { offset: l }) : c && !yt(f) ? Mg({ scaleName: o, fieldOrDatumDef: t, bandPosition: c, offset: l }) : wa(t, o, Id(t, e) ? { binSuffix: "range" } : {}, {
             offset: l
           });
         if (Vt(d)) {
@@ -27568,7 +27568,7 @@ function zE({ channel: e, channelDef: t, channel2Def: n, markDef: i, config: r,
           W(gO(e === lt ? cr : Zr));
         }
       }
-      return Ea(
+      return wa(
         t,
         o,
         yt(f) ? { binSuffix: "range" } : {},
@@ -27593,14 +27593,14 @@ function zE({ channel: e, channelDef: t, channel2Def: n, markDef: i, config: r,
 function yf(e, t) {
   return Te(["x", "x2"], e) && t === "width" ? { field: { group: "width" } } : Te(["y", "y2"], e) && t === "height" ? { field: { group: "height" } } : it(t);
 }
-function Ga(e) {
+function Ha(e) {
   return e && e !== "number" && e !== "time";
 }
 function UO(e, t, n) {
   return `${e}(${t}${n ? `, ${Ke(n)}` : ""})`;
 }
 function BE({ fieldOrDatumDef: e, format: t, formatType: n, expr: i, normalizeStack: r, config: o }) {
-  if (Ga(n))
+  if (Ha(n))
     return Zi({
       fieldOrDatumDef: e,
       format: t,
@@ -27680,7 +27680,7 @@ function Zi({ fieldOrDatumDef: e, format: t, formatType: n, expr: i, normalizeSt
   return { signal: UO(n, s, t) };
 }
 function qO(e, t, n, i, r, o) {
-  if (!(J(i) && Ga(i)) && !(n === void 0 && i === void 0 && r.customFormatTypes && ku(e) === "quantitative" && (r.normalizedNumberFormatType && Cu(e) && e.stack === "normalize" || r.numberFormatType))) {
+  if (!(J(i) && Ha(i)) && !(n === void 0 && i === void 0 && r.customFormatTypes && ku(e) === "quantitative" && (r.normalizedNumberFormatType && Cu(e) && e.stack === "normalize" || r.numberFormatType))) {
     if (Cu(e) && e.stack === "normalize" && r.normalizedNumberFormat)
       return D_({
         type: "quantitative",
@@ -27703,7 +27703,7 @@ function WO(e, t, n) {
 function D_({ type: e, specifiedFormat: t, config: n, normalizeStack: i }) {
   if (J(t))
     return t;
-  if (e === Wa)
+  if (e === qa)
     return i ? n.normalizedNumberFormat : n.numberFormat;
 }
 function gce({ specifiedFormat: e, timeUnit: t, config: n, omitTimeFormatConfig: i }) {
@@ -27715,7 +27715,7 @@ function HO(e, t) {
   return `format(${e}, "${t || ""}")`;
 }
 function ZA(e, t, n, i) {
-  return Ga(n) ? UO(n, e, t) : HO(e, (J(t) ? t : void 0) ?? i.numberFormat);
+  return Ha(n) ? UO(n, e, t) : HO(e, (J(t) ? t : void 0) ?? i.numberFormat);
 }
 function Rd(e, t, n, i, r) {
   if (n === void 0 && i === void 0 && r.customFormatTypes && r.numberFormatType)
@@ -27885,7 +27885,7 @@ function K(e, t = {}) {
         s = e.op;
       else {
         const { bin: a, aggregate: l, timeUnit: u } = e;
-        tt(a) ? (s = eO(a), r = (t.binSuffix ?? "") + (t.suffix ?? "")) : l ? qs(l) ? (o = `["${n}"]`, n = `argmax_${l.argmax}`) : No(l) ? (o = `["${n}"]`, n = `argmin_${l.argmin}`) : s = String(l) : u && !hl(u) && (s = Sue(u), r = (!["range", "mid"].includes(t.binSuffix) && t.binSuffix || "") + (t.suffix ?? ""));
+        tt(a) ? (s = eO(a), r = (t.binSuffix ?? "") + (t.suffix ?? "")) : l ? js(l) ? (o = `["${n}"]`, n = `argmax_${l.argmax}`) : No(l) ? (o = `["${n}"]`, n = `argmin_${l.argmin}`) : s = String(l) : u && !hl(u) && (s = Sue(u), r = (!["range", "mid"].includes(t.binSuffix) && t.binSuffix || "") + (t.suffix ?? ""));
       }
     s && (n = n ? `${s}_${n}` : s);
   }
@@ -27921,12 +27921,12 @@ function Sce(e, t) {
     if (s)
       return `${n} (${m0(s).join("-")})`;
   } else if (o)
-    return qs(o) ? `${n} for max ${o.argmax}` : No(o) ? `${n} for min ${o.argmin}` : `${$d(o)} of ${n}`;
+    return js(o) ? `${n} for max ${o.argmax}` : No(o) ? `${n} for min ${o.argmin}` : `${$d(o)} of ${n}`;
   return n;
 }
 function $ce(e) {
   const { aggregate: t, bin: n, timeUnit: i, field: r } = e;
-  if (qs(t))
+  if (js(t))
     return `${r} for argmax(${t.argmax})`;
   if (No(t))
     return `${r} for argmin(${t.argmin})`;
@@ -27996,7 +27996,7 @@ function Mce(e, t) {
   const { aggregate: n, bin: i, timeUnit: r } = e;
   if (r)
     return "temporal";
-  if (i || n && !qs(n) && !No(n))
+  if (i || n && !js(n) && !No(n))
     return "quantitative";
   if (pl(e) && e.scale?.type)
     switch (F_[e.scale.type]) {
@@ -28034,13 +28034,13 @@ function t9(e, t, n, i = {}) {
 function Fg(e, t, n, i) {
   if (ZO(e)) {
     const { format: r, formatType: o, ...s } = e;
-    if (Ga(o) && !n.customFormatTypes)
+    if (Ha(o) && !n.customFormatTypes)
       return W(GA(t)), Fg(s, t, n, i);
   } else {
     const r = Cu(e) ? "axis" : KO(e) ? "legend" : UE(e) ? "header" : null;
     if (r && e[r]) {
       const { format: o, formatType: s, ...a } = e[r];
-      if (Ga(s) && !n.customFormatTypes)
+      if (Ha(s) && !n.customFormatTypes)
         return W(GA(t)), Fg({ ...e, [r]: a }, t, n, i);
     }
   }
@@ -28055,7 +28055,7 @@ function Tce(e) {
 }
 function HE(e, t, { compositeMark: n = !1 } = {}) {
   const { aggregate: i, timeUnit: r, bin: o, field: s } = e, a = { ...e };
-  if (!n && i && !gE(i) && !qs(i) && !No(i) && (W(Tle(i)), delete a.aggregate), r && (a.timeUnit = Wt(r)), s && (a.field = `${s}`), tt(o) && (a.bin = C0(o, t)), Vt(o) && !vt(t) && W(uue(t)), Rn(a)) {
+  if (!n && i && !gE(i) && !js(i) && !No(i) && (W(Tle(i)), delete a.aggregate), r && (a.timeUnit = Wt(r)), s && (a.field = `${s}`), tt(o) && (a.bin = C0(o, t)), Vt(o) && !vt(t) && W(uue(t)), Rn(a)) {
     const { type: l } = a, u = Due(l);
     l !== u && (a.type = u), l !== "quantitative" && h0(i) && (W(Mle(l, i)), a.type = "quantitative");
   } else if (!Y8(t)) {
@@ -28120,7 +28120,7 @@ function Nce(e, t) {
       };
     case lt:
     case Gt:
-    case Is:
+    case Ls:
     case Qu:
     case Gn:
     case Jr:
@@ -28128,7 +28128,7 @@ function Nce(e, t) {
     case Ad:
     case Md:
     case l0:
-    case Ua:
+    case Ba:
     case u0:
     case c0:
     case ll:
@@ -28140,26 +28140,26 @@ function Nce(e, t) {
     case Fi:
     case dr:
     case pr:
-      return n !== Wa ? {
+      return n !== qa ? {
         compatible: !1,
         warning: `Channel ${t} should be used with a quantitative field only, not ${e.type} field.`
       } : $l;
     case zo:
+    case Ps:
     case zs:
     case Bs:
-    case Us:
     case Po:
     case Io:
     case Lo:
     case cr:
     case Zr:
-    case Ps:
+    case Is:
       return n === "nominal" && !e.sort ? {
         compatible: !1,
         warning: `Channel ${t} should not be used with an unsorted discrete field.`
       } : $l;
     case Vn:
-    case js:
+    case Us:
       return !Ng(e) && !kce(e) ? {
         compatible: !1,
         warning: Ole(t)
@@ -28181,7 +28181,7 @@ function Fce(e) {
 function S0(e, { timeUnit: t, type: n, wrapTime: i, undefinedIfExprNotRequired: r }) {
   const o = t && Wt(t)?.unit;
   let s = o || n === "temporal", a;
-  return Nd(e) ? a = e.expr : re(e) ? a = e.signal : dl(e) ? (s = !0, a = qa(e)) : (J(e) || ze(e)) && s && (a = `datetime(${Ke(e)})`, xue(o) && (ze(e) && e < 1e4 || J(e) && isNaN(Date.parse(e))) && (a = qa({ [o]: e }))), a ? i && s ? `time(${a})` : a : r ? void 0 : Ke(e);
+  return Nd(e) ? a = e.expr : re(e) ? a = e.signal : dl(e) ? (s = !0, a = ja(e)) : (J(e) || ze(e)) && s && (a = `datetime(${Ke(e)})`, xue(o) && (ze(e) && e < 1e4 || J(e) && isNaN(Date.parse(e))) && (a = ja({ [o]: e }))), a ? i && s ? `time(${a})` : a : r ? void 0 : Ke(e);
 }
 function n9(e, t) {
   const { type: n } = e;
@@ -28488,7 +28488,7 @@ class $0 {
     return Uo(t) ? cce(t.mark) === this.name : !1;
   }
 }
-function ka(e, t) {
+function Ea(e, t) {
   const n = e?.[t];
   return n ? z(n) ? bu(n, (i) => !!i.field) : H(n) || k0(n) : !1;
 }
@@ -28508,7 +28508,7 @@ function a9(e, t) {
 }
 function l9(e) {
   return bu(Tae, (t) => {
-    if (ka(e, t)) {
+    if (Ea(e, t)) {
       const n = e[t];
       if (z(n))
         return bu(n, (i) => !!i.aggregate);
@@ -28537,7 +28537,7 @@ function u9(e, t) {
         };
         if (c) {
           let b;
-          if (qs(c) ? (b = "argmax", m = K({ op: "argmax", field: c.argmax }, { forAs: !0 }), y.field = `${m}.${u}`) : No(c) ? (b = "argmin", m = K({ op: "argmin", field: c.argmin }, { forAs: !0 }), y.field = `${m}.${u}`) : c !== "boxplot" && c !== "errorbar" && c !== "errorband" && (b = c), b) {
+          if (js(c) ? (b = "argmax", m = K({ op: "argmax", field: c.argmax }, { forAs: !0 }), y.field = `${m}.${u}`) : No(c) ? (b = "argmin", m = K({ op: "argmin", field: c.argmin }, { forAs: !0 }), y.field = `${m}.${u}`) : c !== "boxplot" && c !== "errorbar" && c !== "errorband" && (b = c), b) {
             const _ = {
               op: b,
               as: m
@@ -28551,7 +28551,7 @@ function u9(e, t) {
             };
             s[`${l}2`] = b;
           }
-          y.bin = "binned", Y8(l) || (y.type = Wa);
+          y.bin = "binned", Y8(l) || (y.type = qa);
         } else if (d && !hl(d)) {
           r.push({
             timeUnit: d,
@@ -28559,7 +28559,7 @@ function u9(e, t) {
             as: m
           });
           const b = Rn(a) && a.type !== wu && "time";
-          b && (l === Ad || l === Ua ? y.formatType = b : Uae(l) ? y.legend = {
+          b && (l === Ad || l === Ba ? y.formatType = b : Uae(l) ? y.legend = {
             formatType: b,
             ...y.legend
           } : vt(l) && (y.axis = {
@@ -28617,7 +28617,7 @@ function Ice(e, t, n, i) {
       W(dO("encoding", { fill: "fill" in e, stroke: "stroke" in e }));
       continue;
     }
-    if (o === Md || o === xu && !z(s) && !rr(s) || o === Ua && z(s)) {
+    if (o === Md || o === xu && !z(s) && !rr(s) || o === Ba && z(s)) {
       if (s) {
         if (o === xu) {
           const a = e[o];
@@ -28629,7 +28629,7 @@ function Ice(e, t, n, i) {
         r[o] = Q(s).reduce((a, l) => (H(l) ? a.push(HE(l, o)) : W(N_(l, o)), a), []);
       }
     } else {
-      if (o === Ua && s === null)
+      if (o === Ba && s === null)
         r[o] = null;
       else if (!H(s) && !no(s) && !rr(s) && !Od(s) && !re(s)) {
         W(N_(s, o));
@@ -28651,7 +28651,7 @@ function A0(e, t) {
 function Pce(e) {
   const t = [];
   for (const n of U(e))
-    if (ka(e, n)) {
+    if (Ea(e, n)) {
       const i = e[n], r = Q(i);
       for (const o of r)
         H(o) ? t.push(o) : k0(o) && t.push(o.condition);
@@ -28686,13 +28686,13 @@ function c9(e, t) {
       case c0:
       case cr:
       case Zr:
-      case Is:
+      case Ls:
       case Qu:
       case Di:
       case Io:
       case fr:
       case Lo:
-      case Ps:
+      case Is:
       // falls through
       case dr:
       case hr:
@@ -28705,7 +28705,7 @@ function c9(e, t) {
       case ll:
       // falls through
       // tooltip fields should not be added to group by [falls through]
-      case Ua:
+      case Ba:
         return n;
       case xu:
         if (e === "line" || e === "trail")
@@ -28728,10 +28728,10 @@ function c9(e, t) {
       case Jr:
       case Qr:
       case zo:
+      case Ps:
       case zs:
-      case Bs:
-      case js:
-      case Us: {
+      case Us:
+      case Bs: {
         const r = or(t[i]);
         return r && !r.aggregate && n.push(K(r, {})), n;
       }
@@ -29288,7 +29288,7 @@ function Kce(e, t, n, i, r, o, s, a) {
     for (const h of u)
       f.push({
         fieldPrefix: h.as.substring(0, 6),
-        titlePrefix: Ba(Ba(h.calculate, "datum['", ""), "']", "")
+        titlePrefix: za(za(h.calculate, "datum['", ""), "']", "")
       });
   }
   return { postAggregateCalculates: u, errorBarSpecificAggregate: l, tooltipSummary: f, tooltipTitleWithFieldName: d };
@@ -30037,7 +30037,7 @@ function T9(e, t) {
   const c = a === "x" ? "xOffset" : "yOffset", f = t[c], d = H(f) ? K(f, {}) : void 0;
   d && d !== s && (l.push(c), u.add(d));
   const h = Iae.reduce((g, m) => {
-    if (m !== "tooltip" && ka(t, m)) {
+    if (m !== "tooltip" && Ea(t, m)) {
       const y = t[m];
       for (const b of Q(y)) {
         const _ = or(b);
@@ -30056,7 +30056,7 @@ function T9(e, t) {
     groupbyChannels: l,
     groupbyFields: u,
     fieldChannel: r,
-    impute: o.impute === null ? !1 : Ws(i),
+    impute: o.impute === null ? !1 : qs(i),
     stackBy: h,
     offset: p
   }));
@@ -30110,9 +30110,9 @@ function Dfe(e, t, n) {
         if (n)
           return n;
         if (!o)
-          return (H(i) && i.type === Wa && !tt(i.bin) || Tg(i)) && H(r) && Vt(r.bin) ? "horizontal" : "vertical";
+          return (H(i) && i.type === qa && !tt(i.bin) || Tg(i)) && H(r) && Vt(r.bin) ? "horizontal" : "vertical";
         if (!s)
-          return (H(r) && r.type === Wa && !tt(r.bin) || Tg(r)) && H(i) && Vt(i.bin) ? "vertical" : "horizontal";
+          return (H(r) && r.type === qa && !tt(r.bin) || Tg(r)) && H(i) && Vt(i.bin) ? "vertical" : "horizontal";
       }
     // falls through
     case Ag:
@@ -30350,7 +30350,7 @@ class Bfe extends nk {
   ];
   map(t, n) {
     if (Uo(t)) {
-      const i = ka(t.encoding, Eo), r = ka(t.encoding, ko), o = ka(t.encoding, a0);
+      const i = Ea(t.encoding, Eo), r = Ea(t.encoding, ko), o = Ea(t.encoding, a0);
       if (i || r || o)
         return this.mapFacetedUnit(t, n);
     }
@@ -31266,7 +31266,7 @@ const vde = {
   ])), n),
   signals: (e, t, n) => {
     const i = t.name, r = i + zd, o = t.project, s = "(item().isVoronoi ? datum.datum : datum)", a = Ct(e.component.selection ?? {}).reduce((c, f) => f.type === "interval" ? c.concat(f.name + Xl) : c, []).map((c) => `indexof(item().mark.name, '${c}') < 0`).join(" && "), l = `datum && item().mark.marktype !== 'group' && indexof(item().mark.role, 'legend') < 0${a ? ` && ${a}` : ""}`;
-    let u = `unit: ${Ca(e)}, `;
+    let u = `unit: ${ka(e)}, `;
     if (t.project.hasSelectionId)
       u += `${sr}: ${s}[${G(sr)}]`;
     else if (Rr(t))
@@ -31276,7 +31276,7 @@ const vde = {
       u += `fields: ${r}, values: [${c}]`;
     }
     if (Rr(t))
-      return n.concat(wde(t.name, e.scaleName(Ps)), [
+      return n.concat(wde(t.name, e.scaleName(Is)), [
         {
           name: i + Ro,
           on: [
@@ -31309,18 +31309,18 @@ function X9(e) {
   const { signals: t, hasLegend: n, index: i, ...r } = e;
   return r.field = Ni(r.field), r;
 }
-function Va(e, t = !0, n = yn) {
+function Ga(e, t = !0, n = yn) {
   if (z(e)) {
-    const i = e.map((r) => Va(r, t, n));
+    const i = e.map((r) => Ga(r, t, n));
     return t ? `[${i.join(", ")}]` : i;
   } else if (dl(e))
-    return n(t ? qa(e) : vue(e));
+    return n(t ? ja(e) : vue(e));
   return t ? n(Ke(e)) : e;
 }
 function kde(e, t) {
   for (const n of Ct(e.component.selection ?? {})) {
     const i = n.name;
-    let r = `${i}${Ro}, ${n.resolve === "global" ? "true" : `{unit: ${Ca(e)}}`}`;
+    let r = `${i}${Ro}, ${n.resolve === "global" ? "true" : `{unit: ${ka(e)}}`}`;
     for (const o of D0)
       o.defined(n) && (o.signals && (t = o.signals(e, n, t)), o.modifyExpr && (r = o.modifyExpr(e, n, r)));
     t.push({
@@ -31328,7 +31328,7 @@ function kde(e, t) {
       on: [
         {
           events: { signal: n.name + Ro },
-          update: `modify(${G(n.name + Ya)}, ${r})`
+          update: `modify(${G(n.name + Va)}, ${r})`
         }
       ]
     });
@@ -31343,7 +31343,7 @@ function Cde(e, t) {
       value: {},
       on: [
         {
-          events: Ls("pointermove", "scope"),
+          events: Os("pointermove", "scope"),
           update: `isTuple(facet) ? facet : group(${n}).datum`
         }
       ]
@@ -31354,7 +31354,7 @@ function Cde(e, t) {
 function Sde(e, t) {
   let n = !1;
   for (const i of Ct(e.component.selection ?? {})) {
-    const r = i.name, o = G(r + Ya);
+    const r = i.name, o = G(r + Va);
     if (t.filter((a) => a.name === r).length === 0) {
       const a = i.resolve === "global" ? "union" : i.resolve, l = i.type === "point" ? ", true, true)" : ")";
       t.push({
@@ -31373,14 +31373,14 @@ function Sde(e, t) {
   }), ok(t);
 }
 function $de(e, t) {
-  const n = [], i = [], r = Ca(e, { escape: !1 });
+  const n = [], i = [], r = ka(e, { escape: !1 });
   for (const o of Ct(e.component.selection ?? {})) {
-    const s = { name: o.name + Ya };
+    const s = { name: o.name + Va };
     if (o.project.hasSelectionId && (s.transform = [{ type: "collect", sort: { field: sr } }]), o.init) {
       const l = o.project.items.map(X9);
-      s.values = o.project.hasSelectionId ? o.init.map((u) => ({ unit: r, [sr]: Va(u, !1)[0] })) : o.init.map((u) => ({ unit: r, fields: l, values: Va(u, !1) }));
+      s.values = o.project.hasSelectionId ? o.init.map((u) => ({ unit: r, [sr]: Ga(u, !1)[0] })) : o.init.map((u) => ({ unit: r, fields: l, values: Ga(u, !1) }));
     }
-    if ([...n, ...t].filter((l) => l.name === o.name + Ya).length || n.push(s), Rr(o) && t.length) {
+    if ([...n, ...t].filter((l) => l.name === o.name + Va).length || n.push(s), Rr(o) && t.length) {
       const l = e.lookupDataSource(e.getDataName(ft.Main)), u = t.find((f) => f.name === l), c = u.transform.find((f) => f.type === "filter" && f.expr.includes("vlSelectionTest"));
       if (c) {
         u.transform = u.transform.filter((d) => d !== c);
@@ -31494,7 +31494,7 @@ const Xl = "_brush", Z9 = "_scale_trigger", Mc = "geo_interval_init_tick", J9 =
         name: l,
         update: `invert(${a}, [${g("width")}/2, ${g("height")}/2])`
       })));
-      const y = `intersect(${m}, {markname: ${G(e.getName("marks"))}}, unit.mark)`, b = `{unit: ${Ca(e)}}`, _ = `vlSelectionTuples(${y}, ${b})`, v = o.map((w) => w.signals.visual);
+      const y = `intersect(${m}, {markname: ${G(e.getName("marks"))}}, unit.mark)`, b = `{unit: ${ka(e)}}`, _ = `vlSelectionTuples(${y}, ${b})`, v = o.map((w) => w.signals.visual);
       return n.concat({
         name: r,
         on: [
@@ -31524,10 +31524,10 @@ const Xl = "_brush", Z9 = "_scale_trigger", Mc = "geo_interval_init_tick", J9 =
           ]
         });
       }
-      const a = o.map((u) => u.signals.data), l = `unit: ${Ca(e)}, fields: ${i + zd}, values`;
+      const a = o.map((u) => u.signals.data), l = `unit: ${ka(e)}, fields: ${i + zd}, values`;
       return n.concat({
         name: r,
-        ...s ? { init: `{${l}: ${Va(s)}}` } : {},
+        ...s ? { init: `{${l}: ${Ga(s)}}` } : {},
         ...a.length ? {
           on: [
             {
@@ -31551,7 +31551,7 @@ const Xl = "_brush", Z9 = "_scale_trigger", Mc = "geo_interval_init_tick", J9 =
     ]
   })), n),
   marks: (e, t, n) => {
-    const i = t.name, { x: r, y: o } = t.project.hasChannel, s = r?.signals.visual, a = o?.signals.visual, l = `data(${G(t.name + Ya)})`;
+    const i = t.name, { x: r, y: o } = t.project.hasChannel, s = r?.signals.visual, a = o?.signals.visual, l = `data(${G(t.name + Va)})`;
     if (So.defined(t) || !r && !o)
       return n;
     const u = {
@@ -31564,7 +31564,7 @@ const Xl = "_brush", Z9 = "_scale_trigger", Mc = "geo_interval_init_tick", J9 =
       for (const m of U(u))
         u[m] = [
           {
-            test: `${l}.length && ${l}[0].unit === ${Ca(e)}`,
+            test: `${l}.length && ${l}[0].unit === ${ka(e)}`,
             ...u[m]
           },
           { value: 0 }
@@ -31617,7 +31617,7 @@ function Fde(e, t, n, i) {
     // Brush End
   ], []);
   if (r) {
-    const d = n.signals.data, h = So.defined(t), p = e.getScaleComponent(o), g = p ? p.get("type") : void 0, m = i ? { init: Va(i, !0, l) } : { value: [] };
+    const d = n.signals.data, h = So.defined(t), p = e.getScaleComponent(o), g = p ? p.get("type") : void 0, m = i ? { init: Ga(i, !0, l) } : { value: [] };
     return f.push({
       events: { signal: t.name + Z9 },
       update: ir(g) ? `[${l(`${d}[0]`)}, ${l(`${d}[1]`)}]` : "[0, 0]"
@@ -31625,7 +31625,7 @@ function Fde(e, t, n, i) {
       { name: s, ...m, on: f },
       {
         name: d,
-        ...i ? { init: Va(i) } : {},
+        ...i ? { init: Ga(i) } : {},
         // Cannot be `value` as `init` may require datetime exprs.
         on: [
           {
@@ -31855,7 +31855,7 @@ function n7(e, t = { filled: void 0 }) {
 }
 function Lde(e) {
   const { encoding: t, mark: n } = e, i = t.order;
-  return !Ws(n) && rr(i) ? tc({
+  return !qs(n) && rr(i) ? tc({
     model: e,
     channelDef: i,
     vgChannel: "zindex",
@@ -31927,7 +31927,7 @@ function Ide(e) {
           offset: o
         });
     }
-    return Ea(n, i, { suffix: "end" }, { offset: o });
+    return wa(n, i, { suffix: "end" }, { offset: o });
   }
   return PE(e);
 }
@@ -32043,7 +32043,7 @@ function Bde(e, t, n) {
 }
 function Ude({ channel: e, channelDef: t, channel2Def: n, markDef: i, config: r, scaleName: o, scale: s, stack: a, offset: l, defaultRef: u }) {
   return ge(t) && a && // If fieldChannel is X and channel is X2 (or Y and Y2)
-  e.charAt(0) === a.fieldChannel.charAt(0) ? Ea(t, o, { suffix: "start" }, { offset: l }) : PE({
+  e.charAt(0) === a.fieldChannel.charAt(0) ? wa(t, o, { suffix: "start" }, { offset: l }) : PE({
     channel: e,
     channelDef: n,
     scaleName: o,
@@ -32063,7 +32063,7 @@ function wh(e, t) {
     return { [i]: yf(e, t[e]) };
   if (t[n]) {
     const r = t[n];
-    if (Ha(r))
+    if (Wa(r))
       W(Nle(n));
     else
       return { [n]: yf(e, r) };
@@ -32071,7 +32071,7 @@ function wh(e, t) {
 }
 function Fo(e, t) {
   const { config: n, encoding: i, markDef: r } = e, o = r.type, s = eo(t), a = Yn(t), l = i[t], u = i[s], c = e.getScaleComponent(t), f = c ? c.get("type") : void 0, d = r.orient, h = i[a] ?? i.size ?? He("size", r, n, { vgChannel: a }), p = X8(t), g = o === "bar" && (t === "x" ? d === "vertical" : d === "horizontal") || o === "tick" && (t === "y" ? d === "vertical" : d === "horizontal");
-  return H(l) && (tt(l.bin) || Vt(l.bin) || l.timeUnit && !u) && !(h && !Ha(h)) && !i[p] && !yt(f) ? Wde({
+  return H(l) && (tt(l.bin) || Vt(l.bin) || l.timeUnit && !u) && !(h && !Wa(h)) && !i[p] && !yt(f) ? Wde({
     fieldDef: l,
     fieldDef2: u,
     channel: t,
@@ -32079,7 +32079,7 @@ function Fo(e, t) {
   }) : (ge(l) && yt(f) || g) && !u ? qde(l, t, e) : r7(t, e, { defaultPos: "zeroOrMax", defaultPos2: "zeroOrMin" });
 }
 function jde(e, t, n, i, r, o, s) {
-  if (Ha(r))
+  if (Wa(r))
     if (n) {
       const l = n.get("type");
       if (l === "band") {
@@ -32135,7 +32135,7 @@ function qde(e, t, n) {
   m = m || {
     [c]: jde(c, h || l, p || u, o, b, !!e, i.type)
   };
-  const _ = (u || p)?.get("type") === "band" && Ha(b) && !y ? "top" : "middle", v = i7(t, i, o, _), w = v === "xc" || v === "yc", { offset: E, offsetType: x } = Mu({ channel: t, markDef: i, encoding: r, model: n, bandPosition: w ? 0.5 : 0 }), C = PE({
+  const _ = (u || p)?.get("type") === "band" && Wa(b) && !y ? "top" : "middle", v = i7(t, i, o, _), w = v === "xc" || v === "yc", { offset: E, offsetType: x } = Mu({ channel: t, markDef: i, encoding: r, model: n, bandPosition: w ? 0.5 : 0 }), C = PE({
     channel: t,
     channelDef: e,
     markDef: i,
@@ -32145,7 +32145,7 @@ function qde(e, t, n) {
     stack: s,
     offset: E,
     defaultRef: lk({ model: n, defaultPos: "mid", channel: t, scaleName: l, scale: u }),
-    bandPosition: w ? x === "encoding" ? 0 : 0.5 : re(b) ? { signal: `(1-${b})/2` } : Ha(b) ? (1 - b.band) / 2 : 0
+    bandPosition: w ? x === "encoding" ? 0 : 0.5 : re(b) ? { signal: `(1-${b})/2` } : Wa(b) ? (1 - b.band) / 2 : 0
   });
   if (c)
     return { [v]: C, ...m };
@@ -32174,7 +32174,7 @@ function w3(e, t, n, i, r, o, s) {
     return r = r || 0, i + (n ? -r - l : +r + l);
 }
 function Wde({ fieldDef: e, fieldDef2: t, channel: n, model: i }) {
-  const { config: r, markDef: o, encoding: s } = i, a = i.getScaleComponent(n), l = i.scaleName(n), u = a ? a.get("type") : void 0, c = a.get("reverse"), f = VO({ channel: n, fieldDef: e, markDef: o, config: r, scaleType: u }), h = i.component.axes[n]?.[0]?.get("translate") ?? 0.5, p = vt(n) ? He("binSpacing", o, r) ?? 0 : 0, g = eo(n), m = Ss(n), y = Ss(g), b = Ur("minBandSize", o, r), { offset: _ } = Mu({ channel: n, markDef: o, encoding: s, model: i, bandPosition: 0 }), { offset: v } = Mu({ channel: g, markDef: o, encoding: s, model: i, bandPosition: 0 }), w = pce({ fieldDef: e, scaleName: l }), E = w3(n, p, c, h, _, b, w), x = w3(g, p, c, h, v ?? _, b, w), C = re(f) ? { signal: `(1-${f.signal})/2` } : Ha(f) ? (1 - f.band) / 2 : 0.5, S = $s({ fieldDef: e, fieldDef2: t, markDef: o, config: r });
+  const { config: r, markDef: o, encoding: s } = i, a = i.getScaleComponent(n), l = i.scaleName(n), u = a ? a.get("type") : void 0, c = a.get("reverse"), f = VO({ channel: n, fieldDef: e, markDef: o, config: r, scaleType: u }), h = i.component.axes[n]?.[0]?.get("translate") ?? 0.5, p = vt(n) ? He("binSpacing", o, r) ?? 0 : 0, g = eo(n), m = Ss(n), y = Ss(g), b = Ur("minBandSize", o, r), { offset: _ } = Mu({ channel: n, markDef: o, encoding: s, model: i, bandPosition: 0 }), { offset: v } = Mu({ channel: g, markDef: o, encoding: s, model: i, bandPosition: 0 }), w = pce({ fieldDef: e, scaleName: l }), E = w3(n, p, c, h, _, b, w), x = w3(g, p, c, h, v ?? _, b, w), C = re(f) ? { signal: `(1-${f.signal})/2` } : Wa(f) ? (1 - f.band) / 2 : 0.5, S = $s({ fieldDef: e, fieldDef2: t, markDef: o, config: r });
   if (tt(e.bin) || e.timeUnit) {
     const A = e.timeUnit && S !== 0.5;
     return {
@@ -32194,11 +32194,11 @@ function Wde({ fieldDef: e, fieldDef2: t, channel: n, model: i }) {
       })
     };
   } else if (Vt(e.bin)) {
-    const A = Ea(e, l, {}, { offset: x });
+    const A = wa(e, l, {}, { offset: x });
     if (H(t))
       return {
         [y]: A,
-        [m]: Ea(t, l, {}, { offset: E })
+        [m]: wa(t, l, {}, { offset: E })
       };
     if (cl(e.bin) && e.bin.step)
       return {
@@ -32280,7 +32280,7 @@ const gy = "voronoi", o7 = {
   },
   marks: (e, t, n) => {
     const { x: i, y: r } = t.project.hasChannel, o = e.mark;
-    if (Ws(o))
+    if (qs(o))
       return W(ale(o)), n;
     const s = {
       name: e.getName(gy),
@@ -32321,7 +32321,7 @@ const gy = "voronoi", o7 = {
       const c = at(`${i}_${l.field}`);
       n.filter((d) => d.name === c).length || n.unshift({
         name: c,
-        ...s ? { init: Va(s[u]) } : { value: null },
+        ...s ? { init: Ga(s[u]) } : { value: null },
         on: t.events ? [
           {
             events: t.events,
@@ -32345,12 +32345,12 @@ const gy = "voronoi", o7 = {
   }),
   modifyExpr: (e, t) => {
     const n = t.name + Ro, i = t.name + Lg;
-    return `${i} ? null : ${n}, ${t.resolve === "global" ? `${i} ? null : true, ` : `${i} ? null : {unit: ${Ca(e)}}, `}${i} ? ${n} : null`;
+    return `${i} ? null : ${n}, ${t.resolve === "global" ? `${i} ? null : true, ` : `${i} ? null : {unit: ${ka(e)}}, `}${i} ? ${n} : null`;
   }
 }, Vde = {
   defined: (e) => e.clear !== void 0 && e.clear !== !1 && !Rr(e),
   parse: (e, t) => {
-    t.clear && (t.clear = J(t.clear) ? Ls(t.clear, "view") : t.clear);
+    t.clear && (t.clear = J(t.clear) ? Os(t.clear, "view") : t.clear);
   },
   topLevelSignals: (e, t, n) => {
     if (s7.defined(t))
@@ -32390,7 +32390,7 @@ const gy = "voronoi", o7 = {
       for (const a of t.events)
         a.filter = Q(a.filter ?? []), a.filter.includes(s) || a.filter.push(s);
     }
-    const r = uy(t.bind) ? t.bind.legend : "click", o = J(r) ? Ls(r, "view") : Q(r);
+    const r = uy(t.bind) ? t.bind.legend : "click", o = J(r) ? Os(r, "view") : Q(r);
     t.bind = { legend: { merge: o } };
   },
   topLevelSignals: (e, t, n) => {
@@ -32445,7 +32445,7 @@ const u7 = "_translate_anchor", c7 = "_translate_delta", Xde = {
   defined: (e) => e.type === "interval" && e.translate,
   signals: (e, t, n) => {
     const i = t.name, r = So.defined(t), o = i + u7, { x: s, y: a } = t.project.hasChannel;
-    let l = Ls(t.translate, "scope");
+    let l = Os(t.translate, "scope");
     return r || (l = l.map((u) => (u.between[0].markname = i + Xl, u))), n.push({
       name: o,
       value: {},
@@ -32478,7 +32478,7 @@ const f7 = "_zoom_anchor", d7 = "_zoom_delta", Kde = {
   defined: (e) => e.type === "interval" && e.zoom,
   signals: (e, t, n) => {
     const i = t.name, r = So.defined(t), o = i + d7, { x: s, y: a } = t.project.hasChannel, l = G(e.scaleName(lt)), u = G(e.scaleName(Gt));
-    let c = Ls(t.zoom, "scope");
+    let c = Os(t.zoom, "scope");
     return r || (c = c.map((f) => (f.markname = i + Xl, f))), n.push({
       name: i + f7,
       on: [
@@ -32506,7 +32506,7 @@ function $3(e, t, n, i, r) {
     update: a ? y : `clampRange(${y}, 0, ${u})`
   });
 }
-const Ya = "_store", Ro = "_tuple", Zde = "_modify", h7 = "vlSelectionResolve", D0 = [
+const Va = "_store", Ro = "_tuple", Zde = "_modify", h7 = "vlSelectionResolve", D0 = [
   Ede,
   Nde,
   vde,
@@ -32526,7 +32526,7 @@ function Jde(e) {
     t = t.parent;
   return t;
 }
-function Ca(e, { escape: t } = { escape: !0 }) {
+function ka(e, { escape: t } = { escape: !0 }) {
   let n = t ? G(e.name) : e.name;
   const i = Jde(e);
   if (i) {
@@ -32600,7 +32600,7 @@ function Qde(e, t) {
       type: l,
       init: o.value,
       bind: o.bind,
-      events: J(u.on) ? Ls(u.on, "scope") : Q(he(u.on))
+      events: J(u.on) ? Os(u.on, "scope") : Q(he(u.on))
     };
     if (Rr(f) && (r++, r > 1)) {
       delete n[s];
@@ -32613,7 +32613,7 @@ function Qde(e, t) {
   return r > 1 && W(yle), n;
 }
 function y7(e, t, n, i = "datum") {
-  const r = J(t) ? t : t.param, o = at(r), s = G(o + Ya);
+  const r = J(t) ? t : t.param, o = at(r), s = G(o + Va);
   let a;
   try {
     a = e.getSelectionComponent(o, r);
@@ -32728,7 +32728,7 @@ function nf(e, t, n, i = { header: !1 }) {
         return;
       if (a !== void 0) {
         let d = a;
-        c.encode?.labels?.update && re(c.encode.labels.update.text) && (d = Ba(a, "datum.label", c.encode.labels.update.text.signal)), my(c, "labels", "text", { signal: d });
+        c.encode?.labels?.update && re(c.encode.labels.update.text) && (d = za(a, "datum.label", c.encode.labels.update.text.signal)), my(c, "labels", "text", { signal: d });
       }
       if (c.labelAlign === null && delete c.labelAlign, c.encode) {
         for (const d of i9)
@@ -33109,7 +33109,7 @@ function V_(e, t, n) {
   }).signal, c = O0(t, a);
   return {
     text: {
-      signal: l ? Ba(Ba(l, "datum.label", u), "datum.value", K(e, { expr: "parent" })) : u
+      signal: l ? za(za(l, "datum.label", u), "datum.value", K(e, { expr: "parent" })) : u
     },
     ...t === "row" ? { orient: "left" } : {},
     style: "guide-label",
@@ -33347,7 +33347,7 @@ function Che(e, { model: t, legendType: n, legendCmpt: i }) {
 function She(e, { fieldOrDatumDef: t, model: n, channel: i, legendCmpt: r }) {
   const o = n.legend(i) || {}, s = n.config, a = H(t) ? R7(n, r, t) : void 0, l = a ? [{ test: a, value: 1 }, { value: s.legend.unselectedOpacity }] : void 0, { format: u, formatType: c } = o;
   let f;
-  Ga(c) ? f = Zi({
+  Ha(c) ? f = Zi({
     fieldOrDatumDef: t,
     field: "datum.value",
     format: u,
@@ -33393,7 +33393,7 @@ function R7(e, t, n) {
   if (!i?.length)
     return;
   const r = G(n.field);
-  return i.map((o) => `(!length(data(${G(at(o) + Ya)})) || (${o}[${r}] && indexof(${o}[${r}], datum.value) >= 0))`).join(" || ");
+  return i.map((o) => `(!length(data(${G(at(o) + Va)})) || (${o}[${r}] && indexof(${o}[${r}], datum.value) >= 0))`).join(" || ");
 }
 const F3 = {
   direction: ({ direction: e }) => e,
@@ -33796,7 +33796,7 @@ class Qi extends Ze {
         if (l === "count")
           r["*"] ??= {}, r["*"].count = /* @__PURE__ */ new Set([K(s, { forAs: !0 })]);
         else {
-          if (No(l) || qs(l)) {
+          if (No(l) || js(l)) {
             const c = No(l) ? "argmin" : "argmax", f = l[c];
             r[f] ??= {}, r[f][c] = /* @__PURE__ */ new Set([K({ op: c, field: f }, { forAs: !0 })]);
           } else
@@ -33915,7 +33915,7 @@ class ic extends Ze {
       if (i && !i.merged) {
         const r = i.get("type"), o = i.get("range");
         if (yt(r) && fl(o)) {
-          const s = Ka(this.childModel, n), a = _k(s);
+          const s = Xa(this.childModel, n), a = _k(s);
           a ? t[n] = a : W(yE(n));
         }
       }
@@ -34054,7 +34054,7 @@ function Xhe(e) {
     }
   }), st(e)) {
     const { mark: i, markDef: r, encoding: o } = e;
-    if (Ws(i) && // No need to sort by dimension if we have a connected scatterplot (order channel is present)
+    if (qs(i) && // No need to sort by dimension if we have a connected scatterplot (order channel is present)
     !e.encoding.order) {
       const s = r.orient === "horizontal" ? "y" : "x", a = o[s];
       H(a) && a.type === "quantitative" && !(a.field in t) && (t[a.field] = "number");
@@ -34215,7 +34215,7 @@ class Ud extends Ze {
     };
   }
 }
-class Xa extends Ze {
+class Ya extends Ze {
   _data;
   _name;
   _generator;
@@ -34270,7 +34270,7 @@ class Xa extends Ze {
   }
 }
 function mk(e) {
-  return e instanceof Xa || e instanceof Bd || e instanceof Ud;
+  return e instanceof Ya || e instanceof Bd || e instanceof Ud;
 }
 class yk {
   #e;
@@ -34400,7 +34400,7 @@ class npe extends gl {
 }
 class ipe extends gl {
   run(t) {
-    t instanceof jn || t.numChildren() > 0 || t instanceof ic || t instanceof Xa || (this.setModified(), t.remove());
+    t instanceof jn || t.numChildren() > 0 || t instanceof ic || t instanceof Ya || (this.setModified(), t.remove());
   }
 }
 class rpe extends gl {
@@ -34895,7 +34895,7 @@ function yy(e, t, n) {
 function Vo(e, t, n, i) {
   const { encoding: r, markDef: o, mark: s, config: a, stack: l } = n, u = Ft(r[i]), { type: c } = u, f = u.timeUnit, d = bde({
     invalid: Ur("invalid", o, a),
-    isPath: Ws(s)
+    isPath: qs(s)
   });
   if (Uue(t)) {
     const g = Vo(e, void 0, n, i), m = yy(t.unionWith, c, f);
@@ -35034,7 +35034,7 @@ function bpe(e, t, n) {
     return by(r, a);
   } else if (bce(r)) {
     const { encoding: a, order: l } = r, u = e.fieldDef(a), { aggregate: c, field: f } = u, d = o && !s.has(f);
-    if (No(c) || qs(c))
+    if (No(c) || js(c))
       return by({
         field: K(u),
         order: l
@@ -35140,7 +35140,7 @@ function _k(e) {
     return J(t) ? t : void 0;
   }
 }
-function Ka(e, t) {
+function Xa(e, t) {
   const i = e.component.scales[t].get("domains").map((r) => (_o(r) && (r.data = e.lookupDataSource(r.data)), r));
   return _pe(i);
 }
@@ -35185,7 +35185,7 @@ function Epe(e) {
 }
 function ev(e, t) {
   try {
-    const n = Ka(e, t);
+    const n = Xa(e, t);
     return Epe(n);
   } catch {
     return null;
@@ -35205,7 +35205,7 @@ function Cpe(e, t, n) {
   const o = i.getWithExplicit("domains"), s = r.getWithExplicit("domains");
   if (!(o?.explicit && s?.explicit))
     return !1;
-  const a = Ka(e, t), l = Ka(e, n);
+  const a = Xa(e, t), l = Xa(e, n);
   return Ee(a) === Ee(l);
 }
 function B7(e) {
@@ -35246,7 +35246,7 @@ function Spe(e, t) {
     }
     if (o.title || delete o.title, i !== void 0) {
       let s = i;
-      o.encode?.labels?.update && re(o.encode.labels.update.text) && (s = Ba(i, "datum.label", o.encode.labels.update.text.signal)), vpe(o, "labels", "text", { signal: s });
+      o.encode?.labels?.update && re(o.encode.labels.update.text) && (s = za(i, "datum.label", o.encode.labels.update.text.signal)), vpe(o, "labels", "text", { signal: s });
     }
     return o;
   }
@@ -35401,7 +35401,7 @@ function z3(e) {
     const i = e.component.scales[n];
     if (i.merged)
       return t;
-    const r = i.combine(), { name: o, type: s, selectionExtent: a, domains: l, range: u, reverse: c, ...f } = r, d = Dpe(r.range, o, n, e), h = Ka(e, n), p = a ? Mde(e, a, i, h) : null;
+    const r = i.combine(), { name: o, type: s, selectionExtent: a, domains: l, range: u, reverse: c, ...f } = r, d = Dpe(r.range, o, n, e), h = Xa(e, n), p = a ? Mde(e, a, i, h) : null;
     return t.push({
       name: o,
       type: s,
@@ -35544,7 +35544,7 @@ function Ipe(e, t) {
       } else
         W(pO(s));
     else if (Td(e)) {
-      const f = e === Is ? "x" : "y";
+      const f = e === Ls ? "x" : "y";
       if (t.getScaleComponent(f).get("type") === "band") {
         const p = Y7(a, o);
         if (p)
@@ -35584,7 +35584,7 @@ function zpe(e, t) {
       }
       return G7(e, t, l);
     }
-    case Is:
+    case Ls:
     case Qu:
       return Bpe(e, t, l);
     case Po: {
@@ -35603,11 +35603,11 @@ function zpe(e, t) {
           return `min(${f},${d})/2`;
         })
       ];
-    case Ps:
+    case Is:
       return { step: 1e3 / i.scale.framesPerSecond };
-    case Us:
+    case Bs:
       return [i.scale.minStrokeWidth, i.scale.maxStrokeWidth];
-    case js:
+    case Us:
       return [
         // TODO: add this to Vega's config.range?
         [1, 0],
@@ -35623,8 +35623,8 @@ function zpe(e, t) {
     case Qr:
       return l === "ordinal" ? s === "nominal" ? "category" : "ordinal" : c !== void 0 ? "diverging" : r === "rect" || r === "geoshape" ? "heatmap" : "ramp";
     case zo:
+    case Ps:
     case zs:
-    case Bs:
       return [i.scale.minOpacity, i.scale.maxOpacity];
   }
 }
@@ -35649,7 +35649,7 @@ function Y7(e, t) {
     return { step: e.step };
 }
 function Bpe(e, t, n) {
-  const i = e === Is ? "x" : "y", r = t.getScaleComponent(i);
+  const i = e === Ls ? "x" : "y", r = t.getScaleComponent(i);
   if (!r)
     return G7(i, t, n, { center: !0 });
   const o = r.get("type"), s = t.scaleName(i), { markDef: a, config: l } = t;
@@ -35930,7 +35930,7 @@ function tge(e, t, n, i) {
       } else if (n.type === "arc" && e in hE)
         return "band";
       const r = n[Yn(e)];
-      return Ha(r) || Cu(t) && t.axis?.tickBand ? "band" : "point";
+      return Wa(r) || Cu(t) && t.axis?.tickBand ? "band" : "point";
     }
     case "temporal":
       return Vl(e) ? "time" : sy(e) === "discrete" ? (W(ay(e, "temporal")), "ordinal") : H(t) && t.timeUnit && Wt(t.timeUnit).utc ? "utc" : oy(e) ? "band" : "time";
@@ -36181,7 +36181,7 @@ class xk {
       if (r && !r.merged) {
         const o = r.get("type"), s = r.get("range");
         if (yt(o) && fl(s)) {
-          const a = r.get("name"), l = Ka(this, i), u = _k(l);
+          const a = r.get("name"), l = Xa(this, i), u = _k(l);
           if (u) {
             const c = K({ aggregate: "distinct", field: u }, { expr: "datum" });
             return {
@@ -36501,10 +36501,10 @@ class Hf extends Ze {
     };
   }
 }
-class Sa extends Ze {
+class Ca extends Ze {
   transform;
   clone() {
-    return new Sa(null, he(this.transform));
+    return new Ca(null, he(this.transform));
   }
   constructor(t, n) {
     super(t), this.transform = n;
@@ -36520,7 +36520,7 @@ class Sa extends Ze {
     return { signal: `sequence(${[n, i, ...r ? [r] : []].join(",")})` };
   }
   static makeFromTransform(t, n) {
-    return new Sa(t, n);
+    return new Ca(t, n);
   }
   static makeFromEncoding(t, n) {
     const i = n.encoding, r = i.x, o = i.y;
@@ -36529,7 +36529,7 @@ class Sa extends Ze {
       if (s === void 0)
         return;
       const a = r.impute ? o : o.impute ? r : void 0, { method: l, value: u, frame: c, keyvals: f } = s.impute, d = c9(n.mark, i);
-      return new Sa(t, {
+      return new Ca(t, {
         impute: s.field,
         key: a.field,
         ...l ? { method: l } : {},
@@ -36616,7 +36616,7 @@ class Gf extends Ze {
     let a = null;
     if (jfe(s)) {
       let l = iL(s.data, o);
-      l || (l = new Xa(s.data), o.push(l));
+      l || (l = new Ya(s.data), o.push(l));
       const u = n.getName(`lookup_${r}`);
       a = new jn(l, u, ft.Lookup, n.component.data.outputNodeRefCounts), n.component.data.outputNodes[u] = a;
     } else if (qfe(s)) {
@@ -36780,18 +36780,18 @@ class H0 extends Ze {
 function tL(e) {
   let t = 0;
   function n(i, r) {
-    if (i instanceof Xa && !i.isGenerator && !Au(i.data) && (e.push(r), r = {
+    if (i instanceof Ya && !i.isGenerator && !Au(i.data) && (e.push(r), r = {
       name: null,
       source: r.name,
       transform: []
-    }), i instanceof fn && (i.parent instanceof Xa && !r.source ? (r.format = {
+    }), i instanceof fn && (i.parent instanceof Ya && !r.source ? (r.format = {
       ...r.format,
       parse: i.assembleFormatParse()
     }, r.transform.push(...i.assembleTransforms(!0))) : r.transform.push(...i.assembleTransforms())), i instanceof ic) {
       r.name || (r.name = `data_${t++}`), !r.source || r.transform.length > 0 ? (e.push(r), i.data = r.name) : i.data = r.source, e.push(...i.assemble());
       return;
     }
-    switch ((i instanceof Bd || i instanceof Ud || i instanceof Ru || i instanceof nc || i instanceof Tu || i instanceof Hf || i instanceof Qi || i instanceof Gf || i instanceof rc || i instanceof ml || i instanceof B0 || i instanceof z0 || i instanceof I0 || i instanceof U0 || i instanceof j0 || i instanceof q0 || i instanceof Ms || i instanceof H0 || i instanceof W0 || i instanceof P0) && r.transform.push(i.assemble()), (i instanceof Dr || i instanceof Fr || i instanceof Sa || i instanceof $o || i instanceof Kl) && r.transform.push(...i.assemble()), i instanceof jn && (r.source && r.transform.length === 0 ? i.setSource(r.source) : i.parent instanceof jn ? i.setSource(r.name) : (r.name || (r.name = `data_${t++}`), i.setSource(r.name), i.numChildren() === 1 && (e.push(r), r = {
+    switch ((i instanceof Bd || i instanceof Ud || i instanceof Ru || i instanceof nc || i instanceof Tu || i instanceof Hf || i instanceof Qi || i instanceof Gf || i instanceof rc || i instanceof ml || i instanceof B0 || i instanceof z0 || i instanceof I0 || i instanceof U0 || i instanceof j0 || i instanceof q0 || i instanceof Ms || i instanceof H0 || i instanceof W0 || i instanceof P0) && r.transform.push(i.assemble()), (i instanceof Dr || i instanceof Fr || i instanceof Ca || i instanceof $o || i instanceof Kl) && r.transform.push(...i.assemble()), i instanceof jn && (r.source && r.transform.length === 0 ? i.setSource(r.source) : i.parent instanceof jn ? i.setSource(r.name) : (r.name || (r.name = `data_${t++}`), i.setSource(r.name), i.numChildren() === 1 && (e.push(r), r = {
       name: null,
       source: r.name,
       transform: []
@@ -37097,7 +37097,7 @@ class bf extends eL {
         if (o && !o.merged) {
           const s = o.get("type"), a = o.get("range");
           if (yt(s) && fl(a)) {
-            const l = Ka(this.child, r), u = _k(l);
+            const l = Xa(this.child, r), u = _k(l);
             u ? (t.push(u), n.push("distinct"), i.push(`distinct_${u}`)) : W(yE(r));
           }
         }
@@ -37234,14 +37234,14 @@ function iL(e, t) {
 function mge(e, t) {
   if (e.data || !e.parent) {
     if (e.data === null) {
-      const i = new Xa({ values: [] });
+      const i = new Ya({ values: [] });
       return t.push(i), i;
     }
     const n = iL(e.data, t);
     if (n)
       return ps(e.data) || (n.data.format = D8({}, e.data.format, n.data.format)), !n.hasName() && e.data.name && (n.dataName = e.data.name), n;
     {
-      const i = new Xa(e.data);
+      const i = new Ya(e.data);
       return t.push(i), i;
     }
   } else
@@ -37281,7 +37281,7 @@ function yge(e, t, n) {
     else if (Xfe(r))
       e = new H0(e, r);
     else if (ede(r))
-      s = e = Sa.makeFromTransform(e, r), o = "derived";
+      s = e = Ca.makeFromTransform(e, r), o = "derived";
     else if (Hfe(r))
       s = e = new I0(e, r), o = "derived";
     else if (Gfe(r))
@@ -37311,13 +37311,13 @@ function G0(e) {
   const c = t = Ch(ft.Raw, e, t);
   if (st(e)) {
     const m = Qi.makeFromEncoding(t, e);
-    m && (t = m, ck(e) && (t = new Ms(t))), t = Sa.makeFromEncoding(t, e) ?? t, t = $o.makeFromEncoding(t, e) ?? t;
+    m && (t = m, ck(e) && (t = new Ms(t))), t = Ca.makeFromEncoding(t, e) ?? t, t = $o.makeFromEncoding(t, e) ?? t;
   }
   let f, d;
   if (st(e)) {
     const { markDef: m, mark: y, config: b } = e, _ = He("invalid", m, b), { marks: v, scales: w } = d = W9({
       invalid: _,
-      isPath: Ws(y)
+      isPath: qs(y)
     });
     v !== w && w === "include-invalid-values" && (f = t = Ch(ft.PreFilterInvalid, e, t)), v === "exclude-invalid-values" && (t = Ru.make(t, e, d) ?? t);
   }
@@ -37455,7 +37455,7 @@ class Ek extends jo {
 }
 function xge(e, t, n) {
   const { encoding: i, config: r } = e, o = Ft(i[t]) ?? Ft(i[eo(t)]), s = e.axis(t) || {}, { format: a, formatType: l } = s;
-  if (Ga(l))
+  if (Ha(l))
     return {
       text: Zi({
         fieldOrDatumDef: o,
@@ -38079,7 +38079,7 @@ function Zge(e) {
   if (!(!z(s) && rr(s) && $_(s.value) || !s && $_(He("order", r, o)))) {
     if ((z(s) || H(s)) && !n)
       return sO(s, { expr: "datum" });
-    if (Ws(i)) {
+    if (qs(i)) {
       const a = r.orient === "horizontal" ? "y" : "x", l = t[a];
       if (H(l))
         return { field: a };
@@ -38277,7 +38277,7 @@ class oL extends eL {
     return this.markDef.type;
   }
   channelHasField(t) {
-    return ka(this.encoding, t);
+    return Ea(this.encoding, t);
   }
   fieldDef(t) {
     const n = this.encoding[t];
@@ -38470,7 +38470,7 @@ const rme = Eae.version, ome = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Obj
   pick: yu,
   prefixGenerator: A_,
   removePathFromField: Ju,
-  replaceAll: Ba,
+  replaceAll: za,
   replacePathInField: Ni,
   resetIdCounter: $ae,
   setEqual: O8,
@@ -38513,15 +38513,15 @@ const Ml = "#fff", V3 = "#888", lme = {
     gridColor: V3,
     tickColor: Ml
   }
-}, Zs = "#4572a7", ume = {
+}, Ks = "#4572a7", ume = {
   background: "#fff",
-  arc: { fill: Zs },
-  area: { fill: Zs },
-  line: { stroke: Zs, strokeWidth: 2 },
-  path: { stroke: Zs },
-  rect: { fill: Zs },
-  shape: { stroke: Zs },
-  symbol: { fill: Zs, strokeWidth: 1.5, size: 50 },
+  arc: { fill: Ks },
+  area: { fill: Ks },
+  line: { stroke: Ks, strokeWidth: 2 },
+  path: { stroke: Ks },
+  rect: { fill: Ks },
+  shape: { stroke: Ks },
+  symbol: { fill: Ks, strokeWidth: 1.5, size: 50 },
   axis: {
     bandPosition: 0.5,
     grid: !0,
@@ -38556,9 +38556,9 @@ const Ml = "#fff", V3 = "#888", lme = {
       "#a99cbc"
     ]
   }
-}, Js = "#30a2da", vy = "#cbcbcb", cme = "#999", fme = "#333", Y3 = "#f0f0f0", X3 = "#333", dme = {
-  arc: { fill: Js },
-  area: { fill: Js },
+}, Zs = "#30a2da", vy = "#cbcbcb", cme = "#999", fme = "#333", Y3 = "#f0f0f0", X3 = "#333", dme = {
+  arc: { fill: Zs },
+  area: { fill: Zs },
   axis: {
     domainColor: vy,
     grid: !0,
@@ -38591,11 +38591,11 @@ const Ml = "#fff", V3 = "#888", lme = {
     titlePadding: 10
   },
   line: {
-    stroke: Js,
+    stroke: Zs,
     strokeWidth: 2
   },
-  path: { stroke: Js, strokeWidth: 0.5 },
-  rect: { fill: Js },
+  path: { stroke: Zs, strokeWidth: 0.5 },
+  rect: { fill: Zs },
   range: {
     category: [
       "#30a2da",
@@ -38618,10 +38618,10 @@ const Ml = "#fff", V3 = "#888", lme = {
     filled: !0,
     shape: "circle"
   },
-  shape: { stroke: Js },
+  shape: { stroke: Zs },
   bar: {
     binSpacing: 2,
-    fill: Js,
+    fill: Zs,
     stroke: null
   },
   title: {
@@ -38630,17 +38630,17 @@ const Ml = "#fff", V3 = "#888", lme = {
     fontWeight: 600,
     offset: 20
   }
-}, Qs = "#000", hme = {
+}, Js = "#000", hme = {
   group: {
     fill: "#e5e5e5"
   },
-  arc: { fill: Qs },
-  area: { fill: Qs },
-  line: { stroke: Qs },
-  path: { stroke: Qs },
-  rect: { fill: Qs },
-  shape: { stroke: Qs },
-  symbol: { fill: Qs, size: 40 },
+  arc: { fill: Js },
+  area: { fill: Js },
+  line: { stroke: Js },
+  path: { stroke: Js },
+  rect: { fill: Js },
+  shape: { stroke: Js },
+  symbol: { fill: Js, size: 40 },
   axis: {
     domain: !1,
     grid: !0,
@@ -38672,7 +38672,7 @@ const Ml = "#fff", V3 = "#888", lme = {
       "#DCDCDC"
     ]
   }
-}, pme = 22, gme = "normal", K3 = "Benton Gothic, sans-serif", Z3 = 11.5, mme = "normal", ea = "#82c6df", xy = "Benton Gothic Bold, sans-serif", J3 = "normal", Q3 = 13, Tc = {
+}, pme = 22, gme = "normal", K3 = "Benton Gothic, sans-serif", Z3 = 11.5, mme = "normal", Qs = "#82c6df", xy = "Benton Gothic Bold, sans-serif", J3 = "normal", Q3 = 13, Tc = {
   "category-6": ["#ec8431", "#829eb1", "#c89d29", "#3580b1", "#adc839", "#ab7fb4"],
   "fire-7": ["#fbf2c7", "#f9e39c", "#f8d36e", "#f4bb6a", "#e68a4f", "#d15a40", "#ab4232"],
   "fireandice-6": ["#e68a4f", "#f4bb6a", "#f9e39c", "#dadfe2", "#a6b7c6", "#849eae"]
@@ -38685,13 +38685,13 @@ const Ml = "#fff", V3 = "#888", lme = {
     fontSize: pme,
     fontWeight: gme
   },
-  arc: { fill: ea },
-  area: { fill: ea },
-  line: { stroke: ea, strokeWidth: 2 },
-  path: { stroke: ea },
-  rect: { fill: ea },
-  shape: { stroke: ea },
-  symbol: { fill: ea, size: 30 },
+  arc: { fill: Qs },
+  area: { fill: Qs },
+  line: { stroke: Qs, strokeWidth: 2 },
+  path: { stroke: Qs },
+  rect: { fill: Qs },
+  shape: { stroke: Qs },
+  symbol: { fill: Qs, size: 30 },
   axis: {
     labelFont: K3,
     labelFontSize: Z3,
@@ -38730,15 +38730,15 @@ const Ml = "#fff", V3 = "#888", lme = {
     ordinal: Tc["fire-7"],
     ramp: Tc["fire-7"]
   }
-}, ta = "#ab5787", $h = "#979797", bme = {
+}, ea = "#ab5787", $h = "#979797", bme = {
   background: "#f9f9f9",
-  arc: { fill: ta },
-  area: { fill: ta },
-  line: { stroke: ta },
-  path: { stroke: ta },
-  rect: { fill: ta },
-  shape: { stroke: ta },
-  symbol: { fill: ta, size: 30 },
+  arc: { fill: ea },
+  area: { fill: ea },
+  line: { stroke: ea },
+  path: { stroke: ea },
+  rect: { fill: ea },
+  shape: { stroke: ea },
+  symbol: { fill: ea, size: 30 },
   axis: {
     domainColor: $h,
     domainWidth: 0.5,
@@ -38780,15 +38780,15 @@ const Ml = "#fff", V3 = "#888", lme = {
       "#c4c4c4"
     ]
   }
-}, na = "#3e5c69", _me = {
+}, ta = "#3e5c69", _me = {
   background: "#fff",
-  arc: { fill: na },
-  area: { fill: na },
-  line: { stroke: na },
-  path: { stroke: na },
-  rect: { fill: na },
-  shape: { stroke: na },
-  symbol: { fill: na },
+  arc: { fill: ta },
+  area: { fill: ta },
+  line: { stroke: ta },
+  path: { stroke: ta },
+  rect: { fill: ta },
+  shape: { stroke: ta },
+  symbol: { fill: ta },
   axis: {
     domainWidth: 0.5,
     grid: !0,
@@ -38919,14 +38919,14 @@ const Ml = "#fff", V3 = "#888", lme = {
   arc: { fill: mi },
   shape: { stroke: mi },
   symbol: { fill: mi, size: 30 }
-}, ia = "#3366CC", tM = "#ccc", Mh = "Arial, sans-serif", Cme = {
-  arc: { fill: ia },
-  area: { fill: ia },
-  path: { stroke: ia },
-  rect: { fill: ia },
-  shape: { stroke: ia },
-  symbol: { stroke: ia },
-  circle: { fill: ia },
+}, na = "#3366CC", tM = "#ccc", Mh = "Arial, sans-serif", Cme = {
+  arc: { fill: na },
+  area: { fill: na },
+  path: { stroke: na },
+  rect: { fill: na },
+  shape: { stroke: na },
+  symbol: { stroke: na },
+  circle: { fill: na },
   background: "#fff",
   padding: {
     top: 10,
@@ -39484,7 +39484,7 @@ function rv(e) {
   }
   return !0;
 }
-function aa(e) {
+function sa(e) {
   return e.indexOf("/") === -1 && e.indexOf("~") === -1 ? e : e.replace(/~/g, "~0").replace(/\//g, "~1");
 }
 function hL(e) {
@@ -39540,12 +39540,12 @@ var pL = (
   move: function(e, t, n) {
     var i = zg(n, this.path);
     i && (i = ri(i));
-    var r = $a(n, { op: "remove", path: this.from }).removed;
-    return $a(n, { op: "add", path: this.path, value: r }), { newDocument: n, removed: i };
+    var r = Sa(n, { op: "remove", path: this.from }).removed;
+    return Sa(n, { op: "add", path: this.path, value: r }), { newDocument: n, removed: i };
   },
   copy: function(e, t, n) {
     var i = zg(n, this.from);
-    return $a(n, { op: "add", path: this.path, value: ri(i) }), { newDocument: n };
+    return Sa(n, { op: "add", path: this.path, value: ri(i) }), { newDocument: n };
   },
   test: function(e, t, n) {
     return { newDocument: n, test: Vf(e[t], this.value) };
@@ -39574,9 +39574,9 @@ function zg(e, t) {
   if (t == "")
     return e;
   var n = { op: "_get", path: t };
-  return $a(e, n), n.value;
+  return Sa(e, n), n.value;
 }
-function $a(e, t, n, i, r, o) {
+function Sa(e, t, n, i, r, o) {
   if (n === void 0 && (n = !1), i === void 0 && (i = !0), r === void 0 && (r = !0), o === void 0 && (o = 0), n && (typeof n == "function" ? n(t, 0, e, t.path) : Bg(t, 0)), t.path === "") {
     var s = { newDocument: e };
     if (t.op === "add")
@@ -39636,11 +39636,11 @@ function Y0(e, t, n, i, r) {
     throw new pt("Patch sequence must be an array", "SEQUENCE_NOT_AN_ARRAY");
   i || (e = ri(e));
   for (var o = new Array(t.length), s = 0, a = t.length; s < a; s++)
-    o[s] = $a(e, t[s], n, !0, r, s), e = o[s].newDocument;
+    o[s] = Sa(e, t[s], n, !0, r, s), e = o[s].newDocument;
   return o.newDocument = e, o;
 }
 function o0e(e, t, n) {
-  var i = $a(e, t);
+  var i = Sa(e, t);
   if (i.test === !1)
     throw new pt("Test operation failed", "TEST_OPERATION_FAILED", n, t, e);
   return i.newDocument;
@@ -39724,7 +39724,7 @@ var s0e = /* @__PURE__ */ Object.freeze({
   __proto__: null,
   JsonPatchError: pt,
   _areEquals: Vf,
-  applyOperation: $a,
+  applyOperation: Sa,
   applyPatch: Y0,
   applyReducer: o0e,
   deepClone: i0e,
@@ -39798,13 +39798,13 @@ function Tk(e, t, n, i, r) {
       var u = s[l], c = e[u];
       if (nv(t, u) && !(t[u] === void 0 && c !== void 0 && Array.isArray(t) === !1)) {
         var f = t[u];
-        typeof c == "object" && c != null && typeof f == "object" && f != null && Array.isArray(c) === Array.isArray(f) ? Tk(c, f, n, i + "/" + aa(u), r) : c !== f && (r && n.push({ op: "test", path: i + "/" + aa(u), value: ri(c) }), n.push({ op: "replace", path: i + "/" + aa(u), value: ri(f) }));
-      } else Array.isArray(e) === Array.isArray(t) ? (r && n.push({ op: "test", path: i + "/" + aa(u), value: ri(c) }), n.push({ op: "remove", path: i + "/" + aa(u) }), a = !0) : (r && n.push({ op: "test", path: i, value: e }), n.push({ op: "replace", path: i, value: t }));
+        typeof c == "object" && c != null && typeof f == "object" && f != null && Array.isArray(c) === Array.isArray(f) ? Tk(c, f, n, i + "/" + sa(u), r) : c !== f && (r && n.push({ op: "test", path: i + "/" + sa(u), value: ri(c) }), n.push({ op: "replace", path: i + "/" + sa(u), value: ri(f) }));
+      } else Array.isArray(e) === Array.isArray(t) ? (r && n.push({ op: "test", path: i + "/" + sa(u), value: ri(c) }), n.push({ op: "remove", path: i + "/" + sa(u) }), a = !0) : (r && n.push({ op: "test", path: i, value: e }), n.push({ op: "replace", path: i, value: t }));
     }
     if (!(!a && o.length == s.length))
       for (var l = 0; l < o.length; l++) {
         var u = o[l];
-        !nv(e, u) && t[u] !== void 0 && n.push({ op: "add", path: i + "/" + aa(u), value: ri(t[u]) });
+        !nv(e, u) && t[u] !== void 0 && n.push({ op: "add", path: i + "/" + sa(u), value: ri(t[u]) });
       }
   }
 }
@@ -39823,7 +39823,7 @@ var g0e = /* @__PURE__ */ Object.freeze({
 Object.assign({}, s0e, g0e, {
   JsonPatchError: pL,
   deepClone: ri,
-  escapePathComponent: aa,
+  escapePathComponent: sa,
   unescapePathComponent: hL
 });
 function m0e(e) {
@@ -40728,7 +40728,7 @@ function W0e() {
 var H0e = W0e();
 const G0e = /* @__PURE__ */ q0e(H0e);
 function V0e(e) {
-  const [t, n] = ya.useState(null), { ref: i, spec: r, onEmbed: o, onError: s, options: a = {} } = e;
+  const [t, n] = ma.useState(null), { ref: i, spec: r, onEmbed: o, onError: s, options: a = {} } = e;
   return Y0e(() => {
     let l = !1, u = null;
     return (async () => {
@@ -40748,13 +40748,13 @@ function V0e(e) {
   }, [r, a]), t;
 }
 function Y0e(e, t) {
-  const n = ya.useRef(null), i = ya.useRef(0);
-  (!n.current || !G0e(t, n.current)) && (i.current += 1), n.current = t, ya.useEffect(e, [i.current]);
+  const n = ma.useRef(null), i = ma.useRef(0);
+  (!n.current || !G0e(t, n.current)) && (i.current += 1), n.current = t, ma.useEffect(e, [i.current]);
 }
-const vL = ya.forwardRef(
+const vL = ma.forwardRef(
   (e, t) => {
-    const { spec: n, options: i, onEmbed: r, onError: o, ...s } = e, a = ya.useRef(null);
-    return ya.useImperativeHandle(t, () => {
+    const { spec: n, options: i, onEmbed: r, onError: o, ...s } = e, a = ma.useRef(null);
+    return ma.useImperativeHandle(t, () => {
       if (!a.current)
         throw new Error("VegaEmbed: ref is not attached to a div element");
       return a.current;
@@ -40842,7 +40842,7 @@ function r1e(e) {
     }
   );
 }
-const o1e = "_video_box_119ne_1", s1e = "_video_preview_119ne_12", a1e = "_play_button_119ne_25", l1e = "_duration_badge_119ne_39", u1e = "_video_player_wrapper_119ne_51", c1e = "_video_player_119ne_51", f1e = "_youtube_player_119ne_69", ra = {
+const o1e = "_video_box_119ne_1", s1e = "_video_preview_119ne_12", a1e = "_play_button_119ne_25", l1e = "_duration_badge_119ne_39", u1e = "_video_player_wrapper_119ne_51", c1e = "_video_player_119ne_51", f1e = "_youtube_player_119ne_69", ia = {
   video_box: o1e,
   video_preview: s1e,
   play_button: a1e,
@@ -40960,10 +40960,10 @@ function p1e(e) {
             references: n.references,
             time: t.time,
             message: t,
-            children: /* @__PURE__ */ k("div", { ref: d, className: ra.video_box, children: u ? /* @__PURE__ */ k("div", { className: ra.video_player_wrapper, style: A, children: v && E ? /* @__PURE__ */ k(
+            children: /* @__PURE__ */ k("div", { ref: d, className: ia.video_box, children: u ? /* @__PURE__ */ k("div", { className: ia.video_player_wrapper, style: A, children: v && E ? /* @__PURE__ */ k(
               "iframe",
               {
-                className: ra.youtube_player,
+                className: ia.youtube_player,
                 src: E,
                 title: "YouTube video player",
                 frameBorder: "0",
@@ -40974,20 +40974,20 @@ function p1e(e) {
               "video",
               {
                 ref: f,
-                className: ra.video_player,
+                className: ia.video_player,
                 src: r,
                 controls: !0,
                 autoPlay: !0,
                 onEnded: () => c(!1),
                 onLoadedMetadata: S
               }
-            ) }) : /* @__PURE__ */ Y("div", { className: ra.video_preview, onClick: x, children: [
+            ) }) : /* @__PURE__ */ Y("div", { className: ia.video_preview, onClick: x, children: [
               /* @__PURE__ */ k("img", { src: i, alt: "Video preview", onLoad: _ }),
-              /* @__PURE__ */ k("div", { className: ra.play_button, children: /* @__PURE__ */ Y("svg", { width: "48", height: "48", viewBox: "0 0 48 48", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [
+              /* @__PURE__ */ k("div", { className: ia.play_button, children: /* @__PURE__ */ Y("svg", { width: "48", height: "48", viewBox: "0 0 48 48", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [
                 /* @__PURE__ */ k("circle", { cx: "24", cy: "24", r: "24", fill: "rgba(0, 0, 0, 0.6)" }),
                 /* @__PURE__ */ k("path", { d: "M18 14L18 34L32 24L18 14Z", fill: "white" })
               ] }) }),
-              o && /* @__PURE__ */ k("div", { className: ra.duration_badge, children: C(o) })
+              o && /* @__PURE__ */ k("div", { className: ia.duration_badge, children: C(o) })
             ] }) })
           }
         )
@@ -41132,7 +41132,7 @@ function I1e({ message: e }) {
     }),
     [i]
   ), s = i?.template?.TextMessageTemplate?.style;
-  return /* @__PURE__ */ Y(Ts, { children: [
+  return /* @__PURE__ */ Y(Ka, { children: [
     /* @__PURE__ */ Y(
       dn,
       {
@@ -41337,7 +41337,7 @@ function LM({ title: e, data: t }) {
   }, []), a = pe(() => {
     i(!1);
   }, []);
-  return /* @__PURE__ */ Y(Ts, { children: [
+  return /* @__PURE__ */ Y(Ka, { children: [
     /* @__PURE__ */ Y("div", { className: Ce.json_viewer, children: [
       /* @__PURE__ */ Y("div", { className: Ce.json_viewer__header, children: [
         /* @__PURE__ */ k("span", { className: Ce.json_viewer__title, children: e }),
@@ -41534,7 +41534,7 @@ function Wye(e) {
               }
             )
           ] }),
-          s.length === 0 ? /* @__PURE__ */ k("div", { className: kt.empty_state, children: "No data available" }) : /* @__PURE__ */ Y(Ts, { children: [
+          s.length === 0 ? /* @__PURE__ */ k("div", { className: kt.empty_state, children: "No data available" }) : /* @__PURE__ */ Y(Ka, { children: [
             /* @__PURE__ */ k("div", { className: kt.table_wrapper, children: /* @__PURE__ */ Y("table", { className: kt.table, children: [
               /* @__PURE__ */ k("thead", { className: kt.table_header, children: /* @__PURE__ */ k("tr", { children: o.map((S, A) => /* @__PURE__ */ k("th", { className: kt.table_header_cell, children: S.header }, A)) }) }),
               /* @__PURE__ */ k("tbody", { children: b.map((S, A) => /* @__PURE__ */ k("tr", { className: kt.table_row, children: o.map((M, F) => {
@@ -41586,7 +41586,7 @@ function Hye(e) {
     return t.type === "bot" ? /* @__PURE__ */ Y(dn, { type: "bot", direction: "horizontal", children: [
       /* @__PURE__ */ k(ci, { avatar: i }),
       /* @__PURE__ */ k(ui, { message: t, time: t.time, children: a })
-    ] }) : t.type === "user" ? /* @__PURE__ */ k(dn, { type: "user", direction: "horizontal", children: a }) : /* @__PURE__ */ k(Ts, { children: a });
+    ] }) : t.type === "user" ? /* @__PURE__ */ k(dn, { type: "user", direction: "horizontal", children: a }) : a;
   }, [t, i]), o = pe(() => {
     if (t.type === "user")
       return t.blobIds && t.blobIds.length > 0 ? /* @__PURE__ */ k(I1e, { message: { type: "user", message: t } }) : /* @__PURE__ */ k(Yk, { message: t });
@@ -41926,7 +41926,7 @@ function Lbe(e) {
     },
     [t, n]
   );
-  return /* @__PURE__ */ Y(Ts, { children: [
+  return /* @__PURE__ */ Y(Ka, { children: [
     /* @__PURE__ */ k(
       "input",
       {
@@ -42371,7 +42371,7 @@ function Ibe() {
             ]
           }
         )
-      ] }) : /* @__PURE__ */ Y(Ts, { children: [
+      ] }) : /* @__PURE__ */ Y(Ka, { children: [
         g && /* @__PURE__ */ k(
           "button",
           {
@@ -42630,7 +42630,7 @@ const Hbe = "_chatbot__auth_state_container_1hs4h_1", Gbe = "_chatbot__error_sta
           }
         ) });
       default:
-        return /* @__PURE__ */ Y(Ts, { children: [
+        return /* @__PURE__ */ Y(Ka, { children: [
           /* @__PURE__ */ k(
             YL,
             {