@malloydata/render 0.0.226-dev250113232339 → 0.0.226

package/dist/module/index.mjs

@@ -4655,9 +4655,9 @@ d5.MySQLDialect = $ce;
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), n(d5, t);
 })(QN);
-var iu = {};
-Object.defineProperty(iu, "__esModule", { value: !0 });
-iu.getDialects = iu.registerDialect = iu.getDialect = void 0;
+var su = {};
+Object.defineProperty(su, "__esModule", { value: !0 });
+su.getDialects = su.registerDialect = su.getDialect = void 0;
 const kce = qN, Pce = UN, Mce = HN, jce = MN, eG = zN, Uce = QN, GN = /* @__PURE__ */ new Map();
 function qce(t) {
   const e = GN.get(t);
@@ -4665,15 +4665,15 @@ function qce(t) {
     throw new Error(`Unknown Dialect ${t}`);
   return e;
 }
-iu.getDialect = qce;
+su.getDialect = qce;
 function b0(t) {
   GN.set(t.name, t);
 }
-iu.registerDialect = b0;
+su.registerDialect = b0;
 function Hce() {
   return [...GN.values()];
 }
-iu.getDialects = Hce;
+su.getDialects = Hce;
 b0(new Pce.PostgresDialect());
 b0(new jce.StandardSQLDialect());
 b0(new kce.DuckDBDialect());
@@ -4739,7 +4739,7 @@ b0(new Uce.MySQLDialect());
   Object.defineProperty(t, "MySQLDialect", { enumerable: !0, get: function() {
     return a.MySQLDialect;
   } });
-  var l = iu;
+  var l = su;
   Object.defineProperty(t, "getDialect", { enumerable: !0, get: function() {
     return l.getDialect;
   } }), Object.defineProperty(t, "registerDialect", { enumerable: !0, get: function() {
@@ -5055,7 +5055,7 @@ var Kt = {}, Va = {};
  * 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 Du = T && T.__decorate || function(t, e, n, r) {
+var Nu = 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);
@@ -5066,7 +5066,7 @@ var Du = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(bo, "__esModule", { value: !0 });
 bo.TerminalNode = void 0;
-const Vce = ar, Nu = Ee, Yce = Kt;
+const Vce = ar, wu = Ee, Yce = Kt;
 class To {
   constructor(e) {
     this._symbol = e;
@@ -5106,35 +5106,35 @@ class To {
     return this._symbol.type === Yce.Token.EOF ? "<EOF>" : this._symbol.text || "";
   }
 }
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "getChild", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "parent", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "setParent", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "payload", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "sourceInterval", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "childCount", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "accept", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "text", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "toStringTree", null);
-Du([
-  Nu.Override
+Nu([
+  wu.Override
 ], To.prototype, "toString", null);
 bo.TerminalNode = To;
 /*!
@@ -8433,7 +8433,7 @@ BG([
   $G.Override
 ], J1.prototype, "equals", null);
 Mf.ArrayEqualityComparator = J1;
-var jf = {}, wu = {}, Fu = {};
+var jf = {}, Fu = {}, Lu = {};
 (function(t) {
   /*!
    * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -8543,20 +8543,20 @@ var jf = {}, wu = {}, Fu = {};
   ], r.prototype, "toString", null), t.ATNState = r, function(i) {
     i.INVALID_STATE_NUMBER = -1;
   }(r = t.ATNState || (t.ATNState = {}));
-})(Fu);
+})(Lu);
 /*!
  * 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(wu, "__esModule", { value: !0 });
-wu.DecisionState = void 0;
-const Jxe = Fu;
+Object.defineProperty(Fu, "__esModule", { value: !0 });
+Fu.DecisionState = void 0;
+const Jxe = Lu;
 class Xxe extends Jxe.ATNState {
   constructor() {
     super(...arguments), this.decision = -1, this.nonGreedy = !1, this.sll = !1;
   }
 }
-wu.DecisionState = Xxe;
+Fu.DecisionState = Xxe;
 var PT = {}, C5 = {};
 (function(t) {
   /*!
@@ -9506,7 +9506,7 @@ var Bn = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(jf, "__esModule", { value: !0 });
 jf.ATNConfig = void 0;
-const ide = Ya, sde = wu, na = Cn, Yt = Ee, ode = ps, mk = Oo(), yc = Uf, yk = fi(), jT = 2147483648;
+const ide = Ya, sde = Fu, ra = Cn, Yt = Ee, ode = ps, mk = Oo(), yc = Uf, yk = fi(), jT = 2147483648;
 let xi = class Jp {
   constructor(e, n, r) {
     typeof n == "number" ? (yk((n & 16777215) === n), this._state = e, this.altAndOuterContextDepth = n, this._context = r) : (this._state = e, this.altAndOuterContextDepth = n.altAndOuterContextDepth, this._context = r);
@@ -9640,8 +9640,8 @@ let xi = class Jp {
     return this === e ? !0 : e instanceof Jp ? 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 && ode.ObjectEqualityComparator.INSTANCE.equals(this.lexerActionExecutor, e.lexerActionExecutor) : !1;
   }
   hashCode() {
-    let e = na.MurmurHash.initialize(7);
-    return e = na.MurmurHash.update(e, this.state.stateNumber), e = na.MurmurHash.update(e, this.alt), e = na.MurmurHash.update(e, this.reachesIntoOuterContext ? 1 : 0), e = na.MurmurHash.update(e, this.context), e = na.MurmurHash.update(e, this.semanticContext), e = na.MurmurHash.update(e, this.hasPassedThroughNonGreedyDecision ? 1 : 0), e = na.MurmurHash.update(e, this.lexerActionExecutor), e = na.MurmurHash.finish(e, 7), e;
+    let e = ra.MurmurHash.initialize(7);
+    return e = ra.MurmurHash.update(e, this.state.stateNumber), e = ra.MurmurHash.update(e, this.alt), e = ra.MurmurHash.update(e, this.reachesIntoOuterContext ? 1 : 0), e = ra.MurmurHash.update(e, this.context), e = ra.MurmurHash.update(e, this.semanticContext), e = ra.MurmurHash.update(e, this.hasPassedThroughNonGreedyDecision ? 1 : 0), e = ra.MurmurHash.update(e, this.lexerActionExecutor), e = ra.MurmurHash.finish(e, 7), e;
   }
   /**
    * Returns a graphical representation of the current `ATNConfig` in Graphviz format. The graph can be stored to a
@@ -10721,7 +10721,7 @@ Ah.ProxyErrorListener = PG;
  * 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 Lu = T && T.__decorate || function(t, e, n, r) {
+var Iu = 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);
@@ -10875,37 +10875,37 @@ class Pn {
 Pn.EOF = -1;
 Pn.tokenTypeMapCache = /* @__PURE__ */ new WeakMap();
 Pn.ruleIndexMapCache = /* @__PURE__ */ new WeakMap();
-Lu([
+Iu([
   us.SuppressWarnings("serial"),
   us.NotNull
 ], Pn.prototype, "_listeners", void 0);
-Lu([
+Iu([
   us.NotNull
 ], Pn.prototype, "getTokenTypeMap", null);
-Lu([
+Iu([
   us.NotNull
 ], Pn.prototype, "getRuleIndexMap", null);
-Lu([
+Iu([
   us.NotNull
 ], Pn.prototype, "serializedATN", null);
-Lu([
+Iu([
   us.NotNull
 ], Pn.prototype, "atn", null);
-Lu([
+Iu([
   us.NotNull,
   T5(0, us.NotNull)
 ], Pn.prototype, "interpreter", null);
-Lu([
+Iu([
   us.NotNull,
   T5(0, us.NotNull)
 ], Pn.prototype, "getErrorHeader", null);
-Lu([
+Iu([
   T5(0, us.NotNull)
 ], Pn.prototype, "addErrorListener", null);
-Lu([
+Iu([
   T5(0, us.NotNull)
 ], Pn.prototype, "removeErrorListener", null);
-Lu([
+Iu([
   us.NotNull
 ], Pn.prototype, "getErrorListeners", null);
 D0.Recognizer = Pn;
@@ -11155,7 +11155,7 @@ var gde = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(_h, "__esModule", { value: !0 });
 _h.StarLoopEntryState = void 0;
-const mde = lr, yde = Do, Ede = wu, Ade = Ee;
+const mde = lr, yde = Do, Ede = Fu, Ade = Ee;
 class jG extends Ede.DecisionState {
   constructor() {
     super(...arguments), this.precedenceRuleDecision = !1, this.precedenceLoopbackStates = new yde.BitSet();
@@ -12200,7 +12200,7 @@ var QG = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(F0, "__esModule", { value: !0 });
 F0.RuleStopState = void 0;
-const Bde = Fu, $de = lr, GG = Ee;
+const Bde = Lu, $de = lr, GG = Ee;
 class a8 extends Bde.ATNState {
   get nonStopStateNumber() {
     return -1;
@@ -13216,7 +13216,7 @@ var kde = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(rm, "__esModule", { value: !0 });
 rm.BasicState = void 0;
-const Pde = Fu, Mde = lr, jde = Ee;
+const Pde = Lu, Mde = lr, jde = Ee;
 class WG extends Pde.ATNState {
   get stateType() {
     return Mde.ATNStateType.BASIC;
@@ -14020,7 +14020,7 @@ var L5 = {}, Wf = {};
  */
 Object.defineProperty(Wf, "__esModule", { value: !0 });
 Wf.BlockStartState = void 0;
-const she = wu;
+const she = Fu;
 class ohe extends she.DecisionState {
 }
 Wf.BlockStartState = ohe;
@@ -14065,7 +14065,7 @@ var fhe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(I5, "__esModule", { value: !0 });
 I5.BlockEndState = void 0;
-const xhe = Fu, dhe = lr, hhe = Ee;
+const xhe = Lu, dhe = lr, hhe = Ee;
 class XG extends xhe.ATNState {
   get stateType() {
     return dhe.ATNStateType.BLOCK_END;
@@ -14857,7 +14857,7 @@ var vhe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(hm, "__esModule", { value: !0 });
 hm.LoopEndState = void 0;
-const Che = Fu, She = lr, bhe = Ee;
+const Che = Lu, She = lr, bhe = Ee;
 class nW extends Che.ATNState {
   get stateType() {
     return She.ATNStateType.LOOP_END;
@@ -15419,7 +15419,7 @@ function Dh() {
     };
   };
   Object.defineProperty(z2, "__esModule", { value: !0 }), z2.ParserATNSimulator = void 0;
-  const n = em, r = um, i = Ro, s = C5, o = wo(), u = jf, a = Jg(), l = b5(), c = lr, f = cm, x = Do, h = U5, p = wu, m = S5(), g = vh, y = ar, E = Va, A = Ee, _ = c8(), v = gm(), C = ps, S = Gs(), b = Oo(), O = i8(), F = uW, B = F0, U = Sh, z = Uf, X = l8(), W = aW(), ue = Kt, ge = gs, he = fi(), oe = 65535, ce = -(1 << 31 >>> 0);
+  const n = em, r = um, i = Ro, s = C5, o = wo(), u = jf, a = Jg(), l = b5(), c = lr, f = cm, x = Do, h = U5, p = Fu, m = S5(), g = vh, y = ar, E = Va, A = Ee, _ = c8(), v = gm(), C = ps, S = Gs(), b = Oo(), O = i8(), F = uW, B = F0, U = Sh, z = Uf, X = l8(), W = aW(), ue = Kt, ge = gs, he = fi(), oe = 65535, ce = -(1 << 31 >>> 0);
   let pe = class lt extends l.ATNSimulator {
     constructor(L, N) {
       super(L), this.predictionMode = F.PredictionMode.LL, this.force_global_context = !1, this.always_try_local_context = !0, this.enable_global_context_dfa = !1, this.optimize_unique_closure = !0, this.optimize_ll1 = !0, this.optimize_tail_calls = !0, this.tail_call_preserves_sll = !0, this.treat_sllk1_conflict_as_ambiguity = !1, this.reportAmbiguities = !1, this.userWantsCtxSensitive = !0, this._parser = N;
@@ -16562,7 +16562,7 @@ var whe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(H5, "__esModule", { value: !0 });
 H5.PlusLoopbackState = void 0;
-const Fhe = lr, Lhe = wu, Ihe = Ee;
+const Fhe = lr, Lhe = Fu, Ihe = Ee;
 class cW extends Lhe.DecisionState {
   get stateType() {
     return Fhe.ATNStateType.PLUS_LOOP_BACK;
@@ -16759,7 +16759,7 @@ var zhe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(G5, "__esModule", { value: !0 });
 G5.RuleStartState = void 0;
-const Qhe = Fu, Ghe = lr, Whe = Ee;
+const Qhe = Lu, Ghe = lr, Whe = Ee;
 class fW extends Qhe.ATNState {
   constructor() {
     super(...arguments), this.isPrecedenceRule = !1, this.leftFactored = !1;
@@ -16814,7 +16814,7 @@ var Xhe = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(V5, "__esModule", { value: !0 });
 V5.StarLoopbackState = void 0;
-const Zhe = Fu, e2e = lr, t2e = Ee;
+const Zhe = Lu, e2e = lr, t2e = Ee;
 class dW extends Zhe.ATNState {
   get loopEntryState() {
     return this.transition(0).target;
@@ -16843,7 +16843,7 @@ var n2e = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Y5, "__esModule", { value: !0 });
 Y5.TokensStartState = void 0;
-const r2e = lr, i2e = wu, s2e = Ee;
+const r2e = lr, i2e = Fu, s2e = Ee;
 class hW extends i2e.DecisionState {
   get stateType() {
     return r2e.ATNStateType.TOKEN_START;
@@ -16905,7 +16905,7 @@ function Nh() {
     };
   };
   Object.defineProperty(q2, "__esModule", { value: !0 }), q2.ATNDeserializer = void 0;
-  const n = um, r = Ro, i = wo(), s = om, o = lr, u = cm, a = L5, l = rm, c = Do, f = I5, x = Wf, h = wu, p = UG(), m = B5, g = Gf(), y = nm, E = $5, A = k5, _ = P5, v = ZG, C = eW, S = M5, b = tW, O = j5, F = hm, B = Ee, U = c8(), z = Dh(), X = q5, W = H5, ue = z5, ge = Em, he = Q5, oe = G5, ce = F0, pe = Sh, Ce = l8(), L = W5, N = V5, w = _h, P = Kt, G = Y5, H = K5, R = sm;
+  const n = um, r = Ro, i = wo(), s = om, o = lr, u = cm, a = L5, l = rm, c = Do, f = I5, x = Wf, h = Fu, p = UG(), m = B5, g = Gf(), y = nm, E = $5, A = k5, _ = P5, v = ZG, C = eW, S = M5, b = tW, O = j5, F = hm, B = Ee, U = c8(), z = Dh(), X = q5, W = H5, ue = z5, ge = Em, he = Q5, oe = G5, ce = F0, pe = Sh, Ce = l8(), L = W5, N = V5, w = _h, P = Kt, G = Y5, H = K5, R = sm;
   var $;
   (function(Q) {
     Q[Q.UNICODE_BMP = 0] = "UNICODE_BMP", Q[Q.UNICODE_SMP = 1] = "UNICODE_SMP";
@@ -17623,7 +17623,7 @@ function f8() {
     };
   };
   Object.defineProperty(Y2, "__esModule", { value: !0 }), Y2.DefaultErrorStrategy = void 0;
-  const n = Fu, r = lr, i = I0, s = Vf, o = Gf(), u = gm(), a = Oo(), l = Kt, c = Ee;
+  const n = Lu, r = lr, i = I0, s = Vf, o = Gf(), u = gm(), a = Oo(), l = Kt, c = Ee;
   let f = class {
     constructor() {
       this.errorRecoveryMode = !1, this.lastErrorIndex = -1, this.nextTokensState = n.ATNState.INVALID_STATE_NUMBER;
@@ -18620,7 +18620,7 @@ var Sm = {};
  * 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 Iu = T && T.__decorate || function(t, e, n, r) {
+var Bu = 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);
@@ -18631,7 +18631,7 @@ var Iu = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(Sm, "__esModule", { value: !0 });
 Sm.CodePointCharStream = void 0;
-const Gk = fi(), dy = Va, A2e = ar, Bu = Ee;
+const Gk = fi(), dy = Va, A2e = ar, $u = Ee;
 class ms {
   // Use the factory method {@link #fromBuffer(CodePointBuffer)} to
   // construct instances of this type.
@@ -18688,35 +18688,35 @@ class ms {
     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)));
   }
 }
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "consume", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "index", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "size", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "mark", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "release", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "seek", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "sourceName", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "toString", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "LA", null);
-Iu([
-  Bu.Override
+Bu([
+  $u.Override
 ], ms.prototype, "getText", null);
 Sm.CodePointCharStream = ms;
 (function(t) {
@@ -19372,7 +19372,7 @@ function _W() {
     };
   };
   Object.defineProperty(X2, "__esModule", { value: !0 }), X2.ParserInterpreter = void 0;
-  const n = Fu, r = lr, i = Do, s = I0, o = Vf, u = AW(), a = hm, l = Ee, c = Ee, f = Lh(), x = Dh(), h = Qs, p = _h, m = Kt;
+  const n = Lu, r = lr, i = Do, s = I0, o = Vf, u = AW(), a = hm, l = Ee, c = Ee, f = Lh(), x = Dh(), h = Qs, p = _h, m = Kt;
   let g = class bO extends f.Parser {
     constructor(E, A, _, v, C) {
       if (super(E instanceof bO ? E.inputStream : C), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof bO) {
@@ -22521,7 +22521,7 @@ var wt = {}, tpe = T && T.__createBinding || (Object.create ? function(t, e, n,
 };
 Object.defineProperty(wt, "__esModule", { value: !0 });
 wt.PropertiesContext = wt.ArrayValueContext = wt.ReferenceContext = wt.ArrayElementContext = wt.EqValueContext = wt.PropNameContext = wt.IdentifierContext = wt.StringContext = wt.TagDefContext = wt.TagUpdatePropertiesContext = wt.TagReplacePropertiesContext = wt.TagEqContext = wt.TagSpecContext = wt.TagLineContext = wt.MalloyTagParser = void 0;
-const ipe = wo(), spe = Nh(), ope = I0, ZT = gm(), upe = Lh(), $u = Gs(), ape = Dh(), qo = Qs, OP = Kt, lpe = gs, cpe = rpe(pn);
+const ipe = wo(), spe = Nh(), ope = I0, ZT = gm(), upe = Lh(), ku = Gs(), ape = Dh(), qo = Qs, OP = Kt, lpe = gs, cpe = rpe(pn);
 class me extends upe.Parser {
   // @Override
   // @NotNull
@@ -22571,7 +22571,7 @@ class me extends upe.Parser {
   }
   // @RuleVersion(0)
   tagSpec() {
-    let e = new hu(this._ctx, this.state);
+    let e = new pu(this._ctx, this.state);
     this.enterRule(e, 2, me.RULE_tagSpec);
     let n;
     try {
@@ -22913,12 +22913,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 SW extends $u.ParserRuleContext {
+class SW extends ku.ParserRuleContext {
   EOF() {
     return this.getToken(me.EOF, 0);
   }
   tagSpec(e) {
-    return e === void 0 ? this.getRuleContexts(hu) : this.getRuleContext(e, hu);
+    return e === void 0 ? this.getRuleContexts(pu) : this.getRuleContext(e, pu);
   }
   constructor(e, n) {
     super(e, n);
@@ -22933,7 +22933,7 @@ class SW extends $u.ParserRuleContext {
   }
 }
 wt.TagLineContext = SW;
-class hu extends $u.ParserRuleContext {
+class pu extends ku.ParserRuleContext {
   constructor(e, n) {
     super(e, n);
   }
@@ -22945,8 +22945,8 @@ class hu extends $u.ParserRuleContext {
     super.copyFrom(e);
   }
 }
-wt.TagSpecContext = hu;
-class bW extends hu {
+wt.TagSpecContext = pu;
+class bW extends pu {
   propName() {
     return this.getRuleContext(0, Kf);
   }
@@ -22968,7 +22968,7 @@ class bW extends hu {
   }
 }
 wt.TagEqContext = bW;
-class TW extends hu {
+class TW extends pu {
   propName() {
     return this.getRuleContext(0, Kf);
   }
@@ -22990,7 +22990,7 @@ class TW extends hu {
   }
 }
 wt.TagReplacePropertiesContext = TW;
-class RW extends hu {
+class RW extends pu {
   propName() {
     return this.getRuleContext(0, Kf);
   }
@@ -23006,7 +23006,7 @@ class RW extends hu {
   }
 }
 wt.TagUpdatePropertiesContext = RW;
-class OW extends hu {
+class OW extends pu {
   propName() {
     return this.getRuleContext(0, Kf);
   }
@@ -23022,7 +23022,7 @@ class OW extends hu {
   }
 }
 wt.TagDefContext = OW;
-let r4 = class extends $u.ParserRuleContext {
+let r4 = class extends ku.ParserRuleContext {
   SQ_STRING() {
     return this.tryGetToken(me.SQ_STRING, 0);
   }
@@ -23048,7 +23048,7 @@ let r4 = class extends $u.ParserRuleContext {
   }
 };
 wt.StringContext = r4;
-class lA extends $u.ParserRuleContext {
+class lA extends ku.ParserRuleContext {
   BQ_STRING() {
     return this.tryGetToken(me.BQ_STRING, 0);
   }
@@ -23068,7 +23068,7 @@ class lA extends $u.ParserRuleContext {
   }
 }
 wt.IdentifierContext = lA;
-class Kf extends $u.ParserRuleContext {
+class Kf extends ku.ParserRuleContext {
   identifier(e) {
     return e === void 0 ? this.getRuleContexts(lA) : this.getRuleContext(e, lA);
   }
@@ -23088,7 +23088,7 @@ class Kf extends $u.ParserRuleContext {
   }
 }
 wt.PropNameContext = Kf;
-class y8 extends $u.ParserRuleContext {
+class y8 extends ku.ParserRuleContext {
   string() {
     return this.tryGetRuleContext(0, r4);
   }
@@ -23111,7 +23111,7 @@ class y8 extends $u.ParserRuleContext {
   }
 }
 wt.EqValueContext = y8;
-class cA extends $u.ParserRuleContext {
+class cA extends ku.ParserRuleContext {
   string() {
     return this.tryGetRuleContext(0, r4);
   }
@@ -23137,7 +23137,7 @@ class cA extends $u.ParserRuleContext {
   }
 }
 wt.ArrayElementContext = cA;
-class i4 extends $u.ParserRuleContext {
+class i4 extends ku.ParserRuleContext {
   RF_BEG() {
     return this.getToken(me.RF_BEG, 0);
   }
@@ -23160,7 +23160,7 @@ class i4 extends $u.ParserRuleContext {
   }
 }
 wt.ReferenceContext = i4;
-class s4 extends $u.ParserRuleContext {
+class s4 extends ku.ParserRuleContext {
   AR_BEG() {
     return this.getToken(me.AR_BEG, 0);
   }
@@ -23186,7 +23186,7 @@ class s4 extends $u.ParserRuleContext {
   }
 }
 wt.ArrayValueContext = s4;
-class Ih extends $u.ParserRuleContext {
+class Ih extends ku.ParserRuleContext {
   PR_BEG() {
     return this.getToken(me.PR_BEG, 0);
   }
@@ -23197,7 +23197,7 @@ class Ih extends $u.ParserRuleContext {
     return this.tryGetToken(me.DOTTY, 0);
   }
   tagSpec(e) {
-    return e === void 0 ? this.getRuleContexts(hu) : this.getRuleContext(e, hu);
+    return e === void 0 ? this.getRuleContexts(pu) : this.getRuleContext(e, pu);
   }
   constructor(e, n) {
     super(e, n);
@@ -23229,7 +23229,7 @@ var u4 = {};
  * 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 ku = T && T.__decorate || function(t, e, n, r) {
+var Pu = 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);
@@ -23240,7 +23240,7 @@ var ku = T && T.__decorate || function(t, e, n, r) {
 };
 Object.defineProperty(u4, "__esModule", { value: !0 });
 u4.ANTLRInputStream = void 0;
-const fpe = fi(), Pu = Ee, hy = Va;
+const fpe = fi(), Mu = Ee, hy = Va;
 class Fo {
   /** Copy data in string to a local char array */
   constructor(e) {
@@ -23304,35 +23304,35 @@ class Fo {
     return this.data;
   }
 }
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "consume", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "LA", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "index", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "size", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "mark", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "release", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "seek", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "getText", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "sourceName", null);
-ku([
-  Pu.Override
+Pu([
+  Mu.Override
 ], Fo.prototype, "toString", null);
 u4.ANTLRInputStream = Fo;
 var wW = {};
@@ -23477,7 +23477,7 @@ var $0 = T && T.__decorate || function(t, e, n, r) {
 Object.defineProperty(l4, "__esModule", { value: !0 });
 l4.LexerInterpreter = void 0;
 const hpe = Ka(), ppe = tm(), LW = Ee, $h = Ee;
-let pu = class extends hpe.Lexer {
+let gu = class extends hpe.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.");
@@ -23504,29 +23504,29 @@ let pu = class extends hpe.Lexer {
 };
 $0([
   LW.NotNull
-], pu.prototype, "_vocabulary", void 0);
+], gu.prototype, "_vocabulary", void 0);
 $0([
   $h.Override
-], pu.prototype, "atn", null);
+], gu.prototype, "atn", null);
 $0([
   $h.Override
-], pu.prototype, "grammarFileName", null);
+], gu.prototype, "grammarFileName", null);
 $0([
   $h.Override
-], pu.prototype, "ruleNames", null);
+], gu.prototype, "ruleNames", null);
 $0([
   $h.Override
-], pu.prototype, "channelNames", null);
+], gu.prototype, "channelNames", null);
 $0([
   $h.Override
-], pu.prototype, "modeNames", null);
+], gu.prototype, "modeNames", null);
 $0([
   $h.Override
-], pu.prototype, "vocabulary", null);
-pu = $0([
+], gu.prototype, "vocabulary", null);
+gu = $0([
   dpe(1, LW.NotNull)
-], pu);
-l4.LexerInterpreter = pu;
+], gu);
+l4.LexerInterpreter = gu;
 var IW = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -24994,7 +24994,7 @@ class Yr {
     return this.analyticalSQL === void 0 ? this.getSQL() : e && this.partitionSQL ? this.partitionSQL : this.analyticalSQL;
   }
 }
-class Vo {
+class Yo {
   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];
   }
@@ -25096,7 +25096,7 @@ class Vo {
   structs() {
     const e = [];
     for (const n of this.allFields.values())
-      n instanceof Vo && e.push(n);
+      n instanceof Yo && e.push(n);
     return e;
   }
   // return a list of structs that match the criteria
@@ -25174,7 +25174,7 @@ class Vo {
       e.assignFieldsToGroups();
   }
 }
-class Gpe extends Vo {
+class Gpe extends Yo {
   constructor(e) {
     super(e, void 0), this.joins = /* @__PURE__ */ new Map(), this.havings = new dn.AndChain(), this.isComplexQuery = !1, this.queryUsesPartitioning = !1, this.computeOnlyGroups = [], this.elimatedComputeGroups = !1;
   }
@@ -25364,7 +25364,7 @@ class es extends A8 {
       if (s instanceof es) {
         if (this.firstSegment.type === "project")
           throw new Error(`Nested views cannot be used in select - '${s.fieldDef.name}'`);
-        const o = new Vo(s.fieldDef, e);
+        const o = new Yo(s.fieldDef, e);
         this.expandFields(o), e.add(i, o);
       } else if (s instanceof ys) {
         if (e.addField(i, s, {
@@ -25442,7 +25442,7 @@ class es extends A8 {
         } : void 0;
       }
       return;
-    } else if (e instanceof Vo) {
+    } else if (e instanceof Yo) {
       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, Le.isRawSegment)(s) ? void 0 : s.limit;
       let u;
       if ((0, Le.isQuerySegment)(s) && (u = s.orderBy), n)
@@ -25464,7 +25464,7 @@ class es extends A8 {
     let s = 0;
     for (const [u, a] of e.allFields) {
       const l = this.getResultMetadata(a);
-      if (a instanceof Vo) {
+      if (a instanceof Yo) {
         const { structDef: c } = this.generateTurtlePipelineSQL(a, new xA(!0, void 0), "<nosource>");
         if (a.getRepeatedResultType() === "nested") {
           const f = {
@@ -25717,7 +25717,7 @@ ${(0, dn.indent)(h)}) AS ${n.alias}
           } else
             gy(l.f) && (n.sql.push(`${f} as ${c}`), n.fieldIndex++);
         }
-      } else if (l instanceof Vo) {
+      } else if (l instanceof Yo) {
         if (l.firstSegment.type === "reduce")
           this.generateStage0Fields(l, n, r);
         else if (l.firstSegment.type === "project") {
@@ -25814,7 +25814,7 @@ WHERE NOT (${s.sqlOr()})`);
             r.sql.push(`${l} as ${a}`), r.fieldIndex++;
           }
         }
-      } else if (u instanceof Vo && !(u.depth > e))
+      } else if (u instanceof Yo && !(u.depth > e))
         if (u.depth === e) {
           const l = this.generateTurtleSQL(u, i, a, r.outputPipelinedSQL);
           r.groupsAggregated.push({
@@ -25859,7 +25859,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 Yr ? c.fieldUsage.type === "result" && (xr(c.f) ? (i.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`) + ` as ${f}`), u.push(s++)) : gy(c.f) && (i.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`), this.rootResult.groupSet, f)), s++)) : c instanceof Vo && (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 Yr ? c.fieldUsage.type === "result" && (xr(c.f) ? (i.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`) + ` as ${f}`), u.push(s++)) : gy(c.f) && (i.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${this.rootResult.groupSet}`), this.rootResult.groupSet, f)), s++)) : c instanceof Yo && (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, dn.indent)(i.join(`,
 `)) + `
@@ -25876,7 +25876,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 Vo) {
+      if (e.firstSegment.type === "reduce" && i instanceof Yo) {
         const o = {
           type: "struct",
           sqlExpression: this.parent.dialect.sqlMaybeQuoteIdentifier(`${r}__${e.groupSet}`),
@@ -26678,7 +26678,7 @@ Zc.QueryModel = XW;
     return i.composeSQLExpr;
   } });
 })(hs);
-var S8 = {}, nu = {}, g4 = {}, e1e = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
+var S8 = {}, ru = {}, g4 = {}, e1e = 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() {
@@ -28587,7 +28587,7 @@ class d extends x1e.Parser {
   }
   // @RuleVersion(0)
   accessLabel() {
-    let e = new Mu(this._ctx, this.state);
+    let e = new ju(this._ctx, this.state);
     this.enterRule(e, 70, d.RULE_accessLabel);
     let n;
     try {
@@ -30671,7 +30671,7 @@ class d extends x1e.Parser {
   }
   // @RuleVersion(0)
   string() {
-    let e = new ju(this._ctx, this.state);
+    let e = new Uu(this._ctx, this.state);
     this.enterRule(e, 224, d.RULE_string);
     try {
       switch (this.state = 1158, this._errHandler.sync(this), this._input.LA(1)) {
@@ -30731,7 +30731,7 @@ class d extends x1e.Parser {
   }
   // @RuleVersion(0)
   literal() {
-    let e = new Uu(this._ctx, this.state);
+    let e = new qu(this._ctx, this.state);
     this.enterRule(e, 230, d.RULE_literal);
     let n;
     try {
@@ -30782,7 +30782,7 @@ class d extends x1e.Parser {
   }
   // @RuleVersion(0)
   dateLiteral() {
-    let e = new qu(this._ctx, this.state);
+    let e = new Hu(this._ctx, this.state);
     this.enterRule(e, 232, d.RULE_dateLiteral);
     try {
       switch (this.state = 1180, this._errHandler.sync(this), this._input.LA(1)) {
@@ -31656,7 +31656,7 @@ class d extends x1e.Parser {
   }
   // @RuleVersion(0)
   fieldPath() {
-    let e = new Hu(this._ctx, this.state);
+    let e = new zu(this._ctx, this.state);
     this.enterRule(e, 284, d.RULE_fieldPath);
     try {
       let n;
@@ -33337,7 +33337,7 @@ class pA extends de.ParserRuleContext {
 D.ImportItemContext = pA;
 class D8 extends de.ParserRuleContext {
   string() {
-    return this.getRuleContext(0, ju);
+    return this.getRuleContext(0, Uu);
   }
   constructor(e, n) {
     super(e, n);
@@ -34154,7 +34154,7 @@ class hV extends qr {
     return this.getRuleContext(0, U8);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, Mu);
+    return this.tryGetRuleContext(0, ju);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -34214,7 +34214,7 @@ class gV extends qr {
     return this.tryGetToken(d.VIEW, 0);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, Mu);
+    return this.tryGetRuleContext(0, ju);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -34296,7 +34296,7 @@ class EV extends qr {
   }
 }
 D.DefIgnoreModel_stubContext = EV;
-class Mu extends de.ParserRuleContext {
+class ju extends de.ParserRuleContext {
   PUBLIC_KW() {
     return this.tryGetToken(d.PUBLIC_KW, 0);
   }
@@ -34326,7 +34326,7 @@ class Mu extends de.ParserRuleContext {
     return e.visitAccessLabel ? e.visitAccessLabel(this) : e.visitChildren(this);
   }
 }
-D.AccessLabelContext = Mu;
+D.AccessLabelContext = ju;
 class AV extends de.ParserRuleContext {
   fieldNameList() {
     return this.tryGetRuleContext(0, wd);
@@ -34369,7 +34369,7 @@ class v4 extends de.ParserRuleContext {
     return this.getRuleContext(0, Nm);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, Mu);
+    return this.tryGetRuleContext(0, ju);
   }
   constructor(e, n) {
     super(e, n);
@@ -34403,7 +34403,7 @@ class C4 extends de.ParserRuleContext {
     return this.getRuleContext(0, Nm);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, Mu);
+    return this.tryGetRuleContext(0, ju);
   }
   constructor(e, n) {
     super(e, n);
@@ -34602,7 +34602,7 @@ class wm extends de.ParserRuleContext {
     return this.getRuleContext(0, Nm);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, Mu);
+    return this.tryGetRuleContext(0, ju);
   }
   constructor(e, n) {
     super(e, n);
@@ -34649,7 +34649,7 @@ class _V extends nl {
     return this.getRuleContext(0, Fm);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, Mu);
+    return this.tryGetRuleContext(0, ju);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -34679,7 +34679,7 @@ class vV extends nl {
     return this.getRuleContext(0, Fm);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, Mu);
+    return this.tryGetRuleContext(0, ju);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -34709,7 +34709,7 @@ class CV extends nl {
     return this.getRuleContext(0, Fm);
   }
   accessLabel() {
-    return this.tryGetRuleContext(0, Mu);
+    return this.tryGetRuleContext(0, ju);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -35396,7 +35396,7 @@ class ts extends de.ParserRuleContext {
 D.SegExprContext = ts;
 class IV extends ts {
   fieldPath() {
-    return this.getRuleContext(0, Hu);
+    return this.getRuleContext(0, zu);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -36816,7 +36816,7 @@ class pw extends de.ParserRuleContext {
 D.TopStatementContext = pw;
 class wA extends de.ParserRuleContext {
   fieldPath() {
-    return this.tryGetRuleContext(0, Hu);
+    return this.tryGetRuleContext(0, zu);
   }
   DOT() {
     return this.tryGetToken(d.DOT, 0);
@@ -36940,7 +36940,7 @@ class w4 extends de.ParserRuleContext {
     return this.getToken(d.TIMEZONE, 0);
   }
   string() {
-    return this.getRuleContext(0, ju);
+    return this.getRuleContext(0, Uu);
   }
   constructor(e, n) {
     super(e, n);
@@ -37142,7 +37142,7 @@ class F4 extends de.ParserRuleContext {
   }
 }
 D.CompareOpContext = F4;
-class ju extends de.ParserRuleContext {
+class Uu extends de.ParserRuleContext {
   shortString() {
     return this.tryGetRuleContext(0, L4);
   }
@@ -37169,7 +37169,7 @@ class ju extends de.ParserRuleContext {
     return e.visitString ? e.visitString(this) : e.visitChildren(this);
   }
 }
-D.StringContext = ju;
+D.StringContext = Uu;
 class L4 extends de.ParserRuleContext {
   SQ_STRING() {
     return this.tryGetToken(d.SQ_STRING, 0);
@@ -37226,7 +37226,7 @@ class _w extends de.ParserRuleContext {
   }
 }
 D.NumericLiteralContext = _w;
-class Uu extends de.ParserRuleContext {
+class qu extends de.ParserRuleContext {
   constructor(e, n) {
     super(e, n);
   }
@@ -37238,10 +37238,10 @@ class Uu extends de.ParserRuleContext {
     super.copyFrom(e);
   }
 }
-D.LiteralContext = Uu;
-class QV extends Uu {
+D.LiteralContext = qu;
+class QV extends qu {
   string() {
-    return this.getRuleContext(0, ju);
+    return this.getRuleContext(0, Uu);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -37260,7 +37260,7 @@ class QV extends Uu {
   }
 }
 D.ExprStringContext = QV;
-class GV extends Uu {
+class GV extends qu {
   numericLiteral() {
     return this.getRuleContext(0, _w);
   }
@@ -37281,9 +37281,9 @@ class GV extends Uu {
   }
 }
 D.ExprNumberContext = GV;
-class WV extends Uu {
+class WV extends qu {
   dateLiteral() {
-    return this.getRuleContext(0, qu);
+    return this.getRuleContext(0, Hu);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -37302,7 +37302,7 @@ class WV extends Uu {
   }
 }
 D.ExprTimeContext = WV;
-class VV extends Uu {
+class VV extends qu {
   NULL() {
     return this.getToken(d.NULL, 0);
   }
@@ -37323,7 +37323,7 @@ class VV extends Uu {
   }
 }
 D.ExprNULLContext = VV;
-class YV extends Uu {
+class YV extends qu {
   TRUE() {
     return this.tryGetToken(d.TRUE, 0);
   }
@@ -37347,7 +37347,7 @@ class YV extends Uu {
   }
 }
 D.ExprBoolContext = YV;
-class KV extends Uu {
+class KV extends qu {
   HACKY_REGEX() {
     return this.getToken(d.HACKY_REGEX, 0);
   }
@@ -37368,7 +37368,7 @@ class KV extends Uu {
   }
 }
 D.ExprRegexContext = KV;
-class JV extends Uu {
+class JV extends qu {
   NOW() {
     return this.getToken(d.NOW, 0);
   }
@@ -37389,7 +37389,7 @@ class JV extends Uu {
   }
 }
 D.ExprNowContext = JV;
-class qu extends de.ParserRuleContext {
+class Hu extends de.ParserRuleContext {
   constructor(e, n) {
     super(e, n);
   }
@@ -37401,8 +37401,8 @@ class qu extends de.ParserRuleContext {
     super.copyFrom(e);
   }
 }
-D.DateLiteralContext = qu;
-class XV extends qu {
+D.DateLiteralContext = Hu;
+class XV extends Hu {
   LITERAL_TIMESTAMP() {
     return this.getToken(d.LITERAL_TIMESTAMP, 0);
   }
@@ -37423,7 +37423,7 @@ class XV extends qu {
   }
 }
 D.LiteralTimestampContext = XV;
-class ZV extends qu {
+class ZV extends Hu {
   LITERAL_HOUR() {
     return this.getToken(d.LITERAL_HOUR, 0);
   }
@@ -37444,7 +37444,7 @@ class ZV extends qu {
   }
 }
 D.LiteralHourContext = ZV;
-class eY extends qu {
+class eY extends Hu {
   LITERAL_DAY() {
     return this.getToken(d.LITERAL_DAY, 0);
   }
@@ -37465,7 +37465,7 @@ class eY extends qu {
   }
 }
 D.LiteralDayContext = eY;
-class tY extends qu {
+class tY extends Hu {
   LITERAL_WEEK() {
     return this.getToken(d.LITERAL_WEEK, 0);
   }
@@ -37486,7 +37486,7 @@ class tY extends qu {
   }
 }
 D.LiteralWeekContext = tY;
-class nY extends qu {
+class nY extends Hu {
   LITERAL_MONTH() {
     return this.getToken(d.LITERAL_MONTH, 0);
   }
@@ -37507,7 +37507,7 @@ class nY extends qu {
   }
 }
 D.LiteralMonthContext = nY;
-class rY extends qu {
+class rY extends Hu {
   LITERAL_QUARTER() {
     return this.getToken(d.LITERAL_QUARTER, 0);
   }
@@ -37528,7 +37528,7 @@ class rY extends qu {
   }
 }
 D.LiteralQuarterContext = rY;
-class iY extends qu {
+class iY extends Hu {
   LITERAL_YEAR() {
     return this.getToken(d.LITERAL_YEAR, 0);
   }
@@ -37551,7 +37551,7 @@ class iY extends qu {
 D.LiteralYearContext = iY;
 class vw extends de.ParserRuleContext {
   string() {
-    return this.getRuleContext(0, ju);
+    return this.getRuleContext(0, Uu);
   }
   constructor(e, n) {
     super(e, n);
@@ -37576,7 +37576,7 @@ class vw extends de.ParserRuleContext {
 D.TablePathContext = vw;
 class Cw extends de.ParserRuleContext {
   string() {
-    return this.getRuleContext(0, ju);
+    return this.getRuleContext(0, Uu);
   }
   constructor(e, n) {
     super(e, n);
@@ -37706,7 +37706,7 @@ class I4 extends de.ParserRuleContext {
     return this.tryGetRuleContext(0, Bm);
   }
   string() {
-    return this.tryGetRuleContext(0, ju);
+    return this.tryGetRuleContext(0, Uu);
   }
   constructor(e, n) {
     super(e, n);
@@ -37744,7 +37744,7 @@ class Se extends de.ParserRuleContext {
 D.FieldExprContext = Se;
 class sY extends Se {
   fieldPath() {
-    return this.getRuleContext(0, Hu);
+    return this.getRuleContext(0, zu);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -37765,7 +37765,7 @@ class sY extends Se {
 D.ExprFieldPathContext = sY;
 class oY extends Se {
   literal() {
-    return this.getRuleContext(0, Uu);
+    return this.getRuleContext(0, qu);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -38452,7 +38452,7 @@ class DY extends Se {
 D.ExprPathlessAggregateContext = DY;
 class NY extends Se {
   fieldPath() {
-    return this.getRuleContext(0, Hu);
+    return this.getRuleContext(0, zu);
   }
   DOT() {
     return this.getToken(d.DOT, 0);
@@ -38515,7 +38515,7 @@ class wY extends Se {
 D.ExprExprContext = wY;
 class FY extends Se {
   fieldPath() {
-    return this.getRuleContext(0, Hu);
+    return this.getRuleContext(0, zu);
   }
   DOT() {
     return this.getToken(d.DOT, 0);
@@ -38963,7 +38963,7 @@ class Nd extends de.ParserRuleContext {
 D.RecordElementContext = Nd;
 class kY extends Nd {
   fieldPath() {
-    return this.getRuleContext(0, Hu);
+    return this.getRuleContext(0, zu);
   }
   constructor(e) {
     super(e.parent, e.invokingState), this.copyFrom(e);
@@ -39098,7 +39098,7 @@ class $m extends de.ParserRuleContext {
     return this.getToken(d.STAR, 0);
   }
   fieldPath() {
-    return this.tryGetRuleContext(0, Hu);
+    return this.tryGetRuleContext(0, zu);
   }
   DOT() {
     return this.tryGetToken(d.DOT, 0);
@@ -39169,7 +39169,7 @@ class k4 extends de.ParserRuleContext {
     return this.getRuleContext(0, Ut);
   }
   fieldPath() {
-    return this.getRuleContext(0, Hu);
+    return this.getRuleContext(0, zu);
   }
   refExpr() {
     return this.tryGetRuleContext(0, Fw);
@@ -39263,7 +39263,7 @@ class IA extends de.ParserRuleContext {
   }
 }
 D.CollectionMemberContext = IA;
-class Hu extends de.ParserRuleContext {
+class zu extends de.ParserRuleContext {
   fieldName(e) {
     return e === void 0 ? this.getRuleContexts(Ar) : this.getRuleContext(e, Ar);
   }
@@ -39290,7 +39290,7 @@ class Hu extends de.ParserRuleContext {
     return e.visitFieldPath ? e.visitFieldPath(this) : e.visitChildren(this);
   }
 }
-D.FieldPathContext = Hu;
+D.FieldPathContext = zu;
 class MY extends de.ParserRuleContext {
   id() {
     return this.getRuleContext(0, mn);
@@ -39393,7 +39393,7 @@ class UY extends de.ParserRuleContext {
 D.NameSQLBlockContext = UY;
 class qY extends de.ParserRuleContext {
   string() {
-    return this.getRuleContext(0, ju);
+    return this.getRuleContext(0, Uu);
   }
   constructor(e, n) {
     super(e, n);
@@ -39480,7 +39480,7 @@ class Lw extends de.ParserRuleContext {
     return this.getToken(d.OBRACK, 0);
   }
   string() {
-    return this.getRuleContext(0, ju);
+    return this.getRuleContext(0, Uu);
   }
   CBRACK() {
     return this.getToken(d.CBRACK, 0);
@@ -39543,20 +39543,20 @@ function g1e(t, e) {
   return r && e.logError("ambiguous-view-type", {}), n;
 }
 kh.detectAndRemovePartialStages = g1e;
-var km = {}, Ge = {}, M4 = {}, it = {}, gu = {};
-Object.defineProperty(gu, "__esModule", { value: !0 });
-gu.isNotUndefined = gu.locationContainsPosition = void 0;
+var km = {}, Ge = {}, M4 = {}, it = {}, mu = {};
+Object.defineProperty(mu, "__esModule", { value: !0 });
+mu.isNotUndefined = mu.locationContainsPosition = void 0;
 function m1e(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);
 }
-gu.locationContainsPosition = m1e;
+mu.locationContainsPosition = m1e;
 function y1e(t) {
   return t !== void 0;
 }
-gu.isNotUndefined = y1e;
+mu.isNotUndefined = y1e;
 Object.defineProperty(it, "__esModule", { value: !0 });
 it.compositeFieldUsageJoinPaths = it.joinedCompositeFieldUsage = it.compositeFieldUsageDifference = it.emptyCompositeFieldUsage = it.mergeCompositeFieldUsage = it.unique = it.formatCompositeFieldUsage = it.compositeFieldUsageIsPlural = it.isEmptyCompositeFieldUsage = it.formatCompositeFieldUsages = it.compositeFieldUsagePaths = it.resolveCompositeSources = it.narrowCompositeFieldResolution = it.emptyNarrowedCompositeFieldResolution = void 0;
-const $P = gu, n6 = We;
+const $P = mu, n6 = We;
 function BA(t, e, n, r = void 0) {
   var i, s, o, u, a, l, c;
   let f = { ...e }, x;
@@ -39927,7 +39927,7 @@ j4.DialectNameSpace = w1e;
 var Fd = {};
 Object.defineProperty(Fd, "__esModule", { value: !0 });
 Fd.getDialectFunctions = Fd.GlobalNameSpace = void 0;
-const F1e = yh, L1e = iu, I1e = hs;
+const F1e = yh, L1e = su, I1e = hs;
 class B1e {
   constructor() {
     this.entries = XY();
@@ -40007,7 +40007,7 @@ gr.extendNoteHelper = ZY;
 Object.defineProperty(Ge, "__esModule", { value: !0 });
 Ge.Document = Ge.DocStatementList = Ge.ListOf = Ge.isDocStatementOrDocStatementList = Ge.isDocStatement = Ge.ExperimentalExperiment = Ge.ModelEntryReference = Ge.Unimplemented = Ge.MalloyElement = void 0;
 const kP = yh, bE = We, M1e = So, j1e = M4, U1e = Es, q1e = j4, H1e = Fd, PP = gr, z1e = Zv;
-class su {
+class ou {
   /**
    * @param kids All children passed to the constructor are not optional
    */
@@ -40023,7 +40023,7 @@ class su {
     for (const n in e) {
       const r = e[n];
       if (r !== void 0)
-        if (this.children[n] = r, r instanceof su)
+        if (this.children[n] = r, r instanceof ou)
           r.parent = this;
         else
           for (const i of r)
@@ -40142,7 +40142,7 @@ class su {
     let i = `${r}${e}<${this.elementType}>${this.varInfo()}`;
     for (const s of Object.keys(this.children)) {
       const o = this.children[s];
-      o instanceof su ? i += `
+      o instanceof ou ? i += `
 ` + o.stringify(`${s}: `, n + 2) : (i += `
 ${r}  ${s}: [`, o.length > 0 && (i += `
 ` + o.map((u) => u.stringify("", n + 4)).join(`
@@ -40154,7 +40154,7 @@ ${r}  `), i += "]");
   *walk() {
     for (const e of Object.keys(this.children)) {
       const n = this.children[e];
-      if (n instanceof su)
+      if (n instanceof ou)
         yield n;
       else
         for (const r of n)
@@ -40183,14 +40183,14 @@ ${r}  `), i += "]");
     return i && (i.bare() || i.has(e)) ? !0 : (n || this.logError("experiment-not-enabled", { experimentId: e }), !1);
   }
 }
-Ge.MalloyElement = su;
-class Q1e extends su {
+Ge.MalloyElement = ou;
+class Q1e extends ou {
   constructor() {
     super(...arguments), this.elementType = "unimplemented", this.reported = !1;
   }
 }
 Ge.Unimplemented = Q1e;
-class RO extends su {
+class RO extends ou {
   constructor(e) {
     super(), this.name = e, this.elementType = "modelEntryReference";
   }
@@ -40206,7 +40206,7 @@ class RO extends su {
   }
 }
 Ge.ModelEntryReference = RO;
-class G1e extends su {
+class G1e extends ou {
   constructor(e) {
     super(), this.id = e, this.elementType = "experimentalExperiment";
   }
@@ -40223,7 +40223,7 @@ function W1e(t) {
   return t instanceof Pm || eK(t);
 }
 Ge.isDocStatementOrDocStatementList = W1e;
-class tK extends su {
+class tK extends ou {
   constructor(e) {
     super(), this.elements = e, this.newContents();
   }
@@ -40282,7 +40282,7 @@ function Y1e(t) {
   const e = nK(t).join("");
   return (0, z1e.v5)(e, V1e);
 }
-class OO extends su {
+class OO extends ou {
   constructor(e) {
     super(), this.elementType = "document", this.globalNameSpace = new H1e.GlobalNameSpace(), this.documentModel = {}, this.queryList = [], this.didInitModel = !1, this.annotation = {}, this.experiments = new M1e.Tag({}), this.modelAnnotationTodoList = [], this.dialectNameSpaces = /* @__PURE__ */ new Map(), this.statements = new Pm(e), this.has({ statements: e });
   }
@@ -40799,7 +40799,7 @@ function wge(t, e) {
   return r.push(...e), r;
 }
 t0.mergeFields = wge;
-var jm = {}, mr = {}, ou = {}, Fge = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
+var jm = {}, mr = {}, uu = {}, Fge = 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() {
@@ -40820,15 +40820,15 @@ var jm = {}, mr = {}, ou = {}, Fge = T && T.__createBinding || (Object.create ?
       n !== "default" && Object.prototype.hasOwnProperty.call(t, n) && Fge(e, t, n);
   return Lge(e, t), e;
 };
-Object.defineProperty(ou, "__esModule", { value: !0 });
-ou.DefinedParameter = ou.AbstractParameter = ou.SpaceParam = void 0;
+Object.defineProperty(uu, "__esModule", { value: !0 });
+uu.DefinedParameter = uu.AbstractParameter = uu.SpaceParam = void 0;
 const Bge = e0, sK = Ige(Ht), oK = it;
 class kw extends Bge.SpaceEntry {
   constructor() {
     super(...arguments), this.refType = "parameter";
   }
 }
-ou.SpaceParam = kw;
+uu.SpaceParam = kw;
 class $ge extends kw {
   constructor(e) {
     super(), this.astParam = e, this._parameter = void 0;
@@ -40848,7 +40848,7 @@ class $ge extends kw {
     return this.parameter().type;
   }
 }
-ou.AbstractParameter = $ge;
+uu.AbstractParameter = $ge;
 class kge extends kw {
   constructor(e) {
     super(), this.paramDef = e;
@@ -40870,7 +40870,7 @@ class kge extends kw {
     return this.paramDef.type;
   }
 }
-ou.DefinedParameter = kge;
+uu.DefinedParameter = kge;
 var tx = {}, Pge = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
   r === void 0 && (r = n);
   var i = Object.getOwnPropertyDescriptor(e, n);
@@ -40971,7 +40971,7 @@ class Vge extends Wge.ViewField {
 H4.IRViewField = Vge;
 Object.defineProperty(mr, "__esModule", { value: !0 });
 mr.StaticSourceSpace = mr.StructSpaceField = mr.StaticSpace = void 0;
-const Yge = iu, Hx = We, Kge = ou, Jge = Cr, t1 = tx, Xge = Um, Zge = H4;
+const Yge = su, Hx = We, Kge = uu, Jge = Cr, t1 = tx, Xge = Um, Zge = H4;
 class Pw {
   constructor(e, n) {
     this.type = "fieldSpace", this.fromStruct = e, this.structDialect = n;
@@ -41113,7 +41113,7 @@ jm.JoinSpaceField = tme;
 var jh = {};
 Object.defineProperty(jh, "__esModule", { value: !0 });
 jh.ParameterSpace = void 0;
-const nme = ou;
+const nme = uu;
 class rme {
   constructor(e) {
     this.type = "fieldSpace", this._map = {};
@@ -41198,7 +41198,7 @@ var ime = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(q4, "__esModule", { value: !0 });
 q4.DynamicSpace = void 0;
-const ume = ome(We), ame = t0, lme = Qr, cme = Cr, fme = jm, xme = Ph, zP = ou, dme = mr, hme = tx, pme = jh;
+const ume = ome(We), ame = t0, lme = Qr, cme = Cr, fme = jm, xme = Ph, zP = uu, dme = mr, hme = tx, pme = jh;
 class gme extends dme.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;
@@ -41404,10 +41404,10 @@ class Rme extends bme.DefinitionList {
   }
 }
 P0.DeclareFields = Rme;
-var mu = {};
-Object.defineProperty(mu, "__esModule", { value: !0 });
-mu.Filter = mu.FilterElement = void 0;
-const GP = We, Ome = gu, aK = Ge, r6 = On;
+var yu = {};
+Object.defineProperty(yu, "__esModule", { value: !0 });
+yu.Filter = yu.FilterElement = void 0;
+const GP = We, Ome = mu, aK = Ge, r6 = On;
 class Dme extends aK.MalloyElement {
   constructor(e, n) {
     super({ expr: e }), this.expr = e, this.exprSrc = n, this.elementType = "filterElement";
@@ -41429,7 +41429,7 @@ class Dme extends aK.MalloyElement {
     };
   }
 }
-mu.FilterElement = Dme;
+yu.FilterElement = Dme;
 let Nme = class extends aK.ListOf {
   constructor() {
     super(...arguments), this.elementType = "filter", this.forceQueryClass = void 0, this.queryRefinementStage = r6.LegalRefinementStage.Head;
@@ -41465,7 +41465,7 @@ let Nme = class extends aK.ListOf {
     }
   }
 };
-mu.Filter = Nme;
+yu.Filter = Nme;
 var Uh = {};
 Object.defineProperty(Uh, "__esModule", { value: !0 });
 Uh.FieldListEdit = void 0;
@@ -42102,7 +42102,7 @@ class F3e extends m3e.DefinitionList {
 ft.FieldReferences = F3e;
 Object.defineProperty(Mm, "__esModule", { value: !0 });
 Mm.RefinedSource = void 0;
-const L3e = We, I3e = Mh, B3e = P0, $3e = mu, k3e = Uh, P3e = qh, M3e = Hh, j3e = Ws, U3e = zh, q3e = n0, H3e = r0, z3e = jh, Q3e = Oi, KP = uo, i6 = ft;
+const L3e = We, I3e = Mh, B3e = P0, $3e = yu, k3e = Uh, P3e = qh, M3e = Hh, j3e = Ws, U3e = zh, q3e = n0, H3e = r0, z3e = jh, Q3e = Oi, KP = uo, i6 = ft;
 class G3e extends j3e.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 });
@@ -45020,13 +45020,13 @@ EC.ExprSum = Mve;
 var AC = {};
 Object.defineProperty(AC, "__esModule", { value: !0 });
 AC.ExprTimeExtract = void 0;
-const ra = We, Cy = Pt, x6 = at, jve = j0;
+const ia = We, Cy = Pt, x6 = at, jve = j0;
 class sg extends x6.ExpressionDef {
   static extractor(e) {
     const n = sg.pluralMap[e];
     if (n)
       return n;
-    if ((0, ra.isExtractUnit)(e))
+    if ((0, ia.isExtractUnit)(e))
       return e;
   }
   constructor(e, n) {
@@ -45046,12 +45046,12 @@ class sg extends x6.ExpressionDef {
             error: "extract from error",
             from: [i, s]
           });
-        if (!(0, ra.isTemporalType)(i.type))
+        if (!(0, ia.isTemporalType)(i.type))
           return r.first.loggedErrorExpr("invalid-type-for-time-extraction", `Can't extract ${n} from '${i.type}'`);
-        if (!(0, ra.isTemporalType)(s.type))
+        if (!(0, ia.isTemporalType)(s.type))
           return r.last.loggedErrorExpr("invalid-type-for-time-extraction", `Cannot extract ${n} from '${s.type}'`);
         let o = i.type;
-        if (!ra.TD.eq(i, s)) {
+        if (!ia.TD.eq(i, s)) {
           let u = !0;
           if (o = "timestamp", i.type === "date") {
             const a = (0, x6.getMorphicValue)(i, "timestamp");
@@ -45063,25 +45063,25 @@ class sg extends x6.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, ra.isTimestampUnit)(n) ? (0, Cy.computedExprValue)({
+        return ["week", "month", "quarter", "year"].includes(n) ? this.loggedErrorExpr("invalid-timeframe-for-time-measurement", `Cannot measure interval using '${n}'`) : (0, ia.isTimestampUnit)(n) ? (0, Cy.computedExprValue)({
           dataType: { type: "number", numberType: "integer" },
           value: {
             node: "timeDiff",
             units: n,
             kids: {
-              left: (0, ra.mkTemporal)(i.value, o),
-              right: (0, ra.mkTemporal)(s.value, o)
+              left: (0, ia.mkTemporal)(i.value, o),
+              right: (0, ia.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, ra.isTemporalType)(i.type) ? (0, Cy.computedExprValue)({
+        return (0, ia.isTemporalType)(i.type) ? (0, Cy.computedExprValue)({
           dataType: { type: "number", numberType: "integer" },
           value: {
             node: "extract",
-            e: (0, ra.mkTemporal)(i.value, i.type),
+            e: (0, ia.mkTemporal)(i.value, i.type),
             units: n
           },
           from: [i]
@@ -45160,7 +45160,7 @@ var zve = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(ho, "__esModule", { value: !0 });
 ho.ReduceFieldSpace = ho.QuerySpace = ho.QueryOperationSpace = void 0;
-const kA = Gve(We), d6 = t0, RK = q0, yM = Cr, Wve = ft, Vve = Mh, Yve = Um, Kve = mr, Jve = vC, aa = it, Xve = tx;
+const kA = Gve(We), d6 = t0, RK = q0, yM = Cr, Wve = ft, Vve = Mh, Yve = Um, Kve = mr, Jve = vC, Go = it, Xve = tx;
 class OK extends Vve.RefinedSpace {
   get compositeFieldUsage() {
     if (this._compositeFieldUsage === void 0)
@@ -45230,14 +45230,14 @@ class OK extends Vve.RefinedSpace {
     this.astEl.has({ reference: r });
     const i = this.exprSpace.lookup(r);
     if (i.found && i.found instanceof Xve.StructSpaceFieldBase)
-      return (n = i.found.fieldDef().onCompositeFieldUsage) !== null && n !== void 0 ? n : (0, aa.emptyCompositeFieldUsage)();
+      return (0, Go.joinedCompositeFieldUsage)(e.slice(0, -1), (n = i.found.fieldDef().onCompositeFieldUsage) !== null && n !== void 0 ? n : (0, Go.emptyCompositeFieldUsage)());
     throw new Error("Unexpected join lookup was not found or not a struct");
   }
   getCompositeFieldUsageIncludingJoinOns(e) {
     let n = e;
-    const r = (0, aa.compositeFieldUsageJoinPaths)(e);
+    const r = (0, Go.compositeFieldUsageJoinPaths)(e);
     for (const i of r)
-      n = (0, aa.mergeCompositeFieldUsage)(this.getJoinOnCompositeFieldUsage(i), n);
+      n = (0, Go.mergeCompositeFieldUsage)(this.getJoinOnCompositeFieldUsage(i), n);
     return n;
   }
   addCompositeFieldUserFromFilter(e, n) {
@@ -45248,9 +45248,9 @@ class OK extends Vve.RefinedSpace {
   }
   applyNextCompositeFieldUsage(e, n, r, i, s) {
     if (i) {
-      const o = this.getCompositeFieldUsageIncludingJoinOns((0, aa.compositeFieldUsageDifference)(i, n));
-      if (n = (0, aa.mergeCompositeFieldUsage)(n, o), !(0, aa.isEmptyCompositeFieldUsage)(o)) {
-        const u = (0, aa.narrowCompositeFieldResolution)(e, n, r);
+      const o = this.getCompositeFieldUsageIncludingJoinOns((0, Go.compositeFieldUsageDifference)(i, n));
+      if (n = (0, Go.mergeCompositeFieldUsage)(n, o), !(0, Go.isEmptyCompositeFieldUsage)(o)) {
+        const u = (0, Go.narrowCompositeFieldResolution)(e, n, r);
         u.error ? (s ?? this).logError("invalid-composite-field-usage", {
           newUsage: o,
           allUsage: n
@@ -45290,7 +45290,7 @@ class DK extends OK {
   }
   queryFieldDefs() {
     const e = [];
-    let n = (0, aa.emptyCompositeFieldUsage)(), r = (0, aa.emptyNarrowedCompositeFieldResolution)();
+    let n = (0, Go.emptyCompositeFieldUsage)(), r = (0, Go.emptyNarrowedCompositeFieldResolution)();
     const i = this.inputSpace().structDef();
     for (const s of this.compositeFieldUsers) {
       let o;
@@ -46297,13 +46297,13 @@ function M5e(t, e) {
   return r;
 }
 let Ty = {};
-class yu extends Zh {
+class Eu extends Zh {
   /**
    * @param {string} name - Zone name
    * @return {IANAZone}
    */
   static create(e) {
-    return Ty[e] || (Ty[e] = new yu(e)), Ty[e];
+    return Ty[e] || (Ty[e] = new Eu(e)), Ty[e];
   }
   /**
    * Reset local caches. Should only be necessary in testing scenarios.
@@ -46341,7 +46341,7 @@ class yu extends Zh {
     }
   }
   constructor(e) {
-    super(), this.zoneName = e, this.valid = yu.isValidZone(e);
+    super(), this.zoneName = e, this.valid = Eu.isValidZone(e);
   }
   /** @override **/
   get type() {
@@ -46509,7 +46509,7 @@ function wl(t, e) {
     return t;
   if (E5e(t)) {
     const n = t.toLowerCase();
-    return n === "local" || n === "system" ? e : n === "utc" || n === "gmt" ? $r.utcInstance : $r.parseSpecifier(n) || yu.create(t);
+    return n === "local" || n === "system" ? e : n === "utc" || n === "gmt" ? $r.utcInstance : $r.parseSpecifier(n) || Eu.create(t);
   } else
     return Uc(t) ? $r.instance(t) : typeof t == "object" && t.offset && typeof t.offset == "number" ? t : new uJ(t);
 }
@@ -46609,7 +46609,7 @@ class wn {
    * @return {void}
    */
   static resetCaches() {
-    hn.resetCache(), yu.resetCache();
+    hn.resetCache(), Eu.resetCache();
   }
 }
 let wM = {};
@@ -46707,7 +46707,7 @@ class K5e {
     let i;
     if (e.zone.isUniversal) {
       const o = -1 * (e.offset / 60), u = o >= 0 ? `Etc/GMT+${o}` : `Etc/GMT${o}`;
-      e.offset !== 0 && yu.create(u).valid ? (i = u, this.dt = e) : (i = "UTC", r.timeZoneName ? this.dt = e : this.dt = e.offset === 0 ? e : ut.fromMillis(e.ts + e.offset * 60 * 1e3));
+      e.offset !== 0 && Eu.create(u).valid ? (i = u, this.dt = e) : (i = "UTC", r.timeZoneName ? this.dt = e : this.dt = e.offset === 0 ? e : ut.fromMillis(e.ts + e.offset * 60 * 1e3));
     } else
       e.zone.type === "system" ? this.dt = e : (this.dt = e, i = e.zone.name);
     const s = { ...this.opts };
@@ -46894,7 +46894,7 @@ function r3(t, e) {
   return [{}, i, e + 3];
 }
 function i3(t, e) {
-  const n = t[e] ? yu.create(t[e]) : null;
+  const n = t[e] ? Eu.create(t[e]) : null;
   return [{}, n, e + 1];
 }
 const u4e = RegExp(`^T?${Xw.source}$`), a4e = /^-?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)?)?)$/;
@@ -48128,7 +48128,7 @@ let i1 = class {
    * @return {boolean}
    */
   static isValidIANAZone(e) {
-    return yu.isValidZone(e);
+    return Eu.isValidZone(e);
   }
   /**
    * Converts the input into a {@link Zone} instance.
@@ -48587,7 +48587,7 @@ function tCe(t) {
     }
   };
   let n = null, r;
-  return vt(t.z) || (n = yu.create(t.z)), vt(t.Z) || (n || (n = new $r(t.Z)), r = t.Z), vt(t.q) || (t.M = (t.q - 1) * 3 + 1), vt(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), vt(t.u) || (t.S = Yw(t.u)), [Object.keys(t).reduce((s, o) => {
+  return vt(t.z) || (n = Eu.create(t.z)), vt(t.Z) || (n || (n = new $r(t.Z)), r = t.Z), vt(t.q) || (t.M = (t.q - 1) * 3 + 1), vt(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), vt(t.u) || (t.S = Yw(t.u)), [Object.keys(t).reduce((s, o) => {
     const u = e(o);
     return u && (s[u] = t[o]), s;
   }, {}), n, r];
@@ -50260,7 +50260,7 @@ const xCe = "2.5.2", dCe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.
   DateTime: ut,
   Duration: Ct,
   FixedOffsetZone: $r,
-  IANAZone: yu,
+  IANAZone: Eu,
   Info: i1,
   Interval: cn,
   InvalidZone: uJ,
@@ -51278,7 +51278,7 @@ class PSe extends BSe.QueryOperationSpace {
 MC.IndexFieldSpace = PSe;
 Object.defineProperty(PC, "__esModule", { value: !0 });
 PC.IndexBuilder = void 0;
-const T6 = We, MSe = Qr, jSe = mu, USe = a3, qSe = U0, HSe = l3, zSe = MC, R6 = it;
+const T6 = We, MSe = Qr, jSe = yu, USe = a3, qSe = U0, HSe = l3, zSe = MC, R6 = it;
 class QSe {
   constructor(e, n, r, i) {
     this.filters = [], this.alwaysJoins = [], this.type = "index", this.resultFS = new zSe.IndexFieldSpace(e, n, r, i), this.inputFS = this.resultFS.inputSpace();
@@ -52019,7 +52019,7 @@ VC.SourceDesc = fTe;
 var YC = {};
 Object.defineProperty(YC, "__esModule", { value: !0 });
 YC.isSourceProperty = void 0;
-const xTe = mu, dTe = P0, hTe = Uh, pTe = r0, gTe = qh, mTe = Hh, yTe = zh, ETe = n0, ATe = Oi;
+const xTe = yu, dTe = P0, hTe = Uh, pTe = r0, gTe = qh, mTe = Hh, yTe = zh, ETe = n0, ATe = Oi;
 function _Te(t) {
   return t instanceof xTe.Filter || t instanceof ATe.JoinStatement || t instanceof dTe.DeclareFields || t instanceof hTe.FieldListEdit || t instanceof pTe.Renames || t instanceof gTe.PrimaryKey || t instanceof ETe.ObjectAnnotation || t instanceof mTe.Views || t instanceof yTe.TimezoneStatement;
 }
@@ -52060,7 +52060,7 @@ ZC.isQueryExtendProperty = LTe;
 var eS = {};
 Object.defineProperty(eS, "__esModule", { value: !0 });
 eS.isFieldPropStatement = void 0;
-const ITe = s0, BTe = mu, $Te = U0, kTe = Xh;
+const ITe = s0, BTe = yu, $Te = U0, kTe = Xh;
 function PTe(t) {
   return t instanceof BTe.Filter || t instanceof $Te.Limit || t instanceof kTe.PartitionBy || t instanceof ITe.FunctionOrdering;
 }
@@ -52078,7 +52078,7 @@ eS.isFieldPropStatement = PTe;
     for (var s in r)
       s !== "default" && !Object.prototype.hasOwnProperty.call(i, s) && e(i, r, s);
   };
-  Object.defineProperty(t, "__esModule", { value: !0 }), n(rg, t), n(Ld, t), n(Id, t), n(Ws, t), n(Mm, t), n(Lo, t), n(z4, t), n(Q4, t), n(W4, t), n(Qm, t), n(Y4, t), n(K4, t), n(uo, t), n(Uh, t), n(qh, t), n(r0, t), n(Hh, t), n(zh, t), n(X4, t), n(Kh, t), n(Z4, t), n(s0, t), n(eC, t), n(rl, t), n(tC, t), n(Jh, t), n(nC, t), n(rC, t), n(iC, t), n(Ta, t), n(sC, t), n(oC, t), n(uC, t), n(e3, t), n(Zm, t), n(rx, t), n(aC, t), n(lC, t), n(cC, t), n(fC, t), n(xC, t), n(dC, t), n(hC, t), n(Hl, t), n(pC, t), n(gC, t), n(mC, t), n(yC, t), n(EC, t), n(AC, t), n(_C, t), n(CC, t), n(Yn, t), n(OC, t), n(Xh, t), n($d, t), n(kd, t), n(DC, t), n(gf, t), n(j0, t), n(NC, t), n(t3, t), n(zl, t), n(og, t), n(wC, t), n(FC, t), n(LC, t), n(Gh, t), n(Qh, t), n(H0, t), n(IC, t), n(BC, t), n($C, t), n(kC, t), n(xn, t), n(ft, t), n(HC, t), n(zC, t), n(P0, t), n(f3, t), n(og, t), n(mu, t), n(c3, t), n(a3, t), n(Oi, t), n(km, t), n(U0, t), n(x3, t), n(rg, t), n(QC, t), n(mf, t), n(GC, t), n(u3, t), n(l3, t), n(Wh, t), n(nx, t), n(Jm, t), n(Ql, t), n(WC, t), n(n0, t), n(xo, t), n(VC, t), n(YC, t), n(at, t), n(KC, t), n(q0, t), n(Ge, t), n(JC, t), n(UJ, t), n(XC, t), n(ZC, t), n(eS, t);
+  Object.defineProperty(t, "__esModule", { value: !0 }), n(rg, t), n(Ld, t), n(Id, t), n(Ws, t), n(Mm, t), n(Lo, t), n(z4, t), n(Q4, t), n(W4, t), n(Qm, t), n(Y4, t), n(K4, t), n(uo, t), n(Uh, t), n(qh, t), n(r0, t), n(Hh, t), n(zh, t), n(X4, t), n(Kh, t), n(Z4, t), n(s0, t), n(eC, t), n(rl, t), n(tC, t), n(Jh, t), n(nC, t), n(rC, t), n(iC, t), n(Ta, t), n(sC, t), n(oC, t), n(uC, t), n(e3, t), n(Zm, t), n(rx, t), n(aC, t), n(lC, t), n(cC, t), n(fC, t), n(xC, t), n(dC, t), n(hC, t), n(Hl, t), n(pC, t), n(gC, t), n(mC, t), n(yC, t), n(EC, t), n(AC, t), n(_C, t), n(CC, t), n(Yn, t), n(OC, t), n(Xh, t), n($d, t), n(kd, t), n(DC, t), n(gf, t), n(j0, t), n(NC, t), n(t3, t), n(zl, t), n(og, t), n(wC, t), n(FC, t), n(LC, t), n(Gh, t), n(Qh, t), n(H0, t), n(IC, t), n(BC, t), n($C, t), n(kC, t), n(xn, t), n(ft, t), n(HC, t), n(zC, t), n(P0, t), n(f3, t), n(og, t), n(yu, t), n(c3, t), n(a3, t), n(Oi, t), n(km, t), n(U0, t), n(x3, t), n(rg, t), n(QC, t), n(mf, t), n(GC, t), n(u3, t), n(l3, t), n(Wh, t), n(nx, t), n(Jm, t), n(Ql, t), n(WC, t), n(n0, t), n(xo, t), n(VC, t), n(YC, t), n(at, t), n(KC, t), n(q0, t), n(Ge, t), n(JC, t), n(UJ, t), n(XC, t), n(ZC, t), n(eS, t);
 })(P4);
 var tS = {}, Pd = {};
 Object.defineProperty(Pd, "__esModule", { value: !0 });
@@ -52165,7 +52165,7 @@ var UTe = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(tS, "__esModule", { value: !0 });
 tS.MalloyToAST = void 0;
-const pj = o4, zTe = Gg, ee = HTe(P4), w6 = M4, gj = ar, QTe = P4, Nn = an, F6 = We, GTe = So, WTe = Pd, VTe = gu;
+const pj = o4, zTe = Gg, ee = HTe(P4), w6 = M4, gj = ar, QTe = P4, Nn = an, F6 = We, GTe = So, WTe = Pd, VTe = mu;
 class mj extends ee.SourceQueryElement {
   constructor() {
     super(...arguments), this.elementType = "parseErrorSourceQuery";
@@ -53563,7 +53563,7 @@ sS.walkForDocumentHelpContext = c6e;
 var oS = {};
 Object.defineProperty(oS, "__esModule", { value: !0 });
 oS.ReferenceList = void 0;
-const f6e = gu;
+const f6e = mu;
 class x6e {
   constructor(e) {
     this.sourceURL = e, this.references = [];
@@ -53676,9 +53676,9 @@ var A6e = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
       n !== "default" && Object.prototype.hasOwnProperty.call(t, n) && A6e(e, t, n);
   return _6e(e, t), e;
 };
-Object.defineProperty(nu, "__esModule", { value: !0 });
-nu.MalloyParserErrorHandler = nu.MalloyTranslator = nu.MalloyChildTranslator = nu.MalloyTranslation = void 0;
-const Ej = o4, C6e = We, S6e = g4, b6e = D, HJ = v6e(P4), T6e = tS, KO = M4, R6e = Ra, I6 = nS, O6e = rS, D6e = iS, N6e = sS, w6e = oS, UA = uS, F6e = gu, zJ = So, L6e = aS, I6e = lS;
+Object.defineProperty(ru, "__esModule", { value: !0 });
+ru.MalloyParserErrorHandler = ru.MalloyTranslator = ru.MalloyChildTranslator = ru.MalloyTranslation = void 0;
+const Ej = o4, C6e = We, S6e = g4, b6e = D, HJ = v6e(P4), T6e = tS, KO = M4, R6e = Ra, I6 = nS, O6e = rS, D6e = iS, N6e = sS, w6e = oS, UA = uS, F6e = mu, zJ = So, L6e = aS, I6e = lS;
 class B6e extends S6e.MalloyLexer {
   popMode() {
     return this._modeStack.isEmpty ? this._mode : super.popMode();
@@ -54232,13 +54232,13 @@ ${i}` : e = i;
     return n !== void 0 && (n.bare() || n.has("dialect", e));
   }
 }
-nu.MalloyTranslation = xF;
+ru.MalloyTranslation = xF;
 class QJ extends xF {
   constructor(e, n) {
     super(e), this.root = n;
   }
 }
-nu.MalloyChildTranslator = QJ;
+ru.MalloyChildTranslator = QJ;
 class Q6e extends xF {
   constructor(e, n = null, r = null, i = null) {
     super(e, n), this.eventStream = i, this.schemaZone = new I6.Zone(), this.importZone = new I6.Zone(), this.pretranslatedModels = /* @__PURE__ */ new Map(), this.sqlQueryZone = new I6.Zone(), this.root = this, this.logger = new KO.BaseMessageLogger(i), r && this.update(r);
@@ -54253,7 +54253,7 @@ class Q6e extends xF {
     return this.logger.log((0, KO.makeLogMessage)(e, n, { severity: "error", ...r })), e;
   }
 }
-nu.MalloyTranslator = Q6e;
+ru.MalloyTranslator = Q6e;
 class GJ {
   constructor(e, n) {
     this.translator = e, this.messages = n;
@@ -54268,7 +54268,7 @@ class GJ {
     });
   }
 }
-nu.MalloyParserErrorHandler = GJ;
+ru.MalloyParserErrorHandler = GJ;
 function WJ(t) {
   return [
     ...Object.keys(t),
@@ -54307,7 +54307,7 @@ function W6e(t, e) {
 Md.exploreQueryWalkerBuilder = W6e;
 (function(t) {
   Object.defineProperty(t, "__esModule", { value: !0 }), t.exploreQueryWalkerBuilder = t.MalloyTranslation = t.MalloyTranslator = void 0;
-  var e = nu;
+  var e = ru;
   Object.defineProperty(t, "MalloyTranslator", { enumerable: !0, get: function() {
     return e.MalloyTranslator;
   } }), Object.defineProperty(t, "MalloyTranslation", { enumerable: !0, get: function() {
@@ -55234,10 +55234,10 @@ class is extends dF {
   }
 }
 Oe.Explore = is;
-var Go;
+var Wo;
 (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";
-})(Go || (Oe.AtomicFieldType = Go = {}));
+})(Wo || (Oe.AtomicFieldType = Wo = {}));
 class Q0 extends dF {
   constructor(e, n, r) {
     super(e.as || e.name, n, r), this.fieldTypeDef = e, this.parent = n;
@@ -55245,21 +55245,21 @@ class Q0 extends dF {
   get type() {
     switch (this.fieldTypeDef.type) {
       case "string":
-        return Go.String;
+        return Wo.String;
       case "boolean":
-        return Go.Boolean;
+        return Wo.Boolean;
       case "date":
-        return Go.Date;
+        return Wo.Date;
       case "timestamp":
-        return Go.Timestamp;
+        return Wo.Timestamp;
       case "number":
-        return Go.Number;
+        return Wo.Number;
       case "json":
-        return Go.Json;
+        return Wo.Json;
       case "sql native":
-        return Go.NativeUnsupported;
+        return Wo.NativeUnsupported;
       case "error":
-        return Go.Error;
+        return Wo.Error;
       case "record":
       case "array":
         throw new Error(`MTOY TODO IMPLEMENT Atomic ${this.fieldTypeDef.type}`);
@@ -55361,10 +55361,10 @@ var Sc;
 (function(t) {
   t.Day = "day", t.Week = "week", t.Month = "month", t.Quarter = "quarter", t.Year = "year";
 })(Sc || (Oe.DateTimeframe = Sc = {}));
-var Wo;
+var Vo;
 (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";
-})(Wo || (Oe.TimestampTimeframe = Wo = {}));
+})(Vo || (Oe.TimestampTimeframe = Vo = {}));
 class hF extends Q0 {
   constructor(e, n, r) {
     super(e, n, r), this.fieldDateDef = e;
@@ -55394,21 +55394,21 @@ class pF extends Q0 {
     if (this.fieldTimestampDef.timeframe !== void 0)
       switch (this.fieldTimestampDef.timeframe) {
         case "day":
-          return Wo.Day;
+          return Vo.Day;
         case "week":
-          return Wo.Week;
+          return Vo.Week;
         case "month":
-          return Wo.Month;
+          return Vo.Month;
         case "quarter":
-          return Wo.Quarter;
+          return Vo.Quarter;
         case "year":
-          return Wo.Year;
+          return Vo.Year;
         case "second":
-          return Wo.Second;
+          return Vo.Second;
         case "hour":
-          return Wo.Hour;
+          return Vo.Hour;
         case "minute":
-          return Wo.Minute;
+          return Vo.Minute;
       }
   }
 }
@@ -56229,7 +56229,7 @@ class dS {
     return !0;
   }
 }
-class zu extends dS {
+class Qu extends dS {
   constructor(e, n, r, i) {
     super(n, r, i), this._value = e, this._field = n;
   }
@@ -56240,10 +56240,10 @@ class zu extends dS {
     return this._field;
   }
   isScalar() {
-    return this instanceof zu;
+    return this instanceof Qu;
   }
 }
-class iX extends zu {
+class iX extends Qu {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -56257,7 +56257,7 @@ class iX extends zu {
     return this.value.toLocaleLowerCase().localeCompare(e.value.toLocaleLowerCase());
   }
 }
-class sX extends zu {
+class sX extends Qu {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -56271,7 +56271,7 @@ class sX extends zu {
     return 0;
   }
 }
-class oX extends zu {
+class oX extends Qu {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -56285,7 +56285,7 @@ class oX extends zu {
     return this.value === e.value ? 0 : this.value ? 1 : -1;
   }
 }
-class Z6e extends zu {
+class Z6e extends Qu {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -56300,7 +56300,7 @@ class Z6e extends zu {
     return n === r ? 0 : n > r ? 1 : -1;
   }
 }
-class uX extends zu {
+class uX extends Qu {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -56329,7 +56329,7 @@ function aX(t) {
     return n.isValid || (n = Aj.DateTime.fromSQL(t, { zone: "UTC" })), n.toJSDate();
   }
 }
-class lX extends zu {
+class lX extends Qu {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -56346,7 +56346,7 @@ class lX extends zu {
     return this.value > e.value ? 1 : this.value < e.value ? -1 : 0;
   }
 }
-class cX extends zu {
+class cX extends Qu {
   constructor(e, n, r, i) {
     super(e, n, r, i), this._field = n;
   }
@@ -56363,7 +56363,7 @@ class cX extends zu {
     return this.value > e.value ? 1 : this.value < e.value ? -1 : 0;
   }
 }
-class eRe extends zu {
+class eRe extends Qu {
   get key() {
     return this.value.toString();
   }
@@ -111075,7 +111075,7 @@ function oZ(t, e) {
 function uZ(t) {
   return t == null || t === "" ? null : t + "";
 }
-function Eu(t) {
+function Au(t) {
   const e = {}, n = t.length;
   for (let r = 0; r < n; ++r)
     e[t[r]] = !0;
@@ -111509,7 +111509,7 @@ var m3 = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-const Oa = "row", Da = "column", CS = "facet", yn = "x", or = "y", Io = "x2", Qu = "y2", W0 = "xOffset", s2 = "yOffset", Gu = "radius", sl = "radius2", Bo = "theta", ol = "theta2", Wu = "latitude", Vu = "longitude", $o = "latitude2", Ms = "longitude2", Bi = "color", Yu = "fill", Ku = "stroke", $i = "shape", ul = "size", ux = "angle", al = "opacity", V0 = "fillOpacity", Y0 = "strokeOpacity", K0 = "strokeWidth", J0 = "strokeDash", y3 = "text", E3 = "order", A3 = "detail", SS = "key", Af = "tooltip", bS = "href", TS = "url", RS = "description", fNe = {
+const Oa = "row", Da = "column", CS = "facet", yn = "x", or = "y", Io = "x2", Gu = "y2", W0 = "xOffset", s2 = "yOffset", Wu = "radius", sl = "radius2", Bo = "theta", ol = "theta2", Vu = "latitude", Yu = "longitude", $o = "latitude2", Ms = "longitude2", Bi = "color", Ku = "fill", Ju = "stroke", $i = "shape", ul = "size", ux = "angle", al = "opacity", V0 = "fillOpacity", Y0 = "strokeOpacity", K0 = "strokeWidth", J0 = "strokeDash", y3 = "text", E3 = "order", A3 = "detail", SS = "key", Af = "tooltip", bS = "href", TS = "url", RS = "description", fNe = {
   x: 1,
   y: 1,
   x2: 1,
@@ -111531,11 +111531,11 @@ const LF = {
 };
 function xNe(t) {
   switch (t) {
-    case Wu:
+    case Vu:
       return "y";
     case $o:
       return "y2";
-    case Vu:
+    case Yu:
       return "x";
     case Ms:
       return "x2";
@@ -111571,7 +111571,7 @@ const hNe = Te(LF), IF = Object.assign(Object.assign(Object.assign(Object.assign
   description: 1
 });
 function ad(t) {
-  return t === Bi || t === Yu || t === Ku;
+  return t === Bi || t === Ku || t === Ju;
 }
 const gZ = {
   row: 1,
@@ -111584,7 +111584,7 @@ function yNe(t) {
 function mZ(t) {
   return !!BF[t];
 }
-const ENe = [Io, Qu, $o, Ms, ol, sl];
+const ENe = [Io, Gu, $o, Ms, ol, sl];
 function yZ(t) {
   return ax(t) !== t;
 }
@@ -111592,16 +111592,16 @@ function ax(t) {
   switch (t) {
     case Io:
       return yn;
-    case Qu:
+    case Gu:
       return or;
     case $o:
-      return Wu;
-    case Ms:
       return Vu;
+    case Ms:
+      return Yu;
     case ol:
       return Bo;
     case sl:
-      return Gu;
+      return Wu;
   }
   return t;
 }
@@ -111612,7 +111612,7 @@ function a0(t) {
         return "startAngle";
       case ol:
         return "endAngle";
-      case Gu:
+      case Wu:
         return "outerRadius";
       case sl:
         return "innerRadius";
@@ -111624,14 +111624,14 @@ function ll(t) {
     case yn:
       return Io;
     case or:
-      return Qu;
-    case Wu:
-      return $o;
+      return Gu;
     case Vu:
+      return $o;
+    case Yu:
       return Ms;
     case Bo:
       return ol;
-    case Gu:
+    case Wu:
       return sl;
   }
 }
@@ -111641,7 +111641,7 @@ function ki(t) {
     case Io:
       return "width";
     case or:
-    case Qu:
+    case Gu:
       return "height";
   }
 }
@@ -111653,11 +111653,11 @@ function ANe(t) {
       return "yOffset";
     case Io:
       return "x2Offset";
-    case Qu:
+    case Gu:
       return "y2Offset";
     case Bo:
       return "thetaOffset";
-    case Gu:
+    case Wu:
       return "radiusOffset";
     case ol:
       return "theta2Offset";
@@ -111684,7 +111684,7 @@ function AZ(t) {
 const _Ne = Te(IF), $F = m3(IF, ["x", "y", "x2", "y2", "xOffset", "yOffset", "latitude", "longitude", "latitude2", "longitude2", "theta", "theta2", "radius", "radius2"]), vNe = Te($F), kF = {
   x: 1,
   y: 1
-}, Ju = Te(kF);
+}, Xu = Te(kF);
 function _r(t) {
   return t in kF;
 }
@@ -111706,8 +111706,8 @@ function bNe(t) {
 function TNe(t) {
   switch (t) {
     case Bi:
-    case Yu:
     case Ku:
+    case Ju:
     case ul:
     case $i:
     case al:
@@ -111747,8 +111747,8 @@ const SZ = {
 function DNe(t) {
   switch (t) {
     case Bi:
-    case Yu:
     case Ku:
+    case Ju:
     case RS:
     case A3:
     case SS:
@@ -111767,11 +111767,11 @@ function DNe(t) {
     case or:
     case W0:
     case s2:
-    case Wu:
     case Vu:
+    case Yu:
       return ONe;
     case Io:
-    case Qu:
+    case Gu:
     case $o:
     case Ms:
       return {
@@ -111820,7 +111820,7 @@ function DNe(t) {
       return { image: "always" };
     case Bo:
       return { text: "always", arc: "always" };
-    case Gu:
+    case Wu:
       return { text: "always", arc: "always" };
     case ol:
     case sl:
@@ -111832,7 +111832,7 @@ function P6(t) {
     case yn:
     case or:
     case Bo:
-    case Gu:
+    case Wu:
     case W0:
     case s2:
     case ul:
@@ -111842,7 +111842,7 @@ function P6(t) {
     case V0:
     case Y0:
     case Io:
-    case Qu:
+    case Gu:
     case ol:
     case sl:
       return;
@@ -111858,11 +111858,11 @@ function P6(t) {
     case RS:
       return "discrete";
     case Bi:
-    case Yu:
     case Ku:
+    case Ju:
       return "flexible";
-    case Wu:
     case Vu:
+    case Yu:
     case $o:
     case Ms:
     case A3:
@@ -111957,8 +111957,8 @@ function jj(t) {
     case Da:
     case ul:
     case Bi:
-    case Yu:
     case Ku:
+    case Ju:
     case K0:
     case al:
     case V0:
@@ -113616,28 +113616,28 @@ const mg = Hn((t) => {
   t.setUTCMonth(t.getUTCMonth() + e);
 }, (t, e) => e.getUTCMonth() - t.getUTCMonth() + (e.getUTCFullYear() - t.getUTCFullYear()) * 12, (t) => t.getUTCMonth());
 mg.range;
-const Au = Hn((t) => {
+const _u = Hn((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());
-Au.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Hn((e) => {
+_u.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Hn((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);
 });
-Au.range;
-const _u = Hn((t) => {
+_u.range;
+const vu = Hn((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());
-_u.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Hn((e) => {
+vu.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Hn((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);
 });
-_u.range;
+vu.range;
 function hee(t, e, n, r, i, s) {
   const o = [
     [_a, 1, Ea],
@@ -113676,7 +113676,7 @@ function hee(t, e, n, r, i, s) {
   }
   return [u, a];
 }
-const [eFe, tFe] = hee(_u, mg, a2, dee, $S, IS), [nFe, rFe] = hee(Au, gg, u2, Fa, BS, LS), Mr = "year", cs = "quarter", li = "month", Zn = "week", fs = "date", ni = "day", za = "dayofyear", js = "hours", Us = "minutes", vo = "seconds", vu = "milliseconds", pee = [Mr, cs, li, Zn, fs, ni, za, js, Us, vo, vu], G6 = pee.reduce((t, e, n) => (t[e] = 1 + n, t), {});
+const [eFe, tFe] = hee(vu, mg, a2, dee, $S, IS), [nFe, rFe] = hee(_u, gg, u2, Fa, BS, LS), Mr = "year", cs = "quarter", li = "month", Zn = "week", fs = "date", ni = "day", za = "dayofyear", js = "hours", Us = "minutes", vo = "seconds", Cu = "milliseconds", pee = [Mr, cs, li, Zn, fs, ni, za, js, Us, vo, Cu], G6 = pee.reduce((t, e, n) => (t[e] = 1 + n, t), {});
 function gee(t) {
   const e = ke(t).slice(), n = {};
   return e.length || _e("Missing time unit."), e.forEach((i) => {
@@ -113694,7 +113694,7 @@ const iFe = {
   [js]: "%H:00",
   [Us]: "00:%M",
   [vo]: ":%S",
-  [vu]: ".%L",
+  [Cu]: ".%L",
   [`${Mr}-${li}`]: "%Y-%m ",
   [`${Mr}-${li}-${fs}`]: "%Y-%m-%d ",
   [`${js}-${Us}`]: "%H:%M"
@@ -113761,7 +113761,7 @@ function fFe(t, e, n, r, i, s, o) {
   return new Date(Date.UTC(t, e, n, r, i, s, o));
 }
 function Eee(t, e, n, r, i) {
-  const s = e || 1, o = bt(t), u = (y, E, A) => (A = A || y, xFe(n[A], r[A], y === o && s, E)), a = /* @__PURE__ */ new Date(), l = Eu(t), c = l[Mr] ? u(Mr) : hi(2012), f = l[li] ? u(li) : l[cs] ? u(cs) : bc, x = l[Zn] && l[ni] ? u(ni, 1, Zn + ni) : l[Zn] ? u(Zn, 1) : l[ni] ? u(ni, 1) : l[fs] ? u(fs, 1) : l[za] ? u(za, 1) : p3, h = l[js] ? u(js) : bc, p = l[Us] ? u(Us) : bc, m = l[vo] ? u(vo) : bc, g = l[vu] ? u(vu) : bc;
+  const s = e || 1, o = bt(t), u = (y, E, A) => (A = A || y, xFe(n[A], r[A], y === o && s, E)), a = /* @__PURE__ */ new Date(), l = Au(t), c = l[Mr] ? u(Mr) : hi(2012), f = l[li] ? u(li) : l[cs] ? u(cs) : bc, x = l[Zn] && l[ni] ? u(ni, 1, Zn + ni) : l[Zn] ? u(Zn, 1) : l[ni] ? u(ni, 1) : l[fs] ? u(fs, 1) : l[za] ? u(za, 1) : p3, h = l[js] ? u(js) : bc, p = l[Us] ? u(Us) : bc, m = l[vo] ? u(vo) : bc, g = l[Cu] ? u(Cu) : bc;
   return function(y) {
     a.setTime(+y);
     const E = c(a);
@@ -113783,7 +113783,7 @@ const dFe = {
   [js]: (t) => t.getHours(),
   [Us]: (t) => t.getMinutes(),
   [vo]: (t) => t.getSeconds(),
-  [vu]: (t) => t.getMilliseconds(),
+  [Cu]: (t) => t.getMilliseconds(),
   [za]: (t) => mee(t),
   [Zn]: (t) => dD(t),
   [Zn + ni]: (t, e) => Vd(dD(t), t.getDay(), hD(e)),
@@ -113803,7 +113803,7 @@ const gFe = {
   [js]: (t) => t.getUTCHours(),
   [Us]: (t) => t.getUTCMinutes(),
   [vo]: (t) => t.getUTCSeconds(),
-  [vu]: (t) => t.getUTCMilliseconds(),
+  [Cu]: (t) => t.getUTCMilliseconds(),
   [za]: (t) => yee(t),
   [Zn]: (t) => pD(t),
   [ni]: (t, e) => Vd(1, t.getUTCDay(), gD(e)),
@@ -113816,7 +113816,7 @@ function yFe(t, e) {
   return Eee(t, e || 1, gFe, mFe, fFe);
 }
 const EFe = {
-  [Mr]: Au,
+  [Mr]: _u,
   [cs]: gg.every(3),
   [li]: gg,
   [Zn]: u2,
@@ -113826,9 +113826,9 @@ const EFe = {
   [js]: BS,
   [Us]: LS,
   [vo]: _a,
-  [vu]: Qd
+  [Cu]: Qd
 }, AFe = {
-  [Mr]: _u,
+  [Mr]: vu,
   [cs]: mg.every(3),
   [li]: mg,
   [Zn]: a2,
@@ -113838,7 +113838,7 @@ const EFe = {
   [js]: $S,
   [Us]: IS,
   [vo]: _a,
-  [vu]: Qd
+  [Cu]: Qd
 };
 function C3(t) {
   return EFe[t];
@@ -113864,7 +113864,7 @@ function CFe(t, e, n, r) {
 function SFe(t, e, n, r) {
   return _ee(S3(t), e, n, r);
 }
-const o1 = 1e3, u1 = o1 * 60, a1 = u1 * 60, kS = a1 * 24, bFe = kS * 7, aU = kS * 30, mD = kS * 365, vee = [Mr, li, fs, js, Us, vo, vu], l1 = vee.slice(0, -1), c1 = l1.slice(0, -1), f1 = c1.slice(0, -1), TFe = f1.slice(0, -1), RFe = [Mr, Zn], lU = [Mr, li], Cee = [Mr], Lp = [[l1, 1, o1], [l1, 5, 5 * o1], [l1, 15, 15 * o1], [l1, 30, 30 * o1], [c1, 1, u1], [c1, 5, 5 * u1], [c1, 15, 15 * u1], [c1, 30, 30 * u1], [f1, 1, a1], [f1, 3, 3 * a1], [f1, 6, 6 * a1], [f1, 12, 12 * a1], [TFe, 1, kS], [RFe, 1, bFe], [lU, 1, aU], [lU, 3, 3 * aU], [Cee, 1, mD]];
+const o1 = 1e3, u1 = o1 * 60, a1 = u1 * 60, kS = a1 * 24, bFe = kS * 7, aU = kS * 30, mD = kS * 365, vee = [Mr, li, fs, js, Us, vo, Cu], l1 = vee.slice(0, -1), c1 = l1.slice(0, -1), f1 = c1.slice(0, -1), TFe = f1.slice(0, -1), RFe = [Mr, Zn], lU = [Mr, li], Cee = [Mr], Lp = [[l1, 1, o1], [l1, 5, 5 * o1], [l1, 15, 15 * o1], [l1, 30, 30 * o1], [c1, 1, u1], [c1, 5, 5 * u1], [c1, 15, 15 * u1], [c1, 30, 30 * u1], [f1, 1, a1], [f1, 3, 3 * a1], [f1, 6, 6 * a1], [f1, 12, 12 * a1], [TFe, 1, kS], [RFe, 1, bFe], [lU, 1, aU], [lU, 3, 3 * aU], [Cee, 1, mD]];
 function OFe(t) {
   const e = t.extent, n = t.maxbins || 40, r = Math.abs(_S(e)) / n;
   let i = v3((u) => u[2]).right(Lp, r), s, o;
@@ -114226,7 +114226,7 @@ function YFe(t, e) {
   return Lt(t.getHours() % 12 || 12, e, 2);
 }
 function KFe(t, e) {
-  return Lt(1 + Fa.count(Au(t), t), e, 3);
+  return Lt(1 + Fa.count(_u(t), t), e, 3);
 }
 function bee(t, e) {
   return Lt(t.getMilliseconds(), e, 3);
@@ -114248,20 +114248,20 @@ function t9e(t) {
   return e === 0 ? 7 : e;
 }
 function n9e(t, e) {
-  return Lt(u2.count(Au(t) - 1, t), e, 2);
+  return Lt(u2.count(_u(t) - 1, t), e, 2);
 }
 function Tee(t) {
   var e = t.getDay();
   return e >= 4 || e === 0 ? Gd(t) : Gd.ceil(t);
 }
 function r9e(t, e) {
-  return t = Tee(t), Lt(Gd.count(Au(t), t) + (Au(t).getDay() === 4), e, 2);
+  return t = Tee(t), Lt(Gd.count(_u(t), t) + (_u(t).getDay() === 4), e, 2);
 }
 function i9e(t) {
   return t.getDay();
 }
 function s9e(t, e) {
-  return Lt(n_.count(Au(t) - 1, t), e, 2);
+  return Lt(n_.count(_u(t) - 1, t), e, 2);
 }
 function o9e(t, e) {
   return Lt(t.getFullYear() % 100, e, 2);
@@ -114290,7 +114290,7 @@ function x9e(t, e) {
   return Lt(t.getUTCHours() % 12 || 12, e, 2);
 }
 function d9e(t, e) {
-  return Lt(1 + Gl.count(_u(t), t), e, 3);
+  return Lt(1 + Gl.count(vu(t), t), e, 3);
 }
 function Ree(t, e) {
   return Lt(t.getUTCMilliseconds(), e, 3);
@@ -114312,20 +114312,20 @@ function y9e(t) {
   return e === 0 ? 7 : e;
 }
 function E9e(t, e) {
-  return Lt(a2.count(_u(t) - 1, t), e, 2);
+  return Lt(a2.count(vu(t) - 1, t), e, 2);
 }
 function Oee(t) {
   var e = t.getUTCDay();
   return e >= 4 || e === 0 ? Wd(t) : Wd.ceil(t);
 }
 function A9e(t, e) {
-  return t = Oee(t), Lt(Wd.count(_u(t), t) + (_u(t).getUTCDay() === 4), e, 2);
+  return t = Oee(t), Lt(Wd.count(vu(t), t) + (vu(t).getUTCDay() === 4), e, 2);
 }
 function _9e(t) {
   return t.getUTCDay();
 }
 function v9e(t, e) {
-  return Lt(r_.count(_u(t) - 1, t), e, 2);
+  return Lt(r_.count(vu(t) - 1, t), e, 2);
 }
 function C9e(t, e) {
   return Lt(t.getUTCFullYear() % 100, e, 2);
@@ -114460,7 +114460,7 @@ function ED(t) {
 }
 function AU(t, e, n) {
   n = n || {}, He(n) || _e(`Invalid time multi-format specifier: ${n}`);
-  const r = e(vo), i = e(Us), s = e(js), o = e(fs), u = e(Zn), a = e(li), l = e(cs), c = e(Mr), f = t(n[vu] || ".%L"), x = t(n[vo] || ":%S"), h = t(n[Us] || "%I:%M"), p = t(n[js] || "%I %p"), m = t(n[fs] || n[ni] || "%a %d"), g = t(n[Zn] || "%b %d"), y = t(n[li] || "%B"), E = t(n[cs] || "%B"), A = t(n[Mr] || "%Y");
+  const r = e(vo), i = e(Us), s = e(js), o = e(fs), u = e(Zn), a = e(li), l = e(cs), c = e(Mr), f = t(n[Cu] || ".%L"), x = t(n[vo] || ":%S"), h = t(n[Us] || "%I:%M"), p = t(n[js] || "%I %p"), m = t(n[fs] || n[ni] || "%a %d"), g = t(n[Zn] || "%b %d"), y = t(n[li] || "%B"), E = t(n[cs] || "%B"), A = t(n[Mr] || "%Y");
   return (_) => (r(_) < _ ? f : i(_) < _ ? x : s(_) < _ ? h : o(_) < _ ? p : a(_) < _ ? u(_) < _ ? m : g : c(_) < _ ? l(_) < _ ? y : E : A)(_);
 }
 function Lee(t) {
@@ -115156,7 +115156,7 @@ function bLe(t) {
       for (i = r.length; --i >= 0; )
         e.push(n = r[i]), n === t && _e("Cycle detected in dataflow graph.");
 }
-const s_ = {}, Yo = 1, Rl = 2, la = 4, TLe = Yo | Rl, bU = Yo | la, Dx = Yo | Rl | la, TU = 8, kp = 16, RU = 32, OU = 64;
+const s_ = {}, Ko = 1, Rl = 2, la = 4, TLe = Ko | Rl, bU = Ko | la, Dx = Ko | Rl | la, TU = 8, kp = 16, RU = 32, OU = 64;
 function zc(t, e, n) {
   this.dataflow = t, this.stamp = e ?? -1, this.add = [], this.rem = [], this.mod = [], this.fields = null, this.encode = n || null;
 }
@@ -115181,7 +115181,7 @@ zc.prototype = {
   /**
    * Boolean flag indicating ADD (added) tuples.
    */
-  ADD: Yo,
+  ADD: Ko,
   /**
    * Boolean flag indicating REM (removed) tuples.
    */
@@ -115276,7 +115276,7 @@ zc.prototype = {
    */
   init(t, e) {
     const n = this;
-    return n.stamp = t.stamp, n.encode = t.encode, t.fields && !(e & OU) && (n.fields = t.fields), e & Yo ? (n.addF = t.addF, n.add = t.add) : (n.addF = null, n.add = []), e & Rl ? (n.remF = t.remF, n.rem = t.rem) : (n.remF = null, n.rem = []), e & la ? (n.modF = t.modF, n.mod = t.mod) : (n.modF = null, n.mod = []), e & RU ? (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 & OU) && (n.fields = t.fields), e & Ko ? (n.addF = t.addF, n.add = t.add) : (n.addF = null, n.add = []), e & Rl ? (n.remF = t.remF, n.rem = t.rem) : (n.remF = null, n.rem = []), e & la ? (n.modF = t.modF, n.mod = t.mod) : (n.modF = null, n.mod = []), e & RU ? (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.
@@ -115294,7 +115294,7 @@ zc.prototype = {
    */
   changed(t) {
     const e = t || Dx;
-    return e & Yo && this.add.length || e & Rl && this.rem.length || e & la && this.mod.length;
+    return e & Ko && this.add.length || e & Rl && this.rem.length || e & la && this.mod.length;
   },
   /**
    * Forces a "reflow" of tuple values, such that all tuples in the backing
@@ -115307,7 +115307,7 @@ zc.prototype = {
     if (t)
       return this.fork(Dx).reflow();
     const e = this.add.length, n = this.source && this.source.length;
-    return n && n !== e && (this.mod = this.source, e && this.filter(la, DU(this, Yo))), this;
+    return n && n !== e && (this.mod = this.source, e && this.filter(la, DU(this, Ko))), this;
   },
   /**
    * Get/set metadata to pulse requesting garbage collection
@@ -115356,7 +115356,7 @@ zc.prototype = {
    */
   filter(t, e) {
     const n = this;
-    return t & Yo && (n.addF = $y(n.addF, e)), t & Rl && (n.remF = $y(n.remF, e)), t & la && (n.modF = $y(n.modF, e)), t & kp && (n.srcF = $y(n.srcF, e)), n;
+    return t & Ko && (n.addF = $y(n.addF, e)), t & Rl && (n.remF = $y(n.remF, e)), t & la && (n.modF = $y(n.modF, e)), t & kp && (n.srcF = $y(n.srcF, e)), n;
   },
   /**
    * Materialize one or more tuple sets in this pulse. If the tuple set(s) have
@@ -115368,7 +115368,7 @@ zc.prototype = {
   materialize(t) {
     t = t || Dx;
     const e = this;
-    return t & Yo && e.addF && (e.add = K6(e.add, e.addF), e.addF = null), t & Rl && e.remF && (e.rem = K6(e.rem, e.remF), e.remF = null), t & la && e.modF && (e.mod = K6(e.mod, e.modF), e.modF = null), t & kp && e.srcF && (e.source = e.source.filter(e.srcF), e.srcF = null), e;
+    return t & Ko && e.addF && (e.add = K6(e.add, e.addF), e.addF = null), t & Rl && e.remF && (e.rem = K6(e.rem, e.remF), e.remF = null), t & la && e.modF && (e.mod = K6(e.mod, e.modF), e.modF = null), t & kp && e.srcF && (e.source = e.source.filter(e.srcF), e.srcF = null), e;
   },
   /**
    * Visit one or more tuple sets in this pulse.
@@ -115382,7 +115382,7 @@ zc.prototype = {
     const n = this, r = e;
     if (t & kp)
       return Ac(n.source, n.srcF, r), n;
-    t & Yo && Ac(n.add, n.addF, r), t & Rl && Ac(n.rem, n.remF, r), t & la && Ac(n.mod, n.modF, r);
+    t & Ko && Ac(n.add, n.addF, r), t & Rl && Ac(n.rem, n.remF, r), t & la && Ac(n.mod, n.modF, r);
     const i = n.source;
     if (t & TU && i) {
       const s = n.add.length + n.mod.length;
@@ -119447,7 +119447,7 @@ function Wl(t, e) {
   return null;
 }
 const bBe = () => typeof Image < "u" ? Image : null;
-function Xu(t, e) {
+function Zu(t, e) {
   switch (arguments.length) {
     case 0:
       break;
@@ -119500,7 +119500,7 @@ function J9() {
     return arguments.length ? (r = s, i) : r;
   }, i.copy = function() {
     return J9(e, n).unknown(r);
-  }, Xu.apply(i, arguments), i;
+  }, Zu.apply(i, arguments), i;
 }
 function f2(t, e, n) {
   t.prototype = e.prototype = n, n.constructor = t;
@@ -119513,7 +119513,7 @@ function O3(t, e) {
 }
 function nc() {
 }
-var Cf = 0.7, Kd = 1 / Cf, ld = "\\s*([+-]?\\d+)\\s*", _g = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*", uu = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*", TBe = /^#([0-9a-f]{3,8})$/, RBe = new RegExp(`^rgb\\(${ld},${ld},${ld}\\)$`), OBe = new RegExp(`^rgb\\(${uu},${uu},${uu}\\)$`), DBe = new RegExp(`^rgba\\(${ld},${ld},${ld},${_g}\\)$`), NBe = new RegExp(`^rgba\\(${uu},${uu},${uu},${_g}\\)$`), wBe = new RegExp(`^hsl\\(${_g},${uu},${uu}\\)$`), FBe = new RegExp(`^hsla\\(${_g},${uu},${uu},${_g}\\)$`), jU = {
+var Cf = 0.7, Kd = 1 / Cf, ld = "\\s*([+-]?\\d+)\\s*", _g = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*", au = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*", TBe = /^#([0-9a-f]{3,8})$/, RBe = new RegExp(`^rgb\\(${ld},${ld},${ld}\\)$`), OBe = new RegExp(`^rgb\\(${au},${au},${au}\\)$`), DBe = new RegExp(`^rgba\\(${ld},${ld},${ld},${_g}\\)$`), NBe = new RegExp(`^rgba\\(${au},${au},${au},${_g}\\)$`), wBe = new RegExp(`^hsl\\(${_g},${au},${au}\\)$`), FBe = new RegExp(`^hsla\\(${_g},${au},${au},${_g}\\)$`), jU = {
   aliceblue: 15792383,
   antiquewhite: 16444375,
   aqua: 65535,
@@ -119809,26 +119809,26 @@ function tR(t, e, n) {
 }
 const tne = Math.PI / 180, nne = 180 / Math.PI, x_ = 18, rne = 0.96422, ine = 1, sne = 0.82521, one = 4 / 29, cd = 6 / 29, une = 3 * cd * cd, $Be = cd * cd * cd;
 function ane(t) {
-  if (t instanceof au)
-    return new au(t.l, t.a, t.b, t.opacity);
+  if (t instanceof lu)
+    return new lu(t.l, t.a, t.b, t.opacity);
   if (t instanceof va)
     return lne(t);
   t instanceof er || (t = X9(t));
   var e = sR(t.r), n = sR(t.g), r = sR(t.b), i = nR((0.2225045 * e + 0.7168786 * n + 0.0606169 * r) / ine), s, o;
-  return e === n && n === r ? s = o = i : (s = nR((0.4360747 * e + 0.3850649 * n + 0.1430804 * r) / rne), o = nR((0.0139322 * e + 0.0971045 * n + 0.7141733 * r) / sne)), new au(116 * i - 16, 500 * (s - i), 200 * (i - o), t.opacity);
+  return e === n && n === r ? s = o = i : (s = nR((0.4360747 * e + 0.3850649 * n + 0.1430804 * r) / rne), o = nR((0.0139322 * e + 0.0971045 * n + 0.7141733 * r) / sne)), new lu(116 * i - 16, 500 * (s - i), 200 * (i - o), t.opacity);
 }
 function d_(t, e, n, r) {
-  return arguments.length === 1 ? ane(t) : new au(t, e, n, r ?? 1);
+  return arguments.length === 1 ? ane(t) : new lu(t, e, n, r ?? 1);
 }
-function au(t, e, n, r) {
+function lu(t, e, n, r) {
   this.l = +t, this.a = +e, this.b = +n, this.opacity = +r;
 }
-f2(au, d_, O3(nc, {
+f2(lu, d_, O3(nc, {
   brighter(t) {
-    return new au(this.l + x_ * (t ?? 1), this.a, this.b, this.opacity);
+    return new lu(this.l + x_ * (t ?? 1), this.a, this.b, this.opacity);
   },
   darker(t) {
-    return new au(this.l - x_ * (t ?? 1), this.a, this.b, this.opacity);
+    return new lu(this.l - x_ * (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;
@@ -119855,7 +119855,7 @@ function sR(t) {
 function kBe(t) {
   if (t instanceof va)
     return new va(t.h, t.c, t.l, t.opacity);
-  if (t instanceof au || (t = ane(t)), t.a === 0 && t.b === 0)
+  if (t instanceof lu || (t = ane(t)), t.a === 0 && t.b === 0)
     return new va(NaN, 0 < t.l && t.l < 100 ? 0 : NaN, t.l, t.opacity);
   var e = Math.atan2(t.b, t.a) * nne;
   return new va(e < 0 ? e + 360 : e, Math.sqrt(t.a * t.a + t.b * t.b), t.l, t.opacity);
@@ -119868,9 +119868,9 @@ function va(t, e, n, r) {
 }
 function lne(t) {
   if (isNaN(t.h))
-    return new au(t.l, 0, 0, t.opacity);
+    return new lu(t.l, 0, 0, t.opacity);
   var e = t.h * tne;
-  return new au(t.l, Math.cos(e) * t.c, Math.sin(e) * t.c, t.opacity);
+  return new lu(t.l, Math.cos(e) * t.c, Math.sin(e) * t.c, t.opacity);
 }
 f2(va, h_, O3(nc, {
   brighter(t) {
@@ -120375,7 +120375,7 @@ function One() {
   var t = Tne();
   return t.copy = function() {
     return N3(t, One());
-  }, Xu.apply(t, arguments), hx(t);
+  }, Zu.apply(t, arguments), hx(t);
 }
 function Dne(t) {
   var e;
@@ -120473,7 +120473,7 @@ function rL(t) {
 }
 function wne() {
   const t = rL(VS()).domain([1, 10]);
-  return t.copy = () => N3(t, wne()).base(t.base()), Xu.apply(t, arguments), t;
+  return t.copy = () => N3(t, wne()).base(t.base()), Zu.apply(t, arguments), t;
 }
 function rq(t) {
   return function(e) {
@@ -120495,7 +120495,7 @@ function Fne() {
   var t = iL(VS());
   return t.copy = function() {
     return N3(t, Fne()).constant(t.constant());
-  }, Xu.apply(t, arguments);
+  }, Zu.apply(t, arguments);
 }
 function sq(t) {
   return function(e) {
@@ -120521,7 +120521,7 @@ function oL() {
   var t = sL(VS());
   return t.copy = function() {
     return N3(t, oL()).exponent(t.exponent());
-  }, Xu.apply(t, arguments), t;
+  }, Zu.apply(t, arguments), t;
 }
 function v$e() {
   return oL.apply(null, arguments).exponent(0.5);
@@ -120558,7 +120558,7 @@ function Lne() {
     return n.slice();
   }, s.copy = function() {
     return Lne().domain(t).range(e).unknown(r);
-  }, Xu.apply(s, arguments);
+  }, Zu.apply(s, arguments);
 }
 function Ine() {
   var t = 0, e = 1, n = 1, r = [0.5], i = [0, 1], s;
@@ -120584,7 +120584,7 @@ function Ine() {
     return r.slice();
   }, o.copy = function() {
     return Ine().domain([t, e]).range(i).unknown(s);
-  }, Xu.apply(hx(o), arguments);
+  }, Zu.apply(hx(o), arguments);
 }
 function Bne() {
   var t = [0.5], e = [0, 1], n, r = 1;
@@ -120602,7 +120602,7 @@ function Bne() {
     return arguments.length ? (n = s, i) : n;
   }, i.copy = function() {
     return Bne().domain(t).range(e).unknown(n);
-  }, Xu.apply(i, arguments);
+  }, Zu.apply(i, arguments);
 }
 function C$e(t) {
   return new Date(t);
@@ -120632,10 +120632,10 @@ function uL(t, e, n, r, i, s, o, u, a, l) {
   }, c;
 }
 function b$e() {
-  return Xu.apply(uL(nFe, rFe, Au, gg, u2, Fa, BS, LS, _a, s9).domain([new Date(2e3, 0, 1), new Date(2e3, 0, 2)]), arguments);
+  return Zu.apply(uL(nFe, rFe, _u, gg, u2, Fa, BS, LS, _a, s9).domain([new Date(2e3, 0, 1), new Date(2e3, 0, 2)]), arguments);
 }
 function T$e() {
-  return Xu.apply(uL(eFe, tFe, _u, mg, a2, Gl, $S, IS, _a, o9).domain([Date.UTC(2e3, 0, 1), Date.UTC(2e3, 0, 2)]), arguments);
+  return Zu.apply(uL(eFe, tFe, vu, mg, a2, Gl, $S, IS, _a, o9).domain([Date.UTC(2e3, 0, 1), Date.UTC(2e3, 0, 2)]), arguments);
 }
 function YS() {
   var t = 0, e = 1, n, r, i, s, o = wi, u = !1, a;
@@ -120746,7 +120746,7 @@ function fL(t, e, n) {
   const r = t - e + n * 2;
   return t ? r > 0 ? r : 1 : 0;
 }
-const D$e = "identity", Jd = "linear", Ga = "log", w3 = "pow", F3 = "sqrt", JS = "symlog", Sf = "time", bf = "utc", lu = "sequential", x2 = "diverging", Xd = "quantile", XS = "quantize", ZS = "threshold", xL = "ordinal", FD = "point", Une = "band", dL = "bin-ordinal", zn = "continuous", L3 = "discrete", I3 = "discretizing", Vs = "interpolating", hL = "temporal";
+const D$e = "identity", Jd = "linear", Ga = "log", w3 = "pow", F3 = "sqrt", JS = "symlog", Sf = "time", bf = "utc", cu = "sequential", x2 = "diverging", Xd = "quantile", XS = "quantize", ZS = "threshold", xL = "ordinal", FD = "point", Une = "band", dL = "bin-ordinal", zn = "continuous", L3 = "discrete", I3 = "discretizing", Vs = "interpolating", hL = "temporal";
 function N$e(t) {
   return function(e) {
     let n = e[0], r = e[1], i;
@@ -120849,7 +120849,7 @@ function k$e(t, e, n) {
     const s = e();
     return s.invertRange || (s.invertRange = s.invert ? N$e(s) : s.invertExtent ? w$e(s) : void 0), s.type = t, Qne(s);
   };
-  return r.metadata = Eu(ke(n)), r;
+  return r.metadata = Au(ke(n)), r;
 }
 function Bt(t, e, n) {
   return arguments.length > 1 ? (p_.set(t, k$e(t, e, n)), this) : Gne(t) ? p_.get(t) : void 0;
@@ -120862,12 +120862,12 @@ Bt(F3, v$e, zn);
 Bt(JS, Fne, zn);
 Bt(Sf, b$e, [zn, hL]);
 Bt(bf, T$e, [zn, hL]);
-Bt(lu, aL, [zn, Vs]);
-Bt(`${lu}-${Jd}`, aL, [zn, Vs]);
-Bt(`${lu}-${Ga}`, $ne, [zn, Vs, Ga]);
-Bt(`${lu}-${w3}`, lL, [zn, Vs]);
-Bt(`${lu}-${F3}`, R$e, [zn, Vs]);
-Bt(`${lu}-${JS}`, kne, [zn, Vs]);
+Bt(cu, aL, [zn, Vs]);
+Bt(`${cu}-${Jd}`, aL, [zn, Vs]);
+Bt(`${cu}-${Ga}`, $ne, [zn, Vs, Ga]);
+Bt(`${cu}-${w3}`, lL, [zn, Vs]);
+Bt(`${cu}-${F3}`, R$e, [zn, Vs]);
+Bt(`${cu}-${JS}`, kne, [zn, Vs]);
 Bt(`${x2}-${Jd}`, Pne, [zn, Vs]);
 Bt(`${x2}-${Ga}`, Mne, [zn, Vs, Ga]);
 Bt(`${x2}-${w3}`, cL, [zn, Vs]);
@@ -121272,7 +121272,7 @@ function xke(t, e, n) {
     }
   return r;
 }
-const h0 = Math.PI / 180, dke = 1e-14, Rc = Math.PI / 2, Xo = Math.PI * 2, Nx = Math.sqrt(3) / 2;
+const h0 = Math.PI / 180, dke = 1e-14, Rc = Math.PI / 2, Zo = Math.PI * 2, Nx = Math.sqrt(3) / 2;
 var uR = {}, aR = {}, cre = [].join;
 function hke(t, e, n, r, i, s, o, u, a) {
   const l = cre.call(arguments);
@@ -121290,7 +121290,7 @@ function hke(t, e, n, r, i, s, o, u, a) {
   s == i && (F = -F);
   const B = 0.5 * (_ + C) - F * (S - v), U = 0.5 * (v + S) + F * (C - _), z = Math.atan2(v - U, _ - B);
   let W = Math.atan2(S - U, C - B) - z;
-  W < 0 && s === 1 ? W += Xo : W > 0 && s === 0 && (W -= Xo);
+  W < 0 && s === 1 ? W += Zo : W > 0 && s === 0 && (W -= Zo);
   const ue = Math.ceil(Math.abs(W / (Rc + 1e-3))), ge = [];
   for (let he = 0; he < ue; ++he) {
     const oe = z + he * W / ue, ce = z + (he + 1) * W / ue;
@@ -121426,7 +121426,7 @@ const fq = 0.5773502691896257, xq = {
   circle: {
     draw: function(t, e) {
       const n = Math.sqrt(e) / 2;
-      t.moveTo(n, 0), t.arc(0, 0, n, 0, Xo);
+      t.moveTo(n, 0), t.arc(0, 0, n, 0, Zo);
     }
   },
   cross: {
@@ -121524,14 +121524,14 @@ function _ke(t) {
 function vke(t) {
   return t.height;
 }
-function ia(t) {
+function sa(t) {
   return typeof t == "function" ? t : () => +t;
 }
 function qy(t, e, n) {
   return Math.max(e, Math.min(t, n));
 }
 function Cke() {
-  var t = Eke, e = Ake, n = _ke, r = vke, i = ia(0), s = i, o = i, u = i, a = null;
+  var t = Eke, e = Ake, n = _ke, r = vke, 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 = qy(+i.call(this, c), 0, E), _ = qy(+s.call(this, c), 0, E), v = qy(+o.call(this, c), 0, E), C = qy(+u.call(this, c), 0, E);
     if (a || (a = h = Q9()), A <= 0 && _ <= 0 && v <= 0 && C <= 0)
@@ -121544,15 +121544,15 @@ function Cke() {
       return a = null, h + "" || null;
   }
   return l.x = function(c) {
-    return arguments.length ? (t = ia(c), l) : t;
+    return arguments.length ? (t = sa(c), l) : t;
   }, l.y = function(c) {
-    return arguments.length ? (e = ia(c), l) : e;
+    return arguments.length ? (e = sa(c), l) : e;
   }, l.width = function(c) {
-    return arguments.length ? (n = ia(c), l) : n;
+    return arguments.length ? (n = sa(c), l) : n;
   }, l.height = function(c) {
-    return arguments.length ? (r = ia(c), l) : r;
+    return arguments.length ? (r = sa(c), l) : r;
   }, l.cornerRadius = function(c, f, x, h) {
-    return arguments.length ? (i = ia(c), s = f != null ? ia(f) : i, u = x != null ? ia(x) : i, o = h != null ? ia(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;
@@ -121567,7 +121567,7 @@ function Ske() {
         var y = Math.sqrt(m * m + g * g), E = (m /= y) * a, A = (g /= y) * a, _ = Math.atan2(g, m);
         i.moveTo(o - E, u - A), i.lineTo(f - m * p, x - g * p), i.arc(f, x, p, _ - Math.PI, _), i.lineTo(o + E, u + A), i.arc(o, u, a, _, _ + Math.PI);
       } else
-        i.arc(f, x, p, 0, Xo);
+        i.arc(f, x, p, 0, Zo);
       i.closePath();
     } else
       s = 1;
@@ -121768,7 +121768,7 @@ function sc(t, e, n) {
 function nPe(t, e) {
   return t.strokeJoin && t.strokeJoin !== "miter" ? 0 : e;
 }
-const rPe = Xo - 1e-8;
+const rPe = Zo - 1e-8;
 let tb, IE, BE, Bc, BD, $E, $D, kD;
 const Il = (t, e) => tb.add(t, e), kE = (t, e) => Il(IE = t, BE = e), hq = (t) => Il(t, tb.y1), pq = (t) => Il(tb.x1, t), Oc = (t, e) => BD * t + $D * e, Dc = (t, e) => $E * t + kD * e, cR = (t, e) => Il(Oc(t, e), Dc(t, e)), fR = (t, e) => kE(Oc(t, e), Dc(t, e));
 function nb(t, e) {
@@ -121799,8 +121799,8 @@ const iPe = {
       const o = (l) => Il(n * Math.cos(l) + t, n * Math.sin(l) + e);
       let u, a;
       if (o(r), o(i), i !== r)
-        if (r = r % Xo, r < 0 && (r += Xo), i = i % Xo, i < 0 && (i += Xo), i < r && (s = !s, u = r, r = i, i = u), s)
-          for (i -= Xo, u = r - r % Rc, a = 0; a < 4 && u > i; ++a, u -= Rc)
+        if (r = r % Zo, r < 0 && (r += Zo), i = i % Zo, i < 0 && (i += Zo), i < r && (s = !s, u = r, r = i, i = u), s)
+          for (i -= Zo, u = r - r % Rc, a = 0; a < 4 && u > i; ++a, u -= Rc)
             o(u);
         else
           for (u = r - r % Rc + Rc, a = 0; a < 4 && u < i; ++a, u = u + Rc)
@@ -121925,7 +121925,7 @@ function gre(t) {
     r = e[i], r.index = i, r.zindex && n.push(r);
   return t.zdirty = !1, t.zitems = n.sort(aPe);
 }
-function Cu(t, e) {
+function Su(t, e) {
   var n = t.items, r, i;
   if (!n || !n.length)
     return;
@@ -121955,7 +121955,7 @@ function MD(t, e) {
 }
 function TL(t) {
   return function(e, n, r) {
-    Cu(n, (i) => {
+    Su(n, (i) => {
       (!r || r.intersects(i.bounds)) && mre(t, e, i, i);
     });
   };
@@ -122117,9 +122117,9 @@ function Sg(t, e, n, r) {
 }
 const SPe = P3(Sg), bPe = P3(Sg, !1), TPe = P3(Sg, !0);
 function RPe(t, e, n) {
-  Cu(e, (r) => {
+  Su(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 && (Sg(t, r, i, s), eh(t, r), r.fill && y_(t, r, u) && t.fill(), r.stroke && !o && th(t, r, u) && t.stroke()), t.save(), t.translate(i, s), r.clip && Ere(t, r), n && n.translate(-i, -s), Cu(r, (a) => {
+    (r.stroke || r.fill) && u && (Sg(t, r, i, s), eh(t, r), r.fill && y_(t, r, u) && t.fill(), r.stroke && !o && th(t, r, u) && t.stroke()), t.save(), t.translate(i, s), r.clip && Ere(t, r), n && n.translate(-i, -s), Su(r, (a) => {
       this.draw(t, a, n);
     }), n && n.translate(i, s), t.restore(), o && r.stroke && u && (Sg(t, r, i, s), eh(t, r), th(t, r, u) && t.stroke());
   });
@@ -122194,7 +122194,7 @@ function FPe(t, e) {
   return t.set(s, o, s + r, o + i);
 }
 function LPe(t, e, n) {
-  Cu(e, (r) => {
+  Su(e, (r) => {
     if (n && !n.intersects(r.bounds))
       return;
     const i = wL(r, this);
@@ -122275,7 +122275,7 @@ function vre(t, e, n) {
   return e.stroke && th(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 zPe(t, e, n) {
-  Cu(e, (r) => {
+  Su(e, (r) => {
     if (!(n && !n.intersects(r.bounds))) {
       var i = r.opacity == null ? 1 : r.opacity;
       i && vre(t, r, i) && (eh(t, r), t.stroke());
@@ -122296,7 +122296,7 @@ var GPe = {
   isect: sPe
 }, WPe = DL("shape", Xke), VPe = DL("symbol", Zke, dre);
 const _q = Q7e();
-var cu = {
+var fu = {
   height: cl,
   measureWidth: IL,
   estimateWidth: jD,
@@ -122305,7 +122305,7 @@ var cu = {
 };
 Cre(!0);
 function Cre(t) {
-  cu.width = t && Vl ? IL : jD;
+  fu.width = t && Vl ? IL : jD;
 }
 function jD(t, e) {
   return Sre(p0(t, e), cl(t));
@@ -122342,7 +122342,7 @@ function p0(t, e) {
   return t.limit > 0 && n.length ? JPe(t, n) : n;
 }
 function KPe(t) {
-  if (cu.width === IL) {
+  if (fu.width === IL) {
     const e = BL(t);
     return (n) => bre(n, e);
   } else {
@@ -122390,15 +122390,15 @@ function ZPe(t, e) {
   t("text-anchor", XPe[e.align] || "start"), u ? (a = Wc(s, o) + " " + OL(u), (n || r) && (a += " " + Wc(n, r))) : a = Wc(s + n, o + r), t("transform", a);
 }
 function kL(t, e, n) {
-  var r = cu.height(e), i = e.align, s = ub(e), o = s.x1, u = s.y1, a = e.dx || 0, l = (e.dy || 0) + $L(e) - Math.round(0.8 * r), c = M3(e), f;
-  if (ve(c) ? (r += Tf(e) * (c.length - 1), f = c.reduce((x, h) => Math.max(x, cu.width(e, h)), 0)) : f = cu.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 = fu.height(e), i = e.align, s = ub(e), o = s.x1, u = s.y1, a = e.dx || 0, l = (e.dy || 0) + $L(e) - Math.round(0.8 * r), c = M3(e), f;
+  if (ve(c) ? (r += Tf(e) * (c.length - 1), f = c.reduce((x, h) => Math.max(x, fu.width(e, h)), 0)) : f = fu.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 * h0, o, u);
   else if (n === 2)
     return t.rotatedPoints(e.angle * h0, o, u);
   return t;
 }
 function eMe(t, e, n) {
-  Cu(e, (r) => {
+  Su(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)) {
@@ -122607,7 +122607,7 @@ function Xi(t, e, n, r) {
   var i = t.childNodes[e], s;
   return (!i || i.tagName.toLowerCase() !== n.toLowerCase()) && (s = i || null, i = $c(t.ownerDocument, n, r), t.insertBefore(i, s)), i;
 }
-function Zo(t, e) {
+function eu(t, e) {
   for (var n = t.childNodes, r = n.length; r > e; )
     t.removeChild(n[--r]);
   return t;
@@ -123029,7 +123029,7 @@ function SMe(t, e, n) {
 }
 De(zD, fl, {
   initialize(t, e, n, r, i, s) {
-    return this._options = s || {}, this._canvas = this._options.externalContext ? null : Wl(1, 1, this._options.type), t && this._canvas && (Zo(t, 0).appendChild(this._canvas), this._canvas.setAttribute("class", "marks")), Rq.initialize.call(this, t, e, n, r, i);
+    return this._options = s || {}, this._canvas = this._options.externalContext ? null : Wl(1, 1, this._options.type), t && this._canvas && (eu(t, 0).appendChild(this._canvas), this._canvas.setAttribute("class", "marks")), Rq.initialize.call(this, t, e, n, r, i);
   },
   resize(t, e, n, r) {
     if (Rq.resize.call(this, t, e, n, r), this._canvas)
@@ -123112,7 +123112,7 @@ const kre = "aria-hidden", ML = "aria-label", jL = "role", UL = "aria-roledescri
   [jL]: t,
   [UL]: e,
   [ML]: n || void 0
-}), bMe = Eu(["axis-domain", "axis-grid", "axis-label", "axis-tick", "axis-title", "legend-band", "legend-entry", "legend-gradient", "legend-label", "legend-title", "legend-symbol", "title"]), Oq = {
+}), bMe = Au(["axis-domain", "axis-grid", "axis-label", "axis-tick", "axis-title", "legend-band", "legend-entry", "legend-gradient", "legend-label", "legend-title", "legend-symbol", "title"]), Oq = {
   axis: {
     desc: "axis",
     caption: OMe
@@ -123259,7 +123259,7 @@ De(Wre, fl, {
    * @return {SVGRenderer} - This renderer instance.
    */
   initialize(t, e, n, r, i) {
-    return this._defs = {}, this._clearDefs(), t && (this._svg = Xi(t, 0, "svg", kn), this._svg.setAttributeNS(wq, "xmlns", kn), this._svg.setAttributeNS(wq, "xmlns:xlink", bg["xmlns:xlink"]), this._svg.setAttribute("version", bg.version), this._svg.setAttribute("class", "marks"), Zo(t, 1), this._root = Xi(this._svg, Up, "g", kn), Bl(this._root, Gre), Zo(this._svg, Up + 1)), this.background(this._bgcolor), xR.initialize.call(this, t, e, n, r, i);
+    return this._defs = {}, this._clearDefs(), t && (this._svg = Xi(t, 0, "svg", kn), this._svg.setAttributeNS(wq, "xmlns", kn), this._svg.setAttributeNS(wq, "xmlns:xlink", bg["xmlns:xlink"]), this._svg.setAttribute("version", bg.version), this._svg.setAttribute("class", "marks"), eu(t, 1), this._root = Xi(this._svg, Up, "g", kn), Bl(this._root, Gre), eu(this._svg, Up + 1)), this.background(this._bgcolor), xR.initialize.call(this, t, e, n, r, i);
   },
   /**
    * Get / set the background color.
@@ -123313,7 +123313,7 @@ De(Wre, fl, {
    * @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), Zo(this._root, 1)), this.defs(), this._dirty = [], ++this._dirtyID, this;
+    return this._dirtyCheck() && (this._dirtyAll && this._clearDefs(), this.mark(this._root, t), eu(this._root, 1)), this.defs(), this._dirty = [], ++this._dirtyID, this;
   },
   // -- Manage rendering of items marked as dirty --
   /**
@@ -123374,7 +123374,7 @@ De(Wre, fl, {
       const h = this.isDirty(x), p = Lq(x, u, l, i.tag, r);
       h && (this._update(i, p, x), o && $Me(this, p, x)), l = p, ++c;
     };
-    return i.nested ? e.items.length && f(e.items[0]) : Cu(e, f), Zo(u, c), u;
+    return i.nested ? e.items.length && f(e.items[0]) : Su(e, f), eu(u, c), u;
   },
   /**
    * Update the attributes of an SVG element for a mark item.
@@ -123417,7 +123417,7 @@ De(Wre, fl, {
       n || (e.el = n = Xi(t, Up + 1, "defs", kn)), r = IMe(n, e.gradient[i], r);
     for (const i in e.clipping)
       n || (e.el = n = Xi(t, Up + 1, "defs", kn)), r = BMe(n, e.clipping[i], r);
-    n && (r === 0 ? (t.removeChild(n), e.el = null) : Zo(n, r));
+    n && (r === 0 ? (t.removeChild(n), e.el = null) : eu(n, r));
   },
   /**
    * Clear defs caches.
@@ -123467,7 +123467,7 @@ function IMe(t, e, n) {
     });
   for (r = 0, i = e.stops.length; r < i; ++r)
     s = Xi(t, r, "stop", kn), s.setAttribute("offset", e.stops[r].offset), s.setAttribute("stop-color", e.stops[r].color);
-  return Zo(t, r), n;
+  return eu(t, r), n;
 }
 function BMe(t, e, n) {
   let r;
@@ -123476,14 +123476,14 @@ function BMe(t, e, n) {
     y: 0,
     width: e.width,
     height: e.height
-  })), Zo(t, 1), n + 1;
+  })), eu(t, 1), n + 1;
 }
 function $Me(t, e, n) {
   e = e.lastChild.previousSibling;
   let r, i = 0;
-  Cu(n, (s) => {
+  Su(n, (s) => {
     r = t.mark(e, s, r), ++i;
-  }), Zo(e, 1 + i);
+  }), eu(e, 1 + i);
 }
 function Lq(t, e, n, r, i) {
   let s = t._svg, o;
@@ -123525,7 +123525,7 @@ const PMe = {
     const r = M3(n);
     let i, s, o, u;
     ve(r) ? (s = r.map((a) => p0(n, a)), i = s.join(`
-`), i !== Br.text && (Zo(e, 0), o = e.ownerDocument, u = Tf(n), s.forEach((a, l) => {
+`), i !== Br.text && (eu(e, 0), o = e.ownerDocument, u = Tf(n), s.forEach((a, l) => {
       const c = $c(o, "tspan", kn);
       c.__data__ = n, c.textContent = a, l && (c.setAttribute("x", 0), c.setAttribute("dy", u)), e.appendChild(c);
     }), Br.text = i)) : (s = p0(n, r), s !== Br.text && (e.textContent = s, Br.text = s)), Vr(e, "font-family", ob(n)), Vr(e, "font-size", cl(n) + "px"), Vr(e, "font-style", n.fontStyle), Vr(e, "font-variant", n.fontVariant), Vr(e, "font-weight", n.fontWeight);
@@ -123614,11 +123614,11 @@ De(Yre, fl, {
           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)), Cu(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)), Su(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]) : Cu(e, s), t.close();
+    return n.nested ? e.items && e.items.length && s(e.items[0]) : Su(e, s), t.close();
   },
   /**
    * Get href attributes for a hyperlinked mark item.
@@ -124634,9 +124634,9 @@ function qje(t) {
   return !t.bins && (e === Jd || e === w3 || e === F3);
 }
 function Tie(t) {
-  return gL(t) && t !== lu;
+  return gL(t) && t !== cu;
 }
-const Hje = Eu(["set", "modified", "clear", "type", "scheme", "schemeExtent", "schemeCount", "domain", "domainMin", "domainMid", "domainMax", "domainRaw", "domainImplicit", "nice", "zero", "bins", "range", "rangeStep", "round", "reverse", "interpolate", "interpolateGamma"]);
+const Hje = Au(["set", "modified", "clear", "type", "scheme", "schemeExtent", "schemeCount", "domain", "domainMin", "domainMid", "domainMax", "domainRaw", "domainImplicit", "nice", "zero", "bins", "range", "rangeStep", "round", "reverse", "interpolate", "interpolateGamma"]);
 function Rie(t) {
   ye.call(this, null, t), this.modified(!0);
 }
@@ -124655,7 +124655,7 @@ De(Rie, ye, {
 });
 function zje(t) {
   var e = t.type, n = "", r;
-  return e === lu ? lu + "-" + Jd : (Qje(t) && (r = t.rawDomain ? t.rawDomain.length : t.domain ? t.domain.length + +(t.domainMid != null) : 0, n = r === 2 ? lu + "-" : r === 3 ? x2 + "-" : ""), (n + e || Jd).toLowerCase());
+  return e === cu ? cu + "-" + Jd : (Qje(t) && (r = t.rawDomain ? t.rawDomain.length : t.domain ? t.domain.length + +(t.domainMid != null) : 0, n = r === 2 ? cu + "-" : r === 3 ? x2 + "-" : ""), (n + e || Jd).toLowerCase());
 }
 function Qje(t) {
   const e = t.type;
@@ -124880,12 +124880,12 @@ function Vq(t, e) {
 function da(t, e) {
   t && Gq.hasOwnProperty(t.type) ? Gq[t.type](t, e) : D_(t, e);
 }
-var N_ = new ai(), w_ = new ai(), Bie, $ie, JD, XD, ZD, Su = {
+var N_ = new ai(), w_ = new ai(), Bie, $ie, JD, XD, ZD, bu = {
   point: hr,
   lineStart: hr,
   lineEnd: hr,
   polygonStart: function() {
-    N_ = new ai(), Su.lineStart = iUe, Su.lineEnd = sUe;
+    N_ = new ai(), bu.lineStart = iUe, bu.lineEnd = sUe;
   },
   polygonEnd: function() {
     var t = +N_;
@@ -124896,13 +124896,13 @@ var N_ = new ai(), w_ = new ai(), Bie, $ie, JD, XD, ZD, Su = {
   }
 };
 function iUe() {
-  Su.point = oUe;
+  bu.point = oUe;
 }
 function sUe() {
   kie(Bie, $ie);
 }
 function oUe(t, e) {
-  Su.point = kie, Bie = t, $ie = e, t *= pt, e *= pt, JD = t, XD = tt(e = e / 2 + R_), ZD = Ke(e);
+  bu.point = kie, Bie = t, $ie = e, t *= pt, e *= pt, JD = t, XD = tt(e = e / 2 + R_), ZD = Ke(e);
 }
 function kie(t, e) {
   t *= pt, e *= pt, e = e / 2 + R_;
@@ -124910,7 +124910,7 @@ function kie(t, e) {
   N_.add(Hs(l, a)), JD = t, XD = s, ZD = o;
 }
 function uUe(t) {
-  return w_ = new ai(), da(t, Su), w_ * 2;
+  return w_ = new ai(), da(t, bu), w_ * 2;
 }
 function F_(t) {
   return [Hs(t[1], t[0]), Pi(t[2])];
@@ -124940,10 +124940,10 @@ var fn, bi, En, Ki, vc, Pie, Mie, fd, P1, Ol, Wa, ca = {
   lineStart: Yq,
   lineEnd: Kq,
   polygonStart: function() {
-    ca.point = Uie, ca.lineStart = aUe, ca.lineEnd = lUe, P1 = new ai(), Su.polygonStart();
+    ca.point = Uie, ca.lineStart = aUe, ca.lineEnd = lUe, P1 = new ai(), bu.polygonStart();
   },
   polygonEnd: function() {
-    Su.polygonEnd(), ca.point = e7, ca.lineStart = Yq, ca.lineEnd = Kq, N_ < 0 ? (fn = -(En = 180), bi = -(Ki = 90)) : P1 > Ze ? Ki = 90 : P1 < -Ze && (bi = -90), Wa[0] = fn, Wa[1] = En;
+    bu.polygonEnd(), ca.point = e7, ca.lineStart = Yq, ca.lineEnd = Kq, N_ < 0 ? (fn = -(En = 180), bi = -(Ki = 90)) : P1 > Ze ? Ki = 90 : P1 < -Ze && (bi = -90), Wa[0] = fn, Wa[1] = En;
   },
   sphere: function() {
     fn = -(En = 180), bi = -(Ki = 90);
@@ -124975,13 +124975,13 @@ function Uie(t, e) {
     P1.add(At(n) > 180 ? n + (n > 0 ? 360 : -360) : n);
   } else
     Pie = t, Mie = e;
-  Su.point(t, e), jie(t, e);
+  bu.point(t, e), jie(t, e);
 }
 function aUe() {
-  Su.lineStart();
+  bu.lineStart();
 }
 function lUe() {
-  Uie(Pie, Mie), Su.lineEnd(), At(P1) > Ze && (fn = -(En = 180)), Wa[0] = fn, Wa[1] = En, fd = null;
+  Uie(Pie, Mie), bu.lineEnd(), At(P1) > Ze && (fn = -(En = 180)), Wa[0] = fn, Wa[1] = En, fd = null;
 }
 function Yi(t, e) {
   return (e -= t) < 0 ? e + 360 : e;
@@ -125599,7 +125599,7 @@ var sh = 1 / 0, U_ = sh, Og = -sh, q_ = Og, H_ = {
 function FUe(t, e) {
   t < sh && (sh = t), t > Og && (Og = t), e < U_ && (U_ = e), e > q_ && (q_ = e);
 }
-var l7 = 0, c7 = 0, g1 = 0, z_ = 0, Q_ = 0, Zx = 0, f7 = 0, x7 = 0, m1 = 0, Zie, ese, eu, tu, Os = {
+var l7 = 0, c7 = 0, g1 = 0, z_ = 0, Q_ = 0, Zx = 0, f7 = 0, x7 = 0, m1 = 0, Zie, ese, tu, nu, Os = {
   point: Df,
   lineStart: aH,
   lineEnd: lH,
@@ -125621,11 +125621,11 @@ function aH() {
   Os.point = LUe;
 }
 function LUe(t, e) {
-  Os.point = IUe, Df(eu = t, tu = e);
+  Os.point = IUe, Df(tu = t, nu = e);
 }
 function IUe(t, e) {
-  var n = t - eu, r = e - tu, i = mi(n * n + r * r);
-  z_ += i * (eu + t) / 2, Q_ += i * (tu + e) / 2, Zx += i, Df(eu = t, tu = e);
+  var n = t - tu, r = e - nu, i = mi(n * n + r * r);
+  z_ += i * (tu + t) / 2, Q_ += i * (nu + e) / 2, Zx += i, Df(tu = t, nu = e);
 }
 function lH() {
   Os.point = Df;
@@ -125637,11 +125637,11 @@ function $Ue() {
   tse(Zie, ese);
 }
 function kUe(t, e) {
-  Os.point = tse, Df(Zie = eu = t, ese = tu = e);
+  Os.point = tse, Df(Zie = tu = t, ese = nu = e);
 }
 function tse(t, e) {
-  var n = t - eu, r = e - tu, i = mi(n * n + r * r);
-  z_ += i * (eu + t) / 2, Q_ += i * (tu + e) / 2, Zx += i, i = tu * t - eu * e, f7 += i * (eu + t), x7 += i * (tu + e), m1 += i * 3, Df(eu = t, tu = e);
+  var n = t - tu, r = e - nu, i = mi(n * n + r * r);
+  z_ += i * (tu + t) / 2, Q_ += i * (nu + e) / 2, Zx += i, i = nu * t - tu * e, f7 += i * (tu + t), x7 += i * (nu + e), m1 += i * 3, Df(tu = t, nu = e);
 }
 function nse(t) {
   this._context = t;
@@ -125951,7 +125951,7 @@ function gH(t, e, n, r, i, s) {
     return [r * (c * m - f * g + x), i * (h - f * m - c * g)];
   }, p;
 }
-function Zu(t) {
+function ea(t) {
   return ase(function() {
     return t;
   })();
@@ -126135,7 +126135,7 @@ fse.invert = U3(function(t) {
   return 2 * Pi(t / 2);
 });
 function KUe() {
-  return Zu(fse).scale(124.75).clipAngle(180 - 1e-3);
+  return ea(fse).scale(124.75).clipAngle(180 - 1e-3);
 }
 var xse = cse(function(t) {
   return (t = Iie(t)) && t / Ke(t);
@@ -126144,7 +126144,7 @@ xse.invert = U3(function(t) {
   return t;
 });
 function JUe() {
-  return Zu(xse).scale(79.4188).clipAngle(180 - 1e-3);
+  return ea(xse).scale(79.4188).clipAngle(180 - 1e-3);
 }
 function xb(t, e) {
   return [t, O_(eI((_n + e) / 2))];
@@ -126156,7 +126156,7 @@ function XUe() {
   return dse(xb).scale(961 / gi);
 }
 function dse(t) {
-  var e = Zu(t), n = e.center, r = e.scale, i = e.translate, s = e.clipExtent, o = null, u, a, l;
+  var e = ea(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) {
@@ -126197,7 +126197,7 @@ function V_(t, e) {
 }
 V_.invert = V_;
 function tqe() {
-  return Zu(V_).scale(152.63);
+  return ea(V_).scale(152.63);
 }
 function nqe(t, e) {
   var n = tt(t), r = t === e ? Ke(t) : (n - tt(e)) / (e - t), i = n / r + t;
@@ -126232,7 +126232,7 @@ hse.invert = function(t, e) {
   ];
 };
 function sqe() {
-  return Zu(hse).scale(177.158);
+  return ea(hse).scale(177.158);
 }
 function pse(t, e) {
   var n = tt(e), r = tt(t) * n;
@@ -126240,7 +126240,7 @@ function pse(t, e) {
 }
 pse.invert = U3(h2);
 function oqe() {
-  return Zu(pse).scale(144.049).clipAngle(60);
+  return ea(pse).scale(144.049).clipAngle(60);
 }
 function uqe() {
   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 = cb({
@@ -126312,14 +126312,14 @@ gse.invert = function(t, e) {
   ];
 };
 function aqe() {
-  return Zu(gse).scale(175.295);
+  return ea(gse).scale(175.295);
 }
 function mse(t, e) {
   return [tt(e) * Ke(t), Ke(e)];
 }
 mse.invert = U3(Pi);
 function lqe() {
-  return Zu(mse).scale(249.5).clipAngle(90 + Ze);
+  return ea(mse).scale(249.5).clipAngle(90 + Ze);
 }
 function yse(t, e) {
   var n = tt(e), r = 1 + tt(t) * n;
@@ -126329,7 +126329,7 @@ yse.invert = U3(function(t) {
   return 2 * h2(t);
 });
 function cqe() {
-  return Zu(yse).scale(250).clipAngle(142);
+  return ea(yse).scale(250).clipAngle(142);
 }
 function Ese(t, e) {
   return [O_(eI((_n + e) / 2)), -t];
@@ -126369,7 +126369,7 @@ function gqe(t, e, n) {
 }
 var mqe = gqe(mH / g7, mH, Ase);
 function yqe() {
-  return Zu(mqe).scale(169.529);
+  return ea(mqe).scale(169.529);
 }
 const Eqe = use(), m7 = [
   // standard properties in d3-geo
@@ -126437,7 +126437,7 @@ for (const t in J_)
   _se(t, J_[t]);
 function _qe() {
 }
-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 oa = [[], [[[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 Cse() {
   var t = 1, e = 1, n = u;
   function r(a, l) {
@@ -126461,16 +126461,16 @@ function Cse() {
   }
   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, oa[g << 1].forEach(A); ++h < t - 1; )
+      m = g, g = a[h + 1] >= l, oa[m | g << 1].forEach(A);
+    for (oa[g << 0].forEach(A); ++p < e - 1; ) {
+      for (h = -1, g = a[p * t + t] >= l, y = a[p * t] >= l, oa[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, oa[m | g << 1 | y << 2 | E << 3].forEach(A);
+      oa[g | y << 3].forEach(A);
+    }
+    for (h = -1, y = a[p * t] >= l, oa[y << 2].forEach(A); ++h < t - 1; )
+      E = y, y = a[p * t + h + 1] >= l, oa[y << 2 | E << 3].forEach(A);
+    oa[y << 3].forEach(A);
     function A(_) {
       var v = [_[0][0] + h, _[0][1] + p], C = [_[1][0] + h, _[1][1] + p], S = o(v), b = o(C), O, F;
       (O = x[S]) ? (F = f[b]) ? (delete x[O.end], delete f[F.start], O === F ? (O.ring.push(C), c(O.ring)) : f[O.start] = x[F.end] = {
@@ -127100,7 +127100,7 @@ function $qe(t, e) {
 function Ose(t) {
   if (!dt(t))
     return !1;
-  const e = Eu(oi(t));
+  const e = Au(oi(t));
   return e.$x || e.$y || e.$value || e.$max;
 }
 function kqe(t, e, n, r) {
@@ -129136,7 +129136,7 @@ function Qze(t) {
     fillOpacity: 0
   } : e;
 }
-const oa = 5, Gr = 31, wg = 32, Dl = new Uint32Array(wg + 1), io = new Uint32Array(wg + 1);
+const ua = 5, Gr = 31, wg = 32, Dl = new Uint32Array(wg + 1), io = new Uint32Array(wg + 1);
 io[0] = 0;
 Dl[0] = ~io[0];
 for (let t = 1; t <= wg; ++t)
@@ -129153,20 +129153,20 @@ function Gze(t, e) {
     array: n,
     get: (s, o) => {
       const u = o * t + s;
-      return n[u >>> oa] & 1 << (u & Gr);
+      return n[u >>> ua] & 1 << (u & Gr);
     },
     set: (s, o) => {
       const u = o * t + s;
-      r(u >>> oa, 1 << (u & Gr));
+      r(u >>> ua, 1 << (u & Gr));
     },
     clear: (s, o) => {
       const u = o * t + s;
-      i(u >>> oa, ~(1 << (u & Gr)));
+      i(u >>> ua, ~(1 << (u & Gr)));
     },
     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 >>> oa, h = f >>> oa, x === h) {
+        if (c = l * t + s, f = l * t + u, x = c >>> ua, h = f >>> ua, x === h) {
           if (n[x] & Dl[c & Gr] & io[(f & Gr) + 1])
             return !0;
         } else {
@@ -129181,7 +129181,7 @@ function Gze(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 >>> oa, x = c >>> oa, f === x)
+        if (l = o * t + s, c = o * t + u, f = l >>> ua, x = c >>> ua, f === x)
           r(f, Dl[l & Gr] & io[(c & Gr) + 1]);
         else
           for (r(f, Dl[l & Gr]), r(x, io[(c & Gr) + 1]), h = f + 1; h < x; ++h)
@@ -129190,7 +129190,7 @@ function Gze(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 >>> oa, x = c >>> oa, f === x)
+        if (l = o * t + s, c = o * t + u, f = l >>> ua, x = c >>> ua, f === x)
           i(f, io[l & Gr] | Dl[(c & Gr) + 1]);
         else
           for (i(f, io[l & Gr]), i(x, Dl[(c & Gr) + 1]), h = f + 1; h < x; ++h)
@@ -129206,7 +129206,7 @@ function Wze(t, e, n) {
 function Vze(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 = cu.width(o.datum, o.datum.text);
+    const u = o.datum.datum.items[r].items, a = u.length, l = o.datum.fontSize, c = fu.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);
@@ -129234,7 +129234,7 @@ function Yze(t, e, n, r) {
     }
   }
   return function(l) {
-    const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = cu.width(l.datum, l.datum.text);
+    const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = fu.width(l.datum, l.datum.text);
     let p = n ? x : 0, m = !1, g = !1, y = 0, E, A, _, v, C, S, b, O, F, B, U, z, X, W, ue, ge, he;
     for (let oe = 0; oe < f; ++oe) {
       for (E = c[oe].x, _ = c[oe].y, A = c[oe].x2 === void 0 ? E : c[oe].x2, v = c[oe].y2 === void 0 ? _ : c[oe].y2, E > A && (he = E, E = A, A = he), _ > v && (he = _, _ = v, v = he), F = t(E), U = t(A), B = ~~((F + U) / 2), z = t(_), W = t(v), X = ~~((z + W) / 2), b = B; b >= F; --b)
@@ -129252,7 +129252,7 @@ const Kze = [-1, -1, 1, 1], Jze = [-1, 1, -1, 1];
 function Xze(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 = cu.width(l.datum, l.datum.text), p = [];
+    const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = fu.width(l.datum, l.datum.text), p = [];
     let m = n ? x : 0, g = !1, y = !1, E = 0, A, _, v, C, S, b, O, F, B, U, z, X;
     for (let W = 0; W < f; ++W) {
       for (A = c[W].x, v = c[W].y, _ = c[W].x2 === void 0 ? A : c[W].x2, C = c[W].y2 === void 0 ? v : c[W].y2, p.push([t((A + _) / 2), t((v + C) / 2)]); p.length; )
@@ -129282,7 +129282,7 @@ function tQe(t, e, n, r) {
     for (let U = 0; U < a; ++U) {
       if (h = (n[U] & 3) - 1, p = (n[U] >>> 2 & 3) - 1, m = h === 0 && p === 0 || r[U] < 0, g = h && p ? Math.SQRT1_2 : 1, y = r[U] < 0 ? -1 : 1, E = c[1 + h] + r[U] * h * g, S = c[4 + p] + y * f * p / 2 + r[U] * p * g, _ = S - f / 2, v = S + f / 2, b = t(E), F = t(_), B = t(v), !x)
         if (PH(b, b, F, B, o, u, E, E, _, v, c, m))
-          x = cu.width(l.datum, l.datum.text);
+          x = fu.width(l.datum, l.datum.text);
         else
           continue;
       if (C = E + y * x * h / 2, E = C - x / 2, A = C + x / 2, b = t(E), O = t(A), PH(b, O, F, B, o, u, E, A, _, v, c, m))
@@ -129315,7 +129315,7 @@ function iQe(t, e, n, r, i, s, o, u, a, l, c) {
   const f = Math.max(r.length, i.length), x = sQe(r, f), h = oQe(i, f), p = uQe(t[0].datum), m = p === "group" && t[0].datum.items[a].marktype, g = m === "area", y = aQe(p, m, u, a), E = l === null || l === 1 / 0, A = g && c === "naive";
   let _ = -1, v = -1;
   const C = t.map((F) => {
-    const B = E ? cu.width(F, F.text) : void 0;
+    const B = E ? fu.width(F, F.text) : void 0;
     return _ = Math.max(_, B), v = Math.max(v, F.fontSize), {
       datum: F,
       opacity: 0,
@@ -130985,17 +130985,17 @@ function aGe(t) {
       return [];
   }
 }
-var ea, Qe, Ae, jr, qt, pb = 1, z3 = 2, Ff = 3, oc = 4, gb = 5, gx = 6, Ci = 7, Q3 = 8, lGe = 9;
-ea = {};
-ea[pb] = "Boolean";
-ea[z3] = "<end>";
-ea[Ff] = "Identifier";
-ea[oc] = "Keyword";
-ea[gb] = "Null";
-ea[gx] = "Numeric";
-ea[Ci] = "Punctuator";
-ea[Q3] = "String";
-ea[lGe] = "RegularExpression";
+var ta, Qe, Ae, jr, qt, pb = 1, z3 = 2, Ff = 3, oc = 4, gb = 5, gx = 6, Ci = 7, Q3 = 8, lGe = 9;
+ta = {};
+ta[pb] = "Boolean";
+ta[z3] = "<end>";
+ta[Ff] = "Identifier";
+ta[oc] = "Keyword";
+ta[gb] = "Null";
+ta[gx] = "Numeric";
+ta[Ci] = "Punctuator";
+ta[Q3] = "String";
+ta[lGe] = "RegularExpression";
 var cGe = "ArrayExpression", fGe = "BinaryExpression", xGe = "CallExpression", dGe = "ConditionalExpression", Kse = "Identifier", hGe = "Literal", pGe = "LogicalExpression", gGe = "MemberExpression", mGe = "ObjectExpression", yGe = "Property", EGe = "UnaryExpression", nr = "Unexpected token %0", AGe = "Unexpected number", _Ge = "Unexpected string", vGe = "Unexpected identifier", CGe = "Unexpected reserved word", SGe = "Unexpected end of input", N7 = "Invalid regular expression", $R = "Invalid regular expression: missing /", Jse = "Octal literals are not allowed in strict mode.", bGe = "Duplicate data property in object literal not allowed in strict mode", pr = "ILLEGAL", Fg = "Disabled.", TGe = 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]"), RGe = 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 mb(t, e) {
   if (!t)
@@ -131735,7 +131735,7 @@ function iWe(t) {
 }
 function sWe(t) {
   t = t || {};
-  const e = t.allowed ? Eu(t.allowed) : {}, n = t.forbidden ? Eu(t.forbidden) : {}, r = t.constants || roe, i = (t.functions || ioe)(f), s = t.globalvar, o = t.fieldvar, u = dt(s) ? s : (p) => `${s}["${p}"]`;
+  const e = t.allowed ? Au(t.allowed) : {}, n = t.forbidden ? Au(t.forbidden) : {}, r = t.constants || roe, i = (t.functions || ioe)(f), s = t.globalvar, o = t.fieldvar, u = dt(s) ? s : (p) => `${s}["${p}"]`;
   let a = {}, l = {}, c = 0;
   function f(p) {
     if (Ue(p))
@@ -131843,7 +131843,7 @@ function fWe(...t) {
       e.add(r);
   return e;
 }
-const jI = "intersect", ZH = "union", xWe = "vlMulti", dWe = "vlPoint", ez = "or", hWe = "and", Jo = "_vgsid_", Ig = ls(Jo), pWe = "E", gWe = "R", mWe = "R-E", yWe = "R-LE", EWe = "R-RE", iv = "index:unit";
+const jI = "intersect", ZH = "union", xWe = "vlMulti", dWe = "vlPoint", ez = "or", hWe = "and", Xo = "_vgsid_", Ig = ls(Xo), pWe = "E", gWe = "R", mWe = "R-E", yWe = "R-LE", EWe = "R-RE", iv = "index:unit";
 function tz(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 = ls.getter || ls(u.field), o = u.getter(t), qc(o) && (o = ii(o)), qc(r[s]) && (r[s] = ii(r[s])), qc(r[s][0]) && (r[s] = r[s].map(ii)), u.type === pWe) {
@@ -131892,7 +131892,7 @@ function SWe(t, e) {
   return t.map((n) => xt(e.fields ? {
     values: e.fields.map((r) => (r.getter || (r.getter = ls(r.field)))(n.datum))
   } : {
-    [Jo]: Ig(n.datum)
+    [Xo]: Ig(n.datum)
   }, e));
 }
 function bWe(t, e, n, r) {
@@ -131902,10 +131902,10 @@ function bWe(t, e, n, r) {
         h = c[v], m = o[h.field] || (o[h.field] = {}), g = m[x] || (m[x] = []), a[h.field] = y = h.type.charAt(0), E = jR[`${y}_union`], m[x] = E(g, ke(f[v]));
       n && (g = u[x] || (u[x] = []), g.push(ke(f).reduce((S, b, O) => (S[c[O].field] = b, S), {})));
     } else
-      h = Jo, p = Ig(l), m = o[h] || (o[h] = {}), g = m[x] || (m[x] = []), g.push(p), n && (g = u[x] || (u[x] = []), g.push({
-        [Jo]: p
+      h = Xo, p = Ig(l), m = o[h] || (o[h] = {}), g = m[x] || (m[x] = []), g.push(p), n && (g = u[x] || (u[x] = []), g.push({
+        [Xo]: p
       }));
-  if (e = e || ZH, o[Jo] ? o[Jo] = jR[`${Jo}_${e}`](...Object.values(o[Jo])) : Object.keys(o).forEach((S) => {
+  if (e = e || ZH, o[Xo] ? o[Xo] = jR[`${Xo}_${e}`](...Object.values(o[Xo])) : Object.keys(o).forEach((S) => {
     o[S] = Object.keys(o[S]).map((b) => o[S][b]).reduce((b, O) => b === void 0 ? O : jR[`${a[S]}_${e}`](b, O));
   }), s = Object.keys(u), n && s.length) {
     const S = r ? dWe : xWe;
@@ -131920,8 +131920,8 @@ function bWe(t, e, n, r) {
   return o;
 }
 var jR = {
-  [`${Jo}_union`]: fWe,
-  [`${Jo}_intersect`]: lWe,
+  [`${Xo}_union`]: fWe,
+  [`${Xo}_intersect`]: lWe,
   E_union: function(t, e) {
     if (!t.length)
       return e;
@@ -132426,7 +132426,7 @@ Qn("vlSelectionTest", AWe, UI);
 Qn("vlSelectionIdTest", CWe, UI);
 Qn("vlSelectionResolve", bWe, UI);
 Qn("vlSelectionTuples", SWe);
-function bu(t, e) {
+function Tu(t, e) {
   const n = {};
   let r;
   try {
@@ -132458,7 +132458,7 @@ function FVe(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 LVe = Eu(["rule"]), sz = Eu(["group", "image", "rect"]);
+const LVe = Au(["rule"]), sz = Au(["group", "image", "rect"]);
 function IVe(t, e) {
   let n = "";
   return LVe[e] || (t.x2 && (t.x ? (sz[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 ? (sz[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;
@@ -132880,7 +132880,7 @@ function pYe(t) {
     defaults: {}
   }, t), n = (r, i) => {
     i.forEach((s) => {
-      ve(r[s]) && (r[s] = Eu(r[s]));
+      ve(r[s]) && (r[s] = Au(r[s]));
     });
   };
   return n(e.defaults, ["prevent", "allow"]), n(e, ["view", "window", "selector"]), e;
@@ -133658,7 +133658,7 @@ function wKe(t) {
   return ve(t) ? DKe(t) : vb(t);
 }
 function FKe(t, e, n, r) {
-  const i = bu(t, e);
+  const i = Tu(t, e);
   return i.$fields.forEach((s) => r[s] = 1), xt(n, i.$params), i.$expr;
 }
 const LKe = "outer", IKe = ["value", "update", "init", "react", "bind"];
@@ -133774,7 +133774,7 @@ function HKe(t, e) {
 }
 function nB(t, e, n) {
   let r = e.between;
-  return r && (r.length !== 2 && _e('Stream "between" parameter must have 2 entries: ' + Ne(e)), t.between = [kg(r[0], n), kg(r[1], n)]), r = e.filter ? [].concat(e.filter) : [], (e.marktype || e.markname || e.markrole) && r.push(zKe(e.marktype, e.markname, e.markrole)), e.source === tB && r.push("inScope(event.item)"), r.length && (t.filter = bu("(" + 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: ' + Ne(e)), t.between = [kg(r[0], n), kg(r[1], n)]), r = e.filter ? [].concat(e.filter) : [], (e.marktype || e.markname || e.markrole) && r.push(zKe(e.marktype, e.markname, e.markrole)), e.source === tB && r.push("inScope(event.item)"), r.length && (t.filter = Tu("(" + 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 zKe(t, e, n) {
   const r = "event.item";
@@ -133794,7 +133794,7 @@ function GKe(t, e, n) {
   let s = t.events, o = t.update, u = [];
   s || _e("Signal update missing events specification."), Ue(s) && (s = mx(s, e.isSubscope() ? tB : M7)), s = ke(s).filter((a) => a.signal || a.scale ? (u.push(a), 0) : 1), u.length > 1 && (u = [VKe(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()," + Ne(r) + ")"), i.update = Ue(o) ? bu(o, e) : o.expr != null ? bu(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()," + Ne(r) + ")"), i.update = Ue(o) ? Tu(o, e) : o.expr != null ? Tu(o.expr, e) : o.value != null ? o.value : o.signal != null ? {
     $expr: QKe,
     $params: {
       $value: e.signalRef(o.signal)
@@ -133816,7 +133816,7 @@ function VKe(t) {
 function YKe(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 = bu(r, e), n.update = r.$expr, n.params = r.$params), t.on && t.on.forEach((i) => GKe(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 = Tu(r, e), n.update = r.$expr, n.params = r.$params), t.on && t.on.forEach((i) => GKe(i, e, n.id));
 }
 const zt = (t) => (e, n, r) => Cb(t, n, e || void 0, r), Hoe = zt("aggregate"), KKe = zt("axisticks"), zoe = zt("bound"), Po = zt("collect"), _z = zt("compare"), JKe = zt("datajoin"), Qoe = zt("encode"), XKe = zt("expression"), ZKe = zt("facet"), eJe = zt("field"), tJe = zt("key"), nJe = zt("legendentries"), rJe = zt("load"), iJe = zt("mark"), sJe = zt("multiextent"), oJe = zt("multivalues"), uJe = zt("overlap"), aJe = zt("params"), Goe = zt("prefacet"), lJe = zt("projection"), cJe = zt("proxy"), fJe = zt("relay"), Woe = zt("render"), xJe = zt("scale"), yx = zt("sieve"), dJe = zt("sortitems"), Voe = zt("viewlayout"), hJe = zt("values");
 let pJe = 0;
@@ -134428,7 +134428,7 @@ function bz(t, e, n) {
     return Rz(r) ? _e("Expression references can not be signals.") : QR(r) ? n.fieldRef(e) : Oz(r) ? n.compareRef(e) : n.signalRef(e.signal);
   {
     const i = t.expr || QR(r);
-    return i && xXe(e) ? n.exprRef(e.expr, e.as) : i && dXe(e) ? $g(e.field, e.as) : Rz(r) ? bu(e, n) : hXe(r) ? Ye(n.getData(e).values) : QR(r) ? $g(e) : Oz(r) ? n.compareRef(e) : e;
+    return i && xXe(e) ? n.exprRef(e.expr, e.as) : i && dXe(e) ? $g(e.field, e.as) : Rz(r) ? Tu(e, n) : hXe(r) ? Ye(n.getData(e).values) : QR(r) ? $g(e) : Oz(r) ? n.compareRef(e) : e;
   }
 }
 function cXe(t, e, n) {
@@ -134569,7 +134569,7 @@ function mXe(t, e, n) {
   };
 }
 function oue(t, e, n) {
-  const r = t.remove, i = t.insert, s = t.toggle, o = t.modify, u = t.values, a = e.add(lv()), l = "if(" + t.trigger + ',modify("' + n + '",' + [i, r, s, o, u].map((f) => f ?? "null").join(",") + "),0)", c = bu(l, e);
+  const r = t.remove, i = t.insert, s = t.toggle, o = t.modify, u = t.values, a = e.add(lv()), l = "if(" + t.trigger + ',modify("' + n + '",' + [i, r, s, o, u].map((f) => f ?? "null").join(",") + "),0)", c = Tu(l, e);
   a.update = c.$expr, a.params = c.$params;
 }
 function Db(t, e) {
@@ -134721,7 +134721,7 @@ function vXe(t, e, n) {
 }
 function CXe(t, e, n) {
   const r = Vc(Nz("size", t, n)), i = Vc(Nz("strokeWidth", t, n)), s = Vc(SXe(n[1].encode, e, V3));
-  return bu(`max(ceil(sqrt(${r})+${i}),${s})`, e);
+  return Tu(`max(ceil(sqrt(${r})+${i}),${s})`, e);
 }
 function Nz(t, e, n) {
   return e[t] ? `scale("${e[t]}",datum)` : tue(t, n[0].encode);
@@ -135546,7 +135546,7 @@ fue.prototype = Bz.prototype = {
   parseLambdas() {
     const t = Object.keys(this.lambdas);
     for (let e = 0, n = t.length; e < n; ++e) {
-      const r = t[e], i = bu(r, this), s = this.lambdas[r];
+      const r = t[e], i = Tu(r, this), s = this.lambdas[r];
       s.params = i.$params, s.update = i.$expr;
     }
   },
@@ -135558,7 +135558,7 @@ fue.prototype = Bz.prototype = {
   },
   exprRef(t, e) {
     const n = {
-      expr: bu(t, this)
+      expr: Tu(t, this)
     };
     return e && (n.expr.$name = e), Ye(this.add(XKe(n)));
   },
@@ -136139,7 +136139,7 @@ function EZe(t, e, n = !1) {
     case W0:
     case s2:
     case Bo:
-    case Gu:
+    case Wu:
       return fo(e) || e === "band" ? !0 : e === "point" ? !n : !1;
     case ul:
     case K0:
@@ -136149,8 +136149,8 @@ function EZe(t, e, n = !1) {
     case ux:
       return fo(e) || ch(e) || Rt(["band", "point", "ordinal"], e);
     case Bi:
-    case Yu:
     case Ku:
+    case Ju:
       return e !== "band";
     case J0:
     case $i:
@@ -136186,7 +136186,7 @@ function vue(t) {
   ].includes(t);
 }
 const CZe = new Set(Te(_i));
-function Tu(t) {
+function Ru(t) {
   return t.type;
 }
 const SZe = [
@@ -136251,7 +136251,7 @@ const wZe = {
   thickness: 1
 };
 function BZe(t) {
-  return Tu(t) ? t.type : t;
+  return Ru(t) ? t.type : t;
 }
 function yB(t) {
   const { channel: e, channelDef: n, markDef: r, scale: i, config: s } = t, o = AB(t);
@@ -136286,7 +136286,7 @@ function PZe(t) {
 }
 function Yc(t, e, n, r) {
   const i = {};
-  if (e && (i.scale = e), ta(t)) {
+  if (e && (i.scale = e), na(t)) {
     const { datum: s } = t;
     cx(s) ? i.signal = pg(s) : Ve(s) ? i.signal = s.signal : _3(s) ? i.signal = s.expr : i.value = s;
   } else
@@ -136335,7 +136335,7 @@ function AB({ channel: t, channelDef: e, channel2Def: n, markDef: r, config: i,
               bandPosition: c,
               offset: a
             });
-          be(jZ(t === yn ? Io : Qu));
+          be(jZ(t === yn ? Io : Gu));
         }
       }
       return Yc(
@@ -136467,7 +136467,7 @@ function Mz(t) {
 function wue(t) {
   return !!t && !!t.encoding;
 }
-function fu(t) {
+function xu(t) {
   return !!t && (t.op === "count" || !!t.field);
 }
 function Fue(t) {
@@ -136556,17 +136556,17 @@ function Fe(t) {
 function W7(t) {
   return t && t.type;
 }
-function ta(t) {
+function na(t) {
   return t && "datum" in t;
 }
-function ru(t) {
+function iu(t) {
   return zs(t) && !xv(t) || V7(t);
 }
 function V7(t) {
-  return ta(t) && on(t.datum);
+  return na(t) && on(t.datum);
 }
 function ot(t) {
-  return Fe(t) || ta(t);
+  return Fe(t) || na(t);
 }
 function zs(t) {
   return t && ("field" in t || t.aggregate === "count") && "type" in t;
@@ -136734,7 +136734,7 @@ function ZZe(t, e) {
     }
   return "nominal";
 }
-function Ru(t) {
+function Ou(t) {
   if (Fe(t))
     return t;
   if (Mb(t))
@@ -136835,8 +136835,8 @@ function tet(t, e) {
     case W0:
     case s2:
     case Bi:
-    case Yu:
     case Ku:
+    case Ju:
     case y3:
     case A3:
     case SS:
@@ -136845,12 +136845,12 @@ function tet(t, e) {
     case TS:
     case ux:
     case Bo:
-    case Gu:
+    case Wu:
     case RS:
       return kx;
-    case Vu:
+    case Yu:
     case Ms:
-    case Wu:
+    case Vu:
     case $o:
       return n !== Bf ? {
         compatible: !1,
@@ -136864,7 +136864,7 @@ function tet(t, e) {
     case ol:
     case sl:
     case Io:
-    case Qu:
+    case Gu:
       return n === "nominal" && !t.sort ? {
         compatible: !1,
         warning: `Channel ${e} should not be used with an unsorted discrete field.`
@@ -137201,12 +137201,12 @@ function Kc(t, e) {
 }
 function Gue(t, e) {
   const n = t && t[e];
-  return n ? ve(n) ? Ud(n, (r) => !!r.field) : Fe(n) || ta(n) || X3(n) : !1;
+  return n ? ve(n) ? Ud(n, (r) => !!r.field) : Fe(n) || na(n) || X3(n) : !1;
 }
 function Y7(t, e) {
   if (_r(e)) {
     const n = t[e];
-    if ((Fe(n) || ta(n)) && xue(n.type)) {
+    if ((Fe(n) || na(n)) && xue(n.type)) {
       const r = EZ(e);
       return Gue(t, r);
     }
@@ -137220,7 +137220,7 @@ function DB(t) {
       if (ve(n))
         return Ud(n, (r) => !!r.aggregate);
       {
-        const r = Ru(n);
+        const r = Ou(n);
         return r && !!r.aggregate;
       }
     }
@@ -137312,7 +137312,7 @@ function aet(t, e, n, r) {
       continue;
     }
     if (s === ul && e === "line") {
-      const u = Ru(t[s]);
+      const u = Ou(t[s]);
       if (u != null && u.aggregate) {
         be(h8e);
         continue;
@@ -137327,7 +137327,7 @@ function aet(t, e, n, r) {
     else {
       if (s === Af && o === null)
         i[s] = null;
-      else if (!Fe(o) && !ta(o) && !Co(o) && !Pb(o) && !Ve(o)) {
+      else if (!Fe(o) && !na(o) && !Co(o) && !Pb(o) && !Ve(o)) {
         be(uD(o, s));
         continue;
       }
@@ -137380,15 +137380,15 @@ function Vue(t, e) {
       case RS:
       case TS:
       case Io:
-      case Qu:
+      case Gu:
       case W0:
       case s2:
       case Bo:
       case ol:
-      case Gu:
-      case sl:
       case Wu:
+      case sl:
       case Vu:
+      case Yu:
       case $o:
       case Ms:
       case y3:
@@ -137411,14 +137411,14 @@ function Vue(t, e) {
         if (t === "trail")
           return n;
       case Bi:
-      case Yu:
       case Ku:
+      case Ju:
       case al:
       case V0:
       case Y0:
       case J0:
       case K0: {
-        const i = Ru(e[r]);
+        const i = Ou(e[r]);
         return i && !i.aggregate && n.push(Ie(i, {})), n;
       }
     }
@@ -137486,7 +137486,7 @@ function FB(t, e, n, r, i) {
 function Kue(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 } : {}), Tu(r.mark) ? r.mark : { type: r.mark }), { style: `${u}-${e}` }), i2(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 } : {}), Ru(r.mark) ? r.mark : { type: r.mark }), { style: `${u}-${e}` }), i2(t[e]) ? {} : t[e]) })
   ] : [];
 }
 function Jue(t, e, n) {
@@ -137508,10 +137508,10 @@ function aE(t, e) {
 }
 function Xue(t, e) {
   const { mark: n, encoding: r } = t, { x: i, y: s } = r;
-  if (Tu(n) && n.orient)
+  if (Ru(n) && n.orient)
     return n.orient;
-  if (ru(i)) {
-    if (ru(s)) {
+  if (iu(i)) {
+    if (iu(s)) {
       const o = Fe(i) && i.aggregate, u = Fe(s) && s.aggregate;
       if (!o && u === e)
         return "vertical";
@@ -137523,7 +137523,7 @@ function Xue(t, e) {
     }
     return "horizontal";
   } else {
-    if (ru(s))
+    if (iu(s))
       return "vertical";
     throw new Error(`Need a valid continuous axis for ${e}s`);
   }
@@ -137544,7 +137544,7 @@ function Zue(t) {
 function eae(t, { config: e }) {
   var n, r;
   t = Object.assign(Object.assign({}, t), { encoding: Hb(t.encoding, e) });
-  const { mark: i, encoding: s, params: o, projection: u } = t, a = ZE(t, ["mark", "encoding", "params", "projection"]), l = Tu(i) ? i : { type: i };
+  const { mark: i, encoding: s, params: o, projection: u } = t, a = ZE(t, ["mark", "encoding", "params", "projection"]), l = Ru(i) ? i : { type: i };
   o && be(BZ("boxplot"));
   const c = (n = l.extent) !== null && n !== void 0 ? n : e.boxplot.extent, f = Mt(
     "size",
@@ -137787,11 +137787,11 @@ function yet(t, e) {
     if (ot(u) && ot(a))
       throw new Error(`${e} cannot have both x2 and y2`);
     if (ot(u)) {
-      if (ru(s))
+      if (iu(s))
         return { orient: "horizontal", inputType: "aggregated-upper-lower" };
       throw new Error(`Both x and x2 have to be quantitative in ${e}`);
     } else if (ot(a)) {
-      if (ru(o))
+      if (iu(o))
         return { orient: "vertical", inputType: "aggregated-upper-lower" };
       throw new Error(`Both y and y2 have to be quantitative in ${e}`);
     }
@@ -137805,11 +137805,11 @@ function yet(t, e) {
     if (ot(u) && ot(l))
       throw new Error(`${e} cannot have both xError and yError with both are quantiative`);
     if (ot(u)) {
-      if (ru(s))
+      if (iu(s))
         return { orient: "horizontal", inputType: "aggregated-error" };
       throw new Error("All x, xError, and xError2 (if exist) have to be quantitative");
     } else if (ot(l)) {
-      if (ru(o))
+      if (iu(o))
         return { orient: "vertical", inputType: "aggregated-error" };
       throw new Error("All y, yError, and yError2 (if exist) have to be quantitative");
     }
@@ -137827,7 +137827,7 @@ function _et(t) {
 }
 function rae(t, e, n) {
   var r;
-  const { mark: i, encoding: s, params: o, projection: u } = t, a = Hz(t, ["mark", "encoding", "params", "projection"]), l = Tu(i) ? i : { type: i };
+  const { mark: i, encoding: s, params: o, projection: u } = t, a = Hz(t, ["mark", "encoding", "params", "projection"]), l = Ru(i) ? i : { type: i };
   o && be(BZ(e));
   const { orient: c, inputType: f } = yet(t, e), { continuousAxisChannelDef: x, continuousAxisChannelDef2: h, continuousAxisChannelDefError: p, continuousAxisChannelDefError2: m, continuousAxis: g } = Jue(t, c, e), { errorBarSpecificAggregate: y, postAggregateCalculates: E, tooltipSummary: A, tooltipTitleWithFieldName: _ } = vet(l, x, h, p, m, f, e, n), v = s, C = g;
   v[C];
@@ -138160,7 +138160,7 @@ function fae({ step: t, offsetIsDiscrete: e }) {
   var n;
   return e ? (n = t.for) !== null && n !== void 0 ? n : "offset" : "position";
 }
-function Ou(t) {
+function Du(t) {
   return He(t) && t.step !== void 0;
 }
 function Qz(t) {
@@ -138204,7 +138204,7 @@ function J7(t, e) {
 }
 function gv(t, e) {
   const n = mv(t, e);
-  return Ou(n) ? n.step : xae;
+  return Du(n) ? n.step : xae;
 }
 function mv(t, e) {
   var n;
@@ -138268,7 +138268,7 @@ const xae = 20, jet = {
   title: {},
   facet: { spacing: Gz },
   concat: { spacing: Gz }
-}, ua = [
+}, aa = [
   "#4c78a8",
   "#f58518",
   "#e45756",
@@ -138286,15 +138286,15 @@ const xae = 20, jet = {
   groupTitle: 13,
   groupSubtitle: 12
 }, Vz = {
-  blue: ua[0],
-  orange: ua[1],
-  red: ua[2],
-  teal: ua[3],
-  green: ua[4],
-  yellow: ua[5],
-  purple: ua[6],
-  pink: ua[7],
-  brown: ua[8],
+  blue: aa[0],
+  orange: aa[1],
+  red: aa[2],
+  teal: aa[3],
+  green: aa[4],
+  yellow: aa[5],
+  purple: aa[6],
+  pink: aa[7],
+  brown: aa[8],
   gray0: "#000",
   gray1: "#111",
   gray2: "#222",
@@ -138631,7 +138631,7 @@ function ott(t) {
 }
 function pae(t, e, n = {}) {
   var r, i;
-  const s = Tu(t) ? t.type : t;
+  const s = Ru(t) ? t.type : t;
   if (!itt.has(s))
     return null;
   const o = Yz(e, "x") || Yz(e, "theta");
@@ -138648,7 +138648,7 @@ function pae(t, e, n = {}) {
     if (m !== "tooltip" && Kc(e, m)) {
       const g = e[m];
       for (const y of ke(g)) {
-        const E = Ru(y);
+        const E = Ou(y);
         if (E.aggregate)
           continue;
         const A = Ie(E, {});
@@ -138709,7 +138709,7 @@ class ltt {
   }
   hasMatchingType(e, n) {
     if (hl(e)) {
-      const { mark: r, encoding: i } = e, s = Tu(r) ? r : { type: r };
+      const { mark: r, encoding: i } = e, s = Ru(r) ? r : { type: r };
       switch (s.type) {
         case "line":
         case "rule":
@@ -138725,7 +138725,7 @@ class ltt {
     return !1;
   }
   run(e, n, r) {
-    const { config: i } = n, { params: s, projection: o, mark: u, encoding: a } = e, l = gae(e, ["params", "projection", "mark", "encoding"]), c = Hb(a, i), f = Tu(u) ? u : { type: u }, x = VR(f, i[f.type], c), h = f.type === "area" && Kz(f, i[f.type]), p = [
+    const { config: i } = n, { params: s, projection: o, mark: u, encoding: a } = e, l = gae(e, ["params", "projection", "mark", "encoding"]), c = Hb(a, i), f = Ru(u) ? u : { type: u }, x = VR(f, i[f.type], c), h = f.type === "area" && Kz(f, i[f.type]), p = [
       Object.assign(Object.assign({}, s ? { params: s } : {}), {
         mark: utt(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
@@ -138769,7 +138769,7 @@ function mae(t, e) {
   if (t = X7("field", t, e), t !== void 0) {
     if (t === null)
       return null;
-    if (SB(t) && fu(t.sort)) {
+    if (SB(t) && xu(t.sort)) {
       const n = X7("field", t.sort, e);
       t = Object.assign(Object.assign({}, t), n ? { sort: n } : {});
     }
@@ -138820,10 +138820,10 @@ class xtt {
   hasMatchingType(e) {
     if (hl(e)) {
       const { encoding: n, mark: r } = e;
-      if (r === "line" || Tu(r) && r.type === "line")
+      if (r === "line" || Ru(r) && r.type === "line")
         for (const i of ENe) {
           const s = ax(i), o = n[s];
-          if (n[i] && (Fe(o) && !Xr(o.bin) || ta(o)))
+          if (n[i] && (Fe(o) && !Xr(o.bin) || na(o)))
             return !0;
         }
     }
@@ -139246,7 +139246,7 @@ class pl {
     }
   }
 }
-function Ko(t) {
+function Jo(t) {
   return {
     explicit: !0,
     value: t
@@ -139524,12 +139524,12 @@ var iQ = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-class xu extends Qt {
+class du extends Qt {
   constructor(e, n) {
     super(e), this.formula = n;
   }
   clone() {
-    return new xu(null, ct(this.formula));
+    return new du(null, ct(this.formula));
   }
   static makeFromEncoding(e, n) {
     const r = n.reduceFieldDef((i, s) => {
@@ -139548,11 +139548,11 @@ class xu extends Qt {
       }
       return i;
     }, {});
-    return Vt(r) ? null : new xu(e, r);
+    return Vt(r) ? null : new du(e, r);
   }
   static makeFromTransform(e, n) {
     const r = Object.assign({}, n), { timeUnit: i } = r, s = iQ(r, ["timeUnit"]), o = pi(i), u = Object.assign(Object.assign({}, s), { timeUnit: o });
-    return new xu(e, {
+    return new du(e, {
       [Tt(u)]: u
     });
   }
@@ -139668,7 +139668,7 @@ const Ztt = {
       const g = { type: "E", field: m };
       g.signals = Object.assign({}, l(g, "data")), s.items.push(g), s.hasField[m] = g;
     }
-    x && (e.init = x.map((m) => s.items.map((g) => He(m) ? m[g.channel] !== void 0 ? m[g.channel] : m[g.field] : m))), Vt(u) || (s.timeUnit = new xu(null, u));
+    x && (e.init = x.map((m) => s.items.map((g) => He(m) ? m[g.channel] !== void 0 ? m[g.channel] : m[g.field] : m))), Vt(u) || (s.timeUnit = new du(null, u));
   },
   signals: (t, e, n) => {
     const r = e.name + ty;
@@ -139937,7 +139937,7 @@ function wae(t, e, n, { reactiveGeom: r } = {}) {
     }), h = x.title || RB(x, n), p = ke(h).join(", ");
     let m;
     if (_r(c)) {
-      const g = c === "x" ? "x2" : "y2", y = Ru(t[g]);
+      const g = c === "x" ? "x2" : "y2", y = Ou(t[g]);
       if (Xr(x.bin) && y) {
         const E = Ie(x, { expr: s }), A = Ie(y, { expr: s }), { format: _, formatType: v } = dv(x);
         m = Bb(E, A, _, v, n), i[g] = !0;
@@ -140406,7 +140406,7 @@ function ynt(t, { invalid: e = !1, channels: n }) {
 function GB(t) {
   const { config: e, markDef: n } = t;
   if (Mt("invalid", n, e)) {
-    const i = Ent(t, { channels: Ju });
+    const i = Ent(t, { channels: Xu });
     if (i)
       return { defined: { signal: i } };
   }
@@ -140888,7 +140888,7 @@ function T1(t, e, n, r = { header: !1 }) {
 }
 function Yae(t) {
   const { axes: e } = t.component, n = [];
-  for (const r of Ju)
+  for (const r of Xu)
     if (e[r]) {
       for (const i of e[r])
         if (!i.get("disable") && !i.get("gridScale")) {
@@ -141222,7 +141222,7 @@ function qnt(t, e) {
 function Hnt(t, e) {
   var n;
   const { sort: r } = t;
-  return fu(r) ? {
+  return xu(r) ? {
     field: Ie(r, { expr: "datum" }),
     order: (n = r.order) !== null && n !== void 0 ? n : "ascending"
   } : ve(r) ? {
@@ -141839,7 +141839,7 @@ function Art(t) {
 function _rt(t) {
   const e = [], { encoding: n } = t;
   for (const r of [
-    [Vu, Wu],
+    [Yu, Vu],
     [Ms, $o]
   ])
     (Mn(n[r[0]]) || Mn(n[r[1]])) && e.push({
@@ -141936,12 +141936,12 @@ function mQ(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 Qt {
+class hu extends Qt {
   constructor(e, n) {
     super(e), this.bins = n;
   }
   clone() {
-    return new du(null, ct(this.bins));
+    return new hu(null, ct(this.bins));
   }
   static makeFromEncoding(e, n) {
     const r = n.reduceFieldDef((i, s, o) => {
@@ -141951,7 +141951,7 @@ class du extends Qt {
       }
       return i;
     }, {});
-    return Vt(r) ? null : new du(e, r);
+    return Vt(r) ? null : new hu(e, r);
   }
   /**
    * Creates a bin node from BinTransform.
@@ -141959,7 +141959,7 @@ class du extends Qt {
    */
   static makeFromTransform(e, n, r) {
     const { key: i, binComponent: s } = mQ(n, n.bin, r);
-    return new du(e, {
+    return new hu(e, {
       [i]: s
     });
   }
@@ -142123,7 +142123,7 @@ class v2 extends Qt {
       const o = n.facet[s];
       if (o) {
         const { bin: u, sort: a } = o;
-        this[s] = Object.assign({ name: n.getName(`${s}_domain`), fields: [Ie(o), ...en(u) ? [Ie(o, { binSuffix: "end" })] : []] }, fu(a) ? { sortField: a } : ve(a) ? { sortIndexField: gh(o, s) } : {});
+        this[s] = Object.assign({ name: n.getName(`${s}_domain`), fields: [Ie(o), ...en(u) ? [Ie(o, { binSuffix: "end" })] : []] }, xu(a) ? { sortField: a } : ve(a) ? { sortIndexField: gh(o, s) } : {});
       }
     }
     this.childModel = n.child;
@@ -142158,7 +142158,7 @@ class v2 extends Qt {
   }
   getChildIndependentFieldsWithStep() {
     const e = {};
-    for (const n of Ju) {
+    for (const n of Xu) {
       const r = this.childModel.component.scales[n];
       if (r && !r.merged) {
         const i = r.get("type"), s = r.get("range");
@@ -142288,7 +142288,7 @@ function wrt(t) {
 function Frt(t) {
   const e = {};
   function n(r) {
-    fh(r) ? e[r.field] = "date" : r.type === "quantitative" && LNe(r.aggregate) ? e[r.field] = "number" : hg(r.field) > 1 ? r.field in e || (e[r.field] = "flatten") : Ax(r) && fu(r.sort) && hg(r.sort.field) > 1 && (r.sort.field in e || (e[r.sort.field] = "flatten"));
+    fh(r) ? e[r.field] = "date" : r.type === "quantitative" && LNe(r.aggregate) ? e[r.field] = "number" : hg(r.field) > 1 ? r.field in e || (e[r.field] = "flatten") : Ax(r) && xu(r.sort) && hg(r.sort.field) > 1 && (r.sort.field in e || (e[r.sort.field] = "flatten"));
   }
   if ((In(t) || mo(t)) && t.forEachFieldDef((r, i) => {
     if (zs(r))
@@ -142591,7 +142591,7 @@ class krt extends e$ {
   }
   run(e, n) {
     let r = /* @__PURE__ */ new Set();
-    e instanceof xu && (r = e.producedFields(), cZ(r, n) && (this.setModified(), e.removeFormulas(n), e.producedFields.length === 0 && e.remove()));
+    e instanceof du && (r = e.producedFields(), cZ(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]));
   }
@@ -142651,7 +142651,7 @@ class Urt extends _x {
 }
 class qrt extends _x {
   run(e) {
-    const n = e.children.filter((i) => i instanceof xu), 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);
   }
@@ -142680,12 +142680,12 @@ class zrt extends _x {
   run(e) {
     const n = !(ZB(e) || e instanceof _2 || e instanceof Pr || e instanceof v0), r = [], i = [];
     for (const s of e.children)
-      s instanceof du && (n && !fZ(e.producedFields(), s.dependentFields()) ? r.push(s) : i.push(s));
+      s instanceof hu && (n && !fZ(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 hu ? e.merge(s, this.model.renameSignal.bind(this.model)) : s.swapWithParent();
     }
     if (i.length > 1) {
       const s = i.pop();
@@ -142801,7 +142801,7 @@ class Ia extends Qt {
       return null;
     const { groupbyChannels: s, fieldChannel: o, offset: u, impute: a } = r, l = s.map((h) => {
       const p = i[h];
-      return Ru(p);
+      return Ou(p);
     }).filter((h) => !!h), c = Grt(n), f = n.encoding.order;
     let x;
     return ve(f) || Fe(f) ? x = wZ(f) : x = c.reduce((h, p) => (h.field.push(p), h.order.push(o === "y" ? "descending" : "ascending"), h), { field: [], order: [] }), new Ia(e, {
@@ -143078,12 +143078,12 @@ function Sl(t, e, n, r) {
   const { encoding: i } = n, s = Mn(i[r]), { type: o } = s, u = s.timeUnit;
   if (dZe(e)) {
     const f = Sl(t, void 0, n, r), x = XR(e.unionWith, o, u);
-    return Ko([...f.value, ...x]);
+    return Jo([...f.value, ...x]);
   } else {
     if (Ve(e))
-      return Ko([e]);
+      return Jo([e]);
     if (e && e !== "unaggregated" && !mue(e))
-      return Ko(XR(e, o, u));
+      return Jo(XR(e, o, u));
   }
   const a = n.stack;
   if (a && r === a.fieldChannel) {
@@ -143102,7 +143102,7 @@ function Sl(t, e, n, r) {
     ]);
   }
   const l = X0(r) && Fe(s) ? rit(n, r, t) : void 0;
-  if (ta(s)) {
+  if (na(s)) {
     const f = XR([s.datum], o, u);
     return Vi(f);
   }
@@ -143205,7 +143205,7 @@ function rit(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 (fu(i)) {
+  if (xu(i)) {
     const u = s && !o.has(i.field);
     return ZR(i, u);
   } else if (wue(i)) {
@@ -143398,7 +143398,7 @@ function lit(t, e) {
             const p = n.range;
             if (ve(p)) {
               if (_r(t))
-                return Ko(p.map((m) => {
+                return Jo(p.map((m) => {
                   if (m === "width" || m === "height") {
                     const g = e.getName(m), y = e.getSignalName.bind(e);
                     return Ii.fromName(y, g);
@@ -143406,24 +143406,24 @@ function lit(t, e) {
                   return m;
                 }));
             } else if (He(p))
-              return Ko({
+              return Jo({
                 data: e.requestDataName(Xt.Main),
                 field: p.field,
                 sort: { op: "min", field: e.vgField(t) }
               });
-            return Ko(p);
+            return Jo(p);
           }
           case "scheme":
-            return Ko(cit(n[f]));
+            return Jo(cit(n[f]));
         }
     }
   const o = t === yn || t === "xOffset" ? "width" : "height", u = r[o];
-  if (Ou(u)) {
+  if (Du(u)) {
     if (_r(t))
       if (ur(s)) {
         const f = _le(u, e, t);
         if (f)
-          return Ko({ step: f });
+          return Jo({ step: f });
       } else
         be(MZ(o));
     else if (o2(t)) {
@@ -143431,13 +143431,13 @@ function lit(t, e) {
       if (e.getScaleComponent(f).get("type") === "band") {
         const p = vle(u, s);
         if (p)
-          return Ko(p);
+          return Jo(p);
       }
     }
   }
   const { rangeMin: a, rangeMax: l } = n, c = fit(t, e);
   return (a !== void 0 || l !== void 0) && // it's ok to check just rangeMin's compatibility since rangeMin/rangeMax are the same
-  Q7(s, "rangeMin") && ve(c) && c.length === 2 ? Ko([a ?? c[0], l ?? c[1]]) : Vi(c);
+  Q7(s, "rangeMin") && ve(c) && c.length === 2 ? Jo([a ?? c[0], l ?? c[1]]) : Vi(c);
 }
 function cit(t) {
   return xZe(t) ? Object.assign({ scheme: t.name }, $s(t, ["name"])) : { scheme: t };
@@ -143449,7 +143449,7 @@ function fit(t, e) {
     case or: {
       if (Rt(["point", "band"], l)) {
         const p = Cle(t, n, r.view);
-        if (Ou(p))
+        if (Du(p))
           return { step: _le(p, e, t) };
       }
       const x = ki(t), h = e.getName(x);
@@ -143466,7 +143466,7 @@ function fit(t, e) {
       return [0, Math.PI * 2];
     case ux:
       return [0, 360];
-    case Gu:
+    case Wu:
       return [
         0,
         new Ii(() => {
@@ -143488,8 +143488,8 @@ function fit(t, e) {
     case $i:
       return "symbol";
     case Bi:
-    case Yu:
     case Ku:
+    case Ju:
       return l === "ordinal" ? u === "nominal" ? "category" : "ordinal" : f !== void 0 ? "diverging" : i === "rect" || i === "geoshape" ? "heatmap" : "ramp";
     case al:
     case V0:
@@ -143522,7 +143522,7 @@ function xit(t, e, n) {
   const r = t === W0 ? "x" : "y", s = e.getScaleComponent(r).get("type"), o = e.scaleName(r);
   if (s === "band") {
     const u = Cle(r, e.size, e.config.view);
-    if (Ou(u)) {
+    if (Du(u)) {
       const a = vle(u, n);
       if (a)
         return a;
@@ -143604,7 +143604,7 @@ function pit(t, e, n, r) {
   throw new Error(wS("size", t));
 }
 function bQ(t, e, n) {
-  const r = Ou(t.width) ? t.width.step : gv(n, "width"), i = Ou(t.height) ? t.height.step : gv(n, "height");
+  const r = Du(t.width) ? t.width.step : gv(n, "width"), i = Du(t.height) ? t.height.step : gv(n, "height");
   return e.x || e.y ? new Ii(() => `min(${[
     e.x ? e.x.signal : r,
     e.y ? e.y.signal : i
@@ -143696,12 +143696,12 @@ function mit(t, e) {
     };
 }
 function yit(t, e) {
-  if (Rt([Bi, Yu, Ku], t) && e !== "nominal")
+  if (Rt([Bi, Ku, Ju], t) && e !== "nominal")
     return "hcl";
 }
 function Eit(t, e, n, r, i, s) {
   var o;
-  if (!(!((o = Ru(s)) === null || o === void 0) && o.bin || ve(n) || i != null || r != null || Rt([Li.TIME, Li.UTC], t)))
+  if (!(!((o = Ou(s)) === null || o === void 0) && o.bin || ve(n) || i != null || r != null || Rt([Li.TIME, Li.UTC], t)))
     return _r(e) ? !0 : void 0;
 }
 function Ait(t, e, n, r, i, s) {
@@ -143766,7 +143766,7 @@ function Sit(t, e, n, r, i) {
   }
   if (t === "size" && e.type === "quantitative" && !ch(i))
     return !0;
-  if (!(Fe(e) && e.bin) && Rt([...Ju, ...CNe], t)) {
+  if (!(Fe(e) && e.bin) && Rt([...Xu, ...CNe], t)) {
     const { orient: o, type: u } = r;
     return !(Rt(["bar", "area", "line", "trail"], u) && (o === "horizontal" && t === "y" || o === "vertical" && t === "x"));
   }
@@ -144116,13 +144116,13 @@ class Dle extends i$ {
   }
   reduceFieldDef(e, n) {
     return fet(this.getMapping(), (r, i, s) => {
-      const o = Ru(i);
+      const o = Ou(i);
       return o ? e(r, o, s) : r;
     }, n);
   }
   forEachFieldDef(e, n) {
     NB(this.getMapping(), (r, i) => {
-      const s = Ru(r);
+      const s = Ou(r);
       s && e(s, i);
     }, n);
   }
@@ -144275,12 +144275,12 @@ class pd extends Qt {
       return e;
     let r = 0;
     for (const i of [
-      [Vu, Wu],
+      [Yu, Vu],
       [Ms, $o]
     ]) {
       const s = i.map((o) => {
         const u = Mn(n.encoding[o]);
-        return Fe(u) ? u.field : ta(u) ? { expr: `${u.datum}` } : Co(u) ? { expr: `${u.value}` } : void 0;
+        return Fe(u) ? u.field : na(u) ? { expr: `${u.datum}` } : Co(u) ? { expr: `${u.value}` } : void 0;
       });
       (s[0] || s[1]) && (e = new pd(e, s, null, n.getName(`geojson_${r++}`)));
     }
@@ -144324,12 +144324,12 @@ class Hg extends Qt {
     if (!n.projectionName())
       return e;
     for (const r of [
-      [Vu, Wu],
+      [Yu, Vu],
       [Ms, $o]
     ]) {
       const i = r.map((o) => {
         const u = Mn(n.encoding[o]);
-        return Fe(u) ? u.field : ta(u) ? { expr: `${u.datum}` } : Co(u) ? { expr: `${u.value}` } : void 0;
+        return Fe(u) ? u.field : na(u) ? { expr: `${u.datum}` } : Co(u) ? { expr: `${u.value}` } : void 0;
       }), s = r[0] === Ms ? "2" : "";
       (i[0] || i[1]) && (e = new Hg(e, n.projectionName(), i, [
         n.getName(`x${s}`),
@@ -144617,7 +144617,7 @@ function Nle(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 ny || r instanceof ry || r instanceof qg || r instanceof _2 || r instanceof ph || r instanceof Hg || r instanceof go || r instanceof zg || r instanceof C2 || r instanceof vx || r instanceof eT || r instanceof Zb || r instanceof Xb || r instanceof tT || r instanceof nT || r instanceof rT || r instanceof v0 || r instanceof sT || r instanceof iT) && i.transform.push(r.assemble()), (r instanceof du || r instanceof xu || r instanceof Jc || r instanceof Ia || r instanceof pd) && i.transform.push(...r.assemble()), r instanceof ci && (i.source && i.transform.length === 0 ? r.setSource(i.source) : r.parent instanceof ci ? r.setSource(i.name) : (i.name || (i.name = `data_${e++}`), r.setSource(i.name), r.numChildren() === 1 && (t.push(i), i = {
+    switch ((r instanceof ny || r instanceof ry || r instanceof qg || r instanceof _2 || r instanceof ph || r instanceof Hg || r instanceof go || r instanceof zg || r instanceof C2 || r instanceof vx || r instanceof eT || r instanceof Zb || r instanceof Xb || r instanceof tT || r instanceof nT || r instanceof rT || r instanceof v0 || r instanceof sT || r instanceof iT) && i.transform.push(r.assemble()), (r instanceof hu || r instanceof du || r instanceof Jc || r instanceof Ia || r instanceof pd) && i.transform.push(...r.assemble()), r instanceof ci && (i.source && i.transform.length === 0 ? r.setSource(i.source) : r.parent instanceof ci ? 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: []
@@ -144768,11 +144768,11 @@ function _v(t, e) {
 }
 function qit(t) {
   const { size: e, component: n } = t;
-  for (const r of Ju) {
+  for (const r of Xu) {
     const i = ki(r);
     if (e[i]) {
       const s = e[i];
-      n.layoutSize.set(i, Ou(s) ? "step" : s, !0);
+      n.layoutSize.set(i, Du(s) ? "step" : s, !0);
     } else {
       const s = Hit(t, i);
       n.layoutSize.set(i, s, !1);
@@ -144785,7 +144785,7 @@ function Hit(t, e) {
     const s = i.get("type"), o = i.get("range");
     if (ur(s)) {
       const u = mv(r.view, e);
-      return ec(o) || Ou(u) ? "step" : u;
+      return ec(o) || Du(u) ? "step" : u;
     } else
       return J7(r.view, e);
   } else {
@@ -144793,7 +144793,7 @@ function Hit(t, e) {
       return J7(r.view, e);
     {
       const s = mv(r.view, e);
-      return Ou(s) ? s.step : s;
+      return Du(s) ? s.step : s;
     }
   }
 }
@@ -144912,7 +144912,7 @@ class W1 extends Dle {
         e.push(i), n.push("distinct"), r.push(`distinct_${i}`);
       }
     } else
-      for (const i of Ju) {
+      for (const i of Xu) {
         const s = this.child.component.scales[i];
         if (s && !s.merged) {
           const o = s.get("type"), u = s.get("range");
@@ -144931,7 +144931,7 @@ class W1 extends Dle {
       if (f) {
         a.push(Ie(f));
         const { bin: x, sort: h } = f;
-        if (en(x) && a.push(Ie(f, { binSuffix: "end" })), fu(h)) {
+        if (en(x) && a.push(Ie(f, { binSuffix: "end" })), xu(h)) {
           const { field: p, op: m = $b } = h, g = dN(f, h);
           r && i ? (s.push(g), o.push("max"), u.push(g)) : (s.push(p), o.push(m), u.push(g));
         } else if (ve(h)) {
@@ -144951,13 +144951,13 @@ class W1 extends Dle {
   }
   facetSortFields(e) {
     const { facet: n } = this, r = n[e];
-    return r ? fu(r.sort) ? [dN(r, r.sort, { expr: "datum" })] : ve(r.sort) ? [gh(r, e, { expr: "datum" })] : [Ie(r, { expr: "datum" })] : [];
+    return r ? xu(r.sort) ? [dN(r, r.sort, { expr: "datum" })] : ve(r.sort) ? [gh(r, e, { expr: "datum" })] : [Ie(r, { expr: "datum" })] : [];
   }
   facetSortOrder(e) {
     const { facet: n } = this, r = n[e];
     if (r) {
       const { sort: i } = r;
-      return [(fu(i) ? i.order : !ve(i) && i) || "ascending"];
+      return [(xu(i) ? i.order : !ve(i) && i) || "ascending"];
     }
     return [];
   }
@@ -144999,7 +144999,7 @@ function zit(t, e) {
   if (n && r) {
     let i = null;
     for (const s of [n, r])
-      if (fu(s.sort)) {
+      if (xu(s.sort)) {
         const { field: o, op: u = $b } = s.sort;
         t = i = new vx(t, {
           joinaggregate: [
@@ -145069,9 +145069,9 @@ function Git(t, e, n) {
       const l = wrt(o);
       a = t = (r = Pr.makeWithAncestors(t, {}, l, n)) !== null && r !== void 0 ? r : t, t = new _2(t, e, o.filter);
     } else if (Aae(o))
-      a = t = du.makeFromTransform(t, o, e), u = "number";
+      a = t = hu.makeFromTransform(t, o, e), u = "number";
     else if (Ott(o))
-      u = "date", n.getWithExplicit(o.field).value === void 0 && (t = new Pr(t, { [o.field]: u }), n.set(o.field, u, !1)), a = t = xu.makeFromTransform(t, o);
+      u = "date", n.getWithExplicit(o.field).value === void 0 && (t = new Pr(t, { [o.field]: u }), n.set(o.field, u, !1)), a = t = du.makeFromTransform(t, o);
     else if (Dtt(o))
       a = t = go.makeFromTransform(t, o), u = "number", WB(e) && (t = new v0(t));
     else if (Eae(o))
@@ -145116,9 +145116,9 @@ function oT(t) {
   const { outputNodes: x, outputNodeRefCounts: h } = t.component.data, p = t.data, g = !(p && (Kl(p) || xh(p) || jg(p))) && t.parent ? t.parent.component.data.ancestorParse.clone() : new Htt();
   Kl(p) ? (Tae(p) ? f = new ry(f, p.sequence) : qB(p) && (f = new ny(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 = Pr.makeExplicit(f, t, g)) !== null && n !== void 0 ? n : f, f = new v0(f);
   const y = t.parent && S2(t.parent);
-  (In(t) || mo(t)) && y && (f = (r = du.makeFromEncoding(f, t)) !== null && r !== void 0 ? r : f), t.transforms.length > 0 && (f = Git(f, t, g));
+  (In(t) || mo(t)) && y && (f = (r = hu.makeFromEncoding(f, t)) !== null && r !== void 0 ? r : f), t.transforms.length > 0 && (f = Git(f, t, g));
   const E = Lrt(t), A = Frt(t);
-  f = (i = Pr.makeWithAncestors(f, {}, Object.assign(Object.assign({}, E), A), g)) !== null && i !== void 0 ? i : f, In(t) && (f = pd.parseAll(f, t), f = Hg.parseAll(f, t)), (In(t) || mo(t)) && (y || (f = (s = du.makeFromEncoding(f, t)) !== null && s !== void 0 ? s : f), f = (o = xu.makeFromEncoding(f, t)) !== null && o !== void 0 ? o : f, f = ph.parseAllForSortIndex(f, t));
+  f = (i = Pr.makeWithAncestors(f, {}, Object.assign(Object.assign({}, E), A), g)) !== null && i !== void 0 ? i : f, In(t) && (f = pd.parseAll(f, t), f = Hg.parseAll(f, t)), (In(t) || mo(t)) && (y || (f = (s = hu.makeFromEncoding(f, t)) !== null && s !== void 0 ? s : f), f = (o = du.makeFromEncoding(f, t)) !== null && o !== void 0 ? o : f, f = ph.parseAllForSortIndex(f, t));
   const _ = t.getDataName(Xt.Raw), v = new ci(f, _, Xt.Raw, h);
   if (x[_] = v, f = v, In(t)) {
     const O = go.makeFromEncoding(f, t);
@@ -145238,7 +145238,7 @@ function Kit(t, e, n) {
   }) }, n) : n;
 }
 function Jit(t) {
-  return Ju.reduce((e, n) => (t.component.scales[n] && (e[n] = [ist(n, t)]), e), {});
+  return Xu.reduce((e, n) => (t.component.scales[n] && (e[n] = [ist(n, t)]), e), {});
 }
 const Xit = {
   bottom: "top",
@@ -145254,7 +145254,7 @@ function Zit(t) {
     for (const o of Te(s.component.axes))
       r.axis[o] = JB(t.component.resolve, o), r.axis[o] === "shared" && (n[o] = est(n[o], s.component.axes[o]), n[o] || (r.axis[o] = "independent", delete n[o]));
   }
-  for (const s of Ju) {
+  for (const s of Xu) {
     for (const o of t.children)
       if (o.component.axes[s]) {
         if (r.axis[s] === "independent") {
@@ -145394,9 +145394,9 @@ function ist(t, e) {
   return Vt(y) || o.set("encode", y, !!s.encoding || s.labelAngle !== void 0), o;
 }
 function sst({ encoding: t, size: e }) {
-  for (const n of Ju) {
+  for (const n of Xu) {
     const r = ki(n);
-    Ou(e[r]) && ru(t[n]) && (delete e[r], be(MZ(r)));
+    Du(e[r]) && iu(t[n]) && (delete e[r], be(MZ(r)));
   }
   return e;
 }
@@ -145467,7 +145467,7 @@ function cst(t, e, n) {
       }
     case Lb:
     case pB: {
-      const u = ru(r), a = ru(i);
+      const u = iu(r), a = iu(i);
       if (n)
         return n;
       if (u && !a)
@@ -145824,7 +145824,7 @@ function Fst(t) {
           return {
             field: Ie(l, { prefix: a, suffix: "sort_index", expr: "datum" })
           };
-        if (fu(c))
+        if (xu(c))
           return {
             field: Ie({
               // FIXME: this op might not already exist?
@@ -145885,7 +145885,7 @@ class Ile extends Dle {
   constructor(e, n, r, i = {}, s) {
     var o;
     super(e, "unit", n, r, s, void 0, Qz(e) ? e.view : void 0), this.specifiedScales = {}, this.specifiedAxes = {}, this.specifiedLegends = {}, this.specifiedProjection = {}, this.selection = [], this.children = [];
-    const u = Tu(e.mark) ? Object.assign({}, e.mark) : { type: e.mark }, a = u.type;
+    const u = Ru(e.mark) ? Object.assign({}, e.mark) : { type: e.mark }, a = u.type;
     u.filled === void 0 && (u.filled = lst(u, s, {
       graticule: e.data && qB(e.data)
     }));
@@ -145925,7 +145925,7 @@ class Ile extends Dle {
     return ve(n) && (i.domain = n.map(Ji)), ve(r) && (i.range = r.map(Ji)), i;
   }
   initAxes(e) {
-    return Ju.reduce((n, r) => {
+    return Xu.reduce((n, r) => {
       const i = e[r];
       if (ot(i) || r === yn && ot(e.x2) || r === or && ot(e.y2)) {
         const s = ot(i) ? i.axis : void 0;
@@ -146005,7 +146005,7 @@ class Ile extends Dle {
   }
   fieldDef(e) {
     const n = this.encoding[e];
-    return Ru(n);
+    return Ou(n);
   }
   typedFieldDef(e) {
     const n = this.fieldDef(e);