@malloydata/render 0.0.226-dev250113222119 → 0.0.226-dev250113232418

package/dist/register/register.mjs

@@ -137,7 +137,7 @@ function Q$(t, e = {}, n = {}) {
 const xce = {
   context: void 0,
   registry: void 0
-}, dce = (t, e) => t === e, wu = Symbol("solid-proxy"), HO = Symbol("solid-track"), HA = {
+}, dce = (t, e) => t === e, Nu = Symbol("solid-proxy"), HO = Symbol("solid-track"), HA = {
   equals: dce
 };
 let TG = FG;
@@ -480,10 +480,10 @@ function Qy() {
 }
 const bce = {
   get(t, e, n) {
-    return e === wu ? n : t.get(e);
+    return e === Nu ? n : t.get(e);
   },
   has(t, e) {
-    return e === wu ? !0 : t.has(e);
+    return e === Nu ? !0 : t.has(e);
   },
   set: Qy,
   deleteProperty: Qy,
@@ -512,11 +512,11 @@ function Tce() {
       return n;
   }
 }
-function Eu(...t) {
+function Au(...t) {
   let e = !1;
   for (let o = 0; o < t.length; o++) {
     const u = t[o];
-    e = e || !!u && wu in u, t[o] = typeof u == "function" ? (e = !0, Pn(u)) : u;
+    e = e || !!u && Nu in u, t[o] = typeof u == "function" ? (e = !0, Pn(u)) : u;
   }
   if (e)
     return new Proxy(
@@ -3645,8 +3645,10 @@ ${" ".repeat(this.parseCursor)}^`;
         if (o) {
           r = !1;
           let u = o[0];
+          const a = this.parseCursor;
           if (this.parseCursor += u.length, i !== "space") {
             i[0] === "q" && (u = u.slice(1, -1)), yield {
+              cursor: a,
               type: i === "char" ? u : i,
               text: u
             };
@@ -3655,7 +3657,7 @@ ${" ".repeat(this.parseCursor)}^`;
         }
       }
       if (r) {
-        yield { type: "unexpected token", text: e };
+        yield { cursor: this.parseCursor, type: "unexpected token", text: e };
         return;
       }
     }
@@ -3913,50 +3915,45 @@ class fxe extends ZG.TinyParser {
     return e.text.toUpperCase();
   }
   typeDef() {
-    const e = this.parseCursor, n = this.next("id"), r = this.sqlID(n);
-    let i;
-    if (r === "VARCHAR" && this.peek().type === "size" && this.next(), (r === "DECIMAL" || r === "NUMERIC") && this.peek().type === "precision")
-      this.next(), i = { type: "number", numberType: "float" };
-    else if (r === "TIMESTAMP")
-      this.peek().text === "WITH" && this.nextText("WITH", "TIME", "ZONE"), i = { type: "timestamp" };
-    else if (ZO[r])
-      i = ZO[r];
-    else if (r === "STRUCT")
-      for (this.next("("), i = { type: "record", fields: [] }; ; ) {
-        const s = this.next();
-        if (s.type === "qsingle" || s.type === "qdouble" || s.type === "id") {
-          const o = this.typeDef();
-          i.fields.push((0, yd.mkFieldDef)(o, this.unquoteName(s)));
+    const e = this.next("id"), n = this.sqlID(e);
+    let r;
+    if (n === "VARCHAR" && this.peek().type === "size" && this.next(), (n === "DECIMAL" || n === "NUMERIC") && this.peek().type === "precision")
+      this.next(), r = { type: "number", numberType: "float" };
+    else if (n === "TIMESTAMP")
+      this.peek().text === "WITH" && this.nextText("WITH", "TIME", "ZONE"), r = { type: "timestamp" };
+    else if (ZO[n])
+      r = ZO[n];
+    else if (n === "STRUCT")
+      for (this.next("("), r = { type: "record", fields: [] }; ; ) {
+        const i = this.next();
+        if (i.type === "qsingle" || i.type === "qdouble" || i.type === "id") {
+          const s = this.typeDef();
+          r.fields.push((0, yd.mkFieldDef)(s, this.unquoteName(i)));
         } else {
-          if (s.type !== ")")
+          if (i.type !== ")")
             throw this.parseError("Expected identifier or ) to end STRUCT");
           break;
         }
         this.peek().type === "," && this.next();
       }
-    else if (n.type === "id") {
-      for (; ; ) {
-        const s = this.peek();
-        if (s.type === "arrayOf" || s.type === "eof")
-          break;
-        this.next();
-      }
-      i = {
+    else if (e.type === "id") {
+      let i = e.cursor + e.text.length;
+      this.peek().type === "precision" && this.next(), this.peek().type === "eof" && (i = this.input.length), r = {
         type: "sql native",
-        rawType: this.input.slice(e, this.parseCursor - e + 1)
+        rawType: this.input.slice(e.cursor, i)
       };
     } else
       throw this.parseError("Could not understand type");
     for (; this.peek().type === "arrayOf"; )
-      this.next(), i.type === "record" ? i = {
+      this.next(), r.type === "record" ? r = {
         type: "array",
         elementTypeDef: { type: "record_element" },
-        fields: i.fields
-      } : i = {
+        fields: r.fields
+      } : r = {
         type: "array",
-        elementTypeDef: i
+        elementTypeDef: r
       };
-    return i;
+    return r;
   }
 }
 (function(t) {
@@ -5575,9 +5572,9 @@ V5.MySQLDialect = Fxe;
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), n(V5, t);
 })(AN);
-var Au = {};
-Object.defineProperty(Au, "__esModule", { value: !0 });
-Au.getDialects = Au.registerDialect = Au.getDialect = void 0;
+var vu = {};
+Object.defineProperty(vu, "__esModule", { value: !0 });
+vu.getDialects = vu.registerDialect = vu.getDialect = void 0;
 const Lxe = mN, Ixe = gN, Bxe = yN, $xe = hN, nW = EN, kxe = AN, vN = /* @__PURE__ */ new Map();
 function Pxe(t) {
   const e = vN.get(t);
@@ -5585,15 +5582,15 @@ function Pxe(t) {
     throw new Error(`Unknown Dialect ${t}`);
   return e;
 }
-Au.getDialect = Pxe;
+vu.getDialect = Pxe;
 function J0(t) {
   vN.set(t.name, t);
 }
-Au.registerDialect = J0;
+vu.registerDialect = J0;
 function Mxe() {
   return [...vN.values()];
 }
-Au.getDialects = Mxe;
+vu.getDialects = Mxe;
 J0(new Ixe.PostgresDialect());
 J0(new $xe.StandardSQLDialect());
 J0(new Lxe.DuckDBDialect());
@@ -5659,7 +5656,7 @@ J0(new kxe.MySQLDialect());
   Object.defineProperty(t, "MySQLDialect", { enumerable: !0, get: function() {
     return a.MySQLDialect;
   } });
-  var l = Au;
+  var l = vu;
   Object.defineProperty(t, "getDialect", { enumerable: !0, get: function() {
     return l.getDialect;
   } }), Object.defineProperty(t, "registerDialect", { enumerable: !0, get: function() {
@@ -5975,7 +5972,7 @@ var en = {}, gl = {};
  * 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.
  */
-var Wu = T && T.__decorate || function(t, e, n, r) {
+var Vu = T && T.__decorate || function(t, e, n, r) {
   var i = arguments.length, s = i < 3 ? e : r === null ? r = Object.getOwnPropertyDescriptor(e, n) : r, o;
   if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
     s = Reflect.decorate(t, e, n, r);
@@ -5986,7 +5983,7 @@ var Wu = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(jo, "__esModule", { value: !0 });
 jo.TerminalNode = void 0;
-const zxe = dr, Vu = Ae, Qxe = en;
+const zxe = dr, Yu = Ae, Qxe = en;
 class Uo {
   constructor(e) {
     this._symbol = e;
@@ -6026,35 +6023,35 @@ class Uo {
     return this._symbol.type === Qxe.Token.EOF ? "<EOF>" : this._symbol.text || "";
   }
 }
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "getChild", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "parent", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "setParent", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "payload", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "sourceInterval", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "childCount", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "accept", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "text", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "toStringTree", null);
-Wu([
-  Vu.Override
+Vu([
+  Yu.Override
 ], Uo.prototype, "toString", null);
 jo.TerminalNode = Uo;
 /*!
@@ -9353,7 +9350,7 @@ kW([
   PW.Override
 ], Pg.prototype, "equals", null);
 dx.ArrayEqualityComparator = Pg;
-var hx = {}, Yu = {}, Ku = {};
+var hx = {}, Ku = {}, Ju = {};
 (function(t) {
   /*!
    * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -9463,20 +9460,20 @@ var hx = {}, Yu = {}, Ku = {};
   ], r.prototype, "toString", null), t.ATNState = r, function(i) {
     i.INVALID_STATE_NUMBER = -1;
   }(r = t.ATNState || (t.ATNState = {}));
-})(Ku);
+})(Ju);
 /*!
  * 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(Yu, "__esModule", { value: !0 });
-Yu.DecisionState = void 0;
-const Whe = Ku;
+Object.defineProperty(Ku, "__esModule", { value: !0 });
+Ku.DecisionState = void 0;
+const Whe = Ju;
 class Vhe extends Whe.ATNState {
   constructor() {
     super(...arguments), this.decision = -1, this.nonGreedy = !1, this.sll = !1;
   }
 }
-Yu.DecisionState = Vhe;
+Ku.DecisionState = Vhe;
 var S6 = {}, iS = {};
 (function(t) {
   /*!
@@ -10426,7 +10423,7 @@ var Mn = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(hx, "__esModule", { value: !0 });
 hx.ATNConfig = void 0;
-const e2e = ml, t2e = Yu, Aa = Tn, Zt = Ae, n2e = bs, eP = Ho(), qc = px, tP = yi(), b6 = 2147483648;
+const e2e = ml, t2e = Ku, va = Tn, Zt = Ae, n2e = bs, eP = Ho(), qc = px, tP = yi(), b6 = 2147483648;
 let Ei = class $1 {
   constructor(e, n, r) {
     typeof n == "number" ? (tP((n & 16777215) === n), this._state = e, this.altAndOuterContextDepth = n, this._context = r) : (this._state = e, this.altAndOuterContextDepth = n.altAndOuterContextDepth, this._context = r);
@@ -10560,8 +10557,8 @@ let Ei = class $1 {
     return this === e ? !0 : e instanceof $1 ? this.state.stateNumber === e.state.stateNumber && this.alt === e.alt && this.reachesIntoOuterContext === e.reachesIntoOuterContext && this.context.equals(e.context) && this.semanticContext.equals(e.semanticContext) && this.isPrecedenceFilterSuppressed === e.isPrecedenceFilterSuppressed && this.hasPassedThroughNonGreedyDecision === e.hasPassedThroughNonGreedyDecision && n2e.ObjectEqualityComparator.INSTANCE.equals(this.lexerActionExecutor, e.lexerActionExecutor) : !1;
   }
   hashCode() {
-    let e = Aa.MurmurHash.initialize(7);
-    return e = Aa.MurmurHash.update(e, this.state.stateNumber), e = Aa.MurmurHash.update(e, this.alt), e = Aa.MurmurHash.update(e, this.reachesIntoOuterContext ? 1 : 0), e = Aa.MurmurHash.update(e, this.context), e = Aa.MurmurHash.update(e, this.semanticContext), e = Aa.MurmurHash.update(e, this.hasPassedThroughNonGreedyDecision ? 1 : 0), e = Aa.MurmurHash.update(e, this.lexerActionExecutor), e = Aa.MurmurHash.finish(e, 7), e;
+    let e = va.MurmurHash.initialize(7);
+    return e = va.MurmurHash.update(e, this.state.stateNumber), e = va.MurmurHash.update(e, this.alt), e = va.MurmurHash.update(e, this.reachesIntoOuterContext ? 1 : 0), e = va.MurmurHash.update(e, this.context), e = va.MurmurHash.update(e, this.semanticContext), e = va.MurmurHash.update(e, this.hasPassedThroughNonGreedyDecision ? 1 : 0), e = va.MurmurHash.update(e, this.lexerActionExecutor), e = va.MurmurHash.finish(e, 7), e;
   }
   /**
    * Returns a graphical representation of the current `ATNConfig` in Graphviz format. The graph can be stored to a
@@ -11641,7 +11638,7 @@ r2.ProxyErrorListener = jW;
  * 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.
  */
-var Ju = T && T.__decorate || function(t, e, n, r) {
+var Xu = T && T.__decorate || function(t, e, n, r) {
   var i = arguments.length, s = i < 3 ? e : r === null ? r = Object.getOwnPropertyDescriptor(e, n) : r, o;
   if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
     s = Reflect.decorate(t, e, n, r);
@@ -11795,37 +11792,37 @@ class zn {
 zn.EOF = -1;
 zn.tokenTypeMapCache = /* @__PURE__ */ new WeakMap();
 zn.ruleIndexMapCache = /* @__PURE__ */ new WeakMap();
-Ju([
+Xu([
   ys.SuppressWarnings("serial"),
   ys.NotNull
 ], zn.prototype, "_listeners", void 0);
-Ju([
+Xu([
   ys.NotNull
 ], zn.prototype, "getTokenTypeMap", null);
-Ju([
+Xu([
   ys.NotNull
 ], zn.prototype, "getRuleIndexMap", null);
-Ju([
+Xu([
   ys.NotNull
 ], zn.prototype, "serializedATN", null);
-Ju([
+Xu([
   ys.NotNull
 ], zn.prototype, "atn", null);
-Ju([
+Xu([
   ys.NotNull,
   uS(0, ys.NotNull)
 ], zn.prototype, "interpreter", null);
-Ju([
+Xu([
   ys.NotNull,
   uS(0, ys.NotNull)
 ], zn.prototype, "getErrorHeader", null);
-Ju([
+Xu([
   uS(0, ys.NotNull)
 ], zn.prototype, "addErrorListener", null);
-Ju([
+Xu([
   uS(0, ys.NotNull)
 ], zn.prototype, "removeErrorListener", null);
-Ju([
+Xu([
   ys.NotNull
 ], zn.prototype, "getErrorListeners", null);
 tc.Recognizer = zn;
@@ -12075,7 +12072,7 @@ var x2e = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(i2, "__esModule", { value: !0 });
 i2.StarLoopEntryState = void 0;
-const d2e = hr, h2e = zo, p2e = Yu, g2e = Ae;
+const d2e = hr, h2e = zo, p2e = Ku, g2e = Ae;
 class qW extends p2e.DecisionState {
   constructor() {
     super(...arguments), this.precedenceRuleDecision = !1, this.precedenceLoopbackStates = new h2e.BitSet();
@@ -13120,7 +13117,7 @@ var WW = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(ic, "__esModule", { value: !0 });
 ic.RuleStopState = void 0;
-const N2e = Ku, F2e = hr, VW = Ae;
+const N2e = Ju, F2e = hr, VW = Ae;
 class kN extends N2e.ATNState {
   get nonStopStateNumber() {
     return -1;
@@ -14136,7 +14133,7 @@ var L2e = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Qm, "__esModule", { value: !0 });
 Qm.BasicState = void 0;
-const I2e = Ku, B2e = hr, $2e = Ae;
+const I2e = Ju, B2e = hr, $2e = Ae;
 class YW extends I2e.ATNState {
   get stateType() {
     return B2e.ATNStateType.BASIC;
@@ -14940,7 +14937,7 @@ var hS = {}, vx = {};
  */
 Object.defineProperty(vx, "__esModule", { value: !0 });
 vx.BlockStartState = void 0;
-const tpe = Yu;
+const tpe = Ku;
 class npe extends tpe.DecisionState {
 }
 vx.BlockStartState = npe;
@@ -14985,7 +14982,7 @@ var upe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(pS, "__esModule", { value: !0 });
 pS.BlockEndState = void 0;
-const ape = Ku, lpe = hr, cpe = Ae;
+const ape = Ju, lpe = hr, cpe = Ae;
 class eV extends ape.ATNState {
   get stateType() {
     return lpe.ATNStateType.BLOCK_END;
@@ -15777,7 +15774,7 @@ var ype = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(n3, "__esModule", { value: !0 });
 n3.LoopEndState = void 0;
-const Epe = Ku, Ape = hr, vpe = Ae;
+const Epe = Ju, Ape = hr, vpe = Ae;
 class iV extends Epe.ATNState {
   get stateType() {
     return Ape.ATNStateType.LOOP_END;
@@ -16339,7 +16336,7 @@ function x2() {
     };
   };
   Object.defineProperty(Rp, "__esModule", { value: !0 }), Rp.ParserATNSimulator = void 0;
-  const n = qm, r = Ym, i = qo, s = iS, o = Go(), u = hx, a = Mm(), l = oS(), c = hr, f = Xm, x = zo, h = _S, p = Yu, m = sS(), g = s2, y = dr, E = gl, A = Ae, v = MN(), _ = i3(), S = bs, C = oo(), b = Ho(), N = LN(), L = lV, I = ic, P = u2, q = px, X = PN(), G = cV(), ue = en, he = Ts, pe = yi(), ae = 65535, fe = -(1 << 31 >>> 0);
+  const n = qm, r = Ym, i = qo, s = iS, o = Go(), u = hx, a = Mm(), l = oS(), c = hr, f = Xm, x = zo, h = _S, p = Ku, m = sS(), g = s2, y = dr, E = gl, A = Ae, v = MN(), _ = i3(), S = bs, C = oo(), b = Ho(), N = LN(), L = lV, I = ic, P = u2, q = px, X = PN(), G = cV(), ue = en, he = Ts, pe = yi(), ae = 65535, fe = -(1 << 31 >>> 0);
   let re = class ft extends l.ATNSimulator {
     constructor(D, R) {
       super(D), this.predictionMode = L.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 = R;
@@ -17482,7 +17479,7 @@ var Rpe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(CS, "__esModule", { value: !0 });
 CS.PlusLoopbackState = void 0;
-const Ope = hr, Dpe = Yu, wpe = Ae;
+const Ope = hr, Dpe = Ku, wpe = Ae;
 class xV extends Dpe.DecisionState {
   get stateType() {
     return Ope.ATNStateType.PLUS_LOOP_BACK;
@@ -17679,7 +17676,7 @@ var jpe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(RS, "__esModule", { value: !0 });
 RS.RuleStartState = void 0;
-const Upe = Ku, qpe = hr, Hpe = Ae;
+const Upe = Ju, qpe = hr, Hpe = Ae;
 class dV extends Upe.ATNState {
   constructor() {
     super(...arguments), this.isPrecedenceRule = !1, this.leftFactored = !1;
@@ -17734,7 +17731,7 @@ var Vpe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(DS, "__esModule", { value: !0 });
 DS.StarLoopbackState = void 0;
-const Ype = Ku, Kpe = hr, Jpe = Ae;
+const Ype = Ju, Kpe = hr, Jpe = Ae;
 class pV extends Ype.ATNState {
   get loopEntryState() {
     return this.transition(0).target;
@@ -17763,7 +17760,7 @@ var Xpe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(wS, "__esModule", { value: !0 });
 wS.TokensStartState = void 0;
-const Zpe = hr, e1e = Yu, t1e = Ae;
+const Zpe = hr, e1e = Ku, t1e = Ae;
 class gV extends e1e.DecisionState {
   get stateType() {
     return Zpe.ATNStateType.TOKEN_START;
@@ -17825,7 +17822,7 @@ function d2() {
     };
   };
   Object.defineProperty(bp, "__esModule", { value: !0 }), bp.ATNDeserializer = void 0;
-  const n = Ym, r = qo, i = Go(), s = Vm, o = hr, u = Xm, a = hS, l = Qm, c = zo, f = pS, x = vx, h = Yu, p = HW(), m = gS, g = Ax(), y = zm, E = mS, A = yS, v = ES, _ = tV, S = nV, C = AS, b = rV, N = vS, L = n3, I = Ae, P = MN(), q = x2(), X = SS, G = CS, ue = bS, he = u3, pe = TS, ae = RS, fe = ic, re = u2, ie = PN(), D = OS, R = DS, O = i2, k = en, W = wS, H = NS, w = Wm;
+  const n = Ym, r = qo, i = Go(), s = Vm, o = hr, u = Xm, a = hS, l = Qm, c = zo, f = pS, x = vx, h = Ku, p = HW(), m = gS, g = Ax(), y = zm, E = mS, A = yS, v = ES, _ = tV, S = nV, C = AS, b = rV, N = vS, L = n3, I = Ae, P = MN(), q = x2(), X = SS, G = CS, ue = bS, he = u3, pe = TS, ae = RS, fe = ic, re = u2, ie = PN(), D = OS, R = DS, O = i2, k = en, W = wS, H = NS, w = Wm;
   var $;
   (function(Q) {
     Q[Q.UNICODE_BMP = 0] = "UNICODE_BMP", Q[Q.UNICODE_SMP = 1] = "UNICODE_SMP";
@@ -18543,7 +18540,7 @@ function jN() {
     };
   };
   Object.defineProperty(Fp, "__esModule", { value: !0 }), Fp.DefaultErrorStrategy = void 0;
-  const n = Ku, r = hr, i = oc, s = _x, o = Ax(), u = i3(), a = Ho(), l = en, c = Ae;
+  const n = Ju, r = hr, i = oc, s = _x, o = Ax(), u = i3(), a = Ho(), l = en, c = Ae;
   let f = class {
     constructor() {
       this.errorRecoveryMode = !1, this.lastErrorIndex = -1, this.nextTokensState = n.ATNState.INVALID_STATE_NUMBER;
@@ -19540,7 +19537,7 @@ var x3 = {};
  * 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.
  */
-var Xu = T && T.__decorate || function(t, e, n, r) {
+var Zu = T && T.__decorate || function(t, e, n, r) {
   var i = arguments.length, s = i < 3 ? e : r === null ? r = Object.getOwnPropertyDescriptor(e, n) : r, o;
   if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
     s = Reflect.decorate(t, e, n, r);
@@ -19551,7 +19548,7 @@ var Xu = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(x3, "__esModule", { value: !0 });
 x3.CodePointCharStream = void 0;
-const DP = yi(), eE = gl, g1e = dr, Zu = Ae;
+const DP = yi(), eE = gl, g1e = dr, ea = Ae;
 class Rs {
   // Use the factory method {@link #fromBuffer(CodePointBuffer)} to
   // construct instances of this type.
@@ -19608,35 +19605,35 @@ class Rs {
     return this._array instanceof Int32Array ? String.fromCodePoint(...Array.from(this._array.subarray(n, n + r))) : String.fromCharCode(...Array.from(this._array.subarray(n, n + r)));
   }
 }
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "consume", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "index", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "size", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "mark", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "release", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "seek", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "sourceName", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "toString", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "LA", null);
-Xu([
-  Zu.Override
+Zu([
+  ea.Override
 ], Rs.prototype, "getText", null);
 x3.CodePointCharStream = Rs;
 (function(t) {
@@ -20292,7 +20289,7 @@ function SV() {
     };
   };
   Object.defineProperty(Bp, "__esModule", { value: !0 }), Bp.ParserInterpreter = void 0;
-  const n = Ku, r = hr, i = zo, s = oc, o = _x, u = _V(), a = n3, l = Ae, c = Ae, f = g2(), x = x2(), h = so, p = i2, m = en;
+  const n = Ju, r = hr, i = zo, s = oc, o = _x, u = _V(), a = n3, l = Ae, c = Ae, f = g2(), x = x2(), h = so, p = i2, m = en;
   let g = class gD extends f.Parser {
     constructor(E, A, v, _, S) {
       if (super(E instanceof gD ? E.inputStream : S), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof gD) {
@@ -23441,7 +23438,7 @@ var It = {}, J1e = T && T.__createBinding || (Object.create ? function(t, e, n,
 };
 Object.defineProperty(It, "__esModule", { value: !0 });
 It.PropertiesContext = It.ArrayValueContext = It.ReferenceContext = It.ArrayElementContext = It.EqValueContext = It.PropNameContext = It.IdentifierContext = It.StringContext = It.TagDefContext = It.TagUpdatePropertiesContext = It.TagReplacePropertiesContext = It.TagEqContext = It.TagSpecContext = It.TagLineContext = It.MalloyTagParser = void 0;
-const ege = Go(), tge = d2(), nge = oc, P6 = i3(), rge = g2(), ea = oo(), ige = x2(), ru = so, fM = en, sge = Ts, oge = Z1e(yn);
+const ege = Go(), tge = d2(), nge = oc, P6 = i3(), rge = g2(), ta = oo(), ige = x2(), ru = so, fM = en, sge = Ts, oge = Z1e(yn);
 class ye extends rge.Parser {
   // @Override
   // @NotNull
@@ -23491,7 +23488,7 @@ class ye extends rge.Parser {
   }
   // @RuleVersion(0)
   tagSpec() {
-    let e = new Nu(this._ctx, this.state);
+    let e = new Fu(this._ctx, this.state);
     this.enterRule(e, 2, ye.RULE_tagSpec);
     let n;
     try {
@@ -23833,12 +23830,12 @@ Z\v
 KM	LELILJLKMNO\x07\x07OP
 PQ\x07\bQRS\x07\vSX\bTU\x07\fUW\bVTWZXVXYY\\ZX[]\x07\f\\[\\]]^^_\x07\r_\`h\x07	ai\x07bdcbdgeceffigehaheijjk\x07
 k"'/2=CGLX\\eh`;
-class TV extends ea.ParserRuleContext {
+class TV extends ta.ParserRuleContext {
   EOF() {
     return this.getToken(ye.EOF, 0);
   }
   tagSpec(e) {
-    return e === void 0 ? this.getRuleContexts(Nu) : this.getRuleContext(e, Nu);
+    return e === void 0 ? this.getRuleContexts(Fu) : this.getRuleContext(e, Fu);
   }
   constructor(e, n) {
     super(e, n);
@@ -23853,7 +23850,7 @@ class TV extends ea.ParserRuleContext {
   }
 }
 It.TagLineContext = TV;
-class Nu extends ea.ParserRuleContext {
+class Fu extends ta.ParserRuleContext {
   constructor(e, n) {
     super(e, n);
   }
@@ -23865,8 +23862,8 @@ class Nu extends ea.ParserRuleContext {
     super.copyFrom(e);
   }
 }
-It.TagSpecContext = Nu;
-class RV extends Nu {
+It.TagSpecContext = Fu;
+class RV extends Fu {
   propName() {
     return this.getRuleContext(0, Cx);
   }
@@ -23888,7 +23885,7 @@ class RV extends Nu {
   }
 }
 It.TagEqContext = RV;
-class OV extends Nu {
+class OV extends Fu {
   propName() {
     return this.getRuleContext(0, Cx);
   }
@@ -23910,7 +23907,7 @@ class OV extends Nu {
   }
 }
 It.TagReplacePropertiesContext = OV;
-class DV extends Nu {
+class DV extends Fu {
   propName() {
     return this.getRuleContext(0, Cx);
   }
@@ -23926,7 +23923,7 @@ class DV extends Nu {
   }
 }
 It.TagUpdatePropertiesContext = DV;
-class wV extends Nu {
+class wV extends Fu {
   propName() {
     return this.getRuleContext(0, Cx);
   }
@@ -23942,7 +23939,7 @@ class wV extends Nu {
   }
 }
 It.TagDefContext = wV;
-let PS = class extends ea.ParserRuleContext {
+let PS = class extends ta.ParserRuleContext {
   SQ_STRING() {
     return this.tryGetToken(ye.SQ_STRING, 0);
   }
@@ -23968,7 +23965,7 @@ let PS = class extends ea.ParserRuleContext {
   }
 };
 It.StringContext = PS;
-class iv extends ea.ParserRuleContext {
+class iv extends ta.ParserRuleContext {
   BQ_STRING() {
     return this.tryGetToken(ye.BQ_STRING, 0);
   }
@@ -23988,7 +23985,7 @@ class iv extends ea.ParserRuleContext {
   }
 }
 It.IdentifierContext = iv;
-class Cx extends ea.ParserRuleContext {
+class Cx extends ta.ParserRuleContext {
   identifier(e) {
     return e === void 0 ? this.getRuleContexts(iv) : this.getRuleContext(e, iv);
   }
@@ -24008,7 +24005,7 @@ class Cx extends ea.ParserRuleContext {
   }
 }
 It.PropNameContext = Cx;
-class WN extends ea.ParserRuleContext {
+class WN extends ta.ParserRuleContext {
   string() {
     return this.tryGetRuleContext(0, PS);
   }
@@ -24031,7 +24028,7 @@ class WN extends ea.ParserRuleContext {
   }
 }
 It.EqValueContext = WN;
-class sv extends ea.ParserRuleContext {
+class sv extends ta.ParserRuleContext {
   string() {
     return this.tryGetRuleContext(0, PS);
   }
@@ -24057,7 +24054,7 @@ class sv extends ea.ParserRuleContext {
   }
 }
 It.ArrayElementContext = sv;
-class MS extends ea.ParserRuleContext {
+class MS extends ta.ParserRuleContext {
   RF_BEG() {
     return this.getToken(ye.RF_BEG, 0);
   }
@@ -24080,7 +24077,7 @@ class MS extends ea.ParserRuleContext {
   }
 }
 It.ReferenceContext = MS;
-class jS extends ea.ParserRuleContext {
+class jS extends ta.ParserRuleContext {
   AR_BEG() {
     return this.getToken(ye.AR_BEG, 0);
   }
@@ -24106,7 +24103,7 @@ class jS extends ea.ParserRuleContext {
   }
 }
 It.ArrayValueContext = jS;
-class m2 extends ea.ParserRuleContext {
+class m2 extends ta.ParserRuleContext {
   PR_BEG() {
     return this.getToken(ye.PR_BEG, 0);
   }
@@ -24117,7 +24114,7 @@ class m2 extends ea.ParserRuleContext {
     return this.tryGetToken(ye.DOTTY, 0);
   }
   tagSpec(e) {
-    return e === void 0 ? this.getRuleContexts(Nu) : this.getRuleContext(e, Nu);
+    return e === void 0 ? this.getRuleContexts(Fu) : this.getRuleContext(e, Fu);
   }
   constructor(e, n) {
     super(e, n);
@@ -24149,7 +24146,7 @@ var qS = {};
  * 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.
  */
-var ta = T && T.__decorate || function(t, e, n, r) {
+var na = T && T.__decorate || function(t, e, n, r) {
   var i = arguments.length, s = i < 3 ? e : r === null ? r = Object.getOwnPropertyDescriptor(e, n) : r, o;
   if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
     s = Reflect.decorate(t, e, n, r);
@@ -24160,7 +24157,7 @@ var ta = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(qS, "__esModule", { value: !0 });
 qS.ANTLRInputStream = void 0;
-const uge = yi(), na = Ae, tE = gl;
+const uge = yi(), ra = Ae, tE = gl;
 class Wo {
   /** Copy data in string to a local char array */
   constructor(e) {
@@ -24224,35 +24221,35 @@ class Wo {
     return this.data;
   }
 }
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "consume", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "LA", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "index", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "size", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "mark", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "release", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "seek", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "getText", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "sourceName", null);
-ta([
-  na.Override
+na([
+  ra.Override
 ], Wo.prototype, "toString", null);
 qS.ANTLRInputStream = Wo;
 var LV = {};
@@ -24397,7 +24394,7 @@ var ac = T && T.__decorate || function(t, e, n, r) {
 Object.defineProperty(zS, "__esModule", { value: !0 });
 zS.LexerInterpreter = void 0;
 const cge = yl(), fge = Hm(), BV = Ae, E2 = Ae;
-let Fu = class extends cge.Lexer {
+let Lu = class extends cge.Lexer {
   constructor(e, n, r, i, s, o, u) {
     if (super(u), o.grammarType !== 0)
       throw new Error("IllegalArgumentException: The ATN must be a lexer ATN.");
@@ -24424,29 +24421,29 @@ let Fu = class extends cge.Lexer {
 };
 ac([
   BV.NotNull
-], Fu.prototype, "_vocabulary", void 0);
+], Lu.prototype, "_vocabulary", void 0);
 ac([
   E2.Override
-], Fu.prototype, "atn", null);
+], Lu.prototype, "atn", null);
 ac([
   E2.Override
-], Fu.prototype, "grammarFileName", null);
+], Lu.prototype, "grammarFileName", null);
 ac([
   E2.Override
-], Fu.prototype, "ruleNames", null);
+], Lu.prototype, "ruleNames", null);
 ac([
   E2.Override
-], Fu.prototype, "channelNames", null);
+], Lu.prototype, "channelNames", null);
 ac([
   E2.Override
-], Fu.prototype, "modeNames", null);
+], Lu.prototype, "modeNames", null);
 ac([
   E2.Override
-], Fu.prototype, "vocabulary", null);
-Fu = ac([
+], Lu.prototype, "vocabulary", null);
+Lu = ac([
   lge(1, BV.NotNull)
-], Fu);
-zS.LexerInterpreter = Fu;
+], Lu);
+zS.LexerInterpreter = Lu;
 var $V = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -25914,7 +25911,7 @@ class ni {
     return this.analyticalSQL === void 0 ? this.getSQL() : e && this.partitionSQL ? this.partitionSQL : this.analyticalSQL;
   }
 }
-class lu {
+class cu {
   constructor(e, n) {
     this.turtleDef = e, this.parent = n, this.type = "query", this.allFields = /* @__PURE__ */ new Map(), this.groupSet = 0, this.depth = 0, this.childGroups = [], this.hasHaving = !1, this.ungroupedSets = /* @__PURE__ */ new Map(), this.resultUsesUngrouped = !1, this.firstSegment = e.pipeline[0];
   }
@@ -26016,7 +26013,7 @@ class lu {
   structs() {
     const e = [];
     for (const n of this.allFields.values())
-      n instanceof lu && e.push(n);
+      n instanceof cu && e.push(n);
     return e;
   }
   // return a list of structs that match the criteria
@@ -26094,7 +26091,7 @@ class lu {
       e.assignFieldsToGroups();
   }
 }
-class qge extends lu {
+class qge extends cu {
   constructor(e) {
     super(e, void 0), this.joins = /* @__PURE__ */ new Map(), this.havings = new gn.AndChain(), this.isComplexQuery = !1, this.queryUsesPartitioning = !1, this.computeOnlyGroups = [], this.elimatedComputeGroups = !1;
   }
@@ -26284,7 +26281,7 @@ class cs extends YN {
       if (s instanceof cs) {
         if (this.firstSegment.type === "project")
           throw new Error(`Nested views cannot be used in select - '${s.fieldDef.name}'`);
-        const o = new lu(s.fieldDef, e);
+        const o = new cu(s.fieldDef, e);
         this.expandFields(o), e.add(i, o);
       } else if (s instanceof Os) {
         if (e.addField(i, s, {
@@ -26362,7 +26359,7 @@ class cs extends YN {
         } : void 0;
       }
       return;
-    } else if (e instanceof lu) {
+    } else if (e instanceof cu) {
       const n = e.turtleDef.name || e.turtleDef.as, r = n ? [n] : [], i = e.firstSegment.filterList, s = e.turtleDef.pipeline[e.turtleDef.pipeline.length - 1], o = (0, Be.isRawSegment)(s) ? void 0 : s.limit;
       let u;
       if ((0, Be.isQuerySegment)(s) && (u = s.orderBy), n)
@@ -26384,7 +26381,7 @@ class cs extends YN {
     let s = 0;
     for (const [u, a] of e.allFields) {
       const l = this.getResultMetadata(a);
-      if (a instanceof lu) {
+      if (a instanceof cu) {
         const { structDef: c } = this.generateTurtlePipelineSQL(a, new uv(!0, void 0), "<nosource>");
         if (a.getRepeatedResultType() === "nested") {
           const f = {
@@ -26637,7 +26634,7 @@ ${(0, gn.indent)(h)}) AS ${n.alias}
           } else
             rE(l.f) && (n.sql.push(`${f} as ${c}`), n.fieldIndex++);
         }
-      } else if (l instanceof lu) {
+      } else if (l instanceof cu) {
         if (l.firstSegment.type === "reduce")
           this.generateStage0Fields(l, n, r);
         else if (l.firstSegment.type === "project") {
@@ -26734,7 +26731,7 @@ WHERE NOT (${s.sqlOr()})`);
             r.sql.push(`${l} as ${a}`), r.fieldIndex++;
           }
         }
-      } else if (u instanceof lu && !(u.depth > e))
+      } else if (u instanceof cu && !(u.depth > e))
         if (u.depth === e) {
           const l = this.generateTurtleSQL(u, i, a, r.outputPipelinedSQL);
           r.groupsAggregated.push({
@@ -26779,7 +26776,7 @@ WHERE NOT (${s.sqlOr()})`);
     const o = [], u = [];
     for (const [l, c] of this.rootResult.allFields) {
       const f = this.parent.dialect.sqlMaybeQuoteIdentifier(l);
-      c instanceof ni ? c.fieldUsage.type === "result" && (mr(c.f) ? (i.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`) + ` as ${f}`), u.push(s++)) : rE(c.f) && (i.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`), this.rootResult.groupSet, f)), s++)) : c instanceof lu && (c.firstSegment.type === "reduce" ? (i.push(`${this.generateTurtleSQL(c, e, f, o)} as ${f}`), s++) : c.firstSegment.type === "project" && (i.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`), this.rootResult.groupSet, f)), s++));
+      c instanceof ni ? c.fieldUsage.type === "result" && (mr(c.f) ? (i.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`) + ` as ${f}`), u.push(s++)) : rE(c.f) && (i.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`), this.rootResult.groupSet, f)), s++)) : c instanceof cu && (c.firstSegment.type === "reduce" ? (i.push(`${this.generateTurtleSQL(c, e, f, o)} as ${f}`), s++) : c.firstSegment.type === "project" && (i.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`), this.rootResult.groupSet, f)), s++));
     }
     r += (0, gn.indent)(i.join(`,
 `)) + `
@@ -26796,7 +26793,7 @@ FROM ${n}
     const n = [];
     for (const [r, i] of e.allFields) {
       const s = this.parent.dialect.sqlMaybeQuoteIdentifier(r);
-      if (e.firstSegment.type === "reduce" && i instanceof lu) {
+      if (e.firstSegment.type === "reduce" && i instanceof cu) {
         const o = {
           type: "struct",
           sqlExpression: this.parent.dialect.sqlMaybeQuoteIdentifier(`${r}__${e.groupSet}`),
@@ -27598,7 +27595,7 @@ bf.QueryModel = eY;
     return i.composeSQLExpr;
   } });
 })(Cs);
-var ZN = {}, mu = {}, JS = {}, Kge = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
+var ZN = {}, yu = {}, JS = {}, Kge = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
   r === void 0 && (r = n);
   var i = Object.getOwnPropertyDescriptor(e, n);
   (!i || ("get" in i ? !e.__esModule : i.writable || i.configurable)) && (i = { enumerable: !0, get: function() {
@@ -29507,7 +29504,7 @@ class d extends ame.Parser {
   }
   // @RuleVersion(0)
   accessLabel() {
-    let e = new ra(this._ctx, this.state);
+    let e = new ia(this._ctx, this.state);
     this.enterRule(e, 70, d.RULE_accessLabel);
     let n;
     try {
@@ -31591,7 +31588,7 @@ class d extends ame.Parser {
   }
   // @RuleVersion(0)
   string() {
-    let e = new ia(this._ctx, this.state);
+    let e = new sa(this._ctx, this.state);
     this.enterRule(e, 224, d.RULE_string);
     try {
       switch (this.state = 1158, this._errHandler.sync(this), this._input.LA(1)) {
@@ -31651,7 +31648,7 @@ class d extends ame.Parser {
   }
   // @RuleVersion(0)
   literal() {
-    let e = new sa(this._ctx, this.state);
+    let e = new oa(this._ctx, this.state);
     this.enterRule(e, 230, d.RULE_literal);
     let n;
     try {
@@ -31702,7 +31699,7 @@ class d extends ame.Parser {
   }
   // @RuleVersion(0)
   dateLiteral() {
-    let e = new oa(this._ctx, this.state);
+    let e = new ua(this._ctx, this.state);
     this.enterRule(e, 232, d.RULE_dateLiteral);
     try {
       switch (this.state = 1180, this._errHandler.sync(this), this._input.LA(1)) {
@@ -32576,7 +32573,7 @@ class d extends ame.Parser {
   }
   // @RuleVersion(0)
   fieldPath() {
-    let e = new ua(this._ctx, this.state);
+    let e = new aa(this._ctx, this.state);
     this.enterRule(e, 284, d.RULE_fieldPath);
     try {
       let n;
@@ -34257,7 +34254,7 @@ class cv extends me.ParserRuleContext {
 F.ImportItemContext = cv;
 class i8 extends me.ParserRuleContext {
   string() {
-    return this.getRuleContext(0, ia);
+    return this.getRuleContext(0, sa);
   }
   constructor(e, n) {
     super(e, n);
@@ -35074,7 +35071,7 @@ class gY extends Yr {
     return this.getRuleContext(0, g8);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, ra);
+    return this.tryGetRuleContext(0, ia);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -35134,7 +35131,7 @@ class yY extends Yr {
     return this.tryGetToken(d.VIEW, 0);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, ra);
+    return this.tryGetRuleContext(0, ia);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -35216,7 +35213,7 @@ class vY extends Yr {
   }
 }
 F.DefIgnoreModel_stubContext = vY;
-class ra extends me.ParserRuleContext {
+class ia extends me.ParserRuleContext {
   PUBLIC_KW() {
     return this.tryGetToken(d.PUBLIC_KW, 0);
   }
@@ -35246,7 +35243,7 @@ class ra extends me.ParserRuleContext {
     return e.visitAccessLabel ? e.visitAccessLabel(this) : e.visitChildren(this);
   }
 }
-F.AccessLabelContext = ra;
+F.AccessLabelContext = ia;
 class _Y extends me.ParserRuleContext {
   fieldNameList() {
     return this.tryGetRuleContext(0, fh);
@@ -35289,7 +35286,7 @@ class rC extends me.ParserRuleContext {
     return this.getRuleContext(0, y3);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, ra);
+    return this.tryGetRuleContext(0, ia);
   }
   constructor(e, n) {
     super(e, n);
@@ -35323,7 +35320,7 @@ class iC extends me.ParserRuleContext {
     return this.getRuleContext(0, y3);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, ra);
+    return this.tryGetRuleContext(0, ia);
   }
   constructor(e, n) {
     super(e, n);
@@ -35522,7 +35519,7 @@ class E3 extends me.ParserRuleContext {
     return this.getRuleContext(0, y3);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, ra);
+    return this.tryGetRuleContext(0, ia);
   }
   constructor(e, n) {
     super(e, n);
@@ -35569,7 +35566,7 @@ class SY extends Cl {
     return this.getRuleContext(0, A3);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, ra);
+    return this.tryGetRuleContext(0, ia);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -35599,7 +35596,7 @@ class CY extends Cl {
     return this.getRuleContext(0, A3);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, ra);
+    return this.tryGetRuleContext(0, ia);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -35629,7 +35626,7 @@ class bY extends Cl {
     return this.getRuleContext(0, A3);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, ra);
+    return this.tryGetRuleContext(0, ia);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -36316,7 +36313,7 @@ class fs extends me.ParserRuleContext {
 F.SegExprContext = fs;
 class $Y extends fs {
   fieldPath() {
-    return this.getRuleContext(0, ua);
+    return this.getRuleContext(0, aa);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -37736,7 +37733,7 @@ class z8 extends me.ParserRuleContext {
 F.TopStatementContext = z8;
 class Tv extends me.ParserRuleContext {
   fieldPath() {
-    return this.tryGetRuleContext(0, ua);
+    return this.tryGetRuleContext(0, aa);
   }
   DOT() {
     return this.tryGetToken(d.DOT, 0);
@@ -37860,7 +37857,7 @@ class xC extends me.ParserRuleContext {
     return this.getToken(d.TIMEZONE, 0);
   }
   string() {
-    return this.getRuleContext(0, ia);
+    return this.getRuleContext(0, sa);
   }
   constructor(e, n) {
     super(e, n);
@@ -38062,7 +38059,7 @@ class dC extends me.ParserRuleContext {
   }
 }
 F.CompareOpContext = dC;
-class ia extends me.ParserRuleContext {
+class sa extends me.ParserRuleContext {
   shortString() {
     return this.tryGetRuleContext(0, hC);
   }
@@ -38089,7 +38086,7 @@ class ia extends me.ParserRuleContext {
     return e.visitString ? e.visitString(this) : e.visitChildren(this);
   }
 }
-F.StringContext = ia;
+F.StringContext = sa;
 class hC extends me.ParserRuleContext {
   SQ_STRING() {
     return this.tryGetToken(d.SQ_STRING, 0);
@@ -38146,7 +38143,7 @@ class K8 extends me.ParserRuleContext {
   }
 }
 F.NumericLiteralContext = K8;
-class sa extends me.ParserRuleContext {
+class oa extends me.ParserRuleContext {
   constructor(e, n) {
     super(e, n);
   }
@@ -38158,10 +38155,10 @@ class sa extends me.ParserRuleContext {
     super.copyFrom(e);
   }
 }
-F.LiteralContext = sa;
-class WY extends sa {
+F.LiteralContext = oa;
+class WY extends oa {
   string() {
-    return this.getRuleContext(0, ia);
+    return this.getRuleContext(0, sa);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -38180,7 +38177,7 @@ class WY extends sa {
   }
 }
 F.ExprStringContext = WY;
-class VY extends sa {
+class VY extends oa {
   numericLiteral() {
     return this.getRuleContext(0, K8);
   }
@@ -38201,9 +38198,9 @@ class VY extends sa {
   }
 }
 F.ExprNumberContext = VY;
-class YY extends sa {
+class YY extends oa {
   dateLiteral() {
-    return this.getRuleContext(0, oa);
+    return this.getRuleContext(0, ua);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -38222,7 +38219,7 @@ class YY extends sa {
   }
 }
 F.ExprTimeContext = YY;
-class KY extends sa {
+class KY extends oa {
   NULL() {
     return this.getToken(d.NULL, 0);
   }
@@ -38243,7 +38240,7 @@ class KY extends sa {
   }
 }
 F.ExprNULLContext = KY;
-class JY extends sa {
+class JY extends oa {
   TRUE() {
     return this.tryGetToken(d.TRUE, 0);
   }
@@ -38267,7 +38264,7 @@ class JY extends sa {
   }
 }
 F.ExprBoolContext = JY;
-class XY extends sa {
+class XY extends oa {
   HACKY_REGEX() {
     return this.getToken(d.HACKY_REGEX, 0);
   }
@@ -38288,7 +38285,7 @@ class XY extends sa {
   }
 }
 F.ExprRegexContext = XY;
-class ZY extends sa {
+class ZY extends oa {
   NOW() {
     return this.getToken(d.NOW, 0);
   }
@@ -38309,7 +38306,7 @@ class ZY extends sa {
   }
 }
 F.ExprNowContext = ZY;
-class oa extends me.ParserRuleContext {
+class ua extends me.ParserRuleContext {
   constructor(e, n) {
     super(e, n);
   }
@@ -38321,8 +38318,8 @@ class oa extends me.ParserRuleContext {
     super.copyFrom(e);
   }
 }
-F.DateLiteralContext = oa;
-class eK extends oa {
+F.DateLiteralContext = ua;
+class eK extends ua {
   LITERAL_TIMESTAMP() {
     return this.getToken(d.LITERAL_TIMESTAMP, 0);
   }
@@ -38343,7 +38340,7 @@ class eK extends oa {
   }
 }
 F.LiteralTimestampContext = eK;
-class tK extends oa {
+class tK extends ua {
   LITERAL_HOUR() {
     return this.getToken(d.LITERAL_HOUR, 0);
   }
@@ -38364,7 +38361,7 @@ class tK extends oa {
   }
 }
 F.LiteralHourContext = tK;
-class nK extends oa {
+class nK extends ua {
   LITERAL_DAY() {
     return this.getToken(d.LITERAL_DAY, 0);
   }
@@ -38385,7 +38382,7 @@ class nK extends oa {
   }
 }
 F.LiteralDayContext = nK;
-class rK extends oa {
+class rK extends ua {
   LITERAL_WEEK() {
     return this.getToken(d.LITERAL_WEEK, 0);
   }
@@ -38406,7 +38403,7 @@ class rK extends oa {
   }
 }
 F.LiteralWeekContext = rK;
-class iK extends oa {
+class iK extends ua {
   LITERAL_MONTH() {
     return this.getToken(d.LITERAL_MONTH, 0);
   }
@@ -38427,7 +38424,7 @@ class iK extends oa {
   }
 }
 F.LiteralMonthContext = iK;
-class sK extends oa {
+class sK extends ua {
   LITERAL_QUARTER() {
     return this.getToken(d.LITERAL_QUARTER, 0);
   }
@@ -38448,7 +38445,7 @@ class sK extends oa {
   }
 }
 F.LiteralQuarterContext = sK;
-class oK extends oa {
+class oK extends ua {
   LITERAL_YEAR() {
     return this.getToken(d.LITERAL_YEAR, 0);
   }
@@ -38471,7 +38468,7 @@ class oK extends oa {
 F.LiteralYearContext = oK;
 class J8 extends me.ParserRuleContext {
   string() {
-    return this.getRuleContext(0, ia);
+    return this.getRuleContext(0, sa);
   }
   constructor(e, n) {
     super(e, n);
@@ -38496,7 +38493,7 @@ class J8 extends me.ParserRuleContext {
 F.TablePathContext = J8;
 class X8 extends me.ParserRuleContext {
   string() {
-    return this.getRuleContext(0, ia);
+    return this.getRuleContext(0, sa);
   }
   constructor(e, n) {
     super(e, n);
@@ -38626,7 +38623,7 @@ class pC extends me.ParserRuleContext {
     return this.tryGetRuleContext(0, S3);
   }
   string() {
-    return this.tryGetRuleContext(0, ia);
+    return this.tryGetRuleContext(0, sa);
   }
   constructor(e, n) {
     super(e, n);
@@ -38664,7 +38661,7 @@ class be extends me.ParserRuleContext {
 F.FieldExprContext = be;
 class uK extends be {
   fieldPath() {
-    return this.getRuleContext(0, ua);
+    return this.getRuleContext(0, aa);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -38685,7 +38682,7 @@ class uK extends be {
 F.ExprFieldPathContext = uK;
 class aK extends be {
   literal() {
-    return this.getRuleContext(0, sa);
+    return this.getRuleContext(0, oa);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -39372,7 +39369,7 @@ class NK extends be {
 F.ExprPathlessAggregateContext = NK;
 class FK extends be {
   fieldPath() {
-    return this.getRuleContext(0, ua);
+    return this.getRuleContext(0, aa);
   }
   DOT() {
     return this.getToken(d.DOT, 0);
@@ -39435,7 +39432,7 @@ class LK extends be {
 F.ExprExprContext = LK;
 class IK extends be {
   fieldPath() {
-    return this.getRuleContext(0, ua);
+    return this.getRuleContext(0, aa);
   }
   DOT() {
     return this.getToken(d.DOT, 0);
@@ -39883,7 +39880,7 @@ class ch extends me.ParserRuleContext {
 F.RecordElementContext = ch;
 class MK extends ch {
   fieldPath() {
-    return this.getRuleContext(0, ua);
+    return this.getRuleContext(0, aa);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -40018,7 +40015,7 @@ class C3 extends me.ParserRuleContext {
     return this.getToken(d.STAR, 0);
   }
   fieldPath() {
-    return this.tryGetRuleContext(0, ua);
+    return this.tryGetRuleContext(0, aa);
   }
   DOT() {
     return this.tryGetToken(d.DOT, 0);
@@ -40089,7 +40086,7 @@ class yC extends me.ParserRuleContext {
     return this.getRuleContext(0, Ht);
   }
   fieldPath() {
-    return this.getRuleContext(0, ua);
+    return this.getRuleContext(0, aa);
   }
   refExpr() {
     return this.tryGetRuleContext(0, uF);
@@ -40183,7 +40180,7 @@ class Dv extends me.ParserRuleContext {
   }
 }
 F.CollectionMemberContext = Dv;
-class ua extends me.ParserRuleContext {
+class aa extends me.ParserRuleContext {
   fieldName(e) {
     return e === void 0 ? this.getRuleContexts(Tr) : this.getRuleContext(e, Tr);
   }
@@ -40210,7 +40207,7 @@ class ua extends me.ParserRuleContext {
     return e.visitFieldPath ? e.visitFieldPath(this) : e.visitChildren(this);
   }
 }
-F.FieldPathContext = ua;
+F.FieldPathContext = aa;
 class UK extends me.ParserRuleContext {
   id() {
     return this.getRuleContext(0, An);
@@ -40313,7 +40310,7 @@ class HK extends me.ParserRuleContext {
 F.NameSQLBlockContext = HK;
 class zK extends me.ParserRuleContext {
   string() {
-    return this.getRuleContext(0, ia);
+    return this.getRuleContext(0, sa);
   }
   constructor(e, n) {
     super(e, n);
@@ -40400,7 +40397,7 @@ class aF extends me.ParserRuleContext {
     return this.getToken(d.OBRACK, 0);
   }
   string() {
-    return this.getRuleContext(0, ia);
+    return this.getRuleContext(0, sa);
   }
   CBRACK() {
     return this.getToken(d.CBRACK, 0);
@@ -40463,20 +40460,20 @@ function xme(t, e) {
   return r && e.logError("ambiguous-view-type", {}), n;
 }
 A2.detectAndRemovePartialStages = xme;
-var b3 = {}, Ye = {}, AC = {}, at = {}, Lu = {};
-Object.defineProperty(Lu, "__esModule", { value: !0 });
-Lu.isNotUndefined = Lu.locationContainsPosition = void 0;
+var b3 = {}, Ye = {}, AC = {}, at = {}, Iu = {};
+Object.defineProperty(Iu, "__esModule", { value: !0 });
+Iu.isNotUndefined = Iu.locationContainsPosition = void 0;
 function dme(t, e) {
   return t.range.start.line <= e.line && t.range.end.line >= e.line && (e.line !== t.range.start.line || e.character >= t.range.start.character) && (e.line !== t.range.end.line || e.character <= t.range.end.character);
 }
-Lu.locationContainsPosition = dme;
+Iu.locationContainsPosition = dme;
 function hme(t) {
   return t !== void 0;
 }
-Lu.isNotUndefined = hme;
+Iu.isNotUndefined = hme;
 Object.defineProperty(at, "__esModule", { value: !0 });
 at.compositeFieldUsageJoinPaths = at.joinedCompositeFieldUsage = at.compositeFieldUsageDifference = at.emptyCompositeFieldUsage = at.mergeCompositeFieldUsage = at.unique = at.formatCompositeFieldUsage = at.compositeFieldUsageIsPlural = at.isEmptyCompositeFieldUsage = at.formatCompositeFieldUsages = at.compositeFieldUsagePaths = at.resolveCompositeSources = at.narrowCompositeFieldResolution = at.emptyNarrowedCompositeFieldResolution = void 0;
-const EM = Lu, U6 = Ke;
+const EM = Iu, U6 = Ke;
 function wv(t, e, n, r = void 0) {
   var i, s, o, u, a, l, c;
   let f = { ...e }, x;
@@ -40847,7 +40844,7 @@ vC.DialectNameSpace = Rme;
 var xh = {};
 Object.defineProperty(xh, "__esModule", { value: !0 });
 xh.getDialectFunctions = xh.GlobalNameSpace = void 0;
-const Ome = t2, Dme = Au, wme = Cs;
+const Ome = t2, Dme = vu, wme = Cs;
 class Nme {
   constructor() {
     this.entries = eJ();
@@ -40927,7 +40924,7 @@ _r.extendNoteHelper = tJ;
 Object.defineProperty(Ye, "__esModule", { value: !0 });
 Ye.Document = Ye.DocStatementList = Ye.ListOf = Ye.isDocStatementOrDocStatementList = Ye.isDocStatement = Ye.ExperimentalExperiment = Ye.ModelEntryReference = Ye.Unimplemented = Ye.MalloyElement = void 0;
 const AM = t2, fA = Ke, Bme = Mo, $me = AC, kme = Ds, Pme = vC, Mme = xh, vM = _r, jme = I5;
-class vu {
+class _u {
   /**
    * @param kids All children passed to the constructor are not optional
    */
@@ -40943,7 +40940,7 @@ class vu {
     for (const n in e) {
       const r = e[n];
       if (r !== void 0)
-        if (this.children[n] = r, r instanceof vu)
+        if (this.children[n] = r, r instanceof _u)
           r.parent = this;
         else
           for (const i of r)
@@ -41062,7 +41059,7 @@ class vu {
     let i = `${r}${e}<${this.elementType}>${this.varInfo()}`;
     for (const s of Object.keys(this.children)) {
       const o = this.children[s];
-      o instanceof vu ? i += `
+      o instanceof _u ? i += `
 ` + o.stringify(`${s}: `, n + 2) : (i += `
 ${r}  ${s}: [`, o.length > 0 && (i += `
 ` + o.map((u) => u.stringify("", n + 4)).join(`
@@ -41074,7 +41071,7 @@ ${r}  `), i += "]");
   *walk() {
     for (const e of Object.keys(this.children)) {
       const n = this.children[e];
-      if (n instanceof vu)
+      if (n instanceof _u)
         yield n;
       else
         for (const r of n)
@@ -41103,14 +41100,14 @@ ${r}  `), i += "]");
     return i && (i.bare() || i.has(e)) ? !0 : (n || this.logError("experiment-not-enabled", { experimentId: e }), !1);
   }
 }
-Ye.MalloyElement = vu;
-class Ume extends vu {
+Ye.MalloyElement = _u;
+class Ume extends _u {
   constructor() {
     super(...arguments), this.elementType = "unimplemented", this.reported = !1;
   }
 }
 Ye.Unimplemented = Ume;
-class yD extends vu {
+class yD extends _u {
   constructor(e) {
     super(), this.name = e, this.elementType = "modelEntryReference";
   }
@@ -41126,7 +41123,7 @@ class yD extends vu {
   }
 }
 Ye.ModelEntryReference = yD;
-class qme extends vu {
+class qme extends _u {
   constructor(e) {
     super(), this.id = e, this.elementType = "experimentalExperiment";
   }
@@ -41143,7 +41140,7 @@ function Hme(t) {
   return t instanceof T3 || nJ(t);
 }
 Ye.isDocStatementOrDocStatementList = Hme;
-class rJ extends vu {
+class rJ extends _u {
   constructor(e) {
     super(), this.elements = e, this.newContents();
   }
@@ -41202,7 +41199,7 @@ function Qme(t) {
   const e = iJ(t).join("");
   return (0, jme.v5)(e, zme);
 }
-class ED extends vu {
+class ED extends _u {
   constructor(e) {
     super(), this.elementType = "document", this.globalNameSpace = new Mme.GlobalNameSpace(), this.documentModel = {}, this.queryList = [], this.didInitModel = !1, this.annotation = {}, this.experiments = new Bme.Tag({}), this.modelAnnotationTodoList = [], this.dialectNameSpaces = /* @__PURE__ */ new Map(), this.statements = new T3(e), this.has({ statements: e });
   }
@@ -41719,7 +41716,7 @@ function R3e(t, e) {
   return r.push(...e), r;
 }
 b0.mergeFields = R3e;
-var O3 = {}, Sr = {}, _u = {}, O3e = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
+var O3 = {}, Sr = {}, Su = {}, O3e = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
   r === void 0 && (r = n);
   var i = Object.getOwnPropertyDescriptor(e, n);
   (!i || ("get" in i ? !e.__esModule : i.writable || i.configurable)) && (i = { enumerable: !0, get: function() {
@@ -41740,15 +41737,15 @@ var O3 = {}, Sr = {}, _u = {}, O3e = T && T.__createBinding || (Object.create ?
       n !== "default" && Object.prototype.hasOwnProperty.call(t, n) && O3e(e, t, n);
   return D3e(e, t), e;
 };
-Object.defineProperty(_u, "__esModule", { value: !0 });
-_u.DefinedParameter = _u.AbstractParameter = _u.SpaceParam = void 0;
+Object.defineProperty(Su, "__esModule", { value: !0 });
+Su.DefinedParameter = Su.AbstractParameter = Su.SpaceParam = void 0;
 const N3e = C0, uJ = w3e(Wt), aJ = at;
 class xF extends N3e.SpaceEntry {
   constructor() {
     super(...arguments), this.refType = "parameter";
   }
 }
-_u.SpaceParam = xF;
+Su.SpaceParam = xF;
 class F3e extends xF {
   constructor(e) {
     super(), this.astParam = e, this._parameter = void 0;
@@ -41768,7 +41765,7 @@ class F3e extends xF {
     return this.parameter().type;
   }
 }
-_u.AbstractParameter = F3e;
+Su.AbstractParameter = F3e;
 class L3e extends xF {
   constructor(e) {
     super(), this.paramDef = e;
@@ -41790,7 +41787,7 @@ class L3e extends xF {
     return this.paramDef.type;
   }
 }
-_u.DefinedParameter = L3e;
+Su.DefinedParameter = L3e;
 var Dx = {}, I3e = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
   r === void 0 && (r = n);
   var i = Object.getOwnPropertyDescriptor(e, n);
@@ -41891,7 +41888,7 @@ class z3e extends H3e.ViewField {
 CC.IRViewField = z3e;
 Object.defineProperty(Sr, "__esModule", { value: !0 });
 Sr.StaticSourceSpace = Sr.StructSpaceField = Sr.StaticSpace = void 0;
-const Q3e = Au, vd = Ke, G3e = _u, W3e = Dr, j1 = Dx, V3e = D3, Y3e = CC;
+const Q3e = vu, vd = Ke, G3e = Su, W3e = Dr, j1 = Dx, V3e = D3, Y3e = CC;
 class dF {
   constructor(e, n) {
     this.type = "fieldSpace", this.fromStruct = e, this.structDialect = n;
@@ -42033,7 +42030,7 @@ O3.JoinSpaceField = J3e;
 var S2 = {};
 Object.defineProperty(S2, "__esModule", { value: !0 });
 S2.ParameterSpace = void 0;
-const X3e = _u;
+const X3e = Su;
 class Z3e {
   constructor(e) {
     this.type = "fieldSpace", this._map = {};
@@ -42118,7 +42115,7 @@ var eye = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(SC, "__esModule", { value: !0 });
 SC.DynamicSpace = void 0;
-const rye = nye(Ke), iye = b0, sye = Xr, oye = Dr, uye = O3, aye = v2, RM = _u, lye = Sr, cye = Dx, fye = S2;
+const rye = nye(Ke), iye = b0, sye = Xr, oye = Dr, uye = O3, aye = v2, RM = Su, lye = Sr, cye = Dx, fye = S2;
 class xye extends lye.StaticSpace {
   constructor(e) {
     super(structuredClone(e), e.dialect), this.complete = !1, this.parameters = [], this.newAccessModifiers = /* @__PURE__ */ new Map(), this.newNotes = /* @__PURE__ */ new Map(), this.fromSource = e, this.sourceDef = void 0;
@@ -42324,10 +42321,10 @@ class Sye extends vye.DefinitionList {
   }
 }
 cc.DeclareFields = Sye;
-var Iu = {};
-Object.defineProperty(Iu, "__esModule", { value: !0 });
-Iu.Filter = Iu.FilterElement = void 0;
-const DM = Ke, Cye = Lu, cJ = Ye, q6 = Nn;
+var Bu = {};
+Object.defineProperty(Bu, "__esModule", { value: !0 });
+Bu.Filter = Bu.FilterElement = void 0;
+const DM = Ke, Cye = Iu, cJ = Ye, q6 = Nn;
 class bye extends cJ.MalloyElement {
   constructor(e, n) {
     super({ expr: e }), this.expr = e, this.exprSrc = n, this.elementType = "filterElement";
@@ -42349,7 +42346,7 @@ class bye extends cJ.MalloyElement {
     };
   }
 }
-Iu.FilterElement = bye;
+Bu.FilterElement = bye;
 let Tye = class extends cJ.ListOf {
   constructor() {
     super(...arguments), this.elementType = "filter", this.forceQueryClass = void 0, this.queryRefinementStage = q6.LegalRefinementStage.Head;
@@ -42385,7 +42382,7 @@ let Tye = class extends cJ.ListOf {
     }
   }
 };
-Iu.Filter = Tye;
+Bu.Filter = Tye;
 var C2 = {};
 Object.defineProperty(C2, "__esModule", { value: !0 });
 C2.FieldListEdit = void 0;
@@ -43022,7 +43019,7 @@ class OEe extends dEe.DefinitionList {
 ht.FieldReferences = OEe;
 Object.defineProperty(R3, "__esModule", { value: !0 });
 R3.RefinedSource = void 0;
-const DEe = Ke, wEe = _2, NEe = cc, FEe = Iu, LEe = C2, IEe = b2, BEe = T2, $Ee = uo, kEe = R2, PEe = T0, MEe = R0, jEe = S2, UEe = ki, LM = So, H6 = ht;
+const DEe = Ke, wEe = _2, NEe = cc, FEe = Bu, LEe = C2, IEe = b2, BEe = T2, $Ee = uo, kEe = R2, PEe = T0, MEe = R0, jEe = S2, UEe = ki, LM = So, H6 = ht;
 class qEe extends $Ee.Source {
   constructor(e, n, r) {
     super({ source: e, refinement: n }), this.source = e, this.refinement = n, this.includeList = r, this.elementType = "refinedSource", r && this.has({ includeList: r });
@@ -45940,13 +45937,13 @@ e4.ExprSum = BSe;
 var t4 = {};
 Object.defineProperty(t4, "__esModule", { value: !0 });
 t4.ExprTimeExtract = void 0;
-const va = Ke, cE = jt, J6 = ct, $Se = xc;
+const _a = Ke, cE = jt, J6 = ct, $Se = xc;
 class Gg extends J6.ExpressionDef {
   static extractor(e) {
     const n = Gg.pluralMap[e];
     if (n)
       return n;
-    if ((0, va.isExtractUnit)(e))
+    if ((0, _a.isExtractUnit)(e))
       return e;
   }
   constructor(e, n) {
@@ -45966,12 +45963,12 @@ class Gg extends J6.ExpressionDef {
             error: "extract from error",
             from: [i, s]
           });
-        if (!(0, va.isTemporalType)(i.type))
+        if (!(0, _a.isTemporalType)(i.type))
           return r.first.loggedErrorExpr("invalid-type-for-time-extraction", `Can't extract ${n} from '${i.type}'`);
-        if (!(0, va.isTemporalType)(s.type))
+        if (!(0, _a.isTemporalType)(s.type))
           return r.last.loggedErrorExpr("invalid-type-for-time-extraction", `Cannot extract ${n} from '${s.type}'`);
         let o = i.type;
-        if (!va.TD.eq(i, s)) {
+        if (!_a.TD.eq(i, s)) {
           let u = !0;
           if (o = "timestamp", i.type === "date") {
             const a = (0, J6.getMorphicValue)(i, "timestamp");
@@ -45983,25 +45980,25 @@ class Gg extends J6.ExpressionDef {
           if (u)
             return r.first.loggedErrorExpr("invalid-types-for-time-measurement", `Cannot measure from ${i.type} to ${s.type}`);
         }
-        return ["week", "month", "quarter", "year"].includes(n) ? this.loggedErrorExpr("invalid-timeframe-for-time-measurement", `Cannot measure interval using '${n}'`) : (0, va.isTimestampUnit)(n) ? (0, cE.computedExprValue)({
+        return ["week", "month", "quarter", "year"].includes(n) ? this.loggedErrorExpr("invalid-timeframe-for-time-measurement", `Cannot measure interval using '${n}'`) : (0, _a.isTimestampUnit)(n) ? (0, cE.computedExprValue)({
           dataType: { type: "number", numberType: "integer" },
           value: {
             node: "timeDiff",
             units: n,
             kids: {
-              left: (0, va.mkTemporal)(i.value, o),
-              right: (0, va.mkTemporal)(s.value, o)
+              left: (0, _a.mkTemporal)(i.value, o),
+              right: (0, _a.mkTemporal)(s.value, o)
             }
           },
           from: [i, s]
         }) : this.loggedErrorExpr("invalid-time-extraction-unit", `Cannot extract ${n} from a range`);
       } else {
         const i = r.getExpression(e);
-        return (0, va.isTemporalType)(i.type) ? (0, cE.computedExprValue)({
+        return (0, _a.isTemporalType)(i.type) ? (0, cE.computedExprValue)({
           dataType: { type: "number", numberType: "integer" },
           value: {
             node: "extract",
-            e: (0, va.mkTemporal)(i.value, i.type),
+            e: (0, _a.mkTemporal)(i.value, i.type),
             units: n
           },
           from: [i]
@@ -46080,7 +46077,7 @@ var jSe = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(Do, "__esModule", { value: !0 });
 Do.ReduceFieldSpace = Do.QuerySpace = Do.QueryOperationSpace = void 0;
-const Fv = qSe(Ke), X6 = b0, DJ = hc, tj = Dr, HSe = ht, zSe = _2, QSe = D3, GSe = Sr, WSe = r4, Ta = at, VSe = Dx;
+const Fv = qSe(Ke), X6 = b0, DJ = hc, tj = Dr, HSe = ht, zSe = _2, QSe = D3, GSe = Sr, WSe = r4, uu = at, VSe = Dx;
 class wJ extends zSe.RefinedSpace {
   get compositeFieldUsage() {
     if (this._compositeFieldUsage === void 0)
@@ -46150,14 +46147,14 @@ class wJ extends zSe.RefinedSpace {
     this.astEl.has({ reference: r });
     const i = this.exprSpace.lookup(r);
     if (i.found && i.found instanceof VSe.StructSpaceFieldBase)
-      return (n = i.found.fieldDef().onCompositeFieldUsage) !== null && n !== void 0 ? n : (0, Ta.emptyCompositeFieldUsage)();
+      return (0, uu.joinedCompositeFieldUsage)(e.slice(0, -1), (n = i.found.fieldDef().onCompositeFieldUsage) !== null && n !== void 0 ? n : (0, uu.emptyCompositeFieldUsage)());
     throw new Error("Unexpected join lookup was not found or not a struct");
   }
   getCompositeFieldUsageIncludingJoinOns(e) {
     let n = e;
-    const r = (0, Ta.compositeFieldUsageJoinPaths)(e);
+    const r = (0, uu.compositeFieldUsageJoinPaths)(e);
     for (const i of r)
-      n = (0, Ta.mergeCompositeFieldUsage)(this.getJoinOnCompositeFieldUsage(i), n);
+      n = (0, uu.mergeCompositeFieldUsage)(this.getJoinOnCompositeFieldUsage(i), n);
     return n;
   }
   addCompositeFieldUserFromFilter(e, n) {
@@ -46168,9 +46165,9 @@ class wJ extends zSe.RefinedSpace {
   }
   applyNextCompositeFieldUsage(e, n, r, i, s) {
     if (i) {
-      const o = this.getCompositeFieldUsageIncludingJoinOns((0, Ta.compositeFieldUsageDifference)(i, n));
-      if (n = (0, Ta.mergeCompositeFieldUsage)(n, o), !(0, Ta.isEmptyCompositeFieldUsage)(o)) {
-        const u = (0, Ta.narrowCompositeFieldResolution)(e, n, r);
+      const o = this.getCompositeFieldUsageIncludingJoinOns((0, uu.compositeFieldUsageDifference)(i, n));
+      if (n = (0, uu.mergeCompositeFieldUsage)(n, o), !(0, uu.isEmptyCompositeFieldUsage)(o)) {
+        const u = (0, uu.narrowCompositeFieldResolution)(e, n, r);
         u.error ? (s ?? this).logError("invalid-composite-field-usage", {
           newUsage: o,
           allUsage: n
@@ -46210,7 +46207,7 @@ class NJ extends wJ {
   }
   queryFieldDefs() {
     const e = [];
-    let n = (0, Ta.emptyCompositeFieldUsage)(), r = (0, Ta.emptyNarrowedCompositeFieldResolution)();
+    let n = (0, uu.emptyCompositeFieldUsage)(), r = (0, uu.emptyNarrowedCompositeFieldResolution)();
     const i = this.inputSpace().structDef();
     for (const s of this.compositeFieldUsers) {
       let o;
@@ -47258,13 +47255,13 @@ function BCe(t, e) {
   return r;
 }
 let dE = {};
-class Bu extends $2 {
+class $u extends $2 {
   /**
    * @param {string} name - Zone name
    * @return {IANAZone}
    */
   static create(e) {
-    return dE[e] || (dE[e] = new Bu(e)), dE[e];
+    return dE[e] || (dE[e] = new $u(e)), dE[e];
   }
   /**
    * Reset local caches. Should only be necessary in testing scenarios.
@@ -47304,7 +47301,7 @@ class Bu extends $2 {
     }
   }
   constructor(e) {
-    super(), this.zoneName = e, this.valid = Bu.isValidZone(e);
+    super(), this.zoneName = e, this.valid = $u.isValidZone(e);
   }
   /** @override **/
   get type() {
@@ -47475,7 +47472,7 @@ function e0(t, e) {
     return t;
   if (pCe(t)) {
     const n = t.toLowerCase();
-    return n === "local" || n === "system" ? e : n === "utc" || n === "gmt" ? qr.utcInstance : qr.parseSpecifier(n) || Bu.create(t);
+    return n === "local" || n === "system" ? e : n === "utc" || n === "gmt" ? qr.utcInstance : qr.parseSpecifier(n) || $u.create(t);
   } else
     return xf(t) ? qr.instance(t) : typeof t == "object" && t.offset && typeof t.offset == "number" ? t : new lX(t);
 }
@@ -47575,7 +47572,7 @@ class In {
    * @return {void}
    */
   static resetCaches() {
-    mn.resetCache(), Bu.resetCache();
+    mn.resetCache(), $u.resetCache();
   }
 }
 let hj = {};
@@ -47686,7 +47683,7 @@ class GCe {
     let i;
     if (e.zone.isUniversal) {
       const o = -1 * (e.offset / 60), u = o >= 0 ? `Etc/GMT+${o}` : `Etc/GMT${o}`;
-      e.offset !== 0 && Bu.create(u).valid ? (i = u, this.dt = e) : (i = "UTC", r.timeZoneName ? this.dt = e : this.dt = e.offset === 0 ? e : xt.fromMillis(e.ts + e.offset * 60 * 1e3));
+      e.offset !== 0 && $u.create(u).valid ? (i = u, this.dt = e) : (i = "UTC", r.timeZoneName ? this.dt = e : this.dt = e.offset === 0 ? e : xt.fromMillis(e.ts + e.offset * 60 * 1e3));
     } else
       e.zone.type === "system" ? this.dt = e : (this.dt = e, i = e.zone.name);
     const s = {
@@ -47892,7 +47889,7 @@ function Q3(t, e) {
   return [{}, i, e + 3];
 }
 function G3(t, e) {
-  const n = t[e] ? Bu.create(t[e]) : null;
+  const n = t[e] ? $u.create(t[e]) : null;
   return [{}, n, e + 1];
 }
 const r4e = RegExp(`^T?${RF.source}$`), i4e = /^-?P(?:(?:(-?\d{1,20}(?:\.\d{1,20})?)Y)?(?:(-?\d{1,20}(?:\.\d{1,20})?)M)?(?:(-?\d{1,20}(?:\.\d{1,20})?)W)?(?:(-?\d{1,20}(?:\.\d{1,20})?)D)?(?:T(?:(-?\d{1,20}(?:\.\d{1,20})?)H)?(?:(-?\d{1,20}(?:\.\d{1,20})?)M)?(?:(-?\d{1,20})(?:[.,](-?\d{1,20}))?S)?)?)$/;
@@ -49112,7 +49109,7 @@ let H1 = class {
    * @return {boolean}
    */
   static isValidIANAZone(e) {
-    return Bu.isValidZone(e);
+    return $u.isValidZone(e);
   }
   /**
    * Converts the input into a {@link Zone} instance.
@@ -49611,7 +49608,7 @@ function J4e(t) {
     }
   };
   let n = null, r;
-  return bt(t.z) || (n = Bu.create(t.z)), bt(t.Z) || (n || (n = new qr(t.Z)), r = t.Z), bt(t.q) || (t.M = (t.q - 1) * 3 + 1), bt(t.h) || (t.h < 12 && t.a === 1 ? t.h += 12 : t.h === 12 && t.a === 0 && (t.h = 0)), t.G === 0 && t.y && (t.y = -t.y), bt(t.u) || (t.S = CF(t.u)), [Object.keys(t).reduce((s, o) => {
+  return bt(t.z) || (n = $u.create(t.z)), bt(t.Z) || (n || (n = new qr(t.Z)), r = t.Z), bt(t.q) || (t.M = (t.q - 1) * 3 + 1), bt(t.h) || (t.h < 12 && t.a === 1 ? t.h += 12 : t.h === 12 && t.a === 0 && (t.h = 0)), t.G === 0 && t.y && (t.y = -t.y), bt(t.u) || (t.S = CF(t.u)), [Object.keys(t).reduce((s, o) => {
     const u = e(o);
     return u && (s[u] = t[o]), s;
   }, {}), n, r];
@@ -51423,7 +51420,7 @@ const abe = "2.5.2";
 var lbe = Ki.DateTime = xt;
 Ki.Duration = Tt;
 Ki.FixedOffsetZone = qr;
-Ki.IANAZone = Bu;
+Ki.IANAZone = $u;
 Ki.Info = H1;
 Ki.Interval = dn;
 Ki.InvalidZone = lX;
@@ -52440,7 +52437,7 @@ class ITe extends NTe.QueryOperationSpace {
 A4.IndexFieldSpace = ITe;
 Object.defineProperty(E4, "__esModule", { value: !0 });
 E4.IndexBuilder = void 0;
-const fR = Ke, BTe = Xr, $Te = Iu, kTe = K3, PTe = dc, MTe = J3, jTe = A4, xR = at;
+const fR = Ke, BTe = Xr, $Te = Bu, kTe = K3, PTe = dc, MTe = J3, jTe = A4, xR = at;
 class UTe {
   constructor(e, n, r, i) {
     this.filters = [], this.alwaysJoins = [], this.type = "index", this.resultFS = new jTe.IndexFieldSpace(e, n, r, i), this.inputFS = this.resultFS.inputSpace();
@@ -53181,7 +53178,7 @@ D4.SourceDesc = uRe;
 var w4 = {};
 Object.defineProperty(w4, "__esModule", { value: !0 });
 w4.isSourceProperty = void 0;
-const aRe = Iu, lRe = cc, cRe = C2, fRe = R0, xRe = b2, dRe = T2, hRe = R2, pRe = T0, gRe = ki;
+const aRe = Bu, lRe = cc, cRe = C2, fRe = R0, xRe = b2, dRe = T2, hRe = R2, pRe = T0, gRe = ki;
 function mRe(t) {
   return t instanceof aRe.Filter || t instanceof gRe.JoinStatement || t instanceof lRe.DeclareFields || t instanceof cRe.FieldListEdit || t instanceof fRe.Renames || t instanceof xRe.PrimaryKey || t instanceof pRe.ObjectAnnotation || t instanceof dRe.Views || t instanceof hRe.TimezoneStatement;
 }
@@ -53222,7 +53219,7 @@ I4.isQueryExtendProperty = DRe;
 var B4 = {};
 Object.defineProperty(B4, "__esModule", { value: !0 });
 B4.isFieldPropStatement = void 0;
-const wRe = D0, NRe = Iu, FRe = dc, LRe = B2;
+const wRe = D0, NRe = Bu, FRe = dc, LRe = B2;
 function IRe(t) {
   return t instanceof NRe.Filter || t instanceof FRe.Limit || t instanceof LRe.PartitionBy || t instanceof wRe.FunctionOrdering;
 }
@@ -53240,7 +53237,7 @@ B4.isFieldPropStatement = IRe;
     for (var s in r)
       s !== "default" && !Object.prototype.hasOwnProperty.call(i, s) && e(i, r, s);
   };
-  Object.defineProperty(t, "__esModule", { value: !0 }), n(zg, t), n(dh, t), n(hh, t), n(uo, t), n(R3, t), n(Vo, t), n(bC, t), n(TC, t), n(OC, t), n(L3, t), n(wC, t), n(NC, t), n(So, t), n(C2, t), n(b2, t), n(R0, t), n(T2, t), n(R2, t), n(LC, t), n(L2, t), n(IC, t), n(D0, t), n(BC, t), n(bl, t), n($C, t), n(I2, t), n(kC, t), n(PC, t), n(MC, t), n(Ga, t), n(jC, t), n(UC, t), n(qC, t), n(q3, t), n(U3, t), n(Nx, t), n(HC, t), n(zC, t), n(QC, t), n(GC, t), n(WC, t), n(VC, t), n(YC, t), n(d0, t), n(KC, t), n(JC, t), n(XC, t), n(ZC, t), n(e4, t), n(t4, t), n(n4, t), n(i4, t), n(tr, t), n(l4, t), n(B2, t), n(gh, t), n(mh, t), n(c4, t), n(Uf, t), n(xc, t), n(f4, t), n(H3, t), n(h0, t), n(Wg, t), n(x4, t), n(d4, t), n(h4, t), n(D2, t), n(O2, t), n(pc, t), n(p4, t), n(g4, t), n(m4, t), n(y4, t), n(pn, t), n(ht, t), n(C4, t), n(b4, t), n(cc, t), n(Z3, t), n(Wg, t), n(Iu, t), n(X3, t), n(K3, t), n(ki, t), n(b3, t), n(dc, t), n(ey, t), n(zg, t), n(T4, t), n(qf, t), n(R4, t), n(Y3, t), n(J3, t), n(w2, t), n(wx, t), n(M3, t), n(p0, t), n(O4, t), n(T0, t), n(Oo, t), n(D4, t), n(w4, t), n(ct, t), n(N4, t), n(hc, t), n(Ye, t), n(F4, t), n(qX, t), n(L4, t), n(I4, t), n(B4, t);
+  Object.defineProperty(t, "__esModule", { value: !0 }), n(zg, t), n(dh, t), n(hh, t), n(uo, t), n(R3, t), n(Vo, t), n(bC, t), n(TC, t), n(OC, t), n(L3, t), n(wC, t), n(NC, t), n(So, t), n(C2, t), n(b2, t), n(R0, t), n(T2, t), n(R2, t), n(LC, t), n(L2, t), n(IC, t), n(D0, t), n(BC, t), n(bl, t), n($C, t), n(I2, t), n(kC, t), n(PC, t), n(MC, t), n(Ga, t), n(jC, t), n(UC, t), n(qC, t), n(q3, t), n(U3, t), n(Nx, t), n(HC, t), n(zC, t), n(QC, t), n(GC, t), n(WC, t), n(VC, t), n(YC, t), n(d0, t), n(KC, t), n(JC, t), n(XC, t), n(ZC, t), n(e4, t), n(t4, t), n(n4, t), n(i4, t), n(tr, t), n(l4, t), n(B2, t), n(gh, t), n(mh, t), n(c4, t), n(Uf, t), n(xc, t), n(f4, t), n(H3, t), n(h0, t), n(Wg, t), n(x4, t), n(d4, t), n(h4, t), n(D2, t), n(O2, t), n(pc, t), n(p4, t), n(g4, t), n(m4, t), n(y4, t), n(pn, t), n(ht, t), n(C4, t), n(b4, t), n(cc, t), n(Z3, t), n(Wg, t), n(Bu, t), n(X3, t), n(K3, t), n(ki, t), n(b3, t), n(dc, t), n(ey, t), n(zg, t), n(T4, t), n(qf, t), n(R4, t), n(Y3, t), n(J3, t), n(w2, t), n(wx, t), n(M3, t), n(p0, t), n(O4, t), n(T0, t), n(Oo, t), n(D4, t), n(w4, t), n(ct, t), n(N4, t), n(hc, t), n(Ye, t), n(F4, t), n(qX, t), n(L4, t), n(I4, t), n(B4, t);
 })(EC);
 var $4 = {}, yh = {};
 Object.defineProperty(yh, "__esModule", { value: !0 });
@@ -53327,7 +53324,7 @@ var kRe = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty($4, "__esModule", { value: !0 });
 $4.MalloyToAST = void 0;
-const Xj = US, jRe = Im, te = MRe(EC), gR = AC, Zj = dr, URe = EC, Ln = xn, mR = Ke, qRe = Mo, HRe = yh, zRe = Lu;
+const Xj = US, jRe = Im, te = MRe(EC), gR = AC, Zj = dr, URe = EC, Ln = xn, mR = Ke, qRe = Mo, HRe = yh, zRe = Iu;
 class eU extends te.SourceQueryElement {
   constructor() {
     super(...arguments), this.elementType = "parseErrorSourceQuery";
@@ -54725,7 +54722,7 @@ j4.walkForDocumentHelpContext = oOe;
 var U4 = {};
 Object.defineProperty(U4, "__esModule", { value: !0 });
 U4.ReferenceList = void 0;
-const uOe = Lu;
+const uOe = Iu;
 class aOe {
   constructor(e) {
     this.sourceURL = e, this.references = [];
@@ -54838,9 +54835,9 @@ var gOe = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
       n !== "default" && Object.prototype.hasOwnProperty.call(t, n) && gOe(e, t, n);
   return mOe(e, t), e;
 };
-Object.defineProperty(mu, "__esModule", { value: !0 });
-mu.MalloyParserErrorHandler = mu.MalloyTranslator = mu.MalloyChildTranslator = mu.MalloyTranslation = void 0;
-const nU = US, EOe = Ke, AOe = JS, vOe = F, zX = yOe(EC), _Oe = $4, UD = AC, SOe = Wa, ER = k4, COe = P4, bOe = M4, TOe = j4, ROe = U4, $v = q4, OOe = Lu, QX = Mo, DOe = H4, wOe = z4;
+Object.defineProperty(yu, "__esModule", { value: !0 });
+yu.MalloyParserErrorHandler = yu.MalloyTranslator = yu.MalloyChildTranslator = yu.MalloyTranslation = void 0;
+const nU = US, EOe = Ke, AOe = JS, vOe = F, zX = yOe(EC), _Oe = $4, UD = AC, SOe = Wa, ER = k4, COe = P4, bOe = M4, TOe = j4, ROe = U4, $v = q4, OOe = Iu, QX = Mo, DOe = H4, wOe = z4;
 class NOe extends AOe.MalloyLexer {
   popMode() {
     return this._modeStack.isEmpty ? this._mode : super.popMode();
@@ -55394,13 +55391,13 @@ ${i}` : e = i;
     return n !== void 0 && (n.bare() || n.has("dialect", e));
   }
 }
-mu.MalloyTranslation = UF;
+yu.MalloyTranslation = UF;
 class GX extends UF {
   constructor(e, n) {
     super(e), this.root = n;
   }
 }
-mu.MalloyChildTranslator = GX;
+yu.MalloyChildTranslator = GX;
 class UOe extends UF {
   constructor(e, n = null, r = null, i = null) {
     super(e, n), this.eventStream = i, this.schemaZone = new ER.Zone(), this.importZone = new ER.Zone(), this.pretranslatedModels = /* @__PURE__ */ new Map(), this.sqlQueryZone = new ER.Zone(), this.root = this, this.logger = new UD.BaseMessageLogger(i), r && this.update(r);
@@ -55415,7 +55412,7 @@ class UOe extends UF {
     return this.logger.log((0, UD.makeLogMessage)(e, n, { severity: "error", ...r })), e;
   }
 }
-mu.MalloyTranslator = UOe;
+yu.MalloyTranslator = UOe;
 class WX {
   constructor(e, n) {
     this.translator = e, this.messages = n;
@@ -55430,7 +55427,7 @@ class WX {
     });
   }
 }
-mu.MalloyParserErrorHandler = WX;
+yu.MalloyParserErrorHandler = WX;
 function VX(t) {
   return [
     ...Object.keys(t),
@@ -55469,7 +55466,7 @@ function HOe(t, e) {
 Eh.exploreQueryWalkerBuilder = HOe;
 (function(t) {
   Object.defineProperty(t, "__esModule", { value: !0 }), t.exploreQueryWalkerBuilder = t.MalloyTranslation = t.MalloyTranslator = void 0;
-  var e = mu;
+  var e = yu;
   Object.defineProperty(t, "MalloyTranslator", { enumerable: !0, get: function() {
     return e.MalloyTranslator;
   } }), Object.defineProperty(t, "MalloyTranslation", { enumerable: !0, get: function() {
@@ -56396,10 +56393,10 @@ class hs extends qF {
   }
 }
 we.Explore = hs;
-var uu;
+var au;
 (function(t) {
   t.String = "string", t.Number = "number", t.Boolean = "boolean", t.Date = "date", t.Timestamp = "timestamp", t.Json = "json", t.NativeUnsupported = "sql native", t.Error = "error";
-})(uu || (we.AtomicFieldType = uu = {}));
+})(au || (we.AtomicFieldType = au = {}));
 class mc extends qF {
   constructor(e, n, r) {
     super(e.as || e.name, n, r), this.fieldTypeDef = e, this.parent = n;
@@ -56407,21 +56404,21 @@ class mc extends qF {
   get type() {
     switch (this.fieldTypeDef.type) {
       case "string":
-        return uu.String;
+        return au.String;
       case "boolean":
-        return uu.Boolean;
+        return au.Boolean;
       case "date":
-        return uu.Date;
+        return au.Date;
       case "timestamp":
-        return uu.Timestamp;
+        return au.Timestamp;
       case "number":
-        return uu.Number;
+        return au.Number;
       case "json":
-        return uu.Json;
+        return au.Json;
       case "sql native":
-        return uu.NativeUnsupported;
+        return au.NativeUnsupported;
       case "error":
-        return uu.Error;
+        return au.Error;
       case "record":
       case "array":
         throw new Error(`MTOY TODO IMPLEMENT Atomic ${this.fieldTypeDef.type}`);
@@ -56523,10 +56520,10 @@ var Vc;
 (function(t) {
   t.Day = "day", t.Week = "week", t.Month = "month", t.Quarter = "quarter", t.Year = "year";
 })(Vc || (we.DateTimeframe = Vc = {}));
-var au;
+var lu;
 (function(t) {
   t.Day = "day", t.Week = "week", t.Month = "month", t.Quarter = "quarter", t.Year = "year", t.Second = "second", t.Hour = "hour", t.Minute = "minute";
-})(au || (we.TimestampTimeframe = au = {}));
+})(lu || (we.TimestampTimeframe = lu = {}));
 class HF extends mc {
   constructor(e, n, r) {
     super(e, n, r), this.fieldDateDef = e;
@@ -56556,21 +56553,21 @@ class zF extends mc {
     if (this.fieldTimestampDef.timeframe !== void 0)
       switch (this.fieldTimestampDef.timeframe) {
         case "day":
-          return au.Day;
+          return lu.Day;
         case "week":
-          return au.Week;
+          return lu.Week;
         case "month":
-          return au.Month;
+          return lu.Month;
         case "quarter":
-          return au.Quarter;
+          return lu.Quarter;
         case "year":
-          return au.Year;
+          return lu.Year;
         case "second":
-          return au.Second;
+          return lu.Second;
         case "hour":
-          return au.Hour;
+          return lu.Hour;
         case "minute":
-          return au.Minute;
+          return lu.Minute;
       }
   }
 }
@@ -57391,7 +57388,7 @@ class V4 {
     return !0;
   }
 }
-class aa extends V4 {
+class la extends V4 {
   constructor(e, n, r, i) {
     super(n, r, i), this._value = e, this._field = n;
   }
@@ -57402,10 +57399,10 @@ class aa extends V4 {
     return this._field;
   }
   isScalar() {
-    return this instanceof aa;
+    return this instanceof la;
   }
 }
-class sZ extends aa {
+class sZ extends la {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -57419,7 +57416,7 @@ class sZ extends aa {
     return this.value.toLocaleLowerCase().localeCompare(e.value.toLocaleLowerCase());
   }
 }
-class oZ extends aa {
+class oZ extends la {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -57433,7 +57430,7 @@ class oZ extends aa {
     return 0;
   }
 }
-class uZ extends aa {
+class uZ extends la {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -57447,7 +57444,7 @@ class uZ extends aa {
     return this.value === e.value ? 0 : this.value ? 1 : -1;
   }
 }
-class YOe extends aa {
+class YOe extends la {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -57462,7 +57459,7 @@ class YOe extends aa {
     return n === r ? 0 : n > r ? 1 : -1;
   }
 }
-class aZ extends aa {
+class aZ extends la {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -57491,7 +57488,7 @@ function lZ(t) {
     return n.isValid || (n = rU.DateTime.fromSQL(t, { zone: "UTC" })), n.toJSDate();
   }
 }
-class cZ extends aa {
+class cZ extends la {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -57508,7 +57505,7 @@ class cZ extends aa {
     return this.value > e.value ? 1 : this.value < e.value ? -1 : 0;
   }
 }
-class fZ extends aa {
+class fZ extends la {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -57525,7 +57522,7 @@ class fZ extends aa {
     return this.value > e.value ? 1 : this.value < e.value ? -1 : 0;
   }
 }
-class KOe extends aa {
+class KOe extends la {
   get key() {
     return this.value.toString();
   }
@@ -60011,7 +60008,7 @@ function oee(t, e) {
 function uee(t) {
   return t == null || t === "" ? null : t + "";
 }
-function $u(t) {
+function ku(t) {
   const e = {}, n = t.length;
   for (let r = 0; r < n; ++r)
     e[t[r]] = !0;
@@ -60931,28 +60928,28 @@ const em = Yn((t) => {
   t.setUTCMonth(t.getUTCMonth() + e);
 }, (t, e) => e.getUTCMonth() - t.getUTCMonth() + (e.getUTCFullYear() - t.getUTCFullYear()) * 12, (t) => t.getUTCMonth());
 em.range;
-const ku = Yn((t) => {
+const Pu = Yn((t) => {
   t.setMonth(0, 1), t.setHours(0, 0, 0, 0);
 }, (t, e) => {
   t.setFullYear(t.getFullYear() + e);
 }, (t, e) => e.getFullYear() - t.getFullYear(), (t) => t.getFullYear());
-ku.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Yn((e) => {
+Pu.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Yn((e) => {
   e.setFullYear(Math.floor(e.getFullYear() / t) * t), e.setMonth(0, 1), e.setHours(0, 0, 0, 0);
 }, (e, n) => {
   e.setFullYear(e.getFullYear() + n * t);
 });
-ku.range;
-const Pu = Yn((t) => {
+Pu.range;
+const Mu = Yn((t) => {
   t.setUTCMonth(0, 1), t.setUTCHours(0, 0, 0, 0);
 }, (t, e) => {
   t.setUTCFullYear(t.getUTCFullYear() + e);
 }, (t, e) => e.getUTCFullYear() - t.getUTCFullYear(), (t) => t.getUTCFullYear());
-Pu.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Yn((e) => {
+Mu.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Yn((e) => {
   e.setUTCFullYear(Math.floor(e.getUTCFullYear() / t) * t), e.setUTCMonth(0, 1), e.setUTCHours(0, 0, 0, 0);
 }, (e, n) => {
   e.setUTCFullYear(e.getUTCFullYear() + n * t);
 });
-Pu.range;
+Mu.range;
 function Ree(t, e, n, r, i, s) {
   const o = [
     [ka, 1, Ba],
@@ -60991,7 +60988,7 @@ function Ree(t, e, n, r, i, s) {
   }
   return [u, a];
 }
-const [A8e, v8e] = Ree(Pu, em, H2, Tee, sb, rb), [_8e, S8e] = Ree(ku, Zg, q2, Ya, ib, nb), Gr = "year", As = "quarter", pi = "month", ir = "week", vs = "date", li = "day", ll = "dayofyear", Xs = "hours", Zs = "minutes", $o = "seconds", Mu = "milliseconds", Oee = [Gr, As, pi, ir, vs, li, ll, Xs, Zs, $o, Mu], OR = Oee.reduce((t, e, n) => (t[e] = 1 + n, t), {});
+const [A8e, v8e] = Ree(Mu, em, H2, Tee, sb, rb), [_8e, S8e] = Ree(Pu, Zg, q2, Ya, ib, nb), Gr = "year", As = "quarter", pi = "month", ir = "week", vs = "date", li = "day", ll = "dayofyear", Xs = "hours", Zs = "minutes", $o = "seconds", ju = "milliseconds", Oee = [Gr, As, pi, ir, vs, li, ll, Xs, Zs, $o, ju], OR = Oee.reduce((t, e, n) => (t[e] = 1 + n, t), {});
 function Dee(t) {
   const e = je(t).slice(), n = {};
   return e.length || _e("Missing time unit."), e.forEach((i) => {
@@ -61009,7 +61006,7 @@ const C8e = {
   [Xs]: "%H:00",
   [Zs]: "00:%M",
   [$o]: ":%S",
-  [Mu]: ".%L",
+  [ju]: ".%L",
   [`${Gr}-${pi}`]: "%Y-%m ",
   [`${Gr}-${pi}-${vs}`]: "%Y-%m-%d ",
   [`${Xs}-${Zs}`]: "%H:%M"
@@ -61076,7 +61073,7 @@ function N8e(t, e, n, r, i, s, o) {
   return new Date(Date.UTC(t, e, n, r, i, s, o));
 }
 function Fee(t, e, n, r, i) {
-  const s = e || 1, o = Ot(t), u = (y, E, A) => (A = A || y, F8e(n[A], r[A], y === o && s, E)), a = /* @__PURE__ */ new Date(), l = $u(t), c = l[Gr] ? u(Gr) : vi(2012), f = l[pi] ? u(pi) : l[As] ? u(As) : Kc, x = l[ir] && l[li] ? u(li, 1, ir + li) : l[ir] ? u(ir, 1) : l[li] ? u(li, 1) : l[vs] ? u(vs, 1) : l[ll] ? u(ll, 1) : ny, h = l[Xs] ? u(Xs) : Kc, p = l[Zs] ? u(Zs) : Kc, m = l[$o] ? u($o) : Kc, g = l[Mu] ? u(Mu) : Kc;
+  const s = e || 1, o = Ot(t), u = (y, E, A) => (A = A || y, F8e(n[A], r[A], y === o && s, E)), a = /* @__PURE__ */ new Date(), l = ku(t), c = l[Gr] ? u(Gr) : vi(2012), f = l[pi] ? u(pi) : l[As] ? u(As) : Kc, x = l[ir] && l[li] ? u(li, 1, ir + li) : l[ir] ? u(ir, 1) : l[li] ? u(li, 1) : l[vs] ? u(vs, 1) : l[ll] ? u(ll, 1) : ny, h = l[Xs] ? u(Xs) : Kc, p = l[Zs] ? u(Zs) : Kc, m = l[$o] ? u($o) : Kc, g = l[ju] ? u(ju) : Kc;
   return function(y) {
     a.setTime(+y);
     const E = c(a);
@@ -61098,7 +61095,7 @@ const L8e = {
   [Xs]: (t) => t.getHours(),
   [Zs]: (t) => t.getMinutes(),
   [$o]: (t) => t.getSeconds(),
-  [Mu]: (t) => t.getMilliseconds(),
+  [ju]: (t) => t.getMilliseconds(),
   [ll]: (t) => wee(t),
   [ir]: (t) => XD(t),
   [ir + li]: (t, e) => Th(XD(t), t.getDay(), ZD(e)),
@@ -61118,7 +61115,7 @@ const $8e = {
   [Xs]: (t) => t.getUTCHours(),
   [Zs]: (t) => t.getUTCMinutes(),
   [$o]: (t) => t.getUTCSeconds(),
-  [Mu]: (t) => t.getUTCMilliseconds(),
+  [ju]: (t) => t.getUTCMilliseconds(),
   [ll]: (t) => Nee(t),
   [ir]: (t) => e7(t),
   [li]: (t, e) => Th(1, t.getUTCDay(), t7(e)),
@@ -61131,7 +61128,7 @@ function P8e(t, e) {
   return Fee(t, e || 1, $8e, k8e, N8e);
 }
 const M8e = {
-  [Gr]: ku,
+  [Gr]: Pu,
   [As]: Zg.every(3),
   [pi]: Zg,
   [ir]: q2,
@@ -61141,9 +61138,9 @@ const M8e = {
   [Xs]: ib,
   [Zs]: nb,
   [$o]: ka,
-  [Mu]: Sh
+  [ju]: Sh
 }, j8e = {
-  [Gr]: Pu,
+  [Gr]: Mu,
   [As]: em.every(3),
   [pi]: em,
   [ir]: H2,
@@ -61153,7 +61150,7 @@ const M8e = {
   [Xs]: sb,
   [Zs]: rb,
   [$o]: ka,
-  [Mu]: Sh
+  [ju]: Sh
 };
 function sy(t) {
   return M8e[t];
@@ -61179,7 +61176,7 @@ function H8e(t, e, n, r) {
 function z8e(t, e, n, r) {
   return Iee(oy(t), e, n, r);
 }
-const Q1 = 1e3, G1 = Q1 * 60, W1 = G1 * 60, ob = W1 * 24, Q8e = ob * 7, DU = ob * 30, n7 = ob * 365, Bee = [Gr, pi, vs, Xs, Zs, $o, Mu], V1 = Bee.slice(0, -1), Y1 = V1.slice(0, -1), K1 = Y1.slice(0, -1), G8e = K1.slice(0, -1), W8e = [Gr, ir], wU = [Gr, pi], $ee = [Gr], g1 = [[V1, 1, Q1], [V1, 5, 5 * Q1], [V1, 15, 15 * Q1], [V1, 30, 30 * Q1], [Y1, 1, G1], [Y1, 5, 5 * G1], [Y1, 15, 15 * G1], [Y1, 30, 30 * G1], [K1, 1, W1], [K1, 3, 3 * W1], [K1, 6, 6 * W1], [K1, 12, 12 * W1], [G8e, 1, ob], [W8e, 1, Q8e], [wU, 1, DU], [wU, 3, 3 * DU], [$ee, 1, n7]];
+const Q1 = 1e3, G1 = Q1 * 60, W1 = G1 * 60, ob = W1 * 24, Q8e = ob * 7, DU = ob * 30, n7 = ob * 365, Bee = [Gr, pi, vs, Xs, Zs, $o, ju], V1 = Bee.slice(0, -1), Y1 = V1.slice(0, -1), K1 = Y1.slice(0, -1), G8e = K1.slice(0, -1), W8e = [Gr, ir], wU = [Gr, pi], $ee = [Gr], g1 = [[V1, 1, Q1], [V1, 5, 5 * Q1], [V1, 15, 15 * Q1], [V1, 30, 30 * Q1], [Y1, 1, G1], [Y1, 5, 5 * G1], [Y1, 15, 15 * G1], [Y1, 30, 30 * G1], [K1, 1, W1], [K1, 3, 3 * W1], [K1, 6, 6 * W1], [K1, 12, 12 * W1], [G8e, 1, ob], [W8e, 1, Q8e], [wU, 1, DU], [wU, 3, 3 * DU], [$ee, 1, n7]];
 function V8e(t) {
   const e = t.extent, n = t.maxbins || 40, r = Math.abs(eb(e)) / n;
   let i = iy((u) => u[2]).right(g1, r), s, o;
@@ -61541,7 +61538,7 @@ function pFe(t, e) {
   return $t(t.getHours() % 12 || 12, e, 2);
 }
 function gFe(t, e) {
-  return $t(1 + Ya.count(ku(t), t), e, 3);
+  return $t(1 + Ya.count(Pu(t), t), e, 3);
 }
 function Pee(t, e) {
   return $t(t.getMilliseconds(), e, 3);
@@ -61563,20 +61560,20 @@ function vFe(t) {
   return e === 0 ? 7 : e;
 }
 function _Fe(t, e) {
-  return $t(q2.count(ku(t) - 1, t), e, 2);
+  return $t(q2.count(Pu(t) - 1, t), e, 2);
 }
 function Mee(t) {
   var e = t.getDay();
   return e >= 4 || e === 0 ? Ch(t) : Ch.ceil(t);
 }
 function SFe(t, e) {
-  return t = Mee(t), $t(Ch.count(ku(t), t) + (ku(t).getDay() === 4), e, 2);
+  return t = Mee(t), $t(Ch.count(Pu(t), t) + (Pu(t).getDay() === 4), e, 2);
 }
 function CFe(t) {
   return t.getDay();
 }
 function bFe(t, e) {
-  return $t(Hv.count(ku(t) - 1, t), e, 2);
+  return $t(Hv.count(Pu(t) - 1, t), e, 2);
 }
 function TFe(t, e) {
   return $t(t.getFullYear() % 100, e, 2);
@@ -61605,7 +61602,7 @@ function FFe(t, e) {
   return $t(t.getUTCHours() % 12 || 12, e, 2);
 }
 function LFe(t, e) {
-  return $t(1 + g0.count(Pu(t), t), e, 3);
+  return $t(1 + g0.count(Mu(t), t), e, 3);
 }
 function jee(t, e) {
   return $t(t.getUTCMilliseconds(), e, 3);
@@ -61627,20 +61624,20 @@ function PFe(t) {
   return e === 0 ? 7 : e;
 }
 function MFe(t, e) {
-  return $t(H2.count(Pu(t) - 1, t), e, 2);
+  return $t(H2.count(Mu(t) - 1, t), e, 2);
 }
 function Uee(t) {
   var e = t.getUTCDay();
   return e >= 4 || e === 0 ? bh(t) : bh.ceil(t);
 }
 function jFe(t, e) {
-  return t = Uee(t), $t(bh.count(Pu(t), t) + (Pu(t).getUTCDay() === 4), e, 2);
+  return t = Uee(t), $t(bh.count(Mu(t), t) + (Mu(t).getUTCDay() === 4), e, 2);
 }
 function UFe(t) {
   return t.getUTCDay();
 }
 function qFe(t, e) {
-  return $t(zv.count(Pu(t) - 1, t), e, 2);
+  return $t(zv.count(Mu(t) - 1, t), e, 2);
 }
 function HFe(t, e) {
   return $t(t.getUTCFullYear() % 100, e, 2);
@@ -61775,7 +61772,7 @@ function i7(t) {
 }
 function UU(t, e, n) {
   n = n || {}, ze(n) || _e(`Invalid time multi-format specifier: ${n}`);
-  const r = e($o), i = e(Zs), s = e(Xs), o = e(vs), u = e(ir), a = e(pi), l = e(As), c = e(Gr), f = t(n[Mu] || ".%L"), x = t(n[$o] || ":%S"), h = t(n[Zs] || "%I:%M"), p = t(n[Xs] || "%I %p"), m = t(n[vs] || n[li] || "%a %d"), g = t(n[ir] || "%b %d"), y = t(n[pi] || "%B"), E = t(n[As] || "%B"), A = t(n[Gr] || "%Y");
+  const r = e($o), i = e(Zs), s = e(Xs), o = e(vs), u = e(ir), a = e(pi), l = e(As), c = e(Gr), f = t(n[ju] || ".%L"), x = t(n[$o] || ":%S"), h = t(n[Zs] || "%I:%M"), p = t(n[Xs] || "%I %p"), m = t(n[vs] || n[li] || "%a %d"), g = t(n[ir] || "%b %d"), y = t(n[pi] || "%B"), E = t(n[As] || "%B"), A = t(n[Gr] || "%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 Gee(t) {
@@ -62471,7 +62468,7 @@ function z9e(t) {
       for (i = r.length; --i >= 0; )
         e.push(n = r[i]), n === t && _e("Cycle detected in dataflow graph.");
 }
-const Gv = {}, cu = 1, Yl = 2, Ra = 4, Q9e = cu | Yl, GU = cu | Ra, sd = cu | Yl | Ra, WU = 8, A1 = 16, VU = 32, YU = 64;
+const Gv = {}, fu = 1, Yl = 2, Ra = 4, Q9e = fu | Yl, GU = fu | Ra, sd = fu | Yl | Ra, WU = 8, A1 = 16, VU = 32, YU = 64;
 function pf(t, e, n) {
   this.dataflow = t, this.stamp = e ?? -1, this.add = [], this.rem = [], this.mod = [], this.fields = null, this.encode = n || null;
 }
@@ -62496,7 +62493,7 @@ pf.prototype = {
   /**
    * Boolean flag indicating ADD (added) tuples.
    */
-  ADD: cu,
+  ADD: fu,
   /**
    * Boolean flag indicating REM (removed) tuples.
    */
@@ -62591,7 +62588,7 @@ pf.prototype = {
    */
   init(t, e) {
     const n = this;
-    return n.stamp = t.stamp, n.encode = t.encode, t.fields && !(e & YU) && (n.fields = t.fields), e & cu ? (n.addF = t.addF, n.add = t.add) : (n.addF = null, n.add = []), e & Yl ? (n.remF = t.remF, n.rem = t.rem) : (n.remF = null, n.rem = []), e & Ra ? (n.modF = t.modF, n.mod = t.mod) : (n.modF = null, n.mod = []), e & VU ? (n.srcF = null, n.source = null) : (n.srcF = t.srcF, n.source = t.source, t.cleans && (n.cleans = t.cleans)), n;
+    return n.stamp = t.stamp, n.encode = t.encode, t.fields && !(e & YU) && (n.fields = t.fields), e & fu ? (n.addF = t.addF, n.add = t.add) : (n.addF = null, n.add = []), e & Yl ? (n.remF = t.remF, n.rem = t.rem) : (n.remF = null, n.rem = []), e & Ra ? (n.modF = t.modF, n.mod = t.mod) : (n.modF = null, n.mod = []), e & VU ? (n.srcF = null, n.source = null) : (n.srcF = t.srcF, n.source = t.source, t.cleans && (n.cleans = t.cleans)), n;
   },
   /**
    * Schedules a function to run after pulse propagation completes.
@@ -62609,7 +62606,7 @@ pf.prototype = {
    */
   changed(t) {
     const e = t || sd;
-    return e & cu && this.add.length || e & Yl && this.rem.length || e & Ra && this.mod.length;
+    return e & fu && this.add.length || e & Yl && this.rem.length || e & Ra && this.mod.length;
   },
   /**
    * Forces a "reflow" of tuple values, such that all tuples in the backing
@@ -62622,7 +62619,7 @@ pf.prototype = {
     if (t)
       return this.fork(sd).reflow();
     const e = this.add.length, n = this.source && this.source.length;
-    return n && n !== e && (this.mod = this.source, e && this.filter(Ra, KU(this, cu))), this;
+    return n && n !== e && (this.mod = this.source, e && this.filter(Ra, KU(this, fu))), this;
   },
   /**
    * Get/set metadata to pulse requesting garbage collection
@@ -62671,7 +62668,7 @@ pf.prototype = {
    */
   filter(t, e) {
     const n = this;
-    return t & cu && (n.addF = SE(n.addF, e)), t & Yl && (n.remF = SE(n.remF, e)), t & Ra && (n.modF = SE(n.modF, e)), t & A1 && (n.srcF = SE(n.srcF, e)), n;
+    return t & fu && (n.addF = SE(n.addF, e)), t & Yl && (n.remF = SE(n.remF, e)), t & Ra && (n.modF = SE(n.modF, e)), t & A1 && (n.srcF = SE(n.srcF, e)), n;
   },
   /**
    * Materialize one or more tuple sets in this pulse. If the tuple set(s) have
@@ -62683,7 +62680,7 @@ pf.prototype = {
   materialize(t) {
     t = t || sd;
     const e = this;
-    return t & cu && e.addF && (e.add = FR(e.add, e.addF), e.addF = null), t & Yl && e.remF && (e.rem = FR(e.rem, e.remF), e.remF = null), t & Ra && e.modF && (e.mod = FR(e.mod, e.modF), e.modF = null), t & A1 && e.srcF && (e.source = e.source.filter(e.srcF), e.srcF = null), e;
+    return t & fu && e.addF && (e.add = FR(e.add, e.addF), e.addF = null), t & Yl && e.remF && (e.rem = FR(e.rem, e.remF), e.remF = null), t & Ra && e.modF && (e.mod = FR(e.mod, e.modF), e.modF = null), t & A1 && e.srcF && (e.source = e.source.filter(e.srcF), e.srcF = null), e;
   },
   /**
    * Visit one or more tuple sets in this pulse.
@@ -62697,7 +62694,7 @@ pf.prototype = {
     const n = this, r = e;
     if (t & A1)
       return zc(n.source, n.srcF, r), n;
-    t & cu && zc(n.add, n.addF, r), t & Yl && zc(n.rem, n.remF, r), t & Ra && zc(n.mod, n.modF, r);
+    t & fu && zc(n.add, n.addF, r), t & Yl && zc(n.rem, n.remF, r), t & Ra && zc(n.mod, n.modF, r);
     const i = n.source;
     if (t & WU && i) {
       const s = n.add.length + n.mod.length;
@@ -66762,7 +66759,7 @@ function m0(t, e) {
   return null;
 }
 const zIe = () => typeof Image < "u" ? Image : null;
-function la(t, e) {
+function ca(t, e) {
   switch (arguments.length) {
     case 0:
       break;
@@ -66815,7 +66812,7 @@ function Z9() {
     return arguments.length ? (r = s, i) : r;
   }, i.copy = function() {
     return Z9(e, n).unknown(r);
-  }, la.apply(i, arguments), i;
+  }, ca.apply(i, arguments), i;
 }
 function G2(t, e, n) {
   t.prototype = e.prototype = n, n.constructor = t;
@@ -66828,7 +66825,7 @@ function cy(t, e) {
 }
 function Ec() {
 }
-var Qf = 0.7, Oh = 1 / Qf, jd = "\\s*([+-]?\\d+)\\s*", im = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*", Su = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*", QIe = /^#([0-9a-f]{3,8})$/, GIe = new RegExp(`^rgb\\(${jd},${jd},${jd}\\)$`), WIe = new RegExp(`^rgb\\(${Su},${Su},${Su}\\)$`), VIe = new RegExp(`^rgba\\(${jd},${jd},${jd},${im}\\)$`), YIe = new RegExp(`^rgba\\(${Su},${Su},${Su},${im}\\)$`), KIe = new RegExp(`^hsl\\(${im},${Su},${Su}\\)$`), JIe = new RegExp(`^hsla\\(${im},${Su},${Su},${im}\\)$`), uq = {
+var Qf = 0.7, Oh = 1 / Qf, jd = "\\s*([+-]?\\d+)\\s*", im = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*", Cu = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*", QIe = /^#([0-9a-f]{3,8})$/, GIe = new RegExp(`^rgb\\(${jd},${jd},${jd}\\)$`), WIe = new RegExp(`^rgb\\(${Cu},${Cu},${Cu}\\)$`), VIe = new RegExp(`^rgba\\(${jd},${jd},${jd},${im}\\)$`), YIe = new RegExp(`^rgba\\(${Cu},${Cu},${Cu},${im}\\)$`), KIe = new RegExp(`^hsl\\(${im},${Cu},${Cu}\\)$`), JIe = new RegExp(`^hsla\\(${im},${Cu},${Cu},${im}\\)$`), uq = {
   aliceblue: 15792383,
   antiquewhite: 16444375,
   aqua: 65535,
@@ -67124,26 +67121,26 @@ function kR(t, e, n) {
 }
 const pne = Math.PI / 180, gne = 180 / Math.PI, Zv = 18, mne = 0.96422, yne = 1, Ene = 0.82521, Ane = 4 / 29, Ud = 6 / 29, vne = 3 * Ud * Ud, tBe = Ud * Ud * Ud;
 function _ne(t) {
-  if (t instanceof Cu)
-    return new Cu(t.l, t.a, t.b, t.opacity);
+  if (t instanceof bu)
+    return new bu(t.l, t.a, t.b, t.opacity);
   if (t instanceof Pa)
     return Sne(t);
   t instanceof sr || (t = eL(t));
   var e = UR(t.r), n = UR(t.g), r = UR(t.b), i = PR((0.2225045 * e + 0.7168786 * n + 0.0606169 * r) / yne), s, o;
-  return e === n && n === r ? s = o = i : (s = PR((0.4360747 * e + 0.3850649 * n + 0.1430804 * r) / mne), o = PR((0.0139322 * e + 0.0971045 * n + 0.7141733 * r) / Ene)), new Cu(116 * i - 16, 500 * (s - i), 200 * (i - o), t.opacity);
+  return e === n && n === r ? s = o = i : (s = PR((0.4360747 * e + 0.3850649 * n + 0.1430804 * r) / mne), o = PR((0.0139322 * e + 0.0971045 * n + 0.7141733 * r) / Ene)), new bu(116 * i - 16, 500 * (s - i), 200 * (i - o), t.opacity);
 }
 function e_(t, e, n, r) {
-  return arguments.length === 1 ? _ne(t) : new Cu(t, e, n, r ?? 1);
+  return arguments.length === 1 ? _ne(t) : new bu(t, e, n, r ?? 1);
 }
-function Cu(t, e, n, r) {
+function bu(t, e, n, r) {
   this.l = +t, this.a = +e, this.b = +n, this.opacity = +r;
 }
-G2(Cu, e_, cy(Ec, {
+G2(bu, e_, cy(Ec, {
   brighter(t) {
-    return new Cu(this.l + Zv * (t ?? 1), this.a, this.b, this.opacity);
+    return new bu(this.l + Zv * (t ?? 1), this.a, this.b, this.opacity);
   },
   darker(t) {
-    return new Cu(this.l - Zv * (t ?? 1), this.a, this.b, this.opacity);
+    return new bu(this.l - Zv * (t ?? 1), this.a, this.b, this.opacity);
   },
   rgb() {
     var t = (this.l + 16) / 116, e = isNaN(this.a) ? t : t + this.a / 500, n = isNaN(this.b) ? t : t - this.b / 200;
@@ -67170,7 +67167,7 @@ function UR(t) {
 function nBe(t) {
   if (t instanceof Pa)
     return new Pa(t.h, t.c, t.l, t.opacity);
-  if (t instanceof Cu || (t = _ne(t)), t.a === 0 && t.b === 0)
+  if (t instanceof bu || (t = _ne(t)), t.a === 0 && t.b === 0)
     return new Pa(NaN, 0 < t.l && t.l < 100 ? 0 : NaN, t.l, t.opacity);
   var e = Math.atan2(t.b, t.a) * gne;
   return new Pa(e < 0 ? e + 360 : e, Math.sqrt(t.a * t.a + t.b * t.b), t.l, t.opacity);
@@ -67183,9 +67180,9 @@ function Pa(t, e, n, r) {
 }
 function Sne(t) {
   if (isNaN(t.h))
-    return new Cu(t.l, 0, 0, t.opacity);
+    return new bu(t.l, 0, 0, t.opacity);
   var e = t.h * pne;
-  return new Cu(t.l, Math.cos(e) * t.c, Math.sin(e) * t.c, t.opacity);
+  return new bu(t.l, Math.cos(e) * t.c, Math.sin(e) * t.c, t.opacity);
 }
 G2(Pa, t_, cy(Ec, {
   brighter(t) {
@@ -67690,7 +67687,7 @@ function qne() {
   var t = jne();
   return t.copy = function() {
     return xy(t, qne());
-  }, la.apply(t, arguments), Mx(t);
+  }, ca.apply(t, arguments), Mx(t);
 }
 function Hne(t) {
   var e;
@@ -67788,7 +67785,7 @@ function sL(t) {
 }
 function Qne() {
   const t = sL(mb()).domain([1, 10]);
-  return t.copy = () => xy(t, Qne()).base(t.base()), la.apply(t, arguments), t;
+  return t.copy = () => xy(t, Qne()).base(t.base()), ca.apply(t, arguments), t;
 }
 function Cq(t) {
   return function(e) {
@@ -67810,7 +67807,7 @@ function Gne() {
   var t = oL(mb());
   return t.copy = function() {
     return xy(t, Gne()).constant(t.constant());
-  }, la.apply(t, arguments);
+  }, ca.apply(t, arguments);
 }
 function Tq(t) {
   return function(e) {
@@ -67836,7 +67833,7 @@ function aL() {
   var t = uL(mb());
   return t.copy = function() {
     return xy(t, aL()).exponent(t.exponent());
-  }, la.apply(t, arguments), t;
+  }, ca.apply(t, arguments), t;
 }
 function UBe() {
   return aL.apply(null, arguments).exponent(0.5);
@@ -67873,7 +67870,7 @@ function Wne() {
     return n.slice();
   }, s.copy = function() {
     return Wne().domain(t).range(e).unknown(r);
-  }, la.apply(s, arguments);
+  }, ca.apply(s, arguments);
 }
 function Vne() {
   var t = 0, e = 1, n = 1, r = [0.5], i = [0, 1], s;
@@ -67899,7 +67896,7 @@ function Vne() {
     return r.slice();
   }, o.copy = function() {
     return Vne().domain([t, e]).range(i).unknown(s);
-  }, la.apply(Mx(o), arguments);
+  }, ca.apply(Mx(o), arguments);
 }
 function Yne() {
   var t = [0.5], e = [0, 1], n, r = 1;
@@ -67917,7 +67914,7 @@ function Yne() {
     return arguments.length ? (n = s, i) : n;
   }, i.copy = function() {
     return Yne().domain(t).range(e).unknown(n);
-  }, la.apply(i, arguments);
+  }, ca.apply(i, arguments);
 }
 function qBe(t) {
   return new Date(t);
@@ -67947,10 +67944,10 @@ function lL(t, e, n, r, i, s, o, u, a, l) {
   }, c;
 }
 function zBe() {
-  return la.apply(lL(_8e, S8e, ku, Zg, q2, Ya, ib, nb, ka, u9).domain([new Date(2e3, 0, 1), new Date(2e3, 0, 2)]), arguments);
+  return ca.apply(lL(_8e, S8e, Pu, Zg, q2, Ya, ib, nb, ka, u9).domain([new Date(2e3, 0, 1), new Date(2e3, 0, 2)]), arguments);
 }
 function QBe() {
-  return la.apply(lL(A8e, v8e, Pu, em, H2, g0, sb, rb, ka, a9).domain([Date.UTC(2e3, 0, 1), Date.UTC(2e3, 0, 2)]), arguments);
+  return ca.apply(lL(A8e, v8e, Mu, em, H2, g0, sb, rb, ka, a9).domain([Date.UTC(2e3, 0, 1), Date.UTC(2e3, 0, 2)]), arguments);
 }
 function yb() {
   var t = 0, e = 1, n, r, i, s, o = ji, u = !1, a;
@@ -68061,7 +68058,7 @@ function dL(t, e, n) {
   const r = t - e + n * 2;
   return t ? r > 0 ? r : 1 : 0;
 }
-const VBe = "identity", Dh = "linear", fl = "log", dy = "pow", hy = "sqrt", Ab = "symlog", Gf = "time", Wf = "utc", bu = "sequential", W2 = "diverging", wh = "quantile", vb = "quantize", _b = "threshold", hL = "ordinal", m7 = "point", tre = "band", pL = "bin-ordinal", Kn = "continuous", py = "discrete", gy = "discretizing", ao = "interpolating", gL = "temporal";
+const VBe = "identity", Dh = "linear", fl = "log", dy = "pow", hy = "sqrt", Ab = "symlog", Gf = "time", Wf = "utc", Tu = "sequential", W2 = "diverging", wh = "quantile", vb = "quantize", _b = "threshold", hL = "ordinal", m7 = "point", tre = "band", pL = "bin-ordinal", Kn = "continuous", py = "discrete", gy = "discretizing", ao = "interpolating", gL = "temporal";
 function YBe(t) {
   return function(e) {
     let n = e[0], r = e[1], i;
@@ -68164,7 +68161,7 @@ function n$e(t, e, n) {
     const s = e();
     return s.invertRange || (s.invertRange = s.invert ? YBe(s) : s.invertExtent ? KBe(s) : void 0), s.type = t, sre(s);
   };
-  return r.metadata = $u(je(n)), r;
+  return r.metadata = ku(je(n)), r;
 }
 function kt(t, e, n) {
   return arguments.length > 1 ? (n_.set(t, n$e(t, e, n)), this) : ore(t) ? n_.get(t) : void 0;
@@ -68177,12 +68174,12 @@ kt(hy, UBe, Kn);
 kt(Ab, Gne, Kn);
 kt(Gf, zBe, [Kn, gL]);
 kt(Wf, QBe, [Kn, gL]);
-kt(bu, cL, [Kn, ao]);
-kt(`${bu}-${Dh}`, cL, [Kn, ao]);
-kt(`${bu}-${fl}`, Kne, [Kn, ao, fl]);
-kt(`${bu}-${dy}`, fL, [Kn, ao]);
-kt(`${bu}-${hy}`, GBe, [Kn, ao]);
-kt(`${bu}-${Ab}`, Jne, [Kn, ao]);
+kt(Tu, cL, [Kn, ao]);
+kt(`${Tu}-${Dh}`, cL, [Kn, ao]);
+kt(`${Tu}-${fl}`, Kne, [Kn, ao, fl]);
+kt(`${Tu}-${dy}`, fL, [Kn, ao]);
+kt(`${Tu}-${hy}`, GBe, [Kn, ao]);
+kt(`${Tu}-${Ab}`, Jne, [Kn, ao]);
 kt(`${W2}-${Dh}`, Xne, [Kn, ao]);
 kt(`${W2}-${fl}`, Zne, [Kn, ao, fl]);
 kt(`${W2}-${dy}`, xL, [Kn, ao]);
@@ -68587,7 +68584,7 @@ function N$e(t, e, n) {
     }
   return r;
 }
-const k0 = Math.PI / 180, F$e = 1e-14, Xc = Math.PI / 2, du = Math.PI * 2, od = Math.sqrt(3) / 2;
+const k0 = Math.PI / 180, F$e = 1e-14, Xc = Math.PI / 2, hu = Math.PI * 2, od = Math.sqrt(3) / 2;
 var HR = {}, zR = {}, Cre = [].join;
 function L$e(t, e, n, r, i, s, o, u, a) {
   const l = Cre.call(arguments);
@@ -68605,7 +68602,7 @@ function L$e(t, e, n, r, i, s, o, u, a) {
   s == i && (L = -L);
   const I = 0.5 * (v + S) - L * (C - _), P = 0.5 * (_ + C) + L * (S - v), q = Math.atan2(_ - P, v - I);
   let G = Math.atan2(C - P, S - I) - q;
-  G < 0 && s === 1 ? G += du : G > 0 && s === 0 && (G -= du);
+  G < 0 && s === 1 ? G += hu : G > 0 && s === 0 && (G -= hu);
   const ue = Math.ceil(Math.abs(G / (Xc + 1e-3))), he = [];
   for (let pe = 0; pe < ue; ++pe) {
     const ae = q + pe * G / ue, fe = q + (pe + 1) * G / ue;
@@ -68741,7 +68738,7 @@ const Fq = 0.5773502691896257, Lq = {
   circle: {
     draw: function(t, e) {
       const n = Math.sqrt(e) / 2;
-      t.moveTo(n, 0), t.arc(0, 0, n, 0, du);
+      t.moveTo(n, 0), t.arc(0, 0, n, 0, hu);
     }
   },
   cross: {
@@ -68839,14 +68836,14 @@ function j$e(t) {
 function U$e(t) {
   return t.height;
 }
-function _a(t) {
+function Sa(t) {
   return typeof t == "function" ? t : () => +t;
 }
 function DE(t, e, n) {
   return Math.max(e, Math.min(t, n));
 }
 function q$e() {
-  var t = P$e, e = M$e, n = j$e, r = U$e, i = _a(0), s = i, o = i, u = i, a = null;
+  var t = P$e, e = M$e, n = j$e, r = U$e, i = Sa(0), s = i, o = i, u = i, a = null;
   function l(c, f, x) {
     var h, p = f ?? +t.call(this, c), m = x ?? +e.call(this, c), g = +n.call(this, c), y = +r.call(this, c), E = Math.min(g, y) / 2, A = DE(+i.call(this, c), 0, E), v = DE(+s.call(this, c), 0, E), _ = DE(+o.call(this, c), 0, E), S = DE(+u.call(this, c), 0, E);
     if (a || (a = h = W9()), A <= 0 && v <= 0 && _ <= 0 && S <= 0)
@@ -68859,15 +68856,15 @@ function q$e() {
       return a = null, h + "" || null;
   }
   return l.x = function(c) {
-    return arguments.length ? (t = _a(c), l) : t;
+    return arguments.length ? (t = Sa(c), l) : t;
   }, l.y = function(c) {
-    return arguments.length ? (e = _a(c), l) : e;
+    return arguments.length ? (e = Sa(c), l) : e;
   }, l.width = function(c) {
-    return arguments.length ? (n = _a(c), l) : n;
+    return arguments.length ? (n = Sa(c), l) : n;
   }, l.height = function(c) {
-    return arguments.length ? (r = _a(c), l) : r;
+    return arguments.length ? (r = Sa(c), l) : r;
   }, l.cornerRadius = function(c, f, x, h) {
-    return arguments.length ? (i = _a(c), s = f != null ? _a(f) : i, u = x != null ? _a(x) : i, o = h != null ? _a(h) : s, l) : i;
+    return arguments.length ? (i = Sa(c), s = f != null ? Sa(f) : i, u = x != null ? Sa(x) : i, o = h != null ? Sa(h) : s, l) : i;
   }, l.context = function(c) {
     return arguments.length ? (a = c ?? null, l) : a;
   }, l;
@@ -68882,7 +68879,7 @@ function H$e() {
         var y = Math.sqrt(m * m + g * g), E = (m /= y) * a, A = (g /= y) * a, v = Math.atan2(g, m);
         i.moveTo(o - E, u - A), i.lineTo(f - m * p, x - g * p), i.arc(f, x, p, v - Math.PI, v), i.lineTo(o + E, u + A), i.arc(o, u, a, v, v + Math.PI);
       } else
-        i.arc(f, x, p, 0, du);
+        i.arc(f, x, p, 0, hu);
       i.closePath();
     } else
       s = 1;
@@ -69083,7 +69080,7 @@ function _c(t, e, n) {
 function vke(t, e) {
   return t.strokeJoin && t.strokeJoin !== "miter" ? 0 : e;
 }
-const _ke = du - 1e-8;
+const _ke = hu - 1e-8;
 let Cb, AA, vA, of, A7, _A, v7, _7;
 const r0 = (t, e) => Cb.add(t, e), SA = (t, e) => r0(AA = t, vA = e), Bq = (t) => r0(t, Cb.y1), $q = (t) => r0(Cb.x1, t), Zc = (t, e) => A7 * t + v7 * e, ef = (t, e) => _A * t + _7 * e, GR = (t, e) => r0(Zc(t, e), ef(t, e)), WR = (t, e) => SA(Zc(t, e), ef(t, e));
 function bb(t, e) {
@@ -69114,8 +69111,8 @@ const Ske = {
       const o = (l) => r0(n * Math.cos(l) + t, n * Math.sin(l) + e);
       let u, a;
       if (o(r), o(i), i !== r)
-        if (r = r % du, r < 0 && (r += du), i = i % du, i < 0 && (i += du), i < r && (s = !s, u = r, r = i, i = u), s)
-          for (i -= du, u = r - r % Xc, a = 0; a < 4 && u > i; ++a, u -= Xc)
+        if (r = r % hu, r < 0 && (r += hu), i = i % hu, i < 0 && (i += hu), i < r && (s = !s, u = r, r = i, i = u), s)
+          for (i -= hu, u = r - r % Xc, a = 0; a < 4 && u > i; ++a, u -= Xc)
             o(u);
         else
           for (u = r - r % Xc + Xc, a = 0; a < 4 && u < i; ++a, u = u + Xc)
@@ -69240,7 +69237,7 @@ function wre(t) {
     r = e[i], r.index = i, r.zindex && n.push(r);
   return t.zdirty = !1, t.zitems = n.sort(Rke);
 }
-function ju(t, e) {
+function Uu(t, e) {
   var n = t.items, r, i;
   if (!n || !n.length)
     return;
@@ -69270,7 +69267,7 @@ function C7(t, e) {
 }
 function OL(t) {
   return function(e, n, r) {
-    ju(n, (i) => {
+    Uu(n, (i) => {
       (!r || r.intersects(i.bounds)) && Nre(t, e, i, i);
     });
   };
@@ -69432,9 +69429,9 @@ function um(t, e, n, r) {
 }
 const Hke = Ay(um), zke = Ay(um, !1), Qke = Ay(um, !0);
 function Gke(t, e, n) {
-  ju(e, (r) => {
+  Uu(e, (r) => {
     const i = r.x || 0, s = r.y || 0, o = r.strokeForeground, u = r.opacity == null ? 1 : r.opacity;
-    (r.stroke || r.fill) && u && (um(t, r, i, s), Fh(t, r), r.fill && s_(t, r, u) && t.fill(), r.stroke && !o && Lh(t, r, u) && t.stroke()), t.save(), t.translate(i, s), r.clip && Lre(t, r), n && n.translate(-i, -s), ju(r, (a) => {
+    (r.stroke || r.fill) && u && (um(t, r, i, s), Fh(t, r), r.fill && s_(t, r, u) && t.fill(), r.stroke && !o && Lh(t, r, u) && t.stroke()), t.save(), t.translate(i, s), r.clip && Lre(t, r), n && n.translate(-i, -s), Uu(r, (a) => {
       this.draw(t, a, n);
     }), n && n.translate(i, s), t.restore(), o && r.stroke && u && (um(t, r, i, s), Fh(t, r), Lh(t, r, u) && t.stroke());
   });
@@ -69509,7 +69506,7 @@ function Jke(t, e) {
   return t.set(s, o, s + r, o + i);
 }
 function Xke(t, e, n) {
-  ju(e, (r) => {
+  Uu(e, (r) => {
     if (n && !n.intersects(r.bounds))
       return;
     const i = LL(r, this);
@@ -69590,7 +69587,7 @@ function $re(t, e, n) {
   return e.stroke && Lh(t, e, n) ? (r = e.x || 0, i = e.y || 0, s = e.x2 != null ? e.x2 : r, o = e.y2 != null ? e.y2 : i, t.beginPath(), t.moveTo(r, i), t.lineTo(s, o), !0) : !1;
 }
 function lPe(t, e, n) {
-  ju(e, (r) => {
+  Uu(e, (r) => {
     if (!(n && !n.intersects(r.bounds))) {
       var i = r.opacity == null ? 1 : r.opacity;
       i && $re(t, r, i) && (Fh(t, r), t.stroke());
@@ -69611,7 +69608,7 @@ var fPe = {
   isect: Cke
 }, xPe = NL("shape", mke), dPe = NL("symbol", yke, Rre);
 const qq = DNe();
-var Tu = {
+var Ru = {
   height: Ol,
   measureWidth: $L,
   estimateWidth: b7,
@@ -69620,7 +69617,7 @@ var Tu = {
 };
 kre(!0);
 function kre(t) {
-  Tu.width = t && y0 ? $L : b7;
+  Ru.width = t && y0 ? $L : b7;
 }
 function b7(t, e) {
   return Pre(P0(t, e), Ol(t));
@@ -69657,7 +69654,7 @@ function P0(t, e) {
   return t.limit > 0 && n.length ? gPe(t, n) : n;
 }
 function pPe(t) {
-  if (Tu.width === $L) {
+  if (Ru.width === $L) {
     const e = kL(t);
     return (n) => Mre(n, e);
   } else {
@@ -69705,15 +69702,15 @@ function yPe(t, e) {
   t("text-anchor", mPe[e.align] || "start"), u ? (a = yf(s, o) + " " + wL(u), (n || r) && (a += " " + yf(n, r))) : a = yf(s + n, o + r), t("transform", a);
 }
 function ML(t, e, n) {
-  var r = Tu.height(e), i = e.align, s = wb(e), o = s.x1, u = s.y1, a = e.dx || 0, l = (e.dy || 0) + PL(e) - Math.round(0.8 * r), c = vy(e), f;
-  if (Ce(c) ? (r += Vf(e) * (c.length - 1), f = c.reduce((x, h) => Math.max(x, Tu.width(e, h)), 0)) : f = Tu.width(e, c), i === "center" ? a -= f / 2 : i === "right" && (a -= f), t.set(a += o, l += u, a + f, l + r), e.angle && !n)
+  var r = Ru.height(e), i = e.align, s = wb(e), o = s.x1, u = s.y1, a = e.dx || 0, l = (e.dy || 0) + PL(e) - Math.round(0.8 * r), c = vy(e), f;
+  if (Ce(c) ? (r += Vf(e) * (c.length - 1), f = c.reduce((x, h) => Math.max(x, Ru.width(e, h)), 0)) : f = Ru.width(e, c), i === "center" ? a -= f / 2 : i === "right" && (a -= f), t.set(a += o, l += u, a + f, l + r), e.angle && !n)
     t.rotate(e.angle * k0, o, u);
   else if (n === 2)
     return t.rotatedPoints(e.angle * k0, o, u);
   return t;
 }
 function EPe(t, e, n) {
-  ju(e, (r) => {
+  Uu(e, (r) => {
     var i = r.opacity == null ? 1 : r.opacity, s, o, u, a, l, c, f;
     if (!(n && !n.intersects(r.bounds) || // bounds check
     i === 0 || r.fontSize <= 0 || r.text == null || r.text.length === 0)) {
@@ -69922,7 +69919,7 @@ function us(t, e, n, r) {
   var i = t.childNodes[e], s;
   return (!i || i.tagName.toLowerCase() !== n.toLowerCase()) && (s = i || null, i = uf(t.ownerDocument, n, r), t.insertBefore(i, s)), i;
 }
-function hu(t, e) {
+function pu(t, e) {
   for (var n = t.childNodes, r = n.length; r > e; )
     t.removeChild(n[--r]);
   return t;
@@ -70344,7 +70341,7 @@ function HPe(t, e, n) {
 }
 Ne(D7, Dl, {
   initialize(t, e, n, r, i, s) {
-    return this._options = s || {}, this._canvas = this._options.externalContext ? null : m0(1, 1, this._options.type), t && this._canvas && (hu(t, 0).appendChild(this._canvas), this._canvas.setAttribute("class", "marks")), Vq.initialize.call(this, t, e, n, r, i);
+    return this._options = s || {}, this._canvas = this._options.externalContext ? null : m0(1, 1, this._options.type), t && this._canvas && (pu(t, 0).appendChild(this._canvas), this._canvas.setAttribute("class", "marks")), Vq.initialize.call(this, t, e, n, r, i);
   },
   resize(t, e, n, r) {
     if (Vq.resize.call(this, t, e, n, r), this._canvas)
@@ -70427,7 +70424,7 @@ const Jre = "aria-hidden", UL = "aria-label", qL = "role", HL = "aria-roledescri
   [qL]: t,
   [HL]: e,
   [UL]: n || void 0
-}), zPe = $u(["axis-domain", "axis-grid", "axis-label", "axis-tick", "axis-title", "legend-band", "legend-entry", "legend-gradient", "legend-label", "legend-title", "legend-symbol", "title"]), Yq = {
+}), zPe = ku(["axis-domain", "axis-grid", "axis-label", "axis-tick", "axis-title", "legend-band", "legend-entry", "legend-gradient", "legend-label", "legend-title", "legend-symbol", "title"]), Yq = {
   axis: {
     desc: "axis",
     caption: WPe
@@ -70574,7 +70571,7 @@ Ne(uie, Dl, {
    * @return {SVGRenderer} - This renderer instance.
    */
   initialize(t, e, n, r, i) {
-    return this._defs = {}, this._clearDefs(), t && (this._svg = us(t, 0, "svg", Hn), this._svg.setAttributeNS(Xq, "xmlns", Hn), this._svg.setAttributeNS(Xq, "xmlns:xlink", am["xmlns:xlink"]), this._svg.setAttribute("version", am.version), this._svg.setAttribute("class", "marks"), hu(t, 1), this._root = us(this._svg, C1, "g", Hn), i0(this._root, oie), hu(this._svg, C1 + 1)), this.background(this._bgcolor), VR.initialize.call(this, t, e, n, r, i);
+    return this._defs = {}, this._clearDefs(), t && (this._svg = us(t, 0, "svg", Hn), this._svg.setAttributeNS(Xq, "xmlns", Hn), this._svg.setAttributeNS(Xq, "xmlns:xlink", am["xmlns:xlink"]), this._svg.setAttribute("version", am.version), this._svg.setAttribute("class", "marks"), pu(t, 1), this._root = us(this._svg, C1, "g", Hn), i0(this._root, oie), pu(this._svg, C1 + 1)), this.background(this._bgcolor), VR.initialize.call(this, t, e, n, r, i);
   },
   /**
    * Get / set the background color.
@@ -70628,7 +70625,7 @@ Ne(uie, Dl, {
    * @param {object} scene - The root mark of a scenegraph to render.
    */
   _render(t) {
-    return this._dirtyCheck() && (this._dirtyAll && this._clearDefs(), this.mark(this._root, t), hu(this._root, 1)), this.defs(), this._dirty = [], ++this._dirtyID, this;
+    return this._dirtyCheck() && (this._dirtyAll && this._clearDefs(), this.mark(this._root, t), pu(this._root, 1)), this.defs(), this._dirty = [], ++this._dirtyID, this;
   },
   // -- Manage rendering of items marked as dirty --
   /**
@@ -70689,7 +70686,7 @@ Ne(uie, Dl, {
       const h = this.isDirty(x), p = eH(x, u, l, i.tag, r);
       h && (this._update(i, p, x), o && tMe(this, p, x)), l = p, ++c;
     };
-    return i.nested ? e.items.length && f(e.items[0]) : ju(e, f), hu(u, c), u;
+    return i.nested ? e.items.length && f(e.items[0]) : Uu(e, f), pu(u, c), u;
   },
   /**
    * Update the attributes of an SVG element for a mark item.
@@ -70732,7 +70729,7 @@ Ne(uie, Dl, {
       n || (e.el = n = us(t, C1 + 1, "defs", Hn)), r = ZPe(n, e.gradient[i], r);
     for (const i in e.clipping)
       n || (e.el = n = us(t, C1 + 1, "defs", Hn)), r = eMe(n, e.clipping[i], r);
-    n && (r === 0 ? (t.removeChild(n), e.el = null) : hu(n, r));
+    n && (r === 0 ? (t.removeChild(n), e.el = null) : pu(n, r));
   },
   /**
    * Clear defs caches.
@@ -70782,7 +70779,7 @@ function ZPe(t, e, n) {
     });
   for (r = 0, i = e.stops.length; r < i; ++r)
     s = us(t, r, "stop", Hn), s.setAttribute("offset", e.stops[r].offset), s.setAttribute("stop-color", e.stops[r].color);
-  return hu(t, r), n;
+  return pu(t, r), n;
 }
 function eMe(t, e, n) {
   let r;
@@ -70791,14 +70788,14 @@ function eMe(t, e, n) {
     y: 0,
     width: e.width,
     height: e.height
-  })), hu(t, 1), n + 1;
+  })), pu(t, 1), n + 1;
 }
 function tMe(t, e, n) {
   e = e.lastChild.previousSibling;
   let r, i = 0;
-  ju(n, (s) => {
+  Uu(n, (s) => {
     r = t.mark(e, s, r), ++i;
-  }), hu(e, 1 + i);
+  }), pu(e, 1 + i);
 }
 function eH(t, e, n, r, i) {
   let s = t._svg, o;
@@ -70840,7 +70837,7 @@ const rMe = {
     const r = vy(n);
     let i, s, o, u;
     Ce(r) ? (s = r.map((a) => P0(n, a)), i = s.join(`
-`), i !== jr.text && (hu(e, 0), o = e.ownerDocument, u = Vf(n), s.forEach((a, l) => {
+`), i !== jr.text && (pu(e, 0), o = e.ownerDocument, u = Vf(n), s.forEach((a, l) => {
       const c = uf(o, "tspan", Hn);
       c.__data__ = n, c.textContent = a, l && (c.setAttribute("x", 0), c.setAttribute("dy", u)), e.appendChild(c);
     }), jr.text = i)) : (s = P0(n, r), s !== jr.text && (e.textContent = s, jr.text = s)), ti(e, "font-family", Db(n)), ti(e, "font-size", Ol(n) + "px"), ti(e, "font-style", n.fontStyle), ti(e, "font-variant", n.fontVariant), ti(e, "font-weight", n.fontWeight);
@@ -70929,11 +70926,11 @@ Ne(lie, Dl, {
           t.text(P0(o, a));
       } else if (r === "g") {
         const a = o.strokeForeground, l = o.fill, c = o.stroke;
-        a && c && (o.stroke = null), t.open("path", this.attr(e, o, n.background, "bgrect")).close(), t.open("g", this.attr(e, o, n.content)), ju(o, (f) => this.mark(t, f)), t.close(), a && c ? (l && (o.fill = null), o.stroke = c, t.open("path", this.attr(e, o, n.foreground, "bgrect")).close(), l && (o.fill = l)) : t.open("path", this.attr(e, o, n.foreground, "bgfore")).close();
+        a && c && (o.stroke = null), t.open("path", this.attr(e, o, n.background, "bgrect")).close(), t.open("g", this.attr(e, o, n.content)), Uu(o, (f) => this.mark(t, f)), t.close(), a && c ? (l && (o.fill = null), o.stroke = c, t.open("path", this.attr(e, o, n.foreground, "bgrect")).close(), l && (o.fill = l)) : t.open("path", this.attr(e, o, n.foreground, "bgfore")).close();
       }
       t.close(), u && t.close();
     };
-    return n.nested ? e.items && e.items.length && s(e.items[0]) : ju(e, s), t.close();
+    return n.nested ? e.items && e.items.length && s(e.items[0]) : Uu(e, s), t.close();
   },
   /**
    * Get href attributes for a hyperlinked mark item.
@@ -71949,9 +71946,9 @@ function uje(t) {
   return !t.bins && (e === Dh || e === dy || e === hy);
 }
 function jie(t) {
-  return yL(t) && t !== bu;
+  return yL(t) && t !== Tu;
 }
-const aje = $u(["set", "modified", "clear", "type", "scheme", "schemeExtent", "schemeCount", "domain", "domainMin", "domainMid", "domainMax", "domainRaw", "domainImplicit", "nice", "zero", "bins", "range", "rangeStep", "round", "reverse", "interpolate", "interpolateGamma"]);
+const aje = ku(["set", "modified", "clear", "type", "scheme", "schemeExtent", "schemeCount", "domain", "domainMin", "domainMid", "domainMax", "domainRaw", "domainImplicit", "nice", "zero", "bins", "range", "rangeStep", "round", "reverse", "interpolate", "interpolateGamma"]);
 function Uie(t) {
   Ee.call(this, null, t), this.modified(!0);
 }
@@ -71970,7 +71967,7 @@ Ne(Uie, Ee, {
 });
 function lje(t) {
   var e = t.type, n = "", r;
-  return e === bu ? bu + "-" + Dh : (cje(t) && (r = t.rawDomain ? t.rawDomain.length : t.domain ? t.domain.length + +(t.domainMid != null) : 0, n = r === 2 ? bu + "-" : r === 3 ? W2 + "-" : ""), (n + e || Dh).toLowerCase());
+  return e === Tu ? Tu + "-" + Dh : (cje(t) && (r = t.rawDomain ? t.rawDomain.length : t.domain ? t.domain.length + +(t.domainMid != null) : 0, n = r === 2 ? Tu + "-" : r === 3 ? W2 + "-" : ""), (n + e || Dh).toLowerCase());
 }
 function cje(t) {
   const e = t.type;
@@ -72195,12 +72192,12 @@ function pH(t, e) {
 function Fa(t, e) {
   t && dH.hasOwnProperty(t.type) ? dH[t.type](t, e) : g_(t, e);
 }
-var m_ = new hi(), y_ = new hi(), Yie, Kie, $7, k7, P7, Uu = {
+var m_ = new hi(), y_ = new hi(), Yie, Kie, $7, k7, P7, qu = {
   point: Ar,
   lineStart: Ar,
   lineEnd: Ar,
   polygonStart: function() {
-    m_ = new hi(), Uu.lineStart = Sje, Uu.lineEnd = Cje;
+    m_ = new hi(), qu.lineStart = Sje, qu.lineEnd = Cje;
   },
   polygonEnd: function() {
     var t = +m_;
@@ -72211,13 +72208,13 @@ var m_ = new hi(), y_ = new hi(), Yie, Kie, $7, k7, P7, Uu = {
   }
 };
 function Sje() {
-  Uu.point = bje;
+  qu.point = bje;
 }
 function Cje() {
   Jie(Yie, Kie);
 }
 function bje(t, e) {
-  Uu.point = Jie, Yie = t, Kie = e, t *= yt, e *= yt, $7 = t, k7 = st(e = e / 2 + h_), P7 = et(e);
+  qu.point = Jie, Yie = t, Kie = e, t *= yt, e *= yt, $7 = t, k7 = st(e = e / 2 + h_), P7 = et(e);
 }
 function Jie(t, e) {
   t *= yt, e *= yt, e = e / 2 + h_;
@@ -72225,7 +72222,7 @@ function Jie(t, e) {
   m_.add(to(l, a)), $7 = t, k7 = s, P7 = o;
 }
 function Tje(t) {
-  return y_ = new hi(), Fa(t, Uu), y_ * 2;
+  return y_ = new hi(), Fa(t, qu), y_ * 2;
 }
 function E_(t) {
   return [to(t[1], t[0]), zi(t[2])];
@@ -72255,10 +72252,10 @@ var hn, Li, _n, os, Gc, Xie, Zie, qd, bg, Kl, xl, Oa = {
   lineStart: gH,
   lineEnd: mH,
   polygonStart: function() {
-    Oa.point = tse, Oa.lineStart = Rje, Oa.lineEnd = Oje, bg = new hi(), Uu.polygonStart();
+    Oa.point = tse, Oa.lineStart = Rje, Oa.lineEnd = Oje, bg = new hi(), qu.polygonStart();
   },
   polygonEnd: function() {
-    Uu.polygonEnd(), Oa.point = M7, Oa.lineStart = gH, Oa.lineEnd = mH, m_ < 0 ? (hn = -(_n = 180), Li = -(os = 90)) : bg > rt ? os = 90 : bg < -rt && (Li = -90), xl[0] = hn, xl[1] = _n;
+    qu.polygonEnd(), Oa.point = M7, Oa.lineStart = gH, Oa.lineEnd = mH, m_ < 0 ? (hn = -(_n = 180), Li = -(os = 90)) : bg > rt ? os = 90 : bg < -rt && (Li = -90), xl[0] = hn, xl[1] = _n;
   },
   sphere: function() {
     hn = -(_n = 180), Li = -(os = 90);
@@ -72290,13 +72287,13 @@ function tse(t, e) {
     bg.add(St(n) > 180 ? n + (n > 0 ? 360 : -360) : n);
   } else
     Xie = t, Zie = e;
-  Uu.point(t, e), ese(t, e);
+  qu.point(t, e), ese(t, e);
 }
 function Rje() {
-  Uu.lineStart();
+  qu.lineStart();
 }
 function Oje() {
-  tse(Xie, Zie), Uu.lineEnd(), St(bg) > rt && (hn = -(_n = 180)), xl[0] = hn, xl[1] = _n, qd = null;
+  tse(Xie, Zie), qu.lineEnd(), St(bg) > rt && (hn = -(_n = 180)), xl[0] = hn, xl[1] = _n, qd = null;
 }
 function is(t, e) {
   return (e -= t) < 0 ? e + 360 : e;
@@ -72914,7 +72911,7 @@ var kh = 1 / 0, O_ = kh, fm = -kh, D_ = fm, w_ = {
 function Jje(t, e) {
   t < kh && (kh = t), t > fm && (fm = t), e < O_ && (O_ = e), e > D_ && (D_ = e);
 }
-var V7 = 0, Y7 = 0, tg = 0, N_ = 0, F_ = 0, Fd = 0, K7 = 0, J7 = 0, ng = 0, dse, hse, pu, gu, Ms = {
+var V7 = 0, Y7 = 0, tg = 0, N_ = 0, F_ = 0, Fd = 0, K7 = 0, J7 = 0, ng = 0, dse, hse, gu, mu, Ms = {
   point: Jf,
   lineStart: DH,
   lineEnd: wH,
@@ -72936,11 +72933,11 @@ function DH() {
   Ms.point = Xje;
 }
 function Xje(t, e) {
-  Ms.point = Zje, Jf(pu = t, gu = e);
+  Ms.point = Zje, Jf(gu = t, mu = e);
 }
 function Zje(t, e) {
-  var n = t - pu, r = e - gu, i = Si(n * n + r * r);
-  N_ += i * (pu + t) / 2, F_ += i * (gu + e) / 2, Fd += i, Jf(pu = t, gu = e);
+  var n = t - gu, r = e - mu, i = Si(n * n + r * r);
+  N_ += i * (gu + t) / 2, F_ += i * (mu + e) / 2, Fd += i, Jf(gu = t, mu = e);
 }
 function wH() {
   Ms.point = Jf;
@@ -72952,11 +72949,11 @@ function tUe() {
   pse(dse, hse);
 }
 function nUe(t, e) {
-  Ms.point = pse, Jf(dse = pu = t, hse = gu = e);
+  Ms.point = pse, Jf(dse = gu = t, hse = mu = e);
 }
 function pse(t, e) {
-  var n = t - pu, r = e - gu, i = Si(n * n + r * r);
-  N_ += i * (pu + t) / 2, F_ += i * (gu + e) / 2, Fd += i, i = gu * t - pu * e, K7 += i * (pu + t), J7 += i * (gu + e), ng += i * 3, Jf(pu = t, gu = e);
+  var n = t - gu, r = e - mu, i = Si(n * n + r * r);
+  N_ += i * (gu + t) / 2, F_ += i * (mu + e) / 2, Fd += i, i = mu * t - gu * e, K7 += i * (gu + t), J7 += i * (mu + e), ng += i * 3, Jf(gu = t, mu = e);
 }
 function gse(t) {
   this._context = t;
@@ -73266,7 +73263,7 @@ function kH(t, e, n, r, i, s) {
     return [r * (c * m - f * g + x), i * (h - f * m - c * g)];
   }, p;
 }
-function ca(t) {
+function fa(t) {
   return _se(function() {
     return t;
   })();
@@ -73450,7 +73447,7 @@ bse.invert = Sy(function(t) {
   return 2 * zi(t / 2);
 });
 function pUe() {
-  return ca(bse).scale(124.75).clipAngle(180 - 1e-3);
+  return fa(bse).scale(124.75).clipAngle(180 - 1e-3);
 }
 var Tse = Cse(function(t) {
   return (t = Vie(t)) && t / et(t);
@@ -73459,7 +73456,7 @@ Tse.invert = Sy(function(t) {
   return t;
 });
 function gUe() {
-  return ca(Tse).scale(79.4188).clipAngle(180 - 1e-3);
+  return fa(Tse).scale(79.4188).clipAngle(180 - 1e-3);
 }
 function Bb(t, e) {
   return [t, p_(nI((Cn + e) / 2))];
@@ -73471,7 +73468,7 @@ function mUe() {
   return Rse(Bb).scale(961 / _i);
 }
 function Rse(t) {
-  var e = ca(t), n = e.center, r = e.scale, i = e.translate, s = e.clipExtent, o = null, u, a, l;
+  var e = fa(t), n = e.center, r = e.scale, i = e.translate, s = e.clipExtent, o = null, u, a, l;
   e.scale = function(f) {
     return arguments.length ? (r(f), c()) : r();
   }, e.translate = function(f) {
@@ -73512,7 +73509,7 @@ function B_(t, e) {
 }
 B_.invert = B_;
 function AUe() {
-  return ca(B_).scale(152.63);
+  return fa(B_).scale(152.63);
 }
 function vUe(t, e) {
   var n = st(t), r = t === e ? et(t) : (n - st(e)) / (e - t), i = n / r + t;
@@ -73547,7 +73544,7 @@ Ose.invert = function(t, e) {
   ];
 };
 function CUe() {
-  return ca(Ose).scale(177.158);
+  return fa(Ose).scale(177.158);
 }
 function Dse(t, e) {
   var n = st(e), r = st(t) * n;
@@ -73555,7 +73552,7 @@ function Dse(t, e) {
 }
 Dse.invert = Sy(Y2);
 function bUe() {
-  return ca(Dse).scale(144.049).clipAngle(60);
+  return fa(Dse).scale(144.049).clipAngle(60);
 }
 function TUe() {
   var t = 1, e = 0, n = 0, r = 1, i = 1, s = 0, o, u, a = null, l, c, f, x = 1, h = 1, p = Lb({
@@ -73627,14 +73624,14 @@ wse.invert = function(t, e) {
   ];
 };
 function RUe() {
-  return ca(wse).scale(175.295);
+  return fa(wse).scale(175.295);
 }
 function Nse(t, e) {
   return [st(e) * et(t), et(e)];
 }
 Nse.invert = Sy(zi);
 function OUe() {
-  return ca(Nse).scale(249.5).clipAngle(90 + rt);
+  return fa(Nse).scale(249.5).clipAngle(90 + rt);
 }
 function Fse(t, e) {
   var n = st(e), r = 1 + st(t) * n;
@@ -73644,7 +73641,7 @@ Fse.invert = Sy(function(t) {
   return 2 * Y2(t);
 });
 function DUe() {
-  return ca(Fse).scale(250).clipAngle(142);
+  return fa(Fse).scale(250).clipAngle(142);
 }
 function Lse(t, e) {
   return [p_(nI((Cn + e) / 2)), -t];
@@ -73684,7 +73681,7 @@ function BUe(t, e, n) {
 }
 var $Ue = BUe(PH / tw, PH, Ise);
 function kUe() {
-  return ca($Ue).scale(169.529);
+  return fa($Ue).scale(169.529);
 }
 const PUe = vse(), nw = [
   // standard properties in d3-geo
@@ -73752,7 +73749,7 @@ for (const t in P_)
   Bse(t, P_[t]);
 function jUe() {
 }
-const Sa = [[], [[[1, 1.5], [0.5, 1]]], [[[1.5, 1], [1, 1.5]]], [[[1.5, 1], [0.5, 1]]], [[[1, 0.5], [1.5, 1]]], [[[1, 1.5], [0.5, 1]], [[1, 0.5], [1.5, 1]]], [[[1, 0.5], [1, 1.5]]], [[[1, 0.5], [0.5, 1]]], [[[0.5, 1], [1, 0.5]]], [[[1, 1.5], [1, 0.5]]], [[[0.5, 1], [1, 0.5]], [[1.5, 1], [1, 1.5]]], [[[1.5, 1], [1, 0.5]]], [[[0.5, 1], [1.5, 1]]], [[[1, 1.5], [1.5, 1]]], [[[0.5, 1], [1, 1.5]]], []];
+const Ca = [[], [[[1, 1.5], [0.5, 1]]], [[[1.5, 1], [1, 1.5]]], [[[1.5, 1], [0.5, 1]]], [[[1, 0.5], [1.5, 1]]], [[[1, 1.5], [0.5, 1]], [[1, 0.5], [1.5, 1]]], [[[1, 0.5], [1, 1.5]]], [[[1, 0.5], [0.5, 1]]], [[[0.5, 1], [1, 0.5]]], [[[1, 1.5], [1, 0.5]]], [[[0.5, 1], [1, 0.5]], [[1.5, 1], [1, 1.5]]], [[[1.5, 1], [1, 0.5]]], [[[0.5, 1], [1.5, 1]]], [[[1, 1.5], [1.5, 1]]], [[[0.5, 1], [1, 1.5]]], []];
 function kse() {
   var t = 1, e = 1, n = u;
   function r(a, l) {
@@ -73776,16 +73773,16 @@ function kse() {
   }
   function s(a, l, c) {
     var f = new Array(), x = new Array(), h, p, m, g, y, E;
-    for (h = p = -1, g = a[0] >= l, Sa[g << 1].forEach(A); ++h < t - 1; )
-      m = g, g = a[h + 1] >= l, Sa[m | g << 1].forEach(A);
-    for (Sa[g << 0].forEach(A); ++p < e - 1; ) {
-      for (h = -1, g = a[p * t + t] >= l, y = a[p * t] >= l, Sa[g << 1 | y << 2].forEach(A); ++h < t - 1; )
-        m = g, g = a[p * t + t + h + 1] >= l, E = y, y = a[p * t + h + 1] >= l, Sa[m | g << 1 | y << 2 | E << 3].forEach(A);
-      Sa[g | y << 3].forEach(A);
-    }
-    for (h = -1, y = a[p * t] >= l, Sa[y << 2].forEach(A); ++h < t - 1; )
-      E = y, y = a[p * t + h + 1] >= l, Sa[y << 2 | E << 3].forEach(A);
-    Sa[y << 3].forEach(A);
+    for (h = p = -1, g = a[0] >= l, Ca[g << 1].forEach(A); ++h < t - 1; )
+      m = g, g = a[h + 1] >= l, Ca[m | g << 1].forEach(A);
+    for (Ca[g << 0].forEach(A); ++p < e - 1; ) {
+      for (h = -1, g = a[p * t + t] >= l, y = a[p * t] >= l, Ca[g << 1 | y << 2].forEach(A); ++h < t - 1; )
+        m = g, g = a[p * t + t + h + 1] >= l, E = y, y = a[p * t + h + 1] >= l, Ca[m | g << 1 | y << 2 | E << 3].forEach(A);
+      Ca[g | y << 3].forEach(A);
+    }
+    for (h = -1, y = a[p * t] >= l, Ca[y << 2].forEach(A); ++h < t - 1; )
+      E = y, y = a[p * t + h + 1] >= l, Ca[y << 2 | E << 3].forEach(A);
+    Ca[y << 3].forEach(A);
     function A(v) {
       var _ = [v[0][0] + h, v[0][1] + p], S = [v[1][0] + h, v[1][1] + p], C = o(_), b = o(S), N, L;
       (N = x[C]) ? (L = f[b]) ? (delete x[N.end], delete f[L.start], N === L ? (N.ring.push(S), c(N.ring)) : f[N.start] = x[L.end] = {
@@ -74415,7 +74412,7 @@ function tqe(t, e) {
 function qse(t) {
   if (!gt(t))
     return !1;
-  const e = $u(di(t));
+  const e = ku(di(t));
   return e.$x || e.$y || e.$value || e.$max;
 }
 function nqe(t, e, n, r) {
@@ -76451,7 +76448,7 @@ function cze(t) {
     fillOpacity: 0
   } : e;
 }
-const Ca = 5, Zr = 31, hm = 32, Jl = new Uint32Array(hm + 1), Ao = new Uint32Array(hm + 1);
+const ba = 5, Zr = 31, hm = 32, Jl = new Uint32Array(hm + 1), Ao = new Uint32Array(hm + 1);
 Ao[0] = 0;
 Jl[0] = ~Ao[0];
 for (let t = 1; t <= hm; ++t)
@@ -76468,20 +76465,20 @@ function fze(t, e) {
     array: n,
     get: (s, o) => {
       const u = o * t + s;
-      return n[u >>> Ca] & 1 << (u & Zr);
+      return n[u >>> ba] & 1 << (u & Zr);
     },
     set: (s, o) => {
       const u = o * t + s;
-      r(u >>> Ca, 1 << (u & Zr));
+      r(u >>> ba, 1 << (u & Zr));
     },
     clear: (s, o) => {
       const u = o * t + s;
-      i(u >>> Ca, ~(1 << (u & Zr)));
+      i(u >>> ba, ~(1 << (u & Zr)));
     },
     getRange: (s, o, u, a) => {
       let l = a, c, f, x, h;
       for (; l >= o; --l)
-        if (c = l * t + s, f = l * t + u, x = c >>> Ca, h = f >>> Ca, x === h) {
+        if (c = l * t + s, f = l * t + u, x = c >>> ba, h = f >>> ba, x === h) {
           if (n[x] & Jl[c & Zr] & Ao[(f & Zr) + 1])
             return !0;
         } else {
@@ -76496,7 +76493,7 @@ function fze(t, e) {
     setRange: (s, o, u, a) => {
       let l, c, f, x, h;
       for (; o <= a; ++o)
-        if (l = o * t + s, c = o * t + u, f = l >>> Ca, x = c >>> Ca, f === x)
+        if (l = o * t + s, c = o * t + u, f = l >>> ba, x = c >>> ba, f === x)
           r(f, Jl[l & Zr] & Ao[(c & Zr) + 1]);
         else
           for (r(f, Jl[l & Zr]), r(x, Ao[(c & Zr) + 1]), h = f + 1; h < x; ++h)
@@ -76505,7 +76502,7 @@ function fze(t, e) {
     clearRange: (s, o, u, a) => {
       let l, c, f, x, h;
       for (; o <= a; ++o)
-        if (l = o * t + s, c = o * t + u, f = l >>> Ca, x = c >>> Ca, f === x)
+        if (l = o * t + s, c = o * t + u, f = l >>> ba, x = c >>> ba, f === x)
           i(f, Ao[l & Zr] | Jl[(c & Zr) + 1]);
         else
           for (i(f, Ao[l & Zr]), i(x, Jl[(c & Zr) + 1]), h = f + 1; h < x; ++h)
@@ -76521,7 +76518,7 @@ function xze(t, e, n) {
 function dze(t, e, n, r) {
   const i = t.width, s = t.height;
   return function(o) {
-    const u = o.datum.datum.items[r].items, a = u.length, l = o.datum.fontSize, c = Tu.width(o.datum, o.datum.text);
+    const u = o.datum.datum.items[r].items, a = u.length, l = o.datum.fontSize, c = Ru.width(o.datum, o.datum.text);
     let f = 0, x, h, p, m, g, y, E;
     for (let A = 0; A < a; ++A)
       x = u[A].x, p = u[A].y, h = u[A].x2 === void 0 ? x : u[A].x2, m = u[A].y2 === void 0 ? p : u[A].y2, g = (x + h) / 2, y = (p + m) / 2, E = Math.abs(h - x + m - p), E >= f && (f = E, o.x = g, o.y = y);
@@ -76549,7 +76546,7 @@ function hze(t, e, n, r) {
     }
   }
   return function(l) {
-    const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = Tu.width(l.datum, l.datum.text);
+    const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = Ru.width(l.datum, l.datum.text);
     let p = n ? x : 0, m = !1, g = !1, y = 0, E, A, v, _, S, C, b, N, L, I, P, q, X, G, ue, he, pe;
     for (let ae = 0; ae < f; ++ae) {
       for (E = c[ae].x, v = c[ae].y, A = c[ae].x2 === void 0 ? E : c[ae].x2, _ = c[ae].y2 === void 0 ? v : c[ae].y2, E > A && (pe = E, E = A, A = pe), v > _ && (pe = v, v = _, _ = pe), L = t(E), P = t(A), I = ~~((L + P) / 2), q = t(v), G = t(_), X = ~~((q + G) / 2), b = I; b >= L; --b)
@@ -76567,7 +76564,7 @@ const pze = [-1, -1, 1, 1], gze = [-1, 1, -1, 1];
 function mze(t, e, n, r) {
   const i = t.width, s = t.height, o = e[0], u = e[1], a = t.bitmap();
   return function(l) {
-    const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = Tu.width(l.datum, l.datum.text), p = [];
+    const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = Ru.width(l.datum, l.datum.text), p = [];
     let m = n ? x : 0, g = !1, y = !1, E = 0, A, v, _, S, C, b, N, L, I, P, q, X;
     for (let G = 0; G < f; ++G) {
       for (A = c[G].x, _ = c[G].y, v = c[G].x2 === void 0 ? A : c[G].x2, S = c[G].y2 === void 0 ? _ : c[G].y2, p.push([t((A + v) / 2), t((_ + S) / 2)]); p.length; )
@@ -76597,7 +76594,7 @@ function Aze(t, e, n, r) {
     for (let P = 0; P < a; ++P) {
       if (h = (n[P] & 3) - 1, p = (n[P] >>> 2 & 3) - 1, m = h === 0 && p === 0 || r[P] < 0, g = h && p ? Math.SQRT1_2 : 1, y = r[P] < 0 ? -1 : 1, E = c[1 + h] + r[P] * h * g, C = c[4 + p] + y * f * p / 2 + r[P] * p * g, v = C - f / 2, _ = C + f / 2, b = t(E), L = t(v), I = t(_), !x)
         if (sz(b, b, L, I, o, u, E, E, v, _, c, m))
-          x = Tu.width(l.datum, l.datum.text);
+          x = Ru.width(l.datum, l.datum.text);
         else
           continue;
       if (S = E + y * x * h / 2, E = S - x / 2, A = S + x / 2, b = t(E), N = t(A), sz(b, N, L, I, o, u, E, A, v, _, c, m))
@@ -76630,7 +76627,7 @@ function Sze(t, e, n, r, i, s, o, u, a, l, c) {
   const f = Math.max(r.length, i.length), x = Cze(r, f), h = bze(i, f), p = Tze(t[0].datum), m = p === "group" && t[0].datum.items[a].marktype, g = m === "area", y = Rze(p, m, u, a), E = l === null || l === 1 / 0, A = g && c === "naive";
   let v = -1, _ = -1;
   const S = t.map((L) => {
-    const I = E ? Tu.width(L, L.text) : void 0;
+    const I = E ? Ru.width(L, L.text) : void 0;
     return v = Math.max(v, I), _ = Math.max(_, L.fontSize), {
       datum: L,
       opacity: 0,
@@ -78300,17 +78297,17 @@ function RQe(t) {
       return [];
   }
 }
-var fa, Ve, ve, Wr, Qt, Pb = 1, Ty = 2, ex = 3, Sc = 4, Mb = 5, Ux = 6, Ni = 7, Ry = 8, OQe = 9;
-fa = {};
-fa[Pb] = "Boolean";
-fa[Ty] = "<end>";
-fa[ex] = "Identifier";
-fa[Sc] = "Keyword";
-fa[Mb] = "Null";
-fa[Ux] = "Numeric";
-fa[Ni] = "Punctuator";
-fa[Ry] = "String";
-fa[OQe] = "RegularExpression";
+var xa, Ve, ve, Wr, Qt, Pb = 1, Ty = 2, ex = 3, Sc = 4, Mb = 5, Ux = 6, Ni = 7, Ry = 8, OQe = 9;
+xa = {};
+xa[Pb] = "Boolean";
+xa[Ty] = "<end>";
+xa[ex] = "Identifier";
+xa[Sc] = "Keyword";
+xa[Mb] = "Null";
+xa[Ux] = "Numeric";
+xa[Ni] = "Punctuator";
+xa[Ry] = "String";
+xa[OQe] = "RegularExpression";
 var DQe = "ArrayExpression", wQe = "BinaryExpression", NQe = "CallExpression", FQe = "ConditionalExpression", coe = "Identifier", LQe = "Literal", IQe = "LogicalExpression", BQe = "MemberExpression", $Qe = "ObjectExpression", kQe = "Property", PQe = "UnaryExpression", ur = "Unexpected token %0", MQe = "Unexpected number", jQe = "Unexpected string", UQe = "Unexpected identifier", qQe = "Unexpected reserved word", HQe = "Unexpected end of input", pw = "Invalid regular expression", yO = "Invalid regular expression: missing /", foe = "Octal literals are not allowed in strict mode.", zQe = "Duplicate data property in object literal not allowed in strict mode", vr = "ILLEGAL", pm = "Disabled.", QQe = new RegExp("[\\xAA\\xB5\\xBA\\xC0-\\xD6\\xD8-\\xF6\\xF8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u037F\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u052F\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0620-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0800-\\u0815\\u081A\\u0824\\u0828\\u0840-\\u0858\\u08A0-\\u08B2\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971-\\u0980\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0CF1\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F8\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191E\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1AA7\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5\\u1CF6\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005-\\u3007\\u3021-\\u3029\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA69D\\uA6A0-\\uA6EF\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA7AD\\uA7B0\\uA7B1\\uA7F7-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uA9E0-\\uA9E4\\uA9E6-\\uA9EF\\uA9FA-\\uA9FE\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA7E-\\uAAAF\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uAB30-\\uAB5A\\uAB5C-\\uAB5F\\uAB64\\uAB65\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]"), GQe = new RegExp("[\\xAA\\xB5\\xBA\\xC0-\\xD6\\xD8-\\xF6\\xF8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0300-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u037F\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u0483-\\u0487\\u048A-\\u052F\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u0591-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u05C5\\u05C7\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0610-\\u061A\\u0620-\\u0669\\u066E-\\u06D3\\u06D5-\\u06DC\\u06DF-\\u06E8\\u06EA-\\u06FC\\u06FF\\u0710-\\u074A\\u074D-\\u07B1\\u07C0-\\u07F5\\u07FA\\u0800-\\u082D\\u0840-\\u085B\\u08A0-\\u08B2\\u08E4-\\u0963\\u0966-\\u096F\\u0971-\\u0983\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BC-\\u09C4\\u09C7\\u09C8\\u09CB-\\u09CE\\u09D7\\u09DC\\u09DD\\u09DF-\\u09E3\\u09E6-\\u09F1\\u0A01-\\u0A03\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A3C\\u0A3E-\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A59-\\u0A5C\\u0A5E\\u0A66-\\u0A75\\u0A81-\\u0A83\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABC-\\u0AC5\\u0AC7-\\u0AC9\\u0ACB-\\u0ACD\\u0AD0\\u0AE0-\\u0AE3\\u0AE6-\\u0AEF\\u0B01-\\u0B03\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3C-\\u0B44\\u0B47\\u0B48\\u0B4B-\\u0B4D\\u0B56\\u0B57\\u0B5C\\u0B5D\\u0B5F-\\u0B63\\u0B66-\\u0B6F\\u0B71\\u0B82\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BBE-\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCD\\u0BD0\\u0BD7\\u0BE6-\\u0BEF\\u0C00-\\u0C03\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C39\\u0C3D-\\u0C44\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C58\\u0C59\\u0C60-\\u0C63\\u0C66-\\u0C6F\\u0C81-\\u0C83\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBC-\\u0CC4\\u0CC6-\\u0CC8\\u0CCA-\\u0CCD\\u0CD5\\u0CD6\\u0CDE\\u0CE0-\\u0CE3\\u0CE6-\\u0CEF\\u0CF1\\u0CF2\\u0D01-\\u0D03\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D-\\u0D44\\u0D46-\\u0D48\\u0D4A-\\u0D4E\\u0D57\\u0D60-\\u0D63\\u0D66-\\u0D6F\\u0D7A-\\u0D7F\\u0D82\\u0D83\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0DCA\\u0DCF-\\u0DD4\\u0DD6\\u0DD8-\\u0DDF\\u0DE6-\\u0DEF\\u0DF2\\u0DF3\\u0E01-\\u0E3A\\u0E40-\\u0E4E\\u0E50-\\u0E59\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB9\\u0EBB-\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EC8-\\u0ECD\\u0ED0-\\u0ED9\\u0EDC-\\u0EDF\\u0F00\\u0F18\\u0F19\\u0F20-\\u0F29\\u0F35\\u0F37\\u0F39\\u0F3E-\\u0F47\\u0F49-\\u0F6C\\u0F71-\\u0F84\\u0F86-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u1000-\\u1049\\u1050-\\u109D\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u135D-\\u135F\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F8\\u1700-\\u170C\\u170E-\\u1714\\u1720-\\u1734\\u1740-\\u1753\\u1760-\\u176C\\u176E-\\u1770\\u1772\\u1773\\u1780-\\u17D3\\u17D7\\u17DC\\u17DD\\u17E0-\\u17E9\\u180B-\\u180D\\u1810-\\u1819\\u1820-\\u1877\\u1880-\\u18AA\\u18B0-\\u18F5\\u1900-\\u191E\\u1920-\\u192B\\u1930-\\u193B\\u1946-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19B0-\\u19C9\\u19D0-\\u19D9\\u1A00-\\u1A1B\\u1A20-\\u1A5E\\u1A60-\\u1A7C\\u1A7F-\\u1A89\\u1A90-\\u1A99\\u1AA7\\u1AB0-\\u1ABD\\u1B00-\\u1B4B\\u1B50-\\u1B59\\u1B6B-\\u1B73\\u1B80-\\u1BF3\\u1C00-\\u1C37\\u1C40-\\u1C49\\u1C4D-\\u1C7D\\u1CD0-\\u1CD2\\u1CD4-\\u1CF6\\u1CF8\\u1CF9\\u1D00-\\u1DF5\\u1DFC-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u200C\\u200D\\u203F\\u2040\\u2054\\u2071\\u207F\\u2090-\\u209C\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D7F-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2DE0-\\u2DFF\\u2E2F\\u3005-\\u3007\\u3021-\\u302F\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u3099\\u309A\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA62B\\uA640-\\uA66F\\uA674-\\uA67D\\uA67F-\\uA69D\\uA69F-\\uA6F1\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA7AD\\uA7B0\\uA7B1\\uA7F7-\\uA827\\uA840-\\uA873\\uA880-\\uA8C4\\uA8D0-\\uA8D9\\uA8E0-\\uA8F7\\uA8FB\\uA900-\\uA92D\\uA930-\\uA953\\uA960-\\uA97C\\uA980-\\uA9C0\\uA9CF-\\uA9D9\\uA9E0-\\uA9FE\\uAA00-\\uAA36\\uAA40-\\uAA4D\\uAA50-\\uAA59\\uAA60-\\uAA76\\uAA7A-\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEF\\uAAF2-\\uAAF6\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uAB30-\\uAB5A\\uAB5C-\\uAB5F\\uAB64\\uAB65\\uABC0-\\uABEA\\uABEC\\uABED\\uABF0-\\uABF9\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE00-\\uFE0F\\uFE20-\\uFE2D\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF10-\\uFF19\\uFF21-\\uFF3A\\uFF3F\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]");
 function jb(t, e) {
   if (!t)
@@ -79050,7 +79047,7 @@ function SGe(t) {
 }
 function CGe(t) {
   t = t || {};
-  const e = t.allowed ? $u(t.allowed) : {}, n = t.forbidden ? $u(t.forbidden) : {}, r = t.constants || moe, i = (t.functions || yoe)(f), s = t.globalvar, o = t.fieldvar, u = gt(s) ? s : (p) => `${s}["${p}"]`;
+  const e = t.allowed ? ku(t.allowed) : {}, n = t.forbidden ? ku(t.forbidden) : {}, r = t.constants || moe, i = (t.functions || yoe)(f), s = t.globalvar, o = t.fieldvar, u = gt(s) ? s : (p) => `${s}["${p}"]`;
   let a = {}, l = {}, c = 0;
   function f(p) {
     if (qe(p))
@@ -79158,7 +79155,7 @@ function wGe(...t) {
       e.add(r);
   return e;
 }
-const qI = "intersect", Az = "union", NGe = "vlMulti", FGe = "vlPoint", vz = "or", LGe = "and", xu = "_vgsid_", mm = Es(xu), IGe = "E", BGe = "R", $Ge = "R-E", kGe = "R-LE", PGe = "R-RE", Q_ = "index:unit";
+const qI = "intersect", Az = "union", NGe = "vlMulti", FGe = "vlPoint", vz = "or", LGe = "and", du = "_vgsid_", mm = Es(du), IGe = "E", BGe = "R", $Ge = "R-E", kGe = "R-LE", PGe = "R-RE", Q_ = "index:unit";
 function _z(t, e) {
   for (var n = e.fields, r = e.values, i = n.length, s = 0, o, u; s < i; ++s)
     if (u = n[s], u.getter = Es.getter || Es(u.field), o = u.getter(t), df(o) && (o = fi(o)), df(r[s]) && (r[s] = fi(r[s])), df(r[s][0]) && (r[s] = r[s].map(fi)), u.type === IGe) {
@@ -79207,7 +79204,7 @@ function HGe(t, e) {
   return t.map((n) => pt(e.fields ? {
     values: e.fields.map((r) => (r.getter || (r.getter = Es(r.field)))(n.datum))
   } : {
-    [xu]: mm(n.datum)
+    [du]: mm(n.datum)
   }, e));
 }
 function zGe(t, e, n, r) {
@@ -79217,10 +79214,10 @@ function zGe(t, e, n, r) {
         h = c[_], m = o[h.field] || (o[h.field] = {}), g = m[x] || (m[x] = []), a[h.field] = y = h.type.charAt(0), E = _O[`${y}_union`], m[x] = E(g, je(f[_]));
       n && (g = u[x] || (u[x] = []), g.push(je(f).reduce((C, b, N) => (C[c[N].field] = b, C), {})));
     } else
-      h = xu, p = mm(l), m = o[h] || (o[h] = {}), g = m[x] || (m[x] = []), g.push(p), n && (g = u[x] || (u[x] = []), g.push({
-        [xu]: p
+      h = du, p = mm(l), m = o[h] || (o[h] = {}), g = m[x] || (m[x] = []), g.push(p), n && (g = u[x] || (u[x] = []), g.push({
+        [du]: p
       }));
-  if (e = e || Az, o[xu] ? o[xu] = _O[`${xu}_${e}`](...Object.values(o[xu])) : Object.keys(o).forEach((C) => {
+  if (e = e || Az, o[du] ? o[du] = _O[`${du}_${e}`](...Object.values(o[du])) : Object.keys(o).forEach((C) => {
     o[C] = Object.keys(o[C]).map((b) => o[C][b]).reduce((b, N) => b === void 0 ? N : _O[`${a[C]}_${e}`](b, N));
   }), s = Object.keys(u), n && s.length) {
     const C = r ? FGe : NGe;
@@ -79235,8 +79232,8 @@ function zGe(t, e, n, r) {
   return o;
 }
 var _O = {
-  [`${xu}_union`]: wGe,
-  [`${xu}_intersect`]: OGe,
+  [`${du}_union`]: wGe,
+  [`${du}_intersect`]: OGe,
   E_union: function(t, e) {
     if (!t.length)
       return e;
@@ -79741,7 +79738,7 @@ Gt("vlSelectionTest", MGe, HI);
 Gt("vlSelectionIdTest", qGe, HI);
 Gt("vlSelectionResolve", zGe, HI);
 Gt("vlSelectionTuples", HGe);
-function qu(t, e) {
+function Hu(t, e) {
   const n = {};
   let r;
   try {
@@ -79773,7 +79770,7 @@ function JWe(t) {
   const e = this, n = t.operators || [];
   return t.background && (e.background = t.background), t.eventConfig && (e.eventConfig = t.eventConfig), t.locale && (e.locale = t.locale), n.forEach((r) => e.parseOperator(r)), n.forEach((r) => e.parseOperatorParameters(r)), (t.streams || []).forEach((r) => e.parseStream(r)), (t.updates || []).forEach((r) => e.parseUpdate(r)), e.resolve();
 }
-const XWe = $u(["rule"]), Tz = $u(["group", "image", "rect"]);
+const XWe = ku(["rule"]), Tz = ku(["group", "image", "rect"]);
 function ZWe(t, e) {
   let n = "";
   return XWe[e] || (t.x2 && (t.x ? (Tz[e] && (n += "if(o.x>o.x2)$=o.x,o.x=o.x2,o.x2=$;"), n += "o.width=o.x2-o.x;") : n += "o.x=o.x2-(o.width||0);"), t.xc && (n += "o.x=o.xc-(o.width||0)/2;"), t.y2 && (t.y ? (Tz[e] && (n += "if(o.y>o.y2)$=o.y,o.y=o.y2,o.y2=$;"), n += "o.height=o.y2-o.y;") : n += "o.y=o.y2-(o.height||0);"), t.yc && (n += "o.y=o.yc-(o.height||0)/2;")), n;
@@ -80195,7 +80192,7 @@ function IVe(t) {
     defaults: {}
   }, t), n = (r, i) => {
     i.forEach((s) => {
-      Ce(r[s]) && (r[s] = $u(r[s]));
+      Ce(r[s]) && (r[s] = ku(r[s]));
     });
   };
   return n(e.defaults, ["prevent", "allow"]), n(e, ["view", "window", "selector"]), e;
@@ -80973,7 +80970,7 @@ function KYe(t) {
   return Ce(t) ? VYe(t) : Qb(t);
 }
 function JYe(t, e, n, r) {
-  const i = qu(t, e);
+  const i = Hu(t, e);
   return i.$fields.forEach((s) => r[s] = 1), pt(n, i.$params), i.$expr;
 }
 const XYe = "outer", ZYe = ["value", "update", "init", "react", "bind"];
@@ -81089,7 +81086,7 @@ function aKe(t, e) {
 }
 function sB(t, e, n) {
   let r = e.between;
-  return r && (r.length !== 2 && _e('Stream "between" parameter must have 2 entries: ' + Fe(e)), t.between = [Am(r[0], n), Am(r[1], n)]), r = e.filter ? [].concat(e.filter) : [], (e.marktype || e.markname || e.markrole) && r.push(lKe(e.marktype, e.markname, e.markrole)), e.source === iB && r.push("inScope(event.item)"), r.length && (t.filter = qu("(" + r.join(")&&(") + ")", n).$expr), (r = e.throttle) != null && (t.throttle = +r), (r = e.debounce) != null && (t.debounce = +r), e.consume && (t.consume = !0), t;
+  return r && (r.length !== 2 && _e('Stream "between" parameter must have 2 entries: ' + Fe(e)), t.between = [Am(r[0], n), Am(r[1], n)]), r = e.filter ? [].concat(e.filter) : [], (e.marktype || e.markname || e.markrole) && r.push(lKe(e.marktype, e.markname, e.markrole)), e.source === iB && r.push("inScope(event.item)"), r.length && (t.filter = Hu("(" + r.join(")&&(") + ")", n).$expr), (r = e.throttle) != null && (t.throttle = +r), (r = e.debounce) != null && (t.debounce = +r), e.consume && (t.consume = !0), t;
 }
 function lKe(t, e, n) {
   const r = "event.item";
@@ -81109,7 +81106,7 @@ function fKe(t, e, n) {
   let s = t.events, o = t.update, u = [];
   s || _e("Signal update missing events specification."), qe(s) && (s = qx(s, e.isSubscope() ? iB : Cw)), s = je(s).filter((a) => a.signal || a.scale ? (u.push(a), 0) : 1), u.length > 1 && (u = [dKe(u)]), s.length && u.push(s.length > 1 ? {
     merge: s
-  } : s[0]), r != null && (o && _e("Signal encode and update are mutually exclusive."), o = "encode(item()," + Fe(r) + ")"), i.update = qe(o) ? qu(o, e) : o.expr != null ? qu(o.expr, e) : o.value != null ? o.value : o.signal != null ? {
+  } : s[0]), r != null && (o && _e("Signal encode and update are mutually exclusive."), o = "encode(item()," + Fe(r) + ")"), i.update = qe(o) ? Hu(o, e) : o.expr != null ? Hu(o.expr, e) : o.value != null ? o.value : o.signal != null ? {
     $expr: cKe,
     $params: {
       $value: e.signalRef(o.signal)
@@ -81131,7 +81128,7 @@ function dKe(t) {
 function hKe(t, e) {
   const n = e.getSignal(t.name);
   let r = t.update;
-  t.init && (r ? _e("Signals can not include both init and update expressions.") : (r = t.init, n.initonly = !0)), r && (r = qu(r, e), n.update = r.$expr, n.params = r.$params), t.on && t.on.forEach((i) => fKe(i, e, n.id));
+  t.init && (r ? _e("Signals can not include both init and update expressions.") : (r = t.init, n.initonly = !0)), r && (r = Hu(r, e), n.update = r.$expr, n.params = r.$params), t.on && t.on.forEach((i) => fKe(i, e, n.id));
 }
 const Vt = (t) => (e, n, r) => Gb(t, n, e || void 0, r), nue = Vt("aggregate"), pKe = Vt("axisticks"), rue = Vt("bound"), Ko = Vt("collect"), qz = Vt("compare"), gKe = Vt("datajoin"), iue = Vt("encode"), mKe = Vt("expression"), yKe = Vt("facet"), EKe = Vt("field"), AKe = Vt("key"), vKe = Vt("legendentries"), _Ke = Vt("load"), SKe = Vt("mark"), CKe = Vt("multiextent"), bKe = Vt("multivalues"), TKe = Vt("overlap"), RKe = Vt("params"), sue = Vt("prefacet"), OKe = Vt("projection"), DKe = Vt("proxy"), wKe = Vt("relay"), oue = Vt("render"), NKe = Vt("scale"), Hx = Vt("sieve"), FKe = Vt("sortitems"), uue = Vt("viewlayout"), LKe = Vt("values");
 let IKe = 0;
@@ -81743,7 +81740,7 @@ function Gz(t, e, n) {
     return Vz(r) ? _e("Expression references can not be signals.") : RO(r) ? n.fieldRef(e) : Yz(r) ? n.compareRef(e) : n.signalRef(e.signal);
   {
     const i = t.expr || RO(r);
-    return i && NJe(e) ? n.exprRef(e.expr, e.as) : i && FJe(e) ? Em(e.field, e.as) : Vz(r) ? qu(e, n) : LJe(r) ? Ze(n.getData(e).values) : RO(r) ? Em(e) : Yz(r) ? n.compareRef(e) : e;
+    return i && NJe(e) ? n.exprRef(e.expr, e.as) : i && FJe(e) ? Em(e.field, e.as) : Vz(r) ? Hu(e, n) : LJe(r) ? Ze(n.getData(e).values) : RO(r) ? Em(e) : Yz(r) ? n.compareRef(e) : e;
   }
 }
 function DJe(t, e, n) {
@@ -81884,7 +81881,7 @@ function $Je(t, e, n) {
   };
 }
 function Eue(t, e, n) {
-  const r = t.remove, i = t.insert, s = t.toggle, o = t.modify, u = t.values, a = e.add(K_()), l = "if(" + t.trigger + ',modify("' + n + '",' + [i, r, s, o, u].map((f) => f ?? "null").join(",") + "),0)", c = qu(l, e);
+  const r = t.remove, i = t.insert, s = t.toggle, o = t.modify, u = t.values, a = e.add(K_()), l = "if(" + t.trigger + ',modify("' + n + '",' + [i, r, s, o, u].map((f) => f ?? "null").join(",") + "),0)", c = Hu(l, e);
   a.update = c.$expr, a.params = c.$params;
 }
 function Xb(t, e) {
@@ -82036,7 +82033,7 @@ function UJe(t, e, n) {
 }
 function qJe(t, e, n) {
   const r = Ef(Jz("size", t, n)), i = Ef(Jz("strokeWidth", t, n)), s = Ef(HJe(n[1].encode, e, wy));
-  return qu(`max(ceil(sqrt(${r})+${i}),${s})`, e);
+  return Hu(`max(ceil(sqrt(${r})+${i}),${s})`, e);
 }
 function Jz(t, e, n) {
   return e[t] ? `scale("${e[t]}",datum)` : hue(t, n[0].encode);
@@ -82861,7 +82858,7 @@ Cue.prototype = nQ.prototype = {
   parseLambdas() {
     const t = Object.keys(this.lambdas);
     for (let e = 0, n = t.length; e < n; ++e) {
-      const r = t[e], i = qu(r, this), s = this.lambdas[r];
+      const r = t[e], i = Hu(r, this), s = this.lambdas[r];
       s.params = i.$params, s.update = i.$expr;
     }
   },
@@ -82873,7 +82870,7 @@ Cue.prototype = nQ.prototype = {
   },
   exprRef(t, e) {
     const n = {
-      expr: qu(t, this)
+      expr: Hu(t, this)
     };
     return e && (n.expr.$name = e), Ze(this.add(mKe(n)));
   },
@@ -83569,8 +83566,8 @@ function kXe(t) {
 }
 const X_ = Symbol("store-raw"), zd = Symbol("store-node"), wa = Symbol("store-has"), Rue = Symbol("store-self");
 function Oue(t) {
-  let e = t[wu];
-  if (!e && (Object.defineProperty(t, wu, {
+  let e = t[Nu];
+  if (!e && (Object.defineProperty(t, Nu, {
     value: e = new Proxy(t, jXe)
   }), !Array.isArray(t))) {
     const n = Object.keys(t), r = Object.getOwnPropertyDescriptors(t);
@@ -83584,15 +83581,15 @@ function Oue(t) {
   }
   return e;
 }
-function Hu(t) {
+function zu(t) {
   let e;
-  return t != null && typeof t == "object" && (t[wu] || !(e = Object.getPrototypeOf(t)) || e === Object.prototype || Array.isArray(t));
+  return t != null && typeof t == "object" && (t[Nu] || !(e = Object.getPrototypeOf(t)) || e === Object.prototype || Array.isArray(t));
 }
 function dl(t, e = /* @__PURE__ */ new Set()) {
   let n, r, i, s;
   if (n = t != null && t[X_])
     return n;
-  if (!Hu(t) || e.has(t))
+  if (!zu(t) || e.has(t))
     return t;
   if (Array.isArray(t)) {
     Object.isFrozen(t) ? t = t.slice(0) : e.add(t);
@@ -83623,7 +83620,7 @@ function _m(t, e, n) {
 }
 function PXe(t, e) {
   const n = Reflect.getOwnPropertyDescriptor(t, e);
-  return !n || n.get || !n.configurable || e === wu || e === zd || (delete n.value, delete n.writable, n.get = () => t[wu][e]), n;
+  return !n || n.get || !n.configurable || e === Nu || e === zd || (delete n.value, delete n.writable, n.get = () => t[Nu][e]), n;
 }
 function Due(t) {
   zO() && _m(Z_(t, zd), Rue)();
@@ -83635,7 +83632,7 @@ const jXe = {
   get(t, e, n) {
     if (e === X_)
       return t;
-    if (e === wu)
+    if (e === Nu)
       return n;
     if (e === HO)
       return Due(t), n;
@@ -83647,10 +83644,10 @@ const jXe = {
       const o = Object.getOwnPropertyDescriptor(t, e);
       zO() && (typeof s != "function" || t.hasOwnProperty(e)) && !(o && o.get) && (s = _m(r, e, s)());
     }
-    return Hu(s) ? Oue(s) : s;
+    return zu(s) ? Oue(s) : s;
   },
   has(t, e) {
-    return e === X_ || e === wu || e === HO || e === zd || e === wa || e === "__proto__" ? !0 : (zO() && _m(Z_(t, wa), e)(), e in t);
+    return e === X_ || e === Nu || e === HO || e === zd || e === wa || e === "__proto__" ? !0 : (zO() && _m(Z_(t, wa), e)(), e in t);
   },
   set() {
     return !0;
@@ -83719,7 +83716,7 @@ function fg(t, e, n = []) {
     i = t[r], n = [r].concat(n);
   }
   let s = e[0];
-  typeof s == "function" && (s = s(i, n), s === i) || r === void 0 && s == null || (s = dl(s), r === void 0 || Hu(i) && Hu(s) && !Array.isArray(s) ? wue(i, s) : wi(t, r, s));
+  typeof s == "function" && (s = s(i, n), s === i) || r === void 0 && s == null || (s = dl(s), r === void 0 || zu(i) && zu(s) && !Array.isArray(s) ? wue(i, s) : wi(t, r, s));
 }
 function eT(...[t, e]) {
   const n = dl(t || {}), r = Array.isArray(n), i = Oue(n);
@@ -83736,7 +83733,7 @@ function Td(t, e, n, r, i) {
   if (t === s)
     return;
   const o = Array.isArray(t);
-  if (n !== Dw && (!Hu(t) || !Hu(s) || o !== Array.isArray(s) || i && t[i] !== s[i])) {
+  if (n !== Dw && (!zu(t) || !zu(s) || o !== Array.isArray(s) || i && t[i] !== s[i])) {
     wi(e, n, t);
     return;
   }
@@ -83778,7 +83775,7 @@ function Td(t, e, n, r, i) {
 function qXe(t, e = {}) {
   const { merge: n, key: r = "id" } = e, i = dl(t);
   return (s) => {
-    if (!Hu(s) || !Hu(i))
+    if (!zu(s) || !zu(i))
       return i;
     const o = Td(
       i,
@@ -83798,7 +83795,7 @@ const e5 = /* @__PURE__ */ new WeakMap(), Nue = {
       return t;
     const n = t[e];
     let r;
-    return Hu(n) ? e5.get(n) || (e5.set(n, r = new Proxy(n, Nue)), r) : n;
+    return zu(n) ? e5.get(n) || (e5.set(n, r = new Proxy(n, Nue)), r) : n;
   },
   set(t, e, n) {
     return wi(t, e, dl(n)), !0;
@@ -83809,7 +83806,7 @@ const e5 = /* @__PURE__ */ new WeakMap(), Nue = {
 };
 function MA(t) {
   return (e) => {
-    if (Hu(e)) {
+    if (zu(e)) {
       let n;
       (n = e5.get(e)) || e5.set(e, n = new Proxy(e, Nue)), t(n);
     }
@@ -84114,7 +84111,7 @@ function nZe(t) {
             return v();
           },
           get children() {
-            return Qe(YXe, Eu({
+            return Qe(YXe, Au({
               onClose: () => _(!1)
             }, t, {
               devMode: !0
@@ -84896,7 +84893,7 @@ function gZe({
   return { startIndex: s, endIndex: o };
 }
 function mZe(t) {
-  const e = Eu(t), n = new pZe(e), [r, i] = eT(n.getVirtualItems()), [s, o] = yr(n.getTotalSize()), u = {
+  const e = Au(t), n = new pZe(e), [r, i] = eT(n.getVirtualItems()), [s, o] = yr(n.getTotalSize()), u = {
     get(l, c) {
       switch (c) {
         case "getVirtualItems":
@@ -84912,7 +84909,7 @@ function mZe(t) {
     const l = a._didMount();
     a._willUpdate(), Bg(l);
   }), pce(() => {
-    a.setOptions(Eu(e, t, {
+    a.setOptions(Au(e, t, {
       onChange: (l, c) => {
         var f;
         l._willUpdate(), i(qXe(l.getVirtualItems(), {
@@ -84923,7 +84920,7 @@ function mZe(t) {
   }), a;
 }
 function Pue(t) {
-  return mZe(Eu({
+  return mZe(Au({
     observeElementRect: cZe,
     observeElementOffset: xZe,
     scrollToFn: hZe
@@ -85075,7 +85072,7 @@ const OZe = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, DZe = OZe,
   })();
 }, wZe = (t) => {
   var fe;
-  const e = Eu({
+  const e = Au({
     rowLimit: 1 / 0
   }, t), n = ix(), r = U0();
   let i = !1;
@@ -85388,7 +85385,7 @@ const OZe = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, DZe = OZe,
     };
   });
   r().root && io().addCSSToShadowRoot(sZe);
-  const i = io().tableConfig, s = () => Eu(t, {
+  const i = io().tableConfig, s = () => Au(t, {
     disableVirtualization: typeof t.disableVirtualization == "boolean" ? t.disableVirtualization : i().disableVirtualization,
     rowLimit: typeof t.rowLimit == "number" ? t.rowLimit : i().rowLimit,
     shouldFillWidth: typeof t.shouldFillWidth == "boolean" ? t.shouldFillWidth : i().shouldFillWidth
@@ -85398,7 +85395,7 @@ const OZe = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, DZe = OZe,
       return r();
     },
     get children() {
-      return Qe(wZe, Eu(s));
+      return Qe(wZe, Au(s));
     }
   });
 };
@@ -86151,7 +86148,7 @@ var Fy = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-const Ja = "row", Xa = "column", nT = "facet", vn = "x", fr = "y", Xo = "x2", xa = "y2", Cc = "xOffset", Z2 = "yOffset", da = "radius", Fl = "radius2", Zo = "theta", Ll = "theta2", ha = "latitude", pa = "longitude", eu = "latitude2", no = "longitude2", Qi = "color", ga = "fill", ma = "stroke", Gi = "shape", Il = "size", Qx = "angle", Bl = "opacity", bc = "fillOpacity", Tc = "strokeOpacity", Rc = "strokeWidth", Oc = "strokeDash", Ly = "text", Iy = "order", By = "detail", rT = "key", ox = "tooltip", iT = "href", sT = "url", oT = "description", ret = {
+const Ja = "row", Xa = "column", nT = "facet", vn = "x", fr = "y", Xo = "x2", da = "y2", Cc = "xOffset", Z2 = "yOffset", ha = "radius", Fl = "radius2", Zo = "theta", Ll = "theta2", pa = "latitude", ga = "longitude", eu = "latitude2", no = "longitude2", Qi = "color", ma = "fill", ya = "stroke", Gi = "shape", Il = "size", Qx = "angle", Bl = "opacity", bc = "fillOpacity", Tc = "strokeOpacity", Rc = "strokeWidth", Oc = "strokeDash", Ly = "text", Iy = "order", By = "detail", rT = "key", ox = "tooltip", iT = "href", sT = "url", oT = "description", ret = {
   x: 1,
   y: 1,
   x2: 1,
@@ -86173,11 +86170,11 @@ const _B = {
 };
 function iet(t) {
   switch (t) {
-    case ha:
+    case pa:
       return "y";
     case eu:
       return "y2";
-    case pa:
+    case ga:
       return "x";
     case no:
       return "x2";
@@ -86213,7 +86210,7 @@ const oet = De(_B), SB = Object.assign(Object.assign(Object.assign(Object.assign
   description: 1
 });
 function Gd(t) {
-  return t === Qi || t === ga || t === ma;
+  return t === Qi || t === ma || t === ya;
 }
 const Vue = {
   row: 1,
@@ -86226,7 +86223,7 @@ function fet(t) {
 function Yue(t) {
   return !!CB[t];
 }
-const xet = [Xo, xa, eu, no, Ll, Fl];
+const xet = [Xo, da, eu, no, Ll, Fl];
 function Kue(t) {
   return Gx(t) !== t;
 }
@@ -86234,16 +86231,16 @@ function Gx(t) {
   switch (t) {
     case Xo:
       return vn;
-    case xa:
+    case da:
       return fr;
     case eu:
-      return ha;
-    case no:
       return pa;
+    case no:
+      return ga;
     case Ll:
       return Zo;
     case Fl:
-      return da;
+      return ha;
   }
   return t;
 }
@@ -86254,7 +86251,7 @@ function q0(t) {
         return "startAngle";
       case Ll:
         return "endAngle";
-      case da:
+      case ha:
         return "outerRadius";
       case Fl:
         return "innerRadius";
@@ -86266,14 +86263,14 @@ function $l(t) {
     case vn:
       return Xo;
     case fr:
-      return xa;
-    case ha:
-      return eu;
+      return da;
     case pa:
+      return eu;
+    case ga:
       return no;
     case Zo:
       return Ll;
-    case da:
+    case ha:
       return Fl;
   }
 }
@@ -86283,7 +86280,7 @@ function Wi(t) {
     case Xo:
       return "width";
     case fr:
-    case xa:
+    case da:
       return "height";
   }
 }
@@ -86295,11 +86292,11 @@ function det(t) {
       return "yOffset";
     case Xo:
       return "x2Offset";
-    case xa:
+    case da:
       return "y2Offset";
     case Zo:
       return "thetaOffset";
-    case da:
+    case ha:
       return "radiusOffset";
     case Ll:
       return "theta2Offset";
@@ -86326,7 +86323,7 @@ function Xue(t) {
 const het = De(SB), bB = Fy(SB, ["x", "y", "x2", "y2", "xOffset", "yOffset", "latitude", "longitude", "latitude2", "longitude2", "theta", "theta2", "radius", "radius2"]), pet = De(bB), TB = {
   x: 1,
   y: 1
-}, ya = De(TB);
+}, Ea = De(TB);
 function Or(t) {
   return t in TB;
 }
@@ -86348,8 +86345,8 @@ function yet(t) {
 function Eet(t) {
   switch (t) {
     case Qi:
-    case ga:
     case ma:
+    case ya:
     case Il:
     case Gi:
     case Bl:
@@ -86389,8 +86386,8 @@ const nae = {
 function _et(t) {
   switch (t) {
     case Qi:
-    case ga:
     case ma:
+    case ya:
     case oT:
     case By:
     case rT:
@@ -86409,11 +86406,11 @@ function _et(t) {
     case fr:
     case Cc:
     case Z2:
-    case ha:
     case pa:
+    case ga:
       return vet;
     case Xo:
-    case xa:
+    case da:
     case eu:
     case no:
       return {
@@ -86462,7 +86459,7 @@ function _et(t) {
       return { image: "always" };
     case Zo:
       return { text: "always", arc: "always" };
-    case da:
+    case ha:
       return { text: "always", arc: "always" };
     case Ll:
     case Fl:
@@ -86474,7 +86471,7 @@ function FO(t) {
     case vn:
     case fr:
     case Zo:
-    case da:
+    case ha:
     case Cc:
     case Z2:
     case Il:
@@ -86484,7 +86481,7 @@ function FO(t) {
     case bc:
     case Tc:
     case Xo:
-    case xa:
+    case da:
     case Ll:
     case Fl:
       return;
@@ -86500,11 +86497,11 @@ function FO(t) {
     case oT:
       return "discrete";
     case Qi:
-    case ga:
     case ma:
+    case ya:
       return "flexible";
-    case ha:
     case pa:
+    case ga:
     case eu:
     case no:
     case By:
@@ -86599,8 +86596,8 @@ function pQ(t) {
     case Xa:
     case Il:
     case Qi:
-    case ga:
     case ma:
+    case ya:
     case Rc:
     case Bl:
     case bc:
@@ -87657,7 +87654,7 @@ function Snt(t, e, n = !1) {
     case Cc:
     case Z2:
     case Zo:
-    case da:
+    case ha:
       return Ro(e) || e === "band" ? !0 : e === "point" ? !n : !1;
     case Il:
     case Rc:
@@ -87667,8 +87664,8 @@ function Snt(t, e, n = !1) {
     case Qx:
       return Ro(e) || Qh(e) || wt(["band", "point", "ordinal"], e);
     case Qi:
-    case ga:
     case ma:
+    case ya:
       return e !== "band";
     case Oc:
     case Gi:
@@ -87704,7 +87701,7 @@ function kae(t) {
   ].includes(t);
 }
 const Rnt = new Set(De(Oi));
-function zu(t) {
+function Qu(t) {
   return t.type;
 }
 const Ont = [
@@ -87769,7 +87766,7 @@ const Bnt = {
   thickness: 1
 };
 function Mnt(t) {
-  return zu(t) ? t.type : t;
+  return Qu(t) ? t.type : t;
 }
 function YB(t) {
   const { channel: e, channelDef: n, markDef: r, scale: i, config: s } = t, o = JB(t);
@@ -87804,7 +87801,7 @@ function qnt(t) {
 }
 function Af(t, e, n, r) {
   const i = {};
-  if (e && (i.scale = e), Ea(t)) {
+  if (e && (i.scale = e), Aa(t)) {
     const { datum: s } = t;
     Vx(s) ? i.signal = bm(s) : Xe(s) ? i.signal = s.signal : $y(s) ? i.signal = s.expr : i.value = s;
   } else
@@ -87853,7 +87850,7 @@ function JB({ channel: t, channelDef: e, channel2Def: n, markDef: r, config: i,
               bandPosition: c,
               offset: a
             });
-          Oe(yae(t === vn ? Xo : xa));
+          Oe(yae(t === vn ? Xo : da));
         }
       }
       return Af(
@@ -87985,7 +87982,7 @@ function wQ(t) {
 function Gae(t) {
   return !!t && !!t.encoding;
 }
-function Ru(t) {
+function Ou(t) {
   return !!t && (t.op === "count" || !!t.field);
 }
 function Wae(t) {
@@ -88074,17 +88071,17 @@ function Ie(t) {
 function $w(t) {
   return t && t.type;
 }
-function Ea(t) {
+function Aa(t) {
   return t && "datum" in t;
 }
-function yu(t) {
+function Eu(t) {
   return ro(t) && !u5(t) || kw(t);
 }
 function kw(t) {
-  return Ea(t) && ln(t.datum);
+  return Aa(t) && ln(t.datum);
 }
 function lt(t) {
-  return Ie(t) || Ea(t);
+  return Ie(t) || Aa(t);
 }
 function ro(t) {
   return t && ("field" in t || t.aggregate === "count") && "type" in t;
@@ -88252,7 +88249,7 @@ function rrt(t, e) {
     }
   return "nominal";
 }
-function Qu(t) {
+function Gu(t) {
   if (Ie(t))
     return t;
   if (ET(t))
@@ -88353,8 +88350,8 @@ function srt(t, e) {
     case Cc:
     case Z2:
     case Qi:
-    case ga:
     case ma:
+    case ya:
     case Ly:
     case By:
     case rT:
@@ -88363,12 +88360,12 @@ function srt(t, e) {
     case sT:
     case Qx:
     case Zo:
-    case da:
+    case ha:
     case oT:
       return pd;
-    case pa:
+    case ga:
     case no:
-    case ha:
+    case pa:
     case eu:
       return n !== ax ? {
         compatible: !1,
@@ -88382,7 +88379,7 @@ function srt(t, e) {
     case Ll:
     case Fl:
     case Xo:
-    case xa:
+    case da:
       return n === "nominal" && !t.sort ? {
         compatible: !1,
         warning: `Channel ${e} should not be used with an unsorted discrete field.`
@@ -88719,12 +88716,12 @@ function vf(t, e) {
 }
 function ule(t, e) {
   const n = t && t[e];
-  return n ? Ce(n) ? Uh(n, (r) => !!r.field) : Ie(n) || Ea(n) || My(n) : !1;
+  return n ? Ce(n) ? Uh(n, (r) => !!r.field) : Ie(n) || Aa(n) || My(n) : !1;
 }
 function Pw(t, e) {
   if (Or(e)) {
     const n = t[e];
-    if ((Ie(n) || Ea(n)) && Rae(n.type)) {
+    if ((Ie(n) || Aa(n)) && Rae(n.type)) {
       const r = Jue(e);
       return ule(t, r);
     }
@@ -88738,7 +88735,7 @@ function o$(t) {
       if (Ce(n))
         return Uh(n, (r) => !!r.aggregate);
       {
-        const r = Qu(n);
+        const r = Gu(n);
         return r && !!r.aggregate;
       }
     }
@@ -88830,7 +88827,7 @@ function xrt(t, e, n, r) {
       continue;
     }
     if (s === Il && e === "line") {
-      const u = Qu(t[s]);
+      const u = Gu(t[s]);
       if (u != null && u.aggregate) {
         Oe(att);
         continue;
@@ -88845,7 +88842,7 @@ function xrt(t, e, n, r) {
     else {
       if (s === ox && o === null)
         i[s] = null;
-      else if (!Ie(o) && !Ea(o) && !Po(o) && !yT(o) && !Xe(o)) {
+      else if (!Ie(o) && !Aa(o) && !Po(o) && !yT(o) && !Xe(o)) {
         Oe(Fw(o, s));
         continue;
       }
@@ -88898,15 +88895,15 @@ function lle(t, e) {
       case oT:
       case sT:
       case Xo:
-      case xa:
+      case da:
       case Cc:
       case Z2:
       case Zo:
       case Ll:
-      case da:
-      case Fl:
       case ha:
+      case Fl:
       case pa:
+      case ga:
       case eu:
       case no:
       case Ly:
@@ -88929,14 +88926,14 @@ function lle(t, e) {
         if (t === "trail")
           return n;
       case Qi:
-      case ga:
       case ma:
+      case ya:
       case Bl:
       case bc:
       case Tc:
       case Oc:
       case Rc: {
-        const i = Qu(e[r]);
+        const i = Gu(e[r]);
         return i && !i.aggregate && n.push($e(i, {})), n;
       }
     }
@@ -89004,7 +89001,7 @@ function l$(t, e, n, r, i) {
 function fle(t, e, n, r) {
   const { clip: i, color: s, opacity: o } = t, u = t.type;
   return t[e] || t[e] === void 0 && n[e] ? [
-    Object.assign(Object.assign({}, r), { mark: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, n[e]), i ? { clip: i } : {}), s ? { color: s } : {}), o ? { opacity: o } : {}), zu(r.mark) ? r.mark : { type: r.mark }), { style: `${u}-${e}` }), U2(t[e]) ? {} : t[e]) })
+    Object.assign(Object.assign({}, r), { mark: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, n[e]), i ? { clip: i } : {}), s ? { color: s } : {}), o ? { opacity: o } : {}), Qu(r.mark) ? r.mark : { type: r.mark }), { style: `${u}-${e}` }), U2(t[e]) ? {} : t[e]) })
   ] : [];
 }
 function xle(t, e, n) {
@@ -89026,10 +89023,10 @@ function YE(t, e) {
 }
 function dle(t, e) {
   const { mark: n, encoding: r } = t, { x: i, y: s } = r;
-  if (zu(n) && n.orient)
+  if (Qu(n) && n.orient)
     return n.orient;
-  if (yu(i)) {
-    if (yu(s)) {
+  if (Eu(i)) {
+    if (Eu(s)) {
       const o = Ie(i) && i.aggregate, u = Ie(s) && s.aggregate;
       if (!o && u === e)
         return "vertical";
@@ -89041,7 +89038,7 @@ function dle(t, e) {
     }
     return "horizontal";
   } else {
-    if (yu(s))
+    if (Eu(s))
       return "vertical";
     throw new Error(`Need a valid continuous axis for ${e}s`);
   }
@@ -89062,7 +89059,7 @@ function hle(t) {
 function ple(t, { config: e }) {
   var n, r;
   t = Object.assign(Object.assign({}, t), { encoding: ST(t.encoding, e) });
-  const { mark: i, encoding: s, params: o, projection: u } = t, a = qA(t, ["mark", "encoding", "params", "projection"]), l = zu(i) ? i : { type: i };
+  const { mark: i, encoding: s, params: o, projection: u } = t, a = qA(t, ["mark", "encoding", "params", "projection"]), l = Qu(i) ? i : { type: i };
   o && Oe(dae("boxplot"));
   const c = (n = l.extent) !== null && n !== void 0 ? n : e.boxplot.extent, f = qt(
     "size",
@@ -89305,11 +89302,11 @@ function vrt(t, e) {
     if (lt(u) && lt(a))
       throw new Error(`${e} cannot have both x2 and y2`);
     if (lt(u)) {
-      if (yu(s))
+      if (Eu(s))
         return { orient: "horizontal", inputType: "aggregated-upper-lower" };
       throw new Error(`Both x and x2 have to be quantitative in ${e}`);
     } else if (lt(a)) {
-      if (yu(o))
+      if (Eu(o))
         return { orient: "vertical", inputType: "aggregated-upper-lower" };
       throw new Error(`Both y and y2 have to be quantitative in ${e}`);
     }
@@ -89323,11 +89320,11 @@ function vrt(t, e) {
     if (lt(u) && lt(l))
       throw new Error(`${e} cannot have both xError and yError with both are quantiative`);
     if (lt(u)) {
-      if (yu(s))
+      if (Eu(s))
         return { orient: "horizontal", inputType: "aggregated-error" };
       throw new Error("All x, xError, and xError2 (if exist) have to be quantitative");
     } else if (lt(l)) {
-      if (yu(o))
+      if (Eu(o))
         return { orient: "vertical", inputType: "aggregated-error" };
       throw new Error("All y, yError, and yError2 (if exist) have to be quantitative");
     }
@@ -89345,7 +89342,7 @@ function Crt(t) {
 }
 function yle(t, e, n) {
   var r;
-  const { mark: i, encoding: s, params: o, projection: u } = t, a = IQ(t, ["mark", "encoding", "params", "projection"]), l = zu(i) ? i : { type: i };
+  const { mark: i, encoding: s, params: o, projection: u } = t, a = IQ(t, ["mark", "encoding", "params", "projection"]), l = Qu(i) ? i : { type: i };
   o && Oe(dae(e));
   const { orient: c, inputType: f } = vrt(t, e), { continuousAxisChannelDef: x, continuousAxisChannelDef2: h, continuousAxisChannelDefError: p, continuousAxisChannelDefError2: m, continuousAxis: g } = xle(t, c, e), { errorBarSpecificAggregate: y, postAggregateCalculates: E, tooltipSummary: A, tooltipTitleWithFieldName: v } = brt(l, x, h, p, m, f, e, n), _ = s, S = g;
   _[S];
@@ -89678,7 +89675,7 @@ function Tle({ step: t, offsetIsDiscrete: e }) {
   var n;
   return e ? (n = t.for) !== null && n !== void 0 ? n : "offset" : "position";
 }
-function Gu(t) {
+function Wu(t) {
   return ze(t) && t.step !== void 0;
 }
 function $Q(t) {
@@ -89722,7 +89719,7 @@ function jw(t, e) {
 }
 function f5(t, e) {
   const n = x5(t, e);
-  return Gu(n) ? n.step : Rle;
+  return Wu(n) ? n.step : Rle;
 }
 function x5(t, e) {
   var n;
@@ -89786,7 +89783,7 @@ const Rle = 20, qrt = {
   title: {},
   facet: { spacing: kQ },
   concat: { spacing: kQ }
-}, ba = [
+}, Ta = [
   "#4c78a8",
   "#f58518",
   "#e45756",
@@ -89804,15 +89801,15 @@ const Rle = 20, qrt = {
   groupTitle: 13,
   groupSubtitle: 12
 }, MQ = {
-  blue: ba[0],
-  orange: ba[1],
-  red: ba[2],
-  teal: ba[3],
-  green: ba[4],
-  yellow: ba[5],
-  purple: ba[6],
-  pink: ba[7],
-  brown: ba[8],
+  blue: Ta[0],
+  orange: Ta[1],
+  red: Ta[2],
+  teal: Ta[3],
+  green: Ta[4],
+  yellow: Ta[5],
+  purple: Ta[6],
+  pink: Ta[7],
+  brown: Ta[8],
   gray0: "#000",
   gray1: "#111",
   gray2: "#222",
@@ -90149,7 +90146,7 @@ function ait(t) {
 }
 function wle(t, e, n = {}) {
   var r, i;
-  const s = zu(t) ? t.type : t;
+  const s = Qu(t) ? t.type : t;
   if (!oit.has(s))
     return null;
   const o = jQ(e, "x") || jQ(e, "theta");
@@ -90166,7 +90163,7 @@ function wle(t, e, n = {}) {
     if (m !== "tooltip" && vf(e, m)) {
       const g = e[m];
       for (const y of je(g)) {
-        const E = Qu(y);
+        const E = Gu(y);
         if (E.aggregate)
           continue;
         const A = $e(E, {});
@@ -90227,7 +90224,7 @@ class fit {
   }
   hasMatchingType(e, n) {
     if (kl(e)) {
-      const { mark: r, encoding: i } = e, s = zu(r) ? r : { type: r };
+      const { mark: r, encoding: i } = e, s = Qu(r) ? r : { type: r };
       switch (s.type) {
         case "line":
         case "rule":
@@ -90243,7 +90240,7 @@ class fit {
     return !1;
   }
   run(e, n, r) {
-    const { config: i } = n, { params: s, projection: o, mark: u, encoding: a } = e, l = Nle(e, ["params", "projection", "mark", "encoding"]), c = ST(a, i), f = zu(u) ? u : { type: u }, x = BO(f, i[f.type], c), h = f.type === "area" && UQ(f, i[f.type]), p = [
+    const { config: i } = n, { params: s, projection: o, mark: u, encoding: a } = e, l = Nle(e, ["params", "projection", "mark", "encoding"]), c = ST(a, i), f = Qu(u) ? u : { type: u }, x = BO(f, i[f.type], c), h = f.type === "area" && UQ(f, i[f.type]), p = [
       Object.assign(Object.assign({}, s ? { params: s } : {}), {
         mark: lit(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
@@ -90287,7 +90284,7 @@ function Fle(t, e) {
   if (t = Uw("field", t, e), t !== void 0) {
     if (t === null)
       return null;
-    if (t$(t) && Ru(t.sort)) {
+    if (t$(t) && Ou(t.sort)) {
       const n = Uw("field", t.sort, e);
       t = Object.assign(Object.assign({}, t), n ? { sort: n } : {});
     }
@@ -90338,10 +90335,10 @@ class hit {
   hasMatchingType(e) {
     if (kl(e)) {
       const { encoding: n, mark: r } = e;
-      if (r === "line" || zu(r) && r.type === "line")
+      if (r === "line" || Qu(r) && r.type === "line")
         for (const i of xet) {
           const s = Gx(i), o = n[s];
-          if (n[i] && (Ie(o) && !ai(o.bin) || Ea(o)))
+          if (n[i] && (Ie(o) && !ai(o.bin) || Aa(o)))
             return !0;
         }
     }
@@ -90764,7 +90761,7 @@ class Pl {
     }
   }
 }
-function fu(t) {
+function xu(t) {
   return {
     explicit: !0,
     value: t
@@ -91042,12 +91039,12 @@ var YQ = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-class Ou extends Yt {
+class Du extends Yt {
   constructor(e, n) {
     super(e), this.formula = n;
   }
   clone() {
-    return new Ou(null, dt(this.formula));
+    return new Du(null, dt(this.formula));
   }
   static makeFromEncoding(e, n) {
     const r = n.reduceFieldDef((i, s) => {
@@ -91066,11 +91063,11 @@ class Ou extends Yt {
       }
       return i;
     }, {});
-    return Xt(r) ? null : new Ou(e, r);
+    return Xt(r) ? null : new Du(e, r);
   }
   static makeFromTransform(e, n) {
     const r = Object.assign({}, n), { timeUnit: i } = r, s = YQ(r, ["timeUnit"]), o = Ci(i), u = Object.assign(Object.assign({}, s), { timeUnit: o });
-    return new Ou(e, {
+    return new Du(e, {
       [Dt(u)]: u
     });
   }
@@ -91186,7 +91183,7 @@ const tst = {
       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) => ze(m) ? m[g.channel] !== void 0 ? m[g.channel] : m[g.field] : m))), Xt(u) || (s.timeUnit = new Ou(null, u));
+    x && (e.init = x.map((m) => s.items.map((g) => ze(m) ? m[g.channel] !== void 0 ? m[g.channel] : m[g.field] : m))), Xt(u) || (s.timeUnit = new Du(null, u));
   },
   signals: (t, e, n) => {
     const r = e.name + qy;
@@ -91455,7 +91452,7 @@ function Gle(t, e, n, { reactiveGeom: r } = {}) {
     }), h = x.title || i$(x, n), p = je(h).join(", ");
     let m;
     if (Or(c)) {
-      const g = c === "x" ? "x2" : "y2", y = Qu(t[g]);
+      const g = c === "x" ? "x2" : "y2", y = Gu(t[g]);
       if (ai(x.bin) && y) {
         const E = $e(x, { expr: s }), A = $e(y, { expr: s }), { format: v, formatType: _ } = a5(x);
         m = pT(E, A, v, _, n), i[g] = !0;
@@ -91924,7 +91921,7 @@ function Ast(t, { invalid: e = !1, channels: n }) {
 function S$(t) {
   const { config: e, markDef: n } = t;
   if (qt("invalid", n, e)) {
-    const i = vst(t, { channels: ya });
+    const i = vst(t, { channels: Ea });
     if (i)
       return { defined: { signal: i } };
   }
@@ -92406,7 +92403,7 @@ function xg(t, e, n, r = { header: !1 }) {
 }
 function c0e(t) {
   const { axes: e } = t.component, n = [];
-  for (const r of ya)
+  for (const r of Ea)
     if (e[r]) {
       for (const i of e[r])
         if (!i.get("disable") && !i.get("gridScale")) {
@@ -92740,7 +92737,7 @@ function zst(t, e) {
 function Qst(t, e) {
   var n;
   const { sort: r } = t;
-  return Ru(r) ? {
+  return Ou(r) ? {
     field: $e(r, { expr: "datum" }),
     order: (n = r.order) !== null && n !== void 0 ? n : "ascending"
   } : Ce(r) ? {
@@ -93357,7 +93354,7 @@ function _ot(t) {
 function Sot(t) {
   const e = [], { encoding: n } = t;
   for (const r of [
-    [pa, ha],
+    [ga, pa],
     [no, eu]
   ])
     (Qn(n[r[0]]) || Qn(n[r[1]])) && e.push({
@@ -93454,12 +93451,12 @@ function aG(t, e, n) {
   const l = Object.assign(Object.assign(Object.assign({ bin: s, field: t.field, as: [r] }, u ? { signal: u } : {}), a ? { extentSignal: a } : {}), i ? { span: i } : {});
   return { key: o, binComponent: l };
 }
-class Du extends Yt {
+class wu extends Yt {
   constructor(e, n) {
     super(e), this.bins = n;
   }
   clone() {
-    return new Du(null, dt(this.bins));
+    return new wu(null, dt(this.bins));
   }
   static makeFromEncoding(e, n) {
     const r = n.reduceFieldDef((i, s, o) => {
@@ -93469,7 +93466,7 @@ class Du extends Yt {
       }
       return i;
     }, {});
-    return Xt(r) ? null : new Du(e, r);
+    return Xt(r) ? null : new wu(e, r);
   }
   /**
    * Creates a bin node from BinTransform.
@@ -93477,7 +93474,7 @@ class Du extends Yt {
    */
   static makeFromTransform(e, n, r) {
     const { key: i, binComponent: s } = aG(n, n.bin, r);
-    return new Du(e, {
+    return new wu(e, {
       [i]: s
     });
   }
@@ -93641,7 +93638,7 @@ class sp extends Yt {
       const o = n.facet[s];
       if (o) {
         const { bin: u, sort: a } = o;
-        this[s] = Object.assign({ name: n.getName(`${s}_domain`), fields: [$e(o), ...sn(u) ? [$e(o, { binSuffix: "end" })] : []] }, Ru(a) ? { sortField: a } : Ce(a) ? { sortIndexField: Jh(o, s) } : {});
+        this[s] = Object.assign({ name: n.getName(`${s}_domain`), fields: [$e(o), ...sn(u) ? [$e(o, { binSuffix: "end" })] : []] }, Ou(a) ? { sortField: a } : Ce(a) ? { sortIndexField: Jh(o, s) } : {});
       }
     }
     this.childModel = n.child;
@@ -93676,7 +93673,7 @@ class sp extends Yt {
   }
   getChildIndependentFieldsWithStep() {
     const e = {};
-    for (const n of ya) {
+    for (const n of Ea) {
       const r = this.childModel.component.scales[n];
       if (r && !r.merged) {
         const i = r.get("type"), s = r.get("range");
@@ -93806,7 +93803,7 @@ function Lot(t) {
 function Iot(t) {
   const e = {};
   function n(r) {
-    Gh(r) ? e[r.field] = "date" : r.type === "quantitative" && Ret(r.aggregate) ? e[r.field] = "number" : Cm(r.field) > 1 ? r.field in e || (e[r.field] = "flatten") : Yx(r) && Ru(r.sort) && Cm(r.sort.field) > 1 && (r.sort.field in e || (e[r.sort.field] = "flatten"));
+    Gh(r) ? e[r.field] = "date" : r.type === "quantitative" && Ret(r.aggregate) ? e[r.field] = "number" : Cm(r.field) > 1 ? r.field in e || (e[r.field] = "flatten") : Yx(r) && Ou(r.sort) && Cm(r.sort.field) > 1 && (r.sort.field in e || (e[r.sort.field] = "flatten"));
   }
   if ((kn(t) || Fo(t)) && t.forEachFieldDef((r, i) => {
     if (ro(r))
@@ -94109,7 +94106,7 @@ class Mot extends N$ {
   }
   run(e, n) {
     let r = /* @__PURE__ */ new Set();
-    e instanceof Ou && (r = e.producedFields(), que(r, n) && (this.setModified(), e.removeFormulas(n), e.producedFields.length === 0 && e.remove()));
+    e instanceof Du && (r = e.producedFields(), que(r, n) && (this.setModified(), e.removeFormulas(n), e.producedFields.length === 0 && e.remove()));
     for (const i of e.children)
       this.run(i, /* @__PURE__ */ new Set([...n, ...r]));
   }
@@ -94169,7 +94166,7 @@ class Hot extends Kx {
 }
 class zot extends Kx {
   run(e) {
-    const n = e.children.filter((i) => i instanceof Ou), r = n.pop();
+    const n = e.children.filter((i) => i instanceof Du), r = n.pop();
     for (const i of n)
       this.setModified(), r.merge(i);
   }
@@ -94198,12 +94195,12 @@ class Got extends Kx {
   run(e) {
     const n = !(w$(e) || e instanceof ip || e instanceof zr || e instanceof W0), r = [], i = [];
     for (const s of e.children)
-      s instanceof Du && (n && !Hue(e.producedFields(), s.dependentFields()) ? r.push(s) : i.push(s));
+      s instanceof wu && (n && !Hue(e.producedFields(), s.dependentFields()) ? r.push(s) : i.push(s));
     if (r.length > 0) {
       const s = r.pop();
       for (const o of r)
         s.merge(o, this.model.renameSignal.bind(this.model));
-      this.setModified(), e instanceof Du ? e.merge(s, this.model.renameSignal.bind(this.model)) : s.swapWithParent();
+      this.setModified(), e instanceof wu ? e.merge(s, this.model.renameSignal.bind(this.model)) : s.swapWithParent();
     }
     if (i.length > 1) {
       const s = i.pop();
@@ -94319,7 +94316,7 @@ class el extends Yt {
       return null;
     const { groupbyChannels: s, fieldChannel: o, offset: u, impute: a } = r, l = s.map((h) => {
       const p = i[h];
-      return Qu(p);
+      return Gu(p);
     }).filter((h) => !!h), c = Vot(n), f = n.encoding.order;
     let x;
     return Ce(f) || Ie(f) ? x = lae(f) : x = c.reduce((h, p) => (h.field.push(p), h.order.push(o === "y" ? "descending" : "ascending"), h), { field: [], order: [] }), new el(e, {
@@ -94596,12 +94593,12 @@ function Wl(t, e, n, r) {
   const { encoding: i } = n, s = Qn(i[r]), { type: o } = s, u = s.timeUnit;
   if (mnt(e)) {
     const f = Wl(t, void 0, n, r), x = MO(e.unionWith, o, u);
-    return fu([...f.value, ...x]);
+    return xu([...f.value, ...x]);
   } else {
     if (Xe(e))
-      return fu([e]);
+      return xu([e]);
     if (e && e !== "unaggregated" && !Fae(e))
-      return fu(MO(e, o, u));
+      return xu(MO(e, o, u));
   }
   const a = n.stack;
   if (a && r === a.fieldChannel) {
@@ -94620,7 +94617,7 @@ function Wl(t, e, n, r) {
     ]);
   }
   const l = Dc(r) && Ie(s) ? sut(n, r, t) : void 0;
-  if (Ea(s)) {
+  if (Aa(s)) {
     const f = MO([s.datum], o, u);
     return rs(f);
   }
@@ -94723,7 +94720,7 @@ function sut(t, e, n) {
       order: "ascending"
     };
   const { stack: s } = t, o = s ? /* @__PURE__ */ new Set([...s.groupbyFields, ...s.stackBy.map((u) => u.fieldDef.field)]) : void 0;
-  if (Ru(i)) {
+  if (Ou(i)) {
     const u = s && !o.has(i.field);
     return jO(i, u);
   } else if (Gae(i)) {
@@ -94916,7 +94913,7 @@ function fut(t, e) {
             const p = n.range;
             if (Ce(p)) {
               if (Or(t))
-                return fu(p.map((m) => {
+                return xu(p.map((m) => {
                   if (m === "width" || m === "height") {
                     const g = e.getName(m), y = e.getSignalName.bind(e);
                     return Hi.fromName(y, g);
@@ -94924,24 +94921,24 @@ function fut(t, e) {
                   return m;
                 }));
             } else if (ze(p))
-              return fu({
+              return xu({
                 data: e.requestDataName(nn.Main),
                 field: p.field,
                 sort: { op: "min", field: e.vgField(t) }
               });
-            return fu(p);
+            return xu(p);
           }
           case "scheme":
-            return fu(xut(n[f]));
+            return xu(xut(n[f]));
         }
     }
   const o = t === vn || t === "xOffset" ? "width" : "height", u = r[o];
-  if (Gu(u)) {
+  if (Wu(u)) {
     if (Or(t))
       if (xr(s)) {
         const f = $0e(u, e, t);
         if (f)
-          return fu({ step: f });
+          return xu({ step: f });
       } else
         Oe(mae(o));
     else if (ep(t)) {
@@ -94949,13 +94946,13 @@ function fut(t, e) {
       if (e.getScaleComponent(f).get("type") === "band") {
         const p = k0e(u, s);
         if (p)
-          return fu(p);
+          return xu(p);
       }
     }
   }
   const { rangeMin: a, rangeMax: l } = n, c = dut(t, e);
   return (a !== void 0 || l !== void 0) && // it's ok to check just rangeMin's compatibility since rangeMin/rangeMax are the same
-  Iw(s, "rangeMin") && Ce(c) && c.length === 2 ? fu([a ?? c[0], l ?? c[1]]) : rs(c);
+  Iw(s, "rangeMin") && Ce(c) && c.length === 2 ? xu([a ?? c[0], l ?? c[1]]) : rs(c);
 }
 function xut(t) {
   return gnt(t) ? Object.assign({ scheme: t.name }, Js(t, ["name"])) : { scheme: t };
@@ -94967,7 +94964,7 @@ function dut(t, e) {
     case fr: {
       if (wt(["point", "band"], l)) {
         const p = P0e(t, n, r.view);
-        if (Gu(p))
+        if (Wu(p))
           return { step: $0e(p, e, t) };
       }
       const x = Wi(t), h = e.getName(x);
@@ -94984,7 +94981,7 @@ function dut(t, e) {
       return [0, Math.PI * 2];
     case Qx:
       return [0, 360];
-    case da:
+    case ha:
       return [
         0,
         new Hi(() => {
@@ -95006,8 +95003,8 @@ function dut(t, e) {
     case Gi:
       return "symbol";
     case Qi:
-    case ga:
     case ma:
+    case ya:
       return l === "ordinal" ? u === "nominal" ? "category" : "ordinal" : f !== void 0 ? "diverging" : i === "rect" || i === "geoshape" ? "heatmap" : "ramp";
     case Bl:
     case bc:
@@ -95040,7 +95037,7 @@ function hut(t, e, n) {
   const r = t === Cc ? "x" : "y", s = e.getScaleComponent(r).get("type"), o = e.scaleName(r);
   if (s === "band") {
     const u = P0e(r, e.size, e.config.view);
-    if (Gu(u)) {
+    if (Wu(u)) {
       const a = k0e(u, n);
       if (a)
         return a;
@@ -95122,7 +95119,7 @@ function mut(t, e, n, r) {
   throw new Error(cT("size", t));
 }
 function gG(t, e, n) {
-  const r = Gu(t.width) ? t.width.step : f5(n, "width"), i = Gu(t.height) ? t.height.step : f5(n, "height");
+  const r = Wu(t.width) ? t.width.step : f5(n, "width"), i = Wu(t.height) ? t.height.step : f5(n, "height");
   return e.x || e.y ? new Hi(() => `min(${[
     e.x ? e.x.signal : r,
     e.y ? e.y.signal : i
@@ -95214,12 +95211,12 @@ function Eut(t, e) {
     };
 }
 function Aut(t, e) {
-  if (wt([Qi, ga, ma], t) && e !== "nominal")
+  if (wt([Qi, ma, ya], t) && e !== "nominal")
     return "hcl";
 }
 function vut(t, e, n, r, i, s) {
   var o;
-  if (!(!((o = Qu(s)) === null || o === void 0) && o.bin || Ce(n) || i != null || r != null || wt([qi.TIME, qi.UTC], t)))
+  if (!(!((o = Gu(s)) === null || o === void 0) && o.bin || Ce(n) || i != null || r != null || wt([qi.TIME, qi.UTC], t)))
     return Or(e) ? !0 : void 0;
 }
 function _ut(t, e, n, r, i, s) {
@@ -95284,7 +95281,7 @@ function Tut(t, e, n, r, i) {
   }
   if (t === "size" && e.type === "quantitative" && !Qh(i))
     return !0;
-  if (!(Ie(e) && e.bin) && wt([...ya, ...get], t)) {
+  if (!(Ie(e) && e.bin) && wt([...Ea, ...get], t)) {
     const { orient: o, type: u } = r;
     return !(wt(["bar", "area", "line", "trail"], u) && (o === "horizontal" && t === "y" || o === "vertical" && t === "x"));
   }
@@ -95634,13 +95631,13 @@ class z0e extends B$ {
   }
   reduceFieldDef(e, n) {
     return hrt(this.getMapping(), (r, i, s) => {
-      const o = Qu(i);
+      const o = Gu(i);
       return o ? e(r, o, s) : r;
     }, n);
   }
   forEachFieldDef(e, n) {
     u$(this.getMapping(), (r, i) => {
-      const s = Qu(r);
+      const s = Gu(r);
       s && e(s, i);
     }, n);
   }
@@ -95793,12 +95790,12 @@ class Yd extends Yt {
       return e;
     let r = 0;
     for (const i of [
-      [pa, ha],
+      [ga, pa],
       [no, eu]
     ]) {
       const s = i.map((o) => {
         const u = Qn(n.encoding[o]);
-        return Ie(u) ? u.field : Ea(u) ? { expr: `${u.datum}` } : Po(u) ? { expr: `${u.value}` } : void 0;
+        return Ie(u) ? u.field : Aa(u) ? { expr: `${u.datum}` } : Po(u) ? { expr: `${u.value}` } : void 0;
       });
       (s[0] || s[1]) && (e = new Yd(e, s, null, n.getName(`geojson_${r++}`)));
     }
@@ -95842,12 +95839,12 @@ class wm extends Yt {
     if (!n.projectionName())
       return e;
     for (const r of [
-      [pa, ha],
+      [ga, pa],
       [no, eu]
     ]) {
       const i = r.map((o) => {
         const u = Qn(n.encoding[o]);
-        return Ie(u) ? u.field : Ea(u) ? { expr: `${u.datum}` } : Po(u) ? { expr: `${u.value}` } : void 0;
+        return Ie(u) ? u.field : Aa(u) ? { expr: `${u.datum}` } : Po(u) ? { expr: `${u.value}` } : void 0;
       }), s = r[0] === no ? "2" : "";
       (i[0] || i[1]) && (e = new wm(e, n.projectionName(), i, [
         n.getName(`x${s}`),
@@ -96135,7 +96132,7 @@ function Q0e(t) {
       i.name || (i.name = `data_${e++}`), !i.source || i.transform.length > 0 ? (t.push(i), r.data = i.name) : r.data = i.source, t.push(...r.assemble());
       return;
     }
-    switch ((r instanceof Hy || r instanceof zy || r instanceof Dm || r instanceof ip || r instanceof Kh || r instanceof wm || r instanceof No || r instanceof Nm || r instanceof op || r instanceof Jx || r instanceof IT || r instanceof LT || r instanceof FT || r instanceof BT || r instanceof $T || r instanceof kT || r instanceof W0 || r instanceof MT || r instanceof PT) && i.transform.push(r.assemble()), (r instanceof Du || r instanceof Ou || r instanceof _f || r instanceof el || r instanceof Yd) && i.transform.push(...r.assemble()), r instanceof mi && (i.source && i.transform.length === 0 ? r.setSource(i.source) : r.parent instanceof mi ? r.setSource(i.name) : (i.name || (i.name = `data_${e++}`), r.setSource(i.name), r.numChildren() === 1 && (t.push(i), i = {
+    switch ((r instanceof Hy || r instanceof zy || r instanceof Dm || r instanceof ip || r instanceof Kh || r instanceof wm || r instanceof No || r instanceof Nm || r instanceof op || r instanceof Jx || r instanceof IT || r instanceof LT || r instanceof FT || r instanceof BT || r instanceof $T || r instanceof kT || r instanceof W0 || r instanceof MT || r instanceof PT) && i.transform.push(r.assemble()), (r instanceof wu || r instanceof Du || r instanceof _f || r instanceof el || r instanceof Yd) && i.transform.push(...r.assemble()), r instanceof mi && (i.source && i.transform.length === 0 ? r.setSource(i.source) : r.parent instanceof mi ? r.setSource(i.name) : (i.name || (i.name = `data_${e++}`), r.setSource(i.name), r.numChildren() === 1 && (t.push(i), i = {
       name: null,
       source: i.name,
       transform: []
@@ -96286,11 +96283,11 @@ function g5(t, e) {
 }
 function zut(t) {
   const { size: e, component: n } = t;
-  for (const r of ya) {
+  for (const r of Ea) {
     const i = Wi(r);
     if (e[i]) {
       const s = e[i];
-      n.layoutSize.set(i, Gu(s) ? "step" : s, !0);
+      n.layoutSize.set(i, Wu(s) ? "step" : s, !0);
     } else {
       const s = Qut(t, i);
       n.layoutSize.set(i, s, !1);
@@ -96303,7 +96300,7 @@ function Qut(t, e) {
     const s = i.get("type"), o = i.get("range");
     if (xr(s)) {
       const u = x5(r.view, e);
-      return Nc(o) || Gu(u) ? "step" : u;
+      return Nc(o) || Wu(u) ? "step" : u;
     } else
       return jw(r.view, e);
   } else {
@@ -96311,7 +96308,7 @@ function Qut(t, e) {
       return jw(r.view, e);
     {
       const s = x5(r.view, e);
-      return Gu(s) ? s.step : s;
+      return Wu(s) ? s.step : s;
     }
   }
 }
@@ -96430,7 +96427,7 @@ class Ig extends z0e {
         e.push(i), n.push("distinct"), r.push(`distinct_${i}`);
       }
     } else
-      for (const i of ya) {
+      for (const i of Ea) {
         const s = this.child.component.scales[i];
         if (s && !s.merged) {
           const o = s.get("type"), u = s.get("range");
@@ -96449,7 +96446,7 @@ class Ig extends z0e {
       if (f) {
         a.push($e(f));
         const { bin: x, sort: h } = f;
-        if (sn(x) && a.push($e(f, { binSuffix: "end" })), Ru(h)) {
+        if (sn(x) && a.push($e(f, { binSuffix: "end" })), Ou(h)) {
           const { field: p, op: m = gT } = h, g = nN(f, h);
           r && i ? (s.push(g), o.push("max"), u.push(g)) : (s.push(p), o.push(m), u.push(g));
         } else if (Ce(h)) {
@@ -96469,13 +96466,13 @@ class Ig extends z0e {
   }
   facetSortFields(e) {
     const { facet: n } = this, r = n[e];
-    return r ? Ru(r.sort) ? [nN(r, r.sort, { expr: "datum" })] : Ce(r.sort) ? [Jh(r, e, { expr: "datum" })] : [$e(r, { expr: "datum" })] : [];
+    return r ? Ou(r.sort) ? [nN(r, r.sort, { expr: "datum" })] : Ce(r.sort) ? [Jh(r, e, { expr: "datum" })] : [$e(r, { expr: "datum" })] : [];
   }
   facetSortOrder(e) {
     const { facet: n } = this, r = n[e];
     if (r) {
       const { sort: i } = r;
-      return [(Ru(i) ? i.order : !Ce(i) && i) || "ascending"];
+      return [(Ou(i) ? i.order : !Ce(i) && i) || "ascending"];
     }
     return [];
   }
@@ -96517,7 +96514,7 @@ function Gut(t, e) {
   if (n && r) {
     let i = null;
     for (const s of [n, r])
-      if (Ru(s.sort)) {
+      if (Ou(s.sort)) {
         const { field: o, op: u = gT } = s.sort;
         t = i = new Jx(t, {
           joinaggregate: [
@@ -96587,9 +96584,9 @@ function Vut(t, e, n) {
       const l = Lot(o);
       a = t = (r = zr.makeWithAncestors(t, {}, l, n)) !== null && r !== void 0 ? r : t, t = new ip(t, e, o.filter);
     } else if (Ble(o))
-      a = t = Du.makeFromTransform(t, o, e), u = "number";
+      a = t = wu.makeFromTransform(t, o, e), u = "number";
     else if (wit(o))
-      u = "date", n.getWithExplicit(o.field).value === void 0 && (t = new zr(t, { [o.field]: u }), n.set(o.field, u, !1)), a = t = Ou.makeFromTransform(t, o);
+      u = "date", n.getWithExplicit(o.field).value === void 0 && (t = new zr(t, { [o.field]: u }), n.set(o.field, u, !1)), a = t = Du.makeFromTransform(t, o);
     else if (Nit(o))
       a = t = No.makeFromTransform(t, o), u = "number", C$(e) && (t = new W0(t));
     else if (Ile(o))
@@ -96634,9 +96631,9 @@ function jT(t) {
   const { outputNodes: x, outputNodeRefCounts: h } = t.component.data, p = t.data, g = !(p && (A0(p) || Wh(p) || Rm(p))) && t.parent ? t.parent.component.data.ancestorParse.clone() : new Qit();
   A0(p) ? (Ule(p) ? f = new zy(f, p.sequence) : E$(p) && (f = new Hy(f, p.graticule)), g.parseNothing = !0) : ((e = p == null ? void 0 : p.format) === null || e === void 0 ? void 0 : e.parse) === null && (g.parseNothing = !0), f = (n = zr.makeExplicit(f, t, g)) !== null && n !== void 0 ? n : f, f = new W0(f);
   const y = t.parent && up(t.parent);
-  (kn(t) || Fo(t)) && y && (f = (r = Du.makeFromEncoding(f, t)) !== null && r !== void 0 ? r : f), t.transforms.length > 0 && (f = Vut(f, t, g));
+  (kn(t) || Fo(t)) && y && (f = (r = wu.makeFromEncoding(f, t)) !== null && r !== void 0 ? r : f), t.transforms.length > 0 && (f = Vut(f, t, g));
   const E = Bot(t), A = Iot(t);
-  f = (i = zr.makeWithAncestors(f, {}, Object.assign(Object.assign({}, E), A), g)) !== null && i !== void 0 ? i : f, kn(t) && (f = Yd.parseAll(f, t), f = wm.parseAll(f, t)), (kn(t) || Fo(t)) && (y || (f = (s = Du.makeFromEncoding(f, t)) !== null && s !== void 0 ? s : f), f = (o = Ou.makeFromEncoding(f, t)) !== null && o !== void 0 ? o : f, f = Kh.parseAllForSortIndex(f, t));
+  f = (i = zr.makeWithAncestors(f, {}, Object.assign(Object.assign({}, E), A), g)) !== null && i !== void 0 ? i : f, kn(t) && (f = Yd.parseAll(f, t), f = wm.parseAll(f, t)), (kn(t) || Fo(t)) && (y || (f = (s = wu.makeFromEncoding(f, t)) !== null && s !== void 0 ? s : f), f = (o = Du.makeFromEncoding(f, t)) !== null && o !== void 0 ? o : f, f = Kh.parseAllForSortIndex(f, t));
   const v = t.getDataName(nn.Raw), _ = new mi(f, v, nn.Raw, h);
   if (x[v] = _, f = _, kn(t)) {
     const N = No.makeFromEncoding(f, t);
@@ -96756,7 +96753,7 @@ function Xut(t, e, n) {
   }) }, n) : n;
 }
 function Zut(t) {
-  return ya.reduce((e, n) => (t.component.scales[n] && (e[n] = [oat(n, t)]), e), {});
+  return Ea.reduce((e, n) => (t.component.scales[n] && (e[n] = [oat(n, t)]), e), {});
 }
 const eat = {
   bottom: "top",
@@ -96772,7 +96769,7 @@ function tat(t) {
     for (const o of De(s.component.axes))
       r.axis[o] = O$(t.component.resolve, o), r.axis[o] === "shared" && (n[o] = nat(n[o], s.component.axes[o]), n[o] || (r.axis[o] = "independent", delete n[o]));
   }
-  for (const s of ya) {
+  for (const s of Ea) {
     for (const o of t.children)
       if (o.component.axes[s]) {
         if (r.axis[s] === "independent") {
@@ -96912,9 +96909,9 @@ function oat(t, e) {
   return Xt(y) || o.set("encode", y, !!s.encoding || s.labelAngle !== void 0), o;
 }
 function uat({ encoding: t, size: e }) {
-  for (const n of ya) {
+  for (const n of Ea) {
     const r = Wi(n);
-    Gu(e[r]) && yu(t[n]) && (delete e[r], Oe(mae(r)));
+    Wu(e[r]) && Eu(t[n]) && (delete e[r], Oe(mae(r)));
   }
   return e;
 }
@@ -96985,7 +96982,7 @@ function xat(t, e, n) {
       }
     case dT:
     case GB: {
-      const u = yu(r), a = yu(i);
+      const u = Eu(r), a = Eu(i);
       if (n)
         return n;
       if (u && !a)
@@ -97342,7 +97339,7 @@ function Iat(t) {
           return {
             field: $e(l, { prefix: a, suffix: "sort_index", expr: "datum" })
           };
-        if (Ru(c))
+        if (Ou(c))
           return {
             field: $e({
               // FIXME: this op might not already exist?
@@ -97403,7 +97400,7 @@ class Y0e extends z0e {
   constructor(e, n, r, i = {}, s) {
     var o;
     super(e, "unit", n, r, s, void 0, $Q(e) ? e.view : void 0), this.specifiedScales = {}, this.specifiedAxes = {}, this.specifiedLegends = {}, this.specifiedProjection = {}, this.selection = [], this.children = [];
-    const u = zu(e.mark) ? Object.assign({}, e.mark) : { type: e.mark }, a = u.type;
+    const u = Qu(e.mark) ? Object.assign({}, e.mark) : { type: e.mark }, a = u.type;
     u.filled === void 0 && (u.filled = fat(u, s, {
       graticule: e.data && E$(e.data)
     }));
@@ -97443,7 +97440,7 @@ class Y0e extends z0e {
     return Ce(n) && (i.domain = n.map(as)), Ce(r) && (i.range = r.map(as)), i;
   }
   initAxes(e) {
-    return ya.reduce((n, r) => {
+    return Ea.reduce((n, r) => {
       const i = e[r];
       if (lt(i) || r === vn && lt(e.x2) || r === fr && lt(e.y2)) {
         const s = lt(i) ? i.axis : void 0;
@@ -97523,7 +97520,7 @@ class Y0e extends z0e {
   }
   fieldDef(e) {
     const n = this.encoding[e];
-    return Qu(n);
+    return Gu(n);
   }
   typedFieldDef(e) {
     const n = this.fieldDef(e);
@@ -150133,7 +150130,7 @@ function V0(t) {
         break;
       }
       case "chart": {
-        o = Qe(nZe, Eu({
+        o = Qe(nZe, Au({
           field: e,
           get data() {
             return r.getData(n);
@@ -150144,7 +150141,7 @@ function V0(t) {
       }
       case "dashboard": {
         if (n.isArray())
-          o = Qe(UZe, Eu({
+          o = Qe(UZe, Au({
             data: n
           }, u));
         else
@@ -150165,7 +150162,7 @@ function V0(t) {
       }
       case "table": {
         if (n.isArrayOrRecord())
-          o = Qe(NZe, Eu({
+          o = Qe(NZe, Au({
             data: n
           }, u));
         else