@malloydata/render 0.0.282 → 0.0.284

package/dist/module/index.mjs

@@ -470,19 +470,19 @@ class t0 extends Dx {
     super("Zone is an abstract class");
   }
 }
-const Ue = "numeric", Go = "short", As = "long", L7 = {
+const Ue = "numeric", Wo = "short", As = "long", L7 = {
   year: Ue,
   month: Ue,
   day: Ue
 }, CK = {
   year: Ue,
-  month: Go,
+  month: Wo,
   day: Ue
 }, J2e = {
   year: Ue,
-  month: Go,
+  month: Wo,
   day: Ue,
-  weekday: Go
+  weekday: Wo
 }, SK = {
   year: Ue,
   month: As,
@@ -503,7 +503,7 @@ const Ue = "numeric", Go = "short", As = "long", L7 = {
   hour: Ue,
   minute: Ue,
   second: Ue,
-  timeZoneName: Go
+  timeZoneName: Wo
 }, OK = {
   hour: Ue,
   minute: Ue,
@@ -523,7 +523,7 @@ const Ue = "numeric", Go = "short", As = "long", L7 = {
   minute: Ue,
   second: Ue,
   hourCycle: "h23",
-  timeZoneName: Go
+  timeZoneName: Wo
 }, LK = {
   hour: Ue,
   minute: Ue,
@@ -545,22 +545,22 @@ const Ue = "numeric", Go = "short", As = "long", L7 = {
   second: Ue
 }, BK = {
   year: Ue,
-  month: Go,
+  month: Wo,
   day: Ue,
   hour: Ue,
   minute: Ue
 }, kK = {
   year: Ue,
-  month: Go,
+  month: Wo,
   day: Ue,
   hour: Ue,
   minute: Ue,
   second: Ue
 }, X2e = {
   year: Ue,
-  month: Go,
+  month: Wo,
   day: Ue,
-  weekday: Go,
+  weekday: Wo,
   hour: Ue,
   minute: Ue
 }, PK = {
@@ -569,7 +569,7 @@ const Ue = "numeric", Go = "short", As = "long", L7 = {
   day: Ue,
   hour: Ue,
   minute: Ue,
-  timeZoneName: Go
+  timeZoneName: Wo
 }, MK = {
   year: Ue,
   month: As,
@@ -577,7 +577,7 @@ const Ue = "numeric", Go = "short", As = "long", L7 = {
   hour: Ue,
   minute: Ue,
   second: Ue,
-  timeZoneName: Go
+  timeZoneName: Wo
 }, jK = {
   year: Ue,
   month: As,
@@ -1084,7 +1084,7 @@ class Vi {
     return oj(o, s(a));
   }
 }
-class $o {
+class Bo {
   constructor(e, r) {
     this.reason = e, this.explanation = r;
   }
@@ -2201,7 +2201,7 @@ class Rt {
   static invalid(e, r = null) {
     if (!e)
       throw new qs("need to specify a reason the Duration is invalid");
-    const i = e instanceof $o ? e : new $o(e, r);
+    const i = e instanceof Bo ? e : new Bo(e, r);
     if (jn.throwOnInvalid)
       throw new K2e(i);
     return new Rt({ invalid: i });
@@ -2645,7 +2645,7 @@ let eg = class tr {
   static invalid(e, r = null) {
     if (!e)
       throw new qs("need to specify a reason the Interval is invalid");
-    const i = e instanceof $o ? e : new $o(e, r);
+    const i = e instanceof Bo ? e : new Bo(e, r);
     if (jn.throwOnInvalid)
       throw new Y2e(i);
     return new tr({ invalid: i });
@@ -3557,7 +3557,7 @@ function Mme(t, e, r) {
 }
 const cJ = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334], fJ = [0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335];
 function Ws(t, e) {
-  return new $o(
+  return new Bo(
     "unit out of range",
     `you specified ${e} (of type ${typeof e}) as a ${t}, which is invalid`
   );
@@ -3613,7 +3613,7 @@ function mJ(t) {
 }
 const BD = "Invalid DateTime", _j = 864e13;
 function sA(t) {
-  return new $o("unsupported zone", `the zone "${t.name}" is not supported`);
+  return new Bo("unsupported zone", `the zone "${t.name}" is not supported`);
 }
 function kD(t) {
   return t.weekData === null && (t.weekData = M7(t.c)), t.weekData;
@@ -3685,7 +3685,7 @@ function Q2(t, e, r, i, s, o) {
     return u ? c : c.setZone(a);
   } else
     return xt.invalid(
-      new $o("unparsable", `the input "${s}" can't be parsed as ${i}`)
+      new Bo("unparsable", `the input "${s}" can't be parsed as ${i}`)
     );
 }
 function oA(t, e, r = !0) {
@@ -3799,7 +3799,7 @@ class xt {
    */
   constructor(e) {
     const r = e.zone || jn.defaultZone;
-    let i = e.invalid || (Number.isNaN(e.ts) ? new $o("invalid input") : null) || (r.isValid ? null : sA(r));
+    let i = e.invalid || (Number.isNaN(e.ts) ? new Bo("invalid input") : null) || (r.isValid ? null : sA(r));
     this.ts = Tt(e.ts) ? jn.now() : e.ts;
     let s = null, o = null;
     if (!i)
@@ -3807,7 +3807,7 @@ class xt {
         [s, o] = [e.old.c, e.old.o];
       else {
         const a = r.offset(this.ts);
-        s = vj(this.ts, a), i = Number.isNaN(s.year) ? new $o("invalid input") : null, s = i ? null : s, o = i ? null : a;
+        s = vj(this.ts, a), i = Number.isNaN(s.year) ? new Bo("invalid input") : null, s = i ? null : s, o = i ? null : a;
       }
     this._zone = r, this.loc = e.loc || _n.create(), this.invalid = i, this.weekData = null, this.c = s, this.o = o, this.isLuxonDateTime = !0;
   }
@@ -4114,7 +4114,7 @@ class xt {
   static invalid(e, r = null) {
     if (!e)
       throw new qs("need to specify a reason the DateTime is invalid");
-    const i = e instanceof $o ? e : new $o(e, r);
+    const i = e instanceof Bo ? e : new Bo(e, r);
     if (jn.throwOnInvalid)
       throw new V2e(i);
     return new xt({ invalid: i });
@@ -58263,11 +58263,11 @@ function Fl(t) {
     }
   return s && Se("Access path missing closing bracket: " + t), i && Se("Access path missing closing quote: " + t), a > u && (a++, c()), e;
 }
-function Wo(t, e, r) {
+function Vo(t, e, r) {
   const i = Fl(t);
   return t = i.length === 1 ? i[0] : t, Fs((r && r.get || CJ)(i), [t], e || t);
 }
-const y5 = Wo("id"), bi = Fs((t) => t, [], "identity"), cf = Fs(() => 0, [], "zero"), F3 = Fs(() => 1, [], "one"), Vo = Fs(() => !0, [], "true"), Yc = Fs(() => !1, [], "false");
+const y5 = Vo("id"), bi = Fs((t) => t, [], "identity"), cf = Fs(() => 0, [], "zero"), F3 = Fs(() => 1, [], "one"), Yo = Fs(() => !0, [], "true"), Yc = Fs(() => !1, [], "false");
 function rge(t, e, r) {
   const i = [e].concat([].slice.call(r));
   console[t].apply(console, i);
@@ -58394,7 +58394,7 @@ function IJ(t, e, r) {
   r = r || {}, e = je(e) || [];
   const i = [], s = [], o = {}, u = r.comparator || mge;
   return je(t).forEach((a, l) => {
-    a != null && (i.push(e[l] === pge ? -1 : 1), s.push(a = Et(a) ? a : Wo(a, null, r)), (yi(a) || []).forEach((c) => o[c] = 1));
+    a != null && (i.push(e[l] === pge ? -1 : 1), s.push(a = Et(a) ? a : Vo(a, null, r)), (yi(a) || []).forEach((c) => o[c] = 1));
   }), s.length === 0 ? null : Fs(u(s, i), Object.keys(o));
 }
 const v5 = (t, e) => (t < e || t == null) && e != null ? -1 : (t > e || e == null) && t != null ? 1 : (e = e instanceof Date ? +e : e, (t = t instanceof Date ? +t : t) !== t && e === e ? -1 : e !== e && t === t ? 1 : 0), mge = (t, e) => t.length === 1 ? gge(t[0], e[0]) : yge(t, e, t.length), gge = (t, e) => function(r, i) {
@@ -59001,7 +59001,7 @@ function Pge(t, e = "datum") {
 function Mge(t) {
   return t.replace(/(\[|\]|\.|'|")/g, "\\$1");
 }
-function Yo(t) {
+function Ko(t) {
   return `${Fl(t).map(Mge).join("\\.")}`;
 }
 function Ah(t, e, r) {
@@ -59044,7 +59044,7 @@ var L3 = function(t, e) {
       e.indexOf(i[s]) < 0 && Object.prototype.propertyIsEnumerable.call(t, i[s]) && (r[i[s]] = t[i[s]]);
   return r;
 };
-const sl = "row", ol = "column", b5 = "facet", Sn = "x", hr = "y", ru = "x2", ia = "y2", ac = "xOffset", Op = "yOffset", sa = "radius", Nl = "radius2", iu = "theta", Ll = "theta2", oa = "latitude", ua = "longitude", su = "latitude2", oo = "longitude2", es = "color", aa = "fill", la = "stroke", ts = "shape", Il = "size", Ox = "angle", $l = "opacity", lc = "fillOpacity", cc = "strokeOpacity", fc = "strokeWidth", xc = "strokeDash", I3 = "text", $3 = "order", B3 = "detail", T5 = "key", Uf = "tooltip", R5 = "href", D5 = "url", O5 = "description", Qge = {
+const sl = "row", ol = "column", b5 = "facet", Sn = "x", hr = "y", iu = "x2", ia = "y2", ac = "xOffset", Op = "yOffset", sa = "radius", Nl = "radius2", su = "theta", Ll = "theta2", oa = "latitude", ua = "longitude", ou = "latitude2", oo = "longitude2", es = "color", aa = "fill", la = "stroke", ts = "shape", Il = "size", Ox = "angle", $l = "opacity", lc = "fillOpacity", cc = "strokeOpacity", fc = "strokeWidth", xc = "strokeDash", I3 = "text", $3 = "order", B3 = "detail", T5 = "key", Uf = "tooltip", R5 = "href", D5 = "url", O5 = "description", Qge = {
   x: 1,
   y: 1,
   x2: 1,
@@ -59068,7 +59068,7 @@ function zge(t) {
   switch (t) {
     case oa:
       return "y";
-    case su:
+    case ou:
       return "y2";
     case ua:
       return "x";
@@ -59119,22 +59119,22 @@ function Jge(t) {
 function KJ(t) {
   return !!YN[t];
 }
-const Xge = [ru, ia, su, oo, Ll, Nl];
+const Xge = [iu, ia, ou, oo, Ll, Nl];
 function JJ(t) {
   return wx(t) !== t;
 }
 function wx(t) {
   switch (t) {
-    case ru:
+    case iu:
       return Sn;
     case ia:
       return hr;
-    case su:
+    case ou:
       return oa;
     case oo:
       return ua;
     case Ll:
-      return iu;
+      return su;
     case Nl:
       return sa;
   }
@@ -59143,7 +59143,7 @@ function wx(t) {
 function k0(t) {
   if (VJ(t))
     switch (t) {
-      case iu:
+      case su:
         return "startAngle";
       case Ll:
         return "endAngle";
@@ -59157,14 +59157,14 @@ function k0(t) {
 function Bl(t) {
   switch (t) {
     case Sn:
-      return ru;
+      return iu;
     case hr:
       return ia;
     case oa:
-      return su;
+      return ou;
     case ua:
       return oo;
-    case iu:
+    case su:
       return Ll;
     case sa:
       return Nl;
@@ -59173,7 +59173,7 @@ function Bl(t) {
 function ns(t) {
   switch (t) {
     case Sn:
-    case ru:
+    case iu:
       return "width";
     case hr:
     case ia:
@@ -59186,11 +59186,11 @@ function Zge(t) {
       return "xOffset";
     case hr:
       return "yOffset";
-    case ru:
+    case iu:
       return "x2Offset";
     case ia:
       return "y2Offset";
-    case iu:
+    case su:
       return "thetaOffset";
     case sa:
       return "radiusOffset";
@@ -59305,9 +59305,9 @@ function a3e(t) {
     case oa:
     case ua:
       return u3e;
-    case ru:
+    case iu:
     case ia:
-    case su:
+    case ou:
     case oo:
       return {
         area: "always",
@@ -59353,7 +59353,7 @@ function a3e(t) {
       return { point: "always", square: "always", text: "always" };
     case D5:
       return { image: "always" };
-    case iu:
+    case su:
       return { text: "always", arc: "always" };
     case sa:
       return { text: "always", arc: "always" };
@@ -59366,7 +59366,7 @@ function jD(t) {
   switch (t) {
     case Sn:
     case hr:
-    case iu:
+    case su:
     case sa:
     case ac:
     case Op:
@@ -59376,7 +59376,7 @@ function jD(t) {
     case $l:
     case lc:
     case cc:
-    case ru:
+    case iu:
     case ia:
     case Ll:
     case Nl:
@@ -59398,7 +59398,7 @@ function jD(t) {
       return "flexible";
     case oa:
     case ua:
-    case su:
+    case ou:
     case oo:
     case B3:
     case T5:
@@ -60199,11 +60199,11 @@ function Qye(t) {
 function TX(t) {
   return d9(t) || u9(t) || x9(t) || a9(t) || c9(t) || l9(t) || f9(t);
 }
-function bu(t, e) {
+function Tu(t, e) {
   return zb(t, { timeUnit: e, wrapTime: !0 });
 }
 function zye(t, e) {
-  return t.map((r) => bu(r, e));
+  return t.map((r) => Tu(r, e));
 }
 function RX(t, e = !0) {
   var r;
@@ -60214,19 +60214,19 @@ function RX(t, e = !0) {
     `time(${jye(s, i)})`
   ) : Pe(t, { expr: "datum" });
   if (u9(t))
-    return `${o}===${bu(t.equal, s)}`;
+    return `${o}===${Tu(t.equal, s)}`;
   if (a9(t)) {
     const u = t.lt;
-    return `${o}<${bu(u, s)}`;
+    return `${o}<${Tu(u, s)}`;
   } else if (c9(t)) {
     const u = t.gt;
-    return `${o}>${bu(u, s)}`;
+    return `${o}>${Tu(u, s)}`;
   } else if (l9(t)) {
     const u = t.lte;
-    return `${o}<=${bu(u, s)}`;
+    return `${o}<=${Tu(u, s)}`;
   } else if (f9(t)) {
     const u = t.gte;
-    return `${o}>=${bu(u, s)}`;
+    return `${o}>=${Tu(u, s)}`;
   } else {
     if (d9(t))
       return `indexof([${zye(t.oneOf, s).join(",")}], ${o}) !== -1`;
@@ -60235,9 +60235,9 @@ function RX(t, e = !0) {
     if (x9(t)) {
       const { range: u } = t, a = Ze(u) ? { signal: `${u.signal}[0]` } : u[0], l = Ze(u) ? { signal: `${u.signal}[1]` } : u[1];
       if (a !== null && l !== null && e)
-        return "inrange(" + o + ", [" + bu(a, s) + ", " + bu(l, s) + "])";
+        return "inrange(" + o + ", [" + Tu(a, s) + ", " + Tu(l, s) + "])";
       const c = [];
-      return a !== null && c.push(`${o} >= ${bu(a, s)}`), l !== null && c.push(`${o} <= ${bu(l, s)}`), c.length > 0 ? c.join(" && ") : "true";
+      return a !== null && c.push(`${o} >= ${Tu(a, s)}`), l !== null && c.push(`${o} <= ${Tu(l, s)}`), c.length > 0 ? c.join(" && ") : "true";
     }
   }
   throw new Error(`Invalid field predicate: ${dn(t)}`);
@@ -61172,7 +61172,7 @@ function WX(t, e, r, i, s, o) {
   }
   return [a, l];
 }
-const [BEe, kEe] = WX(Yu, Rg, Lp, GX, P5, B5), [PEe, MEe] = WX(Vu, Tg, Np, ll, k5, $5), Yr = "year", bs = "quarter", _i = "month", ur = "week", Ts = "date", hi = "day", Al = "dayofyear", uo = "hours", ao = "minutes", Ko = "seconds", Ku = "milliseconds", VX = [Yr, bs, _i, ur, Ts, hi, Al, uo, ao, Ko, Ku], VD = VX.reduce((t, e, r) => (t[e] = 1 + r, t), {});
+const [BEe, kEe] = WX(Yu, Rg, Lp, GX, P5, B5), [PEe, MEe] = WX(Vu, Tg, Np, ll, k5, $5), Yr = "year", bs = "quarter", _i = "month", ur = "week", Ts = "date", hi = "day", Al = "dayofyear", uo = "hours", ao = "minutes", Jo = "seconds", Ku = "milliseconds", VX = [Yr, bs, _i, ur, Ts, hi, Al, uo, ao, Jo, Ku], VD = VX.reduce((t, e, r) => (t[e] = 1 + r, t), {});
 function YX(t) {
   const e = je(t).slice(), r = {};
   return e.length || Se("Missing time unit."), e.forEach((s) => {
@@ -61189,7 +61189,7 @@ const jEe = {
   [Al]: "%j ",
   [uo]: "%H:00",
   [ao]: "00:%M",
-  [Ko]: ":%S",
+  [Jo]: ":%S",
   [Ku]: ".%L",
   [`${Yr}-${_i}`]: "%Y-%m ",
   [`${Yr}-${_i}-${Ts}`]: "%Y-%m-%d ",
@@ -61257,7 +61257,7 @@ function WEe(t, e, r, i, s, o, u) {
   return new Date(Date.UTC(t, e, r, i, s, o, u));
 }
 function XX(t, e, r, i, s) {
-  const o = e || 1, u = wt(t), a = (A, E, _) => (_ = _ || A, VEe(r[_], i[_], A === u && o, E)), l = /* @__PURE__ */ new Date(), c = Wu(t), f = c[Yr] ? a(Yr) : Ti(2012), x = c[_i] ? a(_i) : c[bs] ? a(bs) : cf, h = c[ur] && c[hi] ? a(hi, 1, ur + hi) : c[ur] ? a(ur, 1) : c[hi] ? a(hi, 1) : c[Ts] ? a(Ts, 1) : c[Al] ? a(Al, 1) : F3, p = c[uo] ? a(uo) : cf, m = c[ao] ? a(ao) : cf, g = c[Ko] ? a(Ko) : cf, y = c[Ku] ? a(Ku) : cf;
+  const o = e || 1, u = wt(t), a = (A, E, _) => (_ = _ || A, VEe(r[_], i[_], A === u && o, E)), l = /* @__PURE__ */ new Date(), c = Wu(t), f = c[Yr] ? a(Yr) : Ti(2012), x = c[_i] ? a(_i) : c[bs] ? a(bs) : cf, h = c[ur] && c[hi] ? a(hi, 1, ur + hi) : c[ur] ? a(ur, 1) : c[hi] ? a(hi, 1) : c[Ts] ? a(Ts, 1) : c[Al] ? a(Al, 1) : F3, p = c[uo] ? a(uo) : cf, m = c[ao] ? a(ao) : cf, g = c[Jo] ? a(Jo) : cf, y = c[Ku] ? a(Ku) : cf;
   return function(A) {
     l.setTime(+A);
     const E = f(l);
@@ -61278,7 +61278,7 @@ const YEe = {
   [Ts]: (t) => t.getDate(),
   [uo]: (t) => t.getHours(),
   [ao]: (t) => t.getMinutes(),
-  [Ko]: (t) => t.getSeconds(),
+  [Jo]: (t) => t.getSeconds(),
   [Ku]: (t) => t.getMilliseconds(),
   [Al]: (t) => KX(t),
   [ur]: (t) => J7(t),
@@ -61298,7 +61298,7 @@ const XEe = {
   [Ts]: (t) => t.getUTCDate(),
   [uo]: (t) => t.getUTCHours(),
   [ao]: (t) => t.getUTCMinutes(),
-  [Ko]: (t) => t.getUTCSeconds(),
+  [Jo]: (t) => t.getUTCSeconds(),
   [Ku]: (t) => t.getUTCMilliseconds(),
   [Al]: (t) => JX(t),
   [ur]: (t) => Z7(t),
@@ -61321,7 +61321,7 @@ const tAe = {
   [Al]: ll,
   [uo]: k5,
   [ao]: $5,
-  [Ko]: nl,
+  [Jo]: nl,
   [Ku]: Ch
 }, nAe = {
   [Yr]: Yu,
@@ -61333,7 +61333,7 @@ const tAe = {
   [Al]: T0,
   [uo]: P5,
   [ao]: B5,
-  [Ko]: nl,
+  [Jo]: nl,
   [Ku]: Ch
 };
 function P3(t) {
@@ -61360,7 +61360,7 @@ function sAe(t, e, r, i) {
 function oAe(t, e, r, i) {
   return eZ(M3(t), e, r, i);
 }
-const _m = 1e3, vm = _m * 60, Cm = vm * 60, M5 = Cm * 24, uAe = M5 * 7, nU = M5 * 30, tw = M5 * 365, tZ = [Yr, _i, Ts, uo, ao, Ko, Ku], Sm = tZ.slice(0, -1), bm = Sm.slice(0, -1), Tm = bm.slice(0, -1), aAe = Tm.slice(0, -1), lAe = [Yr, ur], rU = [Yr, _i], nZ = [Yr], V2 = [[Sm, 1, _m], [Sm, 5, 5 * _m], [Sm, 15, 15 * _m], [Sm, 30, 30 * _m], [bm, 1, vm], [bm, 5, 5 * vm], [bm, 15, 15 * vm], [bm, 30, 30 * vm], [Tm, 1, Cm], [Tm, 3, 3 * Cm], [Tm, 6, 6 * Cm], [Tm, 12, 12 * Cm], [aAe, 1, M5], [lAe, 1, uAe], [rU, 1, nU], [rU, 3, 3 * nU], [nZ, 1, tw]];
+const _m = 1e3, vm = _m * 60, Cm = vm * 60, M5 = Cm * 24, uAe = M5 * 7, nU = M5 * 30, tw = M5 * 365, tZ = [Yr, _i, Ts, uo, ao, Jo, Ku], Sm = tZ.slice(0, -1), bm = Sm.slice(0, -1), Tm = bm.slice(0, -1), aAe = Tm.slice(0, -1), lAe = [Yr, ur], rU = [Yr, _i], nZ = [Yr], V2 = [[Sm, 1, _m], [Sm, 5, 5 * _m], [Sm, 15, 15 * _m], [Sm, 30, 30 * _m], [bm, 1, vm], [bm, 5, 5 * vm], [bm, 15, 15 * vm], [bm, 30, 30 * vm], [Tm, 1, Cm], [Tm, 3, 3 * Cm], [Tm, 6, 6 * Cm], [Tm, 12, 12 * Cm], [aAe, 1, M5], [lAe, 1, uAe], [rU, 1, nU], [rU, 3, 3 * nU], [nZ, 1, tw]];
 function cAe(t) {
   const e = t.extent, r = t.maxbins || 40, i = Math.abs(C5(e)) / r;
   let s = Fp((a) => a[2]).right(V2, i), o, u;
@@ -61945,7 +61945,7 @@ function rw(t) {
 }
 function hU(t, e, r) {
   r = r || {}, Ge(r) || Se(`Invalid time multi-format specifier: ${r}`);
-  const i = e(Ko), s = e(ao), o = e(uo), u = e(Ts), a = e(ur), l = e(_i), c = e(bs), f = e(Yr), x = t(r[Ku] || ".%L"), h = t(r[Ko] || ":%S"), p = t(r[ao] || "%I:%M"), m = t(r[uo] || "%I %p"), g = t(r[Ts] || r[hi] || "%a %d"), y = t(r[ur] || "%b %d"), A = t(r[_i] || "%B"), E = t(r[bs] || "%B"), _ = t(r[Yr] || "%Y");
+  const i = e(Jo), s = e(ao), o = e(uo), u = e(Ts), a = e(ur), l = e(_i), c = e(bs), f = e(Yr), x = t(r[Ku] || ".%L"), h = t(r[Jo] || ":%S"), p = t(r[ao] || "%I:%M"), m = t(r[uo] || "%I %p"), g = t(r[Ts] || r[hi] || "%a %d"), y = t(r[ur] || "%b %d"), A = t(r[_i] || "%B"), E = t(r[bs] || "%B"), _ = t(r[Yr] || "%Y");
   return (v) => (i(v) < v ? x : s(v) < v ? h : o(v) < v ? p : u(v) < v ? m : l(v) < v ? a(v) < v ? g : y : f(v) < v ? c(v) < v ? A : E : _)(v);
 }
 function xZ(t) {
@@ -62067,7 +62067,7 @@ function I_e(t) {
   return typeof Buffer == "function" && Et(Buffer.isBuffer) ? Buffer.isBuffer(t) : !1;
 }
 function v9(t, e) {
-  const r = e && e.property ? Wo(e.property) : bi;
+  const r = e && e.property ? Vo(e.property) : bi;
   return Ge(t) && !I_e(t) ? $_e(r(t), e) : r(JSON.parse(t));
 }
 v9.responseType = "json";
@@ -62479,7 +62479,7 @@ function s0(t, e, r) {
   return new R9(t, e, r);
 }
 R9.prototype = {
-  _filter: Vo,
+  _filter: Yo,
   _apply: bi,
   targets() {
     return this._targets || (this._targets = j5(y5));
@@ -62528,7 +62528,7 @@ R9.prototype = {
     return t.targets().add(s0(null, null, () => r = !0)), e.targets().add(s0(null, null, () => r = !1)), this.filter(() => r);
   },
   detach() {
-    this._filter = Vo, this._targets = null;
+    this._filter = Yo, this._targets = null;
   }
 };
 function Y_e(t, e, r, i) {
@@ -62581,7 +62581,7 @@ async function Z_e(t, e, r) {
   const i = this, s = i._pending || eve(i);
   s.requests += 1;
   const o = await i.request(e, r);
-  return i.pulse(t, i.changeset().remove(Vo).insert(o.data || [])), s.done(), o;
+  return i.pulse(t, i.changeset().remove(Yo).insert(o.data || [])), s.done(), o;
 }
 function eve(t) {
   let e;
@@ -63956,7 +63956,7 @@ function GZ(t, e) {
   return o.prototype.init = Yve, o.prototype.add = Kve, o.prototype.rem = Jve, o.prototype.set = Xve, o.prototype.get = r, o.fields = t.map((u) => u.out), o;
 }
 function L9(t) {
-  this._key = t ? Wo(t) : nt, this.reset();
+  this._key = t ? Vo(t) : nt, this.reset();
 }
 const Nr = L9.prototype;
 Nr.reset = function() {
@@ -64408,7 +64408,7 @@ ke(k9, Ee, {
   transform(t, e) {
     const r = e.fork(e.NO_SOURCE), i = t.as || ["a", "b"], s = i[0], o = i[1], u = !this.value || e.changed(e.ADD_REM) || t.modified("as") || t.modified("filter");
     let a = this.value;
-    return u ? (a && (r.rem = a), a = e.materialize(e.SOURCE).source, r.add = this.value = nCe(a, s, o, t.filter || Vo)) : r.mod = a, r.source = this.value, r.modifies(i);
+    return u ? (a && (r.rem = a), a = e.materialize(e.SOURCE).source, r.add = this.value = nCe(a, s, o, t.filter || Yo)) : r.mod = a, r.source = this.value, r.modifies(i);
   }
 });
 function nCe(t, e, r, i) {
@@ -64773,7 +64773,7 @@ function eee(t) {
 }
 ke(eee, un);
 function lCe(t) {
-  return this.value && !t.modified() ? this.value : be(t.name) ? je(t.name).map((e) => Wo(e)) : Wo(t.name, t.as);
+  return this.value && !t.modified() ? this.value : be(t.name) ? je(t.name).map((e) => Vo(e)) : Vo(t.name, t.as);
 }
 function H9(t) {
   Ee.call(this, N3(), t);
@@ -65915,7 +65915,7 @@ function Ht(t) {
     return t;
   };
 }
-const DU = Math.abs, Ir = Math.atan2, Kc = Math.cos, FCe = Math.max, tO = Math.min, Au = Math.sin, Ef = Math.sqrt, Ur = 1e-12, Rh = Math.PI, Ov = Rh / 2, mee = 2 * Rh;
+const DU = Math.abs, Ir = Math.atan2, Kc = Math.cos, FCe = Math.max, tO = Math.min, _u = Math.sin, Ef = Math.sqrt, Ur = 1e-12, Rh = Math.PI, Ov = Rh / 2, mee = 2 * Rh;
 function NCe(t) {
   return t > 1 ? 0 : t < -1 ? Rh : Math.acos(t);
 }
@@ -66038,19 +66038,19 @@ function UCe() {
     var f, x, h = +t.apply(this, arguments), p = +e.apply(this, arguments), m = s.apply(this, arguments) - Ov, g = o.apply(this, arguments) - Ov, y = DU(g - m), A = g > m;
     if (a || (a = f = l()), p < h && (x = p, p = h, h = x), !(p > Ur)) a.moveTo(0, 0);
     else if (y > mee - Ur)
-      a.moveTo(p * Kc(m), p * Au(m)), a.arc(0, 0, p, m, g, !A), h > Ur && (a.moveTo(h * Kc(g), h * Au(g)), a.arc(0, 0, h, g, m, A));
+      a.moveTo(p * Kc(m), p * _u(m)), a.arc(0, 0, p, m, g, !A), h > Ur && (a.moveTo(h * Kc(g), h * _u(g)), a.arc(0, 0, h, g, m, A));
     else {
       var E = m, _ = g, v = m, C = g, b = y, S = y, R = u.apply(this, arguments) / 2, O = R > Ur && (i ? +i.apply(this, arguments) : Ef(h * h + p * p)), $ = tO(DU(p - h) / 2, +r.apply(this, arguments)), D = $, k = $, j, V;
       if (O > Ur) {
-        var G = OU(O / h * Au(R)), K = OU(O / p * Au(R));
+        var G = OU(O / h * _u(R)), K = OU(O / p * _u(R));
         (b -= G * 2) > Ur ? (G *= A ? 1 : -1, v += G, C -= G) : (b = 0, v = C = (m + g) / 2), (S -= K * 2) > Ur ? (K *= A ? 1 : -1, E += K, _ -= K) : (S = 0, E = _ = (m + g) / 2);
       }
-      var ce = p * Kc(E), xe = p * Au(E), ee = h * Kc(C), te = h * Au(C);
+      var ce = p * Kc(E), xe = p * _u(E), ee = h * Kc(C), te = h * _u(C);
       if ($ > Ur) {
-        var le = p * Kc(_), Ae = p * Au(_), I = h * Kc(v), N = h * Au(v), L;
+        var le = p * Kc(_), Ae = p * _u(_), I = h * Kc(v), N = h * _u(v), L;
         if (y < Rh)
           if (L = jCe(ce, xe, I, N, le, Ae, ee, te)) {
-            var q = ce - L[0], Y = xe - L[1], Q = le - L[0], w = Ae - L[1], P = 1 / Au(NCe((q * Q + Y * w) / (Ef(q * q + Y * Y) * Ef(Q * Q + w * w))) / 2), U = Ef(L[0] * L[0] + L[1] * L[1]);
+            var q = ce - L[0], Y = xe - L[1], Q = le - L[0], w = Ae - L[1], P = 1 / _u(NCe((q * Q + Y * w) / (Ef(q * q + Y * Y) * Ef(Q * Q + w * w))) / 2), U = Ef(L[0] * L[0] + L[1] * L[1]);
             D = tO($, (h - U) / (P - 1)), k = tO($, (p - U) / (P + 1));
           } else
             D = k = 0;
@@ -66061,7 +66061,7 @@ function UCe() {
   }
   return c.centroid = function() {
     var f = (+t.apply(this, arguments) + +e.apply(this, arguments)) / 2, x = (+s.apply(this, arguments) + +o.apply(this, arguments)) / 2 - Rh / 2;
-    return [Kc(x) * f, Au(x) * f];
+    return [Kc(x) * f, _u(x) * f];
   }, c.innerRadius = function(f) {
     return arguments.length ? (t = typeof f == "function" ? f : Ht(+f), c) : t;
   }, c.outerRadius = function(f) {
@@ -67205,28 +67205,28 @@ function Af(t) {
   return t = Ff(t), (t < 16 ? "0" : "") + t.toString(16);
 }
 function jU(t, e, r, i) {
-  return i <= 0 ? t = e = r = NaN : r <= 0 || r >= 1 ? t = e = NaN : e <= 0 && (t = NaN), new Lo(t, e, r, i);
+  return i <= 0 ? t = e = r = NaN : r <= 0 || r >= 1 ? t = e = NaN : e <= 0 && (t = NaN), new Io(t, e, r, i);
 }
 function Iee(t) {
-  if (t instanceof Lo) return new Lo(t.h, t.s, t.l, t.opacity);
-  if (t instanceof gc || (t = Ng(t)), !t) return new Lo();
-  if (t instanceof Lo) return t;
+  if (t instanceof Io) return new Io(t.h, t.s, t.l, t.opacity);
+  if (t instanceof gc || (t = Ng(t)), !t) return new Io();
+  if (t instanceof Io) return t;
   t = t.rgb();
   var e = t.r / 255, r = t.g / 255, i = t.b / 255, s = Math.min(e, r, i), o = Math.max(e, r, i), u = NaN, a = o - s, l = (o + s) / 2;
-  return a ? (e === o ? u = (r - i) / a + (r < i) * 6 : r === o ? u = (i - e) / a + 2 : u = (e - r) / a + 4, a /= l < 0.5 ? o + s : 2 - o - s, u *= 60) : a = l > 0 && l < 1 ? 0 : u, new Lo(u, a, l, t.opacity);
+  return a ? (e === o ? u = (r - i) / a + (r < i) * 6 : r === o ? u = (i - e) / a + 2 : u = (e - r) / a + 4, a /= l < 0.5 ? o + s : 2 - o - s, u *= 60) : a = l > 0 && l < 1 ? 0 : u, new Io(u, a, l, t.opacity);
 }
 function Iv(t, e, r, i) {
-  return arguments.length === 1 ? Iee(t) : new Lo(t, e, r, i ?? 1);
+  return arguments.length === 1 ? Iee(t) : new Io(t, e, r, i ?? 1);
 }
-function Lo(t, e, r, i) {
+function Io(t, e, r, i) {
   this.h = +t, this.s = +e, this.l = +r, this.opacity = +i;
 }
-Bp(Lo, Iv, H3(gc, {
+Bp(Io, Iv, H3(gc, {
   brighter(t) {
-    return t = t == null ? Dh : Math.pow(Dh, t), new Lo(this.h, this.s, this.l * t, this.opacity);
+    return t = t == null ? Dh : Math.pow(Dh, t), new Io(this.h, this.s, this.l * t, this.opacity);
   },
   darker(t) {
-    return t = t == null ? Qf : Math.pow(Qf, t), new Lo(this.h, this.s, this.l * t, this.opacity);
+    return t = t == null ? Qf : Math.pow(Qf, t), new Io(this.h, this.s, this.l * t, this.opacity);
   },
   rgb() {
     var t = this.h % 360 + (this.h < 0) * 360, e = isNaN(t) || isNaN(this.s) ? 0 : this.s, r = this.l, i = r + (r < 0.5 ? r : 1 - r) * e, s = 2 * r - i;
@@ -67238,7 +67238,7 @@ Bp(Lo, Iv, H3(gc, {
     );
   },
   clamp() {
-    return new Lo(UU(this.h), pA(this.s), pA(this.l), Lv(this.opacity));
+    return new Io(UU(this.h), pA(this.s), pA(this.l), Lv(this.opacity));
   },
   displayable() {
     return (0 <= this.s && this.s <= 1 || isNaN(this.s)) && 0 <= this.l && this.l <= 1 && 0 <= this.opacity && this.opacity <= 1;
@@ -67450,7 +67450,7 @@ function Xee(t, e) {
     return r.setTime(t * (1 - i) + e * i), r;
   };
 }
-function wo(t, e) {
+function Fo(t, e) {
   return t = +t, e = +e, function(r) {
     return t * (1 - r) + e * r;
   };
@@ -67479,7 +67479,7 @@ function RSe(t) {
 function ete(t, e) {
   var r = xw.lastIndex = aO.lastIndex = 0, i, s, o, u = -1, a = [], l = [];
   for (t = t + "", e = e + ""; (i = xw.exec(t)) && (s = aO.exec(e)); )
-    (o = s.index) > r && (o = e.slice(r, o), a[u] ? a[u] += o : a[++u] = o), (i = i[0]) === (s = s[0]) ? a[u] ? a[u] += s : a[++u] = s : (a[++u] = null, l.push({ i: u, x: wo(i, s) })), r = aO.lastIndex;
+    (o = s.index) > r && (o = e.slice(r, o), a[u] ? a[u] += o : a[++u] = o), (i = i[0]) === (s = s[0]) ? a[u] ? a[u] += s : a[++u] = s : (a[++u] = null, l.push({ i: u, x: Fo(i, s) })), r = aO.lastIndex;
   return r < e.length && (o = e.slice(r), a[u] ? a[u] += o : a[++u] = o), a.length < 2 ? l[0] ? RSe(l[0].x) : TSe(e) : (e = l.length, function(c) {
     for (var f = 0, x; f < e; ++f) a[(x = l[f]).i] = x.x(c);
     return a.join("");
@@ -67487,7 +67487,7 @@ function ete(t, e) {
 }
 function yc(t, e) {
   var r = typeof e, i;
-  return e == null || r === "boolean" ? V5(e) : (r === "number" ? wo : r === "string" ? (i = Ng(e)) ? (e = i, fw) : ete : e instanceof Ng ? fw : e instanceof Date ? Xee : Kee(e) ? pL : Array.isArray(e) ? Jee : typeof e.valueOf != "function" && typeof e.toString != "function" || isNaN(e) ? Zee : wo)(t, e);
+  return e == null || r === "boolean" ? V5(e) : (r === "number" ? Fo : r === "string" ? (i = Ng(e)) ? (e = i, fw) : ete : e instanceof Ng ? fw : e instanceof Date ? Xee : Kee(e) ? pL : Array.isArray(e) ? Jee : typeof e.valueOf != "function" && typeof e.toString != "function" || isNaN(e) ? Zee : Fo)(t, e);
 }
 function DSe(t) {
   var e = t.length;
@@ -67541,19 +67541,19 @@ function nte(t, e, r, i) {
   function o(c, f, x, h, p, m) {
     if (c !== x || f !== h) {
       var g = p.push("translate(", null, e, null, r);
-      m.push({ i: g - 4, x: wo(c, x) }, { i: g - 2, x: wo(f, h) });
+      m.push({ i: g - 4, x: Fo(c, x) }, { i: g - 2, x: Fo(f, h) });
     } else (x || h) && p.push("translate(" + x + e + h + r);
   }
   function u(c, f, x, h) {
-    c !== f ? (c - f > 180 ? f += 360 : f - c > 180 && (c += 360), h.push({ i: x.push(s(x) + "rotate(", null, i) - 2, x: wo(c, f) })) : f && x.push(s(x) + "rotate(" + f + i);
+    c !== f ? (c - f > 180 ? f += 360 : f - c > 180 && (c += 360), h.push({ i: x.push(s(x) + "rotate(", null, i) - 2, x: Fo(c, f) })) : f && x.push(s(x) + "rotate(" + f + i);
   }
   function a(c, f, x, h) {
-    c !== f ? h.push({ i: x.push(s(x) + "skewX(", null, i) - 2, x: wo(c, f) }) : f && x.push(s(x) + "skewX(" + f + i);
+    c !== f ? h.push({ i: x.push(s(x) + "skewX(", null, i) - 2, x: Fo(c, f) }) : f && x.push(s(x) + "skewX(" + f + i);
   }
   function l(c, f, x, h, p, m) {
     if (c !== x || f !== h) {
       var g = p.push(s(p) + "scale(", null, ",", null, ")");
-      m.push({ i: g - 4, x: wo(c, x) }, { i: g - 2, x: wo(f, h) });
+      m.push({ i: g - 4, x: Fo(c, x) }, { i: g - 2, x: Fo(f, h) });
     } else (x !== 1 || h !== 1) && p.push(s(p) + "scale(" + x + "," + h + ")");
   }
   return function(c, f) {
@@ -67671,7 +67671,7 @@ const GSe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
   interpolateHslLong: MSe,
   interpolateHue: OSe,
   interpolateLab: jSe,
-  interpolateNumber: wo,
+  interpolateNumber: Fo,
   interpolateNumberArray: pL,
   interpolateObject: Zee,
   interpolateRgb: fw,
@@ -67736,7 +67736,7 @@ function K5() {
     return h == null || isNaN(h = +h) ? o : (l || (l = a(t.map(i), e, r)))(i(u(h)));
   }
   return x.invert = function(h) {
-    return u(s((c || (c = a(e, t.map(i), wo)))(h)));
+    return u(s((c || (c = a(e, t.map(i), Fo)))(h)));
   }, x.domain = function(h) {
     return arguments.length ? (t = Array.from(h, hw), f()) : t.slice();
   }, x.range = function(h) {
@@ -68567,9 +68567,9 @@ function IL(t) {
 function qte(t, e, r) {
   const i = t.gradient;
   let s = t.id, o = i === "radial" ? Mv : "";
-  return s || (s = t.id = "gradient_" + J5e++, i === "radial" ? (t.x1 = _u(t.x1, 0.5), t.y1 = _u(t.y1, 0.5), t.r1 = _u(t.r1, 0), t.x2 = _u(t.x2, 0.5), t.y2 = _u(t.y2, 0.5), t.r2 = _u(t.r2, 0.5), o = Mv) : (t.x1 = _u(t.x1, 0), t.y1 = _u(t.y1, 0), t.x2 = _u(t.x2, 1), t.y2 = _u(t.y2, 0))), e[s] = t, "url(" + (r || "") + "#" + o + s + ")";
+  return s || (s = t.id = "gradient_" + J5e++, i === "radial" ? (t.x1 = vu(t.x1, 0.5), t.y1 = vu(t.y1, 0.5), t.r1 = vu(t.r1, 0), t.x2 = vu(t.x2, 0.5), t.y2 = vu(t.y2, 0.5), t.r2 = vu(t.r2, 0.5), o = Mv) : (t.x1 = vu(t.x1, 0), t.y1 = vu(t.y1, 0), t.x2 = vu(t.x2, 1), t.y2 = vu(t.y2, 0))), e[s] = t, "url(" + (r || "") + "#" + o + s + ")";
 }
-function _u(t, e) {
+function vu(t, e) {
   return t ?? e;
 }
 function X5e(t, e) {
@@ -69387,7 +69387,7 @@ function Kte(t, e, r, i) {
   s !== 0 && (t(e, i) || (Nh(e, r), r.fill && Uv(e, r, s) && e.fill(), r.stroke && Lh(e, r, s) && e.stroke()));
 }
 function sb(t) {
-  return t = t || Vo, function(e, r, i, s, o, u) {
+  return t = t || Yo, function(e, r, i, s, o, u) {
     return i *= e.pixelRatio, s *= e.pixelRatio, Cw(r, (a) => {
       const l = a.bounds;
       if (!(l && !l.contains(o, u) || !l) && t(e, a, i, s, o, u))
@@ -69626,7 +69626,7 @@ var R4e = {
   bound: b4e,
   draw: T4e,
   pick: sb(),
-  isect: Vo,
+  isect: Yo,
   // bounds check is sufficient
   get: zL,
   xOffset: ob,
@@ -70016,7 +70016,7 @@ function ir(t, e, r, i) {
   var s = t.childNodes[e], o;
   return (!s || s.tagName.toLowerCase() !== r.toLowerCase()) && (o = s || null, s = vf(t.ownerDocument, r, i), t.insertBefore(s, o)), s;
 }
-function Fo(t, e) {
+function No(t, e) {
   for (var r = t.childNodes, i = r.length; i > e; ) t.removeChild(r[--i]);
   return t;
 }
@@ -70452,7 +70452,7 @@ class Dw extends cb {
     super(e), this._options = {}, this._redraw = !1, this._dirty = new Jn(), this._tempb = new Jn();
   }
   initialize(e, r, i, s, o, u) {
-    return this._options = u || {}, this._canvas = this._options.externalContext ? null : R0(1, 1, this._options.type), e && this._canvas && (Fo(e, 0).appendChild(this._canvas), this._canvas.setAttribute("class", "marks")), super.initialize(e, r, i, s, o);
+    return this._options = u || {}, this._canvas = this._options.externalContext ? null : R0(1, 1, this._options.type), e && this._canvas && (No(e, 0).appendChild(this._canvas), this._canvas.setAttribute("class", "marks")), super.initialize(e, r, i, s, o);
   }
   resize(e, r, i, s) {
     if (super.resize(e, r, i, s), this._canvas)
@@ -70685,7 +70685,7 @@ class Tne extends cb {
    * @return {SVGRenderer} - This renderer instance.
    */
   initialize(e, r, i, s, o) {
-    return this._defs = {}, this._clearDefs(), e && (this._svg = ir(e, 0, "svg", Gn), this._svg.setAttributeNS(Tq, "xmlns", Gn), this._svg.setAttributeNS(Tq, "xmlns:xlink", $g["xmlns:xlink"]), this._svg.setAttribute("version", $g.version), this._svg.setAttribute("class", "marks"), Fo(e, 1), this._root = ir(this._svg, n1, "g", Gn), g0(this._root, bne), Fo(this._svg, n1 + 1)), this.background(this._bgcolor), super.initialize(e, r, i, s, o);
+    return this._defs = {}, this._clearDefs(), e && (this._svg = ir(e, 0, "svg", Gn), this._svg.setAttributeNS(Tq, "xmlns", Gn), this._svg.setAttributeNS(Tq, "xmlns:xlink", $g["xmlns:xlink"]), this._svg.setAttribute("version", $g.version), this._svg.setAttribute("class", "marks"), No(e, 1), this._root = ir(this._svg, n1, "g", Gn), g0(this._root, bne), No(this._svg, n1 + 1)), this.background(this._bgcolor), super.initialize(e, r, i, s, o);
   }
   /**
    * Get / set the background color.
@@ -70740,7 +70740,7 @@ class Tne extends cb {
    *                            If undefined, render all mark types
    */
   _render(e, r) {
-    return this._dirtyCheck() && (this._dirtyAll && this._clearDefs(), this.mark(this._root, e, void 0, r), Fo(this._root, 1)), this.defs(), this._dirty = [], ++this._dirtyID, this;
+    return this._dirtyCheck() && (this._dirtyAll && this._clearDefs(), this.mark(this._root, e, void 0, r), No(this._root, 1)), this.defs(), this._dirty = [], ++this._dirtyID, this;
   }
   // -- Manage rendering of items marked as dirty --
   /**
@@ -70793,7 +70793,7 @@ class Tne extends cb {
       return r._svg;
     const o = this._svg, u = r.marktype, a = lo[u], l = r.interactive === !1 ? "none" : null, c = a.tag === "g", f = Dq(r, e, i, "g", o);
     if (u !== "group" && s != null && !s.includes(u))
-      return Fo(f, 0), r._svg;
+      return No(f, 0), r._svg;
     f.setAttribute("class", ane(r));
     const x = Ane(r);
     for (const g in x) ui(f, g, x[g]);
@@ -70803,7 +70803,7 @@ class Tne extends cb {
       const y = this.isDirty(g), A = Dq(g, f, h, a.tag, o);
       y && (this._update(a, A, g), c && FTe(this, A, g, s)), h = A, ++p;
     };
-    return a.nested ? r.items.length && m(r.items[0]) : Ju(r, m), Fo(f, p), f;
+    return a.nested ? r.items.length && m(r.items[0]) : Ju(r, m), No(f, p), f;
   }
   /**
    * Update the attributes of an SVG element for a mark item.
@@ -70845,7 +70845,7 @@ class Tne extends cb {
       i || (r.el = i = ir(e, n1 + 1, "defs", Gn)), s = OTe(i, r.gradient[o], s);
     for (const o in r.clipping)
       i || (r.el = i = ir(e, n1 + 1, "defs", Gn)), s = wTe(i, r.clipping[o], s);
-    i && (s === 0 ? (e.removeChild(i), r.el = null) : Fo(i, s));
+    i && (s === 0 ? (e.removeChild(i), r.el = null) : No(i, s));
   }
   /**
    * Clear defs caches.
@@ -70894,7 +70894,7 @@ function OTe(t, e, r) {
     });
   for (i = 0, s = e.stops.length; i < s; ++i)
     o = ir(t, i, "stop", Gn), o.setAttribute("offset", e.stops[i].offset), o.setAttribute("stop-color", e.stops[i].color);
-  return Fo(t, i), r;
+  return No(t, i), r;
 }
 function wTe(t, e, r) {
   let i;
@@ -70903,14 +70903,14 @@ function wTe(t, e, r) {
     y: 0,
     width: e.width,
     height: e.height
-  })), Fo(t, 1), r + 1;
+  })), No(t, 1), r + 1;
 }
 function FTe(t, e, r, i) {
   e = e.lastChild.previousSibling;
   let s, o = 0;
   Ju(r, (u) => {
     s = t.mark(e, u, s, i), ++o;
-  }), Fo(e, 1 + o);
+  }), No(e, 1 + o);
 }
 function Dq(t, e, r, i, s) {
   let o = t._svg, u;
@@ -70952,7 +70952,7 @@ const LTe = {
     const i = ey(r);
     let s, o, u, a;
     be(i) ? (o = i.map((l) => Q0(r, l)), s = o.join(`
-`), s !== Qr.text && (Fo(e, 0), u = e.ownerDocument, a = Wf(r), o.forEach((l, c) => {
+`), s !== Qr.text && (No(e, 0), u = e.ownerDocument, a = Wf(r), o.forEach((l, c) => {
       const f = vf(u, "tspan", Gn);
       f.__data__ = r, f.textContent = l, c && (f.setAttribute("x", 0), f.setAttribute("dy", a)), e.appendChild(f);
     }), Qr.text = s)) : (o = Q0(r, i), o !== Qr.text && (e.textContent = o, Qr.text = o)), ui(e, "font-family", ab(r)), ui(e, "font-size", kl(r) + "px"), ui(e, "font-style", r.fontStyle), ui(e, "font-variant", r.fontVariant), ui(e, "font-weight", r.fontWeight);
@@ -71295,7 +71295,7 @@ function jTe(t) {
   else return;
   t.bounds.intersect(mO);
 }
-const Ih = "top", Io = "left", Bo = "right", z0 = "bottom", UTe = "top-left", qTe = "top-right", HTe = "bottom-left", QTe = "bottom-right", iI = "start", Ow = "middle", li = "end", zTe = "x", GTe = "y", xb = "group", sI = "axis", oI = "title", WTe = "frame", VTe = "scope", uI = "legend", Bne = "row-header", kne = "row-footer", Pne = "row-title", Mne = "column-header", jne = "column-footer", Une = "column-title", YTe = "padding", KTe = "symbol", qne = "fit", Hne = "fit-x", Qne = "fit-y", JTe = "pad", aI = "none", yA = "all", ww = "each", lI = "flush", y0 = "column", E0 = "row";
+const Ih = "top", $o = "left", ko = "right", z0 = "bottom", UTe = "top-left", qTe = "top-right", HTe = "bottom-left", QTe = "bottom-right", iI = "start", Ow = "middle", li = "end", zTe = "x", GTe = "y", xb = "group", sI = "axis", oI = "title", WTe = "frame", VTe = "scope", uI = "legend", Bne = "row-header", kne = "row-footer", Pne = "row-title", Mne = "column-header", jne = "column-footer", Une = "column-title", YTe = "padding", KTe = "symbol", qne = "fit", Hne = "fit-x", Qne = "fit-y", JTe = "pad", aI = "none", yA = "all", ww = "each", lI = "flush", y0 = "column", E0 = "row";
 function zne(t) {
   Ee.call(this, null, t);
 }
@@ -71426,7 +71426,7 @@ function Gd(t, e, r) {
 }
 function nRe(t) {
   var e = t.items[0].orient;
-  return e === Io || e === Bo;
+  return e === $o || e === ko;
 }
 function rRe(t) {
   let e = +t.grid;
@@ -71445,10 +71445,10 @@ function iRe(t, e, r, i) {
     case Ih:
       E = x || 0, _ = -f, C = Math.max(h, Math.min(p, -y.y1)), y.add(0, -C).add(c, 0), m && AA(t, m, C, g, A, 0, -1, y);
       break;
-    case Io:
+    case $o:
       E = -f, _ = x || 0, C = Math.max(h, Math.min(p, -y.x1)), y.add(-C, 0).add(0, c), m && AA(t, m, C, g, A, 1, -1, y);
       break;
-    case Bo:
+    case ko:
       E = r + f, _ = x || 0, C = Math.max(h, Math.min(p, y.x2)), y.add(0, 0).add(C, c), m && AA(t, m, C, g, A, 1, 1, y);
       break;
     case z0:
@@ -71649,7 +71649,7 @@ function dRe(t, e, r, i, s, o, u) {
     nodirty: !0
   };
   switch (e) {
-    case Io:
+    case $o:
       x.anchor = {
         x: Math.floor(i.x1) - l,
         column: li,
@@ -71657,7 +71657,7 @@ function dRe(t, e, r, i, s, o, u) {
         row: c
       };
       break;
-    case Bo:
+    case ko:
       x.anchor = {
         x: Math.ceil(i.x2) + l,
         y: f * (u || i.height() + 2 * i.y1),
@@ -71724,20 +71724,20 @@ function mRe(t, e, r) {
   else {
     var u = e.items[1].items[0], a = u.anchor, l = e.titlePadding || 0, c = i - u.x, f = i - u.y;
     switch (u.orient) {
-      case Io:
+      case $o:
         s += Math.ceil(u.bounds.width()) + l;
         break;
-      case Bo:
+      case ko:
       case z0:
         break;
       default:
         o += u.bounds.height() + l;
     }
     switch ((s || o) && r1(t, r, s, o), u.orient) {
-      case Io:
+      case $o:
         f += Cd(e, r, u, a, 1, 1);
         break;
-      case Bo:
+      case ko:
         c += Cd(e, r, u, li, 0, 0) + l, f += Cd(e, r, u, a, 1, 1);
         break;
       case z0:
@@ -71763,17 +71763,17 @@ function gRe(t) {
   });
 }
 function yRe(t, e, r, i, s) {
-  var o = e.items[0], u = o.frame, a = o.orient, l = o.anchor, c = o.offset, f = o.padding, x = o.items[0].items[0], h = o.items[1] && o.items[1].items[0], p = a === Io || a === Bo ? i : r, m = 0, g = 0, y = 0, A = 0, E = 0, _;
-  if (u !== xb ? a === Io ? (m = s.y2, p = s.y1) : a === Bo ? (m = s.y1, p = s.y2) : (m = s.x1, p = s.x2) : a === Io && (m = i, p = 0), _ = l === iI ? m : l === li ? p : (m + p) / 2, h && h.text) {
+  var o = e.items[0], u = o.frame, a = o.orient, l = o.anchor, c = o.offset, f = o.padding, x = o.items[0].items[0], h = o.items[1] && o.items[1].items[0], p = a === $o || a === ko ? i : r, m = 0, g = 0, y = 0, A = 0, E = 0, _;
+  if (u !== xb ? a === $o ? (m = s.y2, p = s.y1) : a === ko ? (m = s.y1, p = s.y2) : (m = s.x1, p = s.x2) : a === $o && (m = i, p = 0), _ = l === iI ? m : l === li ? p : (m + p) / 2, h && h.text) {
     switch (a) {
       case Ih:
       case z0:
         E = x.bounds.height() + f;
         break;
-      case Io:
+      case $o:
         A = x.bounds.width() + f;
         break;
-      case Bo:
+      case ko:
         A = -x.bounds.width() - f;
         break;
     }
@@ -71784,10 +71784,10 @@ function yRe(t, e, r, i, s) {
     case Ih:
       g = _, y = s.y1 - qr.height() - c;
       break;
-    case Io:
+    case $o:
       g = s.x1 - qr.width() - c, y = _;
       break;
-    case Bo:
+    case ko:
       g = s.x2 + qr.width() + c, y = _;
       break;
     case z0:
@@ -71841,7 +71841,7 @@ function ARe(t, e, r) {
   if (c.length) {
     const y = {};
     c.forEach((A) => {
-      h = A.orient || Bo, h !== aI && (y[h] || (y[h] = [])).push(A);
+      h = A.orient || ko, h !== aI && (y[h] || (y[h] = [])).push(A);
     });
     for (const A in y) {
       const E = y[A];
@@ -71851,8 +71851,8 @@ function ARe(t, e, r) {
       const E = A.bounds;
       if (E.equals(A._bounds) || (A.bounds = A._bounds, t.dirty(A), A.bounds = E, t.dirty(A)), r.autosize && (r.autosize.type === qne || r.autosize.type === Hne || r.autosize.type === Qne))
         switch (A.orient) {
-          case Io:
-          case Bo:
+          case $o:
+          case ko:
             u.add(E.x1, 0).add(E.x2, 0);
             break;
           case Ih:
@@ -72482,16 +72482,16 @@ function aDe(t) {
   }
   return x0 = Cl = null, En === 1 / 0 || Qi === 1 / 0 ? [[NaN, NaN], [NaN, NaN]] : [[En, Qi], [Tn, gs]];
 }
-var wm, sC, oC, uC, aC, lC, cC, fC, Pw, Mw, jw, _re, vre, fi, xi, di, ko = {
+var wm, sC, oC, uC, aC, lC, cC, fC, Pw, Mw, jw, _re, vre, fi, xi, di, Po = {
   sphere: Cr,
   point: pI,
   lineStart: Vq,
   lineEnd: Yq,
   polygonStart: function() {
-    ko.lineStart = fDe, ko.lineEnd = xDe;
+    Po.lineStart = fDe, Po.lineEnd = xDe;
   },
   polygonEnd: function() {
-    ko.lineStart = Vq, ko.lineEnd = Yq;
+    Po.lineStart = Vq, Po.lineEnd = Yq;
   }
 };
 function pI(t, e) {
@@ -72503,12 +72503,12 @@ function ty(t, e, r) {
   ++wm, oC += (t - oC) / wm, uC += (e - uC) / wm, aC += (r - aC) / wm;
 }
 function Vq() {
-  ko.point = lDe;
+  Po.point = lDe;
 }
 function lDe(t, e) {
   t *= At, e *= At;
   var r = st(e);
-  fi = r * st(t), xi = r * tt(t), di = tt(e), ko.point = cDe, ty(fi, xi, di);
+  fi = r * st(t), xi = r * tt(t), di = tt(e), Po.point = cDe, ty(fi, xi, di);
 }
 function cDe(t, e) {
   t *= At, e *= At;
@@ -72516,16 +72516,16 @@ function cDe(t, e) {
   sC += u, lC += u * (fi + (fi = i)), cC += u * (xi + (xi = s)), fC += u * (di + (di = o)), ty(fi, xi, di);
 }
 function Yq() {
-  ko.point = pI;
+  Po.point = pI;
 }
 function fDe() {
-  ko.point = dDe;
+  Po.point = dDe;
 }
 function xDe() {
-  Cre(_re, vre), ko.point = pI;
+  Cre(_re, vre), Po.point = pI;
 }
 function dDe(t, e) {
-  _re = t, vre = e, t *= At, e *= At, ko.point = Cre;
+  _re = t, vre = e, t *= At, e *= At, Po.point = Cre;
   var r = st(e);
   fi = r * st(t), xi = r * tt(t), di = tt(e), ty(fi, xi, di);
 }
@@ -72535,7 +72535,7 @@ function Cre(t, e) {
   Pw.add(x * u), Mw.add(x * a), jw.add(x * l), sC += f, lC += f * (fi + (fi = i)), cC += f * (xi + (xi = s)), fC += f * (di + (di = o)), ty(fi, xi, di);
 }
 function hDe(t) {
-  wm = sC = oC = uC = aC = lC = cC = fC = 0, Pw = new Ai(), Mw = new Ai(), jw = new Ai(), Wa(t, ko);
+  wm = sC = oC = uC = aC = lC = cC = fC = 0, Pw = new Ai(), Mw = new Ai(), jw = new Ai(), Wa(t, Po);
   var e = +Pw, r = +Mw, i = +jw, s = Nw(e, r, i);
   return s < Jv && (e = lC, r = cC, i = fC, sC < it && (e = oC, r = uC, i = aC), s = Nw(e, r, i), s < Jv) ? [NaN, NaN] : [co(r, e) * In, rs(i / s) * In];
 }
@@ -74398,7 +74398,7 @@ DI.Definition = {
 ke(DI, Ee, {
   transform(t, e) {
     var r = e.fork(e.ALL), i = this.value, s = t.as || "shape", o = r.ADD;
-    return (!i || t.modified()) && (this.value = i = FOe(tie(t.projection), t.field || Wo("datum"), t.pointRadius), r.materialize().reflow(), o = r.SOURCE), r.visit(o, (u) => u[s] = i), r.modifies(s);
+    return (!i || t.modified()) && (this.value = i = FOe(tie(t.projection), t.field || Vo("datum"), t.pointRadius), r.materialize().reflow(), o = r.SOURCE), r.visit(o, (u) => u[s] = i), r.modifies(s);
   }
 });
 function FOe(t, e, r) {
@@ -76267,7 +76267,7 @@ ke(MI, Ee, {
     e.source || Se("Stratify transform requires an upstream data source.");
     let r = this.value;
     const i = t.modified(), s = e.fork(e.ALL).materialize(e.SOURCE), o = !r || i || e.changed(e.ADD_REM) || e.modified(t.key.fields) || e.modified(t.parentKey.fields);
-    return s.source = s.source.slice(), o && (r = s.source.length ? s8(wH().id(t.key).parentId(t.parentKey)(s.source), t.key, Vo) : s8(wH()([{}]), t.key, t.key)), s.source.root = this.value = r, s;
+    return s.source = s.source.slice(), o && (r = s.source.length ? s8(wH().id(t.key).parentId(t.parentKey)(s.source), t.key, Yo) : s8(wH()([{}]), t.key, t.key)), s.source.root = this.value = r, s;
   }
 });
 const NH = {
@@ -76493,11 +76493,11 @@ function q7e(t) {
     fillOpacity: 0
   } : e;
 }
-const Ma = 5, si = 31, jg = 32, d0 = new Uint32Array(jg + 1), No = new Uint32Array(jg + 1);
-No[0] = 0;
-d0[0] = ~No[0];
+const Ma = 5, si = 31, jg = 32, d0 = new Uint32Array(jg + 1), Lo = new Uint32Array(jg + 1);
+Lo[0] = 0;
+d0[0] = ~Lo[0];
 for (let t = 1; t <= jg; ++t)
-  No[t] = No[t - 1] << 1 | 1, d0[t] = ~No[t];
+  Lo[t] = Lo[t - 1] << 1 | 1, d0[t] = ~Lo[t];
 function H7e(t, e) {
   const r = new Uint32Array(~~((t * e + jg) / jg));
   function i(o, u) {
@@ -76524,10 +76524,10 @@ function H7e(t, e) {
       let c = l, f, x, h, p;
       for (; c >= u; --c)
         if (f = c * t + o, x = c * t + a, h = f >>> Ma, p = x >>> Ma, h === p) {
-          if (r[h] & d0[f & si] & No[(x & si) + 1])
+          if (r[h] & d0[f & si] & Lo[(x & si) + 1])
             return !0;
         } else {
-          if (r[h] & d0[f & si] || r[p] & No[(x & si) + 1]) return !0;
+          if (r[h] & d0[f & si] || r[p] & Lo[(x & si) + 1]) return !0;
           for (let m = h + 1; m < p; ++m)
             if (r[m]) return !0;
         }
@@ -76537,17 +76537,17 @@ function H7e(t, e) {
       let c, f, x, h, p;
       for (; u <= l; ++u)
         if (c = u * t + o, f = u * t + a, x = c >>> Ma, h = f >>> Ma, x === h)
-          i(x, d0[c & si] & No[(f & si) + 1]);
+          i(x, d0[c & si] & Lo[(f & si) + 1]);
         else
-          for (i(x, d0[c & si]), i(h, No[(f & si) + 1]), p = x + 1; p < h; ++p) i(p, 4294967295);
+          for (i(x, d0[c & si]), i(h, Lo[(f & si) + 1]), p = x + 1; p < h; ++p) i(p, 4294967295);
     },
     clearRange: (o, u, a, l) => {
       let c, f, x, h, p;
       for (; u <= l; ++u)
         if (c = u * t + o, f = u * t + a, x = c >>> Ma, h = f >>> Ma, x === h)
-          s(x, No[c & si] | d0[(f & si) + 1]);
+          s(x, Lo[c & si] | d0[(f & si) + 1]);
         else
-          for (s(x, No[c & si]), s(h, d0[(f & si) + 1]), p = x + 1; p < h; ++p) s(p, 0);
+          for (s(x, Lo[c & si]), s(h, d0[(f & si) + 1]), p = x + 1; p < h; ++p) s(p, 0);
     },
     outOfBounds: (o, u, a, l) => o < 0 || u < 0 || l >= e || a >= t
   };
@@ -78240,10 +78240,10 @@ const Ywe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
   crossfilter: YI,
   resolvefilter: KI
 }, Symbol.toStringTag, { value: "Module" })), Kwe = "RawCode", Mh = "Literal", Jwe = "Property", Xwe = "Identifier", Zwe = "ArrayExpression", e8e = "BinaryExpression", Die = "CallExpression", t8e = "ConditionalExpression", n8e = "LogicalExpression", r8e = "MemberExpression", i8e = "ObjectExpression", s8e = "UnaryExpression";
-function ou(t) {
+function uu(t) {
   this.type = t;
 }
-ou.prototype.visit = function(t) {
+uu.prototype.visit = function(t) {
   let e, r, i;
   if (t(this)) return 1;
   for (e = o8e(this), r = 0, i = e.length; r < i; ++r)
@@ -78680,43 +78680,43 @@ function Iie() {
   Gt = Lie(), ve = t;
 }
 function M8e(t) {
-  const e = new ou(a8e);
+  const e = new uu(a8e);
   return e.elements = t, e;
 }
 function HH(t, e, r) {
-  const i = new ou(t === "||" || t === "&&" ? d8e : l8e);
+  const i = new uu(t === "||" || t === "&&" ? d8e : l8e);
   return i.operator = t, i.left = e, i.right = r, i;
 }
 function j8e(t, e) {
-  const r = new ou(c8e);
+  const r = new uu(c8e);
   return r.callee = t, r.arguments = e, r;
 }
 function U8e(t, e, r) {
-  const i = new ou(f8e);
+  const i = new uu(f8e);
   return i.test = t, i.consequent = e, i.alternate = r, i;
 }
 function XI(t) {
-  const e = new ou(Oie);
+  const e = new uu(Oie);
   return e.name = t, e;
 }
 function Um(t) {
-  const e = new ou(x8e);
+  const e = new uu(x8e);
   return e.value = t.value, e.raw = Ye.slice(t.start, t.end), t.regex && (e.raw === "//" && (e.raw = "/(?:)/"), e.regex = t.regex), e;
 }
 function QH(t, e, r) {
-  const i = new ou(h8e);
+  const i = new uu(h8e);
   return i.computed = t === "[", i.object = e, i.property = r, i.computed || (r.member = !0), i;
 }
 function q8e(t) {
-  const e = new ou(p8e);
+  const e = new uu(p8e);
   return e.properties = t, e;
 }
 function zH(t, e, r) {
-  const i = new ou(m8e);
+  const i = new uu(m8e);
   return i.key = e, i.value = r, i.kind = t, i;
 }
 function H8e(t, e) {
-  const r = new ou(g8e);
+  const r = new uu(g8e);
   return r.operator = t, r.argument = e, r.prefix = !0, r;
 }
 function $t(t, e) {
@@ -79088,9 +79088,9 @@ pa[dFe] = "String";
 pa[hFe] = "RegularExpression";
 const YH = Symbol("vega_selection_getter");
 function kie(t) {
-  return (!t.getter || !t.getter[YH]) && (t.getter = Wo(t.field), t.getter[YH] = !0), t.getter;
+  return (!t.getter || !t.getter[YH]) && (t.getter = Vo(t.field), t.getter[YH] = !0), t.getter;
 }
-const e$ = "intersect", KH = "union", pFe = "vlMulti", mFe = "vlPoint", JH = "or", gFe = "and", Nu = "_vgsid_", Hg = Wo(Nu), yFe = "E", EFe = "R", AFe = "R-E", _Fe = "R-LE", vFe = "R-RE", CFe = "E-LT", SFe = "E-LTE", bFe = "E-GT", TFe = "E-GTE", RFe = "E-VALID", DFe = "E-ONE", OC = "index:unit";
+const e$ = "intersect", KH = "union", pFe = "vlMulti", mFe = "vlPoint", JH = "or", gFe = "and", Nu = "_vgsid_", Hg = Vo(Nu), yFe = "E", EFe = "R", AFe = "R-E", _Fe = "R-LE", vFe = "R-RE", CFe = "E-LT", SFe = "E-LTE", bFe = "E-GT", TFe = "E-GTE", RFe = "E-VALID", DFe = "E-ONE", OC = "index:unit";
 function XH(t, e) {
   for (var r = e.fields, i = e.values, s = r.length, o = 0, u, a; o < s; ++o)
     if (a = r[o], u = kie(a)(t), Df(u) && (u = mi(u)), Df(i[o]) && (i[o] = mi(i[o])), be(i[o]) && Df(i[o][0]) && (i[o] = i[o].map(mi)), a.type === yFe) {
@@ -79204,7 +79204,7 @@ function kFe(t, e, r) {
 }
 function PFe(t, e) {
   const r = this.context.dataflow, i = this.context.data[t], s = i.input;
-  return r.pulse(s, r.changeset().remove(Vo).insert(e)), 1;
+  return r.pulse(s, r.changeset().remove(Yo).insert(e)), 1;
 }
 function MFe(t, e, r) {
   if (t) {
@@ -79359,7 +79359,7 @@ function lNe(t, e, r, i, s, o) {
     return 0;
   if ((!f || f.stamp < c) && (a.changes = f = u.changeset(), f.stamp = c, u.runAfter(() => {
     a.modified = !0, u.pulse(l, f).run();
-  }, !0, 1)), r && (x = r === !0 ? Vo : be(r) || S9(r) ? r : eQ(r), f.remove(x)), e && f.insert(e), i && (x = eQ(i), l.value.some(x) ? f.remove(x) : f.insert(i)), s)
+  }, !0, 1)), r && (x = r === !0 ? Yo : be(r) || S9(r) ? r : eQ(r), f.remove(x)), e && f.insert(e), i && (x = eQ(i), l.value.some(x) ? f.remove(x) : f.insert(i)), s)
     for (h in o)
       f.modify(s, h, o[h]);
   return 1;
@@ -79374,7 +79374,7 @@ function fNe(t) {
 }
 const tQ = {};
 function xNe(t, e) {
-  const r = tQ[e] || (tQ[e] = Wo(e));
+  const r = tQ[e] || (tQ[e] = Vo(e));
   return be(t) ? t.map(r) : r(t);
 }
 function Cb(t) {
@@ -79857,7 +79857,7 @@ function t9e(t, e) {
 function n9e(t, e) {
   if (!t.$field) return null;
   const r = "f:" + t.$field + "_" + t.$name;
-  return e.fn[r] || (e.fn[r] = Wo(t.$field, t.$name, e.expr.codegen));
+  return e.fn[r] || (e.fn[r] = Vo(t.$field, t.$name, e.expr.codegen));
 }
 function r9e(t, e) {
   const r = "c:" + t.$compare + "_" + t.$order, i = je(t.$compare).map((s) => s && s.$tupleid ? nt : s);
@@ -79918,7 +79918,7 @@ function x9e(t) {
   Object.keys(s || {}).forEach((o) => {
     r.update(e.signals[o], s[o], c9e);
   }), Object.keys(i || {}).forEach((o) => {
-    r.pulse(e.data[o].input, r.changeset().remove(Vo).insert(i[o]));
+    r.pulse(e.data[o].input, r.changeset().remove(Yo).insert(i[o]));
   }), (t.subcontext || []).forEach((o, u) => {
     const a = e.subcontext[u];
     a && a.setState(o);
@@ -80048,7 +80048,7 @@ function wC(t, e) {
   return rt(r, e) || Se("Unrecognized data set: " + e), r[e];
 }
 function g9e(t, e) {
-  return arguments.length < 2 ? wC(this, t).values.value : Sb.call(this, t, Ip().remove(Vo).insert(e));
+  return arguments.length < 2 ? wC(this, t).values.value : Sb.call(this, t, Ip().remove(Yo).insert(e));
 }
 function Sb(t, e) {
   AZ(e) || Se("Second argument to changes must be a changeset.");
@@ -80984,7 +80984,7 @@ function H_(t) {
   }
   return !1;
 }
-function Oo(t, e) {
+function wo(t, e) {
   return t ?? e;
 }
 function If(t) {
@@ -81066,7 +81066,7 @@ function uIe(t, e) {
   let i = t.update;
   t.init && (i ? Se("Signals can not include both init and update expressions.") : (i = t.init, r.initonly = !0)), i && (i = Zu(i, e), r.update = i.$expr, r.params = i.$params), t.on && t.on.forEach((s) => iIe(s, e, r.id));
 }
-const Kt = (t) => (e, r, i) => Rb(t, r, e || void 0, i), vse = Kt("aggregate"), aIe = Kt("axisticks"), Cse = Kt("bound"), uu = Kt("collect"), yQ = Kt("compare"), lIe = Kt("datajoin"), Sse = Kt("encode"), cIe = Kt("expression"), fIe = Kt("facet"), xIe = Kt("field"), dIe = Kt("key"), hIe = Kt("legendentries"), pIe = Kt("load"), mIe = Kt("mark"), gIe = Kt("multiextent"), yIe = Kt("multivalues"), EIe = Kt("overlap"), AIe = Kt("params"), bse = Kt("prefacet"), _Ie = Kt("projection"), vIe = Kt("proxy"), CIe = Kt("relay"), Tse = Kt("render"), SIe = Kt("scale"), jx = Kt("sieve"), bIe = Kt("sortitems"), Rse = Kt("viewlayout"), TIe = Kt("values");
+const Kt = (t) => (e, r, i) => Rb(t, r, e || void 0, i), vse = Kt("aggregate"), aIe = Kt("axisticks"), Cse = Kt("bound"), au = Kt("collect"), yQ = Kt("compare"), lIe = Kt("datajoin"), Sse = Kt("encode"), cIe = Kt("expression"), fIe = Kt("facet"), xIe = Kt("field"), dIe = Kt("key"), hIe = Kt("legendentries"), pIe = Kt("load"), mIe = Kt("mark"), gIe = Kt("multiextent"), yIe = Kt("multivalues"), EIe = Kt("overlap"), AIe = Kt("params"), bse = Kt("prefacet"), _Ie = Kt("projection"), vIe = Kt("proxy"), CIe = Kt("relay"), Tse = Kt("render"), SIe = Kt("scale"), jx = Kt("sieve"), bIe = Kt("sortitems"), Rse = Kt("viewlayout"), TIe = Kt("values");
 let RIe = 0;
 const Dse = {
   min: "min",
@@ -81118,7 +81118,7 @@ function NIe(t, e, r) {
   return (Fh(e.type) ? IIe : Ote(e.type) ? $Ie : BIe)(t, r, s);
 }
 function LIe(t, e) {
-  const r = "_:vega:_" + RIe++, i = uu({});
+  const r = "_:vega:_" + RIe++, i = au({});
   if (be(t))
     i.value = {
       $ingest: t
@@ -81143,7 +81143,7 @@ function IIe(t, e, r) {
     pulse: u
   };
   i && (s = i.op || "count", o = i.field ? Db(s, i.field) : "count", a.ops = [Dse[s]], a.fields = [e.fieldRef(o)], a.as = [o]), s = e.add(vse(a));
-  const l = e.add(uu({
+  const l = e.add(au({
     pulse: et(s)
   }));
   return o = e.add(TIe({
@@ -81228,7 +81228,7 @@ function jIe(t, e) {
 function C8(t, e, r) {
   return be(t) ? t.map((i) => C8(i, e, r)) : Ge(t) ? t.signal ? r.signalRef(t.signal) : e === "fit" ? t : Se("Unsupported parameter object: " + $e(t)) : t;
 }
-const au = "top", Up = "left", qp = "right", G0 = "bottom", Nse = "center", UIe = "vertical", qIe = "start", HIe = "middle", QIe = "end", S8 = "index", m$ = "label", zIe = "offset", jh = "perc", GIe = "perc2", to = "value", ly = "guide-label", g$ = "guide-title", WIe = "group-title", VIe = "group-subtitle", EQ = "symbol", z_ = "gradient", b8 = "discrete", T8 = "size", YIe = "shape", KIe = "fill", JIe = "stroke", XIe = "strokeWidth", ZIe = "strokeDash", e$e = "opacity", y$ = [T8, YIe, KIe, JIe, XIe, ZIe, e$e], cy = {
+const lu = "top", Up = "left", qp = "right", G0 = "bottom", Nse = "center", UIe = "vertical", qIe = "start", HIe = "middle", QIe = "end", S8 = "index", m$ = "label", zIe = "offset", jh = "perc", GIe = "perc2", to = "value", ly = "guide-label", g$ = "guide-title", WIe = "group-title", VIe = "group-subtitle", EQ = "symbol", z_ = "gradient", b8 = "discrete", T8 = "size", YIe = "shape", KIe = "fill", JIe = "stroke", XIe = "strokeWidth", ZIe = "strokeDash", e$e = "opacity", y$ = [T8, YIe, KIe, JIe, XIe, ZIe, e$e], cy = {
   name: 1,
   style: 1,
   interactive: 1
@@ -81241,8 +81241,8 @@ function Wg(t) {
   return t.type = wb, t.interactive = t.interactive || !1, t;
 }
 function ss(t, e) {
-  const r = (i, s) => Oo(t[i], Oo(e[i], s));
-  return r.isVertical = (i) => UIe === Oo(t.direction, e.direction || (i ? e.symbolDirection : e.gradientDirection)), r.gradientLength = () => Oo(t.gradientLength, e.gradientLength || e.gradientWidth), r.gradientThickness = () => Oo(t.gradientThickness, e.gradientThickness || e.gradientHeight), r.entryColumns = () => Oo(t.columns, Oo(e.columns, +r.isVertical(!0))), r;
+  const r = (i, s) => wo(t[i], wo(e[i], s));
+  return r.isVertical = (i) => UIe === wo(t.direction, e.direction || (i ? e.symbolDirection : e.gradientDirection)), r.gradientLength = () => wo(t.gradientLength, e.gradientLength || e.gradientWidth), r.gradientThickness = () => wo(t.gradientThickness, e.gradientThickness || e.gradientHeight), r.entryColumns = () => wo(t.columns, wo(e.columns, +r.isVertical(!0))), r;
 }
 function Ise(t, e) {
   const r = e && (e.update && e.update[t] || e.enter && e.enter[t]);
@@ -81359,7 +81359,7 @@ function s$e(t, e, r, i, s) {
     encode: g
   }, i);
 }
-const o$e = `datum.${jh}<=0?"${Up}":datum.${jh}>=1?"${qp}":"${Nse}"`, u$e = `datum.${jh}<=0?"${G0}":datum.${jh}>=1?"${au}":"${HIe}"`;
+const o$e = `datum.${jh}<=0?"${Up}":datum.${jh}>=1?"${qp}":"${Nse}"`, u$e = `datum.${jh}<=0?"${G0}":datum.${jh}>=1?"${lu}":"${HIe}"`;
 function AQ(t, e, r, i) {
   const s = ss(t, e), o = s.isVertical(), u = fr(s.gradientThickness()), a = s.gradientLength();
   let l = s("labelOverlap"), c, f, x, h, p = "";
@@ -81384,7 +81384,7 @@ function AQ(t, e, r, i) {
     fontSize: s("labelFontSize"),
     fontStyle: s("labelFontStyle"),
     fontWeight: s("labelFontWeight"),
-    limit: Oo(t.labelLimit, e.gradientLabelLimit)
+    limit: wo(t.labelLimit, e.gradientLabelLimit)
   }), o ? (c.align = {
     value: "left"
   }, c.baseline = f.baseline = {
@@ -81396,7 +81396,7 @@ function AQ(t, e, r, i) {
   }, x = "x", h = "y"), c[x] = f[x] = {
     signal: p + "datum." + jh,
     mult: a
-  }, c[h] = f[h] = u, u.offset = Oo(t.labelOffset, e.gradientLabelOffset) || 0, l = l ? {
+  }, c[h] = f[h] = u, u.offset = wo(t.labelOffset, e.gradientLabelOffset) || 0, l = l ? {
     separation: s("labelSeparation"),
     method: l,
     order: "datum." + S8
@@ -81708,7 +81708,7 @@ function R$e(t, e, r) {
   return t ? (i = t.facet) && (e || Se("Only group marks can be faceted."), i.field != null ? u = a = G_(i, r) : (t.data ? a = et(r.getData(t.data).aggregate) : (o = C$(gt({
     type: "aggregate",
     groupby: je(i.groupby)
-  }, i.aggregate), r), o.params.key = r.keyRef(i.groupby), o.params.pulse = G_(i, r), u = a = et(r.add(o))), s = r.keyRef(i.groupby, !0))) : u = et(r.add(uu(null, [{}]))), u || (u = G_(t, r)), {
+  }, i.aggregate), r), o.params.key = r.keyRef(i.groupby), o.params.pulse = G_(i, r), u = a = et(r.add(o))), s = r.keyRef(i.groupby, !0))) : u = et(r.add(au(null, [{}]))), u || (u = G_(t, r)), {
     key: s,
     pulse: u,
     parent: a
@@ -81762,7 +81762,7 @@ ex.prototype = {
     return o != null && (t = i.scope, u = s[o]), u ? r && r.field && TQ(t, u.agg.params, r) : (l = {
       groupby: t.fieldRef(e, "key"),
       pulse: et(i.output)
-    }, r && r.field && TQ(t, l, r), a = t.add(vse(l)), u = t.add(uu({
+    }, r && r.field && TQ(t, l, r), a = t.add(vse(l)), u = t.add(au({
       pulse: et(a)
     })), u = {
       agg: a,
@@ -81799,7 +81799,7 @@ function D$e(t, e, r) {
     group: et(e.proxy(r.parent)),
     pulse: o
   })) : Se("Facet must specify groupby or field: " + $e(i));
-  const a = e.fork(), l = a.add(uu()), c = a.add(jx({
+  const a = e.fork(), l = a.add(au()), c = a.add(jx({
     pulse: et(l)
   }));
   a.addData(s, new ex(a, l, l, c)), a.addSignal("parent", null), u.params.subflow = {
@@ -81828,7 +81828,7 @@ function Lb(t, e) {
     clean: !i
   }));
   const y = et(l);
-  l = c = e.add(uu({
+  l = c = e.add(au({
     pulse: y
   })), l = e.add(mIe({
     markdef: E$e(t),
@@ -81897,7 +81897,7 @@ function F$e(t, e) {
     scales: c,
     type: m,
     vgrad: m !== "symbol" && s.isVertical()
-  }, y = et(e.add(uu(null, [g]))), A = {
+  }, y = et(e.add(au(null, [g]))), A = {
     enter: {
       x: {
         value: 0
@@ -81980,7 +81980,7 @@ function P$e(t, e) {
   t = ze(t) ? {
     text: t
   } : t;
-  const r = ss(t, e.config.title), i = t.encode || {}, s = i.group || {}, o = s.name || void 0, u = s.interactive, a = s.style, l = [], c = {}, f = et(e.add(uu(null, [c])));
+  const r = ss(t, e.config.title), i = t.encode || {}, s = i.group || {}, o = s.name || void 0, u = s.interactive, a = s.style, l = [], c = {}, f = et(e.add(au(null, [c])));
   return l.push(U$e(t, r, M$e(t), f)), t.subtitle && l.push(q$e(t, r, i.subtitle, f)), Lb(Wg({
     role: ILe,
     from: f,
@@ -82145,7 +82145,7 @@ function Q$e(t, e, r) {
   }), (o || c) && i.splice(1, 0, Xc())), s || i.push(Xc()), i.push(jx({})), i;
 }
 function Xc(t) {
-  const e = uu({}, t);
+  const e = au({}, t);
   return e.metadata = {
     source: !0
   }, e;
@@ -82158,7 +82158,7 @@ function DQ(t, e) {
     format: t.objectProperty(e.format)
   });
 }
-const jse = (t) => t === G0 || t === au, Ib = (t, e, r) => Yn(t) ? V$e(t.signal, e, r) : t === Up || t === au ? e : r, xr = (t, e, r) => Yn(t) ? G$e(t.signal, e, r) : jse(t) ? e : r, jo = (t, e, r) => Yn(t) ? W$e(t.signal, e, r) : jse(t) ? r : e, Use = (t, e, r) => Yn(t) ? Y$e(t.signal, e, r) : t === au ? {
+const jse = (t) => t === G0 || t === lu, Ib = (t, e, r) => Yn(t) ? V$e(t.signal, e, r) : t === Up || t === lu ? e : r, xr = (t, e, r) => Yn(t) ? G$e(t.signal, e, r) : jse(t) ? e : r, Uo = (t, e, r) => Yn(t) ? W$e(t.signal, e, r) : jse(t) ? r : e, Use = (t, e, r) => Yn(t) ? Y$e(t.signal, e, r) : t === lu ? {
   value: e
 } : {
   value: r
@@ -82166,14 +82166,14 @@ const jse = (t) => t === G0 || t === au, Ib = (t, e, r) => Yn(t) ? V$e(t.signal,
   value: e
 } : {
   value: r
-}, G$e = (t, e, r) => qse(`${t} === '${au}' || ${t} === '${G0}'`, e, r), W$e = (t, e, r) => qse(`${t} !== '${au}' && ${t} !== '${G0}'`, e, r), V$e = (t, e, r) => S$(`${t} === '${Up}' || ${t} === '${au}'`, e, r), Y$e = (t, e, r) => S$(`${t} === '${au}'`, e, r), K$e = (t, e, r) => S$(`${t} === '${qp}'`, e, r), qse = (t, e, r) => (e = e != null ? fr(e) : e, r = r != null ? fr(r) : r, OQ(e) && OQ(r) ? (e = e ? e.signal || $e(e.value) : null, r = r ? r.signal || $e(r.value) : null, {
+}, G$e = (t, e, r) => qse(`${t} === '${lu}' || ${t} === '${G0}'`, e, r), W$e = (t, e, r) => qse(`${t} !== '${lu}' && ${t} !== '${G0}'`, e, r), V$e = (t, e, r) => S$(`${t} === '${Up}' || ${t} === '${lu}'`, e, r), Y$e = (t, e, r) => S$(`${t} === '${lu}'`, e, r), K$e = (t, e, r) => S$(`${t} === '${qp}'`, e, r), qse = (t, e, r) => (e = e != null ? fr(e) : e, r = r != null ? fr(r) : r, OQ(e) && OQ(r) ? (e = e ? e.signal || $e(e.value) : null, r = r ? r.signal || $e(r.value) : null, {
   signal: `${t} ? (${e}) : (${r})`
 }) : [gt({
   test: t
 }, e)].concat(r || [])), OQ = (t) => t == null || Object.keys(t).length === 1, S$ = (t, e, r) => ({
   signal: `${t} ? (${Yd(e)}) : (${Yd(r)})`
 }), J$e = (t, e, r, i, s) => ({
-  signal: (i != null ? `${t} === '${Up}' ? (${Yd(i)}) : ` : "") + (r != null ? `${t} === '${G0}' ? (${Yd(r)}) : ` : "") + (s != null ? `${t} === '${qp}' ? (${Yd(s)}) : ` : "") + (e != null ? `${t} === '${au}' ? (${Yd(e)}) : ` : "") + "(null)"
+  signal: (i != null ? `${t} === '${Up}' ? (${Yd(i)}) : ` : "") + (r != null ? `${t} === '${G0}' ? (${Yd(r)}) : ` : "") + (s != null ? `${t} === '${qp}' ? (${Yd(s)}) : ` : "") + (e != null ? `${t} === '${lu}' ? (${Yd(e)}) : ` : "") + "(null)"
 }), Yd = (t) => Yn(t) ? t.signal : t == null ? null : $e(t), X$e = (t, e) => e === 0 ? 0 : Yn(t) ? {
   signal: `(${t.signal}) * ${e}`
 } : {
@@ -82232,7 +82232,7 @@ function Z$e(t, e) {
     for (c of h)
       l[c] = J$e(u.signal, Dd(c, r.axisTop, s, i), Dd(c, r.axisBottom, s, i), Dd(c, r.axisLeft, s, i), Dd(c, r.axisRight, s, i));
   } else
-    a = u === au || u === G0 ? r.axisX : r.axisY, l = r["axis" + u[0].toUpperCase() + u.slice(1)];
+    a = u === lu || u === G0 ? r.axisX : r.axisY, l = r["axis" + u[0].toUpperCase() + u.slice(1)];
   return a || l || o ? gt({}, s, a, l, o) : s;
 }
 function eBe(t, e, r, i) {
@@ -82258,7 +82258,7 @@ function eBe(t, e, r, i) {
     strokeOpacity: s("domainOpacity")
   });
   const c = FQ(t, 0), f = FQ(t, 1);
-  return u.x = a.x = xr(o, c, Ot), u.x2 = a.x2 = xr(o, f), u.y = a.y = jo(o, c, Ot), u.y2 = a.y2 = jo(o, f), Rs({
+  return u.x = a.x = xr(o, c, Ot), u.x2 = a.x2 = xr(o, f), u.y = a.y = Uo(o, c, Ot), u.y2 = a.y2 = Uo(o, f), Rs({
     type: E$,
     role: CLe,
     from: i,
@@ -82321,7 +82321,7 @@ function tBe(t, e, r, i, s) {
     mult: l,
     offset: c
   });
-  return f.x = h.x = xr(u, m, y), f.y = h.y = jo(u, m, y), f.x2 = h.x2 = jo(u, A), f.y2 = h.y2 = xr(u, A), x.x = xr(u, m), x.y = jo(u, m), Rs({
+  return f.x = h.x = xr(u, m, y), f.y = h.y = Uo(u, m, y), f.x2 = h.x2 = Uo(u, A), f.y2 = h.y2 = xr(u, A), x.x = xr(u, m), x.y = Uo(u, m), Rs({
     type: E$,
     role: SLe,
     key: to,
@@ -82379,7 +82379,7 @@ function rBe(t, e, r, i, s, o) {
     offset: o.offset,
     round: u("tickRound")
   };
-  return x.y = c.y = xr(a, Ot, m), x.y2 = c.y2 = xr(a, p), f.x = xr(a, m), x.x = c.x = jo(a, Ot, m), x.x2 = c.x2 = jo(a, p), f.y = jo(a, m), Rs({
+  return x.y = c.y = xr(a, Ot, m), x.y2 = c.y2 = xr(a, p), f.x = xr(a, m), x.x = c.x = Uo(a, Ot, m), x.x2 = c.x2 = Uo(a, p), f.y = Uo(a, m), Rs({
     type: E$,
     role: TLe,
     key: to,
@@ -82411,7 +82411,7 @@ function iBe(t, e, r, i, s, o) {
   const C = {
     opacity: Ot,
     x: xr(a, A, y),
-    y: jo(a, A, y)
+    y: Uo(a, A, y)
   }, b = {
     enter: C,
     update: g = {
@@ -82432,7 +82432,7 @@ function iBe(t, e, r, i, s, o) {
   };
   Or(b, {
     dx: !h && m ? xr(a, v) : null,
-    dy: !p && m ? jo(a, v) : null
+    dy: !p && m ? Uo(a, v) : null
   }), Or(b, {
     angle: u("labelAngle"),
     fill: u("labelColor"),
@@ -82489,7 +82489,7 @@ function sBe(t, e, r, i) {
   }, f = {
     signal: `lerp(range("${t.scale}"), ${Fb(0, 1, 0.5)})`
   };
-  return l.x = xr(o, f), l.y = jo(o, f), a.angle = xr(o, Ot, X$e(u, 90)), a.baseline = xr(o, Use(o, G0, au), {
+  return l.x = xr(o, f), l.y = Uo(o, f), a.angle = xr(o, Ot, X$e(u, 90)), a.baseline = xr(o, Use(o, G0, lu), {
     value: G0
   }), l.angle = a.angle, l.baseline = a.baseline, Or(c, {
     fill: s("titleColor"),
@@ -82525,7 +82525,7 @@ function uBe(t, e) {
     grid: !!l("grid"),
     domain: !!l("domain"),
     title: t.title != null
-  }, x = et(e.add(uu({}, [f]))), h = et(e.add(aIe({
+  }, x = et(e.add(au({}, [f]))), h = et(e.add(aIe({
     scale: e.scaleRef(t.scale),
     extra: e.property(c.extra),
     count: e.objectProperty(t.tickCount),
@@ -82556,7 +82556,7 @@ function aBe(t, e) {
   return Or(r, {
     orient: t("orient"),
     offset: t("offset") || 0,
-    position: Oo(e.position, 0),
+    position: wo(e.position, 0),
     titlePadding: t("titlePadding"),
     minExtent: t("minExtent"),
     maxExtent: t("maxExtent"),
@@ -82594,7 +82594,7 @@ const lBe = (t) => jp({
 function cBe(t, e) {
   const r = e.config, i = et(e.root = e.add(IC())), s = fBe(t, r);
   s.forEach((c) => _se(c, e)), e.description = t.description || r.description, e.eventConfig = r.events, e.legends = e.objectProperty(r.legend && r.legend.layout), e.locale = r.locale;
-  const o = e.add(uu()), u = e.add(Sse(Ase(lBe(t.encode), wb, x$, t.style, e, {
+  const o = e.add(au()), u = e.add(Sse(Ase(lBe(t.encode), wb, x$, t.style, e, {
     pulse: et(o)
   }))), a = e.add(Rse({
     layout: e.objectProperty(t.layout),
@@ -82624,7 +82624,7 @@ function c1(t, e) {
   };
 }
 function fBe(t, e) {
-  const r = (u) => Oo(t[u], e[u]), i = [c1("background", r("background")), c1("autosize", ELe(r("autosize"))), c1("padding", _Le(r("padding"))), c1("width", r("width") || 0), c1("height", r("height") || 0)], s = i.reduce((u, a) => (u[a.name] = a, u), {}), o = {};
+  const r = (u) => wo(t[u], e[u]), i = [c1("background", r("background")), c1("autosize", ELe(r("autosize"))), c1("padding", _Le(r("padding"))), c1("width", r("width") || 0), c1("height", r("height") || 0)], s = i.reduce((u, a) => (u[a.name] = a, u), {}), o = {};
   return je(t.signals).forEach((u) => {
     rt(s, u.name) ? u = gt(s[u.name], u) : i.push(u), o[u.name] = u;
   }), je(e.signals).forEach((u) => {
@@ -83238,7 +83238,7 @@ function pr(t) {
 function Ds(t) {
   return wBe.has(t);
 }
-function Po(t) {
+function Mo(t) {
   return Wse.has(t);
 }
 function qh(t) {
@@ -83316,11 +83316,11 @@ function D8(t, e) {
     case "bins":
       return !["point", "band", "identity", "ordinal"].includes(t);
     case "round":
-      return Po(t) || t === "band" || t === "point";
+      return Mo(t) || t === "band" || t === "point";
     case "padding":
     case "rangeMin":
     case "rangeMax":
-      return Po(t) || ["point", "band"].includes(t);
+      return Mo(t) || ["point", "band"].includes(t);
     case "paddingOuter":
     case "align":
       return ["point", "band"].includes(t);
@@ -83330,9 +83330,9 @@ function D8(t, e) {
     case "domainMid":
     case "domainMin":
     case "clamp":
-      return Po(t);
+      return Mo(t);
     case "nice":
-      return Po(t) || t === "quantize" || t === "threshold";
+      return Mo(t) || t === "quantize" || t === "threshold";
     case "exponent":
       return t === "pow";
     case "base":
@@ -83390,16 +83390,16 @@ function jBe(t, e, r = !1) {
     case hr:
     case ac:
     case Op:
-    case iu:
+    case su:
     case sa:
-      return Po(e) || e === "band" ? !0 : e === "point" ? !r : !1;
+      return Mo(e) || e === "band" ? !0 : e === "point" ? !r : !1;
     case Il:
     case fc:
     case $l:
     case lc:
     case cc:
     case Ox:
-      return Po(e) || qh(e) || Nt(["band", "point", "ordinal"], e);
+      return Mo(e) || qh(e) || Nt(["band", "point", "ordinal"], e);
     case es:
     case aa:
     case la:
@@ -83510,7 +83510,7 @@ function F$(t) {
   return (
     // Only this for field def without counting aggregate (as count wouldn't be null)
     Be(r) && !iX(r.aggregate) && // and only for continuous scale
-    s && Po(s.get("type")) ? rke({
+    s && Mo(s.get("type")) ? rke({
       fieldDef: r,
       channel: e,
       markDef: i,
@@ -83587,7 +83587,7 @@ function L$({ channel: t, channelDef: e, channel2Def: r, markDef: i, config: s,
               bandPosition: f,
               offset: l
             });
-          De(EX(t === Sn ? ru : ia));
+          De(EX(t === Sn ? iu : ia));
         }
       }
       return $f(
@@ -83601,7 +83601,7 @@ function L$({ channel: t, channelDef: e, channel2Def: r, markDef: i, config: s,
           band: h === "band" ? (x = f ?? e.bandPosition) !== null && x !== void 0 ? x : 0.5 : void 0
         }
       );
-    } else if (Jo(e)) {
+    } else if (Xo(e)) {
       const h = e.value, p = l ? { offset: l } : {};
       return Object.assign(Object.assign({}, pg(t, h)), p);
     }
@@ -83798,7 +83798,7 @@ function dy(t) {
 }
 function xke(t) {
   const e = t && t.condition;
-  return !!e && (be(e) || Jo(e));
+  return !!e && (be(e) || Xo(e));
 }
 function Be(t) {
   return t && (!!t.field || t.aggregate === "count");
@@ -83821,7 +83821,7 @@ function ft(t) {
 function fo(t) {
   return t && ("field" in t || t.aggregate === "count") && "type" in t;
 }
-function Jo(t) {
+function Xo(t) {
   return t && "value" in t && "value" in t;
 }
 function qx(t) {
@@ -83860,7 +83860,7 @@ function Pe(t, e = {}) {
       }
     c && (o = o ? `${c}_${o}` : c);
   }
-  return a && (o = `${o}_${a}`), u && (o = `${u}_${o}`), e.forAs ? GJ(o) : e.expr ? Pge(o, e.expr) + l : Yo(o) + l;
+  return a && (o = `${o}_${a}`), u && (o = `${u}_${o}`), e.forAs ? GJ(o) : e.expr ? Pge(o, e.expr) + l : Ko(o) + l;
 }
 function kC(t) {
   switch (t.type) {
@@ -84094,14 +84094,14 @@ function vke(t, e) {
     case R5:
     case D5:
     case Ox:
-    case iu:
+    case su:
     case sa:
     case O5:
       return Od;
     case ua:
     case oo:
     case oa:
-    case su:
+    case ou:
       return r !== tx ? {
         compatible: !1,
         warning: `Channel ${e} should be used with a quantitative field only, not ${t.type} field.`
@@ -84113,7 +84113,7 @@ function vke(t, e) {
     case Il:
     case Ll:
     case Nl:
-    case ru:
+    case iu:
     case ia:
       return r === "nominal" && !t.sort ? {
         compatible: !1,
@@ -84531,7 +84531,7 @@ function Dke(t, e, r) {
   const i = o3e(e, r);
   if (i) {
     if (i === "binned") {
-      const s = t[e === ru ? Sn : hr];
+      const s = t[e === iu ? Sn : hr];
       return !!(Be(s) && Be(t[e]) && ci(s.bin));
     }
   } else return !1;
@@ -84555,7 +84555,7 @@ function Oke(t, e, r, i) {
       } else
         o = a, De(q3e(a));
     }
-    if (o === "angle" && e === "arc" && !t.theta && (De(j3e), o = iu), !Dke(t, o, e)) {
+    if (o === "angle" && e === "arc" && !t.theta && (De(j3e), o = su), !Dke(t, o, e)) {
       De(L5(o, e));
       continue;
     }
@@ -84570,12 +84570,12 @@ function Oke(t, e, r, i) {
       De(mX("encoding", { fill: "fill" in t, stroke: "stroke" in t }));
       continue;
     }
-    if (o === B3 || o === $3 && !be(u) && !Jo(u) || o === Uf && be(u))
+    if (o === B3 || o === $3 && !be(u) && !Xo(u) || o === Uf && be(u))
       u && (s[o] = je(u).reduce((a, l) => (Be(l) ? a.push(U$(l, o)) : De(z7(l, o)), a), []));
     else {
       if (o === Uf && u === null)
         s[o] = null;
-      else if (!Be(u) && !ya(u) && !Jo(u) && !qb(u) && !Ze(u)) {
+      else if (!Be(u) && !ya(u) && !Xo(u) && !qb(u) && !Ze(u)) {
         De(z7(u, o));
         continue;
       }
@@ -84627,17 +84627,17 @@ function Roe(t, e) {
       case R5:
       case O5:
       case D5:
-      case ru:
+      case iu:
       case ia:
       case ac:
       case Op:
-      case iu:
+      case su:
       case Ll:
       case sa:
       case Nl:
       case oa:
       case ua:
-      case su:
+      case ou:
       case oo:
       case I3:
       case ts:
@@ -86204,7 +86204,7 @@ function KQ({ parentEncoding: t, encoding: e = {}, layer: r }) {
       if (ft(u)) {
         const l = Object.assign(Object.assign({}, a), u);
         i[o] = l;
-      } else dy(u) ? i[o] = Object.assign(Object.assign({}, u), { condition: Object.assign(Object.assign({}, a), u.condition) }) : u || u === null ? i[o] = u : (r || Jo(a) || Ze(a) || ft(a) || be(a)) && (i[o] = a);
+      } else dy(u) ? i[o] = Object.assign(Object.assign({}, u), { condition: Object.assign(Object.assign({}, a), u.condition) }) : u || u === null ? i[o] = u : (r || Xo(a) || Ze(a) || ft(a) || be(a)) && (i[o] = a);
     }
   } else
     i = e;
@@ -86825,7 +86825,7 @@ class Uu extends Jt {
     const e = [];
     for (const r of Ei(this.formula)) {
       const { field: i, as: s, timeUnit: o } = r, u = Ri(o), { unit: a, utc: l } = u, c = tz(u, ["unit", "utc"]);
-      e.push(Object.assign(Object.assign(Object.assign(Object.assign({ field: Yo(i), type: "timeunit" }, a ? { units: o9(a) } : {}), l ? { timezone: "utc" } : {}), c), { as: [s, `${s}_end`] }));
+      e.push(Object.assign(Object.assign(Object.assign(Object.assign({ field: Ko(i), type: "timeunit" }, a ? { units: o9(a) } : {}), l ? { timezone: "utc" } : {}), c), { as: [s, `${s}_end`] }));
     }
     return e;
   }
@@ -86909,7 +86909,7 @@ const yMe = {
       name: i,
       value: e.project.items.map((o) => {
         const u = mMe(o, ["signals", "hasLegend"]);
-        return u.field = Yo(u.field), u;
+        return u.field = Ko(u.field), u;
       })
     });
   }
@@ -86936,10 +86936,10 @@ const yMe = {
     const s = r.filter((u) => u.name === e.name)[0];
     let o = s.update;
     if (o.indexOf(vue) >= 0)
-      s.update = `{${i.map((u) => `${$e(Yo(u.field))}: ${u.signals.data}`).join(", ")}}`;
+      s.update = `{${i.map((u) => `${$e(Ko(u.field))}: ${u.signals.data}`).join(", ")}}`;
     else {
       for (const u of i) {
-        const a = `${$e(Yo(u.field))}: ${u.signals.data}`;
+        const a = `${$e(Ko(u.field))}: ${u.signals.data}`;
         o.includes(a) || (o = `${o.substring(0, o.length - 1)}, ${a}}`);
       }
       s.update = o;
@@ -87132,7 +87132,7 @@ function rB(t, e = "text") {
 }
 function Jb(t, e, r = "datum") {
   if (t) {
-    if (Jo(t))
+    if (Xo(t))
       return cn(t.value);
     if (ft(t)) {
       const { format: i, formatType: s } = PC(t);
@@ -87271,7 +87271,7 @@ function fue(t, e = { filled: void 0 }) {
 }
 function TMe(t) {
   const { encoding: e, mark: r } = t, i = e.order;
-  return !vc(r) && Jo(i) ? zp(t, i, "zindex", (s) => cn(s.value)) : {};
+  return !vc(r) && Xo(i) ? zp(t, i, "zindex", (s) => cn(s.value)) : {};
 }
 function Kg({ channel: t, markDef: e, encoding: r = {}, model: i, bandPosition: s }) {
   const o = `${t}Offset`, u = e[o], a = r[o];
@@ -87899,7 +87899,7 @@ const rx = "_store", K0 = "_tuple", HMe = "_modify", vue = "vlSelectionResolve",
 ];
 function QMe(t) {
   let e = t.parent;
-  for (; e && !qo(e); )
+  for (; e && !Ho(e); )
     e = e.parent;
   return e;
 }
@@ -87921,10 +87921,10 @@ function Cue(t, e) {
   (ze(e.select) || !e.select.on) && delete t.events, (ze(e.select) || !e.select.clear) && delete t.clear, (ze(e.select) || !e.select.toggle) && delete t.toggle;
 }
 const zMe = "RawCode", GMe = "Literal", WMe = "Property", VMe = "Identifier", YMe = "ArrayExpression", KMe = "BinaryExpression", JMe = "CallExpression", XMe = "ConditionalExpression", ZMe = "LogicalExpression", eje = "MemberExpression", tje = "ObjectExpression", nje = "UnaryExpression";
-function lu(t) {
+function cu(t) {
   this.type = t;
 }
-lu.prototype.visit = function(t) {
+cu.prototype.visit = function(t) {
   let e, r, i;
   if (t(this)) return 1;
   for (e = rje(this), r = 0, i = e.length; r < i; ++r)
@@ -88361,43 +88361,43 @@ function Oue() {
   Wt = Due(), Ce = t;
 }
 function Bje(t) {
-  const e = new lu(sje);
+  const e = new cu(sje);
   return e.elements = t, e;
 }
 function lz(t, e, r) {
-  const i = new lu(t === "||" || t === "&&" ? cje : oje);
+  const i = new cu(t === "||" || t === "&&" ? cje : oje);
   return i.operator = t, i.left = e, i.right = r, i;
 }
 function kje(t, e) {
-  const r = new lu(uje);
+  const r = new cu(uje);
   return r.callee = t, r.arguments = e, r;
 }
 function Pje(t, e, r) {
-  const i = new lu(aje);
+  const i = new cu(aje);
   return i.test = t, i.consequent = e, i.alternate = r, i;
 }
 function aB(t) {
-  const e = new lu(Sue);
+  const e = new cu(Sue);
   return e.name = t, e;
 }
 function qm(t) {
-  const e = new lu(lje);
+  const e = new cu(lje);
   return e.value = t.value, e.raw = Ke.slice(t.start, t.end), t.regex && (e.raw === "//" && (e.raw = "/(?:)/"), e.regex = t.regex), e;
 }
 function cz(t, e, r) {
-  const i = new lu(fje);
+  const i = new cu(fje);
   return i.computed = t === "[", i.object = e, i.property = r, i.computed || (r.member = !0), i;
 }
 function Mje(t) {
-  const e = new lu(xje);
+  const e = new cu(xje);
   return e.properties = t, e;
 }
 function fz(t, e, r) {
-  const i = new lu(dje);
+  const i = new cu(dje);
   return i.key = e, i.value = r, i.kind = t, i;
 }
 function jje(t, e) {
-  const r = new lu(hje);
+  const r = new cu(hje);
   return r.operator = t, r.argument = e, r.prefix = !0, r;
 }
 function Bt(t, e) {
@@ -88693,7 +88693,7 @@ function Lue(t, e, r) {
     const a = u.project.items.filter((l) => l.channel === s);
     !a.length || a.length > 1 ? (o = u.project.items[0].field, De((a.length ? "Multiple " : "No ") + `matching ${$e(s)} encoding found for selection ${$e(r.param)}. Using "field": ${$e(o)}.`)) : o = a[0].field;
   }
-  return `${u.name}[${$e(Yo(o))}]`;
+  return `${u.name}[${$e(Ko(o))}]`;
 }
 function tUe(t, e) {
   var r;
@@ -89171,7 +89171,7 @@ function yUe(t, e, r, i, s) {
       const { labelOrient: x } = i4(["labelOrient"], u.header, a, e);
       (e === "row" && !Nt(["top", "bottom"], x) || e === "column" && !Nt(["left", "right"], x)) && (o = G8(u, e, a));
     }
-    const l = qo(t) && !xy(t.facet), c = s.axes, f = (c == null ? void 0 : c.length) > 0;
+    const l = Ho(t) && !xy(t.facet), c = s.axes, f = (c == null ? void 0 : c.length) > 0;
     if (o || f) {
       const x = e === "row" ? "height" : "width";
       return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name: t.getName(`${e}_${r}`), type: "group", role: `${e}-${r}` }, i.facetFieldDef ? {
@@ -89243,7 +89243,7 @@ function jA(t, e) {
       const u = o.get("type"), a = o.get("range");
       if (pr(u) && pc(a)) {
         const l = t.scaleName(r);
-        return qo(t.parent) && t.parent.component.resolve.scale[r] === "independent" ? [gz(l, a)] : [
+        return Ho(t.parent) && t.parent.component.resolve.scale[r] === "independent" ? [gz(l, a)] : [
           gz(l, a),
           {
             name: s,
@@ -89290,7 +89290,7 @@ function Hue(t, e) {
   }, {});
 }
 function Que(t, e) {
-  if (qo(e))
+  if (Ho(e))
     return t === "theta" ? "independent" : "shared";
   if (Yp(e))
     return "shared";
@@ -89393,7 +89393,7 @@ function W8(t) {
 function Wue(t, e) {
   if (xke(t))
     return je(t.condition).reduce(e, t.value);
-  if (Jo(t))
+  if (Xo(t))
     return t.value;
 }
 function Vue(t, e, r) {
@@ -89428,7 +89428,7 @@ const Ez = {
   },
   title: ({ fieldOrDatumDef: t, config: e }) => uh(t, e, { allowDisabling: !0 }),
   type: ({ legendType: t, scaleType: e, channel: r }) => {
-    if (nh(r) && Po(e)) {
+    if (nh(r) && Mo(e)) {
       if (t === "gradient")
         return;
     } else if (t === "symbol")
@@ -89479,7 +89479,7 @@ function FUe({ channel: t, timeUnit: e, scaleType: r }) {
   if (nh(t)) {
     if (Nt(["quarter", "month", "day"], e))
       return "symbol";
-    if (Po(r))
+    if (Mo(r))
       return "gradient";
   }
   return "symbol";
@@ -89504,7 +89504,7 @@ function LUe(t, e) {
 }
 function IUe({ legendConfig: t, model: e, direction: r, orient: i, scaleType: s }) {
   const { gradientHorizontalMaxLength: o, gradientHorizontalMinLength: u, gradientVerticalMaxLength: a, gradientVerticalMinLength: l } = t;
-  if (Po(s))
+  if (Mo(s))
     return r === "horizontal" ? i === "top" || i === "bottom" ? Az(e, "width", u, o) : u : Az(e, "height", l, a);
 }
 function Az(t, e, r, i) {
@@ -89757,7 +89757,7 @@ function YUe(t) {
   const e = [], { encoding: r } = t;
   for (const i of [
     [ua, oa],
-    [oo, su]
+    [oo, ou]
   ])
     (Wn(r[i[0]]) || Wn(r[i[1]])) && e.push({
       signal: t.getName(`geojson_${e.length}`)
@@ -89900,10 +89900,10 @@ class qu extends Jt {
   }
   assemble() {
     return Ei(this.bins).flatMap((e) => {
-      const r = [], [i, ...s] = e.as, o = e.bin, { extent: u } = o, a = XUe(o, ["extent"]), l = Object.assign(Object.assign(Object.assign({ type: "bin", field: Yo(e.field), as: i, signal: e.signal }, N5(u) ? { extent: null } : { extent: u }), e.span ? { span: { signal: `span(${e.span})` } } : {}), a);
+      const r = [], [i, ...s] = e.as, o = e.bin, { extent: u } = o, a = XUe(o, ["extent"]), l = Object.assign(Object.assign(Object.assign({ type: "bin", field: Ko(e.field), as: i, signal: e.signal }, N5(u) ? { extent: null } : { extent: u }), e.span ? { span: { signal: `span(${e.span})` } } : {}), a);
       !u && e.extentSignal && (r.push({
         type: "extent",
-        field: Yo(e.field),
+        field: Ko(e.field),
         signal: e.extentSignal
       }), l.extent = { signal: e.extentSignal }), r.push(l);
       for (const c of s)
@@ -89941,7 +89941,7 @@ function rqe(t, e) {
       i in t ? t[i][o] = /* @__PURE__ */ new Set([...(r = t[i][o]) !== null && r !== void 0 ? r : [], ...s[o]]) : t[i] = { [o]: s[o] };
   }
 }
-class Uo extends Jt {
+class qo extends Jt {
   /**
    * @param dimensions string set for dimensions
    * @param measures dictionary mapping field name => dict of aggregation functions and names to use
@@ -89950,7 +89950,7 @@ class Uo extends Jt {
     super(e), this.dimensions = r, this.measures = i;
   }
   clone() {
-    return new Uo(null, new Set(this.dimensions), ht(this.measures));
+    return new qo(null, new Set(this.dimensions), ht(this.measures));
   }
   get groupBy() {
     return this.dimensions;
@@ -89977,7 +89977,7 @@ class Uo extends Jt {
         }
       else
         nqe(o, a, u, r);
-    }), o.size + Oe(s).length === 0) ? null : new Uo(e, o, s);
+    }), o.size + Oe(s).length === 0) ? null : new qo(e, o, s);
   }
   static makeFromTransform(e, r) {
     var i, s, o;
@@ -89988,7 +89988,7 @@ class Uo extends Jt {
     }
     for (const l of (o = r.groupby) !== null && o !== void 0 ? o : [])
       u.add(l);
-    return u.size + Oe(a).length === 0 ? null : new Uo(e, u, a);
+    return u.size + Oe(a).length === 0 ? null : new qo(e, u, a);
   }
   merge(e) {
     return kge(this.dimensions, e.dimensions) ? (rqe(this.measures, e.measures), !0) : (Dye("different dimensions, cannot merge"), !1);
@@ -90016,10 +90016,10 @@ class Uo extends Jt {
     for (const o of Oe(this.measures))
       for (const u of Oe(this.measures[o]))
         for (const a of this.measures[o][u])
-          i.push(a), e.push(u), r.push(o === "*" ? null : Yo(o));
+          i.push(a), e.push(u), r.push(o === "*" ? null : Ko(o));
     return {
       type: "aggregate",
-      groupby: [...this.dimensions].map(Yo),
+      groupby: [...this.dimensions].map(Ko),
       ops: e,
       fields: r,
       as: i
@@ -90204,7 +90204,7 @@ function oqe(t) {
   function r(i) {
     Hh(i) ? e[i.field] = "date" : i.type === "quantitative" && x3e(i.aggregate) ? e[i.field] = "number" : Sg(i.field) > 1 ? i.field in e || (e[i.field] = "flatten") : qx(i) && ju(i.sort) && Sg(i.sort.field) > 1 && (i.sort.field in e || (e[i.sort.field] = "flatten"));
   }
-  if ((qn(t) || qo(t)) && t.forEachFieldDef((i, s) => {
+  if ((qn(t) || Ho(t)) && t.forEachFieldDef((i, s) => {
     if (fo(i))
       r(i);
     else {
@@ -90490,7 +90490,7 @@ class cqe extends gB {
     super(), this.requiresSelectionId = e && oB(e);
   }
   run(e) {
-    e instanceof J0 && (this.requiresSelectionId && (pB(e.parent) || e.parent instanceof Uo || e.parent instanceof Vr) || (this.setModified(), e.remove()));
+    e instanceof J0 && (this.requiresSelectionId && (pB(e.parent) || e.parent instanceof qo || e.parent instanceof Vr) || (this.setModified(), e.remove()));
   }
 }
 class fqe extends mB {
@@ -90566,7 +90566,7 @@ class mqe extends Qx {
 }
 class gqe extends Qx {
   run(e) {
-    const r = e.children.filter((s) => s instanceof Uo), i = {};
+    const r = e.children.filter((s) => s instanceof qo), i = {};
     for (const s of r) {
       const o = Ft(s.groupBy);
       o in i || (i[o] = []), i[o].push(s);
@@ -90840,7 +90840,7 @@ function vqe(t) {
       if (i instanceof Ci) {
         const s = Y8 + i.getSource();
         i.setSource(s), t.model.component.data.outputNodes[s] = i;
-      } else (i instanceof Uo || i instanceof fl || i instanceof Vp || i instanceof zx) && i.addDimensions(t.fields);
+      } else (i instanceof qo || i instanceof fl || i instanceof Vp || i instanceof zx) && i.addDimensions(t.fields);
       for (const s of r.children.flatMap(e))
         s.parent = i;
       return [i];
@@ -90853,7 +90853,7 @@ function V8(t) {
   if (t instanceof Wp)
     if (t.numChildren() === 1 && !(t.children[0] instanceof Ci)) {
       const e = t.children[0];
-      (e instanceof Uo || e instanceof fl || e instanceof Vp || e instanceof zx) && e.addDimensions(t.fields), e.swapWithParent(), V8(t);
+      (e instanceof qo || e instanceof fl || e instanceof Vp || e instanceof zx) && e.addDimensions(t.fields), e.swapWithParent(), V8(t);
     } else {
       const e = t.model.component.data.main;
       nae(e);
@@ -90929,7 +90929,7 @@ function bqe(t) {
     const i = Dqe(t, r);
     if (e[r].setWithExplicit("domains", i), wqe(t, r), t.component.data.isFaceted) {
       let o = t;
-      for (; !qo(o) && o.parent; )
+      for (; !Ho(o) && o.parent; )
         o = o.parent;
       if (o.component.resolve.scale[r] === "shared")
         for (const a of i.value)
@@ -91092,7 +91092,7 @@ function s6(t, e) {
   return Object.assign(Object.assign({
     // Apply default op
     op: r ?? (e ? "sum" : jb)
-  }, i ? { field: Yo(i) } : {}), s ? { order: s } : {});
+  }, i ? { field: Ko(i) } : {}), s ? { order: s } : {});
 }
 function wqe(t, e) {
   var r;
@@ -91366,7 +91366,7 @@ function Mqe(t, e) {
       const h = e.component.scales[t].get("zero"), p = lae(s, h, i), m = Hqe(s, r, e, i);
       return qh(c) ? qqe(p, m, Uqe(c, i, f, t)) : [p, m];
     }
-    case iu:
+    case su:
       return [0, Math.PI * 2];
     case Ox:
       return [0, 360];
@@ -91610,7 +91610,7 @@ function Wqe(t, e, r, i, s, o) {
 }
 function Vqe(t, e, r, i, s, o) {
   if (Dr(t)) {
-    if (Po(e)) {
+    if (Mo(e)) {
       if (r.continuousPadding !== void 0)
         return r.continuousPadding;
       const { type: u, orient: a } = s;
@@ -91787,7 +91787,7 @@ class u6 {
 function qn(t) {
   return (t == null ? void 0 : t.type) === "unit";
 }
-function qo(t) {
+function Ho(t) {
   return (t == null ? void 0 : t.type) === "facet";
 }
 function EB(t) {
@@ -91900,7 +91900,7 @@ let AB = class {
     e = e.concat(this.assembleSignals()), e.length > 0 && (r.signals = e);
     const i = this.assembleLayout();
     i && (r.layout = i), r.marks = [].concat(this.assembleHeaderMarks(), this.assembleMarks());
-    const s = !this.parent || qo(this.parent) ? iae(this) : [];
+    const s = !this.parent || Ho(this.parent) ? iae(this) : [];
     s.length > 0 && (r.scales = s);
     const o = this.assembleAxes();
     o.length > 0 && (r.axes = o);
@@ -91923,7 +91923,7 @@ let AB = class {
     return i[r] = (i[r] || 0) + 1, r;
   }
   getSizeSignalRef(e) {
-    if (qo(this.parent)) {
+    if (Ho(this.parent)) {
       const r = que(e), i = w5(r), s = this.component.scales[i];
       if (s && !s.merged) {
         const o = s.get("type"), u = s.get("range");
@@ -92178,11 +92178,11 @@ class lh extends Jt {
     let i = 0;
     for (const s of [
       [ua, oa],
-      [oo, su]
+      [oo, ou]
     ]) {
       const o = s.map((u) => {
         const a = Wn(r.encoding[u]);
-        return Be(a) ? a.field : ya(a) ? { expr: `${a.datum}` } : Jo(a) ? { expr: `${a.value}` } : void 0;
+        return Be(a) ? a.field : ya(a) ? { expr: `${a.datum}` } : Xo(a) ? { expr: `${a.value}` } : void 0;
       });
       (o[0] || o[1]) && (e = new lh(e, o, null, r.getName(`geojson_${i++}`)));
     }
@@ -92227,11 +92227,11 @@ class e3 extends Jt {
       return e;
     for (const i of [
       [ua, oa],
-      [oo, su]
+      [oo, ou]
     ]) {
       const s = i.map((u) => {
         const a = Wn(r.encoding[u]);
-        return Be(a) ? a.field : ya(a) ? { expr: `${a.datum}` } : Jo(a) ? { expr: `${a.value}` } : void 0;
+        return Be(a) ? a.field : ya(a) ? { expr: `${a.datum}` } : Xo(a) ? { expr: `${a.value}` } : void 0;
       }), o = i[0] === oo ? "2" : "";
       (s[0] || s[1]) && (e = new e3(e, r.projectionName(), s, [
         r.getName(`x${o}`),
@@ -92516,7 +92516,7 @@ function pae(t) {
       s.name || (s.name = `data_${e++}`), !s.source || s.transform.length > 0 ? (t.push(s), i.data = s.name) : i.data = s.source, t.push(...i.assemble());
       return;
     }
-    switch ((i instanceof Ay || i instanceof _y || i instanceof Zg || i instanceof Gp || i instanceof Wh || i instanceof e3 || i instanceof Uo || i instanceof t3 || i instanceof Vp || i instanceof zx || i instanceof a4 || i instanceof u4 || i instanceof o4 || i instanceof l4 || i instanceof c4 || i instanceof f4 || i instanceof J0 || i instanceof d4 || i instanceof x4) && s.transform.push(i.assemble()), (i instanceof qu || i instanceof Uu || i instanceof kf || i instanceof fl || i instanceof lh) && s.transform.push(...i.assemble()), i instanceof Ci && (s.source && s.transform.length === 0 ? i.setSource(s.source) : i.parent instanceof Ci ? i.setSource(s.name) : (s.name || (s.name = `data_${e++}`), i.setSource(s.name), i.numChildren() === 1 && (t.push(s), s = {
+    switch ((i instanceof Ay || i instanceof _y || i instanceof Zg || i instanceof Gp || i instanceof Wh || i instanceof e3 || i instanceof qo || i instanceof t3 || i instanceof Vp || i instanceof zx || i instanceof a4 || i instanceof u4 || i instanceof o4 || i instanceof l4 || i instanceof c4 || i instanceof f4 || i instanceof J0 || i instanceof d4 || i instanceof x4) && s.transform.push(i.assemble()), (i instanceof qu || i instanceof Uu || i instanceof kf || i instanceof fl || i instanceof lh) && s.transform.push(...i.assemble()), i instanceof Ci && (s.source && s.transform.length === 0 ? i.setSource(s.source) : i.parent instanceof Ci ? i.setSource(s.name) : (s.name || (s.name = `data_${e++}`), i.setSource(s.name), i.numChildren() === 1 && (t.push(s), s = {
       name: null,
       source: s.name,
       transform: []
@@ -92972,7 +92972,7 @@ function AHe(t, e, r) {
     else if (WPe(u))
       a = "date", r.getWithExplicit(u.field).value === void 0 && (t = new Vr(t, { [u.field]: a }), r.set(u.field, a, !1)), l = t = Uu.makeFromTransform(t, u);
     else if (VPe(u))
-      l = t = Uo.makeFromTransform(t, u), a = "number", oB(e) && (t = new J0(t));
+      l = t = qo.makeFromTransform(t, u), a = "number", oB(e) && (t = new J0(t));
     else if (Xoe(u))
       l = t = t3.make(t, e, u, o++), a = "derived";
     else if (qPe(u))
@@ -93015,19 +93015,19 @@ function h4(t) {
   const { outputNodes: h, outputNodeRefCounts: p } = t.component.data, m = t.data, y = !(m && (w0(m) || Qh(m) || Yg(m))) && t.parent ? t.parent.component.data.ancestorParse.clone() : new aMe();
   w0(m) ? (sue(m) ? x = new _y(x, m.sequence) : tB(m) && (x = new Ay(x, m.graticule)), y.parseNothing = !0) : ((e = m == null ? void 0 : m.format) === null || e === void 0 ? void 0 : e.parse) === null && (y.parseNothing = !0), x = (r = Vr.makeExplicit(x, t, y)) !== null && r !== void 0 ? r : x, x = new J0(x);
   const A = t.parent && Yp(t.parent);
-  (qn(t) || qo(t)) && A && (x = (i = qu.makeFromEncoding(x, t)) !== null && i !== void 0 ? i : x), t.transforms.length > 0 && (x = AHe(x, t, y));
+  (qn(t) || Ho(t)) && A && (x = (i = qu.makeFromEncoding(x, t)) !== null && i !== void 0 ? i : x), t.transforms.length > 0 && (x = AHe(x, t, y));
   const E = uqe(t), _ = oqe(t);
-  x = (s = Vr.makeWithAncestors(x, {}, Object.assign(Object.assign({}, E), _), y)) !== null && s !== void 0 ? s : x, qn(t) && (x = lh.parseAll(x, t), x = e3.parseAll(x, t)), (qn(t) || qo(t)) && (A || (x = (o = qu.makeFromEncoding(x, t)) !== null && o !== void 0 ? o : x), x = (u = Uu.makeFromEncoding(x, t)) !== null && u !== void 0 ? u : x, x = Wh.parseAllForSortIndex(x, t));
+  x = (s = Vr.makeWithAncestors(x, {}, Object.assign(Object.assign({}, E), _), y)) !== null && s !== void 0 ? s : x, qn(t) && (x = lh.parseAll(x, t), x = e3.parseAll(x, t)), (qn(t) || Ho(t)) && (A || (x = (o = qu.makeFromEncoding(x, t)) !== null && o !== void 0 ? o : x), x = (u = Uu.makeFromEncoding(x, t)) !== null && u !== void 0 ? u : x, x = Wh.parseAllForSortIndex(x, t));
   const v = t.getDataName(on.Raw), C = new Ci(x, v, on.Raw, p);
   if (h[v] = C, x = C, qn(t)) {
-    const O = Uo.makeFromEncoding(x, t);
+    const O = qo.makeFromEncoding(x, t);
     O && (x = O, oB(t) && (x = new J0(x))), x = (a = kf.makeFromEncoding(x, t)) !== null && a !== void 0 ? a : x, x = (l = fl.makeFromEncoding(x, t)) !== null && l !== void 0 ? l : x;
   }
   qn(t) && (x = (c = Zg.make(x, t)) !== null && c !== void 0 ? c : x);
   const b = t.getDataName(on.Main), S = new Ci(x, b, on.Main, p);
   h[b] = S, x = S, qn(t) && tUe(t, S);
   let R = null;
-  if (qo(t)) {
+  if (Ho(t)) {
     const O = t.getName("facet");
     x = (f = yHe(x, t.facet)) !== null && f !== void 0 ? f : x, R = new Wp(x, t, O, S.getSource()), h[O] = R;
   }
@@ -93712,7 +93712,7 @@ function sQe(t) {
 function oQe(t) {
   var e;
   const { encoding: r, stack: i, mark: s, markDef: o, config: u } = t, a = r.order;
-  if (!(!be(a) && Jo(a) && Nj(a.value) || !a && Nj(Qt("order", o, u)))) {
+  if (!(!be(a) && Xo(a) && Nj(a.value) || !a && Nj(Qt("order", o, u)))) {
     if ((be(a) || Be(a)) && !i)
       return cX(a, { expr: "datum" });
     if (vc(s)) {
@@ -95749,7 +95749,7 @@ f5.renderFactories = [
   j7.instance
 ];
 let _F = f5;
-var Xo = {}, p4 = {}, OB = {}, Kp = {}, _e = {};
+var Zo = {}, p4 = {}, OB = {}, Kp = {}, _e = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
@@ -95908,7 +95908,7 @@ Cy([
   Sy(0, Sl.NotNull)
 ], Jp.prototype, "shouldVisitNextChild", null);
 Kp.AbstractParseTreeVisitor = Jp;
-var bc = {}, cu = {}, yr = {};
+var bc = {}, fu = {}, yr = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
@@ -96050,10 +96050,10 @@ var Aa = T && T.__decorate || function(t, e, r, i) {
   else for (var a = t.length - 1; a >= 0; a--) (u = t[a]) && (o = (s < 3 ? u(o) : s > 3 ? u(e, r, o) : u(e, r)) || o);
   return s > 3 && o && Object.defineProperty(e, r, o), o;
 };
-Object.defineProperty(cu, "__esModule", { value: !0 });
-cu.TerminalNode = void 0;
+Object.defineProperty(fu, "__esModule", { value: !0 });
+fu.TerminalNode = void 0;
 const jQe = yr, _a = _e, UQe = rn;
-class fu {
+class xu {
   constructor(e) {
     this._symbol = e;
   }
@@ -96094,35 +96094,35 @@ class fu {
 }
 Aa([
   _a.Override
-], fu.prototype, "getChild", null);
+], xu.prototype, "getChild", null);
 Aa([
   _a.Override
-], fu.prototype, "parent", null);
+], xu.prototype, "parent", null);
 Aa([
   _a.Override
-], fu.prototype, "setParent", null);
+], xu.prototype, "setParent", null);
 Aa([
   _a.Override
-], fu.prototype, "payload", null);
+], xu.prototype, "payload", null);
 Aa([
   _a.Override
-], fu.prototype, "sourceInterval", null);
+], xu.prototype, "sourceInterval", null);
 Aa([
   _a.Override
-], fu.prototype, "childCount", null);
+], xu.prototype, "childCount", null);
 Aa([
   _a.Override
-], fu.prototype, "accept", null);
+], xu.prototype, "accept", null);
 Aa([
   _a.Override
-], fu.prototype, "text", null);
+], xu.prototype, "text", null);
 Aa([
   _a.Override
-], fu.prototype, "toStringTree", null);
+], xu.prototype, "toStringTree", null);
 Aa([
   _a.Override
-], fu.prototype, "toString", null);
-cu.TerminalNode = fu;
+], xu.prototype, "toString", null);
+fu.TerminalNode = xu;
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
@@ -96135,7 +96135,7 @@ var qQe = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(bc, "__esModule", { value: !0 });
 bc.ErrorNode = void 0;
-const HQe = _e, QQe = cu;
+const HQe = _e, QQe = fu;
 let Sae = class extends QQe.TerminalNode {
   constructor(e) {
     super(e);
@@ -96205,7 +96205,7 @@ Rc.RuleNode = GQe;
    * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
    */
   Object.defineProperty(t, "__esModule", { value: !0 }), t.ParseTreeWalker = void 0;
-  const e = bc, r = cu, i = Rc;
+  const e = bc, r = fu, i = Rc;
   class s {
     /**
      * Performs a walk on the given parse tree starting at the root and going down recursively
@@ -96271,7 +96271,7 @@ var Oae = {};
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
  */
 Object.defineProperty(Oae, "__esModule", { value: !0 });
-var x1 = {}, a6 = {}, ql = {}, xu = {}, l6 = { exports: {} }, c6 = {}, X0 = {}, wae = {}, NB = function() {
+var x1 = {}, a6 = {}, ql = {}, du = {}, l6 = { exports: {} }, c6 = {}, X0 = {}, wae = {}, NB = function() {
   if (typeof Symbol != "function" || typeof Object.getOwnPropertySymbols != "function")
     return !1;
   if (typeof Symbol.iterator == "symbol")
@@ -99025,8 +99025,8 @@ var ei = T && T.__decorate || function(t, e, r, i) {
     e(r, i, t);
   };
 };
-Object.defineProperty(xu, "__esModule", { value: !0 });
-xu.Array2DHashSet = void 0;
+Object.defineProperty(du, "__esModule", { value: !0 });
+du.Array2DHashSet = void 0;
 const PGe = wi(), MGe = v4, ti = _e, O6 = Fn, QA = 16, w6 = 0.75;
 class Mn {
   constructor(e, r = QA) {
@@ -99256,14 +99256,14 @@ ei([
 ei([
   ti.SuppressWarnings("unchecked")
 ], Mn.prototype, "createBuckets", null);
-xu.Array2DHashSet = Mn;
+du.Array2DHashSet = Mn;
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
  */
 Object.defineProperty(ql, "__esModule", { value: !0 });
 ql.Array2DHashMap = void 0;
-const gG = xu;
+const gG = du;
 class jGe {
   constructor(e) {
     this.keyComparator = e;
@@ -99532,7 +99532,7 @@ function jB() {
       return h > 3 && p && Object.defineProperty(c, f, p), p;
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.PredictionContextCache = void 0;
-    const r = ql, i = _e, s = Ns, o = du(), u = wi();
+    const r = ql, i = _e, s = Ns, o = hu(), u = wi();
     class a {
       constructor(c = !0) {
         this.contexts = new r.Array2DHashMap(s.ObjectEqualityComparator.INSTANCE), this.childContexts = new r.Array2DHashMap(s.ObjectEqualityComparator.INSTANCE), this.joinContexts = new r.Array2DHashMap(s.ObjectEqualityComparator.INSTANCE), this.enableCache = c;
@@ -99610,7 +99610,7 @@ function jB() {
   }(N6)), N6;
 }
 var EG;
-function du() {
+function hu() {
   return EG || (EG = 1, function(t) {
     /*!
      * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -99627,7 +99627,7 @@ function du() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.SingletonPredictionContext = t.PredictionContext = void 0;
-    const i = ql, s = xu, o = C4, u = Fn, a = _e, l = jB(), c = wi(), f = 1;
+    const i = ql, s = du, o = C4, u = Fn, a = _e, l = jB(), c = wi(), f = 1;
     class x {
       constructor(y) {
         this.cachedHashCode = y;
@@ -100118,7 +100118,7 @@ vn.toCharArray = YGe;
     };
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), t.SemanticContext = void 0;
-  const i = xu, s = Gx, o = Fn, u = _e, a = Ns, l = vn;
+  const i = du, s = Gx, o = Fn, u = _e, a = Ns, l = vn;
   function c(h) {
     let p;
     for (let m of h) {
@@ -100418,7 +100418,7 @@ var Qn = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(Wx, "__esModule", { value: !0 });
 Wx.ATNConfig = void 0;
-const KGe = ql, JGe = va, Ua = Fn, nn = _e, XGe = Ns, AG = du(), lf = Vx, _G = wi(), L6 = 2147483648;
+const KGe = ql, JGe = va, Ua = Fn, nn = _e, XGe = Ns, AG = hu(), lf = Vx, _G = wi(), L6 = 2147483648;
 let Fi = class zm {
   constructor(e, r, i) {
     typeof r == "number" ? (_G((r & 16777215) === r), this._state = e, this.altAndOuterContextDepth = r, this._context = i) : (this._state = e, this.altAndOuterContextDepth = r.altAndOuterContextDepth, this._context = i);
@@ -100696,13 +100696,13 @@ Xh = Qn([
   Os(1, nn.NotNull),
   Os(2, nn.NotNull)
 ], Xh);
-var hu = {};
+var pu = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
  */
-Object.defineProperty(hu, "__esModule", { value: !0 });
-hu.BitSet = void 0;
+Object.defineProperty(pu, "__esModule", { value: !0 });
+pu.BitSet = void 0;
 const ZGe = X0, eWe = Fn, p1 = new Uint16Array(0);
 function fs(t) {
   return t >>> 4;
@@ -101119,7 +101119,7 @@ class Jd {
     return "BitSet " + this.toString();
   }
 }
-hu.BitSet = Jd;
+pu.BitSet = Jd;
 class tWe {
   constructor(e) {
     this.data = e, this.index = 0, this.mask = 65535;
@@ -101154,7 +101154,7 @@ function Ry() {
     return C > 3 && b && Object.defineProperty(E, _, b), b;
   };
   Object.defineProperty(h1, "__esModule", { value: !0 }), h1.ATNConfigSet = void 0;
-  const e = ql, r = xu, i = Gx, s = mu(), o = Wx, u = hu, a = _e, l = Ns, c = du(), f = jB(), x = Vx, h = wi(), p = vn;
+  const e = ql, r = du, i = Gx, s = gu(), o = Wx, u = pu, a = _e, l = Ns, c = hu(), f = jB(), x = Vx, h = wi(), p = vn;
   class m {
     hashCode(E) {
       return E.state ^ E.alt;
@@ -101377,7 +101377,7 @@ function S4() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.DFAState = void 0;
-    const i = mu(), s = hu, o = Fn, u = _e, a = du(), l = wi();
+    const i = gu(), s = pu, o = Fn, u = _e, a = hu(), l = wi();
     class c {
       /**
        * Constructs a new `DFAState`.
@@ -101521,7 +101521,7 @@ function b4() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.ATNSimulator = void 0;
-    const i = Ry(), s = S4(), o = _e, u = du();
+    const i = Ry(), s = S4(), o = _e, u = hu();
     let a = class Gm {
       constructor(c) {
         this.atn = c;
@@ -101819,7 +101819,7 @@ var Oc = T && T.__decorate || function(t, e, r, i) {
 Object.defineProperty(Ls, "__esModule", { value: !0 });
 Ls.VocabularyImpl = void 0;
 const bl = _e, oWe = rn;
-class Zo {
+class eu {
   /**
    * Constructs a new instance of {@link VocabularyImpl} from the specified
    * literal, symbolic, and display token names.
@@ -101866,33 +101866,33 @@ class Zo {
     return i || String(e);
   }
 }
-Zo.EMPTY_VOCABULARY = new Zo([], [], []);
+eu.EMPTY_VOCABULARY = new eu([], [], []);
 Oc([
   bl.NotNull
-], Zo.prototype, "literalNames", void 0);
+], eu.prototype, "literalNames", void 0);
 Oc([
   bl.NotNull
-], Zo.prototype, "symbolicNames", void 0);
+], eu.prototype, "symbolicNames", void 0);
 Oc([
   bl.NotNull
-], Zo.prototype, "displayNames", void 0);
+], eu.prototype, "displayNames", void 0);
 Oc([
   bl.Override
-], Zo.prototype, "maxTokenType", null);
+], eu.prototype, "maxTokenType", null);
 Oc([
   bl.Override
-], Zo.prototype, "getLiteralName", null);
+], eu.prototype, "getLiteralName", null);
 Oc([
   bl.Override
-], Zo.prototype, "getSymbolicName", null);
+], eu.prototype, "getSymbolicName", null);
 Oc([
   bl.Override,
   bl.NotNull
-], Zo.prototype, "getDisplayName", null);
+], eu.prototype, "getDisplayName", null);
 Oc([
   bl.NotNull
-], Zo, "EMPTY_VOCABULARY", void 0);
-Ls.VocabularyImpl = Zo;
+], eu, "EMPTY_VOCABULARY", void 0);
+Ls.VocabularyImpl = eu;
 var DG;
 function ule() {
   if (DG) return m1;
@@ -101908,7 +101908,7 @@ function ule() {
     return x > 3 && h && Object.defineProperty(l, c, h), h;
   };
   Object.defineProperty(m1, "__esModule", { value: !0 }), m1.DFASerializer = void 0;
-  const e = b4(), r = _e, i = du(), s = Dc, o = Ls;
+  const e = b4(), r = _e, i = hu(), s = Dc, o = Ls;
   let u = class {
     constructor(l, c, f, x) {
       c instanceof s.Recognizer ? (f = c.ruleNames, x = c.atn, c = c.vocabulary) : c || (c = o.VocabularyImpl.EMPTY_VOCABULARY), this.dfa = l, this.vocabulary = c, this.ruleNames = f, this.atn = x;
@@ -102037,7 +102037,7 @@ var aWe = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(Zp, "__esModule", { value: !0 });
 Zp.StarLoopEntryState = void 0;
-const lWe = Er, cWe = hu, fWe = va, xWe = _e;
+const lWe = Er, cWe = pu, fWe = va, xWe = _e;
 class ale extends fWe.DecisionState {
   constructor() {
     super(...arguments), this.precedenceRuleDecision = !1, this.precedenceLoopbackStates = new cWe.BitSet();
@@ -102069,7 +102069,7 @@ function lle() {
     };
   };
   Object.defineProperty(d1, "__esModule", { value: !0 }), d1.DFA = void 0;
-  const r = xu, i = Ry(), s = ule(), o = S4(), u = uWe(), a = _e, l = Ns, c = Zp, f = Ls;
+  const r = du, i = Ry(), s = ule(), o = S4(), u = uWe(), a = _e, l = Ns, c = Zp, f = Ls;
   let x = class {
     constructor(p, m = 0) {
       if (this.states = new r.Array2DHashSet(l.ObjectEqualityComparator.INSTANCE), this.nextStateNumber = 0, !p.atn)
@@ -103086,7 +103086,7 @@ function Fy() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.LexerATNSimulator = void 0;
-    const i = wy, s = mu(), o = Wx, u = Ry(), a = b4(), l = S4(), c = yr, f = Ul, x = Hl(), h = w4, p = Xx, m = _e, g = TWe(), y = du(), A = Fc, E = rn, _ = wi();
+    const i = wy, s = gu(), o = Wx, u = Ry(), a = b4(), l = S4(), c = yr, f = Ul, x = Hl(), h = w4, p = Xx, m = _e, g = TWe(), y = hu(), A = Fc, E = rn, _ = wi();
     let v = class ds extends a.ATNSimulator {
       constructor(b, S) {
         super(b), this.optimize_tail_calls = !0, this.startIndex = -1, this._line = 1, this._charPositionInLine = 0, this.mode = x.Lexer.DEFAULT_MODE, this.prevAccept = new ds.SimState(), this.recog = S;
@@ -104085,7 +104085,7 @@ LWe([
   BWe.Override
 ], mle.prototype, "stateType", null);
 Ny.InvalidState = mle;
-var _1 = {}, t2 = {}, pu = {};
+var _1 = {}, t2 = {}, mu = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
@@ -104100,8 +104100,8 @@ var gle = T && T.__decorate || function(t, e, r, i) {
     e(r, i, t);
   };
 };
-Object.defineProperty(pu, "__esModule", { value: !0 });
-pu.Transition = void 0;
+Object.defineProperty(mu, "__esModule", { value: !0 });
+mu.Transition = void 0;
 const yle = _e;
 let o3 = class {
   constructor(e) {
@@ -104143,14 +104143,14 @@ gle([
 o3 = gle([
   kWe(0, yle.NotNull)
 ], o3);
-pu.Transition = o3;
+mu.Transition = o3;
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
  */
 Object.defineProperty(t2, "__esModule", { value: !0 });
 t2.AbstractPredicateTransition = void 0;
-const PWe = pu;
+const PWe = mu;
 class MWe extends PWe.Transition {
   constructor(e) {
     super(e);
@@ -104176,7 +104176,7 @@ function zB() {
     };
   };
   Object.defineProperty(C1, "__esModule", { value: !0 }), C1.SetTransition = void 0;
-  const r = Zx(), i = _e, s = rn, o = pu;
+  const r = Zx(), i = _e, s = rn, o = mu;
   let u = class extends o.Transition {
     // TODO (sam): should we really allow undefined here?
     constructor(l, c) {
@@ -104274,7 +104274,7 @@ var Iy = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(n2, "__esModule", { value: !0 });
 n2.RuleTransition = void 0;
-const Zh = _e, jWe = pu;
+const Zh = _e, jWe = mu;
 let ax = class extends jWe.Transition {
   constructor(e, r, i, s) {
     super(e), this.tailCall = !1, this.optimizedTailCall = !1, this.ruleIndex = r, this.precedence = i, this.followState = s;
@@ -104323,7 +104323,7 @@ var N4 = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty($y, "__esModule", { value: !0 });
 $y.WildcardTransition = void 0;
-const u3 = _e, qWe = pu;
+const u3 = _e, qWe = mu;
 let ep = class extends qWe.Transition {
   constructor(e) {
     super(e);
@@ -104371,7 +104371,7 @@ function HWe() {
     };
   };
   Object.defineProperty(_1, "__esModule", { value: !0 }), _1.LL1Analyzer = void 0;
-  const r = t2, i = xu, s = Wx, o = hu, u = Zx(), a = _e, l = GB(), c = Ns, f = du(), x = Fc, h = n2, p = rn, m = $y;
+  const r = t2, i = du, s = Wx, o = pu, u = Zx(), a = _e, l = GB(), c = Ns, f = hu(), x = Fc, h = n2, p = rn, m = $y;
   let g = class NF {
     constructor(A) {
       this.atn = A;
@@ -104511,7 +104511,7 @@ function HWe() {
   ], g), _1.LL1Analyzer = g, _1;
 }
 var jG;
-function mu() {
+function gu() {
   return jG || (jG = 1, function(t) {
     /*!
      * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -104528,7 +104528,7 @@ function mu() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.ATN = void 0;
-    const i = ql, s = lle(), o = Zx(), u = Ny, a = HWe(), l = _e, c = Ns, f = du(), x = rn, h = wi();
+    const i = ql, s = lle(), o = Zx(), u = Ny, a = HWe(), l = _e, c = Ns, f = hu(), x = rn, h = wi();
     let p = class {
       /** Used for runtime deserialization of ATNs from strings */
       constructor(g, y) {
@@ -104726,7 +104726,7 @@ var Py = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(ky, "__esModule", { value: !0 });
 ky.ActionTransition = void 0;
-const My = _e, WWe = pu;
+const My = _e, WWe = mu;
 let lx = class extends WWe.Transition {
   constructor(e, r, i = -1, s = !1) {
     super(e), this.ruleIndex = r, this.actionIndex = i, this.isCtxDependent = s;
@@ -104777,7 +104777,7 @@ var Uy = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(jy, "__esModule", { value: !0 });
 jy.AtomTransition = void 0;
-const YWe = Zx(), cx = _e, KWe = pu;
+const YWe = Zx(), cx = _e, KWe = mu;
 let fx = class extends KWe.Transition {
   constructor(e, r) {
     super(e), this._label = r;
@@ -104886,7 +104886,7 @@ var qy = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty($4, "__esModule", { value: !0 });
 $4.EpsilonTransition = void 0;
-const tp = _e, aVe = pu;
+const tp = _e, aVe = mu;
 let xx = class extends aVe.Transition {
   constructor(e, r = -1) {
     super(e), this._outermostPrecedenceReturn = r;
@@ -105731,7 +105731,7 @@ function Dle() {
     return p > 3 && m && Object.defineProperty(f, x, m), m;
   };
   Object.defineProperty(w1, "__esModule", { value: !0 }), w1.RuleContext = void 0;
-  const e = mu(), r = Dc, i = Rc, s = yr, o = _e, u = Ic(), a = mo();
+  const e = gu(), r = Dc, i = Rc, s = yr, o = _e, u = Ic(), a = mo();
   let l = class Rle extends i.RuleNode {
     constructor(f, x) {
       super(), this._parent = f, this.invokingState = x ?? -1;
@@ -105873,7 +105873,7 @@ function mo() {
     return x > 3 && h && Object.defineProperty(l, c, h), h;
   };
   Object.defineProperty(O1, "__esModule", { value: !0 }), O1.ParserRuleContext = void 0;
-  const e = bc, r = yr, i = _e, s = Dle(), o = cu;
+  const e = bc, r = yr, i = _e, s = Dle(), o = fu;
   let u = class LF extends s.RuleContext {
     constructor(l, c) {
       c == null ? super() : super(l, c);
@@ -106157,7 +106157,7 @@ function u2() {
     };
   };
   Object.defineProperty(R1, "__esModule", { value: !0 }), R1.ParserATNSimulator = void 0;
-  const r = wy, i = ky, s = xu, o = C4, u = mu(), a = Wx, l = Ry(), c = b4(), f = Er, x = jy, h = hu, p = U4, m = va, g = S4(), y = e2, A = yr, E = Ul, _ = _e, v = GB(), C = Gy(), b = Ns, S = mo(), R = du(), O = jB(), $ = Ole, D = Fc, k = n2, j = Vx, V = zB(), G = wle(), K = rn, ce = Ls, xe = wi(), ee = 65535, te = -(1 << 31 >>> 0);
+  const r = wy, i = ky, s = du, o = C4, u = gu(), a = Wx, l = Ry(), c = b4(), f = Er, x = jy, h = pu, p = U4, m = va, g = S4(), y = e2, A = yr, E = Ul, _ = _e, v = GB(), C = Gy(), b = Ns, S = mo(), R = hu(), O = jB(), $ = Ole, D = Fc, k = n2, j = Vx, V = zB(), G = wle(), K = rn, ce = Ls, xe = wi(), ee = 65535, te = -(1 << 31 >>> 0);
   let le = class dt extends c.ATNSimulator {
     constructor(I, N) {
       super(I), this.predictionMode = $.PredictionMode.LL, this.force_global_context = !1, this.always_try_local_context = !0, this.enable_global_context_dfa = !1, this.optimize_unique_closure = !0, this.optimize_ll1 = !0, this.optimize_tail_calls = !0, this.tail_call_preserves_sll = !0, this.treat_sllk1_conflict_as_ambiguity = !1, this.reportAmbiguities = !1, this.userWantsCtxSensitive = !0, this._parser = N;
@@ -107429,7 +107429,7 @@ var Jy = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(z4, "__esModule", { value: !0 });
 z4.RangeTransition = void 0;
-const IVe = Zx(), Ex = _e, $Ve = pu;
+const IVe = Zx(), Ex = _e, $Ve = mu;
 let Ax = class extends $Ve.Transition {
   constructor(e, r, i) {
     super(e), this.from = r, this.to = i;
@@ -107611,7 +107611,7 @@ function a2() {
     };
   };
   Object.defineProperty(b1, "__esModule", { value: !0 }), b1.ATNDeserializer = void 0;
-  const r = ky, i = xu, s = mu(), o = By, u = Er, a = jy, l = L4, c = Ly, f = hu, x = I4, h = ed, p = va, m = lle(), g = $4, y = Zx(), A = Ny, E = B4, _ = k4, v = P4, C = _le, b = vle, S = M4, R = Cle, O = j4, $ = Qy, D = _e, k = GB(), j = u2(), V = q4, G = H4, K = Q4, ce = Yy, xe = z4, ee = G4, te = Fc, le = n2, Ae = zB(), I = W4, N = V4, L = Zp, q = rn, Y = Y4, Q = K4, w = $y;
+  const r = ky, i = du, s = gu(), o = By, u = Er, a = jy, l = L4, c = Ly, f = pu, x = I4, h = ed, p = va, m = lle(), g = $4, y = Zx(), A = Ny, E = B4, _ = k4, v = P4, C = _le, b = vle, S = M4, R = Cle, O = j4, $ = Qy, D = _e, k = GB(), j = u2(), V = q4, G = H4, K = Q4, ce = Yy, xe = z4, ee = G4, te = Fc, le = n2, Ae = zB(), I = W4, N = V4, L = Zp, q = rn, Y = Y4, Q = K4, w = $y;
   var P;
   (function(W) {
     W[W.UNICODE_BMP = 0] = "UNICODE_BMP", W[W.UNICODE_SMP = 1] = "UNICODE_SMP";
@@ -108318,7 +108318,7 @@ function WB() {
     };
   };
   Object.defineProperty(N1, "__esModule", { value: !0 }), N1.DefaultErrorStrategy = void 0;
-  const r = Ca, i = Er, s = Lc, o = td, u = Zx(), a = Gy(), l = du(), c = rn, f = _e;
+  const r = Ca, i = Er, s = Lc, o = td, u = Zx(), a = Gy(), l = hu(), c = rn, f = _e;
   let x = class {
     constructor() {
       this.errorRecoveryMode = !1, this.lastErrorIndex = -1, this.nextTokensState = r.ATNState.INVALID_STATE_NUMBER;
@@ -110036,7 +110036,7 @@ function Hle() {
     };
   };
   Object.defineProperty($1, "__esModule", { value: !0 }), $1.ParserInterpreter = void 0;
-  const r = Ca, i = Er, s = hu, o = Lc, u = td, a = qle(), l = Qy, c = _e, f = _e, x = f2(), h = u2(), p = po, m = Zp, g = rn;
+  const r = Ca, i = Er, s = pu, o = Lc, u = td, a = qle(), l = Qy, c = _e, f = _e, x = f2(), h = u2(), p = po, m = Zp, g = rn;
   let y = class $F extends x.Parser {
     constructor(E, _, v, C, b) {
       if (super(E instanceof $F ? E.inputStream : b), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof $F) {
@@ -110713,7 +110713,7 @@ function SYe() {
     return f > 3 && x && Object.defineProperty(a, l, x), x;
   };
   Object.defineProperty(G1, "__esModule", { value: !0 }), G1.XPathTokenElement = void 0;
-  const e = _e, r = cu, i = Ic(), s = c2();
+  const e = _e, r = fu, i = Ic(), s = c2();
   let o = class extends s.XPathElement {
     constructor(a, l) {
       super(a), this.tokenType = l;
@@ -111443,7 +111443,7 @@ function NYe() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.ParseTreePatternMatcher = void 0;
-    const i = jle(), s = Z4, o = l2, u = nE, a = gYe(), l = _e, c = Zy, f = Hle(), x = mo(), h = yYe(), p = RYe(), m = po, g = Rc, y = DYe(), A = OYe(), E = cu, _ = wYe(), v = rn, C = FYe();
+    const i = jle(), s = Z4, o = l2, u = nE, a = gYe(), l = _e, c = Zy, f = Hle(), x = mo(), h = yYe(), p = RYe(), m = po, g = Rc, y = DYe(), A = OYe(), E = fu, _ = wYe(), v = rn, C = FYe();
     class b {
       /**
        * Constructs a {@link ParseTreePatternMatcher} or from a {@link Lexer} and
@@ -112001,7 +112001,7 @@ function DW() {
     };
   };
   Object.defineProperty(em, "__esModule", { value: !0 }), em.ProfilingATNSimulator = void 0;
-  const r = LYe(), i = mu(), s = b4(), o = IYe(), u = $Ye(), a = BYe(), l = _e, c = kYe(), f = u2(), x = PYe(), h = Vx, p = wle();
+  const r = LYe(), i = gu(), s = b4(), o = IYe(), u = $Ye(), a = BYe(), l = _e, c = kYe(), f = u2(), x = PYe(), h = Vx, p = wle();
   let m = class extends f.ParserATNSimulator {
     constructor(y) {
       super(y.interpreter.atn, y), this._startIndex = 0, this._sllStopIndex = 0, this._llStopIndex = 0, this.currentDecision = 0, this.conflictingAltResolvedBySLL = 0, this.optimize_ll1 = !1, this.reportAmbiguities = !0, this.numDecisions = this.atn.decisionToState.length, this.decisions = [];
@@ -112157,7 +112157,7 @@ function f2() {
     });
   };
   Object.defineProperty(S1, "__esModule", { value: !0 }), S1.Parser = void 0;
-  const i = vn, s = By, o = a2(), u = WB(), a = bc, l = Oy, c = Hl(), f = _e, x = J4, h = u2(), p = Xy, m = Dc, g = cu, y = rn;
+  const i = vn, s = By, o = a2(), u = WB(), a = bc, l = Oy, c = Hl(), f = _e, x = J4, h = u2(), p = Xy, m = Dc, g = fu, y = rn;
   class A {
     constructor(v, C) {
       this.ruleNames = v, this.tokenStream = C;
@@ -112715,7 +112715,7 @@ function Ic() {
     };
   };
   Object.defineProperty(x1, "__esModule", { value: !0 }), x1.Trees = void 0;
-  const r = mu(), i = wc, s = bc, o = _e, u = f2(), a = mo(), l = Rc, c = cu, f = rn, x = vn;
+  const r = gu(), i = wc, s = bc, o = _e, u = f2(), a = mo(), l = Rc, c = fu, f = rn, x = vn;
   let h = class a0 {
     static toStringTree(m, g) {
       let y;
@@ -112880,7 +112880,7 @@ function Ic() {
   }), r = T && T.__exportStar || function(i, s) {
     for (var o in i) o !== "default" && !Object.prototype.hasOwnProperty.call(s, o) && e(s, i, o);
   };
-  Object.defineProperty(t, "__esModule", { value: !0 }), r(Kp, t), r(bc, t), r(bae, t), r(Tae, t), r(m4, t), r(Rae, t), r(Tc, t), r(Rc, t), r(Dae, t), r(cu, t), r(Oae, t), r(Ic(), t);
+  Object.defineProperty(t, "__esModule", { value: !0 }), r(Kp, t), r(bc, t), r(bae, t), r(Tae, t), r(m4, t), r(Rae, t), r(Tc, t), r(Rc, t), r(Dae, t), r(fu, t), r(Oae, t), r(Ic(), t);
 })(OB);
 var nT = {}, MYe = T && T.__createBinding || (Object.create ? function(t, e, r, i) {
   i === void 0 && (i = r);
@@ -113096,7 +113096,7 @@ var Dt = {}, WYe = T && T.__createBinding || (Object.create ? function(t, e, r,
 }();
 Object.defineProperty(Dt, "__esModule", { value: !0 });
 Dt.PropertiesContext = Dt.ArrayValueContext = Dt.ReferenceContext = Dt.ArrayElementContext = Dt.EqValueContext = Dt.PropNameContext = Dt.IdentifierContext = Dt.StringContext = Dt.TagEmptyContext = Dt.TagDefContext = Dt.TagUpdatePropertiesContext = Dt.TagReplacePropertiesContext = Dt.TagEqContext = Dt.TagSpecContext = Dt.TagLineContext = Dt.MalloyTagParser = void 0;
-const KYe = mu(), JYe = a2(), XYe = Lc, G6 = Gy(), ZYe = f2(), Ra = mo(), eKe = u2(), vu = po, FW = rn, tKe = Ls, nKe = YYe(vn);
+const KYe = gu(), JYe = a2(), XYe = Lc, G6 = Gy(), ZYe = f2(), Ra = mo(), eKe = u2(), Cu = po, FW = rn, tKe = Ls, nKe = YYe(vn);
 class ge extends ZYe.Parser {
   // @Override
   // @NotNull
@@ -113135,7 +113135,7 @@ class ge extends ZYe.Parser {
         this.state = 26, this.match(ge.EOF);
       }
     } catch (i) {
-      if (i instanceof vu.RecognitionException)
+      if (i instanceof Cu.RecognitionException)
         e.exception = i, this._errHandler.reportError(this, i), this._errHandler.recover(this, i);
       else
         throw i;
@@ -113146,7 +113146,7 @@ class ge extends ZYe.Parser {
   }
   // @RuleVersion(0)
   tagSpec() {
-    let e = new eu(this._ctx, this.state);
+    let e = new tu(this._ctx, this.state);
     this.enterRule(e, 2, ge.RULE_tagSpec);
     let r;
     try {
@@ -113168,7 +113168,7 @@ class ge extends ZYe.Parser {
           break;
       }
     } catch (i) {
-      if (i instanceof vu.RecognitionException)
+      if (i instanceof Cu.RecognitionException)
         e.exception = i, this._errHandler.reportError(this, i), this._errHandler.recover(this, i);
       else
         throw i;
@@ -113185,7 +113185,7 @@ class ge extends ZYe.Parser {
     try {
       this.enterOuterAlt(e, 1), this.state = 51, r = this._input.LA(1), !(r & -32) && 1 << r & (1 << ge.SQ_STRING | 1 << ge.DQ_STRING | 1 << ge.NUMERIC_LITERAL | 1 << ge.BARE_STRING) ? (this._input.LA(1) === FW.Token.EOF && (this.matchedEOF = !0), this._errHandler.reportMatch(this), this.consume()) : this._errHandler.recoverInline(this);
     } catch (i) {
-      if (i instanceof vu.RecognitionException)
+      if (i instanceof Cu.RecognitionException)
         e.exception = i, this._errHandler.reportError(this, i), this._errHandler.recover(this, i);
       else
         throw i;
@@ -113202,7 +113202,7 @@ class ge extends ZYe.Parser {
     try {
       this.enterOuterAlt(e, 1), this.state = 53, r = this._input.LA(1), r === ge.BQ_STRING || r === ge.BARE_STRING ? (this._input.LA(1) === FW.Token.EOF && (this.matchedEOF = !0), this._errHandler.reportMatch(this), this.consume()) : this._errHandler.recoverInline(this);
     } catch (i) {
-      if (i instanceof vu.RecognitionException)
+      if (i instanceof Cu.RecognitionException)
         e.exception = i, this._errHandler.reportError(this, i), this._errHandler.recover(this, i);
       else
         throw i;
@@ -113220,7 +113220,7 @@ class ge extends ZYe.Parser {
       for (this.enterOuterAlt(e, 1), this.state = 55, this.identifier(), this.state = 60, this._errHandler.sync(this), r = this._input.LA(1); r === ge.DOT; )
         this.state = 56, this.match(ge.DOT), this.state = 57, this.identifier(), this.state = 62, this._errHandler.sync(this), r = this._input.LA(1);
     } catch (i) {
-      if (i instanceof vu.RecognitionException)
+      if (i instanceof Cu.RecognitionException)
         e.exception = i, this._errHandler.reportError(this, i), this._errHandler.recover(this, i);
       else
         throw i;
@@ -113251,7 +113251,7 @@ class ge extends ZYe.Parser {
           throw new G6.NoViableAltException(this);
       }
     } catch (r) {
-      if (r instanceof vu.RecognitionException)
+      if (r instanceof Cu.RecognitionException)
         e.exception = r, this._errHandler.reportError(this, r), this._errHandler.recover(this, r);
       else
         throw r;
@@ -113286,7 +113286,7 @@ class ge extends ZYe.Parser {
           throw new G6.NoViableAltException(this);
       }
     } catch (i) {
-      if (i instanceof vu.RecognitionException)
+      if (i instanceof Cu.RecognitionException)
         e.exception = i, this._errHandler.reportError(this, i), this._errHandler.recover(this, i);
       else
         throw i;
@@ -113302,7 +113302,7 @@ class ge extends ZYe.Parser {
     try {
       this.enterOuterAlt(e, 1), this.state = 77, this.match(ge.RF_BEG), this.state = 78, this.propName(), this.state = 79, this.match(ge.RF_END);
     } catch (r) {
-      if (r instanceof vu.RecognitionException)
+      if (r instanceof Cu.RecognitionException)
         e.exception = r, this._errHandler.reportError(this, r), this._errHandler.recover(this, r);
       else
         throw r;
@@ -113325,7 +113325,7 @@ class ge extends ZYe.Parser {
         this.state = 91, this._errHandler.sync(this), r = this._input.LA(1), r === ge.COMMA && (this.state = 90, this.match(ge.COMMA)), this.state = 93, this.match(ge.AR_END);
       }
     } catch (i) {
-      if (i instanceof vu.RecognitionException)
+      if (i instanceof Cu.RecognitionException)
         e.exception = i, this._errHandler.reportError(this, i), this._errHandler.recover(this, i);
       else
         throw i;
@@ -113360,7 +113360,7 @@ class ge extends ZYe.Parser {
         this.state = 105, this.match(ge.PR_END);
       }
     } catch (i) {
-      if (i instanceof vu.RecognitionException)
+      if (i instanceof Cu.RecognitionException)
         e.exception = i, this._errHandler.reportError(this, i), this._errHandler.recover(this, i);
       else
         throw i;
@@ -113500,7 +113500,7 @@ class Gle extends Ra.ParserRuleContext {
     return this.getToken(ge.EOF, 0);
   }
   tagSpec(e) {
-    return e === void 0 ? this.getRuleContexts(eu) : this.getRuleContext(e, eu);
+    return e === void 0 ? this.getRuleContexts(tu) : this.getRuleContext(e, tu);
   }
   constructor(e, r) {
     super(e, r);
@@ -113515,7 +113515,7 @@ class Gle extends Ra.ParserRuleContext {
   }
 }
 Dt.TagLineContext = Gle;
-class eu extends Ra.ParserRuleContext {
+class tu extends Ra.ParserRuleContext {
   constructor(e, r) {
     super(e, r);
   }
@@ -113527,8 +113527,8 @@ class eu extends Ra.ParserRuleContext {
     super.copyFrom(e);
   }
 }
-Dt.TagSpecContext = eu;
-class Wle extends eu {
+Dt.TagSpecContext = tu;
+class Wle extends tu {
   propName() {
     return this.getRuleContext(0, rd);
   }
@@ -113550,7 +113550,7 @@ class Wle extends eu {
   }
 }
 Dt.TagEqContext = Wle;
-class Vle extends eu {
+class Vle extends tu {
   propName() {
     return this.getRuleContext(0, rd);
   }
@@ -113572,7 +113572,7 @@ class Vle extends eu {
   }
 }
 Dt.TagReplacePropertiesContext = Vle;
-class Yle extends eu {
+class Yle extends tu {
   propName() {
     return this.getRuleContext(0, rd);
   }
@@ -113588,7 +113588,7 @@ class Yle extends eu {
   }
 }
 Dt.TagUpdatePropertiesContext = Yle;
-class Kle extends eu {
+class Kle extends tu {
   propName() {
     return this.getRuleContext(0, rd);
   }
@@ -113604,7 +113604,7 @@ class Kle extends eu {
   }
 }
 Dt.TagDefContext = Kle;
-class Jle extends eu {
+class Jle extends tu {
   MINUS_DOTTY() {
     return this.getToken(ge.MINUS_DOTTY, 0);
   }
@@ -113792,7 +113792,7 @@ class x2 extends Ra.ParserRuleContext {
     return this.tryGetToken(ge.DOTTY, 0);
   }
   tagSpec(e) {
-    return e === void 0 ? this.getRuleContexts(eu) : this.getRuleContext(e, eu);
+    return e === void 0 ? this.getRuleContexts(tu) : this.getRuleContext(e, tu);
   }
   constructor(e, r) {
     super(e, r);
@@ -113833,7 +113833,7 @@ var Da = T && T.__decorate || function(t, e, r, i) {
 Object.defineProperty(oT, "__esModule", { value: !0 });
 oT.ANTLRInputStream = void 0;
 const rKe = wi(), Oa = _e, JA = Ul;
-class gu {
+class yu {
   /** Copy data in string to a local char array */
   constructor(e) {
     this.p = 0, this.data = e, this.n = e.length;
@@ -113898,35 +113898,35 @@ class gu {
 }
 Da([
   Oa.Override
-], gu.prototype, "consume", null);
+], yu.prototype, "consume", null);
 Da([
   Oa.Override
-], gu.prototype, "LA", null);
+], yu.prototype, "LA", null);
 Da([
   Oa.Override
-], gu.prototype, "index", null);
+], yu.prototype, "index", null);
 Da([
   Oa.Override
-], gu.prototype, "size", null);
+], yu.prototype, "size", null);
 Da([
   Oa.Override
-], gu.prototype, "mark", null);
+], yu.prototype, "mark", null);
 Da([
   Oa.Override
-], gu.prototype, "release", null);
+], yu.prototype, "release", null);
 Da([
   Oa.Override
-], gu.prototype, "seek", null);
+], yu.prototype, "seek", null);
 Da([
   Oa.Override
-], gu.prototype, "getText", null);
+], yu.prototype, "getText", null);
 Da([
   Oa.Override
-], gu.prototype, "sourceName", null);
+], yu.prototype, "sourceName", null);
 Da([
   Oa.Override
-], gu.prototype, "toString", null);
-oT.ANTLRInputStream = gu;
+], yu.prototype, "toString", null);
+oT.ANTLRInputStream = yu;
 var e0e = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -113960,7 +113960,7 @@ var h2 = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(uT, "__esModule", { value: !0 });
 uT.DiagnosticErrorListener = void 0;
-const iKe = hu, Tr = _e, W6 = yr;
+const iKe = pu, Tr = _e, W6 = yr;
 class id {
   /**
    * Initializes a new instance of {@link DiagnosticErrorListener}, specifying
@@ -114132,7 +114132,7 @@ var aKe = T && T.__decorate || function(t, e, r, i) {
 };
 Object.defineProperty(lT, "__esModule", { value: !0 });
 lT.RuleContextWithAltNum = void 0;
-const lKe = mu(), cKe = _e, fKe = mo();
+const lKe = gu(), cKe = _e, fKe = mo();
 class i0e extends fKe.ParserRuleContext {
   constructor(e, r) {
     r !== void 0 ? super(e, r) : super(), this._altNumber = lKe.ATN.INVALID_ALT_NUMBER;
@@ -114473,32 +114473,32 @@ Object.defineProperty(c0e, "__esModule", { value: !0 });
 var pT = {};
 Object.defineProperty(pT, "__esModule", { value: !0 });
 pT.parseString = hKe;
-var Ro;
+var Do;
 (function(t) {
   t[t.Normal = 0] = "Normal", t[t.ReverseVirgule = 1] = "ReverseVirgule", t[t.Unicode = 2] = "Unicode";
-})(Ro || (Ro = {}));
+})(Do || (Do = {}));
 function hKe(t, e = "") {
-  let r = t.slice(e.length), i = Ro.Normal;
+  let r = t.slice(e.length), i = Do.Normal;
   e.length && (r = r.slice(0, -e.length));
   let s = "", o = "";
   for (const u of r)
     switch (i) {
-      case Ro.Normal: {
-        u === "\\" ? i = Ro.ReverseVirgule : s += u;
+      case Do.Normal: {
+        u === "\\" ? i = Do.ReverseVirgule : s += u;
         break;
       }
-      case Ro.ReverseVirgule: {
+      case Do.ReverseVirgule: {
         let a = u;
         if (u === "u") {
-          i = Ro.Unicode, o = "";
+          i = Do.Unicode, o = "";
           continue;
         }
         u === "b" ? a = "\b" : u === "f" ? a = "\f" : u === "n" ? a = `
-` : u === "r" ? a = "\r" : u === "t" && (a = "	"), s += a, i = Ro.Normal;
+` : u === "r" ? a = "\r" : u === "t" && (a = "	"), s += a, i = Do.Normal;
         break;
       }
-      case Ro.Unicode:
-        "ABCDEFabcdef0123456789".includes(u) ? (o += u, o.length === 4 && (s += String.fromCharCode(parseInt(o, 16)), i = Ro.Normal)) : i = Ro.Normal;
+      case Do.Unicode:
+        "ABCDEFabcdef0123456789".includes(u) ? (o += u, o.length === 4 && (s += String.fromCharCode(parseInt(o, 16)), i = Do.Normal)) : i = Do.Normal;
     }
   return s;
 }
@@ -114920,12 +114920,12 @@ class EKe extends pKe.AbstractParseTreeVisitor {
     };
   }();
   Object.defineProperty(t, "__esModule", { value: !0 }), t.ParseUtil = void 0, i(p4, t), t.ParseUtil = s(pT);
-})(Xo);
+})(Zo);
 const AKe = "∅";
 function sS(t, e = "# ") {
   var i;
   const r = ((i = t == null ? void 0 : t.map((s) => s.value)) == null ? void 0 : i.filter((s) => s.startsWith(e))) ?? [];
-  return Xo.Tag.fromTagLines(r).tag ?? new Xo.Tag();
+  return Zo.Tag.fromTagLines(r).tag ?? new Zo.Tag();
 }
 It.Nanoseconds, It.Microseconds, It.Milliseconds, It.Seconds, It.Minutes, It.Hours, It.Days;
 It.Nanoseconds, It.Microseconds, It.Milliseconds, It.Seconds, It.Minutes, It.Hours, It.Days, Number.MAX_VALUE;
@@ -116689,11 +116689,11 @@ function DKe(t, { tabWidth: e } = { tabWidth: 2 }) {
   const r = m0e(t);
   return x0e(r, { tabWidth: e });
 }
-const rk = Symbol("indent"), Ho = Symbol("newline"), ik = Symbol("outdent"), OKe = Symbol("optional_newline_indent");
+const rk = Symbol("indent"), Qo = Symbol("newline"), ik = Symbol("outdent"), OKe = Symbol("optional_newline_indent");
 function x0e(t, { tabWidth: e } = { tabWidth: 2 }) {
   let r = "", i = 0, s = !0;
   for (const o of t)
-    if (o === Ho)
+    if (o === Qo)
       r += `
 `, s = !0;
     else if (o === ik)
@@ -116709,8 +116709,8 @@ function x0e(t, { tabWidth: e } = { tabWidth: 2 }) {
 }
 function yT(t, e, r, i) {
   var s;
-  if (e.includes(Ho))
-    return [t, Ho, rk, ...e, Ho, ik, r];
+  if (e.includes(Qo))
+    return [t, Qo, rk, ...e, Qo, ik, r];
   const u = ((s = i == null ? void 0 : i.spaces) !== null && s !== void 0 ? s : !0) ? " " : "";
   return [t, u, ...e, u, r];
 }
@@ -116798,7 +116798,7 @@ function hl(t) {
     const i = [];
     for (let s = 0; s < t.parameters.length; s++) {
       const o = t.parameters[s];
-      i.push((0, Eg.maybeQuoteIdentifier)(o.name)), i.push(" is "), i.push(...sk(o.value)), s < t.parameters.length - 1 && i.push(",", Ho);
+      i.push((0, Eg.maybeQuoteIdentifier)(o.name)), i.push(" is "), i.push(...sk(o.value)), s < t.parameters.length - 1 && i.push(",", Qo);
     }
     r.push(...yT("(", i, ")", { spaces: !1 }));
   }
@@ -116875,7 +116875,7 @@ function LKe(t) {
       else
         break;
     }
-    r.push(...IKe(o)), e && i < t.operations.length - 1 && r.push(Ho);
+    r.push(...IKe(o)), e && i < t.operations.length - 1 && r.push(Qo);
   }
   return yT("{", r, "}");
 }
@@ -116902,11 +116902,11 @@ function IKe(t) {
 function sd(t, e, r = "") {
   const i = [];
   i.push(`${t}:`);
-  const s = e.length > 1 || e.some((o) => o.includes(Ho));
-  s ? i.push(Ho, rk) : i.push(" ");
+  const s = e.length > 1 || e.some((o) => o.includes(Qo));
+  s ? i.push(Qo, rk) : i.push(" ");
   for (let o = 0; o < e.length; o++) {
     const u = e[o];
-    i.push(...u), e.length > 1 && o < e.length - 1 && i.push(r), s && o < e.length - 1 && i.push(Ho);
+    i.push(...u), e.length > 1 && o < e.length - 1 && i.push(r), s && o < e.length - 1 && i.push(Qo);
   }
   return s && i.push(ik), i;
 }
@@ -116969,7 +116969,7 @@ function QKe(t) {
 function zKe(t) {
   const e = [];
   for (let r = 0; r < t.length; r++)
-    r !== 0 && e.push(Ho), e.push(...QKe(t[r]));
+    r !== 0 && e.push(Qo), e.push(...QKe(t[r]));
   return e;
 }
 function h0e(t) {
@@ -117021,7 +117021,7 @@ function m2(t) {
   return t ? t.flatMap(KKe) : [];
 }
 function KKe(t) {
-  return [t.value.trim(), Ho];
+  return [t.value.trim(), Qo];
 }
 var g2 = {};
 Object.defineProperty(g2, "__esModule", { value: !0 });
@@ -119375,7 +119375,7 @@ CT.STANDARDSQL_MALLOY_STANDARD_OVERLOADS = {
 };
 Object.defineProperty(sE, "__esModule", { value: !0 });
 sE.StandardSQLDialect = void 0;
-const QW = mn, Cu = Ve, zW = Bc, eXe = od, tXe = vT, nXe = CT;
+const QW = mn, Su = Ve, zW = Bc, eXe = od, tXe = vT, nXe = CT;
 function GW(t) {
   return [
     "microsecond",
@@ -119510,10 +119510,10 @@ ${(0, QW.indent)(r)}
   }
   sqlTruncExpr(e, r) {
     const i = e_(e), s = i ? `, "${i}"` : "";
-    return Cu.TD.isDate(r.e.typeDef) ? rXe(r.units) ? `DATE_TRUNC(${r.e.sql},${r.units})` : `TIMESTAMP(${r.e.sql}${s})` : `TIMESTAMP_TRUNC(${r.e.sql},${r.units}${s})`;
+    return Su.TD.isDate(r.e.typeDef) ? rXe(r.units) ? `DATE_TRUNC(${r.e.sql},${r.units})` : `TIMESTAMP(${r.e.sql}${s})` : `TIMESTAMP_TRUNC(${r.e.sql},${r.units}${s})`;
   }
   sqlTimeExtractExpr(e, r) {
-    const i = iXe[r.units] || r.units, s = Cu.TD.isTimestamp(r.e.typeDef) && e_(e), o = s ? ` AT TIME ZONE '${s}'` : "";
+    const i = iXe[r.units] || r.units, s = Su.TD.isTimestamp(r.e.typeDef) && e_(e), o = s ? ` AT TIME ZONE '${s}'` : "";
     return `EXTRACT(${i} FROM ${r.e.sql}${o})`;
   }
   sqlAlterTimeExpr(e) {
@@ -119528,15 +119528,15 @@ ${(0, QW.indent)(r)}
   }
   sqlCast(e, r) {
     const { op: i, srcTypeDef: s, dstTypeDef: o, dstSQLType: u } = this.sqlCastPrep(r), a = e_(e), l = r.e.sql || "";
-    return i === "timestamp::date" && a ? `DATE(${l},'${a}')` : i === "date::timestamp" && a ? `TIMESTAMP(${l}, '${a}')` : Cu.TD.eq(s, o) ? l : `${r.safe ? "SAFE_CAST" : "CAST"}(${l} AS ${u})`;
+    return i === "timestamp::date" && a ? `DATE(${l},'${a}')` : i === "date::timestamp" && a ? `TIMESTAMP(${l}, '${a}')` : Su.TD.eq(s, o) ? l : `${r.safe ? "SAFE_CAST" : "CAST"}(${l} AS ${u})`;
   }
   sqlRegexpMatch(e) {
     return `REGEXP_CONTAINS(${e.kids.expr.sql},${e.kids.regex.sql})`;
   }
   sqlLiteralTime(e, r) {
-    if (Cu.TD.isDate(r.typeDef))
+    if (Su.TD.isDate(r.typeDef))
       return `DATE('${r.literal}')`;
-    if (Cu.TD.isTimestamp(r.typeDef)) {
+    if (Su.TD.isTimestamp(r.typeDef)) {
       let i = `'${r.literal}'`;
       const s = r.timezone || e_(e);
       return s && s !== "UTC" && (i += `,'${s}'`), `TIMESTAMP(${i})`;
@@ -119558,9 +119558,9 @@ ${(0, QW.indent)(r)}
       const { use: a, ratio: l } = r[e.units];
       if (!GW(a))
         throw new Error(`Measure in '${a} not implemented`);
-      if (!Cu.TD.eq(i.typeDef, s.typeDef))
+      if (!Su.TD.eq(i.typeDef, s.typeDef))
         throw new Error("Can't measure difference between different types");
-      Cu.TD.isDate(i.typeDef) && (o = `TIMESTAMP(${o})`, u = `TIMESTAMP(${u})`);
+      Su.TD.isDate(i.typeDef) && (o = `TIMESTAMP(${o})`, u = `TIMESTAMP(${u})`);
       let c = `TIMESTAMP_DIFF(${u},${o},${a})`;
       return l !== 1 && (c = `FLOOR(${c}/${l.toString()}.0)`), c;
     }
@@ -119568,9 +119568,9 @@ ${(0, QW.indent)(r)}
   }
   sqlSampleTable(e, r) {
     if (r !== void 0) {
-      if ((0, Cu.isSamplingEnable)(r) && r.enable && (r = this.defaultSampling), (0, Cu.isSamplingRows)(r))
+      if ((0, Su.isSamplingEnable)(r) && r.enable && (r = this.defaultSampling), (0, Su.isSamplingRows)(r))
         throw new Error("StandardSQL doesn't support sampling by rows only percent");
-      if ((0, Cu.isSamplingPercent)(r))
+      if ((0, Su.isSamplingPercent)(r))
         return `(SELECT * FROM ${e}  TABLESAMPLE SYSTEM (${r.percent} PERCENT))`;
     }
     return e;
@@ -122347,12 +122347,12 @@ kc(new ZXe.MySQLDialect());
     return x.TinyParser;
   } });
 })(y2);
-var ni = {}, tu = {}, PT = {}, $s = {};
+var ni = {}, nu = {}, PT = {}, $s = {};
 Object.defineProperty($s, "__esModule", { value: !0 });
 $s.addModelScope = nZe;
 $s.annotationToTaglines = B0e;
 $s.annotationToTag = k0e;
-const uV = Xo;
+const uV = Zo;
 function nZe(t, e) {
   const r = t ? { ...t } : {};
   return r.scopes ? r.scopes = r.scopes.concat(e) : r.scopes = [e], r;
@@ -123524,7 +123524,7 @@ Object.defineProperty(_k, "__esModule", { value: !0 });
 function BZe(t) {
   return t[0];
 }
-const kZe = $Ze(Ak), n7 = Ar, Do = kZe.default.compile({
+const kZe = $Ze(Ak), n7 = Ar, Oo = kZe.default.compile({
   WS: /[ \t]+/,
   comma: ",",
   semi: ";",
@@ -123533,28 +123533,28 @@ const kZe = $Ze(Ak), n7 = Ar, Do = kZe.default.compile({
   close: ")",
   minus: "-",
   matchStr: /(?:\\[^\n]|[^\n,;()|])+/
-}), PZe = Do.next;
-Do.next = /* @__PURE__ */ ((t) => () => {
+}), PZe = Oo.next;
+Oo.next = /* @__PURE__ */ ((t) => () => {
   for (; ; ) {
-    const e = t.call(Do);
+    const e = t.call(Oo);
     if (e == null || e.type !== "WS")
       return e;
   }
 })(PZe);
 const MZe = {
-  Lexer: Do,
+  Lexer: Oo,
   ParserRules: [
     { name: "stringFilter", symbols: ["stringFilter", "conjunction", "sfUnary"], postprocess: ([t, e, r]) => (0, n7.conjoin)(t, e[0].text, r) },
     { name: "stringFilter", symbols: ["sfUnary"], postprocess: (t) => t[0] },
-    { name: "sfUnary$ebnf$1", symbols: [Do.has("minus") ? { type: "minus" } : minus], postprocess: BZe },
+    { name: "sfUnary$ebnf$1", symbols: [Oo.has("minus") ? { type: "minus" } : minus], postprocess: BZe },
     { name: "sfUnary$ebnf$1", symbols: [], postprocess: () => null },
     { name: "sfUnary", symbols: ["sfUnary$ebnf$1", "clause"], postprocess: (t) => (0, n7.maybeNot)(t) },
-    { name: "parens", symbols: [Do.has("open") ? { type: "open" } : open, "stringFilter", Do.has("close") ? { type: "close" } : close], postprocess: ([t, e, r]) => ({ operator: "()", expr: e }) },
-    { name: "clause", symbols: [Do.has("matchStr") ? { type: "matchStr" } : matchStr], postprocess: ([t]) => (0, n7.matchOp)(t.text) },
+    { name: "parens", symbols: [Oo.has("open") ? { type: "open" } : open, "stringFilter", Oo.has("close") ? { type: "close" } : close], postprocess: ([t, e, r]) => ({ operator: "()", expr: e }) },
+    { name: "clause", symbols: [Oo.has("matchStr") ? { type: "matchStr" } : matchStr], postprocess: ([t]) => (0, n7.matchOp)(t.text) },
     { name: "clause", symbols: ["parens"], postprocess: (t) => t[0] },
-    { name: "conjunction", symbols: [Do.has("comma") ? { type: "comma" } : comma] },
-    { name: "conjunction", symbols: [Do.has("semi") ? { type: "semi" } : semi] },
-    { name: "conjunction", symbols: [Do.has("or") ? { type: "or" } : or] }
+    { name: "conjunction", symbols: [Oo.has("comma") ? { type: "comma" } : comma] },
+    { name: "conjunction", symbols: [Oo.has("semi") ? { type: "semi" } : semi] },
+    { name: "conjunction", symbols: [Oo.has("or") ? { type: "or" } : or] }
   ],
   ParserStart: "stringFilter"
 };
@@ -124282,10 +124282,10 @@ const aE = /* @__PURE__ */ ZY(Wme);
   }
   t.TemporalFilterCompiler = p;
 })(P0e);
-Object.defineProperty(tu, "__esModule", { value: !0 });
-tu.QueryModel = tu.Segment = void 0;
-tu.getResultStructDefForView = cet;
-tu.getResultStructDefForQuery = fet;
+Object.defineProperty(nu, "__esModule", { value: !0 });
+nu.QueryModel = nu.Segment = void 0;
+nu.getResultStructDefForView = cet;
+nu.getResultStructDefForQuery = fet;
 const zZe = E2, GZe = y2, WZe = sE, Ie = Ve, An = mn, aS = PT, VZe = $s, YZe = P0e, n_ = oE;
 function G0e(t) {
   return t.map((e) => encodeURIComponent(e)).join("/");
@@ -125275,7 +125275,7 @@ class aet {
     ).getResultStructDef();
   }
 }
-tu.Segment = aet;
+nu.Segment = aet;
 function cet(t, e) {
   const r = new pl(t, void 0, {
     model: new jT(void 0)
@@ -126727,7 +126727,7 @@ ${u.dialect.sqlFinalStage("__stage0", [
     })).rows;
   }
 }
-tu.QueryModel = jT;
+nu.QueryModel = jT;
 (function(t) {
   var e = T && T.__createBinding || (Object.create ? function(o, u, a, l) {
     l === void 0 && (l = a);
@@ -126741,7 +126741,7 @@ tu.QueryModel = jT;
     for (var a in o) a !== "default" && !Object.prototype.hasOwnProperty.call(u, a) && e(u, o, a);
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), t.composeSQLExpr = t.indent = t.QueryModel = t.Segment = void 0, r(Ve, t);
-  var i = tu;
+  var i = nu;
   Object.defineProperty(t, "Segment", { enumerable: !0, get: function() {
     return i.Segment;
   } }), Object.defineProperty(t, "QueryModel", { enumerable: !0, get: function() {
@@ -127610,7 +127610,7 @@ Object.defineProperty(Xe, "__esModule", { value: !0 });
 Xe.Document = Xe.DocStatementList = Xe.ListOf = Xe.ExperimentalExperiment = Xe.ModelEntryReference = Xe.Unimplemented = Xe.MalloyElement = void 0;
 Xe.isDocStatement = oce;
 Xe.isDocStatementOrDocStatementList = rtt;
-const pV = y2, ov = Ve, Yet = Xo, Ket = A2, Jet = go, Xet = HT, Zet = fE, mV = as, ett = E2;
+const pV = y2, ov = Ve, Yet = Zo, Ket = A2, Jet = go, Xet = HT, Zet = fE, mV = as, ett = E2;
 class Qu {
   /**
    * @param kids All children passed to the constructor are not optional
@@ -128249,7 +128249,7 @@ function Rtt(t) {
   }
   return r;
 }
-var Qo = {}, Zt = {};
+var zo = {}, Zt = {};
 Object.defineProperty(Zt, "__esModule", { value: !0 });
 Zt.computedExprValue = dE;
 Zt.computedTimeResult = Dtt;
@@ -128802,8 +128802,8 @@ var snt = T && T.__createBinding || (Object.create ? function(t, e, r, i) {
     return ont(r, e), r;
   };
 }();
-Object.defineProperty(Qo, "__esModule", { value: !0 });
-Qo.ExprLegacyIn = Qo.ExprEquality = Qo.ExprCompare = void 0;
+Object.defineProperty(zo, "__esModule", { value: !0 });
+zo.ExprLegacyIn = zo.ExprEquality = zo.ExprCompare = void 0;
 const sn = unt(Xt), ant = Zt, lnt = lt, cnt = gE, fnt = {
   "~": [sn.stringT],
   "!~": [sn.stringT],
@@ -128822,7 +128822,7 @@ class gce extends cnt.BinaryBoolean {
     return this.right.apply(e, this.op, this.left);
   }
 }
-Qo.ExprCompare = gce;
+zo.ExprCompare = gce;
 class xnt extends gce {
   constructor(e, r, i) {
     super(e, r, i), this.elementType = "a~=b";
@@ -128834,7 +128834,7 @@ class xnt extends gce {
     return super.apply(e, r, i, !0);
   }
 }
-Qo.ExprEquality = xnt;
+zo.ExprEquality = xnt;
 class dnt extends lnt.ExpressionDef {
   constructor(e, r, i) {
     super(), this.expr = e, this.notIn = r, this.choices = i, this.elementType = "in", this.has({ expr: e, choices: i });
@@ -128852,7 +128852,7 @@ class dnt extends lnt.ExpressionDef {
     });
   }
 }
-Qo.ExprLegacyIn = dnt;
+zo.ExprLegacyIn = dnt;
 var zT = {}, yE = {};
 Object.defineProperty(yE, "__esModule", { value: !0 });
 yE.PassthroughSpace = void 0;
@@ -128930,7 +128930,7 @@ class ynt extends gnt.MalloyElement {
   }
 }
 Vl.FieldName = ynt;
-var nu = {}, Mc = {};
+var ru = {}, Mc = {};
 Object.defineProperty(Mc, "__esModule", { value: !0 });
 Mc.ExprIdReference = void 0;
 const Ent = Ve, Ant = lt;
@@ -129388,9 +129388,9 @@ class Ynt extends Vnt.ExpressionDef {
   }
 }
 CE.ExprFilterExpression = Ynt;
-Object.defineProperty(nu, "__esModule", { value: !0 });
-nu.Filter = nu.FilterElement = void 0;
-const vV = Ve, Knt = Pi, CV = Qo, SV = Mc, Jnt = GT, Cce = Xe, s7 = wn, Xnt = CE;
+Object.defineProperty(ru, "__esModule", { value: !0 });
+ru.Filter = ru.FilterElement = void 0;
+const vV = Ve, Knt = Pi, CV = zo, SV = Mc, Jnt = GT, Cce = Xe, s7 = wn, Xnt = CE;
 class Znt extends Cce.MalloyElement {
   constructor(e, r) {
     super({ expr: e }), this.expr = e, this.exprSrc = r, this.elementType = "filterElement";
@@ -129452,7 +129452,7 @@ class Znt extends Cce.MalloyElement {
       };
   }
 }
-nu.FilterElement = Znt;
+ru.FilterElement = Znt;
 class ert extends Cce.ListOf {
   constructor() {
     super(...arguments), this.elementType = "filter", this.forceQueryClass = void 0, this.queryRefinementStage = s7.LegalRefinementStage.Head;
@@ -129487,11 +129487,11 @@ class ert extends Cce.ListOf {
     }
   }
 }
-nu.Filter = ert;
+ru.Filter = ert;
 Object.defineProperty(Ol, "__esModule", { value: !0 });
 Ol.Drill = Ol.DrillField = void 0;
 Ol.attachDrillPaths = art;
-const dm = Mt, Tu = Ve, trt = Pi, nrt = Qo, rrt = zT, bV = ld, irt = lt, o7 = Vl, srt = wn, TV = _r, ort = nu;
+const dm = Mt, To = Ve, trt = Pi, nrt = zo, rrt = zT, bV = ld, irt = lt, o7 = Vl, srt = wn, TV = _r, ort = ru;
 class Sce extends irt.ExpressionDef {
   constructor(e, r) {
     super(), this.expr = e, this.typeDesc = r, this.elementType = "drillField";
@@ -129539,7 +129539,7 @@ class urt extends ort.Filter {
     }
     const y = g.found.typeDesc();
     if (y.type !== "turtle" || !(g.found instanceof bV.ViewField)) {
-      const K = (0, Tu.isAtomic)(y) ? y.type : "join";
+      const K = (0, To.isAtomic)(y) ? y.type : "join";
       r.logError("drill-view-reference-not-view", `Head of drill reference must be a view, not a ${K}`);
       return;
     }
@@ -129569,19 +129569,21 @@ class urt extends ort.Filter {
           const I = te.path.map((L) => new o7.FieldName(L));
           this.has({ morePathFieldNames: I });
           const N = l.lookup(I);
-          return N.found && N.found instanceof TV.SpaceField && (Ae = N.found.fieldDef(), Ae && (0, Tu.isAtomic)(Ae) && (0, Tu.expressionIsScalar)(Ae.expressionType)) ? te.path[te.path.length - 1] : void 0;
-        } else if ((0, Tu.isAtomic)(te) && (0, Tu.expressionIsScalar)(te.expressionType))
+          return N.found && N.found instanceof TV.SpaceField && (Ae = N.found.fieldDef(), Ae && (0, To.isAtomic)(Ae) && (0, To.expressionIsScalar)(Ae.expressionType)) ? te.path[te.path.length - 1] : void 0;
+        } else if ((0, To.isAtomic)(te) && (0, To.expressionIsScalar)(te.expressionType))
           return (le = te.as) !== null && le !== void 0 ? le : te.name;
       }).filter(trt.isNotUndefined);
-      if (b.push(...xe.map((te) => [...S, te])), !f.some((te) => (0, dm.pathBegins)(te.nestPath, S)))
-        for (const te of (o = ce.filterList) !== null && o !== void 0 ? o : [])
-          x === void 0 ? (x = te.e, h = te.fieldUsage) : (x = {
+      if (b.push(...xe.map((te) => [...S, te])), !f.some((te) => (0, dm.pathBegins)(te.nestPath, S))) {
+        const te = (o = ce.filterList) !== null && o !== void 0 ? o : [];
+        for (const le of te)
+          (0, To.expressionIsAggregate)(le.expressionType) || (x === void 0 ? (x = le.e, h = le.fieldUsage) : (x = {
             node: "and",
             kids: {
               left: x,
-              right: te.e
+              right: le.e
             }
-          }, h = (0, dm.mergeFieldUsage)(h, te.fieldUsage));
+          }, h = (0, dm.mergeFieldUsage)(h, le.fieldUsage)));
+      }
       const ee = ce.queryFields.find((te) => {
         var le;
         return te.type === "fieldref" ? te.path[te.path.length - 1] === K.refString : (le = te.as) !== null && le !== void 0 ? le : te.name === K.refString;
@@ -129604,13 +129606,13 @@ class urt extends ort.Filter {
             return;
           }
           const Ae = le.found.fieldDef();
-          if (Ae === void 0 || (0, Tu.isAtomic)(Ae))
+          if (Ae === void 0 || (0, To.isAtomic)(Ae))
             v = Ae, C = { node: "field", path: ee.path };
           else {
             K.logError("drill-field-reference-not-field", "Final element of drill path must be a field");
             return;
           }
-        } else (0, Tu.isAtomic)(ee) && (v = ee, C = ee.e);
+        } else (0, To.isAtomic)(ee) && (v = ee, C = ee.e);
       else {
         let te;
         if (ee.type === "fieldref") {
@@ -129639,8 +129641,8 @@ class urt extends ort.Filter {
       r.logError("invalid-drill-reference", "Could not determine drill field");
       return;
     }
-    const R = (0, Tu.expressionIsAggregate)(v.expressionType);
-    if ((0, Tu.expressionIsAnalytic)(v.expressionType)) {
+    const R = (0, To.expressionIsAggregate)(v.expressionType);
+    if ((0, To.expressionIsAnalytic)(v.expressionType)) {
       r.logError("analytic-in-drill", "Analytic expressions are not allowed in `drill:`");
       return;
     } else R && r.logError("aggregate-in-drill", "Aggregate expressions are not allowed in `drill:`");
@@ -129684,7 +129686,7 @@ class urt extends ort.Filter {
 Ol.Drill = urt;
 function art(t, e) {
   var r;
-  return t.length !== 1 || !(0, Tu.isQuerySegment)(t[0]) ? t : [
+  return t.length !== 1 || !(0, To.isQuerySegment)(t[0]) ? t : [
     {
       ...t[0],
       filterList: (r = t[0].filterList) === null || r === void 0 ? void 0 : r.map((i) => ({
@@ -130461,31 +130463,31 @@ class pit extends hit.SpaceField {
   }
 }
 RE.RenameSpaceField = pit;
-var DE = {}, Mo = {};
-Object.defineProperty(Mo, "__esModule", { value: !0 });
-Mo.IncludeListItem = Mo.IncludeExceptItem = Mo.IncludeAccessItem = Mo.IncludeItem = void 0;
+var DE = {}, jo = {};
+Object.defineProperty(jo, "__esModule", { value: !0 });
+jo.IncludeListItem = jo.IncludeExceptItem = jo.IncludeAccessItem = jo.IncludeItem = void 0;
 const Oce = Xe, wce = as;
 class Vk extends Oce.MalloyElement {
 }
-Mo.IncludeItem = Vk;
+jo.IncludeItem = Vk;
 class mit extends Vk {
   constructor(e, r) {
     super(), this.kind = e, this.fields = r, this.elementType = "include-access-item", this.isNoteableObj = !0, this.extendNote = wce.extendNoteMethod, this.has({ fields: r });
   }
 }
-Mo.IncludeAccessItem = mit;
+jo.IncludeAccessItem = mit;
 class git extends Vk {
   constructor(e) {
     super(), this.fields = e, this.elementType = "include-except-item", this.kind = "except", this.has({ fields: e });
   }
 }
-Mo.IncludeExceptItem = git;
+jo.IncludeExceptItem = git;
 class yit extends Oce.MalloyElement {
   constructor(e, r) {
     super({ name: e }), this.name = e, this.as = r, this.elementType = "include-list-item", this.isNoteableObj = !0, this.extendNote = wce.extendNoteMethod;
   }
 }
-Mo.IncludeListItem = yit;
+jo.IncludeListItem = yit;
 var ct = {}, b2 = {}, Eit = T && T.__createBinding || (Object.create ? function(t, e, r, i) {
   i === void 0 && (i = r);
   var s = Object.getOwnPropertyDescriptor(e, r);
@@ -130603,16 +130605,16 @@ class Sit extends Cit.ListOf {
   }
 }
 ks.DefinitionList = Sit;
-var yu = {};
-Object.defineProperty(yu, "__esModule", { value: !0 });
-yu.typecheckProject = bit;
-yu.typecheckIndex = Tit;
-yu.typecheckDimension = Rit;
-yu.typecheckMeasure = Dit;
-yu.typecheckDeclare = Oit;
-yu.typecheckCalculate = wit;
-yu.typecheckAggregate = Fit;
-yu.typecheckGroupBy = Nit;
+var Eu = {};
+Object.defineProperty(Eu, "__esModule", { value: !0 });
+Eu.typecheckProject = bit;
+Eu.typecheckIndex = Tit;
+Eu.typecheckDimension = Rit;
+Eu.typecheckMeasure = Dit;
+Eu.typecheckDeclare = Oit;
+Eu.typecheckCalculate = wit;
+Eu.typecheckAggregate = Fit;
+Eu.typecheckGroupBy = Nit;
 const On = ni;
 function bit(t, e) {
   if (t.type === "turtle" || !(0, On.expressionIsScalar)(t.expressionType)) {
@@ -130707,7 +130709,7 @@ function Nit(t, e) {
 }
 Object.defineProperty(ct, "__esModule", { value: !0 });
 ct.FieldReferences = ct.WildcardFieldReference = ct.ViewOrScalarFieldReference = ct.DimensionFieldReference = ct.MeasureFieldReference = ct.DeclareFieldReference = ct.ProjectFieldReference = ct.GroupByFieldReference = ct.AggregateFieldReference = ct.IndexFieldReference = ct.CalculateFieldReference = ct.DrillFieldReference = ct.ParameterFieldReference = ct.GroupedByReference = ct.PartitionByFieldReference = ct.ExpressionFieldReference = ct.AccessModifierFieldReference = ct.AcceptExceptFieldReference = ct.FieldReference = void 0;
-const Lit = b2, Iit = ks, Fce = Xe, Nce = as, Uc = yu;
+const Lit = b2, Iit = ks, Fce = Xe, Nce = as, Uc = Eu;
 class Lr extends Fce.ListOf {
   constructor(e) {
     super(e), this.isNoteableObj = !0, this.extendNote = Nce.extendNoteMethod;
@@ -130927,7 +130929,7 @@ ct.FieldReferences = Jit;
 Object.defineProperty(DE, "__esModule", { value: !0 });
 DE.getIncludeStateForJoin = sN;
 DE.processIncludeList = Zit;
-const Lce = Ve, IV = Mo, hm = ct, Ice = Mt;
+const Lce = Ve, IV = jo, hm = ct, Ice = Mt;
 function Xit(t, e, r) {
   let i = t.fields;
   for (const s of e) {
@@ -131419,7 +131421,7 @@ class Fst extends bst.DefinitionList {
 Ki.JoinStatement = Fst;
 Object.defineProperty(SE, "__esModule", { value: !0 });
 SE.RefinedSource = void 0;
-const Nst = Ve, Lst = v2, Ist = qc, $st = nu, Bst = T2, kst = R2, Pst = D2, Mst = yo, jst = O2, Ust = nc, qst = rc, Hst = S2, Qst = Ki, BV = DE;
+const Nst = Ve, Lst = v2, Ist = qc, $st = ru, Bst = T2, kst = R2, Pst = D2, Mst = yo, jst = O2, Ust = nc, qst = rc, Hst = S2, Qst = Ki, BV = DE;
 class zst extends Mst.Source {
   constructor(e, r, i) {
     super({ source: e, refinement: r }), this.source = e, this.refinement = r, this.includeList = i, this.elementType = "refinedSource", i && this.has({ includeList: i });
@@ -131476,9 +131478,9 @@ class zst extends Mst.Source {
   }
 }
 SE.RefinedSource = zst;
-var Eu = {};
-Object.defineProperty(Eu, "__esModule", { value: !0 });
-Eu.SourceQueryElement = void 0;
+var Au = {};
+Object.defineProperty(Au, "__esModule", { value: !0 });
+Au.SourceQueryElement = void 0;
 const Gst = Xe;
 class Xk extends Gst.MalloyElement {
   constructor() {
@@ -131506,7 +131508,7 @@ class Xk extends Gst.MalloyElement {
     return e;
   }
 }
-Eu.SourceQueryElement = Xk;
+Au.SourceQueryElement = Xk;
 var YT = {}, dd = {};
 Object.defineProperty(dd, "__esModule", { value: !0 });
 dd.QuerySource = void 0;
@@ -131603,7 +131605,7 @@ class rot extends tot.QueryBase {
 w2.QueryArrow = rot;
 Object.defineProperty(YT, "__esModule", { value: !0 });
 YT.SQArrow = void 0;
-const iot = Eu, sot = dd, oot = w2;
+const iot = Au, sot = dd, oot = w2;
 class uot extends iot.SourceQueryElement {
   constructor(e, r) {
     super({ applyTo: e, operation: r }), this.applyTo = e, this.operation = r, this.elementType = "sq-arrow";
@@ -131633,7 +131635,7 @@ Object.defineProperty(Fa, "__esModule", { value: !0 });
 Fa.opOutputStruct = jce;
 Fa.getFinalStruct = lot;
 Fa.getStructFieldDef = cot;
-const MV = X0, aot = tu, s_ = Ve, jV = ri;
+const MV = X0, aot = nu, s_ = Ve, jV = ri;
 function jce(t, e, r) {
   const i = jV.ErrorFactory.didCreate(e) || (0, s_.structHasErrors)(e);
   (0, s_.isPartialSegment)(r) && (r = { ...r, type: "reduce" });
@@ -131841,7 +131843,7 @@ class wot extends Tot.MalloyElement {
 FE.QueryReference = wot;
 Object.defineProperty(wE, "__esModule", { value: !0 });
 wE.SQReference = void 0;
-const Fot = Eu, Not = dd, Lot = N2, qV = FE, HV = ni;
+const Fot = Au, Not = dd, Lot = N2, qV = FE, HV = ni;
 class Iot extends Fot.SourceQueryElement {
   constructor(e, r) {
     super({ ref: e }), this.ref = e, this.args = r, this.elementType = "sq-reference", r !== void 0 && this.has({ args: r });
@@ -131885,7 +131887,7 @@ class Iot extends Fot.SourceQueryElement {
 wE.SQReference = Iot;
 Object.defineProperty(KT, "__esModule", { value: !0 });
 KT.SQRefine = void 0;
-const $ot = Eu, Bot = dd, kot = F2, Pot = wE;
+const $ot = Au, Bot = dd, kot = F2, Pot = wE;
 class Mot extends $ot.SourceQueryElement {
   constructor(e, r) {
     super({ toRefine: e, refine: r }), this.toRefine = e, this.refine = r, this.elementType = "sq-refine";
@@ -131940,7 +131942,7 @@ var LE = {}, hd = {};
 Object.defineProperty(hd, "__esModule", { value: !0 });
 hd.compileSQLInterpolation = Got;
 hd.sqlKey = Wot;
-const Hot = tu, Qot = Ve, zot = mn;
+const Hot = nu, Qot = Ve, zot = mn;
 function Got(t, e, r) {
   let i, s = "", o = !1;
   for (const u of t)
@@ -132051,7 +132053,7 @@ class Yot extends Vot.Source {
 LE.SQLSource = Yot;
 Object.defineProperty(XT, "__esModule", { value: !0 });
 XT.SQSource = void 0;
-const Kot = Eu, Jot = NE, Xot = LE;
+const Kot = Au, Jot = NE, Xot = LE;
 class Zot extends Kot.SourceQueryElement {
   constructor(e) {
     super({ theSource: e }), this.theSource = e, this.elementType = "sq-source";
@@ -132074,7 +132076,7 @@ XT.SQSource = Zot;
 var ZT = {};
 Object.defineProperty(ZT, "__esModule", { value: !0 });
 ZT.SQExtend = void 0;
-const eut = SE, tut = Eu;
+const eut = SE, tut = Au;
 class nut extends tut.SourceQueryElement {
   constructor(e, r, i) {
     super({ sqSrc: e, extend: r }), this.sqSrc = e, this.extend = r, this.includeList = i, this.elementType = "sq-extend";
@@ -132191,7 +132193,7 @@ function QV(t) {
 }
 Object.defineProperty(eR, "__esModule", { value: !0 });
 eR.SQCompose = void 0;
-const sut = tR, out = Eu;
+const sut = tR, out = Au;
 class uut extends out.SourceQueryElement {
   constructor(e) {
     super({ sources: e }), this.sources = e, this.elementType = "sq-compose";
@@ -132302,7 +132304,7 @@ class hut extends dut.ExpressionDef {
 IE.ExprGranularTime = hut;
 Object.defineProperty(nR, "__esModule", { value: !0 });
 nR.Apply = void 0;
-const put = Qo, mut = hE, VV = IE;
+const put = zo, mut = hE, VV = IE;
 class gut extends put.ExprCompare {
   constructor(e, r) {
     super(e, "=", r), this.left = e, this.right = r, this.elementType = "apply";
@@ -133904,7 +133906,7 @@ h3.pluralMap = {
   minutes: "minute",
   seconds: "second"
 };
-var vR = {}, zo = {}, CR = {};
+var vR = {}, Go = {}, CR = {};
 Object.defineProperty(CR, "__esModule", { value: !0 });
 CR.QueryInputSpace = void 0;
 const Nlt = Ki, Llt = v2;
@@ -133962,8 +133964,8 @@ var $lt = T && T.__createBinding || (Object.create ? function(t, e, r, i) {
     return Blt(r, e), r;
   };
 }();
-Object.defineProperty(zo, "__esModule", { value: !0 });
-zo.ReduceFieldSpace = zo.QuerySpace = zo.QueryOperationSpace = void 0;
+Object.defineProperty(Go, "__esModule", { value: !0 });
+Go.ReduceFieldSpace = Go.QuerySpace = Go.QueryOperationSpace = void 0;
 const fS = klt(Ve), p7 = C2, Gce = Vl, rY = _r, Plt = ct, Mlt = v2, jlt = TE, Ult = Rr, qlt = CR, zd = Mt, Hlt = xd;
 class Wce extends Mlt.RefinedSpace {
   get fieldUsage() {
@@ -134063,7 +134065,7 @@ class Wce extends Mlt.RefinedSpace {
     return r;
   }
 }
-zo.QueryOperationSpace = Wce;
+Go.QueryOperationSpace = Wce;
 class Vce extends Wce {
   addRefineFromFields(e) {
     var r;
@@ -134149,13 +134151,13 @@ class Vce extends Wce {
     return !0;
   }
 }
-zo.QuerySpace = Vce;
+Go.QuerySpace = Vce;
 class Qlt extends Vce {
   constructor() {
     super(...arguments), this.segmentType = "reduce";
   }
 }
-zo.ReduceFieldSpace = Qlt;
+Go.ReduceFieldSpace = Qlt;
 function zlt(t) {
   return typeof t != "string" && t.type === "turtle" && t.pipeline.length === 0;
 }
@@ -134188,7 +134190,7 @@ var Glt = T && T.__createBinding || (Object.create ? function(t, e, r, i) {
 }();
 Object.defineProperty(vR, "__esModule", { value: !0 });
 vR.ExprUngroup = void 0;
-const iY = Ve, Ylt = zo, Klt = b2, sY = Vlt(Xt), Jlt = lt;
+const iY = Ve, Ylt = Go, Klt = b2, sY = Vlt(Xt), Jlt = lt;
 class Xlt extends Jlt.ExpressionDef {
   constructor(e, r, i) {
     super({ expr: r, fields: i }), this.control = e, this.expr = r, this.fields = i, this.legalChildTypes = sY.anyAtomicT, this.elementType = "ungroup";
@@ -135099,7 +135101,7 @@ ME.SampleProperty = Sct;
 var PR = {};
 Object.defineProperty(PR, "__esModule", { value: !0 });
 PR.IndexFieldSpace = void 0;
-const bct = Mt, pY = Ve, y7 = ct, Tct = _r, Rct = zo, Dct = b2, Oct = Rr;
+const bct = Mt, pY = Ve, y7 = ct, Tct = _r, Rct = Go, Dct = b2, Oct = Rr;
 class wct extends Rct.QueryOperationSpace {
   constructor() {
     super(...arguments), this.segmentType = "index";
@@ -135177,7 +135179,7 @@ class wct extends Rct.QueryOperationSpace {
 PR.IndexFieldSpace = wct;
 Object.defineProperty(kR, "__esModule", { value: !0 });
 kR.IndexBuilder = void 0;
-const E7 = Ve, Fct = ri, Nct = nu, Lct = PE, Ict = Hc, $ct = ME, Bct = PR, A7 = Mt;
+const E7 = Ve, Fct = ri, Nct = ru, Lct = PE, Ict = Hc, $ct = ME, Bct = PR, A7 = Mt;
 class kct {
   constructor(e, r, i, s) {
     this.filters = [], this.alwaysJoins = [], this.requiredGroupBys = [], this.type = "index", this.resultFS = new Bct.IndexFieldSpace(e, r, i, s), this.inputFS = this.resultFS.inputSpace();
@@ -135212,7 +135214,7 @@ jE.GroupBy = Mct;
 var jR = {};
 Object.defineProperty(jR, "__esModule", { value: !0 });
 jR.ProjectFieldSpace = void 0;
-const m_ = Ve, jct = zo;
+const m_ = Ve, jct = Go;
 class Uct extends jct.QuerySpace {
   constructor() {
     super(...arguments), this.segmentType = "project";
@@ -135255,7 +135257,7 @@ class zct extends Yce.ListOf {
 Sx.Ordering = zct;
 Object.defineProperty(sc, "__esModule", { value: !0 });
 sc.ReduceBuilder = sc.QuerySegmentBuilder = void 0;
-const To = Ve, Gct = ri, Wct = Vl, Vct = Hc, Yct = Sx, Kct = zo, Jct = ks, Xct = Mt;
+const Ro = Ve, Gct = ri, Wct = Vl, Vct = Hc, Yct = Sx, Kct = Go, Jct = ks, Xct = Mt;
 function yY(t) {
   return t.type === "fieldref" ? t.path[t.path.length - 1] : t.name;
 }
@@ -135278,7 +135280,7 @@ class Kce {
     e && e.type !== "index" && e.type !== "raw" && (!this.limit && e.orderBy && !e.defaultOrderBy && (r.orderBy = e.orderBy), !this.limit && e.limit && (r.limit = e.limit)), this.order && (r.orderBy = this.order.getOrderBy(this.inputFS), delete r.defaultOrderBy), this.limit && (r.limit = this.limit);
     const s = (e == null ? void 0 : e.filterList) || [];
     this.filters.length > 0 && !s ? r.filterList = this.filters : s && (r.filterList = [...s, ...this.filters]), this.alwaysJoins.length > 0 && (r.alwaysJoins = [...this.alwaysJoins]);
-    const o = e && (0, To.isQuerySegment)(e) ? (i = e.fieldUsage) !== null && i !== void 0 ? i : [] : [];
+    const o = e && (0, Ro.isQuerySegment)(e) ? (i = e.fieldUsage) !== null && i !== void 0 ? i : [] : [];
     r.fieldUsage = (0, Xct.mergeFieldUsage)(o, this.fieldUsage);
   }
 }
@@ -135290,7 +135292,7 @@ class Zct extends Kce {
   finalize(e) {
     let r;
     if (e)
-      if ((0, To.isReduceSegment)(e) || (0, To.isPartialSegment)(e))
+      if ((0, Ro.isReduceSegment)(e) || (0, Ro.isPartialSegment)(e))
         r = e;
       else
         return this.resultFS.logError("incompatible-segment-for-reduce-refinement", `Can't refine reduce with ${e.type}`), Gct.ErrorFactory.reduceSegment;
@@ -135311,16 +135313,16 @@ class Zct extends Kce {
           const f = o.path.map((h) => new Wct.FieldName(h)), x = this.inputFS.lookup(f).found;
           if (x) {
             const h = x.typeDesc();
-            l = h.type, u = (0, To.expressionIsAggregate)(h.expressionType), a = (0, To.expressionIsAnalytic)(h.expressionType);
+            l = h.type, u = (0, Ro.expressionIsAggregate)(h.expressionType), a = (0, Ro.expressionIsAnalytic)(h.expressionType);
           } else
             continue;
         } else
-          l = o.type, u = (0, To.hasExpression)(o) && (0, To.expressionIsAggregate)(o.expressionType), a = (0, To.hasExpression)(o) && (0, To.expressionIsAnalytic)(o.expressionType);
-        if ((0, To.isTemporalType)(l) || u) {
+          l = o.type, u = (0, Ro.hasExpression)(o) && (0, Ro.expressionIsAggregate)(o.expressionType), a = (0, Ro.hasExpression)(o) && (0, Ro.expressionIsAnalytic)(o.expressionType);
+        if ((0, Ro.isTemporalType)(l) || u) {
           i.defaultOrderBy = !0, i.orderBy = [{ field: c, dir: "desc" }], s = void 0;
           break;
         }
-        (0, To.canOrderBy)(l) && !a && !s && (s = c);
+        (0, Ro.canOrderBy)(l) && !a && !s && (s = c);
       }
       s && (i.defaultOrderBy = !0, i.orderBy = [{ field: s, dir: "asc" }]);
     }
@@ -135511,7 +135513,7 @@ var Cft = T && T.__createBinding || (Object.create ? function(t, e, r, i) {
 }();
 Object.defineProperty(Bn, "__esModule", { value: !0 });
 Bn.FieldDefinitionValue = Bn.DimensionFieldDeclaration = Bn.MeasureFieldDeclaration = Bn.DeclareFieldDeclaration = Bn.ProjectFieldDeclaration = Bn.GroupByFieldDeclaration = Bn.AggregateFieldDeclaration = Bn.CalculateFieldDeclaration = Bn.AtomicFieldDeclaration = void 0;
-const xN = Ve, _Y = bft(Xt), Tft = hE, Rft = Xe, pd = yu, Dft = as, Oft = _r, vY = qR;
+const xN = Ve, _Y = bft(Xt), Tft = hE, Rft = Xe, pd = Eu, Dft = as, Oft = _r, vY = qR;
 class zc extends Rft.MalloyElement {
   constructor(e, r, i) {
     super({ expr: e }), this.expr = e, this.defineName = r, this.exprSrc = i, this.isNoteableObj = !0, this.extendNote = Dft.extendNoteMethod;
@@ -135745,7 +135747,7 @@ ls.idToStr = rfe;
 ls.getOptionalId = Kft;
 ls.unIndent = sfe;
 ls.getPlainString = Xft;
-const Xce = Xo;
+const Xce = Zo;
 function Zce(t) {
   var e, r;
   const i = ((e = t.DQ_STRING()) === null || e === void 0 ? void 0 : e.text) || ((r = t.SQ_STRING()) === null || r === void 0 ? void 0 : r.text);
@@ -135956,7 +135958,7 @@ B0.TableFunctionSource = sxt;
 var WR = {};
 Object.defineProperty(WR, "__esModule", { value: !0 });
 WR.SQLString = void 0;
-const oxt = Xe, afe = Eu;
+const oxt = Xe, afe = Au;
 class uxt extends oxt.MalloyElement {
   constructor() {
     super(...arguments), this.elementType = "sqlString", this.elements = [], this.containsQueries = !1;
@@ -135998,7 +136000,7 @@ VR.SourceDesc = cxt;
 var nP = {};
 Object.defineProperty(nP, "__esModule", { value: !0 });
 nP.isSourceProperty = Axt;
-const fxt = nu, xxt = qc, dxt = T2, hxt = rc, pxt = R2, mxt = D2, gxt = O2, yxt = nc, Ext = Ki;
+const fxt = ru, xxt = qc, dxt = T2, hxt = rc, pxt = R2, mxt = D2, gxt = O2, yxt = nc, Ext = Ki;
 function Axt(t) {
   return t instanceof fxt.Filter || t instanceof Ext.JoinStatement || t instanceof xxt.DeclareFields || t instanceof dxt.FieldListEdit || t instanceof hxt.Renames || t instanceof pxt.PrimaryKey || t instanceof yxt.ObjectAnnotation || t instanceof mxt.Views || t instanceof gxt.TimezoneStatement;
 }
@@ -136034,7 +136036,7 @@ function Nxt(t) {
 var uP = {};
 Object.defineProperty(uP, "__esModule", { value: !0 });
 uP.isFieldPropStatement = Pxt;
-const Lxt = ic, Ixt = nu, $xt = Hc, Bxt = B2, kxt = $2;
+const Lxt = ic, Ixt = ru, $xt = Hc, Bxt = B2, kxt = $2;
 function Pxt(t) {
   return t instanceof Ixt.Filter || t instanceof $xt.Limit || t instanceof kxt.PartitionBy || t instanceof Lxt.FunctionOrdering || t instanceof Bxt.GroupedBy;
 }
@@ -136050,7 +136052,7 @@ function Pxt(t) {
   }), r = T && T.__exportStar || function(i, s) {
     for (var o in i) o !== "default" && !Object.prototype.hasOwnProperty.call(s, o) && e(s, i, o);
   };
-  Object.defineProperty(t, "__esModule", { value: !0 }), r(f3, t), r(fp, t), r(xp, t), r(yo, t), r(SE, t), r(Eu, t), r(YT, t), r(KT, t), r(XT, t), r(wE, t), r(ZT, t), r(eR, t), r(Mo, t), r(T2, t), r(R2, t), r(rc, t), r(D2, t), r(O2, t), r(nR, t), r(L2, t), r(AE, t), r(dp, t), r(ic, t), r(rR, t), r(Yl, t), r(iR, t), r(I2, t), r(sR, t), r(oR, t), r(uR, t), r(Qo, t), r(aR, t), r(lR, t), r(cR, t), r($E, t), r(IE, t), r(Mc, t), r(fR, t), r(xR, t), r(dR, t), r(hR, t), r(pR, t), r(mR, t), r(gR, t), r(I0, t), r(vE, t), r(yR, t), r(CE, t), r(ER, t), r(EE, t), r(AR, t), r(_R, t), r(vR, t), r(SR, t), r($n, t), r(bR, t), r($2, t), r(B2, t), r(hp, t), r(pp, t), r(TR, t), r(Cx, t), r(jc, t), r(RR, t), r(BE, t), r($0, t), r(p3, t), r(DR, t), r(wR, t), r(FR, t), r(F2, t), r(w2, t), r(Qc, t), r(NR, t), r(LR, t), r($R, t), r(BR, t), r(Bn, t), r(ct, t), r(HR, t), r(QR, t), r(qc, t), r(UE, t), r(p3, t), r(nu, t), r(Ol, t), r(jE, t), r(PE, t), r(Ki, t), r(cE, t), r(Hc, t), r(qE, t), r(f3, t), r(zR, t), r(Sx, t), r(GR, t), r(kE, t), r(ME, t), r(N2, t), r(dd, t), r(LE, t), r(B0, t), r(WR, t), r(nc, t), r(Pc, t), r(VR, t), r(nP, t), r(lt, t), r(rP, t), r(Vl, t), r(Xe, t), r(iP, t), r(lfe, t), r(sP, t), r(oP, t), r(uP, t), r(GT, t);
+  Object.defineProperty(t, "__esModule", { value: !0 }), r(f3, t), r(fp, t), r(xp, t), r(yo, t), r(SE, t), r(Au, t), r(YT, t), r(KT, t), r(XT, t), r(wE, t), r(ZT, t), r(eR, t), r(jo, t), r(T2, t), r(R2, t), r(rc, t), r(D2, t), r(O2, t), r(nR, t), r(L2, t), r(AE, t), r(dp, t), r(ic, t), r(rR, t), r(Yl, t), r(iR, t), r(I2, t), r(sR, t), r(oR, t), r(uR, t), r(zo, t), r(aR, t), r(lR, t), r(cR, t), r($E, t), r(IE, t), r(Mc, t), r(fR, t), r(xR, t), r(dR, t), r(hR, t), r(pR, t), r(mR, t), r(gR, t), r(I0, t), r(vE, t), r(yR, t), r(CE, t), r(ER, t), r(EE, t), r(AR, t), r(_R, t), r(vR, t), r(SR, t), r($n, t), r(bR, t), r($2, t), r(B2, t), r(hp, t), r(pp, t), r(TR, t), r(Cx, t), r(jc, t), r(RR, t), r(BE, t), r($0, t), r(p3, t), r(DR, t), r(wR, t), r(FR, t), r(F2, t), r(w2, t), r(Qc, t), r(NR, t), r(LR, t), r($R, t), r(BR, t), r(Bn, t), r(ct, t), r(HR, t), r(QR, t), r(qc, t), r(UE, t), r(p3, t), r(ru, t), r(Ol, t), r(jE, t), r(PE, t), r(Ki, t), r(cE, t), r(Hc, t), r(qE, t), r(f3, t), r(zR, t), r(Sx, t), r(GR, t), r(kE, t), r(ME, t), r(N2, t), r(dd, t), r(LE, t), r(B0, t), r(WR, t), r(nc, t), r(Pc, t), r(VR, t), r(nP, t), r(lt, t), r(rP, t), r(Vl, t), r(Xe, t), r(iP, t), r(lfe, t), r(sP, t), r(oP, t), r(uP, t), r(GT, t);
 })(lE);
 var YR = {}, Mxt = T && T.__createBinding || (Object.create ? function(t, e, r, i) {
   i === void 0 && (i = r);
@@ -136081,7 +136083,7 @@ var YR = {}, Mxt = T && T.__createBinding || (Object.create ? function(t, e, r,
 }();
 Object.defineProperty(YR, "__esModule", { value: !0 });
 YR.MalloyToAST = void 0;
-const OY = d2, qxt = Kp, ie = Uxt(lE), v7 = A2, wY = yr, Hxt = lE, Nn = ls, g_ = Ve, Qxt = Xo, FY = Pi, zxt = oE;
+const OY = d2, qxt = Kp, ie = Uxt(lE), v7 = A2, wY = yr, Hxt = lE, Nn = ls, g_ = Ve, Qxt = Zo, FY = Pi, zxt = oE;
 class NY extends ie.SourceQueryElement {
   constructor() {
     super(...arguments), this.elementType = "parseErrorSourceQuery";
@@ -138563,7 +138565,7 @@ F.MatrixOperationContext = F.IsExploreContext = F.JoinListContext = F.QueryExten
 F.CompareOpContext = F.MalloyTypeContext = F.AggregateContext = F.SampleSpecContext = F.QueryAnnotationContext = F.TimezoneStatementContext = F.SampleStatementContext = F.IndexStatementContext = F.IndexFieldsContext = F.IndexElementContext = F.TopStatementContext = F.BySpecContext = F.LimitStatementContext = F.OrderBySpecContext = F.OrderingContext = F.OrderByStatementContext = F.GroupedByStatementContext = F.PartitionByStatementContext = F.ProjectStatementContext = F.CalculateStatementContext = F.AggregateStatementContext = F.NestDefContext = F.NestEntryContext = F.NestedQueryListContext = F.NestStatementContext = F.QueryFieldEntryContext = F.QueryFieldListContext = F.GroupByStatementContext = F.QueryJoinStatementContext = F.QueryStatementContext = F.DrillClauseListContext = F.DrillStatementContext = F.ExploreQueryDefContext = F.ExploreQueryNameDefContext = F.SubQueryDefListContext = F.HavingStatementContext = F.WhereStatementContext = F.FilterClauseListContext = F.FieldPropertyStatementContext = F.FieldPropertyLimitStatementContext = F.AggregateOrderByStatementContext = F.AggregateOrderBySpecContext = F.AggregateOrderingContext = F.FieldPropertiesContext = F.FilterStatementContext = F.JoinExpressionContext = F.JoinOnContext = F.JoinWithContext = F.JoinDefContext = F.JoinFromContext = void 0;
 F.ExprApplyContext = F.ExprWarnInContext = F.ExprNullCheckContext = F.ExprWarnLikeContext = F.ExprCompareContext = F.ExprOrTreeContext = F.ExprAndTreeContext = F.ExprForRangeContext = F.ExprRangeContext = F.ExprAddSubContext = F.ExprMulDivContext = F.ExprMinusContext = F.ExprSafeCastContext = F.ExprCastContext = F.ExprTimeTruncContext = F.ExprDurationContext = F.ExprFieldPropsContext = F.ExprLiteralRecordContext = F.ExprArrayLiteralContext = F.ExprLiteralContext = F.ExprFieldPathContext = F.FieldExprContext = F.MalloyOrSQLTypeContext = F.UngroupContext = F.TimeframeContext = F.IdContext = F.TableURIContext = F.TablePathContext = F.LiteralYearContext = F.LiteralQuarterContext = F.LiteralMonthContext = F.LiteralWeekContext = F.LiteralDayContext = F.LiteralHourContext = F.LiteralTimestampContext = F.DateLiteralContext = F.ExprNowContext = F.FilterString_stubContext = F.ExprRegexContext = F.ExprBoolContext = F.ExprNULLContext = F.ExprTimeContext = F.ExprNumberContext = F.Stub_rawStringContext = F.ExprStringContext = F.LiteralContext = F.NumericLiteralContext = F.RawStringContext = F.ShortStringContext = F.StringContext = void 0;
 F.ExperimentalStatementForTestingContext = F.DebugPartialContext = F.DebugExprContext = F.FilterStringContext = F.TickFilterStringContext = F.TripFilterStringContext = F.ConnectionNameContext = F.NameSQLBlockContext = F.SqlExploreNameRefContext = F.FieldNameContext = F.JoinNameContext = F.FieldPathContext = F.CollectionMemberContext = F.RefExprContext = F.TaggedRefContext = F.StarQualifiedContext = F.CollectionWildCardContext = F.FieldCollectionContext = F.FieldNameListContext = F.ArgumentListContext = F.RecordExprContext = F.RecordRefContext = F.RecordElementContext = F.RecordKeyContext = F.CaseWhenContext = F.CaseStatementContext = F.PickContext = F.PickStatementContext = F.FieldExprListContext = F.PartialAllowedFieldExprContext = F.PartialTestContext = F.PartialCompareContext = F.ExprUngroupContext = F.ExprCaseContext = F.ExprPickContext = F.ExprFuncContext = F.ExprAggFuncContext = F.ExprExprContext = F.ExprAggregateContext = F.ExprPathlessAggregateContext = F.ExprCoalesceContext = F.ExprLogicalOrContext = F.ExprLogicalAndContext = F.ExprNotContext = void 0;
-const qt = mu(), Rdt = a2(), Ddt = Lc, Yt = Gy(), Odt = f2(), pe = mo(), wdt = u2(), he = po, Ln = rn, Fdt = Ls, ffe = Tdt(vn);
+const qt = gu(), Rdt = a2(), Ddt = Lc, Yt = Gy(), Odt = f2(), pe = mo(), wdt = u2(), he = po, Ln = rn, Fdt = Ls, ffe = Tdt(vn);
 class d extends Odt.Parser {
   // @Override
   // @NotNull
@@ -151119,7 +151121,7 @@ var Hdt = T && T.__createBinding || (Object.create ? function(t, e, r, i) {
 }();
 Object.defineProperty(N0, "__esModule", { value: !0 });
 N0.MalloyTranslator = N0.MalloyChildTranslator = N0.MalloyTranslation = void 0;
-const Gdt = Ve, ide = zdt(lE), Wdt = YR, kY = A2, Vdt = k2, S7 = KR, Ydt = aP, Kdt = lP, Jdt = cP, Xdt = HE, IS = fP, pN = Pi, Zdt = Xo, eht = xP, tht = dP, nht = $s, rht = JR;
+const Gdt = Ve, ide = zdt(lE), Wdt = YR, kY = A2, Vdt = k2, S7 = KR, Ydt = aP, Kdt = lP, Jdt = cP, Xdt = HE, IS = fP, pN = Pi, Zdt = Zo, eht = xP, tht = dP, nht = $s, rht = JR;
 class iht {
   step(e) {
     if (this.response)
@@ -151672,7 +151674,7 @@ Xl.modelDefToModelInfo = mht;
 Xl.convertFieldInfos = Ap;
 Xl.writeLiteralToTag = xde;
 Xl.getResultStructMetadataAnnotation = $S;
-const Gs = ni, mN = tu, LM = $s, ade = Xo;
+const Gs = ni, mN = nu, LM = $s, ade = Zo;
 function lde(t) {
   var e;
   const r = t.parameters && Object.entries(t.parameters).length > 0 ? Object.entries(t.parameters).map(([s, o]) => (0, Gs.isAtomic)(o) ? {
@@ -151996,7 +151998,7 @@ function Aht(t) {
 }
 (function(t) {
   Object.defineProperty(t, "__esModule", { value: !0 }), t.DEFAULT_LOG_RANGE = void 0, t.wrapLegacyInfoConnection = u, t.wrapLegacyConnection = a, t.mapData = c, t.wrapResult = f, t.nodeToLiteralValue = x, t.mapLogs = h;
-  const e = Xo, r = $s, i = ni, s = Xl, o = aE;
+  const e = Zo, r = $s, i = ni, s = Xl, o = aE;
   function u(p) {
     return {
       get dialectName() {
@@ -152830,7 +152832,7 @@ function Oht(t) {
 var Fe = {}, SD = {};
 Object.defineProperty(SD, "__esModule", { value: !0 });
 SD.MALLOY_VERSION = void 0;
-SD.MALLOY_VERSION = "0.0.282";
+SD.MALLOY_VERSION = "0.0.284";
 Object.defineProperty(Fe, "__esModule", { value: !0 });
 Fe.InMemoryModelCache = Fe.CacheManager = Fe.CSVWriter = Fe.JSONWriter = Fe.DataWriter = Fe.DataRecord = Fe.DataArray = Fe.Result = Fe.ExploreMaterializer = Fe.PreparedResultMaterializer = Fe.QueryMaterializer = Fe.ModelMaterializer = Fe.SingleConnectionRuntime = Fe.ConnectionRuntime = Fe.Runtime = Fe.ExploreField = Fe.JoinRelationship = Fe.QueryField = Fe.Query = Fe.StringField = Fe.UnsupportedField = Fe.JSONField = Fe.BooleanField = Fe.NumberField = Fe.TimestampField = Fe.DateField = Fe.TimestampTimeframe = Fe.DateTimeframe = Fe.AtomicField = Fe.AtomicFieldType = Fe.Explore = Fe.SourceRelationship = Fe.FixedConnectionMap = Fe.InMemoryURLReader = Fe.EmptyURLReader = Fe.PreparedResult = Fe.DocumentCompletion = Fe.DocumentSymbol = Fe.DocumentPosition = Fe.DocumentRange = Fe.DocumentTablePath = Fe.Parse = Fe.PreparedQuery = Fe.Model = Fe.MalloyError = Fe.Malloy = void 0;
 const jY = UT, zr = ni, UY = aE, T7 = y2, wht = SD, Fht = E2, Dn = $s, Nht = hd, Lht = Pi, Iht = HE, qY = "internal://internal.malloy";
@@ -155319,7 +155321,7 @@ ii.compileSource = ipt;
 ii.hasErrors = opt;
 ii.newCompileQueryState = Gde;
 ii.statedCompileQuery = Wde;
-const Vht = Wht(up), Yht = UT, cv = ni, Bde = Xl, kde = hd, QY = $s, zY = Xo, b0 = XE;
+const Vht = Wht(up), Yht = UT, cv = ni, Bde = Xl, kde = hd, QY = $s, zY = Zo, b0 = XE;
 function Pde(t, e) {
   return `${t}:${e}`;
 }
@@ -155691,7 +155693,7 @@ Object.defineProperty(eA, "__esModule", { value: !0 });
 eA.compileModel = dpt;
 eA.compileSource = hpt;
 eA.compileQuery = ppt;
-const lpt = Vde(up), Su = Vde(ii), cpt = E2;
+const lpt = Vde(up), bu = Vde(ii), cpt = E2;
 function fpt(t, e) {
   return t.type === "compile_model" ? e.type !== "compile_model" ? !1 : t.modelURL === e.modelURL && t.extendModelURL === e.extendModelURL : t.type === "compile_source" ? e.type !== "compile_source" ? !1 : t.modelURL === e.modelURL && t.extendModelURL === e.extendModelURL && t.name === e.name : e.type !== "compile_query" ? !1 : t.modelURL === e.modelURL && t.queryString === e.queryString;
 }
@@ -155720,7 +155722,7 @@ class xpt {
     return e;
   }
   newCompileModelSession(e, r, i) {
-    const s = i != null && i.ttl ? this.getExpires(i.ttl) : void 0, o = Su.newCompileModelState(e);
+    const s = i != null && i.ttl ? this.getExpires(i.ttl) : void 0, o = bu.newCompileModelState(e);
     return {
       type: "compile_model",
       sessionInfo: r,
@@ -155730,7 +155732,7 @@ class xpt {
     };
   }
   newCompileSourceSession(e, r, i) {
-    const s = i != null && i.ttl ? this.getExpires(i.ttl) : void 0, o = Su.newCompileSourceState(e);
+    const s = i != null && i.ttl ? this.getExpires(i.ttl) : void 0, o = bu.newCompileSourceState(e);
     return {
       type: "compile_source",
       sessionInfo: r,
@@ -155740,7 +155742,7 @@ class xpt {
     };
   }
   newCompileQuerySession(e, r, i) {
-    const s = i != null && i.ttl ? this.getExpires(i.ttl) : void 0, o = Su.newCompileQueryState(e);
+    const s = i != null && i.ttl ? this.getExpires(i.ttl) : void 0, o = bu.newCompileQueryState(e);
     return {
       type: "compile_query",
       sessionInfo: r,
@@ -155758,7 +155760,7 @@ class xpt {
     this.sessions.delete(e);
   }
   hasErrors(e) {
-    return Su.hasErrors(e);
+    return bu.hasErrors(e);
   }
   compileModel(e, r) {
     const i = {
@@ -155767,8 +155769,8 @@ class xpt {
       extendModelURL: e.extend_model_url
     };
     let s = (r == null ? void 0 : r.session_id) && this.findCompileModelSession(r.session_id, i);
-    this.purgeExpired({ except: r == null ? void 0 : r.session_id }), s ? (r != null && r.ttl && (s.expires = this.getExpires(r.ttl)), Su.updateCompileModelState(s.state, e.compiler_needs)) : (s = this.newCompileModelSession(e, i, r), this.sessions.set(s.sessionId, s));
-    const o = Su.statedCompileModel(s.state);
+    this.purgeExpired({ except: r == null ? void 0 : r.session_id }), s ? (r != null && r.ttl && (s.expires = this.getExpires(r.ttl)), bu.updateCompileModelState(s.state, e.compiler_needs)) : (s = this.newCompileModelSession(e, i, r), this.sessions.set(s.sessionId, s));
+    const o = bu.statedCompileModel(s.state);
     return (o.model || this.hasErrors(o.logs)) && this.killSession(s.sessionId), { ...o, session_id: s.sessionId };
   }
   findCompileSourceSession(e, r) {
@@ -155784,8 +155786,8 @@ class xpt {
       extendModelURL: e.extend_model_url
     };
     let s = (r == null ? void 0 : r.session_id) && this.findCompileSourceSession(r.session_id, i);
-    this.purgeExpired({ except: r == null ? void 0 : r.session_id }), s ? (r != null && r.ttl && (s.expires = this.getExpires(r.ttl)), Su.updateCompileModelState(s.state, e.compiler_needs)) : (s = this.newCompileSourceSession(e, i, r), this.sessions.set(s.sessionId, s));
-    const o = Su.statedCompileSource(s.state, e.name);
+    this.purgeExpired({ except: r == null ? void 0 : r.session_id }), s ? (r != null && r.ttl && (s.expires = this.getExpires(r.ttl)), bu.updateCompileModelState(s.state, e.compiler_needs)) : (s = this.newCompileSourceSession(e, i, r), this.sessions.set(s.sessionId, s));
+    const o = bu.statedCompileSource(s.state, e.name);
     return (o.source || this.hasErrors(o.logs)) && this.killSession(s.sessionId), { ...o, session_id: s.sessionId };
   }
   findCompileQuerySession(e, r) {
@@ -155801,8 +155803,8 @@ class xpt {
       query: e.query
     };
     let o = (r == null ? void 0 : r.session_id) && this.findCompileQuerySession(r.session_id, s);
-    this.purgeExpired({ except: r == null ? void 0 : r.session_id }), o ? (r != null && r.ttl && (o.expires = this.getExpires(r.ttl)), Su.updateCompileModelState(o.state, e.compiler_needs)) : (o = this.newCompileQuerySession(e, s, r), this.sessions.set(o.sessionId, o));
-    const u = Su.statedCompileQuery(o.state);
+    this.purgeExpired({ except: r == null ? void 0 : r.session_id }), o ? (r != null && r.ttl && (o.expires = this.getExpires(r.ttl)), bu.updateCompileModelState(o.state, e.compiler_needs)) : (o = this.newCompileQuerySession(e, s, r), this.sessions.set(o.sessionId, o));
+    const u = bu.statedCompileQuery(o.state);
     return (u.result || this.hasErrors(u.logs)) && this.killSession(o.sessionId), { ...u, session_id: o.sessionId };
   }
 }