npm - @malloydata/render - Versions diffs - 0.0.179-dev240904150848 → 0.0.179-dev240904162124 - Mend

@malloydata/render 0.0.179-dev240904150848 → 0.0.179-dev240904162124

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/register/register.mjs +775 -760
package/dist/register/register.umd.js +87 -87
package/dist/stories/dashboard.stories.d.ts +6 -0
package/dist/webcomponent/malloy-render.mjs +775 -760
package/dist/webcomponent/malloy-render.umd.js +87 -87
package/package.json +2 -2

package/dist/register/register.mjs CHANGED Viewed

@@ -145,19 +145,19 @@ const Ul = 1, fS = 2, wW = {
   owner: null
 };
 var Zt = null;
-let sR = null, sfe = null, wn = null, Vr = null, yl = null, k_ = 0;
+let sR = null, sfe = null, Ln = null, Vr = null, yl = null, k_ = 0;
 function Tv(t, e) {
-  const n = wn, r = Zt, i = t.length === 0, s = e === void 0 ? r : e, o = i ? wW : {
+  const n = Ln, r = Zt, i = t.length === 0, s = e === void 0 ? r : e, o = i ? wW : {
     owned: null,
     cleanups: null,
     context: s ? s.context : null,
     owner: s
-  }, u = i ? t : () => t(() => go(() => M_(o)));
-  Zt = o, wn = null;
+  }, u = i ? t : () => t(() => mo(() => M_(o)));
+  Zt = o, Ln = null;
   try {
     return c1(u, !0);
   } finally {
-    wn = n, Zt = r;
+    Ln = n, Zt = r;
   }
 }
 function F0(t, e) {
@@ -191,25 +191,25 @@ function Yr(t, e, n) {
 function ufe(t) {
   return c1(t, !1);
 }
-function go(t) {
-  if (wn === null)
+function mo(t) {
+  if (Ln === null)
     return t();
-  const e = wn;
-  wn = null;
+  const e = Ln;
+  Ln = null;
   try {
     return t();
   } finally {
-    wn = e;
+    Ln = e;
   }
 }
 function rm(t) {
-  n3(() => go(t));
+  n3(() => mo(t));
 }
 function LW(t) {
   return Zt === null || (Zt.cleanups === null ? Zt.cleanups = [t] : Zt.cleanups.push(t)), t;
 }
 function fD() {
-  return wn;
+  return Ln;
 }
 function IW(t, e) {
   const n = Symbol("context");
@@ -237,9 +237,9 @@ function kW() {
       const t = Vr;
       Vr = null, c1(() => dS(this), !1), Vr = t;
     }
-  if (wn) {
+  if (Ln) {
     const t = this.observers ? this.observers.length : 0;
-    wn.sources ? (wn.sources.push(this), wn.sourceSlots.push(t)) : (wn.sources = [this], wn.sourceSlots = [t]), this.observers ? (this.observers.push(wn), this.observerSlots.push(wn.sources.length - 1)) : (this.observers = [wn], this.observerSlots = [wn.sources.length - 1]);
+    Ln.sources ? (Ln.sources.push(this), Ln.sourceSlots.push(t)) : (Ln.sources = [this], Ln.sourceSlots = [t]), this.observers ? (this.observers.push(Ln), this.observerSlots.push(Ln.sources.length - 1)) : (this.observers = [Ln], this.observerSlots = [Ln.sources.length - 1]);
   }
   return this.value;
 }
@@ -267,14 +267,14 @@ function l1(t) {
 }
 function afe(t, e, n) {
   let r;
-  const i = Zt, s = wn;
-  wn = Zt = t;
+  const i = Zt, s = Ln;
+  Ln = Zt = t;
   try {
     r = t.fn(e);
   } catch (o) {
     return t.pure && (t.state = Ul, t.owned && t.owned.forEach(M_), t.owned = null), t.updatedAt = n + 1, UW(o);
   } finally {
-    wn = s, Zt = i;
+    Ln = s, Zt = i;
   }
   (!t.updatedAt || t.updatedAt <= n) && (t.updatedAt != null && "observers" in t ? PW(t, r) : t.value = r, t.updatedAt = n);
 }
@@ -299,7 +299,7 @@ function xS(t) {
     return;
   if (t.state === fS)
     return dS(t);
-  if (t.suspense && go(t.suspense.inFallback))
+  if (t.suspense && mo(t.suspense.inFallback))
     return t.suspense.effects.push(t);
   const e = [t];
   for (; (t = t.owner) && (!t.updatedAt || t.updatedAt < k_); )
@@ -406,7 +406,7 @@ function xfe(t, e) {
   return function(r) {
     let i;
     return Ei(
-      () => i = go(() => (Zt.context = {
+      () => i = mo(() => (Zt.context = {
         ...Zt.context,
         [t]: r.value
       }, BW(() => r.children))),
@@ -423,7 +423,7 @@ function hfe(t, e, n = {}) {
   let r = [], i = [], s = [], o = 0, u = e.length > 1 ? [] : null;
   return LW(() => OP(s)), () => {
     let a = t() || [], l, c;
-    return a[cD], go(() => {
+    return a[cD], mo(() => {
       let x = a.length, h, p, m, g, y, E, A, v, S;
       if (x === 0)
         o !== 0 && (OP(s), s = [], r = [], i = [], o = 0, u && (u = [])), n.fallback && (r = [dfe], i[0] = Tv((_) => (s[0] = _, n.fallback())), o = 1);
@@ -455,8 +455,8 @@ function hfe(t, e, n = {}) {
     }
   };
 }
-function yt(t, e) {
-  return go(() => t(e || {}));
+function gt(t, e) {
+  return mo(() => t(e || {}));
 }
 function gA() {
   return !0;
@@ -557,7 +557,7 @@ function rx(...t) {
   return i;
 }
 const qW = (t) => `Stale read from <${t}>.`;
-function $o(t) {
+function Zs(t) {
   const e = "fallback" in t && {
     fallback: () => t.fallback
   };
@@ -572,10 +572,10 @@ function Eh(t) {
       const r = n();
       if (r) {
         const i = t.children;
-        return typeof i == "function" && i.length > 0 ? go(
+        return typeof i == "function" && i.length > 0 ? mo(
           () => i(
             e ? r : () => {
-              if (!go(n))
+              if (!mo(n))
                 throw qW("Show");
               return t.when;
             }
@@ -612,10 +612,10 @@ function mfe(t) {
       if (s < 0)
         return t.fallback;
       const a = u.children;
-      return typeof a == "function" && a.length > 0 ? go(
+      return typeof a == "function" && a.length > 0 ? mo(
         () => a(
           e ? o : () => {
-            if (go(i)[0] !== s)
+            if (mo(i)[0] !== s)
               throw qW("Match");
             return u.when;
           }
@@ -674,12 +674,12 @@ function yfe(t, e, n) {
     }
   }
 }
-function kn(t, e, n) {
+function Fn(t, e, n) {
   let r;
   const i = () => {
     const o = document.createElement("template");
     return o.innerHTML = t, n ? o.content.firstChild.firstChild : o.content.firstChild;
-  }, s = e ? () => go(() => document.importNode(r || (r = i()), !0)) : () => (r || (r = i())).cloneNode(!0);
+  }, s = e ? () => mo(() => document.importNode(r || (r = i()), !0)) : () => (r || (r = i())).cloneNode(!0);
   return s.cloneNode = s, s;
 }
 function zu(t, e, n) {
@@ -700,9 +700,9 @@ function $h(t, e, n) {
   return n;
 }
 function $u(t, e, n) {
-  return go(() => t(e, n));
+  return mo(() => t(e, n));
 }
-function Vt(t, e, n, r) {
+function zt(t, e, n, r) {
   if (n !== void 0 && !r && (r = []), typeof e != "function")
     return hS(t, e, r, n);
   Ei((i) => hS(t, e(), i, n), r);
@@ -830,7 +830,7 @@ function vfe(t) {
         r.renderRoot.textContent = "", i();
       });
       const o = t(s, n);
-      return Vt(r.renderRoot, o);
+      return zt(r.renderRoot, o);
     }, Afe(r));
   };
 }
@@ -1836,16 +1836,16 @@ J_.fnReplace = gde;
 var Yh = {};
 Object.defineProperty(Yh, "__esModule", { value: !0 });
 Yh.fnByteLength = Yh.fnLength = void 0;
-const Zs = ye;
+const eo = ye;
 function mde() {
   return [
-    (0, Zs.overload)((0, Zs.minScalar)("number"), [(0, Zs.param)("value", (0, Zs.anyExprType)("string"))], (0, Zs.sql)`LENGTH(${(0, Zs.arg)("value")})`)
+    (0, eo.overload)((0, eo.minScalar)("number"), [(0, eo.param)("value", (0, eo.anyExprType)("string"))], (0, eo.sql)`LENGTH(${(0, eo.arg)("value")})`)
   ];
 }
 Yh.fnLength = mde;
 function yde() {
   return [
-    (0, Zs.overload)((0, Zs.minScalar)("number"), [(0, Zs.param)("value", (0, Zs.anyExprType)("string"))], (0, Zs.sql)`BYTE_LENGTH(${(0, Zs.arg)("value")})`)
+    (0, eo.overload)((0, eo.minScalar)("number"), [(0, eo.param)("value", (0, eo.anyExprType)("string"))], (0, eo.sql)`BYTE_LENGTH(${(0, eo.arg)("value")})`)
   ];
 }
 Yh.fnByteLength = yde;
@@ -2353,35 +2353,35 @@ function Ahe() {
   ];
 }
 Zh.fnStringAggDistinct = Ahe;
-var no = {};
-Object.defineProperty(no, "__esModule", { value: !0 });
-no.fnSqlBoolean = no.fnSqlTimestamp = no.fnSqlDate = no.fnSqlString = no.fnSqlNumber = void 0;
+var ro = {};
+Object.defineProperty(ro, "__esModule", { value: !0 });
+ro.fnSqlBoolean = ro.fnSqlTimestamp = ro.fnSqlDate = ro.fnSqlString = ro.fnSqlNumber = void 0;
 const nn = ye;
 function vhe() {
   const t = (0, nn.makeParam)("value", (0, nn.literal)((0, nn.maxScalar)("string")));
   return [(0, nn.overload)((0, nn.minScalar)("number"), [t.param], t.arg)];
 }
-no.fnSqlNumber = vhe;
+ro.fnSqlNumber = vhe;
 function She() {
   const t = (0, nn.makeParam)("value", (0, nn.literal)((0, nn.maxScalar)("string")));
   return [(0, nn.overload)((0, nn.minScalar)("string"), [t.param], t.arg)];
 }
-no.fnSqlString = She;
+ro.fnSqlString = She;
 function _he() {
   const t = (0, nn.makeParam)("value", (0, nn.literal)((0, nn.maxScalar)("string")));
   return [(0, nn.overload)((0, nn.minScalar)("date"), [t.param], t.arg)];
 }
-no.fnSqlDate = _he;
+ro.fnSqlDate = _he;
 function bhe() {
   const t = (0, nn.makeParam)("value", (0, nn.literal)((0, nn.maxScalar)("string")));
   return [(0, nn.overload)((0, nn.minScalar)("timestamp"), [t.param], t.arg)];
 }
-no.fnSqlTimestamp = bhe;
+ro.fnSqlTimestamp = bhe;
 function Che() {
   const t = (0, nn.makeParam)("value", (0, nn.literal)((0, nn.maxScalar)("string")));
   return [(0, nn.overload)((0, nn.minScalar)("boolean"), [t.param], t.arg)];
 }
-no.fnSqlBoolean = Che;
+ro.fnSqlBoolean = Che;
 var E5 = {};
 Object.defineProperty(E5, "__esModule", { value: !0 });
 E5.fnSumMoving = void 0;
@@ -2402,7 +2402,7 @@ function The() {
 E5.fnSumMoving = The;
 (function(t) {
   Object.defineProperty(t, "__esModule", { value: !0 }), t.FUNCTIONS = void 0;
-  const e = H_, n = Q_, r = G_, i = W_, s = V_, o = U0, u = Y_, a = K_, l = X_, c = J_, f = Yh, x = Z_, h = e5, p = t5, m = n5, g = r5, y = i5, E = Kh, A = Yi, v = Xh, S = s5, _ = o5, b = u5, C = a5, R = l5, O = c5, I = f5, j = Jh, Q = q0, G = x5, P = d5, W = h5, oe = p5, ne = Bt, X = g5, ae = m5, de = y5, _e = Zh, D = no, k = E5;
+  const e = H_, n = Q_, r = G_, i = W_, s = V_, o = U0, u = Y_, a = K_, l = X_, c = J_, f = Yh, x = Z_, h = e5, p = t5, m = n5, g = r5, y = i5, E = Kh, A = Yi, v = Xh, S = s5, _ = o5, b = u5, C = a5, R = l5, O = c5, I = f5, j = Jh, Q = q0, G = x5, P = d5, W = h5, oe = p5, ne = Bt, X = g5, ae = m5, de = y5, _e = Zh, D = ro, k = E5;
   t.FUNCTIONS = new ae.FunctionMap(), t.FUNCTIONS.add("concat", e.fnConcat), t.FUNCTIONS.add("round", i.fnRound), t.FUNCTIONS.add("trunc", n.fnTrunc), t.FUNCTIONS.add("floor", ne.fnFloor), t.FUNCTIONS.add("ceil", ne.fnCeil), t.FUNCTIONS.add("cos", ne.fnCos), t.FUNCTIONS.add("acos", ne.fnAcos), t.FUNCTIONS.add("sin", ne.fnSin), t.FUNCTIONS.add("asin", ne.fnAsin), t.FUNCTIONS.add("tan", ne.fnTan), t.FUNCTIONS.add("atan", ne.fnAtan), t.FUNCTIONS.add("atan2", b.fnAtan2), t.FUNCTIONS.add("lower", s.fnLower), t.FUNCTIONS.add("upper", u.fnUpper), t.FUNCTIONS.add("sqrt", ne.fnSqrt), t.FUNCTIONS.add("pow", C.fnPow), t.FUNCTIONS.add("abs", ne.fnAbs), t.FUNCTIONS.add("sign", ne.fnSign), t.FUNCTIONS.add("is_inf", S.fnIsInf), t.FUNCTIONS.add("is_nan", _.fnIsNan), t.FUNCTIONS.add("greatest", j.fnGreatest), t.FUNCTIONS.add("least", j.fnLeast), t.FUNCTIONS.add("div", I.fnDiv), t.FUNCTIONS.add("strpos", O.fnStrpos), t.FUNCTIONS.add("starts_with", v.fnStartsWith), t.FUNCTIONS.add("ends_with", v.fnEndsWith), t.FUNCTIONS.add("trim", Q.fnTrim), t.FUNCTIONS.add("ltrim", Q.fnLtrim), t.FUNCTIONS.add("rtrim", Q.fnRtrim), t.FUNCTIONS.add("rand", G.fnRand), t.FUNCTIONS.add("pi", P.fnPi), t.FUNCTIONS.add("substr", a.fnSubstr), t.FUNCTIONS.add("regexp_extract", l.fnRegexpExtract), t.FUNCTIONS.add("replace", c.fnReplace), t.FUNCTIONS.add("length", f.fnLength), t.FUNCTIONS.add("byte_length", f.fnByteLength), t.FUNCTIONS.add("ifnull", x.fnIfnull), t.FUNCTIONS.add("coalesce", de.fnCoalesce), t.FUNCTIONS.add("nullif", h.fnNullif), t.FUNCTIONS.add("chr", o.fnChr), t.FUNCTIONS.add("ascii", o.fnAscii), t.FUNCTIONS.add("unicode", o.fnUnicode), t.FUNCTIONS.add("repeat", W.fnRepeat), t.FUNCTIONS.add("reverse", oe.fnReverse), t.FUNCTIONS.add("log", R.fnLog), t.FUNCTIONS.add("ln", ne.fnLn), t.FUNCTIONS.add("exp", ne.fnExp), t.FUNCTIONS.add("stddev", r.fnStddev), t.FUNCTIONS.add("string_agg", _e.fnStringAgg), t.FUNCTIONS.add("string_agg_distinct", _e.fnStringAggDistinct), t.FUNCTIONS.add("row_number", p.fnRowNumber), t.FUNCTIONS.add("lag", m.fnLag), t.FUNCTIONS.add("lead", g.fnLead), t.FUNCTIONS.add("rank", y.fnRank), t.FUNCTIONS.add("first_value", E.fnFirstValueWindow), t.FUNCTIONS.add("last_value", E.fnLastValueWindow), t.FUNCTIONS.add("min_cumulative", A.fnMinCumulative), t.FUNCTIONS.add("max_cumulative", A.fnMaxCumulative), t.FUNCTIONS.add("sum_cumulative", A.fnSumCumulative), t.FUNCTIONS.add("min_window", A.fnMinWindow), t.FUNCTIONS.add("max_window", A.fnMaxWindow), t.FUNCTIONS.add("sum_window", A.fnSumWindow), t.FUNCTIONS.add("avg_moving", X.fnAvgRolling), t.FUNCTIONS.add("sum_moving", k.fnSumMoving), t.FUNCTIONS.add("sql_number", D.fnSqlNumber), t.FUNCTIONS.add("sql_string", D.fnSqlString), t.FUNCTIONS.add("sql_date", D.fnSqlDate), t.FUNCTIONS.add("sql_timestamp", D.fnSqlTimestamp), t.FUNCTIONS.add("sql_boolean", D.fnSqlBoolean), t.FUNCTIONS.seal();
 })(dV);
 (function(t) {
@@ -3404,13 +3404,13 @@ M5.fnByteLength = a2e;
 var j5 = {};
 Object.defineProperty(j5, "__esModule", { value: !0 });
 j5.fnCountApprox = void 0;
-const Oo = ye;
+const Ro = ye;
 function l2e() {
-  const t = (0, Oo.makeParam)("value", (0, Oo.maxScalar)("number"));
+  const t = (0, Ro.makeParam)("value", (0, Ro.maxScalar)("number"));
   return [
-    (0, Oo.overload)((0, Oo.minAggregate)("number"), [
-      (0, Oo.param)("value", (0, Oo.anyExprType)("string"), (0, Oo.anyExprType)("number"), (0, Oo.anyExprType)("date"), (0, Oo.anyExprType)("timestamp"), (0, Oo.anyExprType)("boolean"))
-    ], (0, Oo.sql)`APPROX_COUNT_DISTINCT(${t.arg})`, { isSymmetric: !0 })
+    (0, Ro.overload)((0, Ro.minAggregate)("number"), [
+      (0, Ro.param)("value", (0, Ro.anyExprType)("string"), (0, Ro.anyExprType)("number"), (0, Ro.anyExprType)("date"), (0, Ro.anyExprType)("timestamp"), (0, Ro.anyExprType)("boolean"))
+    ], (0, Ro.sql)`APPROX_COUNT_DISTINCT(${t.arg})`, { isSymmetric: !0 })
   ];
 }
 j5.fnCountApprox = l2e;
@@ -3847,16 +3847,16 @@ eb.fnIsNan = F2e;
 var i2 = {};
 Object.defineProperty(i2, "__esModule", { value: !0 });
 i2.fnByteLength = i2.fnLength = void 0;
-const eo = ye;
+const to = ye;
 function w2e() {
   return [
-    (0, eo.overload)((0, eo.minScalar)("number"), [(0, eo.param)("value", (0, eo.anyExprType)("string"))], (0, eo.sql)`LENGTH(${(0, eo.arg)("value")})`)
+    (0, to.overload)((0, to.minScalar)("number"), [(0, to.param)("value", (0, to.anyExprType)("string"))], (0, to.sql)`LENGTH(${(0, to.arg)("value")})`)
   ];
 }
 i2.fnLength = w2e;
 function L2e() {
   return [
-    (0, eo.overload)((0, eo.minScalar)("number"), [(0, eo.param)("value", (0, eo.anyExprType)("string"))], (0, eo.sql)`CEIL(BIT_LENGTH(${(0, eo.arg)("value")}) / 8)`)
+    (0, to.overload)((0, to.minScalar)("number"), [(0, to.param)("value", (0, to.anyExprType)("string"))], (0, to.sql)`CEIL(BIT_LENGTH(${(0, to.arg)("value")}) / 8)`)
   ];
 }
 i2.fnByteLength = L2e;
@@ -4446,13 +4446,13 @@ hb.fnReverse = l1e;
 var pb = {};
 Object.defineProperty(pb, "__esModule", { value: !0 });
 pb.fnCountApprox = void 0;
-const Ro = ye;
+const No = ye;
 function c1e() {
-  const t = (0, Ro.makeParam)("value", (0, Ro.maxScalar)("number"));
+  const t = (0, No.makeParam)("value", (0, No.maxScalar)("number"));
   return [
-    (0, Ro.overload)((0, Ro.minAggregate)("number"), [
-      (0, Ro.param)("value", (0, Ro.anyExprType)("string"), (0, Ro.anyExprType)("number"), (0, Ro.anyExprType)("date"), (0, Ro.anyExprType)("timestamp"), (0, Ro.anyExprType)("boolean"))
-    ], (0, Ro.sql)`APPROX_DISTINCT(${t.arg})`, { isSymmetric: !0 })
+    (0, No.overload)((0, No.minAggregate)("number"), [
+      (0, No.param)("value", (0, No.anyExprType)("string"), (0, No.anyExprType)("number"), (0, No.anyExprType)("date"), (0, No.anyExprType)("timestamp"), (0, No.anyExprType)("boolean"))
+    ], (0, No.sql)`APPROX_DISTINCT(${t.arg})`, { isSymmetric: !0 })
   ];
 }
 pb.fnCountApprox = c1e;
@@ -5890,7 +5890,7 @@ class B1e {
       name: "ignoreme",
       pipeline: [n]
     };
-    return lo.makeQuery(
+    return co.makeQuery(
       i,
       r,
       new r3(!0, void 0),
@@ -5900,7 +5900,7 @@ class B1e {
   }
 }
 mx.Segment = B1e;
-class lo extends gS {
+class co extends gS {
   constructor(e, n, r, i) {
     super(e, n), this.prepared = !1, this.maxDepth = 0, this.maxGroupSet = 0, this.fieldDef = e, this.rootResult = new I1e(e), this.stageWriter = r, this.firstSegment = e.pipeline[0], this.isJoinedSubquery = i;
   }
@@ -5984,7 +5984,7 @@ class lo extends gS {
     let n = 1;
     for (const r of this.getSegmentFields(e)) {
       const { as: i, field: s } = this.expandField(r);
-      if (s instanceof FV || s instanceof lo) {
+      if (s instanceof FV || s instanceof co) {
         if (this.firstSegment.type === "project")
           throw new Error(`Nested views cannot be used in select - '${s.fieldDef.name}'`);
         const o = new wu(s.fieldDef, e);
@@ -6546,7 +6546,7 @@ FROM ${n}
       const c = new Hr(i, void 0, {
         model: this.parent.getModel()
       });
-      u = lo.makeQuery(l, c, n, this.isJoinedSubquery).generateSQLFromPipeline(n), i = u.outputStruct;
+      u = co.makeQuery(l, c, n, this.isJoinedSubquery).generateSQLFromPipeline(n), i = u.outputStruct;
     }
     return i.annotation = e.turtleDef.annotation, {
       structDef: i,
@@ -6584,7 +6584,7 @@ FROM ${n}
       for (const o of i) {
         const u = new Hr(s, void 0, {
           model: this.parent.getModel()
-        }), a = lo.makeQuery({ type: "turtle", name: "ignoreme", pipeline: [o] }, u, e, this.isJoinedSubquery);
+        }), a = co.makeQuery({ type: "turtle", name: "ignoreme", pipeline: [o] }, u, e, this.isJoinedSubquery);
         a.prepare(e), n = a.generateSQL(e), r = a.getResultStructDef(), s = {
           ...r,
           structSource: { type: "sql", method: "lastStage" }
@@ -6594,11 +6594,11 @@ FROM ${n}
     return { lastStageName: n, outputStruct: r };
   }
 }
-class k1e extends lo {
+class k1e extends co {
 }
-class P1e extends lo {
+class P1e extends co {
 }
-class M1e extends lo {
+class M1e extends co {
   constructor(e, n, r, i) {
     super(e, n, r, i), this.indexPaths = {}, this.fieldDef = e;
   }
@@ -6690,7 +6690,7 @@ FROM ${h}
 `), this.resultStage;
   }
 }
-class j1e extends lo {
+class j1e extends co {
   generateSQL(e) {
     const n = this.parent.fieldDef.structSource;
     if (n.type !== "sql" || n.method !== "subquery")
@@ -6706,7 +6706,7 @@ class j1e extends lo {
   getResultMetadata(e) {
   }
 }
-class U1e extends lo {
+class U1e extends co {
   constructor(e, n, r, i) {
     super(e, n, r, i), this.stages = [], this.fieldDef = e, this.fieldsToStages();
   }
@@ -6836,7 +6836,7 @@ class Hr extends NV {
           break;
         }
         case "turtle": {
-          this.addFieldToNameMap(r, lo.makeQuery(n, this, void 0, !1));
+          this.addFieldToNameMap(r, co.makeQuery(n, this, void 0, !1));
           break;
         }
         default:
@@ -7101,7 +7101,7 @@ class wV {
       name: "ignoreme",
       pipeline: e.pipeline,
       filterList: e.filterList
-    }, u = lo.makeQuery(o, this.getStructFromRef(e.structRef, e.sourceArguments), n, i), a = u.generateSQLFromPipeline(n);
+    }, u = co.makeQuery(o, this.getStructFromRef(e.structRef, e.sourceArguments), n, i), a = u.generateSQLFromPipeline(n);
     if (r && u.parent.dialect.hasFinalStage) {
       const l = (0, et.getPhysicalFields)(a.outputStruct).map((c) => u.parent.dialect.sqlMaybeQuoteIdentifier(c.name));
       a.lastStageName = n.addStage(u.parent.dialect.sqlFinalStage(a.lastStageName, l));
@@ -7278,7 +7278,7 @@ var mb = {}, OR = { exports: {} }, RR = {}, Z0 = {}, $V = {}, Ow = function() {
     l.prototype = n.prototype, i.prototype = new l(), l.prototype = null;
   }
   return i;
-}, X1e = K1e, Nw = Function.prototype.bind || X1e, J1e = Nw, Z1e = J1e.call(Function.call, Object.prototype.hasOwnProperty), mt, c2 = SyntaxError, BV = Function, Bh = TypeError, DR = function(t) {
+}, X1e = K1e, Nw = Function.prototype.bind || X1e, J1e = Nw, Z1e = J1e.call(Function.call, Object.prototype.hasOwnProperty), yt, c2 = SyntaxError, BV = Function, Bh = TypeError, DR = function(t) {
   try {
     return BV('"use strict"; return (' + t + ").constructor;")();
   } catch {
@@ -7304,22 +7304,22 @@ var FR = function() {
   }
 }() : FR, ih = H1e(), tpe = G1e(), or = Object.getPrototypeOf || (tpe ? function(t) {
   return t.__proto__;
-} : null), Ah = {}, npe = typeof Uint8Array > "u" || !or ? mt : or(Uint8Array), sx = {
-  "%AggregateError%": typeof AggregateError > "u" ? mt : AggregateError,
+} : null), Ah = {}, npe = typeof Uint8Array > "u" || !or ? yt : or(Uint8Array), sx = {
+  "%AggregateError%": typeof AggregateError > "u" ? yt : AggregateError,
   "%Array%": Array,
-  "%ArrayBuffer%": typeof ArrayBuffer > "u" ? mt : ArrayBuffer,
-  "%ArrayIteratorPrototype%": ih && or ? or([][Symbol.iterator]()) : mt,
-  "%AsyncFromSyncIteratorPrototype%": mt,
+  "%ArrayBuffer%": typeof ArrayBuffer > "u" ? yt : ArrayBuffer,
+  "%ArrayIteratorPrototype%": ih && or ? or([][Symbol.iterator]()) : yt,
+  "%AsyncFromSyncIteratorPrototype%": yt,
   "%AsyncFunction%": Ah,
   "%AsyncGenerator%": Ah,
   "%AsyncGeneratorFunction%": Ah,
   "%AsyncIteratorPrototype%": Ah,
-  "%Atomics%": typeof Atomics > "u" ? mt : Atomics,
-  "%BigInt%": typeof BigInt > "u" ? mt : BigInt,
-  "%BigInt64Array%": typeof BigInt64Array > "u" ? mt : BigInt64Array,
-  "%BigUint64Array%": typeof BigUint64Array > "u" ? mt : BigUint64Array,
+  "%Atomics%": typeof Atomics > "u" ? yt : Atomics,
+  "%BigInt%": typeof BigInt > "u" ? yt : BigInt,
+  "%BigInt64Array%": typeof BigInt64Array > "u" ? yt : BigInt64Array,
+  "%BigUint64Array%": typeof BigUint64Array > "u" ? yt : BigUint64Array,
   "%Boolean%": Boolean,
-  "%DataView%": typeof DataView > "u" ? mt : DataView,
+  "%DataView%": typeof DataView > "u" ? yt : DataView,
   "%Date%": Date,
   "%decodeURI%": decodeURI,
   "%decodeURIComponent%": decodeURIComponent,
@@ -7329,49 +7329,49 @@ var FR = function() {
   "%eval%": eval,
   // eslint-disable-line no-eval
   "%EvalError%": EvalError,
-  "%Float32Array%": typeof Float32Array > "u" ? mt : Float32Array,
-  "%Float64Array%": typeof Float64Array > "u" ? mt : Float64Array,
-  "%FinalizationRegistry%": typeof FinalizationRegistry > "u" ? mt : FinalizationRegistry,
+  "%Float32Array%": typeof Float32Array > "u" ? yt : Float32Array,
+  "%Float64Array%": typeof Float64Array > "u" ? yt : Float64Array,
+  "%FinalizationRegistry%": typeof FinalizationRegistry > "u" ? yt : FinalizationRegistry,
   "%Function%": BV,
   "%GeneratorFunction%": Ah,
-  "%Int8Array%": typeof Int8Array > "u" ? mt : Int8Array,
-  "%Int16Array%": typeof Int16Array > "u" ? mt : Int16Array,
-  "%Int32Array%": typeof Int32Array > "u" ? mt : Int32Array,
+  "%Int8Array%": typeof Int8Array > "u" ? yt : Int8Array,
+  "%Int16Array%": typeof Int16Array > "u" ? yt : Int16Array,
+  "%Int32Array%": typeof Int32Array > "u" ? yt : Int32Array,
   "%isFinite%": isFinite,
   "%isNaN%": isNaN,
-  "%IteratorPrototype%": ih && or ? or(or([][Symbol.iterator]())) : mt,
-  "%JSON%": typeof JSON == "object" ? JSON : mt,
-  "%Map%": typeof Map > "u" ? mt : Map,
-  "%MapIteratorPrototype%": typeof Map > "u" || !ih || !or ? mt : or((/* @__PURE__ */ new Map())[Symbol.iterator]()),
+  "%IteratorPrototype%": ih && or ? or(or([][Symbol.iterator]())) : yt,
+  "%JSON%": typeof JSON == "object" ? JSON : yt,
+  "%Map%": typeof Map > "u" ? yt : Map,
+  "%MapIteratorPrototype%": typeof Map > "u" || !ih || !or ? yt : or((/* @__PURE__ */ new Map())[Symbol.iterator]()),
   "%Math%": Math,
   "%Number%": Number,
   "%Object%": Object,
   "%parseFloat%": parseFloat,
   "%parseInt%": parseInt,
-  "%Promise%": typeof Promise > "u" ? mt : Promise,
-  "%Proxy%": typeof Proxy > "u" ? mt : Proxy,
+  "%Promise%": typeof Promise > "u" ? yt : Promise,
+  "%Proxy%": typeof Proxy > "u" ? yt : Proxy,
   "%RangeError%": RangeError,
   "%ReferenceError%": ReferenceError,
-  "%Reflect%": typeof Reflect > "u" ? mt : Reflect,
+  "%Reflect%": typeof Reflect > "u" ? yt : Reflect,
   "%RegExp%": RegExp,
-  "%Set%": typeof Set > "u" ? mt : Set,
-  "%SetIteratorPrototype%": typeof Set > "u" || !ih || !or ? mt : or((/* @__PURE__ */ new Set())[Symbol.iterator]()),
-  "%SharedArrayBuffer%": typeof SharedArrayBuffer > "u" ? mt : SharedArrayBuffer,
+  "%Set%": typeof Set > "u" ? yt : Set,
+  "%SetIteratorPrototype%": typeof Set > "u" || !ih || !or ? yt : or((/* @__PURE__ */ new Set())[Symbol.iterator]()),
+  "%SharedArrayBuffer%": typeof SharedArrayBuffer > "u" ? yt : SharedArrayBuffer,
   "%String%": String,
-  "%StringIteratorPrototype%": ih && or ? or(""[Symbol.iterator]()) : mt,
-  "%Symbol%": ih ? Symbol : mt,
+  "%StringIteratorPrototype%": ih && or ? or(""[Symbol.iterator]()) : yt,
+  "%Symbol%": ih ? Symbol : yt,
   "%SyntaxError%": c2,
   "%ThrowTypeError%": epe,
   "%TypedArray%": npe,
   "%TypeError%": Bh,
-  "%Uint8Array%": typeof Uint8Array > "u" ? mt : Uint8Array,
-  "%Uint8ClampedArray%": typeof Uint8ClampedArray > "u" ? mt : Uint8ClampedArray,
-  "%Uint16Array%": typeof Uint16Array > "u" ? mt : Uint16Array,
-  "%Uint32Array%": typeof Uint32Array > "u" ? mt : Uint32Array,
+  "%Uint8Array%": typeof Uint8Array > "u" ? yt : Uint8Array,
+  "%Uint8ClampedArray%": typeof Uint8ClampedArray > "u" ? yt : Uint8ClampedArray,
+  "%Uint16Array%": typeof Uint16Array > "u" ? yt : Uint16Array,
+  "%Uint32Array%": typeof Uint32Array > "u" ? yt : Uint32Array,
   "%URIError%": URIError,
-  "%WeakMap%": typeof WeakMap > "u" ? mt : WeakMap,
-  "%WeakRef%": typeof WeakRef > "u" ? mt : WeakRef,
-  "%WeakSet%": typeof WeakSet > "u" ? mt : WeakSet
+  "%WeakMap%": typeof WeakMap > "u" ? yt : WeakMap,
+  "%WeakRef%": typeof WeakRef > "u" ? yt : WeakRef,
+  "%WeakSet%": typeof WeakSet > "u" ? yt : WeakSet
 };
 if (or)
   try {
@@ -9364,8 +9364,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       qe.position++;
     }
     qe.val1.set(Z, qe.position), qe.val2.set(ue, qe.position);
-    var gt = Be(Z, ue, Oe, Le, qe, Ue);
-    return qe.val1.delete(Z), qe.val2.delete(ue), gt;
+    var mt = Be(Z, ue, Oe, Le, qe, Ue);
+    return qe.val1.delete(Z), qe.val2.delete(ue), mt;
   }
   function H(Z, ue, Oe, qe) {
     for (var Ue = a(Z), Le = 0; Le < Ue.length; Le++) {
@@ -9450,11 +9450,11 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     }
     if (Ue !== null) {
       for (var fe = l(ue), we = 0; we < fe.length; we++) {
-        var ze = t(fe[we], 2), nt = ze[0], gt = ze[1];
+        var ze = t(fe[we], 2), nt = ze[0], mt = ze[1];
         if (o(nt) === "object" && nt !== null) {
-          if (!J(Ue, Z, nt, gt, Oe, qe))
+          if (!J(Ue, Z, nt, mt, Oe, qe))
             return !1;
-        } else if (!Oe && (!Z.has(nt) || !$(Z.get(nt), gt, !1, qe)) && !J(Ue, Z, nt, gt, !1, qe))
+        } else if (!Oe && (!Z.has(nt) || !$(Z.get(nt), mt, !1, qe)) && !J(Ue, Z, nt, mt, !1, qe))
           return !1;
       }
       return Ue.size === 0;
@@ -10165,13 +10165,13 @@ var Er = {};
     e[e.INVALID_TYPE = 0] = "INVALID_TYPE", e[e.BASIC = 1] = "BASIC", e[e.RULE_START = 2] = "RULE_START", e[e.BLOCK_START = 3] = "BLOCK_START", e[e.PLUS_BLOCK_START = 4] = "PLUS_BLOCK_START", e[e.STAR_BLOCK_START = 5] = "STAR_BLOCK_START", e[e.TOKEN_START = 6] = "TOKEN_START", e[e.RULE_STOP = 7] = "RULE_STOP", e[e.BLOCK_END = 8] = "BLOCK_END", e[e.STAR_LOOP_BACK = 9] = "STAR_LOOP_BACK", e[e.STAR_LOOP_ENTRY = 10] = "STAR_LOOP_ENTRY", e[e.PLUS_LOOP_BACK = 11] = "PLUS_LOOP_BACK", e[e.LOOP_END = 12] = "LOOP_END";
   }(t.ATNStateType || (t.ATNStateType = {}));
 })(Er);
-var bc = {}, _o = {};
+var bc = {}, bo = {};
 /*!
  * 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(_o, "__esModule", { value: !0 });
-_o.RecognitionException = void 0;
+Object.defineProperty(bo, "__esModule", { value: !0 });
+bo.RecognitionException = void 0;
 class mge extends Error {
   constructor(e, n, r, i) {
     super(i), this._offendingState = -1, this._recognizer = e, this.input = n, this.ctx = r, e && (this._offendingState = e.state);
@@ -10248,7 +10248,7 @@ class mge extends Error {
     return this._recognizer;
   }
 }
-_o.RecognitionException = mge;
+bo.RecognitionException = mge;
 var sy = {}, x1 = {}, ru = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -10324,7 +10324,7 @@ class Age extends Ege.Transition {
   }
 }
 x1.AbstractPredicateTransition = Age;
-var sd = {}, iu = {}, Sb = {}, Fn = {};
+var sd = {}, iu = {}, Sb = {}, wn = {};
 (function(t) {
   /*!
    * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -10364,7 +10364,7 @@ var sd = {}, iu = {}, Sb = {}, Fn = {};
       return c;
     }
   }(t.MurmurHash || (t.MurmurHash = {}));
-})(Fn);
+})(wn);
 var js = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -10428,7 +10428,7 @@ var oY = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Sb, "__esModule", { value: !0 });
 Sb.DefaultEqualityComparator = void 0;
-const uY = Ae, vge = Fn, gM = js;
+const uY = Ae, vge = wn, gM = js;
 class o3 {
   /**
    * {@inheritDoc}
@@ -10479,10 +10479,10 @@ var ri = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(iu, "__esModule", { value: !0 });
 iu.Array2DHashSet = void 0;
-const _ge = Ni(), bge = Sb, ii = Ae, YR = Fn, vA = 16, KR = 0.75;
-class $n {
+const _ge = Ni(), bge = Sb, ii = Ae, YR = wn, vA = 16, KR = 0.75;
+class Bn {
   constructor(e, n = vA) {
-    if (this.n = 0, this.threshold = Math.floor(vA * KR), e instanceof $n) {
+    if (this.n = 0, this.threshold = Math.floor(vA * KR), e instanceof Bn) {
       this.comparator = e.comparator, this.buckets = e.buckets.slice(0);
       for (let r = 0; r < this.buckets.length; r++) {
         let i = this.buckets[r];
@@ -10534,7 +10534,7 @@ class $n {
     return e = YR.MurmurHash.finish(e, this.size), e;
   }
   equals(e) {
-    return e === this ? !0 : !(e instanceof $n) || e.size !== this.size ? !1 : this.containsAll(e);
+    return e === this ? !0 : !(e instanceof Bn) || e.size !== this.size ? !1 : this.containsAll(e);
   }
   expand() {
     let e = this.buckets, n = this.buckets.length * 2, r = this.createBuckets(n);
@@ -10579,7 +10579,7 @@ class $n {
     return e;
   }
   containsAll(e) {
-    if (e instanceof $n) {
+    if (e instanceof Bn) {
       let n = e;
       for (let r of n.buckets)
         if (r != null)
@@ -10662,53 +10662,53 @@ class $n {
 }
 ri([
   ii.NotNull
-], $n.prototype, "comparator", void 0);
+], Bn.prototype, "comparator", void 0);
 ri([
   ii.Override
-], $n.prototype, "hashCode", null);
+], Bn.prototype, "hashCode", null);
 ri([
   ii.Override
-], $n.prototype, "equals", null);
+], Bn.prototype, "equals", null);
 ri([
   ii.Override
-], $n.prototype, "add", null);
+], Bn.prototype, "add", null);
 ri([
   ii.Override
-], $n.prototype, "size", null);
+], Bn.prototype, "size", null);
 ri([
   ii.Override
-], $n.prototype, "isEmpty", null);
+], Bn.prototype, "isEmpty", null);
 ri([
   ii.Override
-], $n.prototype, "contains", null);
+], Bn.prototype, "contains", null);
 ri([
   Sge(0, ii.Nullable)
-], $n.prototype, "containsFast", null);
+], Bn.prototype, "containsFast", null);
 ri([
   ii.Override
-], $n.prototype, Symbol.iterator, null);
+], Bn.prototype, Symbol.iterator, null);
 ri([
   ii.Override
-], $n.prototype, "toArray", null);
+], Bn.prototype, "toArray", null);
 ri([
   ii.Override
-], $n.prototype, "containsAll", null);
+], Bn.prototype, "containsAll", null);
 ri([
   ii.Override
-], $n.prototype, "addAll", null);
+], Bn.prototype, "addAll", null);
 ri([
   ii.Override
-], $n.prototype, "clear", null);
+], Bn.prototype, "clear", null);
 ri([
   ii.Override
-], $n.prototype, "toString", null);
+], Bn.prototype, "toString", null);
 ri([
   ii.SuppressWarnings("unchecked")
-], $n.prototype, "asElementType", null);
+], Bn.prototype, "asElementType", null);
 ri([
   ii.SuppressWarnings("unchecked")
-], $n.prototype, "createBuckets", null);
-iu.Array2DHashSet = $n;
+], Bn.prototype, "createBuckets", null);
+iu.Array2DHashSet = Bn;
 var od = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -10725,7 +10725,7 @@ var aY = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(od, "__esModule", { value: !0 });
 od.ArrayEqualityComparator = void 0;
-const lY = Ae, Cge = Fn, Tge = js;
+const lY = Ae, Cge = wn, Tge = js;
 class u3 {
   /**
    * {@inheritDoc}
@@ -10822,7 +10822,7 @@ gn.toCharArray = Fge;
     };
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), t.SemanticContext = void 0;
-  const r = iu, i = od, s = Fn, o = Ae, u = js, a = gn;
+  const r = iu, i = od, s = wn, o = Ae, u = js, a = gn;
   function l(x) {
     let h;
     for (let p of x) {
@@ -11182,7 +11182,7 @@ var cY = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(bc, "__esModule", { value: !0 });
 bc.FailedPredicateException = void 0;
-const Bge = _o, fY = Ae, kge = sy;
+const Bge = bo, fY = Ae, kge = sy;
 let vS = class xY extends Bge.RecognitionException {
   constructor(e, n, r) {
     super(e, e.inputStream, e.context, xY.formatMessage(n, r));
@@ -11229,7 +11229,7 @@ var Pge = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(ud, "__esModule", { value: !0 });
 ud.InputMismatchException = void 0;
-const jge = _o, Uge = Ae;
+const jge = bo, Uge = Ae;
 let ED = class extends jge.RecognitionException {
   constructor(e, n, r) {
     r === void 0 && (r = e.context), super(e, e.inputStream, r), n !== void 0 && this.setOffendingState(n), this.setOffendingToken(e, e.currentToken);
@@ -11583,7 +11583,7 @@ Lw([
   Iw.Override
 ], Ex.prototype, "toString", null);
 Ar.Interval = Ex;
-var kp = {}, Tb = {}, Cc = {}, Gt = {};
+var kp = {}, Tb = {}, Cc = {}, Wt = {};
 (function(t) {
   /*!
    * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -11594,7 +11594,7 @@ var kp = {}, Tb = {}, Cc = {}, Gt = {};
   (function(n) {
     n.INVALID_TYPE = 0, n.EPSILON = -2, n.MIN_USER_TOKEN_TYPE = 1, n.EOF = e.IntStream.EOF, n.DEFAULT_CHANNEL = 0, n.HIDDEN_CHANNEL = 1, n.MIN_USER_CHANNEL_VALUE = 2;
   })(t.Token || (t.Token = {}));
-})(Gt);
+})(Wt);
 /*!
  * 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.
@@ -11614,7 +11614,7 @@ var fs = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Cc, "__esModule", { value: !0 });
 Cc.CommonToken = void 0;
-const Hge = Ar, xs = Ae, mM = Gt;
+const Hge = Ar, xs = Ae, mM = Wt;
 let Nr = class im {
   constructor(e, n, r = im.EMPTY_SOURCE, i = mM.Token.DEFAULT_CHANNEL, s = 0, o = 0) {
     this._line = 0, this._charPositionInLine = -1, this._channel = mM.Token.DEFAULT_CHANNEL, this.index = -1, this._text = n, this._type = e, this.source = r, this._channel = i, this.start = s, this.stop = o, r.source != null && (this._line = r.source.line, this._charPositionInLine = r.source.charPositionInLine);
@@ -12048,7 +12048,7 @@ function su() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.SingletonPredictionContext = t.PredictionContext = void 0;
-    const r = zl, i = iu, s = _b, o = Fn, u = Ae, a = $w(), l = Ni(), c = 1;
+    const r = zl, i = iu, s = _b, o = wn, u = Ae, a = $w(), l = Ni(), c = 1;
     class f {
       constructor(g) {
         this.cachedHashCode = g;
@@ -12505,7 +12505,7 @@ var Un = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(ad, "__esModule", { value: !0 });
 ad.ATNConfig = void 0;
-const Xge = zl, Jge = va, Ja = Fn, Ht = Ae, Zge = js, vM = su(), Bf = sd, SM = Ni(), rN = 2147483648;
+const Xge = zl, Jge = va, Ja = wn, Qt = Ae, Zge = js, vM = su(), Bf = sd, SM = Ni(), rN = 2147483648;
 let Di = class sm {
   constructor(e, n, r) {
     typeof n == "number" ? (SM((n & 16777215) === n), this._state = e, this.altAndOuterContextDepth = n, this._context = r) : (this._state = e, this.altAndOuterContextDepth = n.altAndOuterContextDepth, this._context = r);
@@ -12682,41 +12682,41 @@ let Di = class sm {
   }
 };
 Un([
-  Ht.NotNull
+  Qt.NotNull
 ], Di.prototype, "_state", void 0);
 Un([
-  Ht.NotNull
+  Qt.NotNull
 ], Di.prototype, "_context", void 0);
 Un([
-  Ht.NotNull
+  Qt.NotNull
 ], Di.prototype, "state", null);
 Un([
-  Ht.NotNull,
-  Ls(0, Ht.NotNull)
+  Qt.NotNull,
+  Ls(0, Qt.NotNull)
 ], Di.prototype, "context", null);
 Un([
-  Ht.NotNull
+  Qt.NotNull
 ], Di.prototype, "semanticContext", null);
 Un([
-  Ht.Override
+  Qt.Override
 ], Di.prototype, "clone", null);
 Un([
-  Ls(0, Ht.NotNull),
-  Ls(2, Ht.NotNull)
+  Ls(0, Qt.NotNull),
+  Ls(2, Qt.NotNull)
 ], Di.prototype, "transformImpl", null);
 Un([
-  Ht.Override
+  Qt.Override
 ], Di.prototype, "equals", null);
 Un([
-  Ht.Override
+  Qt.Override
 ], Di.prototype, "hashCode", null);
 Un([
-  Ls(0, Ht.NotNull),
-  Ls(3, Ht.NotNull)
+  Ls(0, Qt.NotNull),
+  Ls(3, Qt.NotNull)
 ], Di, "create", null);
 Di = Un([
-  Ls(0, Ht.NotNull),
-  Ls(2, Ht.NotNull)
+  Ls(0, Qt.NotNull),
+  Ls(2, Qt.NotNull)
 ], Di);
 ad.ATNConfig = Di;
 let Ax = class extends Di {
@@ -12728,14 +12728,14 @@ let Ax = class extends Di {
   }
 };
 Un([
-  Ht.NotNull
+  Qt.NotNull
 ], Ax.prototype, "_semanticContext", void 0);
 Un([
-  Ht.Override
+  Qt.Override
 ], Ax.prototype, "semanticContext", null);
 Ax = Un([
-  Ls(1, Ht.NotNull),
-  Ls(2, Ht.NotNull)
+  Ls(1, Qt.NotNull),
+  Ls(2, Qt.NotNull)
 ], Ax);
 let x2 = class extends Di {
   constructor(e, n, r, i, s) {
@@ -12753,14 +12753,14 @@ let x2 = class extends Di {
   }
 };
 Un([
-  Ht.Override
+  Qt.Override
 ], x2.prototype, "lexerActionExecutor", null);
 Un([
-  Ht.Override
+  Qt.Override
 ], x2.prototype, "hasPassedThroughNonGreedyDecision", null);
 x2 = Un([
-  Ls(1, Ht.NotNull),
-  Ls(2, Ht.NotNull)
+  Ls(1, Qt.NotNull),
+  Ls(2, Qt.NotNull)
 ], x2);
 let d2 = class extends Ax {
   constructor(e, n, r, i, s, o) {
@@ -12774,14 +12774,14 @@ let d2 = class extends Ax {
   }
 };
 Un([
-  Ht.Override
+  Qt.Override
 ], d2.prototype, "lexerActionExecutor", null);
 Un([
-  Ht.Override
+  Qt.Override
 ], d2.prototype, "hasPassedThroughNonGreedyDecision", null);
 d2 = Un([
-  Ls(1, Ht.NotNull),
-  Ls(2, Ht.NotNull)
+  Ls(1, Qt.NotNull),
+  Ls(2, Qt.NotNull)
 ], d2);
 var ou = {};
 /*!
@@ -12790,7 +12790,7 @@ var ou = {};
  */
 Object.defineProperty(ou, "__esModule", { value: !0 });
 ou.BitSet = void 0;
-const eme = Z0, tme = Fn, jp = new Uint16Array(0);
+const eme = Z0, tme = wn, jp = new Uint16Array(0);
 function Es(t) {
   return t >>> 4;
 }
@@ -13471,7 +13471,7 @@ function Ob() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.DFAState = void 0;
-    const r = uu(), i = ou, s = Fn, o = Ae, u = su(), a = Ni();
+    const r = uu(), i = ou, s = wn, o = Ae, u = su(), a = Ni();
     class l {
       /**
        * Constructs a new `DFAState`.
@@ -13735,7 +13735,7 @@ var Sa = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Tc, "__esModule", { value: !0 });
 Tc.Recognizer = void 0;
-const ime = cy, sme = h1, Is = Ae, RM = Gt, ome = gn;
+const ime = cy, sme = h1, Is = Ae, RM = Wt, ome = gn;
 class Yn {
   constructor() {
     this._listeners = [ime.ConsoleErrorListener.INSTANCE], this._stateNumber = -1;
@@ -13924,7 +13924,7 @@ var Oc = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Us, "__esModule", { value: !0 });
 Us.VocabularyImpl = void 0;
-const Nl = Ae, ume = Gt;
+const Nl = Ae, ume = Wt;
 class Yo {
   /**
    * Constructs a new instance of {@link VocabularyImpl} from the specified
@@ -14337,7 +14337,7 @@ function Bw() {
     };
   };
   Object.defineProperty(Qp, "__esModule", { value: !0 }), Qp.SetTransition = void 0;
-  const n = dd(), r = Ae, i = Gt, s = ru;
+  const n = dd(), r = Ae, i = Wt, s = ru;
   let o = class extends s.Transition {
     // TODO (sam): should we really allow undefined here?
     constructor(a, l) {
@@ -14578,7 +14578,7 @@ function Ome() {
     };
   };
   Object.defineProperty(zp, "__esModule", { value: !0 }), zp.LL1Analyzer = void 0;
-  const n = x1, r = iu, i = ad, s = ou, o = dd(), u = Ae, a = kw(), l = js, c = su(), f = Rc, x = g1, h = Gt, p = hy;
+  const n = x1, r = iu, i = ad, s = ou, o = dd(), u = Ae, a = kw(), l = js, c = su(), f = Rc, x = g1, h = Wt, p = hy;
   let m = class bD {
     constructor(y) {
       this.atn = y;
@@ -14739,7 +14739,7 @@ function uu() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.ATN = void 0;
-    const r = zl, i = EY(), s = dd(), o = fy, u = Ome(), a = Ae, l = js, c = su(), f = Gt, x = Ni();
+    const r = zl, i = EY(), s = dd(), o = fy, u = Ome(), a = Ae, l = js, c = su(), f = Wt, x = Ni();
     let h = class {
       /** Used for runtime deserialization of ATNs from strings */
       constructor(m, g) {
@@ -14886,7 +14886,7 @@ var ld = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(wb, "__esModule", { value: !0 });
 wb.LexerIndexedCustomAction = void 0;
-const SA = Fn, cd = Ae;
+const SA = wn, cd = Ae;
 let Dl = class bY {
   /**
    * Constructs a new indexed custom action by associating a character offset
@@ -14997,7 +14997,7 @@ var fd = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Fb, "__esModule", { value: !0 });
 Fb.LexerActionExecutor = void 0;
-const Nme = od, uN = wb, aN = Fn, ec = Ae;
+const Nme = od, uN = wb, aN = wn, ec = Ae;
 let Fl = class um {
   /**
    * Constructs an executor for a sequence of {@link LexerAction} actions.
@@ -15157,7 +15157,7 @@ var jw = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(xd, "__esModule", { value: !0 });
 xd.LexerNoViableAltException = void 0;
-const Fme = _o, Uw = Ae, wme = Ar, Lme = gn;
+const Fme = bo, Uw = Ae, wme = Ar, Lme = gn;
 let l3 = class extends Fme.RecognitionException {
   constructor(e, n, r, i) {
     super(e, n), this._startIndex = r, this._deadEndConfigs = i;
@@ -15250,7 +15250,7 @@ function py() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.LexerATNSimulator = void 0;
-    const r = ay, i = uu(), s = ad, o = ly(), u = Rb(), a = Ob(), l = Ar, c = ql, f = Hl(), x = Fb, h = xd, p = Ae, m = Ime(), g = su(), y = Rc, E = Gt, A = Ni();
+    const r = ay, i = uu(), s = ad, o = ly(), u = Rb(), a = Ob(), l = Ar, c = ql, f = Hl(), x = Fb, h = xd, p = Ae, m = Ime(), g = su(), y = Rc, E = Wt, A = Ni();
     let v = class As extends u.ATNSimulator {
       constructor(_, b) {
         super(_), this.optimize_tail_calls = !0, this.startIndex = -1, this._line = 1, this._charPositionInLine = 0, this.mode = f.Lexer.DEFAULT_MODE, this.prevAccept = new As.SimState(), this.recog = b;
@@ -15645,7 +15645,7 @@ function Hl() {
     return m > 3 && g && Object.defineProperty(x, h, g), g;
   };
   Object.defineProperty(kp, "__esModule", { value: !0 }), kp.Lexer = void 0;
-  const e = Tb, n = uy, r = Ar, i = ql, s = py(), o = xd, u = Ae, a = Tc, l = Gt;
+  const e = Tb, n = uy, r = Ar, i = ql, s = py(), o = xd, u = Ae, a = Tc, l = Wt;
   let c = class y0 extends a.Recognizer {
     constructor(x) {
       super(), this._factory = e.CommonTokenFactory.DEFAULT, this._tokenStartCharIndex = -1, this._tokenStartLine = 0, this._tokenStartCharPositionInLine = 0, this._hitEOF = !1, this._channel = 0, this._type = 0, this._modeStack = new n.IntegerStack(), this._mode = y0.DEFAULT_MODE, this._input = x, this._tokenFactorySourcePair = { source: this, stream: x };
@@ -15859,7 +15859,7 @@ function dd() {
     };
   };
   Object.defineProperty(Bp, "__esModule", { value: !0 }), Bp.IntervalSet = void 0;
-  const n = od, r = d1, i = Ar, s = Hl(), o = Fn, u = Ae, a = Gt;
+  const n = od, r = d1, i = Ar, s = Hl(), o = wn, u = Ae, a = Wt;
   let l = class Nt {
     constructor(f) {
       this.readonly = !1, f != null ? this._intervals = f.slice(0) : this._intervals = [];
@@ -16528,7 +16528,7 @@ var m1 = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Bb, "__esModule", { value: !0 });
 Bb.LexerChannelAction = void 0;
-const _A = Fn, Tx = Ae;
+const _A = wn, Tx = Ae;
 class Ql {
   /**
    * Constructs a new `channel` action with the specified channel value.
@@ -16619,7 +16619,7 @@ var _y = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(kb, "__esModule", { value: !0 });
 kb.LexerCustomAction = void 0;
-const Kp = Fn, m2 = Ae;
+const Kp = wn, m2 = Ae;
 class Nc {
   /**
    * Constructs a custom lexer action with the specified rule and action
@@ -16725,7 +16725,7 @@ var y1 = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Pb, "__esModule", { value: !0 });
 Pb.LexerModeAction = void 0;
-const bA = Fn, Ox = Ae;
+const bA = wn, Ox = Ae;
 class Gl {
   /**
    * Constructs a new `mode` action with the specified mode value.
@@ -16816,7 +16816,7 @@ var RY = {};
     };
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), t.LexerMoreAction = void 0;
-  const r = Fn, i = Ae;
+  const r = wn, i = Ae;
   class s {
     /**
      * Constructs the singleton instance of the lexer `more` command.
@@ -16893,7 +16893,7 @@ var NY = {};
     };
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), t.LexerPopModeAction = void 0;
-  const r = Fn, i = Ae;
+  const r = wn, i = Ae;
   class s {
     /**
      * Constructs the singleton instance of the lexer `popMode` command.
@@ -16970,7 +16970,7 @@ var E1 = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Mb, "__esModule", { value: !0 });
 Mb.LexerPushModeAction = void 0;
-const CA = Fn, Rx = Ae;
+const CA = wn, Rx = Ae;
 class Wl {
   /**
    * Constructs a new `pushMode` action with the specified mode value.
@@ -17061,7 +17061,7 @@ var DY = {};
     };
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), t.LexerSkipAction = void 0;
-  const r = Fn, i = Ae;
+  const r = wn, i = Ae;
   class s {
     /**
      * Constructs the singleton instance of the lexer `skip` command.
@@ -17138,7 +17138,7 @@ var A1 = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(jb, "__esModule", { value: !0 });
 jb.LexerTypeAction = void 0;
-const TA = Fn, Nx = Ae;
+const TA = wn, Nx = Ae;
 class Vl {
   /**
    * Constructs a new `type` action with the specified token type value.
@@ -17307,7 +17307,7 @@ var _a = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(au, "__esModule", { value: !0 });
 au.TerminalNode = void 0;
-const c3e = Ar, ba = Ae, f3e = Gt;
+const c3e = Ar, ba = Ae, f3e = Wt;
 class lu {
   constructor(e) {
     this._symbol = e;
@@ -17439,7 +17439,7 @@ function wc() {
     };
   };
   Object.defineProperty(eg, "__esModule", { value: !0 }), eg.Trees = void 0;
-  const n = uu(), r = Cc, i = Dc, s = Ae, o = C1(), u = bo(), a = Fc, l = au, c = Gt, f = gn;
+  const n = uu(), r = Cc, i = Dc, s = Ae, o = C1(), u = Co(), a = Fc, l = au, c = Wt, f = gn;
   let x = class E0 {
     static toStringTree(p, m) {
       let g;
@@ -17609,7 +17609,7 @@ function BY() {
     return h > 3 && p && Object.defineProperty(c, f, p), p;
   };
   Object.defineProperty(Zp, "__esModule", { value: !0 }), Zp.RuleContext = void 0;
-  const e = uu(), n = Tc, r = Fc, i = Ar, s = Ae, o = wc(), u = bo();
+  const e = uu(), n = Tc, r = Fc, i = Ar, s = Ae, o = wc(), u = Co();
   let a = class $Y extends r.RuleNode {
     constructor(c, f) {
       super(), this._parent = c, this.invokingState = f ?? -1;
@@ -17737,7 +17737,7 @@ function BY() {
   ], a.prototype, "toStringTree", null), Zp.RuleContext = a, Zp;
 }
 var zM;
-function bo() {
+function Co() {
   if (zM)
     return Jp;
   zM = 1;
@@ -17949,7 +17949,7 @@ var kY = {};
     return c > 3 && f && Object.defineProperty(u, a, f), f;
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), t.PredictionMode = void 0;
-  const n = zl, r = Fn, i = Ae, s = Rc;
+  const n = zl, r = wn, i = Ae, s = Rc;
   (function(o) {
     o[o.SLL = 0] = "SLL", o[o.LL = 1] = "LL", o[o.LL_EXACT_AMBIG_DETECTION = 2] = "LL_EXACT_AMBIG_DETECTION";
   })(t.PredictionMode || (t.PredictionMode = {})), function(o) {
@@ -18017,7 +18017,7 @@ function PY() {
     };
   };
   Object.defineProperty(tg, "__esModule", { value: !0 }), tg.SimulatorState = void 0;
-  const n = Ae, r = bo();
+  const n = Ae, r = Co();
   let i = class {
     constructor(o, u, a, l) {
       this.outerContext = o ?? r.ParserRuleContext.emptyContext(), this.s0 = u, this.useContext = a, this.remainingOuterContext = l;
@@ -18050,7 +18050,7 @@ function v1() {
     };
   };
   Object.defineProperty(Xp, "__esModule", { value: !0 }), Xp.ParserATNSimulator = void 0;
-  const n = ay, r = my, i = iu, s = _b, o = uu(), u = ad, a = ly(), l = Rb(), c = Er, f = Ay, x = ou, h = Ub, p = va, m = Ob(), g = d1, y = Ar, E = ql, A = Ae, v = kw(), S = $y(), _ = js, b = bo(), C = su(), R = $w(), O = kY, I = Rc, j = g1, Q = sd, G = Bw(), P = PY(), W = Gt, oe = Us, ne = Ni(), X = 65535, ae = -(1 << 31 >>> 0);
+  const n = ay, r = my, i = iu, s = _b, o = uu(), u = ad, a = ly(), l = Rb(), c = Er, f = Ay, x = ou, h = Ub, p = va, m = Ob(), g = d1, y = Ar, E = ql, A = Ae, v = kw(), S = $y(), _ = js, b = Co(), C = su(), R = $w(), O = kY, I = Rc, j = g1, Q = sd, G = Bw(), P = PY(), W = Wt, oe = Us, ne = Ni(), X = 65535, ae = -(1 << 31 >>> 0);
   let de = class ot extends l.ATNSimulator {
     constructor(D, k) {
       super(D), this.predictionMode = O.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 = k;
@@ -19433,7 +19433,7 @@ var Kb = {};
  */
 Object.defineProperty(Kb, "__esModule", { value: !0 });
 Kb.UUID = void 0;
-const G3e = Fn;
+const G3e = wn;
 class _S {
   constructor(e, n, r, i) {
     this.data = new Uint32Array(4), this.data[0] = e, this.data[1] = n, this.data[2] = r, this.data[3] = i;
@@ -19478,7 +19478,7 @@ function S1() {
     };
   };
   Object.defineProperty(Yp, "__esModule", { value: !0 }), Yp.ATNDeserializer = void 0;
-  const n = my, r = iu, i = uu(), s = gy, o = Er, u = Ay, a = Lb, l = xy, c = ou, f = Ib, x = hd, h = va, p = EY(), m = $b, g = dd(), y = fy, E = Bb, A = kb, v = Pb, S = RY, _ = NY, b = Mb, C = DY, R = jb, O = by, I = Ae, j = kw(), Q = v1(), G = qb, P = zb, W = Hb, oe = sy, ne = Qb, X = Gb, ae = Rc, de = g1, _e = Bw(), D = Wb, k = Vb, U = p1, Y = Gt, q = Yb, B = Kb, T = hy;
+  const n = my, r = iu, i = uu(), s = gy, o = Er, u = Ay, a = Lb, l = xy, c = ou, f = Ib, x = hd, h = va, p = EY(), m = $b, g = dd(), y = fy, E = Bb, A = kb, v = Pb, S = RY, _ = NY, b = Mb, C = DY, R = jb, O = by, I = Ae, j = kw(), Q = v1(), G = qb, P = zb, W = Hb, oe = sy, ne = Qb, X = Gb, ae = Rc, de = g1, _e = Bw(), D = Wb, k = Vb, U = p1, Y = Wt, q = Yb, B = Kb, T = hy;
   var N;
   (function(z) {
     z[z.UNICODE_BMP = 0] = "UNICODE_BMP", z[z.UNICODE_SMP = 1] = "UNICODE_SMP";
@@ -19598,7 +19598,7 @@ function S1() {
       )));
       let Ee = Qe.toInt(L[H++]);
       for (let V = 0; V < Ee; V++) {
-        let fe = Qe.toInt(L[H]), we = Qe.toInt(L[H + 1]), ze = Qe.toInt(L[H + 2]), nt = Qe.toInt(L[H + 3]), gt = Qe.toInt(L[H + 4]), rt = Qe.toInt(L[H + 5]), rr = this.edgeFactory(ce, ze, fe, we, nt, gt, rt, Le);
+        let fe = Qe.toInt(L[H]), we = Qe.toInt(L[H + 1]), ze = Qe.toInt(L[H + 2]), nt = Qe.toInt(L[H + 3]), mt = Qe.toInt(L[H + 4]), rt = Qe.toInt(L[H + 5]), rr = this.edgeFactory(ce, ze, fe, we, nt, mt, rt, Le);
         ce.states[fe].addTransition(rr), H += 6;
       }
       let ee = new r.Array2DHashSet({
@@ -19669,7 +19669,7 @@ function S1() {
               let ze = fe.transition(we);
               if (!(ze instanceof n.ActionTransition))
                 continue;
-              let nt = ze.ruleIndex, gt = ze.actionIndex, rt = new A.LexerCustomAction(nt, gt);
+              let nt = ze.ruleIndex, mt = ze.actionIndex, rt = new A.LexerCustomAction(nt, mt);
               fe.setTransition(we, new n.ActionTransition(ze.target, nt, V.length, !1)), V.push(rt);
             }
           ce.lexerActions = V;
@@ -19713,8 +19713,8 @@ function S1() {
             fe.addTransition(rt);
           }
           ce.ruleToStartState[V].addTransition(new m.EpsilonTransition(fe)), we.addTransition(new m.EpsilonTransition(ze));
-          let gt = new l.BasicState();
-          ce.addState(gt), gt.addTransition(new u.AtomTransition(we, ce.ruleToTokenType[V])), fe.addTransition(new m.EpsilonTransition(gt));
+          let mt = new l.BasicState();
+          ce.addState(mt), mt.addTransition(new u.AtomTransition(we, ce.ruleToTokenType[V])), fe.addTransition(new m.EpsilonTransition(mt));
         }
         this.deserializationOptions.isVerifyATN && this.verifyATN(ce);
       }
@@ -20586,7 +20586,7 @@ var Bi = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Fy, "__esModule", { value: !0 });
 Fy.BufferedTokenStream = void 0;
-const VM = Ni(), YM = Cc, cN = Ar, fN = Hl(), gr = Ae, Tf = Gt;
+const VM = Ni(), YM = Cc, cN = Ar, fN = Hl(), gr = Ae, Tf = Wt;
 let Dr = class {
   constructor(e) {
     if (this.tokens = [], this.p = -1, this.fetchedEOF = !1, e == null)
@@ -20902,7 +20902,7 @@ var eC = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(_1, "__esModule", { value: !0 });
 _1.CommonTokenStream = void 0;
-const tye = Fy, tC = Ae, KM = Gt;
+const tye = Fy, tC = Ae, KM = Wt;
 let y2 = class extends tye.BufferedTokenStream {
   /**
    * Constructs a new {@link CommonTokenStream} using the specified token
@@ -20982,7 +20982,7 @@ var pd = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(wy, "__esModule", { value: !0 });
 wy.ListTokenSource = void 0;
-const nye = Tb, Al = Ae, xN = Gt;
+const nye = Tb, Al = Ae, xN = Wt;
 let wl = class {
   /**
    * Constructs a new {@link ListTokenSource} instance from the specified
@@ -21181,7 +21181,7 @@ function GY() {
     return a > 3 && l && Object.defineProperty(s, o, l), l;
   };
   Object.defineProperty(ig, "__esModule", { value: !0 }), ig.InterpreterRuleContext = void 0;
-  const e = Ae, n = bo();
+  const e = Ae, n = Co();
   let r = class extends n.ParserRuleContext {
     constructor(s, o, u) {
       u !== void 0 ? super(o, u) : super(), this._ruleIndex = s;
@@ -21217,7 +21217,7 @@ function WY() {
     };
   };
   Object.defineProperty(rg, "__esModule", { value: !0 }), rg.ParserInterpreter = void 0;
-  const n = Aa, r = Er, i = ou, s = bc, o = ud, u = GY(), a = by, l = Ae, c = Ae, f = C1(), x = v1(), h = _o, p = p1, m = Gt;
+  const n = Aa, r = Er, i = ou, s = bc, o = ud, u = GY(), a = by, l = Ae, c = Ae, f = C1(), x = v1(), h = bo, p = p1, m = Wt;
   let g = class TD extends f.Parser {
     constructor(E, A, v, S, _) {
       if (super(E instanceof TD ? E.inputStream : _), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof TD) {
@@ -21856,7 +21856,7 @@ function lye() {
     return c > 3 && f && Object.defineProperty(u, a, f), f;
   };
   Object.defineProperty(xg, "__esModule", { value: !0 }), xg.XPathRuleElement = void 0;
-  const e = bo(), n = Ae, r = wc(), i = b1();
+  const e = Co(), n = Ae, r = wc(), i = b1();
   let s = class extends i.XPathElement {
     constructor(u, a) {
       super(u), this.ruleIndex = a;
@@ -22018,7 +22018,7 @@ function Ww() {
    * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
    */
   Object.defineProperty(ug, "__esModule", { value: !0 }), ug.XPath = void 0;
-  const t = Zb, e = _1, n = xd, r = bo(), i = Gt, s = oye(), o = uye(), u = aye(), a = lye(), l = cye(), c = fye(), f = xye(), x = dye();
+  const t = Zb, e = _1, n = xd, r = Co(), i = Wt, s = oye(), o = uye(), u = aye(), a = lye(), l = cye(), c = fye(), f = xye(), x = dye();
   let h = class VY {
     constructor(m, g) {
       this.parser = m, this.path = g, this.elements = this.split(g);
@@ -22280,7 +22280,7 @@ function pye() {
     };
   };
   Object.defineProperty(mg, "__esModule", { value: !0 }), mg.RuleTagToken = void 0;
-  const n = Ae, r = Gt;
+  const n = Ae, r = Wt;
   let i = class {
     /**
      * Constructs a new instance of {@link RuleTagToken} with the specified rule
@@ -22687,7 +22687,7 @@ function Eye() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.ParseTreePatternMatcher = void 0;
-    const r = KY(), i = Zb, s = _1, o = wy, u = rye(), a = Ae, l = Ly, c = WY(), f = bo(), x = sye(), h = hye(), p = _o, m = Fc, g = pye(), y = gye(), E = au, A = mye(), v = Gt, S = yye();
+    const r = KY(), i = Zb, s = _1, o = wy, u = rye(), a = Ae, l = Ly, c = WY(), f = Co(), x = sye(), h = hye(), p = bo, m = Fc, g = pye(), y = gye(), E = au, A = mye(), v = Wt, S = yye();
     class _ {
       /**
        * Constructs a {@link ParseTreePatternMatcher} or from a {@link Lexer} and
@@ -23438,7 +23438,7 @@ function C1() {
     });
   };
   Object.defineProperty(Vp, "__esModule", { value: !0 }), Vp.Parser = void 0;
-  const r = gn, i = gy, s = S1(), o = Vw(), u = Dc, a = uy, l = Hl(), c = Ae, f = Xb, x = v1(), h = Ny, p = Tc, m = au, g = Gt;
+  const r = gn, i = gy, s = S1(), o = Vw(), u = Dc, a = uy, l = Hl(), c = Ae, f = Xb, x = v1(), h = Ny, p = Tc, m = au, g = Wt;
   class y {
     constructor(v, S) {
       this.ruleNames = v, this.tokenStream = S;
@@ -23996,7 +23996,7 @@ function $y() {
     return l > 3 && c && Object.defineProperty(o, u, c), c;
   };
   Object.defineProperty(Wp, "__esModule", { value: !0 }), Wp.NoViableAltException = void 0;
-  const e = C1(), n = _o, r = Ae;
+  const e = C1(), n = bo, r = Ae;
   let i = class extends n.RecognitionException {
     constructor(o, u, a, l, c, f) {
       o instanceof e.Parser && (u === void 0 && (u = o.inputStream), a === void 0 && (a = o.currentToken), l === void 0 && (l = o.currentToken), f === void 0 && (f = o.context)), super(o, u, f), this._deadEndConfigs = c, this._startToken = a, this.setOffendingToken(o, l);
@@ -24035,7 +24035,7 @@ function Vw() {
     };
   };
   Object.defineProperty($p, "__esModule", { value: !0 }), $p.DefaultErrorStrategy = void 0;
-  const n = Aa, r = Er, i = bc, s = ud, o = dd(), u = $y(), a = su(), l = Gt, c = Ae;
+  const n = Aa, r = Er, i = bc, s = ud, o = dd(), u = $y(), a = su(), l = Wt, c = Ae;
   let f = class {
     constructor() {
       this.errorRecoveryMode = !1, this.lastErrorIndex = -1, this.nextTokensState = n.ATNState.INVALID_STATE_NUMBER;
@@ -24692,7 +24692,7 @@ var T1 = F && F.__decorate || function(t, e, n, r) {
     for (var u = t.length - 1; u >= 0; u--)
       (o = t[u]) && (s = (i < 3 ? o(s) : i > 3 ? o(e, n, s) : o(e, n)) || s);
   return i > 3 && s && Object.defineProperty(e, n, s), s;
-}, co = F && F.__param || function(t, e) {
+}, fo = F && F.__param || function(t, e) {
   return function(n, r) {
     e(n, r, t);
   };
@@ -24759,29 +24759,29 @@ T1([
 ], gd.prototype, "syntaxError", null);
 T1([
   Tr.Override,
-  co(0, Tr.NotNull),
-  co(1, Tr.NotNull),
-  co(6, Tr.NotNull)
+  fo(0, Tr.NotNull),
+  fo(1, Tr.NotNull),
+  fo(6, Tr.NotNull)
 ], gd.prototype, "reportAmbiguity", null);
 T1([
   Tr.Override,
-  co(0, Tr.NotNull),
-  co(1, Tr.NotNull),
-  co(5, Tr.NotNull)
+  fo(0, Tr.NotNull),
+  fo(1, Tr.NotNull),
+  fo(5, Tr.NotNull)
 ], gd.prototype, "reportAttemptingFullContext", null);
 T1([
   Tr.Override,
-  co(0, Tr.NotNull),
-  co(1, Tr.NotNull),
-  co(5, Tr.NotNull)
+  fo(0, Tr.NotNull),
+  fo(1, Tr.NotNull),
+  fo(5, Tr.NotNull)
 ], gd.prototype, "reportContextSensitivity", null);
 T1([
-  co(0, Tr.NotNull),
-  co(1, Tr.NotNull)
+  fo(0, Tr.NotNull),
+  fo(1, Tr.NotNull)
 ], gd.prototype, "getDecisionDescription", null);
 T1([
   Tr.NotNull,
-  co(1, Tr.NotNull)
+  fo(1, Tr.NotNull)
 ], gd.prototype, "getConflictingAlts", null);
 nC.DiagnosticErrorListener = gd;
 var rC = {};
@@ -24877,7 +24877,7 @@ var Dye = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(iC, "__esModule", { value: !0 });
 iC.RuleContextWithAltNum = void 0;
-const Fye = uu(), wye = Ae, Lye = bo();
+const Fye = uu(), wye = Ae, Lye = Co();
 class tK extends Lye.ParserRuleContext {
   constructor(e, n) {
     n !== void 0 ? super(e, n) : super(), this._altNumber = Fye.ATN.INVALID_ALT_NUMBER;
@@ -24952,7 +24952,7 @@ var uC = F && F.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(E2, "__esModule", { value: !0 });
 E2.RewriteOperation = E2.TokenStreamRewriter = void 0;
-const Fj = Ar, aC = Ae, sK = Gt;
+const Fj = Ar, aC = Ae, sK = Wt;
 class qr {
   constructor(e) {
     this.tokens = e, this.programs = /* @__PURE__ */ new Map(), this.programs.set(qr.DEFAULT_PROGRAM_NAME, []), this.lastRewriteTokenIndexes = /* @__PURE__ */ new Map();
@@ -25217,7 +25217,7 @@ Object.defineProperty(uK, "__esModule", { value: !0 });
     for (var s in r)
       s !== "default" && !Object.prototype.hasOwnProperty.call(i, s) && e(i, r, s);
   };
-  Object.defineProperty(t, "__esModule", { value: !0 }), n(LV, t), n(IV, t), n(mb, t), n(KY(), t), n(Fy, t), n(XY, t), n(Zb, t), n(Gw, t), n(Dy, t), n(Cc, t), n(Tb, t), n(_1, t), n(cy, t), n(Vw(), t), n(JY, t), n(nC, t), n(bc, t), n(ud, t), n(GY(), t), n(ql, t), n(Hl(), t), n(rC, t), n(xd, t), n(wy, t), n($y(), t), n(C1(), t), n(eK, t), n(WY(), t), n(bo(), t), n(h1, t), n(Ny, t), n(_o, t), n(Tc, t), n(BY(), t), n(iC, t), n(sC, t), n(oC, t), n(Gt, t), n(nK, t), n(rK, t), n(iK, t), n(E2, t), n(oK, t), n(Us, t), n(uK, t);
+  Object.defineProperty(t, "__esModule", { value: !0 }), n(LV, t), n(IV, t), n(mb, t), n(KY(), t), n(Fy, t), n(XY, t), n(Zb, t), n(Gw, t), n(Dy, t), n(Cc, t), n(Tb, t), n(_1, t), n(cy, t), n(Vw(), t), n(JY, t), n(nC, t), n(bc, t), n(ud, t), n(GY(), t), n(ql, t), n(Hl(), t), n(rC, t), n(xd, t), n(wy, t), n($y(), t), n(C1(), t), n(eK, t), n(WY(), t), n(Co(), t), n(h1, t), n(Ny, t), n(bo, t), n(Tc, t), n(BY(), t), n(iC, t), n(sC, t), n(oC, t), n(Wt, t), n(nK, t), n(rK, t), n(iK, t), n(E2, t), n(oK, t), n(Us, t), n(uK, t);
 })(gb);
 var cC = {}, Bye = F && F.__createBinding || (Object.create ? function(t, e, n, r) {
   r === void 0 && (r = n);
@@ -26081,7 +26081,7 @@ w.AggregateOrderingContext = w.FieldPropertiesContext = w.FilterStatementContext
 w.ExprNowContext = w.ExprRegexContext = w.ExprBoolContext = w.ExprNULLContext = w.ExprTimeContext = w.ExprNumberContext = w.ExprStringContext = w.LiteralContext = w.NumericLiteralContext = w.ShortStringContext = w.StringContext = w.CompareOpContext = w.MalloyTypeContext = w.AggregateContext = w.SampleSpecContext = w.QueryAnnotationContext = w.TimezoneStatementContext = w.SampleStatementContext = w.IndexStatementContext = w.IndexFieldsContext = w.IndexElementContext = w.TopStatementContext = w.BySpecContext = w.LimitStatementContext = w.OrderBySpecContext = w.OrderingContext = w.OrderByStatementContext = w.PartitionByStatementContext = w.ProjectStatementContext = w.CalculateStatementContext = w.AggregateStatementContext = w.NestDefContext = w.NestEntryContext = w.NestedQueryListContext = w.NestStatementContext = w.QueryFieldEntryContext = w.QueryFieldListContext = w.GroupByStatementContext = w.QueryJoinStatementContext = w.QueryStatementContext = w.ExploreQueryDefContext = w.ExploreQueryNameDefContext = w.SubQueryDefListContext = w.HavingStatementContext = w.WhereStatementContext = w.FilterClauseListContext = w.FieldPropertyStatementContext = w.FieldPropertyLimitStatementContext = w.AggregateOrderByStatementContext = w.AggregateOrderBySpecContext = void 0;
 w.StarQualifiedContext = w.CollectionWildCardContext = w.FieldCollectionContext = w.FieldNameListContext = w.ArgumentListContext = w.PickContext = w.PickStatementContext = w.PartialAllowedFieldExprContext = w.ExprUngroupContext = w.ExprPickContext = w.ExprFuncContext = w.ExprAggFuncContext = w.ExprExprContext = w.ExprAggregateContext = w.ExprPathlessAggregateContext = w.ExprCoalesceContext = w.ExprLogicalOrContext = w.ExprLogicalAndContext = w.ExprNotContext = w.ExprApplyContext = w.ExprCompareContext = w.ExprOrTreeContext = w.ExprAndTreeContext = w.ExprForRangeContext = w.ExprRangeContext = w.ExprAddSubContext = w.ExprMulDivContext = w.ExprMinusContext = w.ExprSafeCastContext = w.ExprCastContext = w.ExprTimeTruncContext = w.ExprDurationContext = w.ExprLiteralContext = w.ExprFieldPropsContext = w.ExprFieldPathContext = w.FieldExprContext = w.MalloyOrSQLTypeContext = w.UngroupContext = w.TimeframeContext = w.IdContext = w.TableURIContext = w.TablePathContext = w.LiteralYearContext = w.LiteralQuarterContext = w.LiteralMonthContext = w.LiteralWeekContext = w.LiteralDayContext = w.LiteralHourContext = w.LiteralTimestampContext = w.DateLiteralContext = void 0;
 w.ExperimentalStatementForTestingContext = w.ConnectionNameContext = w.NameSQLBlockContext = w.SqlExploreNameRefContext = w.JustExprContext = w.FieldNameContext = w.JoinNameContext = w.FieldPathContext = w.CollectionMemberContext = w.RefExprContext = w.TaggedRefContext = void 0;
-const Jt = uu(), Gye = S1(), Wye = bc, on = $y(), Vye = C1(), me = bo(), Yye = v1(), ge = _o, qn = Gt, Kye = Us, lK = Qye(gn);
+const Jt = uu(), Gye = S1(), Wye = bc, on = $y(), Vye = C1(), me = Co(), Yye = v1(), ge = bo, qn = Wt, Kye = Us, lK = Qye(gn);
 class d extends Vye.Parser {
   // @Override
   // @NotNull
@@ -26233,7 +26233,7 @@ class d extends Vye.Parser {
   }
   // @RuleVersion(0)
   tags() {
-    let e = new Qt(this._ctx, this.state);
+    let e = new Gt(this._ctx, this.state);
     this.enterRule(e, 10, d.RULE_tags);
     let n;
     try {
@@ -27439,7 +27439,7 @@ class d extends Vye.Parser {
   // @RuleVersion(0)
   sqExpr(e) {
     e === void 0 && (e = 0);
-    let n = this._ctx, r = this.state, i = new In(this._ctx, r), s = i, o = 102;
+    let n = this._ctx, r = this.state, i = new $n(this._ctx, r), s = i, o = 102;
     this.enterRecursionRule(i, 102, d.RULE_sqExpr, e);
     try {
       let u;
@@ -27468,21 +27468,21 @@ class d extends Vye.Parser {
             switch (this._parseListeners != null && this.triggerExitRuleEvent(), s = i, this.state = 641, this._errHandler.sync(this), this.interpreter.adaptivePredict(this._input, 46, this._ctx)) {
               case 1:
                 {
-                  if (i = new $K(new In(n, r)), this.pushNewRecursionContext(i, o, d.RULE_sqExpr), this.state = 632, !this.precpred(this._ctx, 5))
+                  if (i = new $K(new $n(n, r)), this.pushNewRecursionContext(i, o, d.RULE_sqExpr), this.state = 632, !this.precpred(this._ctx, 5))
                     throw this.createFailedPredicateException("this.precpred(this._ctx, 5)");
                   this.state = 633, this.match(d.PLUS), this.state = 634, this.segExpr(0);
                 }
                 break;
               case 2:
                 {
-                  if (i = new BK(new In(n, r)), this.pushNewRecursionContext(i, o, d.RULE_sqExpr), this.state = 635, !this.precpred(this._ctx, 4))
+                  if (i = new BK(new $n(n, r)), this.pushNewRecursionContext(i, o, d.RULE_sqExpr), this.state = 635, !this.precpred(this._ctx, 4))
                     throw this.createFailedPredicateException("this.precpred(this._ctx, 4)");
                   this.state = 636, this.match(d.ARROW), this.state = 637, this.segExpr(0);
                 }
                 break;
               case 3:
                 {
-                  if (i = new kK(new In(n, r)), this.pushNewRecursionContext(i, o, d.RULE_sqExpr), this.state = 638, !this.precpred(this._ctx, 3))
+                  if (i = new kK(new $n(n, r)), this.pushNewRecursionContext(i, o, d.RULE_sqExpr), this.state = 638, !this.precpred(this._ctx, 3))
                     throw this.createFailedPredicateException("this.precpred(this._ctx, 3)");
                   this.state = 639, this.match(d.EXTEND), this.state = 640, this.exploreProperties();
                 }
@@ -30688,7 +30688,7 @@ class bS extends me.ParserRuleContext {
 w.MalloyStatementContext = bS;
 class Yw extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   SOURCE() {
     return this.getToken(d.SOURCE, 0);
@@ -30753,7 +30753,7 @@ class fK extends By {
 w.Use_top_level_query_defsContext = fK;
 class xK extends By {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   QUERY() {
     return this.getToken(d.QUERY, 0);
@@ -30780,10 +30780,10 @@ class xK extends By {
 w.AnonymousQueryContext = xK;
 class fC extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   constructor(e, n) {
     super(e, n);
@@ -30806,7 +30806,7 @@ class fC extends me.ParserRuleContext {
   }
 }
 w.TopLevelAnonQueryDefContext = fC;
-class Qt extends me.ParserRuleContext {
+class Gt extends me.ParserRuleContext {
   ANNOTATION(e) {
     return e === void 0 ? this.getTokens(d.ANNOTATION) : this.getToken(d.ANNOTATION, e);
   }
@@ -30830,13 +30830,13 @@ class Qt extends me.ParserRuleContext {
     return e.visitTags ? e.visitTags(this) : e.visitChildren(this);
   }
 }
-w.TagsContext = Qt;
+w.TagsContext = Gt;
 class Ic extends me.ParserRuleContext {
   IS() {
     return this.getToken(d.IS, 0);
   }
   tags(e) {
-    return e === void 0 ? this.getRuleContexts(Qt) : this.getRuleContext(e, Qt);
+    return e === void 0 ? this.getRuleContexts(Gt) : this.getRuleContext(e, Gt);
   }
   constructor(e, n) {
     super(e, n);
@@ -30861,7 +30861,7 @@ class Ic extends me.ParserRuleContext {
 w.IsDefineContext = Ic;
 class Kw extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   RUN() {
     return this.getToken(d.RUN, 0);
@@ -30926,7 +30926,7 @@ class CS extends me.ParserRuleContext {
     return this.getToken(d.OPEN_CODE, 0);
   }
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   CCURLY() {
     return this.tryGetToken(d.CCURLY, 0);
@@ -31153,7 +31153,7 @@ class dC extends me.ParserRuleContext {
 w.IgnoredModelAnnotationsContext = dC;
 class n9 extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   QUERY() {
     return this.getToken(d.QUERY, 0);
@@ -31187,7 +31187,7 @@ class n9 extends me.ParserRuleContext {
 w.TopLevelQueryDefsContext = n9;
 class OS extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   queryName() {
     return this.getRuleContext(0, gC);
@@ -31196,7 +31196,7 @@ class OS extends me.ParserRuleContext {
     return this.getRuleContext(0, Ic);
   }
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   constructor(e, n) {
     super(e, n);
@@ -31542,7 +31542,7 @@ class s9 extends me.ParserRuleContext {
 w.SourcePropertyListContext = s9;
 class RS extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   sourceNameDef() {
     return this.getRuleContext(0, l9);
@@ -31579,7 +31579,7 @@ class RS extends me.ParserRuleContext {
 w.SourceDefinitionContext = RS;
 class o9 extends me.ParserRuleContext {
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   constructor(e, n) {
     super(e, n);
@@ -31955,7 +31955,7 @@ class bK extends ti {
 w.DefExploreEditFieldContext = bK;
 class CK extends ti {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   subQueryDefList() {
     return this.getRuleContext(0, _9);
@@ -32048,7 +32048,7 @@ class RK extends ti {
 w.DefIgnoreModel_stubContext = RK;
 class mC extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   MEASURE() {
     return this.getToken(d.MEASURE, 0);
@@ -32079,7 +32079,7 @@ class mC extends me.ParserRuleContext {
 w.DefMeasuresContext = mC;
 class yC extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   DIMENSION() {
     return this.getToken(d.DIMENSION, 0);
@@ -32194,7 +32194,7 @@ class Py extends me.ParserRuleContext {
 w.DefListContext = Py;
 class A2 extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   fieldNameDef() {
     return this.getRuleContext(0, x9);
@@ -32319,7 +32319,7 @@ class Yl extends me.ParserRuleContext {
 w.JoinStatementContext = Yl;
 class NK extends Yl {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   JOIN_ONE() {
     return this.getToken(d.JOIN_ONE, 0);
@@ -32346,7 +32346,7 @@ class NK extends Yl {
 w.DefJoinOneContext = NK;
 class DK extends Yl {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   JOIN_MANY() {
     return this.getToken(d.JOIN_MANY, 0);
@@ -32373,7 +32373,7 @@ class DK extends Yl {
 w.DefJoinManyContext = DK;
 class FK extends Yl {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   JOIN_CROSS() {
     return this.getToken(d.JOIN_CROSS, 0);
@@ -32547,7 +32547,7 @@ class FS extends me.ParserRuleContext {
   }
 }
 w.SourceArgumentContext = FS;
-class In extends me.ParserRuleContext {
+class $n extends me.ParserRuleContext {
   constructor(e, n) {
     super(e, n);
   }
@@ -32559,8 +32559,8 @@ class In extends me.ParserRuleContext {
     super.copyFrom(e);
   }
 }
-w.SqExprContext = In;
-class LK extends In {
+w.SqExprContext = $n;
+class LK extends $n {
   id() {
     return this.getRuleContext(0, Nn);
   }
@@ -32584,12 +32584,12 @@ class LK extends In {
   }
 }
 w.SQIDContext = LK;
-class IK extends In {
+class IK extends $n {
   OPAREN() {
     return this.getToken(d.OPAREN, 0);
   }
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   CPAREN() {
     return this.getToken(d.CPAREN, 0);
@@ -32611,9 +32611,9 @@ class IK extends In {
   }
 }
 w.SQParensContext = IK;
-class $K extends In {
+class $K extends $n {
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   PLUS() {
     return this.getToken(d.PLUS, 0);
@@ -32638,9 +32638,9 @@ class $K extends In {
   }
 }
 w.SQRefinedQueryContext = $K;
-class BK extends In {
+class BK extends $n {
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   ARROW() {
     return this.getToken(d.ARROW, 0);
@@ -32665,9 +32665,9 @@ class BK extends In {
   }
 }
 w.SQArrowContext = BK;
-class kK extends In {
+class kK extends $n {
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   EXTEND() {
     return this.getToken(d.EXTEND, 0);
@@ -32692,7 +32692,7 @@ class kK extends In {
   }
 }
 w.SQExtendedSourceContext = kK;
-class PK extends In {
+class PK extends $n {
   exploreTable() {
     return this.getRuleContext(0, ky);
   }
@@ -32713,7 +32713,7 @@ class PK extends In {
   }
 }
 w.SQTableContext = PK;
-class MK extends In {
+class MK extends $n {
   sqlSource() {
     return this.getRuleContext(0, r9);
   }
@@ -32999,10 +32999,10 @@ class m9 extends me.ParserRuleContext {
     return this.getToken(d.IS, 0);
   }
   sqExpr() {
-    return this.getRuleContext(0, In);
+    return this.getRuleContext(0, $n);
   }
   tags(e) {
-    return e === void 0 ? this.getRuleContexts(Qt) : this.getRuleContext(e, Qt);
+    return e === void 0 ? this.getRuleContexts(Gt) : this.getRuleContext(e, Gt);
   }
   constructor(e, n) {
     super(e, n);
@@ -33676,7 +33676,7 @@ class C9 extends me.ParserRuleContext {
 w.QueryJoinStatementContext = C9;
 class T9 extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   GROUP_BY() {
     return this.getToken(d.GROUP_BY, 0);
@@ -33763,7 +33763,7 @@ class kS extends me.ParserRuleContext {
 w.QueryFieldEntryContext = kS;
 class O9 extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   NEST() {
     return this.getToken(d.NEST, 0);
@@ -33835,7 +33835,7 @@ class f3 extends me.ParserRuleContext {
 w.NestEntryContext = f3;
 class YK extends f3 {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   vExpr() {
     return this.getRuleContext(0, tc);
@@ -33865,7 +33865,7 @@ class YK extends f3 {
 w.NestDefContext = YK;
 class N9 extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   AGGREGATE() {
     return this.getToken(d.AGGREGATE, 0);
@@ -33896,7 +33896,7 @@ class N9 extends me.ParserRuleContext {
 w.AggregateStatementContext = N9;
 class D9 extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   CALCULATE() {
     return this.getToken(d.CALCULATE, 0);
@@ -33927,7 +33927,7 @@ class D9 extends me.ParserRuleContext {
 w.CalculateStatementContext = D9;
 class F9 extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   fieldCollection() {
     return this.getRuleContext(0, W9);
@@ -36104,7 +36104,7 @@ class Y9 extends me.ParserRuleContext {
 w.StarQualifiedContext = Y9;
 class DC extends me.ParserRuleContext {
   tags() {
-    return this.getRuleContext(0, Qt);
+    return this.getRuleContext(0, Gt);
   }
   fieldPath() {
     return this.getRuleContext(0, Kl);
@@ -36899,7 +36899,7 @@ var Dt = {}, aEe = F && F.__createBinding || (Object.create ? function(t, e, n,
 };
 Object.defineProperty(Dt, "__esModule", { value: !0 });
 Dt.PropertiesContext = Dt.ArrayValueContext = Dt.ReferenceContext = Dt.ArrayElementContext = Dt.EqValueContext = Dt.PropNameContext = Dt.IdentifierContext = Dt.StringContext = Dt.TagDefContext = Dt.TagUpdatePropertiesContext = Dt.TagReplacePropertiesContext = Dt.TagEqContext = Dt.TagSpecContext = Dt.TagLineContext = Dt.MalloyTagParser = void 0;
-const fEe = uu(), xEe = S1(), dEe = bc, hN = $y(), hEe = C1(), Da = bo(), pEe = v1(), bu = _o, Lj = Gt, gEe = Us, mEe = cEe(gn);
+const fEe = uu(), xEe = S1(), dEe = bc, hN = $y(), hEe = C1(), Da = Co(), pEe = v1(), bu = bo, Lj = Wt, gEe = Us, mEe = cEe(gn);
 class he extends hEe.Parser {
   // @Override
   // @NotNull
@@ -37617,32 +37617,32 @@ function* ZX(t) {
   }
 }
 an.getStringParts = ZX;
-var Io;
+var $o;
 (function(t) {
   t[t.Normal = 0] = "Normal", t[t.ReverseVirgule = 1] = "ReverseVirgule", t[t.Unicode = 2] = "Unicode";
-})(Io || (Io = {}));
+})($o || ($o = {}));
 function eL(t, e = "") {
-  let n = t.slice(e.length), r = Io.Normal;
+  let n = t.slice(e.length), r = $o.Normal;
   e.length && (n = n.slice(0, -e.length));
   let i = "", s = "";
   for (const o of n)
     switch (r) {
-      case Io.Normal: {
-        o === "\\" ? r = Io.ReverseVirgule : i += o;
+      case $o.Normal: {
+        o === "\\" ? r = $o.ReverseVirgule : i += o;
         break;
       }
-      case Io.ReverseVirgule: {
+      case $o.ReverseVirgule: {
         let u = o;
         if (o === "u") {
-          r = Io.Unicode, s = "";
+          r = $o.Unicode, s = "";
           continue;
         }
         o === "b" ? u = "\b" : o === "f" ? u = "\f" : o === "n" ? u = `
-` : o === "r" ? u = "\r" : o === "t" && (u = "	"), i += u, r = Io.Normal;
+` : o === "r" ? u = "\r" : o === "t" && (u = "	"), i += u, r = $o.Normal;
         break;
       }
-      case Io.Unicode:
-        "ABCDEFabcdef0123456789".includes(o) ? (s += o, s.length === 4 && (i += String.fromCharCode(parseInt(s, 16)), r = Io.Normal)) : r = Io.Normal;
+      case $o.Unicode:
+        "ABCDEFabcdef0123456789".includes(o) ? (s += o, s.length === 4 && (i += String.fromCharCode(parseInt(s, 16)), r = $o.Normal)) : r = $o.Normal;
     }
   return i;
 }
@@ -40539,15 +40539,15 @@ class S4e extends v4e.ExpressionDef {
 uE.BinaryBoolean = S4e;
 Object.defineProperty(oE, "__esModule", { value: !0 });
 oE.ExprCompare = void 0;
-const Wt = cn, _4e = uE, b4e = {
-  "~": [Wt.FT.stringT],
-  "!~": [Wt.FT.stringT],
-  "<": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT],
-  "<=": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT],
-  "=": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT],
-  "!=": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT],
-  ">=": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT],
-  ">": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT]
+const Vt = cn, _4e = uE, b4e = {
+  "~": [Vt.FT.stringT],
+  "!~": [Vt.FT.stringT],
+  "<": [Vt.FT.numberT, Vt.FT.stringT, Vt.FT.dateT, Vt.FT.timestampT],
+  "<=": [Vt.FT.numberT, Vt.FT.stringT, Vt.FT.dateT, Vt.FT.timestampT],
+  "=": [Vt.FT.numberT, Vt.FT.stringT, Vt.FT.dateT, Vt.FT.timestampT],
+  "!=": [Vt.FT.numberT, Vt.FT.stringT, Vt.FT.dateT, Vt.FT.timestampT],
+  ">=": [Vt.FT.numberT, Vt.FT.stringT, Vt.FT.dateT, Vt.FT.timestampT],
+  ">": [Vt.FT.numberT, Vt.FT.stringT, Vt.FT.dateT, Vt.FT.timestampT]
 };
 class C4e extends _4e.BinaryBoolean {
   constructor(e, n, r) {
@@ -42364,7 +42364,7 @@ class NJ extends Cd {
     super(`Invalid unit ${e}`);
   }
 }
-class to extends Cd {
+class no extends Cd {
 }
 class h0 extends Cd {
   constructor() {
@@ -42610,7 +42610,7 @@ function ST(t, e) {
 function XJ(t) {
   const e = Number(t);
   if (typeof t == "boolean" || t === "" || Number.isNaN(e))
-    throw new to(`Invalid unit value ${t}`);
+    throw new no(`Invalid unit value ${t}`);
   return e;
 }
 function WS(t, e) {
@@ -44049,7 +44049,7 @@ class _t {
    */
   static fromObject(e, n = {}) {
     if (e == null || typeof e != "object")
-      throw new to(`Duration.fromObject: argument expected to be an object, got ${e === null ? "null" : typeof e}`);
+      throw new no(`Duration.fromObject: argument expected to be an object, got ${e === null ? "null" : typeof e}`);
     return new _t({
       values: WS(e, _t.normalizeUnit),
       loc: pn.fromObject(n),
@@ -44073,7 +44073,7 @@ class _t {
       return e;
     if (typeof e == "object")
       return _t.fromObject(e);
-    throw new to(`Unknown duration argument ${e} of type ${typeof e}`);
+    throw new no(`Unknown duration argument ${e} of type ${typeof e}`);
   }
   /**
    * Create a Duration from an ISO 8601 duration string.
@@ -44119,7 +44119,7 @@ class _t {
    */
   static invalid(e, n = null) {
     if (!e)
-      throw new to("need to specify a reason the Duration is invalid");
+      throw new no("need to specify a reason the Duration is invalid");
     const r = e instanceof Uo ? e : new Uo(e, n);
     if (Pn.throwOnInvalid)
       throw new mbe(r);
@@ -44609,7 +44609,7 @@ class fn {
    */
   static invalid(e, n = null) {
     if (!e)
-      throw new to("need to specify a reason the Interval is invalid");
+      throw new no("need to specify a reason the Interval is invalid");
     const r = e instanceof Uo ? e : new Uo(e, n);
     if (Pn.throwOnInvalid)
       throw new gbe(r);
@@ -45284,7 +45284,7 @@ function GCe(t) {
   } else
     return e;
 }
-function No({
+function Do({
   numberingSystem: t
 }, e = "") {
   return new RegExp(`${hL[t || "latn"]}${e}`);
@@ -45303,7 +45303,7 @@ function YCe(t) {
 function DU(t) {
   return t.replace(/\./g, "").replace(pZ, " ").toLowerCase();
 }
-function Do(t, e) {
+function Fo(t, e) {
   return t === null ? null : {
     regex: RegExp(t.map(YCe).join("|")),
     deser: ([n]) => t.findIndex((r) => DU(n) === DU(r)) + e
@@ -45326,7 +45326,7 @@ function KCe(t) {
   return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
 }
 function XCe(t, e) {
-  const n = No(e), r = No(e, "{2}"), i = No(e, "{3}"), s = No(e, "{4}"), o = No(e, "{6}"), u = No(e, "{1,2}"), a = No(e, "{1,3}"), l = No(e, "{1,6}"), c = No(e, "{1,9}"), f = No(e, "{2,4}"), x = No(e, "{4,6}"), h = (g) => ({
+  const n = Do(e), r = Do(e, "{2}"), i = Do(e, "{3}"), s = Do(e, "{4}"), o = Do(e, "{6}"), u = Do(e, "{1,2}"), a = Do(e, "{1,3}"), l = Do(e, "{1,6}"), c = Do(e, "{1,9}"), f = Do(e, "{2,4}"), x = Do(e, "{4,6}"), h = (g) => ({
     regex: RegExp(KCe(g.val)),
     deser: ([y]) => y,
     literal: !0
@@ -45335,9 +45335,9 @@ function XCe(t, e) {
       return h(g);
     switch (g.val) {
       case "G":
-        return Do(e.eras("short", !1), 0);
+        return Fo(e.eras("short", !1), 0);
       case "GG":
-        return Do(e.eras("long", !1), 0);
+        return Fo(e.eras("long", !1), 0);
       case "y":
         return It(l);
       case "yy":
@@ -45353,17 +45353,17 @@ function XCe(t, e) {
       case "MM":
         return It(r);
       case "MMM":
-        return Do(e.months("short", !0, !1), 1);
+        return Fo(e.months("short", !0, !1), 1);
       case "MMMM":
-        return Do(e.months("long", !0, !1), 1);
+        return Fo(e.months("long", !0, !1), 1);
       case "L":
         return It(u);
       case "LL":
         return It(r);
       case "LLL":
-        return Do(e.months("short", !1, !1), 1);
+        return Fo(e.months("short", !1, !1), 1);
       case "LLLL":
-        return Do(e.months("long", !1, !1), 1);
+        return Fo(e.months("long", !1, !1), 1);
       case "d":
         return It(u);
       case "dd":
@@ -45403,7 +45403,7 @@ function XCe(t, e) {
       case "uuu":
         return It(n);
       case "a":
-        return Do(e.meridiems(), 0);
+        return Fo(e.meridiems(), 0);
       case "kkkk":
         return It(s);
       case "kk":
@@ -45416,13 +45416,13 @@ function XCe(t, e) {
       case "c":
         return It(n);
       case "EEE":
-        return Do(e.weekdays("short", !1, !1), 1);
+        return Fo(e.weekdays("short", !1, !1), 1);
       case "EEEE":
-        return Do(e.weekdays("long", !1, !1), 1);
+        return Fo(e.weekdays("long", !1, !1), 1);
       case "ccc":
-        return Do(e.weekdays("short", !0, !1), 1);
+        return Fo(e.weekdays("short", !0, !1), 1);
       case "cccc":
-        return Do(e.weekdays("long", !0, !1), 1);
+        return Fo(e.weekdays("long", !0, !1), 1);
       case "Z":
       case "ZZ":
         return FU(new RegExp(`([+-]${u.source})(?::(${r.source}))?`), 2);
@@ -45597,7 +45597,7 @@ function oTe(t, e, n) {
   return [r, i, s, o];
 }
 const mZ = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334], yZ = [0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335];
-function io(t, e) {
+function so(t, e) {
   return new Uo("unit out of range", `you specified ${e} (of type ${typeof e}) as a ${t}, which is invalid`);
 }
 function EZ(t, e, n) {
@@ -45678,15 +45678,15 @@ function LU(t) {
 }
 function uTe(t) {
   const e = vT(t.weekYear), n = ll(t.weekNumber, 1, GS(t.weekYear)), r = ll(t.weekday, 1, 7);
-  return e ? n ? r ? !1 : io("weekday", t.weekday) : io("week", t.week) : io("weekYear", t.weekYear);
+  return e ? n ? r ? !1 : so("weekday", t.weekday) : so("week", t.week) : so("weekYear", t.weekYear);
 }
 function aTe(t) {
   const e = vT(t.year), n = ll(t.ordinal, 1, km(t.year));
-  return e ? n ? !1 : io("ordinal", t.ordinal) : io("year", t.year);
+  return e ? n ? !1 : so("ordinal", t.ordinal) : so("year", t.year);
 }
 function SZ(t) {
   const e = vT(t.year), n = ll(t.month, 1, 12), r = ll(t.day, 1, QS(t.year, t.month));
-  return e ? n ? r ? !1 : io("day", t.day) : io("month", t.month) : io("year", t.year);
+  return e ? n ? r ? !1 : so("day", t.day) : so("month", t.month) : so("year", t.year);
 }
 function _Z(t) {
   const {
@@ -45695,7 +45695,7 @@ function _Z(t) {
     second: r,
     millisecond: i
   } = t, s = ll(e, 0, 23) || e === 24 && n === 0 && r === 0 && i === 0, o = ll(n, 0, 59), u = ll(r, 0, 59), a = ll(i, 0, 999);
-  return s ? o ? u ? a ? !1 : io("millisecond", i) : io("second", r) : io("minute", n) : io("hour", e);
+  return s ? o ? u ? a ? !1 : so("millisecond", i) : so("second", r) : so("minute", n) : so("hour", e);
 }
 const DN = "Invalid DateTime", IU = 864e13;
 function MA(t) {
@@ -46018,7 +46018,7 @@ class ut {
         zone: D0(n.zone, Pn.defaultZone),
         loc: pn.fromObject(n)
       });
-    throw new to(`fromMillis requires a numerical input, but received a ${typeof e} with value ${e}`);
+    throw new no(`fromMillis requires a numerical input, but received a ${typeof e} with value ${e}`);
   }
   /**
    * Create a DateTime from a number of seconds since the epoch (meaning since 1 January 1970 00:00:00 UTC). Uses the default zone.
@@ -46037,7 +46037,7 @@ class ut {
         zone: D0(n.zone, Pn.defaultZone),
         loc: pn.fromObject(n)
       });
-    throw new to("fromSeconds requires a numerical input");
+    throw new no("fromSeconds requires a numerical input");
   }
   /**
    * Create a DateTime from a JavaScript object with keys like 'year' and 'hour' with reasonable defaults.
@@ -46168,7 +46168,7 @@ class ut {
    */
   static fromFormat(e, n, r = {}) {
     if (St(e) || St(n))
-      throw new to("fromFormat requires an input string and a format");
+      throw new no("fromFormat requires an input string and a format");
     const {
       locale: i = null,
       numberingSystem: s = null
@@ -46217,7 +46217,7 @@ class ut {
    */
   static invalid(e, n = null) {
     if (!e)
-      throw new to("need to specify a reason the DateTime is invalid");
+      throw new no("need to specify a reason the DateTime is invalid");
     const r = e instanceof Uo ? e : new Uo(e, n);
     if (Pn.throwOnInvalid)
       throw new pbe(r);
@@ -47147,7 +47147,7 @@ class ut {
    */
   static min(...e) {
     if (!e.every(ut.isDateTime))
-      throw new to("min requires all arguments be DateTimes");
+      throw new no("min requires all arguments be DateTimes");
     return yU(e, (n) => n.valueOf(), Math.min);
   }
   /**
@@ -47157,7 +47157,7 @@ class ut {
    */
   static max(...e) {
     if (!e.every(ut.isDateTime))
-      throw new to("max requires all arguments be DateTimes");
+      throw new no("max requires all arguments be DateTimes");
     return yU(e, (n) => n.valueOf(), Math.max);
   }
   // MISC
@@ -47348,7 +47348,7 @@ function $g(t) {
     return ut.fromJSDate(t);
   if (t && typeof t == "object")
     return ut.fromObject(t);
-  throw new to(`Unknown datetime argument: ${t}, of type ${typeof t}`);
+  throw new no(`Unknown datetime argument: ${t}, of type ${typeof t}`);
 }
 const dTe = "2.5.2";
 var hTe = hs.DateTime = ut;
@@ -47380,7 +47380,7 @@ function Td(t, e) {
   }
   return { text: n };
 }
-const OZ = "yyyy", RZ = `${OZ}-LL`, fo = `${RZ}-dd`, NZ = `${fo} HH`, DZ = `${NZ}:mm`, zD = `${DZ}:ss`;
+const OZ = "yyyy", RZ = `${OZ}-LL`, xo = `${RZ}-dd`, NZ = `${xo} HH`, DZ = `${NZ}:mm`, zD = `${DZ}:ss`;
 class FZ extends qD.ExpressionDef {
   constructor(e, n, r) {
     super(), this.units = n, this.timeType = r, this.literalPart = e.text, e.tzSpec && (this.timeZone = e.tzSpec);
@@ -47491,9 +47491,9 @@ class yL extends pE {
   static parse(e) {
     const n = Td(e, !1);
     let r = n.text;
-    const i = uc.DateTime.fromFormat(n.text, fo);
+    const i = uc.DateTime.fromFormat(n.text, xo);
     if (i.isValid)
-      return r = i.plus({ day: 1 }).toFormat(fo), new yL(n, r);
+      return r = i.plus({ day: 1 }).toFormat(xo), new yL(n, r);
   }
 }
 ur.LiteralDay = yL;
@@ -47504,10 +47504,10 @@ class EL extends pE {
   static parse(e) {
     const n = Td(e, !1);
     let r = n.text;
-    const i = n.text.slice(0, 10), s = uc.DateTime.fromFormat(i, fo);
+    const i = n.text.slice(0, 10), s = uc.DateTime.fromFormat(i, xo);
     if (s.isValid && s.weekday === 7) {
       const u = s.plus({ days: 7 });
-      return n.text = s.toFormat(fo), r = u.toFormat(fo), new EL(n, r);
+      return n.text = s.toFormat(xo), r = u.toFormat(xo), new EL(n, r);
     }
   }
 }
@@ -47522,7 +47522,7 @@ class AL extends pE {
     const i = uc.DateTime.fromFormat(n.text, RZ);
     if (i.isValid) {
       const s = i.plus({ months: 1 });
-      return n.text = i.toFormat(fo), r = s.toFormat(fo), new AL(n, r);
+      return n.text = i.toFormat(xo), r = s.toFormat(xo), new AL(n, r);
     }
   }
 }
@@ -47540,7 +47540,7 @@ class vL extends pE {
       let o = uc.DateTime.fromFormat(i[1], "yyyy");
       s > 0 && (o = o.plus({ quarters: s }));
       const u = o.plus({ quarter: 1 });
-      return n.text = o.toFormat(fo), r = u.toFormat(fo), new vL(n, r);
+      return n.text = o.toFormat(xo), r = u.toFormat(xo), new vL(n, r);
     }
   }
 }
@@ -47555,7 +47555,7 @@ class SL extends pE {
     const i = uc.DateTime.fromFormat(n.text, OZ);
     if (i.isValid) {
       const s = i.plus({ year: 1 });
-      return n.text = i.toFormat(fo), r = s.toFormat(fo), new SL(n, r);
+      return n.text = i.toFormat(xo), r = s.toFormat(xo), new SL(n, r);
     }
   }
 }
@@ -47584,7 +47584,7 @@ CT.PartialCompare = ATe;
 var T2 = {};
 Object.defineProperty(T2, "__esModule", { value: !0 });
 T2.PickWhen = T2.Pick = void 0;
-const Tu = le, p0 = vr, Fo = cn, vTe = dt, STe = We;
+const Tu = le, p0 = vr, wo = cn, vTe = dt, STe = We;
 function UA(t, e) {
   return t === void 0 || t.dataType === "null" || t.dataType === "error" ? e : t;
 }
@@ -47616,16 +47616,16 @@ class _Te extends vTe.ExpressionDef {
     let s, o = "scalar", u = "constant";
     for (const c of this.choices) {
       const f = c.when.apply(e, "=", r), x = c.pick ? c.pick.getExpression(e) : r.getExpression(e);
-      if (o = (0, Tu.maxExpressionType)(o, (0, Tu.maxExpressionType)(f.expressionType, x.expressionType)), u = (0, Tu.mergeEvalSpaces)(u, f.evalSpace, x.evalSpace), s && !Fo.FT.typeEq(s, x, !0)) {
-        const h = Fo.FT.inspect(x);
+      if (o = (0, Tu.maxExpressionType)(o, (0, Tu.maxExpressionType)(f.expressionType, x.expressionType)), u = (0, Tu.mergeEvalSpaces)(u, f.evalSpace, x.evalSpace), s && !wo.FT.typeEq(s, x, !0)) {
+        const h = wo.FT.inspect(x);
         return this.log(`pick type '${h}', expected '${s.dataType}'[pick-values-must-match]`), (0, p0.errorFor)("pick when type");
       }
       s = UA(s, x), i.kids.pickWhen.push(f.value), i.kids.pickThen.push(x.value);
     }
     const l = (this.elsePick || r).getExpression(e);
-    if (s = UA(s, l), !Fo.FT.typeEq(s, l, !0)) {
+    if (s = UA(s, l), !wo.FT.typeEq(s, l, !0)) {
       const c = this.elsePick ? "else" : "pick default";
-      return this.log(`${c} type '${Fo.FT.inspect(l)}', expected '${s.dataType}'[pick-values-must-match]`), (0, p0.errorFor)("pick else type");
+      return this.log(`${c} type '${wo.FT.inspect(l)}', expected '${s.dataType}'[pick-values-must-match]`), (0, p0.errorFor)("pick else type");
     }
     return i.kids.pickElse = l.value, {
       dataType: s.dataType,
@@ -47658,21 +47658,21 @@ class _Te extends vTe.ExpressionDef {
     }
     let i, s = "scalar", o = "constant";
     for (const a of r) {
-      if (!Fo.FT.typeEq(a.when, Fo.FT.boolT))
-        return this.log(`when expression must be boolean, not '${Fo.FT.inspect(a.when)}`), (0, p0.errorFor)("pick when type");
-      if (i && !Fo.FT.typeEq(i, a.pick, !0)) {
-        const l = Fo.FT.inspect(a.pick);
+      if (!wo.FT.typeEq(a.when, wo.FT.boolT))
+        return this.log(`when expression must be boolean, not '${wo.FT.inspect(a.when)}`), (0, p0.errorFor)("pick when type");
+      if (i && !wo.FT.typeEq(i, a.pick, !0)) {
+        const l = wo.FT.inspect(a.pick);
         return this.log(`pick type '${l}', expected '${i.dataType}'[pick-values-must-match]`), (0, p0.errorFor)("pick value type");
       }
       i = UA(i, a.pick), s = (0, Tu.maxExpressionType)(s, (0, Tu.maxExpressionType)(a.pick.expressionType, a.when.expressionType)), o = (0, Tu.mergeEvalSpaces)(o, a.pick.evalSpace, a.when.evalSpace), n.kids.pickWhen.push(a.when.value), n.kids.pickThen.push(a.pick.value);
     }
     const u = this.elsePick.getExpression(e);
-    return s = (0, Tu.maxExpressionType)(s, u.expressionType), o = (0, Tu.mergeEvalSpaces)(o, u.evalSpace), i = UA(i, u), Fo.FT.typeEq(i, u, !0) ? (n.kids.pickElse = u.value, {
+    return s = (0, Tu.maxExpressionType)(s, u.expressionType), o = (0, Tu.mergeEvalSpaces)(o, u.evalSpace), i = UA(i, u), wo.FT.typeEq(i, u, !0) ? (n.kids.pickElse = u.value, {
       dataType: i.dataType,
       expressionType: s,
       value: n,
       evalSpace: o
-    }) : (this.elsePick.log(`else type '${Fo.FT.inspect(u)}', expected '${i.dataType}'[pick-values-must-match]`), (0, p0.errorFor)("pick value type mismatch"));
+    }) : (this.elsePick.log(`else type '${wo.FT.inspect(u)}', expected '${i.dataType}'[pick-values-must-match]`), (0, p0.errorFor)("pick value type mismatch"));
   }
 }
 T2.Pick = _Te;
@@ -53640,7 +53640,7 @@ function UNe(t, e) {
 function Hs(t, e, n) {
   return t.fields = e || [], t.fname = n, t;
 }
-function Bn(t) {
+function kn(t) {
   return t == null ? null : t.fname;
 }
 function bi(t) {
@@ -54891,7 +54891,7 @@ F2.every = (t) => (t = Math.floor(t), !isFinite(t) || !(t > 0) ? null : t > 1 ?
   e.setTime(+e + n * t);
 }, (e, n) => (n - e) / t) : F2);
 F2.range;
-const cl = 1e3, so = cl * 60, fl = so * 60, $l = fl * 24, UL = $l * 7, Cq = $l * 30, YN = $l * 365, xl = er((t) => {
+const cl = 1e3, oo = cl * 60, fl = oo * 60, $l = fl * 24, UL = $l * 7, Cq = $l * 30, YN = $l * 365, xl = er((t) => {
   t.setTime(t - t.getMilliseconds());
 }, (t, e) => {
   t.setTime(+t + e * cl);
@@ -54900,17 +54900,17 @@ xl.range;
 const m6 = er((t) => {
   t.setTime(t - t.getMilliseconds() - t.getSeconds() * cl);
 }, (t, e) => {
-  t.setTime(+t + e * so);
-}, (t, e) => (e - t) / so, (t) => t.getMinutes());
+  t.setTime(+t + e * oo);
+}, (t, e) => (e - t) / oo, (t) => t.getMinutes());
 m6.range;
 const y6 = er((t) => {
   t.setUTCSeconds(0, 0);
 }, (t, e) => {
-  t.setTime(+t + e * so);
-}, (t, e) => (e - t) / so, (t) => t.getUTCMinutes());
+  t.setTime(+t + e * oo);
+}, (t, e) => (e - t) / oo, (t) => t.getUTCMinutes());
 y6.range;
 const E6 = er((t) => {
-  t.setTime(t - t.getMilliseconds() - t.getSeconds() * cl - t.getMinutes() * so);
+  t.setTime(t - t.getMilliseconds() - t.getSeconds() * cl - t.getMinutes() * oo);
 }, (t, e) => {
   t.setTime(+t + e * fl);
 }, (t, e) => (e - t) / fl, (t) => t.getHours());
@@ -54924,7 +54924,7 @@ A6.range;
 const _l = er(
   (t) => t.setHours(0, 0, 0, 0),
   (t, e) => t.setDate(t.getDate() + e),
-  (t, e) => (e - t - (e.getTimezoneOffset() - t.getTimezoneOffset()) * so) / $l,
+  (t, e) => (e - t - (e.getTimezoneOffset() - t.getTimezoneOffset()) * oo) / $l,
   (t) => t.getDate() - 1
 );
 _l.range;
@@ -54945,7 +54945,7 @@ function Rd(t) {
     e.setDate(e.getDate() - (e.getDay() + 7 - t) % 7), e.setHours(0, 0, 0, 0);
   }, (e, n) => {
     e.setDate(e.getDate() + n * 7);
-  }, (e, n) => (n - e - (n.getTimezoneOffset() - e.getTimezoneOffset()) * so) / UL);
+  }, (e, n) => (n - e - (n.getTimezoneOffset() - e.getTimezoneOffset()) * oo) / UL);
 }
 const Z1 = Rd(0), t4 = Rd(1), K7e = Rd(2), X7e = Rd(3), w2 = Rd(4), J7e = Rd(5), Z7e = Rd(6);
 Z1.range;
@@ -55010,10 +55010,10 @@ function Xee(t, e, n, r, i, s) {
     [xl, 5, 5 * cl],
     [xl, 15, 15 * cl],
     [xl, 30, 30 * cl],
-    [s, 1, so],
-    [s, 5, 5 * so],
-    [s, 15, 15 * so],
-    [s, 30, 30 * so],
+    [s, 1, oo],
+    [s, 5, 5 * oo],
+    [s, 15, 15 * oo],
+    [s, 30, 30 * oo],
     [i, 1, fl],
     [i, 3, 3 * fl],
     [i, 6, 6 * fl],
@@ -55042,7 +55042,7 @@ function Xee(t, e, n, r, i, s) {
   }
   return [u, a];
 }
-const [iDe, sDe] = Xee(aa, _3, ep, Kee, A6, y6), [oDe, uDe] = Xee(ua, S3, Z1, _l, E6, m6), Xr = "year", Bs = "quarter", Ti = "month", cr = "week", ks = "date", Ai = "day", Bl = "dayofyear", mo = "hours", yo = "minutes", Zo = "seconds", la = "milliseconds", Jee = [Xr, Bs, Ti, cr, ks, Ai, Bl, mo, yo, Zo, la], KN = Jee.reduce((t, e, n) => (t[e] = 1 + n, t), {});
+const [iDe, sDe] = Xee(aa, _3, ep, Kee, A6, y6), [oDe, uDe] = Xee(ua, S3, Z1, _l, E6, m6), Xr = "year", Bs = "quarter", Ti = "month", cr = "week", ks = "date", Ai = "day", Bl = "dayofyear", yo = "hours", Eo = "minutes", Zo = "seconds", la = "milliseconds", Jee = [Xr, Bs, Ti, cr, ks, Ai, Bl, yo, Eo, Zo, la], KN = Jee.reduce((t, e, n) => (t[e] = 1 + n, t), {});
 function Zee(t) {
   const e = Pe(t).slice(), n = {};
   return e.length || Se("Missing time unit."), e.forEach((i) => {
@@ -55057,13 +55057,13 @@ const aDe = {
   [cr]: "W%U ",
   [Ai]: "%a ",
   [Bl]: "%j ",
-  [mo]: "%H:00",
-  [yo]: "00:%M",
+  [yo]: "%H:00",
+  [Eo]: "00:%M",
   [Zo]: ":%S",
   [la]: ".%L",
   [`${Xr}-${Ti}`]: "%Y-%m ",
   [`${Xr}-${Ti}-${ks}`]: "%Y-%m-%d ",
-  [`${mo}-${yo}`]: "%H:%M"
+  [`${yo}-${Eo}`]: "%H:%M"
 };
 function lDe(t, e) {
   const n = lt({}, aDe, e), r = Zee(t), i = r.length;
@@ -55127,7 +55127,7 @@ function pDe(t, e, n, r, i, s, o) {
   return new Date(Date.UTC(t, e, n, r, i, s, o));
 }
 function nte(t, e, n, r, i) {
-  const s = e || 1, o = Ct(t), u = (y, E, A) => (A = A || y, gDe(n[A], r[A], y === o && s, E)), a = /* @__PURE__ */ new Date(), l = oa(t), c = l[Xr] ? u(Xr) : wi(2012), f = l[Ti] ? u(Ti) : l[Bs] ? u(Bs) : zf, x = l[cr] && l[Ai] ? u(Ai, 1, cr + Ai) : l[cr] ? u(cr, 1) : l[Ai] ? u(Ai, 1) : l[ks] ? u(ks, 1) : l[Bl] ? u(Bl, 1) : OE, h = l[mo] ? u(mo) : zf, p = l[yo] ? u(yo) : zf, m = l[Zo] ? u(Zo) : zf, g = l[la] ? u(la) : zf;
+  const s = e || 1, o = Ct(t), u = (y, E, A) => (A = A || y, gDe(n[A], r[A], y === o && s, E)), a = /* @__PURE__ */ new Date(), l = oa(t), c = l[Xr] ? u(Xr) : wi(2012), f = l[Ti] ? u(Ti) : l[Bs] ? u(Bs) : zf, x = l[cr] && l[Ai] ? u(Ai, 1, cr + Ai) : l[cr] ? u(cr, 1) : l[Ai] ? u(Ai, 1) : l[ks] ? u(ks, 1) : l[Bl] ? u(Bl, 1) : OE, h = l[yo] ? u(yo) : zf, p = l[Eo] ? u(Eo) : zf, m = l[Zo] ? u(Zo) : zf, g = l[la] ? u(la) : zf;
   return function(y) {
     a.setTime(+y);
     const E = c(a);
@@ -55146,8 +55146,8 @@ const mDe = {
   [Bs]: (t) => Math.floor(t.getMonth() / 3),
   [Ti]: (t) => t.getMonth(),
   [ks]: (t) => t.getDate(),
-  [mo]: (t) => t.getHours(),
-  [yo]: (t) => t.getMinutes(),
+  [yo]: (t) => t.getHours(),
+  [Eo]: (t) => t.getMinutes(),
   [Zo]: (t) => t.getSeconds(),
   [la]: (t) => t.getMilliseconds(),
   [Bl]: (t) => ete(t),
@@ -55166,8 +55166,8 @@ const ADe = {
   [Bs]: (t) => Math.floor(t.getUTCMonth() / 3),
   [Ti]: (t) => t.getUTCMonth(),
   [ks]: (t) => t.getUTCDate(),
-  [mo]: (t) => t.getUTCHours(),
-  [yo]: (t) => t.getUTCMinutes(),
+  [yo]: (t) => t.getUTCHours(),
+  [Eo]: (t) => t.getUTCMinutes(),
   [Zo]: (t) => t.getUTCSeconds(),
   [la]: (t) => t.getUTCMilliseconds(),
   [Bl]: (t) => tte(t),
@@ -55189,8 +55189,8 @@ const _De = {
   [ks]: _l,
   [Ai]: _l,
   [Bl]: _l,
-  [mo]: E6,
-  [yo]: m6,
+  [yo]: E6,
+  [Eo]: m6,
   [Zo]: xl,
   [la]: F2
 }, bDe = {
@@ -55201,8 +55201,8 @@ const _De = {
   [ks]: V0,
   [Ai]: V0,
   [Bl]: V0,
-  [mo]: A6,
-  [yo]: y6,
+  [yo]: A6,
+  [Eo]: y6,
   [Zo]: xl,
   [la]: F2
 };
@@ -55230,7 +55230,7 @@ function ODe(t, e, n, r) {
 function RDe(t, e, n, r) {
   return ite(FE(t), e, n, r);
 }
-const xm = 1e3, dm = xm * 60, hm = dm * 60, v6 = hm * 24, NDe = v6 * 7, Tq = v6 * 30, i8 = v6 * 365, ste = [Xr, Ti, ks, mo, yo, Zo, la], pm = ste.slice(0, -1), gm = pm.slice(0, -1), mm = gm.slice(0, -1), DDe = mm.slice(0, -1), FDe = [Xr, cr], Oq = [Xr, Ti], ote = [Xr], Pg = [[pm, 1, xm], [pm, 5, 5 * xm], [pm, 15, 15 * xm], [pm, 30, 30 * xm], [gm, 1, dm], [gm, 5, 5 * dm], [gm, 15, 15 * dm], [gm, 30, 30 * dm], [mm, 1, hm], [mm, 3, 3 * hm], [mm, 6, 6 * hm], [mm, 12, 12 * hm], [DDe, 1, v6], [FDe, 1, NDe], [Oq, 1, Tq], [Oq, 3, 3 * Tq], [ote, 1, i8]];
+const xm = 1e3, dm = xm * 60, hm = dm * 60, v6 = hm * 24, NDe = v6 * 7, Tq = v6 * 30, i8 = v6 * 365, ste = [Xr, Ti, ks, yo, Eo, Zo, la], pm = ste.slice(0, -1), gm = pm.slice(0, -1), mm = gm.slice(0, -1), DDe = mm.slice(0, -1), FDe = [Xr, cr], Oq = [Xr, Ti], ote = [Xr], Pg = [[pm, 1, xm], [pm, 5, 5 * xm], [pm, 15, 15 * xm], [pm, 30, 30 * xm], [gm, 1, dm], [gm, 5, 5 * dm], [gm, 15, 15 * dm], [gm, 30, 30 * dm], [mm, 1, hm], [mm, 3, 3 * hm], [mm, 6, 6 * hm], [mm, 12, 12 * hm], [DDe, 1, v6], [FDe, 1, NDe], [Oq, 1, Tq], [Oq, 3, 3 * Tq], [ote, 1, i8]];
 function wDe(t) {
   const e = t.extent, n = t.maxbins || 40, r = Math.abs(p6(e)) / n;
   let i = NE((u) => u[2]).right(Pg, r), s, o;
@@ -55826,7 +55826,7 @@ function o8(t) {
 }
 function Pq(t, e, n) {
   n = n || {}, He(n) || Se(`Invalid time multi-format specifier: ${n}`);
-  const r = e(Zo), i = e(yo), s = e(mo), o = e(ks), u = e(cr), a = e(Ti), l = e(Bs), c = e(Xr), f = t(n[la] || ".%L"), x = t(n[Zo] || ":%S"), h = t(n[yo] || "%I:%M"), p = t(n[mo] || "%I %p"), m = t(n[ks] || n[Ai] || "%a %d"), g = t(n[cr] || "%b %d"), y = t(n[Ti] || "%B"), E = t(n[Bs] || "%B"), A = t(n[Xr] || "%Y");
+  const r = e(Zo), i = e(Eo), s = e(yo), o = e(ks), u = e(cr), a = e(Ti), l = e(Bs), c = e(Xr), f = t(n[la] || ".%L"), x = t(n[Zo] || ":%S"), h = t(n[Eo] || "%I:%M"), p = t(n[yo] || "%I %p"), m = t(n[ks] || n[Ai] || "%a %d"), g = t(n[cr] || "%b %d"), y = t(n[Ti] || "%B"), E = t(n[Bs] || "%B"), A = t(n[Xr] || "%Y");
   return (v) => (r(v) < v ? f : i(v) < v ? x : s(v) < v ? h : o(v) < v ? p : a(v) < v ? u(v) < v ? m : g : c(v) < v ? l(v) < v ? y : E : A)(v);
 }
 function gte(t) {
@@ -57984,13 +57984,13 @@ De(fc, pe, {
         r[v = y[A]] || (r[v] = 1, e.push(v));
     }
     this._dims = Pe(t.groupby), this._dnames = this._dims.map((g) => {
-      const y = Bn(g);
+      const y = kn(g);
       return i(g), n.push(y), y;
     }), this.cellkey = t.key ? t.key : l8(this._dims), this._countOnly = !0, this._counts = [], this._measures = [];
     const s = t.fields || [null], o = t.ops || ["count"], u = t.as || [], a = s.length, l = {};
     let c, f, x, h, p, m;
     for (a !== o.length && Se("Unmatched number of fields and aggregate ops."), m = 0; m < a; ++m) {
-      if (c = s[m], f = o[m], c == null && f !== "count" && Se("Null aggregate field specified."), h = Bn(c), p = Wte(f, h, u[m]), n.push(p), f === "count") {
+      if (c = s[m], f = o[m], c == null && f !== "count" && Se("Null aggregate field specified."), h = kn(c), p = Wte(f, h, u[m]), n.push(p), f === "count") {
         this._counts.push(p);
         continue;
       }
@@ -58163,7 +58163,7 @@ De(iI, pe, {
       let c = Si(e(l));
       return c == null ? null : c < i ? -1 / 0 : c > s ? 1 / 0 : (c = Math.max(i, Math.min(c, s - r)), i + r * Math.floor(Awe + (c - i) / r));
     };
-    return a.start = i, a.stop = n.stop, a.step = r, this.value = Hs(a, bi(e), t.name || "bin_" + Bn(e));
+    return a.start = i, a.stop = n.stop, a.step = r, this.value = Hs(a, bi(e), t.name || "bin_" + kn(e));
   }
 });
 function Xte(t, e, n) {
@@ -58444,7 +58444,7 @@ function Owe(t) {
   return () => t.materialize(t.SOURCE).source;
 }
 function tne(t, e) {
-  return t ? t.map((n, r) => e[r] || Bn(n)) : null;
+  return t ? t.map((n, r) => e[r] || kn(n)) : null;
 }
 function lI(t, e, n) {
   const r = [], i = (f) => f(a);
@@ -58512,7 +58512,7 @@ function rne(t) {
 De(rne, Kt);
 function Nwe(t) {
   const e = t.expr;
-  return this.value && !t.modified("expr") ? this.value : Hs((n) => e(n, t), bi(e), Bn(e));
+  return this.value && !t.modified("expr") ? this.value : Hs((n) => e(n, t), bi(e), kn(e));
 }
 function fI(t) {
   pe.call(this, [void 0, void 0], t);
@@ -58534,7 +58534,7 @@ De(fI, pe, {
       const a = Si(r(u));
       a != null && (a < s && (s = a), a > o && (o = a));
     }), !Number.isFinite(s) || !Number.isFinite(o)) {
-      let u = Bn(r);
+      let u = kn(r);
       u && (u = ` for field "${u}"`), e.dataflow.warn(`Infinite extent${u}: [${s}, ${o}]`), s = o = void 0;
     }
     this.value = [s, o];
@@ -58747,7 +58747,7 @@ pI.Definition = {
 };
 De(pI, pe, {
   transform(t, e) {
-    const n = e.fork(e.NO_SOURCE), r = t.fields, i = r.map(Bn), s = t.as || ["key", "value"], o = s[0], u = s[1], a = r.length;
+    const n = e.fork(e.NO_SOURCE), r = t.fields, i = r.map(kn), s = t.as || ["key", "value"], o = s[0], u = s[1], a = r.length;
     return n.rem = this.value, e.visit(e.SOURCE, (l) => {
       for (let c = 0, f; c < a; ++c)
         f = YL(l), f[o] = i[c], f[u] = r[c](l), n.add.push(f);
@@ -58850,7 +58850,7 @@ function Lwe(t) {
 }
 De(mI, pe, {
   transform(t, e) {
-    var n = e.fork(e.ALL), r = wwe(t), i = Lwe(t), s = Bn(t.field), o = Bn(t.key), u = (t.groupby || []).map(Bn), a = Iwe(e.source, t.groupby, t.key, t.keyvals), l = [], c = this.value, f = a.domain.length, x, h, p, m, g, y, E, A, v, S;
+    var n = e.fork(e.ALL), r = wwe(t), i = Lwe(t), s = kn(t.field), o = kn(t.key), u = (t.groupby || []).map(kn), a = Iwe(e.source, t.groupby, t.key, t.keyvals), l = [], c = this.value, f = a.domain.length, x, h, p, m, g, y, E, A, v, S;
     for (g = 0, A = a.length; g < A; ++g)
       for (x = a[g], p = x.values, h = NaN, E = 0; E < f; ++E)
         if (x[E] == null) {
@@ -58979,7 +58979,7 @@ De(EI, pe, {
   transform(t, e) {
     const n = e.fork(e.NO_SOURCE | e.NO_FIELDS);
     if (!this.value || e.changed() || t.modified()) {
-      const r = e.materialize(e.SOURCE).source, i = lI(r, t.groupby, t.field), s = (t.groupby || []).map(Bn), o = t.bandwidth, u = t.cumulative ? "cdf" : "pdf", a = t.as || ["value", "density"], l = [];
+      const r = e.materialize(e.SOURCE).source, i = lI(r, t.groupby, t.field), s = (t.groupby || []).map(kn), o = t.bandwidth, u = t.cumulative ? "cdf" : "pdf", a = t.as || ["value", "density"], l = [];
       let c = t.extent, f = t.steps || t.minsteps || 25, x = t.steps || t.maxsteps || 200;
       u !== "pdf" && u !== "cdf" && Se("Invalid density method: " + u), t.resolve === "shared" && (c || (c = Il(r, t.field)), f = x = t.steps || x), i.forEach((h) => {
         const p = Bte(h, o)[u], m = t.counts ? h.length : 1, g = c || Il(h);
@@ -59062,7 +59062,7 @@ De(AI, pe, {
   transform(t, e) {
     const n = t.fields, r = t.index, i = t.values, s = t.default == null ? null : t.default, o = t.modified(), u = n.length;
     let a = o ? e.SOURCE : e.ADD, l = e, c = t.as, f, x, h;
-    return i ? (x = i.length, u > 1 && !c && Se('Multi-field lookup requires explicit "as" parameter.'), c && c.length !== u * x && Se('The "as" parameter has too few output field names.'), c = c || i.map(Bn), f = function(p) {
+    return i ? (x = i.length, u > 1 && !c && Se('Multi-field lookup requires explicit "as" parameter.'), c && c.length !== u * x && Se('The "as" parameter has too few output field names.'), c = c || i.map(kn), f = function(p) {
       for (var m = 0, g = 0, y, E; m < u; ++m)
         if (E = r.get(n[m](p)), E == null)
           for (y = 0; y < x; ++y, ++g)
@@ -59270,7 +59270,7 @@ De(_I, pe, {
     const n = e.fork(e.NO_SOURCE | e.NO_FIELDS), r = t.as || ["prob", "value"];
     if (this.value && !t.modified() && !e.changed())
       return n.source = this.value, n;
-    const i = e.materialize(e.SOURCE).source, s = lI(i, t.groupby, t.field), o = (t.groupby || []).map(Bn), u = [], a = t.step || 0.01, l = t.probs || Os(a / 2, 1 - zwe, a), c = l.length;
+    const i = e.materialize(e.SOURCE).source, s = lI(i, t.groupby, t.field), o = (t.groupby || []).map(kn), u = [], a = t.step || 0.01, l = t.probs || Os(a / 2, 1 - zwe, a), c = l.length;
     return s.forEach((f) => {
       const x = Dte(f, l);
       for (let h = 0; h < c; ++h) {
@@ -59608,7 +59608,7 @@ function yne(t) {
     Pe(bi(h)).forEach((p) => u[p] = 1);
   }
   x(t.sort), e.forEach((h, p) => {
-    const m = n[p], g = Bn(m), y = Wte(h, g, i[p]);
+    const m = n[p], g = kn(m), y = Wte(h, g, i[p]);
     if (x(m), s.push(y), Je(T3, h))
       o.push(Hwe(h, n[p], r[p], y));
     else {
@@ -62112,7 +62112,7 @@ function YI(t, e, n) {
   const r = t - e + n * 2;
   return t ? r > 0 ? r : 1 : 0;
 }
-const wLe = "identity", k2 = "linear", Pl = "log", PE = "pow", ME = "sqrt", $6 = "symlog", kx = "time", Px = "utc", Xu = "sequential", ip = "diverging", P2 = "quantile", B6 = "quantize", k6 = "threshold", KI = "ordinal", E8 = "point", Cre = "band", XI = "bin-ordinal", tr = "continuous", jE = "discrete", UE = "discretizing", Co = "interpolating", JI = "temporal";
+const wLe = "identity", k2 = "linear", Pl = "log", PE = "pow", ME = "sqrt", $6 = "symlog", kx = "time", Px = "utc", Xu = "sequential", ip = "diverging", P2 = "quantile", B6 = "quantize", k6 = "threshold", KI = "ordinal", E8 = "point", Cre = "band", XI = "bin-ordinal", tr = "continuous", jE = "discrete", UE = "discretizing", To = "interpolating", JI = "temporal";
 function LLe(t) {
   return function(e) {
     let n = e[0], r = e[1], i;
@@ -62228,17 +62228,17 @@ Lt(ME, CLe, tr);
 Lt($6, gre, tr);
 Lt(kx, RLe, [tr, JI]);
 Lt(Px, NLe, [tr, JI]);
-Lt(Xu, GI, [tr, Co]);
-Lt(`${Xu}-${k2}`, GI, [tr, Co]);
-Lt(`${Xu}-${Pl}`, Are, [tr, Co, Pl]);
-Lt(`${Xu}-${PE}`, WI, [tr, Co]);
-Lt(`${Xu}-${ME}`, DLe, [tr, Co]);
-Lt(`${Xu}-${$6}`, vre, [tr, Co]);
-Lt(`${ip}-${k2}`, Sre, [tr, Co]);
-Lt(`${ip}-${Pl}`, _re, [tr, Co, Pl]);
-Lt(`${ip}-${PE}`, VI, [tr, Co]);
-Lt(`${ip}-${ME}`, FLe, [tr, Co]);
-Lt(`${ip}-${$6}`, bre, [tr, Co]);
+Lt(Xu, GI, [tr, To]);
+Lt(`${Xu}-${k2}`, GI, [tr, To]);
+Lt(`${Xu}-${Pl}`, Are, [tr, To, Pl]);
+Lt(`${Xu}-${PE}`, WI, [tr, To]);
+Lt(`${Xu}-${ME}`, DLe, [tr, To]);
+Lt(`${Xu}-${$6}`, vre, [tr, To]);
+Lt(`${ip}-${k2}`, Sre, [tr, To]);
+Lt(`${ip}-${Pl}`, _re, [tr, To, Pl]);
+Lt(`${ip}-${PE}`, VI, [tr, To]);
+Lt(`${ip}-${ME}`, FLe, [tr, To]);
+Lt(`${ip}-${$6}`, bre, [tr, To]);
 Lt(P2, mre, [UE, P2]);
 Lt(B6, yre, UE);
 Lt(k6, Ere, UE);
@@ -62269,7 +62269,7 @@ function ULe(t) {
   return wd(t, JI);
 }
 function wre(t) {
-  return wd(t, Co);
+  return wd(t, To);
 }
 function Lre(t) {
   return wd(t, P2);
@@ -63244,7 +63244,7 @@ function Em(t, e, n, r, i) {
 function j2(t, e) {
   t.globalCompositeOperation = e.blend || "source-over";
 }
-function Lo(t, e) {
+function Io(t, e) {
   return t ?? e;
 }
 function kz(t, e) {
@@ -63257,9 +63257,9 @@ function l$e(t, e, n) {
   const r = n.width(), i = n.height();
   let s;
   if (e.gradient === "radial")
-    s = t.createRadialGradient(n.x1 + Lo(e.x1, 0.5) * r, n.y1 + Lo(e.y1, 0.5) * i, Math.max(r, i) * Lo(e.r1, 0), n.x1 + Lo(e.x2, 0.5) * r, n.y1 + Lo(e.y2, 0.5) * i, Math.max(r, i) * Lo(e.r2, 0.5));
+    s = t.createRadialGradient(n.x1 + Io(e.x1, 0.5) * r, n.y1 + Io(e.y1, 0.5) * i, Math.max(r, i) * Io(e.r1, 0), n.x1 + Io(e.x2, 0.5) * r, n.y1 + Io(e.y2, 0.5) * i, Math.max(r, i) * Io(e.r2, 0.5));
   else {
-    const o = Lo(e.x1, 0), u = Lo(e.y1, 0), a = Lo(e.x2, 1), l = Lo(e.y2, 0);
+    const o = Io(e.x1, 0), u = Io(e.y1, 0), a = Io(e.x2, 1), l = Io(e.y2, 0);
     if (o === a || u === l || r === i)
       s = t.createLinearGradient(n.x1 + o * r, n.y1 + u * i, n.x1 + a * r, n.y1 + l * i);
     else {
@@ -63449,7 +63449,7 @@ function rie(t, e) {
   t.beginPath(), o$(e) ? sp(t, e, 0, 0) : t.rect(0, 0, e.width || 0, e.height || 0), t.clip();
 }
 function iie(t) {
-  const e = Lo(t.strokeWidth, 1);
+  const e = Io(t.strokeWidth, 1);
   return t.strokeOffset != null ? t.strokeOffset : t.stroke && e > 0.5 && e < 1.5 ? 0.5 - Math.abs(e - 1) : 0;
 }
 function S$e(t, e) {
@@ -63798,7 +63798,7 @@ var oBe = {
   draw: rBe,
   pick: U6(iBe),
   isect: sBe
-}, uBe = h$("trail", r$e, E$e), Eo = {
+}, uBe = h$("trail", r$e, E$e), Ao = {
   arc: g$e,
   area: A$e,
   group: L$e,
@@ -63813,14 +63813,14 @@ var oBe = {
   trail: uBe
 };
 function jz(t, e, n) {
-  var r = Eo[t.mark.marktype], i = e || r.bound;
+  var r = Ao[t.mark.marktype], i = e || r.bound;
   return r.nested && (t = t.mark), i(t.bounds || (t.bounds = new Jn()), t, n);
 }
 var Uz = {
   mark: null
 };
 function aBe(t, e, n) {
-  var r = Eo[t.marktype], i = r.bound, s = t.items, o = s && s.length, u, a, l, c;
+  var r = Ao[t.marktype], i = r.bound, s = t.items, o = s && s.length, u, a, l, c;
   if (r.nested)
     return o ? l = s[0] : (Uz.mark = t, l = Uz), c = jz(l, i, n), e = e && e.union(c) || c, e;
   if (e = e || t.bounds && t.bounds.clear() || new Jn(), o)
@@ -63987,7 +63987,7 @@ function S$(t, e) {
 }
 function xBe(t, e, n, r) {
   var i = t && t.mark, s, o;
-  if (i && (s = Eo[i.marktype]).tip) {
+  if (i && (s = Ao[i.marktype]).tip) {
     for (o = S$(e, n), o[0] -= r[0], o[1] -= r[1]; t = t.mark.group; )
       o[0] -= t.x || 0, o[1] -= t.y || 0;
     t = s.tip(i.items, o);
@@ -64372,7 +64372,7 @@ De(G6, jx, {
   // gx, gy -- the relative coordinates within the current group
   pick(t, e, n, r, i) {
     const s = this.context();
-    return Eo[t.marktype].pick.call(this, s, t, e, n, r, i);
+    return Ao[t.marktype].pick.call(this, s, t, e, n, r, i);
   }
 });
 function _Be() {
@@ -64426,7 +64426,7 @@ De(F8, t0, {
     return this.clear(-n[0], -n[1], r, i), this.draw(e, t, u), e.restore(), s.clear(), this;
   },
   draw(t, e, n) {
-    const r = Eo[e.marktype];
+    const r = Ao[e.marktype];
     e.clip && v$e(t, e), r.draw.call(this, t, e, n), e.clip && t.restore();
   },
   clear(t, e, n, r) {
@@ -64708,7 +64708,7 @@ De(Fie, t0, {
     const e = ++this._dirtyID;
     let n, r, i, s, o, u, a;
     for (o = 0, u = t.length; o < u; ++o)
-      if (n = t[o], r = n.mark, r.marktype !== i && (i = r.marktype, s = Eo[i]), r.zdirty && r.dirty !== e && (this._dirtyAll = !1, Kz(n, e), r.items.forEach((l) => {
+      if (n = t[o], r = n.mark, r.marktype !== i && (i = r.marktype, s = Ao[i]), r.zdirty && r.dirty !== e && (this._dirtyAll = !1, Kz(n, e), r.items.forEach((l) => {
         l.dirty = e;
       })), !r.zdirty) {
         if (n.exit) {
@@ -64729,7 +64729,7 @@ De(Fie, t0, {
   mark(t, e, n) {
     if (!this.isDirty(e))
       return e._svg;
-    const r = this._svg, i = Eo[e.marktype], s = e.interactive === !1 ? "none" : null, o = i.tag === "g", u = Xz(e, t, n, "g", r);
+    const r = this._svg, i = Ao[e.marktype], s = e.interactive === !1 ? "none" : null, o = i.tag === "g", u = Xz(e, t, n, "g", r);
     u.setAttribute("class", pie(e));
     const a = Cie(e);
     for (const x in a)
@@ -64958,7 +64958,7 @@ De(Lie, t0, {
    * @param {object} scene - The mark parent to render.
    */
   mark(t, e) {
-    const n = Eo[e.marktype], r = n.tag, i = [bie, n.attr];
+    const n = Ao[e.marktype], r = n.tag, i = [bie, n.attr];
     t.open("g", {
       class: pie(e),
       "clip-path": e.clip ? u$(this, e, e.group) : null
@@ -65124,7 +65124,7 @@ function Pie(t, e, n, r) {
       for (; u < o; ++u)
         Mie(i[u], e, n, r);
     else
-      for (const a = Eo[s].isect; u < o; ++u) {
+      for (const a = Ao[s].isect; u < o; ++u) {
         const l = i[u];
         jie(l, e, a) && r.push(l);
       }
@@ -65135,7 +65135,7 @@ function QBe(t, e, n) {
   return t.bounds && e.intersects(t.bounds) && (t.marktype === "group" || t.interactive !== !1 && (!n || n(t)));
 }
 function Mie(t, e, n, r) {
-  n && n(t.mark) && jie(t, e, Eo.group.isect) && r.push(t);
+  n && n(t.mark) && jie(t, e, Ao.group.isect) && r.push(t);
   const i = t.items, s = i && i.length;
   if (s) {
     const o = t.x || 0, u = t.y || 0;
@@ -65167,7 +65167,7 @@ function Kie(t) {
 }
 De(Kie, pe, {
   transform(t, e) {
-    const n = e.dataflow, r = t.mark, i = r.marktype, s = Eo[i], o = s.bound;
+    const n = e.dataflow, r = t.mark, i = r.marktype, s = Ao[i], o = s.bound;
     let u = r.bounds, a;
     if (s.nested)
       r.items.length && n.dirty(r.items[0]), u = tv(r, o), r.items.forEach((l) => {
@@ -66179,7 +66179,7 @@ const oPe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
   sortitems: dse,
   stack: k$
 }, Symbol.toStringTag, { value: "Module" }));
-var Ze = 1e-6, C4 = 1e-12, pt = Math.PI, On = pt / 2, T4 = pt / 4, Li = pt * 2, Ln = 180 / pt, xt = pt / 180, At = Math.abs, op = Math.atan, Ao = Math.atan2, tt = Math.cos, iv = Math.ceil, mse = Math.exp, B8 = Math.hypot, O4 = Math.log, y7 = Math.pow, Ke = Math.sin, oo = Math.sign || function(t) {
+var Ze = 1e-6, C4 = 1e-12, pt = Math.PI, On = pt / 2, T4 = pt / 4, Li = pt * 2, In = 180 / pt, xt = pt / 180, At = Math.abs, op = Math.atan, vo = Math.atan2, tt = Math.cos, iv = Math.ceil, mse = Math.exp, B8 = Math.hypot, O4 = Math.log, y7 = Math.pow, Ke = Math.sin, uo = Math.sign || function(t) {
   return t > 0 ? 1 : t < 0 ? -1 : 0;
 }, Ii = Math.sqrt, P$ = Math.tan;
 function yse(t) {
@@ -66273,13 +66273,13 @@ function lPe(t, e) {
 function vse(t, e) {
   t *= xt, e *= xt, e = e / 2 + T4;
   var n = t - P8, r = n >= 0 ? 1 : -1, i = r * n, s = tt(e), o = Ke(e), u = j8 * o, a = M8 * s + u * tt(i), l = u * r * Ke(i);
-  N4.add(Ao(l, a)), P8 = t, M8 = s, j8 = o;
+  N4.add(vo(l, a)), P8 = t, M8 = s, j8 = o;
 }
 function cPe(t) {
   return D4 = new Ci(), ul(t, fa), D4 * 2;
 }
 function F4(t) {
-  return [Ao(t[1], t[0]), os(t[2])];
+  return [vo(t[1], t[0]), os(t[2])];
 }
 function Ux(t) {
   var e = t[0], n = t[1], r = tt(n);
@@ -66323,8 +66323,8 @@ function bse(t, e) {
   if (Uh) {
     var r = H2(Uh, n), i = [r[1], -r[0], 0], s = H2(i, r);
     w4(s), s = F4(s);
-    var o = t - jf, u = o > 0 ? 1 : -1, a = s[0] * Ln * u, l, c = At(o) > 180;
-    c ^ (u * jf < a && a < u * t) ? (l = s[1] * Ln, l > bs && (bs = l)) : (a = (a + 360) % 360 - 180, c ^ (u * jf < a && a < u * t) ? (l = -s[1] * Ln, l < Ki && (Ki = l)) : (e < Ki && (Ki = e), e > bs && (bs = e))), c ? t < jf ? _s(xn, t) > _s(xn, En) && (En = t) : _s(t, En) > _s(xn, En) && (xn = t) : En >= xn ? (t < xn && (xn = t), t > En && (En = t)) : t > jf ? _s(xn, t) > _s(xn, En) && (En = t) : _s(t, En) > _s(xn, En) && (xn = t);
+    var o = t - jf, u = o > 0 ? 1 : -1, a = s[0] * In * u, l, c = At(o) > 180;
+    c ^ (u * jf < a && a < u * t) ? (l = s[1] * In, l > bs && (bs = l)) : (a = (a + 360) % 360 - 180, c ^ (u * jf < a && a < u * t) ? (l = -s[1] * In, l < Ki && (Ki = l)) : (e < Ki && (Ki = e), e > bs && (bs = e))), c ? t < jf ? _s(xn, t) > _s(xn, En) && (En = t) : _s(t, En) > _s(xn, En) && (xn = t) : En >= xn ? (t < xn && (xn = t), t > En && (En = t)) : t > jf ? _s(xn, t) > _s(xn, En) && (En = t) : _s(t, En) > _s(xn, En) && (xn = t);
   } else
     T0.push(Ml = [xn = t, En = t]);
   e < Ki && (Ki = e), e > bs && (bs = e), Uh = n, jf = t;
@@ -66398,7 +66398,7 @@ function pPe(t, e) {
 }
 function gPe(t, e) {
   t *= xt, e *= xt;
-  var n = tt(e), r = n * tt(t), i = n * Ke(t), s = Ke(e), o = Ao(Ii((o = gi * s - mi * i) * o + (o = mi * r - pi * s) * o + (o = pi * i - gi * r) * o), pi * r + gi * i + mi * s);
+  var n = tt(e), r = n * tt(t), i = n * Ke(t), s = Ke(e), o = vo(Ii((o = gi * s - mi * i) * o + (o = mi * r - pi * s) * o + (o = pi * i - gi * r) * o), pi * r + gi * i + mi * s);
   L4 += o, k4 += o * (pi + (pi = r)), P4 += o * (gi + (gi = i)), M4 += o * (mi + (mi = s)), WE(pi, gi, mi);
 }
 function mH() {
@@ -66423,7 +66423,7 @@ function Rse(t, e) {
 function APe(t) {
   Am = L4 = I4 = $4 = B4 = k4 = P4 = M4 = 0, q8 = new Ci(), z8 = new Ci(), H8 = new Ci(), ul(t, zo);
   var e = +q8, n = +z8, r = +H8, i = B8(e, n, r);
-  return i < C4 && (e = k4, n = P4, r = M4, L4 < Ze && (e = I4, n = $4, r = B4), i = B8(e, n, r), i < C4) ? [NaN, NaN] : [Ao(n, e) * Ln, os(r / i) * Ln];
+  return i < C4 && (e = k4, n = P4, r = M4, L4 < Ze && (e = I4, n = $4, r = B4), i = B8(e, n, r), i < C4) ? [NaN, NaN] : [vo(n, e) * In, os(r / i) * In];
 }
 function Q8(t, e) {
   function n(r, i) {
@@ -66454,14 +66454,14 @@ function AH(t, e) {
   function o(u, a) {
     var l = tt(a), c = tt(u) * l, f = Ke(u) * l, x = Ke(a), h = x * n + c * r;
     return [
-      Ao(f * i - h * s, c * n - x * r),
+      vo(f * i - h * s, c * n - x * r),
       os(h * i + f * s)
     ];
   }
   return o.invert = function(u, a) {
     var l = tt(a), c = tt(u) * l, f = Ke(u) * l, x = Ke(a), h = x * i - f * s;
     return [
-      Ao(f * i + x * s, c * n + h * r),
+      vo(f * i + x * s, c * n + h * r),
       os(h * n - c * r)
     ];
   }, o;
@@ -66469,10 +66469,10 @@ function AH(t, e) {
 function vPe(t) {
   t = Nse(t[0] * xt, t[1] * xt, t.length > 2 ? t[2] * xt : 0);
   function e(n) {
-    return n = t(n[0] * xt, n[1] * xt), n[0] *= Ln, n[1] *= Ln, n;
+    return n = t(n[0] * xt, n[1] * xt), n[0] *= In, n[1] *= In, n;
   }
   return e.invert = function(n) {
-    return n = t.invert(n[0] * xt, n[1] * xt), n[0] *= Ln, n[1] *= Ln, n;
+    return n = t.invert(n[0] * xt, n[1] * xt), n[0] *= In, n[1] *= In, n;
   }, e;
 }
 function SPe(t, e, n, r, i, s) {
@@ -66567,7 +66567,7 @@ function SH(t) {
   }
 }
 function A7(t) {
-  return At(t[0]) <= pt ? t[0] : oo(t[0]) * ((At(t[0]) + pt) % Li - pt);
+  return At(t[0]) <= pt ? t[0] : uo(t[0]) * ((At(t[0]) + pt) % Li - pt);
 }
 function _Pe(t, e) {
   var n = A7(e), r = e[1], i = Ke(r), s = [Ke(n), -tt(n), 0], o = 0, u = 0, a = new Ci();
@@ -66576,7 +66576,7 @@ function _Pe(t, e) {
     if (x = (f = t[l]).length)
       for (var f, x, h = f[x - 1], p = A7(h), m = h[1] / 2 + T4, g = Ke(m), y = tt(m), E = 0; E < x; ++E, p = v, g = _, y = b, h = A) {
         var A = f[E], v = A7(A), S = A[1] / 2 + T4, _ = Ke(S), b = tt(S), C = v - p, R = C >= 0 ? 1 : -1, O = R * C, I = O > pt, j = g * _;
-        if (a.add(Ao(j * R * Ke(O), y * b + j * tt(O))), o += I ? C + R * Li : C, I ^ p >= n ^ v >= n) {
+        if (a.add(vo(j * R * Ke(O), y * b + j * tt(O))), o += I ? C + R * Li : C, I ^ p >= n ^ v >= n) {
           var Q = H2(Ux(h), Ux(A));
           w4(Q);
           var G = H2(s, Q);
@@ -66965,15 +66965,15 @@ var Q2 = 1 / 0, j4 = Q2, I3 = -Q2, U4 = I3, q4 = {
 function $Pe(t, e) {
   t < Q2 && (Q2 = t), t > I3 && (I3 = t), e < j4 && (j4 = e), e > U4 && (U4 = e);
 }
-var K8 = 0, X8 = 0, Sm = 0, z4 = 0, H4 = 0, Dh = 0, J8 = 0, Z8 = 0, _m = 0, kse, Pse, Mu, ju, ro = {
+var K8 = 0, X8 = 0, Sm = 0, z4 = 0, H4 = 0, Dh = 0, J8 = 0, Z8 = 0, _m = 0, kse, Pse, Mu, ju, io = {
   point: qx,
   lineStart: TH,
   lineEnd: OH,
   polygonStart: function() {
-    ro.lineStart = PPe, ro.lineEnd = MPe;
+    io.lineStart = PPe, io.lineEnd = MPe;
   },
   polygonEnd: function() {
-    ro.point = qx, ro.lineStart = TH, ro.lineEnd = OH;
+    io.point = qx, io.lineStart = TH, io.lineEnd = OH;
   },
   result: function() {
     var t = _m ? [J8 / _m, Z8 / _m] : Dh ? [z4 / Dh, H4 / Dh] : Sm ? [K8 / Sm, X8 / Sm] : [NaN, NaN];
@@ -66984,26 +66984,26 @@ function qx(t, e) {
   K8 += t, X8 += e, ++Sm;
 }
 function TH() {
-  ro.point = BPe;
+  io.point = BPe;
 }
 function BPe(t, e) {
-  ro.point = kPe, qx(Mu = t, ju = e);
+  io.point = kPe, qx(Mu = t, ju = e);
 }
 function kPe(t, e) {
   var n = t - Mu, r = e - ju, i = Ii(n * n + r * r);
   z4 += i * (Mu + t) / 2, H4 += i * (ju + e) / 2, Dh += i, qx(Mu = t, ju = e);
 }
 function OH() {
-  ro.point = qx;
+  io.point = qx;
 }
 function PPe() {
-  ro.point = jPe;
+  io.point = jPe;
 }
 function MPe() {
   Mse(kse, Pse);
 }
 function jPe(t, e) {
-  ro.point = Mse, qx(kse = Mu = t, Pse = ju = e);
+  io.point = Mse, qx(kse = Mu = t, Pse = ju = e);
 }
 function Mse(t, e) {
   var n = t - Mu, r = e - ju, i = Ii(n * n + r * r);
@@ -67152,7 +67152,7 @@ function Qse(t, e) {
   }, o.bounds = function(u) {
     return ul(u, i(q4)), q4.result();
   }, o.centroid = function(u) {
-    return ul(u, i(ro)), ro.result();
+    return ul(u, i(io)), io.result();
   }, o.projection = function(u) {
     return arguments.length ? (i = u == null ? (t = null, L3) : (t = u).stream, o) : t;
   }, o.context = function(u) {
@@ -67244,7 +67244,7 @@ function QPe(t, e) {
   function n(r, i, s, o, u, a, l, c, f, x, h, p, m, g) {
     var y = l - r, E = c - i, A = y * y + E * E;
     if (A > 4 * e && m--) {
-      var v = o + x, S = u + h, _ = a + p, b = Ii(v * v + S * S + _ * _), C = os(_ /= b), R = At(At(_) - 1) < Ze || At(s - f) < Ze ? (s + f) / 2 : Ao(S, v), O = t(R, C), I = O[0], j = O[1], Q = I - r, G = j - i, P = E * Q - y * G;
+      var v = o + x, S = u + h, _ = a + p, b = Ii(v * v + S * S + _ * _), C = os(_ /= b), R = At(At(_) - 1) < Ze || At(s - f) < Ze ? (s + f) / 2 : vo(S, v), O = t(R, C), I = O[0], j = O[1], Q = I - r, G = j - i, P = E * Q - y * G;
       (P * P / A > e || At((y * Q + E * G) / A - 0.5) > 0.3 || o * x + u * h + a * p < zPe) && (n(r, i, s, o, u, a, I, j, R, v /= b, S /= b, _, m, g), g.point(I, j), n(I, j, R, v, S, _, l, c, f, x, h, p, m, g));
     }
   }
@@ -67328,7 +67328,7 @@ function Gse(t) {
     return C(P[0] * xt, P[1] * xt);
   }
   function j(P) {
-    return P = C.invert(P[0], P[1]), P && [P[0] * Ln, P[1] * Ln];
+    return P = C.invert(P[0], P[1]), P && [P[0] * In, P[1] * In];
   }
   I.stream = function(P) {
     return R && O === P ? R : R = GPe(WPe(c)(m(_(v(O = P)))));
@@ -67337,7 +67337,7 @@ function Gse(t) {
   }, I.postclip = function(P) {
     return arguments.length ? (v = P, g = y = E = A = null, G()) : v;
   }, I.clipAngle = function(P) {
-    return arguments.length ? (m = +P ? NPe(p = P * xt) : (p = null, _H), G()) : p * Ln;
+    return arguments.length ? (m = +P ? NPe(p = P * xt) : (p = null, _H), G()) : p * In;
   }, I.clipExtent = function(P) {
     return arguments.length ? (v = P == null ? (g = y = E = A = null, L3) : Lse(g = +P[0][0], y = +P[0][1], E = +P[1][0], A = +P[1][1]), G()) : g == null ? null : [[g, y], [E, A]];
   }, I.scale = function(P) {
@@ -67345,11 +67345,11 @@ function Gse(t) {
   }, I.translate = function(P) {
     return arguments.length ? (r = +P[0], i = +P[1], Q()) : [r, i];
   }, I.center = function(P) {
-    return arguments.length ? (s = P[0] % 360 * xt, o = P[1] % 360 * xt, Q()) : [s * Ln, o * Ln];
+    return arguments.length ? (s = P[0] % 360 * xt, o = P[1] % 360 * xt, Q()) : [s * In, o * In];
   }, I.rotate = function(P) {
-    return arguments.length ? (u = P[0] % 360 * xt, a = P[1] % 360 * xt, l = P.length > 2 ? P[2] % 360 * xt : 0, Q()) : [u * Ln, a * Ln, l * Ln];
+    return arguments.length ? (u = P[0] % 360 * xt, a = P[1] % 360 * xt, l = P.length > 2 ? P[2] % 360 * xt : 0, Q()) : [u * In, a * In, l * In];
   }, I.angle = function(P) {
-    return arguments.length ? (f = P % 360 * xt, Q()) : f * Ln;
+    return arguments.length ? (f = P % 360 * xt, Q()) : f * In;
   }, I.reflectX = function(P) {
     return arguments.length ? (x = P ? -1 : 1, Q()) : x < 0;
   }, I.reflectY = function(P) {
@@ -67379,7 +67379,7 @@ function Gse(t) {
 function H$(t) {
   var e = 0, n = pt / 3, r = Gse(t), i = r(e, n);
   return i.parallels = function(s) {
-    return arguments.length ? r(e = s[0] * xt, n = s[1] * xt) : [e * Ln, n * Ln];
+    return arguments.length ? r(e = s[0] * xt, n = s[1] * xt) : [e * In, n * In];
   }, i;
 }
 function YPe(t) {
@@ -67401,8 +67401,8 @@ function KPe(t, e) {
     return [l * Ke(u *= r), s - l * tt(u)];
   }
   return o.invert = function(u, a) {
-    var l = s - a, c = Ao(u, At(l)) * oo(l);
-    return l * r < 0 && (c -= pt * oo(u) * oo(l)), [c / r, os((i - (u * u + l * l) * r * r) / (2 * r))];
+    var l = s - a, c = vo(u, At(l)) * uo(l);
+    return l * r < 0 && (c -= pt * uo(u) * uo(l)), [c / r, os((i - (u * u + l * l) * r * r) / (2 * r))];
   }, o;
 }
 function G4() {
@@ -67489,7 +67489,7 @@ function VE(t) {
   return function(e, n) {
     var r = Ii(e * e + n * n), i = t(r), s = Ke(i), o = tt(i);
     return [
-      Ao(e * s, r * o),
+      vo(e * s, r * o),
       os(r && n * s / r)
     ];
   };
@@ -67551,8 +67551,8 @@ function nMe(t, e) {
     return [a * Ke(r * o), i - a * tt(r * o)];
   }
   return s.invert = function(o, u) {
-    var a = i - u, l = oo(r) * Ii(o * o + a * a), c = Ao(o, At(a)) * oo(a);
-    return a * r < 0 && (c -= pt * oo(o) * oo(a)), [c / r, 2 * op(y7(i / l, 1 / r)) - On];
+    var a = i - u, l = uo(r) * Ii(o * o + a * a), c = vo(o, At(a)) * uo(a);
+    return a * r < 0 && (c -= pt * uo(o) * uo(a)), [c / r, 2 * op(y7(i / l, 1 / r)) - On];
   }, s;
 }
 function rMe() {
@@ -67574,8 +67574,8 @@ function sMe(t, e) {
     return [a * Ke(l), i - a * tt(l)];
   }
   return s.invert = function(o, u) {
-    var a = i - u, l = Ao(o, At(a)) * oo(a);
-    return a * r < 0 && (l -= pt * oo(o) * oo(a)), [l / r, i - oo(r) * Ii(o * o + a * a)];
+    var a = i - u, l = vo(o, At(a)) * uo(a);
+    return a * r < 0 && (l -= pt * uo(o) * uo(a)), [l / r, i - uo(r) * Ii(o * o + a * a)];
   }, s;
 }
 function oMe() {
@@ -67644,7 +67644,7 @@ function cMe() {
   }, A.translate = function(v) {
     return arguments.length ? (e = +v[0], n = +v[1], E()) : [e, n];
   }, A.angle = function(v) {
-    return arguments.length ? (s = v % 360 * xt, u = Ke(s), o = tt(s), E()) : s * Ln;
+    return arguments.length ? (s = v % 360 * xt, u = Ke(s), o = tt(s), E()) : s * In;
   }, A.reflectX = function(v) {
     return arguments.length ? (r = v ? -1 : 1, E()) : r < 0;
   }, A.reflectY = function(v) {
@@ -68114,7 +68114,7 @@ De(G$, pe, {
   transform(t, e) {
     if (this.value && !e.changed() && !t.modified())
       return e.StopPropagation;
-    var n = e.fork(e.NO_SOURCE | e.NO_FIELDS), r = e.materialize(e.SOURCE).source, i = IMe(r, t.groupby), s = (t.groupby || []).map(Bn), o = foe(coe(), t), u = t.as || "grid", a = [];
+    var n = e.fork(e.NO_SOURCE | e.NO_FIELDS), r = e.materialize(e.SOURCE).source, i = IMe(r, t.groupby), s = (t.groupby || []).map(kn), o = foe(coe(), t), u = t.as || "grid", a = [];
     function l(c, f) {
       for (let x = 0; x < s.length; ++x)
         c[s[x]] = f[x];
@@ -70489,7 +70489,7 @@ function Xv(t, e, n) {
   const r = e[0].mark.marktype;
   r === "group" ? e.forEach((i) => {
     i.items.forEach((s) => Xv(t, s.items, n));
-  }) : Eo[r].draw(t, {
+  }) : Ao[r].draw(t, {
     items: n ? e.map(VUe) : e
   });
 }
@@ -70867,7 +70867,7 @@ De(hB, pe, {
   transform(t, e) {
     const n = e.fork(e.NO_SOURCE | e.NO_FIELDS);
     if (!this.value || e.changed() || t.modified()) {
-      const r = e.materialize(e.SOURCE).source, i = Doe(r, t.groupby), s = (t.groupby || []).map(Bn), o = s.length, u = t.as || [Bn(t.x), Bn(t.y)], a = [];
+      const r = e.materialize(e.SOURCE).source, i = Doe(r, t.groupby), s = (t.groupby || []).map(kn), o = s.length, u = t.as || [kn(t.x), kn(t.y)], a = [];
       i.forEach((l) => {
         swe(l, t.x, t.y, t.bandwidth || 0.3).forEach((c) => {
           const f = {};
@@ -70936,7 +70936,7 @@ De(pB, pe, {
   transform(t, e) {
     const n = e.fork(e.NO_SOURCE | e.NO_FIELDS);
     if (!this.value || e.changed() || t.modified()) {
-      const r = e.materialize(e.SOURCE).source, i = Doe(r, t.groupby), s = (t.groupby || []).map(Bn), o = t.method || "linear", u = t.order || 3, a = dqe(o, u), l = t.as || [Bn(t.x), Bn(t.y)], c = pF[o], f = [];
+      const r = e.materialize(e.SOURCE).source, i = Doe(r, t.groupby), s = (t.groupby || []).map(kn), o = t.method || "linear", u = t.order || 3, a = dqe(o, u), l = t.as || [kn(t.x), kn(t.y)], c = pF[o], f = [];
       let x = t.extent;
       Je(pF, o) || Se("Invalid regression method: " + o), x != null && o === "log" && x[0] <= 0 && (e.dataflow.warn("Ignoring extent with values <= 0 for log regression."), x = null), i.forEach((h) => {
         if (h.length <= a) {
@@ -75203,13 +75203,13 @@ function AVe(t, e) {
   let r;
   n.domain = Lue(t.domain, t, e), t.range != null && (n.range = $ue(t, e, n)), t.interpolate != null && DVe(t.interpolate, n), t.nice != null && (n.nice = NVe(t.nice)), t.bins != null && (n.bins = RVe(t.bins, e));
   for (r in t)
-    Je(n, r) || r === "name" || (n[r] = uo(t[r], e));
+    Je(n, r) || r === "name" || (n[r] = ao(t[r], e));
 }
-function uo(t, e) {
+function ao(t, e) {
   return He(t) ? t.signal ? e.signalRef(t.signal) : Se("Unsupported object: " + Fe(t)) : t;
 }
 function nS(t, e) {
-  return t.signal ? e.signalRef(t.signal) : t.map((n) => uo(n, e));
+  return t.signal ? e.signalRef(t.signal) : t.map((n) => ao(n, e));
 }
 function lO(t) {
   Se("Can not find data set: " + Fe(t));
@@ -75222,7 +75222,7 @@ function Lue(t, e, n) {
   return t.signal ? n.signalRef(t.signal) : (be(t) ? vVe : t.fields ? _Ve : SVe)(t, e, n);
 }
 function vVe(t, e, n) {
-  return t.map((r) => uo(r, n));
+  return t.map((r) => ao(r, n));
 }
 function SVe(t, e, n) {
   const r = n.getData(t.data);
@@ -75298,12 +75298,12 @@ function RVe(t, e) {
 }
 function NVe(t) {
   return He(t) ? {
-    interval: uo(t.interval),
-    step: uo(t.step)
-  } : uo(t);
+    interval: ao(t.interval),
+    step: ao(t.step)
+  } : ao(t);
 }
 function DVe(t, e) {
-  e.interpolate = uo(t.type || t), t.gamma != null && (e.interpolateGamma = uo(t.gamma));
+  e.interpolate = ao(t.type || t), t.gamma != null && (e.interpolateGamma = ao(t.gamma));
 }
 function $ue(t, e, n) {
   const r = e.config.range;
@@ -75323,17 +75323,17 @@ function $ue(t, e, n) {
       signal: "height"
     }, 0] : Se("Unrecognized scale range value: " + Fe(i));
   } else if (i.scheme) {
-    n.scheme = be(i.scheme) ? nS(i.scheme, e) : uo(i.scheme, e), i.extent && (n.schemeExtent = nS(i.extent, e)), i.count && (n.schemeCount = uo(i.count, e));
+    n.scheme = be(i.scheme) ? nS(i.scheme, e) : ao(i.scheme, e), i.extent && (n.schemeExtent = nS(i.extent, e)), i.count && (n.schemeCount = ao(i.count, e));
     return;
   } else if (i.step) {
-    n.rangeStep = uo(i.step, e);
+    n.rangeStep = ao(i.step, e);
     return;
   } else {
     if (M2(t.type) && !be(i))
       return Lue(i, t, e);
     be(i) || Se("Unsupported range type: " + Fe(i));
   }
-  return i.map((s) => (be(s) ? nS : uo)(s, e));
+  return i.map((s) => (be(s) ? nS : ao)(s, e));
 }
 function FVe(t, e) {
   const n = e.config.projection || {}, r = {};
@@ -75346,13 +75346,13 @@ function FVe(t, e) {
 function OF(t, e, n) {
   return be(t) ? t.map((r) => OF(r, e, n)) : He(t) ? t.signal ? n.signalRef(t.signal) : e === "fit" ? t : Se("Unsupported parameter object: " + Fe(t)) : t;
 }
-const du = "top", ap = "left", lp = "right", mc = "bottom", Bue = "center", wVe = "vertical", LVe = "start", IVe = "middle", $Ve = "end", RF = "index", qB = "label", BVe = "offset", V2 = "perc", kVe = "perc2", xo = "value", tA = "guide-label", zB = "guide-title", PVe = "group-title", MVe = "group-subtitle", jQ = "symbol", rS = "gradient", NF = "discrete", DF = "size", jVe = "shape", UVe = "fill", qVe = "stroke", zVe = "strokeWidth", HVe = "strokeDash", QVe = "opacity", HB = [DF, jVe, UVe, qVe, zVe, HVe, QVe], nA = {
+const du = "top", ap = "left", lp = "right", mc = "bottom", Bue = "center", wVe = "vertical", LVe = "start", IVe = "middle", $Ve = "end", RF = "index", qB = "label", BVe = "offset", V2 = "perc", kVe = "perc2", ho = "value", tA = "guide-label", zB = "guide-title", PVe = "group-title", MVe = "group-subtitle", jQ = "symbol", rS = "gradient", NF = "discrete", DF = "size", jVe = "shape", UVe = "fill", qVe = "stroke", zVe = "strokeWidth", HVe = "strokeDash", QVe = "opacity", HB = [DF, jVe, UVe, qVe, zVe, HVe, QVe], nA = {
   name: 1,
   style: 1,
   interactive: 1
 }, bt = {
   value: 0
-}, ho = {
+}, po = {
   value: 1
 }, cO = "group", kue = "rect", QB = "rule", GVe = "symbol", Bd = "text";
 function H3(t) {
@@ -75413,7 +75413,7 @@ function YVe(t, e, n, r) {
       height: hr(x)
     },
     update: lt({}, a, {
-      opacity: ho,
+      opacity: po,
       fill: {
         gradient: e,
         start: l,
@@ -75444,7 +75444,7 @@ function KVe(t, e, n, r, i) {
     opacity: bt,
     fill: {
       scale: e,
-      field: xo
+      field: ho
     }
   };
   p[l] = {
@@ -75457,7 +75457,7 @@ function KVe(t, e, n, r, i) {
   const m = {
     enter: p,
     update: lt({}, p, {
-      opacity: ho
+      opacity: po
     }),
     exit: {
       opacity: bt
@@ -75472,7 +75472,7 @@ function KVe(t, e, n, r, i) {
   }), Ps({
     type: kue,
     role: AWe,
-    key: xo,
+    key: ho,
     from: i,
     encode: m
   }, r);
@@ -75486,7 +75486,7 @@ function UQ(t, e, n, r) {
       opacity: bt
     },
     update: c = {
-      opacity: ho,
+      opacity: po,
       text: {
         field: qB
       }
@@ -75522,7 +75522,7 @@ function UQ(t, e, n, r) {
     type: Bd,
     role: Aue,
     style: tA,
-    key: xo,
+    key: ho,
     from: r,
     encode: p,
     overlap: a
@@ -75546,7 +75546,7 @@ function ZVe(t, e, n, r, i) {
       y: h
     },
     update: E = {
-      opacity: ho,
+      opacity: po,
       x: y.x,
       y: y.y
     },
@@ -75569,13 +75569,13 @@ function ZVe(t, e, n, r, i) {
   }), HB.forEach((O) => {
     t[O] && (E[O] = y[O] = {
       scale: t[O],
-      field: xo
+      field: ho
     });
   });
   const b = Ps({
     type: GVe,
     role: _We,
-    key: xo,
+    key: ho,
     from: f,
     clip: l ? !0 : void 0,
     encode: g
@@ -75590,7 +75590,7 @@ function ZVe(t, e, n, r, i) {
       y: h
     },
     update: E = {
-      opacity: ho,
+      opacity: po,
       text: {
         field: qB
       },
@@ -75615,7 +75615,7 @@ function ZVe(t, e, n, r, i) {
     type: Bd,
     role: Aue,
     style: tA,
-    key: xo,
+    key: ho,
     from: f,
     encode: g
   }, n.labels);
@@ -75633,7 +75633,7 @@ function ZVe(t, e, n, r, i) {
       opacity: bt
     },
     update: E = {
-      opacity: ho,
+      opacity: po,
       row: {
         signal: null
       },
@@ -75683,7 +75683,7 @@ function aYe(t, e, n, r) {
       opacity: bt
     },
     update: {
-      opacity: ho,
+      opacity: po,
       x: {
         field: {
           group: "padding"
@@ -76364,7 +76364,7 @@ function QYe(t, e, n, r) {
       opacity: bt
     },
     update: u = {
-      opacity: ho
+      opacity: po
     },
     exit: {
       opacity: bt
@@ -76400,7 +76400,7 @@ function GYe(t, e, n, r, i) {
       opacity: bt
     },
     update: x = {
-      opacity: ho
+      opacity: po
     },
     exit: f = {
       opacity: bt
@@ -76416,7 +76416,7 @@ function GYe(t, e, n, r, i) {
   });
   const p = {
     scale: t.scale,
-    field: xo,
+    field: ho,
     band: i.band,
     extra: i.extra,
     offset: i.offset,
@@ -76445,7 +76445,7 @@ function GYe(t, e, n, r, i) {
   return c.x = x.x = pr(o, p, g), c.y = x.y = Go(o, p, g), c.x2 = x.x2 = Go(o, y), c.y2 = x.y2 = pr(o, y), f.x = pr(o, p), f.y = Go(o, p), Ps({
     type: QB,
     role: pWe,
-    key: xo,
+    key: ho,
     from: r,
     encode: h
   }, n);
@@ -76477,7 +76477,7 @@ function VYe(t, e, n, r, i, s) {
       opacity: bt
     },
     update: f = {
-      opacity: ho
+      opacity: po
     },
     exit: c = {
       opacity: bt
@@ -76495,7 +76495,7 @@ function VYe(t, e, n, r, i, s) {
   h.mult = a;
   const p = {
     scale: t.scale,
-    field: xo,
+    field: ho,
     band: s.band,
     extra: s.extra,
     offset: s.offset,
@@ -76504,7 +76504,7 @@ function VYe(t, e, n, r, i, s) {
   return f.y = l.y = pr(u, bt, p), f.y2 = l.y2 = pr(u, h), c.x = pr(u, p), f.x = l.x = Go(u, bt, p), f.x2 = l.x2 = Go(u, h), c.y = Go(u, p), Ps({
     type: QB,
     role: mWe,
-    key: xo,
+    key: ho,
     from: r,
     encode: x
   }, n);
@@ -76521,7 +76521,7 @@ function YYe(t, e, n, r, i, s) {
   g.mult = l, g.offset = hr(o("labelPadding") || 0), g.offset.mult = l;
   const y = {
     scale: a,
-    field: xo,
+    field: ho,
     band: 0.5,
     offset: Mue(s.offset, o("labelOffset"))
   }, E = pr(u, p ? K7(a, c, '"left"', '"right"', '"center"') : {
@@ -76537,7 +76537,7 @@ function YYe(t, e, n, r, i, s) {
   }, _ = {
     enter: S,
     update: m = {
-      opacity: ho,
+      opacity: po,
       text: {
         field: qB
       },
@@ -76584,7 +76584,7 @@ function YYe(t, e, n, r, i, s) {
     type: Bd,
     role: gWe,
     style: tA,
-    key: xo,
+    key: ho,
     from: r,
     encode: _,
     overlap: C
@@ -76602,7 +76602,7 @@ function KYe(t, e, n, r) {
       }
     },
     update: a = lt({}, u, {
-      opacity: ho,
+      opacity: po,
       text: hr(t.title)
     }),
     exit: {
@@ -77733,8 +77733,8 @@ var Kue = { exports: {} };
               ie = ie.charAt(0) + ie.substr(2, V) + "." + ie.substr(2 + V), ie = ie.replace(/^0+([1-9])/, "$1").replace(/^0+\./, "0.");
             ie = ie.replace(/\+-/, "-");
           }
-          ie = ie.replace(/^([+-]?)(\d*)\.(\d*)[Ee]/, function(ze, nt, gt, rt) {
-            return nt + gt + rt.substr(0, (V + fe) % V) + "." + rt.substr(fe) + "E";
+          ie = ie.replace(/^([+-]?)(\d*)\.(\d*)[Ee]/, function(ze, nt, mt, rt) {
+            return nt + mt + rt.substr(0, (V + fe) % V) + "." + rt.substr(fe) + "E";
           });
         } else
           ie = ee.toExponential(ke);
@@ -77792,23 +77792,23 @@ var Kue = { exports: {} };
           return L(ee, ie);
         if (ee.charCodeAt(0) === 36)
           return "$" + ue(Ee, ee.substr(ee.charAt(1) == " " ? 2 : 1), ie);
-        var V, fe, we, ze, nt = Math.abs(ie), gt = ie < 0 ? "-" : "";
+        var V, fe, we, ze, nt = Math.abs(ie), mt = ie < 0 ? "-" : "";
         if (ee.match(/^00+$/))
-          return gt + h(nt, ee.length);
+          return mt + h(nt, ee.length);
         if (ee.match(/^[#?]+$/))
           return V = h(ie, 0), V === "0" && (V = ""), V.length > ee.length ? V : ce(ee.substr(0, ee.length - V.length)) + V;
         if (fe = ee.match(H))
-          return M(fe, nt, gt);
+          return M(fe, nt, mt);
         if (ee.match(/^#+0+$/))
-          return gt + h(nt, ee.length - ee.indexOf("0"));
+          return mt + h(nt, ee.length - ee.indexOf("0"));
         if (fe = ee.match(xe))
           return V = Be(ie, fe[1].length).replace(/^([^\.]+)$/, "$1." + ce(fe[1])).replace(/\.$/, "." + ce(fe[1])).replace(/\.(\d*)$/, function(gs, vp) {
             return "." + vp + o("0", ce(fe[1]).length - vp.length);
           }), ee.indexOf("0.") !== -1 ? V : V.replace(/^0\./, ".");
         if (ee = ee.replace(/^#+([0.])/, "$1"), fe = ee.match(/^(0*)\.(#*)$/))
-          return gt + Be(nt, fe[2].length).replace(/\.(\d*[1-9])0*$/, ".$1").replace(/^(-?\d*)$/, "$1.").replace(/^0\./, fe[1].length ? "0." : ".");
+          return mt + Be(nt, fe[2].length).replace(/\.(\d*[1-9])0*$/, ".$1").replace(/^(-?\d*)$/, "$1.").replace(/^0\./, fe[1].length ? "0." : ".");
         if (fe = ee.match(/^#{1,3},##0(\.?)$/))
-          return gt + oe(h(nt, 0));
+          return mt + oe(h(nt, 0));
         if (fe = ee.match(/^#,##0\.([#0]*0)$/))
           return ie < 0 ? "-" + ue(Ee, ee, -ie) : oe("" + (Math.floor(ie) + Rt(ie, fe[1].length))) + "." + u(st(ie, fe[1].length), fe[1].length);
         if (fe = ee.match(/^#,#*,#0/))
@@ -77821,9 +77821,9 @@ var Kue = { exports: {} };
           return V = ue(Ee, "##########", ie), "(" + V.substr(0, 3) + ") " + V.substr(3, 3) + "-" + V.substr(6);
         var rt = "";
         if (fe = ee.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return we = Math.min(fe[4].length, 7), ze = _(nt, Math.pow(10, we) - 1, !1), V = "" + gt, rt = ne("n", fe[1], ze[1]), rt.charAt(rt.length - 1) == " " && (rt = rt.substr(0, rt.length - 1) + "0"), V += rt + fe[2] + "/" + fe[3], rt = l(ze[2], we), rt.length < fe[4].length && (rt = ce(fe[4].substr(fe[4].length - rt.length)) + rt), V += rt, V;
+          return we = Math.min(fe[4].length, 7), ze = _(nt, Math.pow(10, we) - 1, !1), V = "" + mt, rt = ne("n", fe[1], ze[1]), rt.charAt(rt.length - 1) == " " && (rt = rt.substr(0, rt.length - 1) + "0"), V += rt + fe[2] + "/" + fe[3], rt = l(ze[2], we), rt.length < fe[4].length && (rt = ce(fe[4].substr(fe[4].length - rt.length)) + rt), V += rt, V;
         if (fe = ee.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return we = Math.min(Math.max(fe[1].length, fe[4].length), 7), ze = _(nt, Math.pow(10, we) - 1, !0), gt + (ze[0] || (ze[1] ? "" : "0")) + " " + (ze[1] ? a(ze[1], we) + fe[2] + "/" + fe[3] + l(ze[2], we) : o(" ", 2 * we + 1 + fe[2].length + fe[3].length));
+          return we = Math.min(Math.max(fe[1].length, fe[4].length), 7), ze = _(nt, Math.pow(10, we) - 1, !0), mt + (ze[0] || (ze[1] ? "" : "0")) + " " + (ze[1] ? a(ze[1], we) + fe[2] + "/" + fe[3] + l(ze[2], we) : o(" ", 2 * we + 1 + fe[2].length + fe[3].length));
         if (fe = ee.match(/^[#0?]+$/))
           return V = h(ie, 0), ee.length <= V.length ? V : ce(ee.substr(0, ee.length - V.length)) + V;
         if (fe = ee.match(/^([#0?]+)\.([#0]+)$/)) {
@@ -77842,7 +77842,7 @@ var Kue = { exports: {} };
           case "##,###":
           case "#,###":
             var Ap = oe(h(nt, 0));
-            return Ap !== "0" ? gt + Ap : "";
+            return Ap !== "0" ? mt + Ap : "";
           case "###,###.00":
             return ue(Ee, "###,##0.00", ie).replace(/^0\./, ".");
           case "#,###.00":
@@ -77873,8 +77873,8 @@ var Kue = { exports: {} };
             var we = Math.floor(Math.log(ee) * Math.LOG10E);
             ie.indexOf(".") === -1 ? ie = ie.charAt(0) + "." + ie.substr(1) + "E+" + (we - ie.length + fe) : ie += "E+" + (we - fe), ie = ie.replace(/\+-/, "-");
           }
-          ie = ie.replace(/^([+-]?)(\d*)\.(\d*)[Ee]/, function(ze, nt, gt, rt) {
-            return nt + gt + rt.substr(0, (V + fe) % V) + "." + rt.substr(fe) + "E";
+          ie = ie.replace(/^([+-]?)(\d*)\.(\d*)[Ee]/, function(ze, nt, mt, rt) {
+            return nt + mt + rt.substr(0, (V + fe) % V) + "." + rt.substr(fe) + "E";
           });
         } else
           ie = ee.toExponential(ke);
@@ -77893,23 +77893,23 @@ var Kue = { exports: {} };
           return Ue(ee, ie);
         if (ee.charCodeAt(0) === 36)
           return "$" + Le(Ee, ee.substr(ee.charAt(1) == " " ? 2 : 1), ie);
-        var V, fe, we, ze, nt = Math.abs(ie), gt = ie < 0 ? "-" : "";
+        var V, fe, we, ze, nt = Math.abs(ie), mt = ie < 0 ? "-" : "";
         if (ee.match(/^00+$/))
-          return gt + u(nt, ee.length);
+          return mt + u(nt, ee.length);
         if (ee.match(/^[#?]+$/))
           return V = "" + ie, ie === 0 && (V = ""), V.length > ee.length ? V : ce(ee.substr(0, ee.length - V.length)) + V;
         if (fe = ee.match(H))
-          return K(fe, nt, gt);
+          return K(fe, nt, mt);
         if (ee.match(/^#+0+$/))
-          return gt + u(nt, ee.length - ee.indexOf("0"));
+          return mt + u(nt, ee.length - ee.indexOf("0"));
         if (fe = ee.match(xe))
           return V = ("" + ie).replace(/^([^\.]+)$/, "$1." + ce(fe[1])).replace(/\.$/, "." + ce(fe[1])), V = V.replace(/\.(\d*)$/, function(gs, vp) {
             return "." + vp + o("0", ce(fe[1]).length - vp.length);
           }), ee.indexOf("0.") !== -1 ? V : V.replace(/^0\./, ".");
         if (ee = ee.replace(/^#+([0.])/, "$1"), fe = ee.match(/^(0*)\.(#*)$/))
-          return gt + ("" + nt).replace(/\.(\d*[1-9])0*$/, ".$1").replace(/^(-?\d*)$/, "$1.").replace(/^0\./, fe[1].length ? "0." : ".");
+          return mt + ("" + nt).replace(/\.(\d*[1-9])0*$/, ".$1").replace(/^(-?\d*)$/, "$1.").replace(/^0\./, fe[1].length ? "0." : ".");
         if (fe = ee.match(/^#{1,3},##0(\.?)$/))
-          return gt + oe("" + nt);
+          return mt + oe("" + nt);
         if (fe = ee.match(/^#,##0\.([#0]*0)$/))
           return ie < 0 ? "-" + Le(Ee, ee, -ie) : oe("" + ie) + "." + o("0", fe[1].length);
         if (fe = ee.match(/^#,#*,#0/))
@@ -77922,9 +77922,9 @@ var Kue = { exports: {} };
           return V = Le(Ee, "##########", ie), "(" + V.substr(0, 3) + ") " + V.substr(3, 3) + "-" + V.substr(6);
         var rt = "";
         if (fe = ee.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return we = Math.min(fe[4].length, 7), ze = _(nt, Math.pow(10, we) - 1, !1), V = "" + gt, rt = ne("n", fe[1], ze[1]), rt.charAt(rt.length - 1) == " " && (rt = rt.substr(0, rt.length - 1) + "0"), V += rt + fe[2] + "/" + fe[3], rt = l(ze[2], we), rt.length < fe[4].length && (rt = ce(fe[4].substr(fe[4].length - rt.length)) + rt), V += rt, V;
+          return we = Math.min(fe[4].length, 7), ze = _(nt, Math.pow(10, we) - 1, !1), V = "" + mt, rt = ne("n", fe[1], ze[1]), rt.charAt(rt.length - 1) == " " && (rt = rt.substr(0, rt.length - 1) + "0"), V += rt + fe[2] + "/" + fe[3], rt = l(ze[2], we), rt.length < fe[4].length && (rt = ce(fe[4].substr(fe[4].length - rt.length)) + rt), V += rt, V;
         if (fe = ee.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return we = Math.min(Math.max(fe[1].length, fe[4].length), 7), ze = _(nt, Math.pow(10, we) - 1, !0), gt + (ze[0] || (ze[1] ? "" : "0")) + " " + (ze[1] ? a(ze[1], we) + fe[2] + "/" + fe[3] + l(ze[2], we) : o(" ", 2 * we + 1 + fe[2].length + fe[3].length));
+          return we = Math.min(Math.max(fe[1].length, fe[4].length), 7), ze = _(nt, Math.pow(10, we) - 1, !0), mt + (ze[0] || (ze[1] ? "" : "0")) + " " + (ze[1] ? a(ze[1], we) + fe[2] + "/" + fe[3] + l(ze[2], we) : o(" ", 2 * we + 1 + fe[2].length + fe[3].length));
         if (fe = ee.match(/^[#0?]+$/))
           return V = "" + ie, ee.length <= V.length ? V : ce(ee.substr(0, ee.length - V.length)) + V;
         if (fe = ee.match(/^([#0]+)\.([#0]+)$/)) {
@@ -77941,7 +77941,7 @@ var Kue = { exports: {} };
           case "##,###":
           case "#,###":
             var Ap = oe("" + nt);
-            return Ap !== "0" ? gt + Ap : "";
+            return Ap !== "0" ? mt + Ap : "";
           default:
             if (ee.match(/\.[0#?]*$/))
               return Le(Ee, ee.slice(0, ee.lastIndexOf(".")), ie) + ce(ee.slice(ee.lastIndexOf(".")));
@@ -78970,7 +78970,7 @@ function uZe(t, e) {
     r.has("number") ? n = oS.format(r.text("number"), e) : n = e.toLocaleString();
   return n;
 }
-var aZe = /* @__PURE__ */ kn("<a target=_blank>");
+var aZe = /* @__PURE__ */ Fn("<a target=_blank>");
 function lZe(t, e) {
   const {
     tag: n
@@ -78989,7 +78989,7 @@ function lZe(t, e) {
   const a = r.replace(/\//g, "/‌");
   return (() => {
     var l = aZe();
-    return zu(l, "href", u), Vt(l, a), l;
+    return zu(l, "href", u), zt(l, a), l;
   })();
 }
 Array.prototype.flat || Object.defineProperty(Array.prototype, "flat", { configurable: !0, value: function t() {
@@ -79239,7 +79239,7 @@ function Q3(t, e) {
     Je(t, r) && (n[r] = t[r]);
   return n;
 }
-function po(t, e) {
+function go(t, e) {
   const n = Object.assign({}, t);
   for (const r of e)
     delete n[r];
@@ -79324,7 +79324,7 @@ function hG(t) {
 function Cae(t, e) {
   return t === void 0 || e === void 0 ? !0 : bae(hG(t), hG(e));
 }
-function zt(t) {
+function Ht(t) {
   return Te(t).length === 0;
 }
 const Te = Object.keys, Oi = Object.values, Vx = Object.entries;
@@ -79342,7 +79342,7 @@ function IF(t, e) {
   if (e.length === 0)
     return !0;
   const n = e.shift();
-  return n in t && IF(t[n], e) && delete t[n], zt(t);
+  return n in t && IF(t[n], e) && delete t[n], Ht(t);
 }
 function pO(t) {
   return t.charAt(0).toUpperCase() + t.substr(1);
@@ -79405,7 +79405,7 @@ var rA = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-const Cl = "row", Tl = "column", gO = "facet", yn = "x", mr = "y", hu = "x2", Ba = "y2", Kc = "xOffset", cp = "yOffset", ka = "radius", s0 = "radius2", pu = "theta", o0 = "theta2", Pa = "latitude", Ma = "longitude", gu = "latitude2", vo = "longitude2", us = "color", ja = "fill", Ua = "stroke", as = "shape", u0 = "size", Pd = "angle", a0 = "opacity", Xc = "fillOpacity", Jc = "strokeOpacity", Zc = "strokeWidth", ef = "strokeDash", iA = "text", sA = "order", oA = "detail", mO = "key", Yx = "tooltip", yO = "href", EO = "url", AO = "description", CZe = {
+const Cl = "row", Tl = "column", gO = "facet", yn = "x", mr = "y", hu = "x2", Ba = "y2", Kc = "xOffset", cp = "yOffset", ka = "radius", s0 = "radius2", pu = "theta", o0 = "theta2", Pa = "latitude", Ma = "longitude", gu = "latitude2", So = "longitude2", us = "color", ja = "fill", Ua = "stroke", as = "shape", u0 = "size", Pd = "angle", a0 = "opacity", Xc = "fillOpacity", Jc = "strokeOpacity", Zc = "strokeWidth", ef = "strokeDash", iA = "text", sA = "order", oA = "detail", mO = "key", Yx = "tooltip", yO = "href", EO = "url", AO = "description", CZe = {
   x: 1,
   y: 1,
   x2: 1,
@@ -79433,7 +79433,7 @@ function TZe(t) {
       return "y2";
     case Ma:
       return "x";
-    case vo:
+    case So:
       return "x2";
   }
 }
@@ -79473,14 +79473,14 @@ const Dae = {
   row: 1,
   column: 1,
   facet: 1
-}, ao = Te(Dae), uk = Object.assign(Object.assign({}, ok), Dae), NZe = Te(uk), DZe = rA(uk, ["order", "detail", "tooltip"]), FZe = rA(DZe, ["row", "column", "facet"]);
+}, lo = Te(Dae), uk = Object.assign(Object.assign({}, ok), Dae), NZe = Te(uk), DZe = rA(uk, ["order", "detail", "tooltip"]), FZe = rA(DZe, ["row", "column", "facet"]);
 function wZe(t) {
   return !!FZe[t];
 }
 function Fae(t) {
   return !!uk[t];
 }
-const LZe = [hu, Ba, gu, vo, o0, s0];
+const LZe = [hu, Ba, gu, So, o0, s0];
 function wae(t) {
   return Md(t) !== t;
 }
@@ -79492,7 +79492,7 @@ function Md(t) {
       return mr;
     case gu:
       return Pa;
-    case vo:
+    case So:
       return Ma;
     case o0:
       return pu;
@@ -79524,7 +79524,7 @@ function l0(t) {
     case Pa:
       return gu;
     case Ma:
-      return vo;
+      return So;
     case pu:
       return o0;
     case ka:
@@ -79669,7 +79669,7 @@ function zZe(t) {
     case hu:
     case Ba:
     case gu:
-    case vo:
+    case So:
       return {
         area: "always",
         bar: "always",
@@ -79760,7 +79760,7 @@ function X7(t) {
     case Pa:
     case Ma:
     case gu:
-    case vo:
+    case So:
     case oA:
     case mO:
     case sA:
@@ -81086,7 +81086,7 @@ function Ik({ channel: t, channelDef: e, channel2Def: n, markDef: r, config: i,
   if (e) {
     if (it(e)) {
       const x = o == null ? void 0 : o.get("type");
-      if (So(e)) {
+      if (_o(e)) {
         c ?? (c = Dle({
           fieldDef: e,
           fieldDef2: n,
@@ -81305,7 +81305,7 @@ function Fle({ channel: t, fieldDef: e, fieldDef2: n, markDef: r, config: i, sca
     return s ? yr(s) ? ((u = i[r.type]) === null || u === void 0 ? void 0 : u.discreteBandSize) || { band: 1 } : (a = i[r.type]) === null || a === void 0 ? void 0 : a.continuousBandSize : (l = i[r.type]) === null || l === void 0 ? void 0 : l.discreteBandSize;
 }
 function wle(t, e, n, r) {
-  return Xt(t.bin) || t.timeUnit && So(t) && t.type === "temporal" ? Dle({ fieldDef: t, fieldDef2: e, markDef: n, config: r }) !== void 0 : !1;
+  return Xt(t.bin) || t.timeUnit && _o(t) && t.type === "temporal" ? Dle({ fieldDef: t, fieldDef2: e, markDef: n, config: r }) !== void 0 : !1;
 }
 function wO(t) {
   return t && "condition" in t;
@@ -81332,7 +81332,7 @@ function za(t) {
   return t && "datum" in t;
 }
 function qu(t) {
-  return So(t) && !p_(t) || UF(t);
+  return _o(t) && !p_(t) || UF(t);
 }
 function UF(t) {
   return za(t) && sn(t.datum);
@@ -81340,7 +81340,7 @@ function UF(t) {
 function it(t) {
   return Ie(t) || za(t);
 }
-function So(t) {
+function _o(t) {
   return t && ("field" in t || t.aggregate === "count") && "type" in t;
 }
 function tu(t) {
@@ -81359,7 +81359,7 @@ function Ile(t) {
   return t && ("format" in t || "formatType" in t);
 }
 function ynt(t) {
-  return po(t, ["legend", "axis", "header", "scale"]);
+  return go(t, ["legend", "axis", "header", "scale"]);
 }
 function Ent(t) {
   return "op" in t;
@@ -81552,14 +81552,14 @@ function Tnt(t) {
 }
 function qk(t, e, { compositeMark: n = !1 } = {}) {
   const { aggregate: r, timeUnit: i, bin: s, field: o } = t, u = Object.assign({}, t);
-  if (!n && r && !fk(r) && !nf(r) && !jl(r) && (Ce(Ret(r)), delete u.aggregate), i && (u.timeUnit = $i(i)), o && (u.field = `${o}`), Xt(s) && (u.bin = IO(s, e)), yi(s) && !wr(e) && Ce(utt(e)), So(u)) {
+  if (!n && r && !fk(r) && !nf(r) && !jl(r) && (Ce(Ret(r)), delete u.aggregate), i && (u.timeUnit = $i(i)), o && (u.field = `${o}`), Xt(s) && (u.bin = IO(s, e)), yi(s) && !wr(e) && Ce(utt(e)), _o(u)) {
     const { type: a } = u, l = Ftt(a);
     a !== l && (u.type = l), a !== "quantitative" && Mae(r) && (Ce(Oet(a, r)), u.type = "quantitative");
   } else if (!wae(e)) {
     const a = Cnt(u, e);
     u.type = a;
   }
-  if (So(u)) {
+  if (_o(u)) {
     const { compatible: a, warning: l } = Ont(u, e) || {};
     a === !1 && Ce(l);
   }
@@ -81621,7 +81621,7 @@ function Ont(t, e) {
     case AO:
       return ph;
     case Ma:
-    case vo:
+    case So:
     case Pa:
     case gu:
       return n !== Xx ? {
@@ -82020,7 +82020,7 @@ function Hle(t, e) {
             };
             l && (A.field = l), s.push(A);
           }
-        } else if (n.push(g), So(u) && Xt(f)) {
+        } else if (n.push(g), _o(u) && Xt(f)) {
           if (r.push({ bin: f, field: l, as: g }), n.push($e(u, { binSuffix: "end" })), fA(u, a) && n.push($e(u, { binSuffix: "range" })), wr(a)) {
             const E = {
               field: `${g}_end`
@@ -82034,7 +82034,7 @@ function Hle(t, e) {
             field: l,
             as: g
           });
-          const E = So(u) && u.type !== J2 && "time";
+          const E = _o(u) && u.type !== J2 && "time";
           E && (a === iA || a === Yx ? y.formatType = E : MZe(a) ? y.legend = Object.assign({ formatType: E }, y.legend) : wr(a) && (y.axis = Object.assign({ formatType: E }, y.axis)));
         }
         o[a] = y;
@@ -82162,7 +82162,7 @@ function Qle(t, e) {
       case Pa:
       case Ma:
       case gu:
-      case vo:
+      case So:
       case iA:
       case as:
       case Pd:
@@ -82417,10 +82417,10 @@ function Xle(t, { config: e }) {
       }
     ],
     layer: ne
-  }, B = lS(O, ["tooltip"]), { scale: T, axis: N } = g, $ = Qk(g), z = po(N, ["title"]), L = Wle(l, "outliers", e.boxplot, {
+  }, B = lS(O, ["tooltip"]), { scale: T, axis: N } = g, $ = Qk(g), z = go(N, ["title"]), L = Wle(l, "outliers", e.boxplot, {
     transform: [{ filter: `(${U} < ${D}) || (${U} > ${k})` }],
     mark: "point",
-    encoding: Object.assign(Object.assign(Object.assign({ [y]: Object.assign(Object.assign(Object.assign({ field: g.field, type: g.type }, $ !== void 0 ? { title: $ } : {}), T !== void 0 ? { scale: T } : {}), zt(z) ? {} : { axis: z }) }, B), C ? { color: C } : {}), b ? { tooltip: b } : {})
+    encoding: Object.assign(Object.assign(Object.assign({ [y]: Object.assign(Object.assign(Object.assign({ field: g.field, type: g.type }, $ !== void 0 ? { title: $ } : {}), T !== void 0 ? { scale: T } : {}), Ht(z) ? {} : { axis: z }) }, B), C ? { color: C } : {}), b ? { tooltip: b } : {})
   })[0];
   let H;
   const M = [...h, ...p, Y];
@@ -83203,7 +83203,7 @@ const grt = [
 function f0e(t = {}) {
   const { color: e, font: n, fontSize: r, selection: i } = t, s = lrt(t, ["color", "font", "fontSize", "selection"]), o = kL({}, at(frt), n ? hrt(n) : {}, e ? xrt(e) : {}, r ? drt(r) : {}, s || {});
   i && x6(o, "selection", i, !0);
-  const u = po(o, grt);
+  const u = go(o, grt);
   for (const a of ["background", "lineBreak", "padding"])
     o[a] && (u[a] = Ts(o[a]));
   for (const a of Ale)
@@ -83273,22 +83273,22 @@ function Art(t) {
     delete t[e];
   vrt(t);
   for (const e in t)
-    He(t[e]) && zt(t[e]) && delete t[e];
-  return zt(t) ? void 0 : t;
+    He(t[e]) && Ht(t[e]) && delete t[e];
+  return Ht(t) ? void 0 : t;
 }
 function vrt(t) {
   const { titleMarkConfig: e, subtitleMarkConfig: n, subtitle: r } = Uae(t.title);
-  zt(e) || (t.style["group-title"] = Object.assign(
+  Ht(e) || (t.style["group-title"] = Object.assign(
     Object.assign({}, t.style["group-title"]),
     e
     // config.title has higher precedence than config.style.group-title in Vega
-  )), zt(n) || (t.style["group-subtitle"] = Object.assign(Object.assign({}, t.style["group-subtitle"]), n)), zt(r) ? delete t.title : t.title = r;
+  )), Ht(n) || (t.style["group-subtitle"] = Object.assign(Object.assign({}, t.style["group-subtitle"]), n)), Ht(r) ? delete t.title : t.title = r;
 }
 function Srt(t, e, n, r) {
   const i = r ? t[e][r] : t[e];
   e === "view" && (n = "cell");
   const s = Object.assign(Object.assign({}, i), t.style[n ?? e]);
-  zt(s) || (t.style[n ?? e] = s), r || delete t[e];
+  Ht(s) || (t.style[n ?? e] = s), r || delete t[e];
 }
 function MO(t) {
   return "layer" in t;
@@ -83465,7 +83465,7 @@ function wrt(t) {
   for (const e of ["line", "area", "rule", "trail"])
     t[e] && (t = Object.assign(Object.assign({}, t), {
       // TODO: remove as any
-      [e]: po(t[e], ["point", "line"])
+      [e]: go(t[e], ["point", "line"])
     }));
   return t;
 }
@@ -83501,7 +83501,7 @@ class Lrt {
       Object.assign(Object.assign({}, s ? { params: s } : {}), {
         mark: Frt(Object.assign(Object.assign({}, f.type === "area" && f.opacity === void 0 && f.fillOpacity === void 0 ? { opacity: 0.7 } : {}), f)),
         // drop shape from encoding as this might be used to trigger point overlay
-        encoding: po(c, ["shape"])
+        encoding: go(c, ["shape"])
       })
     ], m = x0e(f, c);
     let g = c;
@@ -83660,7 +83660,7 @@ class krt extends eP {
   mapNonLayerRepeat(e, n) {
     var r;
     const { repeat: i, spec: s, data: o } = e, u = m0(e, ["repeat", "spec", "data"]);
-    !be(i) && e.columns && (e = po(e, ["columns"]), Ce(SG("repeat")));
+    !be(i) && e.columns && (e = go(e, ["columns"]), Ce(SG("repeat")));
     const a = [], { repeater: l = {}, repeaterPrefix: c = "" } = n, f = !be(i) && i.row || [l ? l.row : null], x = !be(i) && i.column || [l ? l.column : null], h = be(i) && i || [l ? l.repeat : null];
     for (const m of h)
       for (const g of f)
@@ -83671,7 +83671,7 @@ class krt extends eP {
             column: y,
             layer: l.layer
           }, A = (s.name || "") + c + "child__" + (be(i) ? `${mn(m)}` : (i.row ? `row_${mn(g)}` : "") + (i.column ? `column_${mn(y)}` : "")), v = this.map(s, Object.assign(Object.assign({}, n), { repeater: E, repeaterPrefix: A }));
-          v.name = A, a.push(po(v, ["data"]));
+          v.name = A, a.push(go(v, ["data"]));
         }
     const p = be(i) ? e.columns : i.column ? i.column.length : 1;
     return Object.assign(Object.assign({ data: (r = s.data) !== null && r !== void 0 ? r : o, align: "all" }, u), {
@@ -83681,7 +83681,7 @@ class krt extends eP {
   }
   mapFacet(e, n) {
     const { facet: r } = e;
-    return lA(r) && e.columns && (e = po(e, ["columns"]), Ce(SG("facet"))), super.mapFacet(e, n);
+    return lA(r) && e.columns && (e = go(e, ["columns"]), Ce(SG("facet"))), super.mapFacet(e, n);
   }
   mapUnitWithParentEncodingOrProjection(e, n) {
     const { encoding: r, projection: i } = e, { parentEncoding: s, parentProjection: o, config: u } = n, a = QG({ parentProjection: o, projection: i }), l = HG({
@@ -83742,7 +83742,7 @@ function HG({ parentEncoding: t, encoding: e = {}, layer: n }) {
     }
   } else
     r = e;
-  return !r || zt(r) ? void 0 : r;
+  return !r || Ht(r) ? void 0 : r;
 }
 function QG(t) {
   const { parentProjection: e, projection: n } = t;
@@ -84320,7 +84320,7 @@ class ea extends qt {
       }
       return i;
     }, {});
-    return zt(r) ? null : new ea(e, r);
+    return Ht(r) ? null : new ea(e, r);
   }
   static makeFromTransform(e, n) {
     const r = Object.assign({}, n), { timeUnit: i } = r, s = YG(r, ["timeUnit"]), o = $i(i), u = Object.assign(Object.assign({}, s), { timeUnit: o });
@@ -84440,7 +84440,7 @@ const _it = {
       const g = { type: "E", field: m };
       g.signals = Object.assign({}, l(g, "data")), s.items.push(g), s.hasField[m] = g;
     }
-    x && (e.init = x.map((m) => s.items.map((g) => He(m) ? m[g.channel] !== void 0 ? m[g.channel] : m[g.field] : m))), zt(u) || (s.timeUnit = new ea(null, u));
+    x && (e.init = x.map((m) => s.items.map((g) => He(m) ? m[g.channel] !== void 0 ? m[g.channel] : m[g.field] : m))), Ht(u) || (s.timeUnit = new ea(null, u));
   },
   signals: (t, e, n) => {
     const r = e.name + dA;
@@ -84703,7 +84703,7 @@ function O0e(t, e = {}) {
 function R0e(t, e, n, { reactiveGeom: r } = {}) {
   const i = {}, s = r ? "datum.datum" : "datum", o = [];
   function u(l, c) {
-    const f = Md(c), x = So(l) ? l : Object.assign(Object.assign({}, l), {
+    const f = Md(c), x = _o(l) ? l : Object.assign(Object.assign({}, l), {
       type: t[f].type
       // for secondary field def, copy type from main channel
     }), h = x.title || Uk(x, n), p = Pe(h).join(", ");
@@ -84762,7 +84762,7 @@ function Dit(t) {
   if (r.aria === !1)
     return {};
   const u = R0e(e, i, r);
-  if (!zt(u))
+  if (!Ht(u))
     return {
       description: {
         signal: Vx(u).map(([a, l], c) => `"${c > 0 ? "; " : ""}${a}: " + (${l})`).join(" + ")
@@ -85138,7 +85138,7 @@ function XG({ fieldDef: t, scaleName: e, bandPosition: n, offset: r }) {
   });
 }
 const jit = /* @__PURE__ */ new Set(["aria", "width", "height"]);
-function To(t, e) {
+function Oo(t, e) {
   const { fill: n = void 0, stroke: r = void 0 } = e.color === "include" ? N0e(t) : {};
   return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Uit(t.markDef, e)), JG(t, "fill", n)), JG(t, "stroke", r)), lr("opacity", t)), lr("fillOpacity", t)), lr("strokeOpacity", t)), lr("strokeWidth", t)), lr("strokeDash", t)), Fit(t)), O0e(t)), iP(t, "href")), Rit(t));
 }
@@ -85448,7 +85448,7 @@ function r1(t, { escape: e } = { escape: !0 }) {
   const r = Yit(t);
   if (r) {
     const { facet: i } = r;
-    for (const s of ao)
+    for (const s of lo)
       i[s] && (n += ` + '__facet_${s}_' + (facet[${Fe(r.vgField(s))}])`);
   }
   return n;
@@ -85617,7 +85617,7 @@ function wm(t, e, n, r = { header: !1 }) {
         return;
       if (h.encode) {
         const { grid: p } = h.encode;
-        h.encode = Object.assign({}, p ? { grid: p } : {}), zt(h.encode) && delete h.encode;
+        h.encode = Object.assign({}, p ? { grid: p } : {}), Ht(h.encode) && delete h.encode;
       }
       return Object.assign(Object.assign({
         scale: l,
@@ -85644,7 +85644,7 @@ function wm(t, e, n, r = { header: !1 }) {
       if (h.labelAlign === null && delete h.labelAlign, h.encode) {
         for (const m of jle)
           t.hasAxisPart(m) || delete h.encode[m];
-        zt(h.encode) && delete h.encode;
+        Ht(h.encode) && delete h.encode;
       }
       const p = Jit(f, n);
       return Object.assign(Object.assign(Object.assign(Object.assign({
@@ -86059,14 +86059,14 @@ function gst(t, e) {
 }
 function mst(t, e) {
   const n = {};
-  for (const r of ao) {
+  for (const r of lo) {
     const i = t[r];
     if (i != null && i.facetFieldDef) {
       const { titleAnchor: s, titleOrient: o } = HO(["titleAnchor", "titleOrient"], i.facetFieldDef.header, e, r), u = zO(r, o), a = gst(s, u);
       a !== void 0 && (n[u] = a);
     }
   }
-  return zt(n) ? void 0 : n;
+  return Ht(n) ? void 0 : n;
 }
 function J0e(t, e, n, r, i) {
   const s = {};
@@ -86213,7 +86213,7 @@ function Ast(t, { fieldOrDatumDef: e, model: n, channel: r, legendCmpt: i, legen
       tn(g.legend.unselectedOpacity)
     ] : b && (A.opacity = tn(b));
   }
-  return A = Object.assign(Object.assign({}, A), t), zt(A) ? void 0 : A;
+  return A = Object.assign(Object.assign({}, A), t), Ht(A) ? void 0 : A;
 }
 function vst(t, { model: e, legendType: n, legendCmpt: r }) {
   var i;
@@ -86222,7 +86222,7 @@ function vst(t, { model: e, legendType: n, legendCmpt: r }) {
   const { config: s, markDef: o, encoding: u } = e;
   let a = {};
   const c = ((i = r.get("gradientOpacity")) !== null && i !== void 0 ? i : s.legend.gradientOpacity) === void 0 ? ice(u.opacity) || o.opacity : void 0;
-  return c && (a.opacity = tn(c)), a = Object.assign(Object.assign({}, a), t), zt(a) ? void 0 : a;
+  return c && (a.opacity = tn(c)), a = Object.assign(Object.assign({}, a), t), Ht(a) ? void 0 : a;
 }
 function Sst(t, { fieldOrDatumDef: e, model: n, channel: r, legendCmpt: i }) {
   const s = n.legend(r) || {}, o = n.config, u = Ie(e) ? oce(n, i, e) : void 0, a = u ? [{ test: u, value: 1 }, { value: o.legend.unselectedOpacity }] : void 0, { format: l, formatType: c } = s, f = Jx(c) ? Bk({
@@ -86232,7 +86232,7 @@ function Sst(t, { fieldOrDatumDef: e, model: n, channel: r, legendCmpt: i }) {
     formatType: c,
     config: o
   }) : void 0, x = Object.assign(Object.assign(Object.assign({}, a ? { opacity: a } : {}), f ? { text: f } : {}), t);
-  return zt(x) ? void 0 : x;
+  return Ht(x) ? void 0 : x;
 }
 function _st(t, { legendCmpt: e }) {
   const n = e.get("selections");
@@ -86437,9 +86437,9 @@ function $st(t, e) {
   const A = (r = s == null ? void 0 : s.encoding) !== null && r !== void 0 ? r : {}, v = c.get("selections"), S = {}, _ = { fieldOrDatumDef: h, model: t, channel: e, legendCmpt: c, legendType: g };
   for (const b of ["labels", "legend", "title", "symbols", "gradient", "entries"]) {
     const C = tce((i = A[b]) !== null && i !== void 0 ? i : {}, t), R = b in sW ? sW[b](C, _) : C;
-    R !== void 0 && !zt(R) && (S[b] = Object.assign(Object.assign(Object.assign({}, v != null && v.length && Ie(h) ? { name: `${mn(h.field)}_legend_${b}` } : {}), v != null && v.length ? { interactive: !!v } : {}), { update: R }));
+    R !== void 0 && !Ht(R) && (S[b] = Object.assign(Object.assign(Object.assign({}, v != null && v.length && Ie(h) ? { name: `${mn(h.field)}_legend_${b}` } : {}), v != null && v.length ? { interactive: !!v } : {}), { update: R }));
   }
-  return zt(S) || c.set("encode", S, !!(s != null && s.encoding)), c;
+  return Ht(S) || c.set("encode", S, !!(s != null && s.encoding)), c;
 }
 function Bst(t) {
   const { legends: e, resolve: n } = t.component;
@@ -86612,7 +86612,7 @@ function Qst(t) {
   const e = [], { encoding: n } = t;
   for (const r of [
     [Ma, Pa],
-    [vo, gu]
+    [So, gu]
   ])
     (Kn(n[r[0]]) || Kn(n[r[1]])) && e.push({
       signal: t.getName(`geojson_${e.length}`)
@@ -86717,13 +86717,13 @@ class ta extends qt {
   }
   static makeFromEncoding(e, n) {
     const r = n.reduceFieldDef((i, s, o) => {
-      if (So(s) && Xt(s.bin)) {
+      if (_o(s) && Xt(s.bin)) {
         const { key: u, binComponent: a } = aW(s, s.bin, n);
         i[u] = Object.assign(Object.assign(Object.assign({}, a), i[u]), Yst(n, s, o, n.config));
       }
       return i;
     }, {});
-    return zt(r) ? null : new ta(e, r);
+    return Ht(r) ? null : new ta(e, r);
   }
   /**
    * Creates a bin node from BinTransform.
@@ -86781,7 +86781,7 @@ class ta extends qt {
 function Jst(t, e, n, r) {
   var i;
   const s = jn(r) ? r.encoding[l0(e)] : void 0;
-  if (So(n) && jn(r) && wle(n, s, r.markDef, r.config))
+  if (_o(n) && jn(r) && wle(n, s, r.markDef, r.config))
     t.add($e(n, {})), t.add($e(n, { suffix: "end" })), n.bin && fA(n, e) && t.add($e(n, { binSuffix: "range" }));
   else if (OZe(e)) {
     const o = TZe(e);
@@ -86891,7 +86891,7 @@ class gp extends qt {
    */
   constructor(e, n, r, i) {
     super(e), this.model = n, this.name = r, this.data = i;
-    for (const s of ao) {
+    for (const s of lo) {
       const o = n.facet[s];
       if (o) {
         const { bin: u, sort: a } = o;
@@ -86902,20 +86902,20 @@ class gp extends qt {
   }
   hash() {
     let e = "Facet";
-    for (const n of ao)
+    for (const n of lo)
       this[n] && (e += ` ${n.charAt(0)}:${Tt(this[n])}`);
     return e;
   }
   get fields() {
     var e;
     const n = [];
-    for (const r of ao)
+    for (const r of lo)
       !((e = this[r]) === null || e === void 0) && e.fields && n.push(...this[r].fields);
     return n;
   }
   dependentFields() {
     const e = new Set(this.fields);
-    for (const n of ao)
+    for (const n of lo)
       this[n] && (this[n].sortField && e.add(this[n].sortField.field), this[n].sortIndexField && e.add(this[n].sortIndexField));
     return e;
   }
@@ -87063,7 +87063,7 @@ function not(t) {
     e1(r) ? e[r.field] = "date" : r.type === "quantitative" && WZe(r.aggregate) ? e[r.field] = "number" : G3(r.field) > 1 ? r.field in e || (e[r.field] = "flatten") : qd(r) && Zu(r.sort) && G3(r.sort.field) > 1 && (r.sort.field in e || (e[r.sort.field] = "flatten"));
   }
   if ((jn(t) || Vo(t)) && t.forEachFieldDef((r, i) => {
-    if (So(r))
+    if (_o(r))
       n(r);
     else {
       const s = Md(i), o = t.fieldDef(s);
@@ -87229,7 +87229,7 @@ class ed extends qt {
   constructor(e) {
     super(null), e ?? (e = { name: "source" });
     let n;
-    if (J0(e) || (n = e.format ? Object.assign({}, po(e.format, ["parse"])) : {}), Y3(e))
+    if (J0(e) || (n = e.format ? Object.assign({}, go(e.format, ["parse"])) : {}), Y3(e))
       this._data = { values: e.values };
     else if (t1(e)) {
       if (this._data = { url: e.url }, !n.type) {
@@ -87238,7 +87238,7 @@ class ed extends qt {
       }
     } else
       b0e(e) ? this._data = { values: [{ type: "Sphere" }] } : (S0e(e) || J0(e)) && (this._data = {});
-    this._generator = J0(e), e.name && (this._name = e.name), n && !zt(n) && (this._data.format = n);
+    this._generator = J0(e), e.name && (this._name = e.name), n && !Ht(n) && (this._data.format = n);
   }
   dependentFields() {
     return /* @__PURE__ */ new Set();
@@ -87403,7 +87403,7 @@ class cot extends zd {
       }
       for (const o of s)
         delete i[o];
-      if (!zt(i)) {
+      if (!Ht(i)) {
         this.setModified();
         const o = new Wr(e, i);
         for (const u of n) {
@@ -87746,7 +87746,7 @@ function iw(t) {
   }
   return !0;
 }
-function wo(t, e) {
+function Lo(t, e) {
   let n = !1;
   for (const r of e)
     n = t.optimize(r) || n;
@@ -87754,7 +87754,7 @@ function wo(t, e) {
 }
 function fW(t, e, n) {
   let r = t.sources, i = !1;
-  return i = wo(new aot(), r) || i, i = wo(new oot(e), r) || i, r = r.filter((s) => s.numChildren() > 0), i = wo(new fot(), r) || i, r = r.filter((s) => s.numChildren() > 0), n || (i = wo(new lot(), r) || i, i = wo(new hot(e), r) || i, i = wo(new uot(), r) || i, i = wo(new cot(), r) || i, i = wo(new dot(), r) || i, i = wo(new xot(), r) || i, i = wo(new sot(), r) || i, i = wo(new pot(), r) || i), t.sources = r, i;
+  return i = Lo(new aot(), r) || i, i = Lo(new oot(e), r) || i, r = r.filter((s) => s.numChildren() > 0), i = Lo(new fot(), r) || i, r = r.filter((s) => s.numChildren() > 0), n || (i = Lo(new lot(), r) || i, i = Lo(new hot(e), r) || i, i = Lo(new uot(), r) || i, i = Lo(new cot(), r) || i, i = Lo(new dot(), r) || i, i = Lo(new xot(), r) || i, i = Lo(new sot(), r) || i, i = Lo(new pot(), r) || i), t.sources = r, i;
 }
 function Eot(t, e) {
   iw(t.sources);
@@ -88212,7 +88212,7 @@ function Lot(t, e) {
   PF(s, "rangeMin") && be(c) && c.length === 2 ? Iu([a ?? c[0], l ?? c[1]]) : Ss(c);
 }
 function Iot(t) {
-  return Ptt(t) ? Object.assign({ scheme: t.name }, po(t, ["name"])) : { scheme: t };
+  return Ptt(t) ? Object.assign({ scheme: t.name }, go(t, ["name"])) : { scheme: t };
 }
 function $ot(t, e) {
   const { size: n, config: r, mark: i, encoding: s } = e, o = e.getSignalName.bind(e), { type: u } = Kn(s[t]), l = e.getScaleComponent(t).get("type"), { domain: c, domainMid: f } = e.specifiedScales[t];
@@ -88726,7 +88726,7 @@ class yP {
   }
   assembleGroupEncodeEntry(e) {
     let n = {};
-    return this.view && (n = this.assembleEncodeFromView(this.view)), !e && (this.description && (n.description = tn(this.description)), this.type === "unit" || this.type === "layer") ? Object.assign({ width: this.getSizeSignalRef("width"), height: this.getSizeSignalRef("height") }, n ?? {}) : zt(n) ? void 0 : n;
+    return this.view && (n = this.assembleEncodeFromView(this.view)), !e && (this.description && (n.description = tn(this.description)), this.type === "unit" || this.type === "layer") ? Object.assign({ width: this.getSizeSignalRef("width"), height: this.getSizeSignalRef("height") }, n ?? {}) : Ht(n) ? void 0 : n;
   }
   assembleLayout() {
     if (!this.layout)
@@ -88740,7 +88740,7 @@ class yP {
   assembleHeaderMarks() {
     const { layoutHeaders: e } = this.component;
     let n = [];
-    for (const r of ao)
+    for (const r of lo)
       e[r].title && n.push(fst(this, r));
     for (const r of aP)
       n = n.concat(xst(this, r));
@@ -88759,7 +88759,7 @@ class yP {
     var e, n, r;
     const i = (e = this.title) !== null && e !== void 0 ? e : {}, { encoding: s } = i, o = oD(i, ["encoding"]), u = Object.assign(Object.assign(Object.assign({}, Uae(this.config.title).nonMarkTitleProperties), o), s ? { encode: { update: s } } : {});
     if (u.text)
-      return Ot(["unit", "layer"], this.type) ? Ot(["middle", void 0], u.anchor) && ((n = u.frame) !== null && n !== void 0 || (u.frame = "group")) : (r = u.anchor) !== null && r !== void 0 || (u.anchor = "start"), zt(u) ? void 0 : u;
+      return Ot(["unit", "layer"], this.type) ? Ot(["middle", void 0], u.anchor) && ((n = u.frame) !== null && n !== void 0 || (u.frame = "group")) : (r = u.anchor) !== null && r !== void 0 || (u.anchor = "start"), Ht(u) ? void 0 : u;
   }
   /**
    * Assemble the mark group for this model. We accept optional `signals` so that we can include concat top-level signals with the top-level model's local signals.
@@ -89048,7 +89048,7 @@ class Wh extends qt {
     let r = 0;
     for (const i of [
       [Ma, Pa],
-      [vo, gu]
+      [So, gu]
     ]) {
       const s = i.map((o) => {
         const u = Kn(n.encoding[o]);
@@ -89097,12 +89097,12 @@ class J3 extends qt {
       return e;
     for (const r of [
       [Ma, Pa],
-      [vo, gu]
+      [So, gu]
     ]) {
       const i = r.map((o) => {
         const u = Kn(n.encoding[o]);
         return Ie(u) ? u.field : za(u) ? { expr: `${u.datum}` } : tu(u) ? { expr: `${u.value}` } : void 0;
-      }), s = r[0] === vo ? "2" : "";
+      }), s = r[0] === So ? "2" : "";
       (i[0] || i[1]) && (e = new J3(e, n.projectionName(), i, [
         n.getName(`x${s}`),
         n.getName(`y${s}`)
@@ -89451,7 +89451,7 @@ function uut(t) {
   return t === "top" || t === "left" || Ve(t) ? "header" : "footer";
 }
 function aut(t) {
-  for (const e of ao)
+  for (const e of lo)
     lut(t, e);
   yW(t, "x"), yW(t, "y");
 }
@@ -89631,7 +89631,7 @@ class e3 extends Tce {
   getHeaderLayoutMixins() {
     var e, n, r;
     const i = {};
-    for (const s of ao)
+    for (const s of lo)
       for (const o of lP) {
         const u = this.component.layoutHeaders[s], a = u[o], { facetFieldDef: l } = u;
         if (l) {
@@ -89698,7 +89698,7 @@ class e3 extends Tce {
   }
   assembleFacet() {
     const { name: e, data: n } = this.component.data.facetRoot, { row: r, column: i } = this.facet, { fields: s, ops: o, as: u } = this.getCardinalityAggregateForChild(), a = [];
-    for (const c of ao) {
+    for (const c of lo) {
       const f = this.facet[c];
       if (f) {
         a.push($e(f));
@@ -89757,8 +89757,8 @@ class e3 extends Tce {
       },
       // TODO: move this to after data
       sort: {
-        field: ao.map((a) => this.facetSortFields(a)).flat(),
-        order: ao.map((a) => this.facetSortOrder(a)).flat()
+        field: lo.map((a) => this.facetSortFields(a)).flat(),
+        order: lo.map((a) => this.facetSortOrder(a)).flat()
       }
     }), r.length > 0 ? { data: r } : {}), i ? { encode: { update: i } } : {}), e.assembleGroup(git(this, [])))];
   }
@@ -90161,9 +90161,9 @@ function Rut(t, e) {
     if (!o.hasAxisPart(A))
       return E;
     const S = tce((v = g[A]) !== null && v !== void 0 ? v : {}, e), _ = A === "labels" ? Aut(e, t, S) : S;
-    return _ !== void 0 && !zt(_) && (E[A] = { update: _ }), E;
+    return _ !== void 0 && !Ht(_) && (E[A] = { update: _ }), E;
   }, {});
-  return zt(y) || o.set("encode", y, !!s.encoding || s.labelAngle !== void 0), o;
+  return Ht(y) || o.set("encode", y, !!s.encoding || s.labelAngle !== void 0), o;
 }
 function Nut({ encoding: t, size: e }) {
   for (const n of qa) {
@@ -90257,7 +90257,7 @@ function Iut(t, e, n) {
 }
 const $ut = {
   vgMark: "arc",
-  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "include",
@@ -90267,7 +90267,7 @@ const $ut = {
   })), Gr("x", t, { defaultPos: "mid" })), Gr("y", t, { defaultPos: "mid" })), vc(t, "radius")), vc(t, "theta"))
 }, But = {
   vgMark: "area",
-  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "include",
@@ -90285,7 +90285,7 @@ const $ut = {
   })), oP(t))
 }, kut = {
   vgMark: "rect",
-  encodeEntry: (t) => Object.assign(Object.assign(Object.assign({}, To(t, {
+  encodeEntry: (t) => Object.assign(Object.assign(Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "include",
@@ -90295,7 +90295,7 @@ const $ut = {
   })), vc(t, "x")), vc(t, "y"))
 }, Put = {
   vgMark: "shape",
-  encodeEntry: (t) => Object.assign({}, To(t, {
+  encodeEntry: (t) => Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "include",
@@ -90309,7 +90309,7 @@ const $ut = {
   }
 }, Mut = {
   vgMark: "image",
-  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "ignore",
@@ -90319,7 +90319,7 @@ const $ut = {
   })), vc(t, "x")), vc(t, "y")), iP(t, "url"))
 }, jut = {
   vgMark: "line",
-  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "include",
@@ -90332,7 +90332,7 @@ const $ut = {
   })), oP(t))
 }, Uut = {
   vgMark: "trail",
-  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+  encodeEntry: (t) => Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "include",
@@ -90343,7 +90343,7 @@ const $ut = {
 };
 function vP(t, e) {
   const { config: n } = t;
-  return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+  return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "include",
@@ -90366,7 +90366,7 @@ const zut = {
   encodeEntry: (t) => vP(t, "square")
 }, Gut = {
   vgMark: "rect",
-  encodeEntry: (t) => Object.assign(Object.assign(Object.assign({}, To(t, {
+  encodeEntry: (t) => Object.assign(Object.assign(Object.assign({}, Oo(t, {
     align: "ignore",
     baseline: "ignore",
     color: "include",
@@ -90378,7 +90378,7 @@ const zut = {
   vgMark: "rule",
   encodeEntry: (t) => {
     const { markDef: e } = t, n = e.orient;
-    return !t.encoding.x && !t.encoding.y && !t.encoding.latitude && !t.encoding.longitude ? {} : Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+    return !t.encoding.x && !t.encoding.y && !t.encoding.latitude && !t.encoding.longitude ? {} : Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
       align: "ignore",
       baseline: "ignore",
       color: "include",
@@ -90404,7 +90404,7 @@ const zut = {
   vgMark: "text",
   encodeEntry: (t) => {
     const { config: e, encoding: n } = t;
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
       align: "include",
       baseline: "include",
       color: "include",
@@ -90429,7 +90429,7 @@ const Xut = {
   vgMark: "rect",
   encodeEntry: (t) => {
     const { config: e, markDef: n } = t, r = n.orient, i = r === "horizontal" ? "width" : "height", s = r === "horizontal" ? "height" : "width";
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, To(t, {
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Oo(t, {
       align: "ignore",
       baseline: "ignore",
       color: "include",
@@ -90520,10 +90520,10 @@ function tat(t) {
   t.stack.fieldChannel === "x" ? (o = Object.assign(Object.assign({}, Q3(n.encode.update, ["y", "yc", "y2", "height", ...$F])), { x: { signal: s("min", "datum") }, x2: { signal: s("max", "datum") }, clip: { value: !0 } }), u = {
     x: { field: { group: "x" }, mult: -1 },
     height: { field: { group: "height" } }
-  }, n.encode.update = Object.assign(Object.assign({}, po(n.encode.update, ["y", "yc", "y2"])), { height: { field: { group: "height" } } })) : (o = Object.assign(Object.assign({}, Q3(n.encode.update, ["x", "xc", "x2", "width"])), { y: { signal: s("min", "datum") }, y2: { signal: s("max", "datum") }, clip: { value: !0 } }), u = {
+  }, n.encode.update = Object.assign(Object.assign({}, go(n.encode.update, ["y", "yc", "y2"])), { height: { field: { group: "height" } } })) : (o = Object.assign(Object.assign({}, Q3(n.encode.update, ["x", "xc", "x2", "width"])), { y: { signal: s("min", "datum") }, y2: { signal: s("max", "datum") }, clip: { value: !0 } }), u = {
     y: { field: { group: "y" }, mult: -1 },
     width: { field: { group: "width" } }
-  }, n.encode.update = Object.assign(Object.assign({}, po(n.encode.update, ["x", "xc", "x2"])), { width: { field: { group: "width" } } }));
+  }, n.encode.update = Object.assign(Object.assign({}, go(n.encode.update, ["x", "xc", "x2"])), { width: { field: { group: "width" } } }));
   for (const c of $F) {
     const f = Kx(c, t.markDef, t.config);
     n.encode.update[c] ? (o[c] = n.encode.update[c], delete n.encode.update[c]) : f && (o[c] = tn(f)), f && (n.encode.update[c] = { value: 0 });
@@ -90781,7 +90781,7 @@ class Fce extends Tce {
   }
   typedFieldDef(e) {
     const n = this.fieldDef(e);
-    return So(n) ? n : null;
+    return _o(n) ? n : null;
   }
 }
 class _P extends yP {
@@ -90919,7 +90919,7 @@ function aat(t, e, n = {}, r) {
     ...u0e(f)
   ])), i ? { config: i } : {}), r ? { usermeta: r } : {});
 }
-var lat = /* @__PURE__ */ kn("<div>");
+var lat = /* @__PURE__ */ Fn("<div>");
 function cat(t) {
   let e, n = null;
   return n3(() => {
@@ -90938,7 +90938,7 @@ function fat(t) {
     field: e,
     data: n
   } = t, r = t.metadata.field(e).vegaChartProps, i = structuredClone(r.spec);
-  return i.data[0].values = n, yt(cat, {
+  return i.data[0].values = n, gt(cat, {
     spec: i,
     type: "vega",
     get width() {
@@ -91765,7 +91765,7 @@ function zce(t) {
     scrollToFn: Rat
   }, t));
 }
-var wat = /* @__PURE__ */ kn("<div class=cell-content>"), Lat = /* @__PURE__ */ kn('<div class="column-cell th">'), Iat = /* @__PURE__ */ kn('<div class="column-cell td">'), $at = /* @__PURE__ */ kn("<div style=position:sticky;left:0px;height:0px;visibility:hidden;>"), Bat = /* @__PURE__ */ kn("<div style=position:sticky;top:0px;left:0px;height:0px;visibility:hidden;>"), kat = /* @__PURE__ */ kn("<div class=pinned-header-row>"), Pat = /* @__PURE__ */ kn("<div class=table-row><div class=table-row>"), lD = /* @__PURE__ */ kn("<div class=table-row>"), Mat = /* @__PURE__ */ kn('<div class="table-row limit-row table-gutter-left table-gutter-right">Limiting nested table to <!> records'), jat = /* @__PURE__ */ kn("<div class=malloy-table>"), Uat = /* @__PURE__ */ kn("<div class=pinned-header-subrow>");
+var wat = /* @__PURE__ */ Fn("<div class=cell-content>"), Lat = /* @__PURE__ */ Fn('<div class="column-cell th">'), Iat = /* @__PURE__ */ Fn('<div class="column-cell td">'), $at = /* @__PURE__ */ Fn("<div style=position:sticky;left:0px;height:0px;visibility:hidden;>"), Bat = /* @__PURE__ */ Fn("<div style=position:sticky;top:0px;left:0px;height:0px;visibility:hidden;>"), kat = /* @__PURE__ */ Fn("<div class=pinned-header-row>"), Pat = /* @__PURE__ */ Fn("<div class=table-row><div class=table-row>"), lD = /* @__PURE__ */ Fn("<div class=table-row>"), Mat = /* @__PURE__ */ Fn('<div class="table-row limit-row table-gutter-left table-gutter-right">Limiting nested table to <!> records'), jat = /* @__PURE__ */ Fn("<div class=malloy-table>"), Uat = /* @__PURE__ */ Fn("<div class=pinned-header-subrow>");
 const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat, Hce = (t) => {
   const e = () => {
     const n = u1().layout, r = n.fieldLayout(t.field).width, i = n.fieldLayout(t.field).height, s = {};
@@ -91773,7 +91773,7 @@ const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat,
   };
   return (() => {
     var n = wat();
-    return Vt(n, () => t.value), Ei((r) => {
+    return zt(n, () => t.value), Ei((r) => {
       var i = !!t.isHeader, s = !!t.hideStartGutter, o = !!t.hideEndGutter, u = !!t.tableGutterLeft, a = !!t.tableGutterRight, l = e(), c = typeof t.value == "string" ? t.value : "";
       return i !== r.e && n.classList.toggle("header", r.e = i), s !== r.t && n.classList.toggle("hide-start-gutter", r.t = s), o !== r.a && n.classList.toggle("hide-end-gutter", r.a = o), u !== r.o && n.classList.toggle("table-gutter-left", r.o = u), a !== r.i && n.classList.toggle("table-gutter-right", r.i = a), r.n = $h(n, l, r.n), c !== r.s && zu(n, "title", r.s = c), r;
     }, {
@@ -91792,7 +91792,7 @@ const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat,
   } = u1(), n = Ep(), r = jm(t.field), i = jm(t.field.parentExplore), s = !t.field.parentExplore.isExploreField(), o = r && (i || s), u = Mm(t.field), a = Mm(t.field.parentExplore), l = u && (a || s), c = e.fieldLayout(t.field), f = t.isPinned ? c.absoluteColumnRange : c.relativeColumnRange, x = c.depth > 0 && jm(t.field) || c.metadata.renderAs === "table", h = c.depth > 0 && Mm(t.field) || c.depth === 0 && c.metadata.renderAs === "table";
   return (() => {
     var p = Lat();
-    return Vt(p, yt(Hce, {
+    return zt(p, gt(Hce, {
       get field() {
         return t.field;
       },
@@ -91840,15 +91840,15 @@ const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat,
   const u = i.depth > 0 && jm(t.field), a = i.depth > 0 && Mm(t.field);
   return (() => {
     var l = Iat();
-    return Vt(l, yt(mfe, {
+    return zt(l, gt(mfe, {
       get children() {
-        return [yt(RP, {
+        return [gt(RP, {
           when: n === "table",
           children: e
-        }), yt(RP, {
+        }), gt(RP, {
           when: !0,
           get children() {
-            return yt(Hce, {
+            return gt(Hce, {
               get field() {
                 return t.field;
               },
@@ -91990,7 +91990,7 @@ const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat,
     var G = jat();
     return G.addEventListener("scroll", I), $u((P) => {
       e.scrollEl || (v = P);
-    }, G), Vt(G, yt(Eh, {
+    }, G), zt(G, gt(Eh, {
       get when() {
         return n.root;
       },
@@ -92003,15 +92003,15 @@ const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat,
           return typeof W == "function" ? $u(W, P) : h = P, P;
         })(), (() => {
           var P = kat(), W = R;
-          return typeof W == "function" ? $u(W, P) : R = P, Vt(P, yt($o, {
+          return typeof W == "function" ? $u(W, P) : R = P, zt(P, gt(Zs, {
             get each() {
               return f();
             },
             children: (oe, ne) => (() => {
               var X = Uat();
-              return $u((ae) => A[ne()] = ae, X), Vt(X, yt($o, {
+              return $u((ae) => A[ne()] = ae, X), zt(X, gt(Zs, {
                 each: oe,
-                children: (ae) => yt(_W, {
+                children: (ae) => gt(_W, {
                   get field() {
                     return ae.field;
                   },
@@ -92022,28 +92022,28 @@ const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat,
           })), Ei((oe) => $h(P, Q(), oe)), P;
         })()];
       }
-    }), null), Vt(G, yt(Eh, {
+    }), null), zt(G, gt(Eh, {
       get when() {
         return n.root;
       },
       get children() {
         var P = Pat(), W = P.firstChild;
-        return W.style.setProperty("height", "fit-content"), W.style.setProperty("width", "100%"), Vt(W, yt($o, {
+        return W.style.setProperty("height", "fit-content"), W.style.setProperty("width", "100%"), zt(W, gt(Zs, {
           each: C,
           children: (oe) => (() => {
             var ne = lD();
             return $u((X) => queueMicrotask(() => {
               S.measureElement(X), oe.index === 0 && b(X.clientHeight);
-            }), ne), Vt(ne, yt(Eh, {
+            }), ne), zt(ne, gt(Eh, {
               get when() {
                 return oe.index >= 0;
               },
               get children() {
-                return yt($o, {
+                return gt(Zs, {
                   get each() {
                     return c();
                   },
-                  children: (X) => yt(bW, {
+                  children: (X) => gt(bW, {
                     field: X,
                     get row() {
                       return l()[oe.index];
@@ -92066,44 +92066,44 @@ const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat,
           t: void 0
         }), P;
       }
-    }), null), Vt(G, yt(Eh, {
+    }), null), zt(G, gt(Eh, {
       get when() {
         return !n.root;
       },
       get children() {
         return [(() => {
           var P = lD();
-          return Vt(P, yt($o, {
+          return zt(P, gt(Zs, {
             get each() {
               return c();
             },
-            children: (W) => yt(_W, {
+            children: (W) => gt(_W, {
               field: W
             })
           })), P;
-        })(), yt($o, {
+        })(), gt(Zs, {
           get each() {
             return l();
           },
           children: (P) => (() => {
             var W = lD();
-            return Vt(W, yt($o, {
+            return zt(W, gt(Zs, {
               get each() {
                 return c();
               },
-              children: (oe) => yt(bW, {
+              children: (oe) => gt(bW, {
                 field: oe,
                 row: P
               })
             })), W;
           })()
-        }), yt(Eh, {
+        }), gt(Eh, {
           get when() {
             return u();
           },
           get children() {
             var P = Mat(), W = P.firstChild, oe = W.nextSibling;
-            return oe.nextSibling, Vt(P, () => e.rowLimit, oe), P;
+            return oe.nextSibling, zt(P, () => e.rowLimit, oe), P;
           }
         })];
       }
@@ -92133,16 +92133,16 @@ const qat = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, zat = qat,
       headerSizeStore: CP({})
     };
   });
-  return yt(Uce.Provider, {
+  return gt(Uce.Provider, {
     get value() {
       return r();
     },
     get children() {
-      return yt(Hat, t);
+      return gt(Hat, t);
     }
   });
 };
-var Gat = /* @__PURE__ */ kn('<div class=malloy-list style="text-wrap:wrap;line-height:calc(var(--malloy-render--table-row-height) * 5 / 7 - 1px);">'), Wat = /* @__PURE__ */ kn("<span>");
+var Gat = /* @__PURE__ */ Fn('<div class=malloy-list style="text-wrap:wrap;line-height:calc(var(--malloy-render--table-row-height) * 5 / 7 - 1px);">'), Wat = /* @__PURE__ */ Fn("<span>");
 function Vat(t) {
   if (t.dataColumn.isNull())
     return "∅";
@@ -92168,26 +92168,26 @@ function Vat(t) {
     o.push(u);
   return (() => {
     var u = Gat();
-    return Vt(u, yt($o, {
+    return zt(u, gt(Zs, {
       each: o,
       children: (a, l) => (() => {
         var c = Wat();
-        return Vt(c, () => a1({
+        return zt(c, () => a1({
           field: r,
           dataColumn: a.cell(r),
           resultMetadata: t.resultMetadata,
           tag: r.tagParse().tag
-        }).renderValue, null), Vt(c, () => i && s && "(" + a1({
+        }).renderValue, null), zt(c, () => i && s && "(" + a1({
           field: s,
           dataColumn: a.cell(s),
           resultMetadata: t.resultMetadata,
           tag: s.tagParse().tag
-        }).renderValue + ")", null), Vt(c, () => l() < o.length - 1 && ", ", null), c;
+        }).renderValue + ")", null), zt(c, () => l() < o.length - 1 && ", ", null), c;
       })()
     })), u;
   })();
 }
-var Yat = /* @__PURE__ */ kn("<img>");
+var Yat = /* @__PURE__ */ Fn("<img>");
 function Kat(t) {
   const e = t.tag.tag("image");
   if (!e)
@@ -92210,11 +92210,11 @@ function Kat(t) {
     return $h(a, i), zu(a, "src", u), zu(a, "alt", s), a;
   })();
 }
-var Xat = /* @__PURE__ */ kn("<div class=dashboard-item><div class=dashboard-item-title></div><div class=dashboard-item-value>"), Jat = /* @__PURE__ */ kn("<div class=malloy-dashboard><div><div>"), Zat = /* @__PURE__ */ kn("<div class=dashboard-row><div class=dashboard-row-header><div class=dashboard-row-header-dimension-list></div><div class=dashboard-row-header-separator></div></div><div class=dashboard-row-body>"), elt = /* @__PURE__ */ kn("<div class=dashboard-dimension-wrapper><div class=dashboard-dimension-name></div><div class=dashboard-dimension-value>");
-function tlt(t) {
+var Xat = /* @__PURE__ */ Fn("<div class=dashboard-item><div class=dashboard-item-title></div><div class=dashboard-item-value>"), Jat = /* @__PURE__ */ Fn("<div class=malloy-dashboard><div><div>"), Zat = /* @__PURE__ */ Fn("<div class=dashboard-row><div class=dashboard-row-header><div class=dashboard-row-header-dimension-list></div><div class=dashboard-row-header-separator>"), elt = /* @__PURE__ */ Fn("<div class=dashboard-dimension-wrapper><div class=dashboard-dimension-name></div><div class=dashboard-dimension-value>"), tlt = /* @__PURE__ */ Fn("<div class=dashboard-row-body>");
+function nlt(t) {
   return (() => {
     var e = Xat(), n = e.firstChild, r = n.nextSibling;
-    return Vt(n, () => t.field.name), Vt(r, () => a1({
+    return zt(n, () => t.field.name), zt(r, () => a1({
       field: t.field,
       dataColumn: t.row.cell(t.field),
       tag: t.field.tagParse().tag,
@@ -92222,70 +92222,85 @@ function tlt(t) {
     }).renderValue), Ei(() => r.classList.toggle("dashboard-item-value-measure", !!t.isMeasure)), e;
   })();
 }
-function nlt(t) {
-  const e = () => t.data.field, n = () => e().allFields.filter((l) => !l.tagParse().tag.has("hidden") && l.isAtomicField() && l.sourceWasDimension()), r = () => {
-    const l = [], c = [];
-    for (const f of e().allFields)
-      f.tagParse().tag.has("hidden") || (f.isAtomicField() && f.sourceWasMeasureLike() ? l.push(f) : (!f.isAtomicField() || !f.sourceWasDimension()) && c.push(f));
-    return [...l, ...c];
-  }, i = Yr(() => {
-    const l = [];
-    for (const c of t.data)
-      l.push(c);
-    return l;
+function rlt(t) {
+  const e = () => t.data.field, n = () => e().allFields.filter((c) => !c.tagParse().tag.has("hidden") && c.isAtomicField() && c.sourceWasDimension()), r = () => {
+    const c = [], f = [];
+    for (const x of e().allFields)
+      x.tagParse().tag.has("hidden") || (x.isAtomicField() && x.sourceWasMeasureLike() ? c.push(x) : (!x.isAtomicField() || !x.sourceWasDimension()) && f.push(x));
+    return [...c, ...f];
+  }, i = () => {
+    const c = [[]];
+    for (const f of r()) {
+      const {
+        tag: x
+      } = f.tagParse();
+      x.has("break") && c.push([]), c.at(-1).push(f);
+    }
+    return c;
+  }, s = Yr(() => {
+    const c = [];
+    for (const f of t.data)
+      c.push(f);
+    return c;
   });
-  let s;
-  t.scrollEl && (s = t.scrollEl);
-  const o = zce({
-    count: i().length,
-    getScrollElement: () => s,
+  let o;
+  t.scrollEl && (o = t.scrollEl);
+  const u = zce({
+    count: s().length,
+    getScrollElement: () => o,
     estimateSize: () => 192
-  }), u = o.getVirtualItems(), a = Ep();
+  }), a = u.getVirtualItems(), l = Ep();
   return (() => {
-    var l = Jat(), c = l.firstChild, f = c.firstChild;
-    return $u((x) => {
-      t.scrollEl || (s = x);
-    }, l), c.style.setProperty("width", "100%"), c.style.setProperty("position", "relative"), f.style.setProperty("height", "fit-content"), f.style.setProperty("width", "100%"), Vt(f, yt($o, {
-      each: u,
-      children: (x) => (() => {
-        var h = Zat(), p = h.firstChild, m = p.firstChild, g = p.nextSibling;
-        return $u((y) => queueMicrotask(() => o.measureElement(y)), h), Vt(m, yt($o, {
+    var c = Jat(), f = c.firstChild, x = f.firstChild;
+    return $u((h) => {
+      t.scrollEl || (o = h);
+    }, c), f.style.setProperty("width", "100%"), f.style.setProperty("position", "relative"), x.style.setProperty("height", "fit-content"), x.style.setProperty("width", "100%"), zt(x, gt(Zs, {
+      each: a,
+      children: (h) => (() => {
+        var p = Zat(), m = p.firstChild, g = m.firstChild;
+        return $u((y) => queueMicrotask(() => u.measureElement(y)), p), zt(g, gt(Zs, {
           get each() {
             return n();
           },
           children: (y) => (() => {
             var E = elt(), A = E.firstChild, v = A.nextSibling;
-            return Vt(A, () => y.name), Vt(v, () => a1({
+            return zt(A, () => y.name), zt(v, () => a1({
               field: y,
-              dataColumn: i()[x.index].cell(y),
+              dataColumn: s()[h.index].cell(y),
               tag: y.tagParse().tag,
-              resultMetadata: a
+              resultMetadata: l
             }).renderValue), E;
           })()
-        })), Vt(g, yt($o, {
+        })), zt(p, gt(Zs, {
           get each() {
-            return r();
+            return i();
           },
-          children: (y) => yt(tlt, {
-            field: y,
-            get row() {
-              return i()[x.index];
-            },
-            resultMetadata: a,
-            get isMeasure() {
-              return Yr(() => !!y.isAtomicField())() && y.sourceWasMeasureLike();
-            }
-          })
-        })), Ei(() => zu(h, "data-index", x.index)), h;
+          children: (y) => (() => {
+            var E = tlt();
+            return zt(E, gt(Zs, {
+              each: y,
+              children: (A) => gt(nlt, {
+                field: A,
+                get row() {
+                  return s()[h.index];
+                },
+                resultMetadata: l,
+                get isMeasure() {
+                  return Yr(() => !!A.isAtomicField())() && A.sourceWasMeasureLike();
+                }
+              })
+            })), E;
+          })()
+        }), null), Ei(() => zu(p, "data-index", h.index)), p;
       })()
-    })), Ei((x) => {
-      var m;
-      var h = o.getTotalSize() + "px", p = `${((m = u[0]) == null ? void 0 : m.start) ?? 0}px`;
-      return h !== x.e && ((x.e = h) != null ? c.style.setProperty("height", h) : c.style.removeProperty("height")), p !== x.t && ((x.t = p) != null ? f.style.setProperty("padding-top", p) : f.style.removeProperty("padding-top")), x;
+    })), Ei((h) => {
+      var g;
+      var p = u.getTotalSize() + "px", m = `${((g = a[0]) == null ? void 0 : g.start) ?? 0}px`;
+      return p !== h.e && ((h.e = p) != null ? f.style.setProperty("height", p) : f.style.removeProperty("height")), m !== h.t && ((h.t = m) != null ? x.style.setProperty("padding-top", m) : x.style.removeProperty("padding-top")), h;
     }, {
       e: void 0,
       t: void 0
-    }), l;
+    }), c;
   })();
 }
 class tR {
@@ -92488,7 +92503,7 @@ const N_ = {
 function CW(t) {
   return Array.isArray(t) || t !== null && typeof t == "object";
 }
-class rlt extends tR {
+class ilt extends tR {
   constructor(e, n, r, i, s) {
     super(e, n, r);
     const o = s.spec;
@@ -92565,7 +92580,7 @@ class rlt extends tR {
 }
 const w_ = class w_ extends kd {
   create(e, n, r, i, s) {
-    return new rlt(
+    return new ilt(
       e,
       n,
       r,
@@ -92650,7 +92665,7 @@ class Qce extends tR {
     };
   }
 }
-class ilt extends Qce {
+class slt extends Qce {
   getMark() {
     return "line";
   }
@@ -92675,7 +92690,7 @@ class ilt extends Qce {
 }
 const L_ = class L_ extends kd {
   create(e, n, r, i, s, o) {
-    return new ilt(
+    return new slt(
       e,
       n,
       r,
@@ -92689,7 +92704,7 @@ const L_ = class L_ extends kd {
 };
 L_.instance = new L_();
 let aw = L_;
-class slt extends Qce {
+class olt extends Qce {
   getMark() {
     return "point";
   }
@@ -92714,7 +92729,7 @@ class slt extends Qce {
 }
 const I_ = class I_ extends kd {
   create(e, n, r, i, s, o) {
-    return new slt(
+    return new olt(
       e,
       n,
       r,
@@ -92728,12 +92743,12 @@ const I_ = class I_ extends kd {
 };
 I_.instance = new I_();
 let lw = I_;
-const olt = "Topology", ult = [
+const ult = "Topology", alt = [
   -179.14733999999999,
   -14.552548999999999,
   179.77847,
   71.352561
-], alt = {
+], llt = {
   scale: [
     0.003589293992939929,
     8590596905969058e-19
@@ -92742,7 +92757,7 @@ const olt = "Topology", ult = [
     -179.14733999999999,
     -14.552548999999999
   ]
-}, llt = {
+}, clt = {
   states: {
     type: "GeometryCollection",
     geometries: [
@@ -96260,7 +96275,7 @@ const olt = "Topology", ult = [
       }
     ]
   }
-}, clt = [
+}, flt = [
   [
     [
       25302,
@@ -144224,12 +144239,12 @@ const olt = "Topology", ult = [
     ]
   ]
 ], cw = {
-  type: olt,
-  bbox: ult,
-  transform: alt,
-  objects: llt,
-  arcs: clt
-}, flt = {
+  type: ult,
+  bbox: alt,
+  transform: llt,
+  objects: clt,
+  arcs: flt
+}, xlt = {
   AL: "01",
   Alabama: "01",
   AK: "02",
@@ -144339,7 +144354,7 @@ const olt = "Topology", ult = [
   MP: "69",
   GU: "66"
 };
-class xlt extends tR {
+class dlt extends tR {
   getRegionField(e) {
     return e.allFields[0];
   }
@@ -144351,7 +144366,7 @@ class xlt extends tR {
       return e.value;
     if (e.isString())
       if (e.field === this.getRegionField(e.field.parentExplore)) {
-        const n = flt[e.value];
+        const n = xlt[e.value];
         return n === void 0 ? void 0 : n;
       } else
         return e.value;
@@ -144472,7 +144487,7 @@ class xlt extends tR {
 }
 const $_ = class $_ extends kd {
   create(e, n, r, i, s, o) {
-    return new xlt(
+    return new dlt(
       e,
       n,
       r,
@@ -144486,7 +144501,7 @@ const $_ = class $_ extends kd {
 };
 $_.instance = new $_();
 let fw = $_;
-class dlt extends tR {
+class hlt extends tR {
   getDataValue(e) {
     if (e.isNull() || e.isNumber() || e.isString())
       return e.value;
@@ -144586,7 +144601,7 @@ class dlt extends tR {
 }
 const B_ = class B_ extends kd {
   create(e, n, r, i, s, o) {
-    return new dlt(
+    return new hlt(
       e,
       n,
       r,
@@ -144600,12 +144615,12 @@ const B_ = class B_ extends kd {
 };
 B_.instance = new B_();
 let xw = B_;
-var hlt = /* @__PURE__ */ kn("<div>");
-const plt = [aw.instance, lw.instance, fw.instance, xw.instance];
-function glt(t) {
+var plt = /* @__PURE__ */ Fn("<div>");
+const glt = [aw.instance, lw.instance, fw.instance, xw.instance];
+function mlt(t) {
   const e = Ep(), n = () => {
     var i;
-    return (i = plt.find((s) => s.rendererName === t.type)) == null ? void 0 : i.create(document, {
+    return (i = glt.find((s) => s.rendererName === t.type)) == null ? void 0 : i.create(document, {
       // If rendering chart at root, make large. Otherwise medium because its nested
       size: Vu(e.rootField) === Vu(t.data.field) ? "large" : "medium"
     }, {
@@ -144619,7 +144634,7 @@ function glt(t) {
       r.replaceChildren(i);
     }
   }), (() => {
-    var i = hlt(), s = r;
+    var i = plt(), s = r;
     return typeof s == "function" ? $u(s, i) : r = i, i;
   })();
 }
@@ -144630,7 +144645,7 @@ function OW(t) {
   const e = t.getUTCFullYear(), n = t3(t.getUTCMonth() + 1), r = t3(t.getUTCDate());
   return `${e}-${n}-${r}`;
 }
-function mlt({ field: t, dataColumn: e }) {
+function ylt({ field: t, dataColumn: e }) {
   if (!t.isAtomicField())
     throw new Error(
       `Time renderer error: field ${t.name} is not an atomic field`
@@ -144653,7 +144668,7 @@ function rR(t, e) {
   const n = e ?? t.tagParse().tag;
   return !t.isExplore() && t.isAtomicField() ? n.has("link") ? "link" : n.has("image") ? "image" : "cell" : FF(n, "list", "list_detail") ? "list" : FF(n, "bar_chart") ? "chart" : n.has("dashboard") ? "dashboard" : n.has("line_chart") ? "line_chart" : n.has("scatter_chart") ? "scatter_chart" : n.has("shape_map") ? "shape_map" : n.has("segment_map") ? "segment_map" : "table";
 }
-const ylt = "∅";
+const Elt = "∅";
 function a1(t) {
   const {
     field: e,
@@ -144665,12 +144680,12 @@ function a1(t) {
   let u = "";
   const a = s[o] || {};
   if (n.isNull())
-    u = ylt;
+    u = Elt;
   else
     switch (o) {
       case "cell": {
         const l = n.value;
-        xee(e, l) ? u = uZe(e, l) : dee(e, l) ? u = l : e.isAtomicField() && (e.isDate() || e.isTimestamp()) ? u = mlt(t) : u = String(l);
+        xee(e, l) ? u = uZe(e, l) : dee(e, l) ? u = l : e.isAtomicField() && (e.isDate() || e.isTimestamp()) ? u = ylt(t) : u = String(l);
         break;
       }
       case "link": {
@@ -144686,7 +144701,7 @@ function a1(t) {
         break;
       }
       case "chart": {
-        u = yt(fat, rx({
+        u = gt(fat, rx({
           field: e,
           get data() {
             return r.getData(n);
@@ -144697,7 +144712,7 @@ function a1(t) {
       }
       case "dashboard": {
         if (n.isArray())
-          u = yt(nlt, rx({
+          u = gt(rlt, rx({
             data: n
           }, a));
         else
@@ -144709,7 +144724,7 @@ function a1(t) {
       case "shape_map":
       case "segment_map": {
         if (n.isArray())
-          u = yt(glt, {
+          u = gt(mlt, {
             type: o,
             data: n
           });
@@ -144719,7 +144734,7 @@ function a1(t) {
       }
       case "table": {
         if (n.isArrayOrRecord())
-          u = yt(Qat, rx({
+          u = gt(Qat, rx({
             data: n
           }, a));
         else
@@ -144738,7 +144753,7 @@ function a1(t) {
     renderValue: u
   };
 }
-function Elt() {
+function Alt() {
   const t = /* @__PURE__ */ new WeakMap();
   return {
     get: (e) => {
@@ -144752,13 +144767,13 @@ function Elt() {
     }
   };
 }
-function Alt(t) {
+function vlt(t) {
   const e = /* @__PURE__ */ new WeakMap(), n = (u) => {
     if (e.has(u))
       return e.get(u);
     const a = Vu(u);
     return e.set(u, a), a;
-  }, r = Elt(), i = t.data.field, s = {
+  }, r = Alt(), i = t.data.field, s = {
     fields: {},
     fieldKeyMap: e,
     getFieldKey: n,
@@ -144832,16 +144847,16 @@ function RW(t, e, n) {
     });
   }
 }
-function vlt(t, {
+function Slt(t, {
   element: e
 }) {
   const n = Yr(() => t.result ? t.result : t.queryResult && t.modelDef ? new zW.Result(t.queryResult, t.modelDef) : null);
-  return yt(Eh, {
+  return gt(Eh, {
     get when() {
       return n();
     },
     get children() {
-      return yt(Slt, {
+      return gt(_lt, {
         get result() {
           return n();
         },
@@ -144853,8 +144868,8 @@ function vlt(t, {
     }
   });
 }
-function Slt(t) {
-  const e = Yr(() => Alt(t.result)), n = () => {
+function _lt(t) {
+  const e = Yr(() => vlt(t.result)), n = () => {
     const i = e().modelTag, s = e().resultTag, o = i.tag("theme"), u = s.tag("theme");
     return {
       modelTag: i,
@@ -144865,7 +144880,7 @@ function Slt(t) {
   };
   n3(() => {
     if (t.element) {
-      const i = _lt(n().modelTheme, n().localTheme);
+      const i = blt(n().modelTheme, n().localTheme);
       for (const [s, o] of Object.entries(i))
         t.element.style.setProperty(s, o);
     }
@@ -144885,7 +144900,7 @@ function Slt(t) {
       }
     }
   });
-  return yt($ce.Provider, {
+  return gt($ce.Provider, {
     get value() {
       return e();
     },
@@ -144901,11 +144916,11 @@ function Ys(t, ...e) {
       break;
   return n ?? `var(--malloy-theme--${t.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase()})`;
 }
-function _lt(t, e) {
+function blt(t, e) {
   const n = {}, r = Ys("tableRowHeight", e, t), i = Ys("tableBodyColor", e, t), s = Ys("tableFontSize", e, t), o = Ys("tableHeaderColor", e, t), u = Ys("tableHeaderWeight", e, t), a = Ys("tableBodyWeight", e, t), l = Ys("tableBorder", e, t), c = Ys("tableBackground", e, t), f = Ys("tableGutterSize", e, t), x = Ys("tablePinnedBackground", e, t), h = Ys("tablePinnedBorder", e, t), p = Ys("fontFamily", e, t);
   return n["--malloy-render--table-row-height"] = r, n["--malloy-render--table-body-color"] = i, n["--malloy-render--table-font-size"] = s, n["--malloy-render--font-family"] = p, n["--malloy-render--table-header-color"] = o, n["--malloy-render--table-header-weight"] = u, n["--malloy-render--table-body-weight"] = a, n["--malloy-render--table-border"] = l, n["--malloy-render--table-background"] = c, n["--malloy-render--table-gutter-size"] = f, n["--malloy-render--table-pinned-background"] = x, n["--malloy-render--table-pinned-border"] = h, n;
 }
-const blt = `:host {
+const Clt = `:host {
   --malloy-theme--table-row-height: 28px;
   --malloy-theme--table-font-size: 12px;
   --malloy-theme--table-header-color: #5d626b;
@@ -144935,7 +144950,7 @@ const blt = `:host {
       'calt' 1;
   }
 }
-`, Clt = `.malloy-table * {
+`, Tlt = `.malloy-table * {
   box-sizing: border-box;
 }
@@ -145141,7 +145156,7 @@ const blt = `:host {
 .malloy-table .malloy-list {
   line-height: calc(var(--malloy-render--table-row-height) * 5 / 7 - 1px);
 }
-`, Tlt = `.malloy-dashboard {
+`, Olt = `.malloy-dashboard {
   background: #f7f9fc;
   width: 100%;
   height: 100%;
@@ -145232,14 +145247,14 @@ const blt = `:host {
     text-align: left;
   }
 }
-`, Olt = (t) => (e, n) => {
+`, Rlt = (t) => (e, n) => {
   const { element: r } = n, i = new CSSStyleSheet();
-  i.replaceSync(blt);
+  i.replaceSync(Clt);
   const s = new CSSStyleSheet();
-  return s.replaceSync([Clt, Tlt].join(`
+  return s.replaceSync([Tlt, Olt].join(`
 `)), r.renderRoot.adoptedStyleSheets = [i, s], t(e, n);
 };
-function H0t({
+function Q0t({
   customElements: t = window.customElements,
   HTMLElement: e = window.HTMLElement
 }) {
@@ -145256,10 +145271,10 @@ function H0t({
       },
       { customElements: t, BaseElement: e }
     ),
-    Olt,
+    Rlt,
     vfe
-  )(vlt);
+  )(Slt);
 }
 export {
-  H0t as default
+  Q0t as default
 };