@malloydata/render 0.0.138-dev240404154020 → 0.0.138-dev240404193102

package/dist/module/index.mjs

@@ -599,6 +599,9 @@ ne.isValueDate = nxe;
     sqlTzStr(a) {
       return `"${a.queryTimezone}"`;
     }
+    sqlMakeUnnestKey(a, l) {
+      return this.concat(a, "'x'", l);
+    }
   }
   t.Dialect = o;
 })(Hx);
@@ -3860,7 +3863,7 @@ class A2e extends wP.Dialect {
   //
   sqlUnnestAlias(e, n, r, i, s, o) {
     const u = r.map((a) => this.sqlMaybeQuoteIdentifier(a.sqlOutputName));
-    return s ? i ? `,UNNEST(ARRAY(( SELECT AS STRUCT row_number() over() as __row_id, value FROM UNNEST(${e}) value))) as ${n}` : `,UNNEST(ARRAY((SELECT AS STRUCT value FROM unnest(${e}) value))) as ${n}` : i ? `,UNNEST(zip_with(a, SEQUENCE(1,cardinality(a)), (r,__row_id) -> (r, __row_id))) as ${n}_outer(${n},__row_id)` : `,UNNEST(${e}) as ${n}(${u.join(", ")})`;
+    return s ? i ? `,UNNEST(zip(${e}, SEQUENCE(1,cardinality(${e})))) as words_0(value,__row_id_from_${n})` : `,UNNEST(transform(${e}, x -> ROW(x) )) as ${n}(value)` : i ? `,UNNEST(zip_with(a, SEQUENCE(1,cardinality(a)), (r,__row_id) -> (r, __row_id))) as ${n}_outer(${n},__row_id_from_${n})` : `,UNNEST(${e}) as ${n}(${u.join(", ")})`;
   }
   sqlSumDistinctHashedKey(e) {
     e = `CAST(${e} AS VARCHAR)`;
@@ -3871,7 +3874,7 @@ class A2e extends wP.Dialect {
     return "UUID()";
   }
   sqlFieldReference(e, n, r, i, s) {
-    return n === "__row_id" ? `${e}_outer.__row_id` : `${e}.${n}`;
+    return n === "__row_id" ? `__row_id_from_${e}` : `${e}.${n}`;
   }
   sqlUnnestPipelineHead(e, n) {
     let r = n;
@@ -4000,6 +4003,9 @@ ${(0, FP.indent)(n)}
   concat(...e) {
     return e.join(" || ");
   }
+  sqlMakeUnnestKey(e, n) {
+    return `CAST(${e} as VARCHAR) || 'x' || CAST(${n} as VARCHAR)`;
+  }
   validateTypeName(e) {
     return e.match(/^[A-Za-z\s(),<>0-9]*$/) !== null;
   }
@@ -4680,10 +4686,9 @@ class P2e extends ni {
       return this.parent.getPrimaryKeyField(this.fieldDef).generateExpression(e);
     if (this.parent.fieldDef.structSource.type === "nested") {
       const r = (n = this.parent.parent) === null || n === void 0 ? void 0 : n.getDistinctKey().generateExpression(e);
-      return this.parent.dialect.concat(
+      return this.parent.dialect.sqlMakeUnnestKey(
         r || "",
         // shouldn't have to do this...
-        "'x'",
         this.parent.dialect.sqlFieldReference(this.parent.getIdentifier(), "__row_id", "string", !0, !1)
       );
     } else
@@ -28352,7 +28357,7 @@ class d extends b3e.Parser {
   }
   // @RuleVersion(0)
   collectionMember() {
-    let e = new eS(this._ctx, this.state);
+    let e = new e4(this._ctx, this.state);
     this.enterRule(e, 238, d.RULE_collectionMember);
     try {
       switch (this.state = 1209, this._errHandler.sync(this), this.interpreter.adaptivePredict(this._input, 128, this._ctx)) {
@@ -34680,7 +34685,7 @@ class Om extends ye.ParserRuleContext {
 F.FieldNameListContext = Om;
 class k9 extends ye.ParserRuleContext {
   collectionMember(e) {
-    return e === void 0 ? this.getRuleContexts(eS) : this.getRuleContext(e, eS);
+    return e === void 0 ? this.getRuleContexts(e4) : this.getRuleContext(e, e4);
   }
   COMMA(e) {
     return e === void 0 ? this.getTokens(d.COMMA) : this.getToken(d.COMMA, e);
@@ -34845,7 +34850,7 @@ class j9 extends ye.ParserRuleContext {
   }
 }
 F.RefExprContext = j9;
-class eS extends ye.ParserRuleContext {
+class e4 extends ye.ParserRuleContext {
   taggedRef() {
     return this.tryGetRuleContext(0, tb);
   }
@@ -34875,7 +34880,7 @@ class eS extends ye.ParserRuleContext {
     return e.visitCollectionMember ? e.visitCollectionMember(this) : e.visitChildren(this);
   }
 }
-F.CollectionMemberContext = eS;
+F.CollectionMemberContext = e4;
 class ql extends ye.ParserRuleContext {
   fieldName(e) {
     return e === void 0 ? this.getRuleContexts(as) : this.getRuleContext(e, as);
@@ -35671,7 +35676,7 @@ class he extends Q3e.Parser {
   }
   // @RuleVersion(0)
   identifier() {
-    let e = new tS(this._ctx, this.state);
+    let e = new t4(this._ctx, this.state);
     this.enterRule(e, 6, he.RULE_identifier);
     let n;
     try {
@@ -35737,7 +35742,7 @@ class he extends Q3e.Parser {
   }
   // @RuleVersion(0)
   arrayElement() {
-    let e = new nS(this._ctx, this.state);
+    let e = new n4(this._ctx, this.state);
     this.enterRule(e, 12, he.RULE_arrayElement);
     let n;
     try {
@@ -36101,7 +36106,7 @@ class sb extends _a.ParserRuleContext {
   }
 }
 Rt.StringContext = sb;
-class tS extends _a.ParserRuleContext {
+class t4 extends _a.ParserRuleContext {
   BQ_STRING() {
     return this.tryGetToken(he.BQ_STRING, 0);
   }
@@ -36120,10 +36125,10 @@ class tS extends _a.ParserRuleContext {
     return e.visitIdentifier ? e.visitIdentifier(this) : e.visitChildren(this);
   }
 }
-Rt.IdentifierContext = tS;
+Rt.IdentifierContext = t4;
 class ad extends _a.ParserRuleContext {
   identifier(e) {
-    return e === void 0 ? this.getRuleContexts(tS) : this.getRuleContext(e, tS);
+    return e === void 0 ? this.getRuleContexts(t4) : this.getRuleContext(e, t4);
   }
   DOT(e) {
     return e === void 0 ? this.getTokens(he.DOT) : this.getToken(he.DOT, e);
@@ -36164,7 +36169,7 @@ class z9 extends _a.ParserRuleContext {
   }
 }
 Rt.EqValueContext = z9;
-class nS extends _a.ParserRuleContext {
+class n4 extends _a.ParserRuleContext {
   string() {
     return this.tryGetRuleContext(0, sb);
   }
@@ -36189,7 +36194,7 @@ class nS extends _a.ParserRuleContext {
     return e.visitArrayElement ? e.visitArrayElement(this) : e.visitChildren(this);
   }
 }
-Rt.ArrayElementContext = nS;
+Rt.ArrayElementContext = n4;
 class ob extends _a.ParserRuleContext {
   RF_BEG() {
     return this.getToken(he.RF_BEG, 0);
@@ -36218,7 +36223,7 @@ class ub extends _a.ParserRuleContext {
     return this.getToken(he.AR_BEG, 0);
   }
   arrayElement(e) {
-    return e === void 0 ? this.getRuleContexts(nS) : this.getRuleContext(e, nS);
+    return e === void 0 ? this.getRuleContexts(n4) : this.getRuleContext(e, n4);
   }
   AR_END() {
     return this.getToken(he.AR_END, 0);
@@ -39024,7 +39029,7 @@ function JX(t, e, n, r) {
     evalSpace: (0, Tn.mergeEvalSpaces)(i.evalSpace, s.evalSpace)
   } : (e.log(`Non numeric('${i.dataType},${s.dataType}') value with '${n}'`), (0, Xh.errorFor)("numbers required"));
 }
-function eSe(t, e, n, r) {
+function e4e(t, e, n, r) {
   const i = e.getExpression(t), s = r.getExpression(t), o = vy(e, i, r, s);
   if (o)
     return o;
@@ -39050,7 +39055,7 @@ function ZX(t, e, n, r) {
   if ((0, Qve.isComparison)(n))
     return Jve(t, e, n, r);
   if (MO(n, "+", "-"))
-    return eSe(t, e, n, r);
+    return e4e(t, e, n, r);
   if (MO(n, "*", "%"))
     return JX(t, e, n, r);
   if (MO(n, "/")) {
@@ -39106,10 +39111,10 @@ function vy(t, e, n, r) {
 }
 Object.defineProperty(u1, "__esModule", { value: !0 });
 u1.BinaryBoolean = void 0;
-const Vj = ne, tSe = _r, nSe = cn, rSe = pt, iSe = yn;
-class sSe extends rSe.ExpressionDef {
+const Vj = ne, t4e = _r, n4e = cn, r4e = pt, i4e = yn;
+class s4e extends r4e.ExpressionDef {
   constructor(e, n, r) {
-    super({ left: e, right: r }), this.left = e, this.op = n, this.right = r, this.elementType = "abstract boolean binary", this.legalChildTypes = [nSe.FT.boolT];
+    super({ left: e, right: r }), this.left = e, this.op = n, this.right = r, this.elementType = "abstract boolean binary", this.legalChildTypes = [n4e.FT.boolT];
   }
   getExpression(e) {
     const n = this.left.getExpression(e), r = this.right.getExpression(e);
@@ -39119,16 +39124,16 @@ class sSe extends rSe.ExpressionDef {
         dataType: "boolean",
         expressionType: (0, Vj.maxExpressionType)(n.expressionType, r.expressionType),
         evalSpace: i,
-        value: (0, iSe.compose)(n.value, this.op, r.value)
+        value: (0, i4e.compose)(n.value, this.op, r.value)
       };
     }
-    return (0, tSe.errorFor)("logial required boolean");
+    return (0, t4e.errorFor)("logial required boolean");
   }
 }
-u1.BinaryBoolean = sSe;
+u1.BinaryBoolean = s4e;
 Object.defineProperty(Ey, "__esModule", { value: !0 });
 Ey.ExprCompare = void 0;
-const Wt = cn, oSe = u1, uSe = {
+const Wt = cn, o4e = u1, u4e = {
   "~": [Wt.FT.stringT],
   "!~": [Wt.FT.stringT],
   "<": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT],
@@ -39138,20 +39143,20 @@ const Wt = cn, oSe = u1, uSe = {
   ">=": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT],
   ">": [Wt.FT.numberT, Wt.FT.stringT, Wt.FT.dateT, Wt.FT.timestampT]
 };
-class aSe extends oSe.BinaryBoolean {
+class a4e extends o4e.BinaryBoolean {
   constructor(e, n, r) {
-    super(e, n, r), this.elementType = "a<=>b", this.legalChildTypes = uSe[n];
+    super(e, n, r), this.elementType = "a<=>b", this.legalChildTypes = u4e[n];
   }
   getExpression(e) {
     return this.right.apply(e, this.op, this.left);
   }
 }
-Ey.ExprCompare = aSe;
+Ey.ExprCompare = a4e;
 var Sy = {}, l1 = {};
 Object.defineProperty(l1, "__esModule", { value: !0 });
 l1.ExprTime = void 0;
-const lSe = ne, cSe = yn, fSe = pt;
-class K9 extends fSe.ExpressionDef {
+const l4e = ne, c4e = yn, f4e = pt;
+class K9 extends f4e.ExpressionDef {
   constructor(e, n, r = "scalar") {
     super(), this.elementType = "timestampOrDate", this.elementType = e, this.translationValue = {
       dataType: e,
@@ -39173,7 +39178,7 @@ class K9 extends fSe.ExpressionDef {
         dstType: e,
         expr: n.value
       };
-      (0, lSe.isTimeFieldType)(n.dataType) && (i.srcType = n.dataType), r = (0, cSe.compressExpr)([i]);
+      (0, l4e.isTimeFieldType)(n.dataType) && (i.srcType = n.dataType), r = (0, c4e.compressExpr)([i]);
     }
     return new K9(e, r, n.expressionType);
   }
@@ -39182,8 +39187,8 @@ l1.ExprTime = K9;
 var Oc = {};
 Object.defineProperty(Oc, "__esModule", { value: !0 });
 Oc.Range = void 0;
-const Yj = ne, xSe = _r, dSe = pt, hSe = yn;
-class pSe extends dSe.ExpressionDef {
+const Yj = ne, x4e = _r, d4e = pt, h4e = yn;
+class p4e extends d4e.ExpressionDef {
   constructor(e, n) {
     super({ first: e, last: n }), this.first = e, this.last = n, this.elementType = "range";
   }
@@ -39196,7 +39201,7 @@ class pSe extends dSe.ExpressionDef {
           dataType: "boolean",
           expressionType: (0, Yj.maxExpressionType)(u.expressionType, a.expressionType),
           evalSpace: (0, Yj.mergeEvalSpaces)(u.evalSpace, a.evalSpace),
-          value: (0, hSe.compose)(u.value, s, a.value)
+          value: (0, h4e.compose)(u.value, s, a.value)
         };
       }
       case ">":
@@ -39213,14 +39218,14 @@ class pSe extends dSe.ExpressionDef {
   requestExpression(e) {
   }
   getExpression(e) {
-    return this.log("A Range is not a value"), (0, xSe.errorFor)("a range is not a value");
+    return this.log("A Range is not a value"), (0, x4e.errorFor)("a range is not a value");
   }
 }
-Oc.Range = pSe;
+Oc.Range = p4e;
 Object.defineProperty(Sy, "__esModule", { value: !0 });
 Sy.ExprGranularTime = void 0;
-const jO = ne, gSe = _r, Kj = cn, Xj = bn, mSe = pt, KE = l1, Jj = Oc;
-class ySe extends mSe.ExpressionDef {
+const jO = ne, g4e = _r, Kj = cn, Xj = bn, m4e = pt, KE = l1, Jj = Oc;
+class y4e extends m4e.ExpressionDef {
   constructor(e, n, r) {
     super({ expr: e }), this.expr = e, this.units = n, this.truncate = r, this.elementType = "granularTime", this.legalChildTypes = [Kj.FT.timestampT, Kj.FT.dateT];
   }
@@ -39249,7 +39254,7 @@ class ySe extends mSe.ExpressionDef {
     return {
       ...r,
       dataType: i,
-      value: (0, gSe.errorFor)("granularity typecheck").value,
+      value: (0, g4e.errorFor)("granularity typecheck").value,
       evalSpace: "constant"
     };
   }
@@ -39278,55 +39283,55 @@ class ySe extends mSe.ExpressionDef {
     return new Jj.Range(r, s);
   }
 }
-Sy.ExprGranularTime = ySe;
+Sy.ExprGranularTime = y4e;
 Object.defineProperty(Eb, "__esModule", { value: !0 });
 Eb.Apply = void 0;
-const ESe = K0, ASe = Ey, vSe = a1, Zj = Sy;
-class SSe extends ASe.ExprCompare {
+const E4e = K0, A4e = Ey, v4e = a1, Zj = Sy;
+class S4e extends A4e.ExprCompare {
   constructor(e, n) {
-    super(e, ESe.Comparison.EqualTo, n), this.left = e, this.right = n, this.elementType = "apply";
+    super(e, E4e.Comparison.EqualTo, n), this.left = e, this.right = n, this.elementType = "apply";
   }
   getExpression(e) {
     let n = this.right;
     if (!this.right.granular()) {
       const r = this.right.requestExpression(e);
-      r && (0, vSe.isGranularResult)(r) && (n = new Zj.ExprGranularTime(this.right, r.timeframe, !1));
+      r && (0, v4e.isGranularResult)(r) && (n = new Zj.ExprGranularTime(this.right, r.timeframe, !1));
     }
     return n instanceof Zj.ExprGranularTime ? n.toRange(e).apply(e, this.op, this.left) : super.getExpression(e);
   }
 }
-Eb.Apply = SSe;
+Eb.Apply = S4e;
 var c1 = {};
 Object.defineProperty(c1, "__esModule", { value: !0 });
 c1.BinaryNumeric = void 0;
-const _Se = cn, CSe = pt;
-class bSe extends CSe.ExpressionDef {
+const _4e = cn, C4e = pt;
+class b4e extends C4e.ExpressionDef {
   constructor(e, n, r) {
-    super({ left: e, right: r }), this.left = e, this.op = n, this.right = r, this.elementType = "numeric binary abstract", this.legalChildTypes = [_Se.FT.numberT];
+    super({ left: e, right: r }), this.left = e, this.op = n, this.right = r, this.elementType = "numeric binary abstract", this.legalChildTypes = [_4e.FT.numberT];
   }
   getExpression(e) {
     return this.right.apply(e, this.op, this.left);
   }
 }
-c1.BinaryNumeric = bSe;
+c1.BinaryNumeric = b4e;
 var Ab = {};
 Object.defineProperty(Ab, "__esModule", { value: !0 });
 Ab.Boolean = void 0;
-const TSe = pt, RSe = cn;
-let OSe = class extends TSe.ExpressionDef {
+const T4e = pt, R4e = cn;
+let O4e = class extends T4e.ExpressionDef {
   constructor(e) {
     super(), this.value = e, this.elementType = "boolean literal";
   }
   getExpression() {
-    return { ...RSe.FT.boolT, value: [this.value] };
+    return { ...R4e.FT.boolT, value: [this.value] };
   }
 };
-Ab.Boolean = OSe;
+Ab.Boolean = O4e;
 var X0 = {}, f1 = {};
 Object.defineProperty(f1, "__esModule", { value: !0 });
 f1.ExprIdReference = void 0;
-const UO = ne, NSe = _r, DSe = zu, FSe = pt;
-class wSe extends FSe.ExpressionDef {
+const UO = ne, N4e = _r, D4e = zu, F4e = pt;
+class w4e extends F4e.ExpressionDef {
   constructor(e) {
     super(), this.fieldReference = e, this.elementType = "ExpressionIdReference", this.has({ fieldPath: e });
   }
@@ -39346,11 +39351,11 @@ class wSe extends FSe.ExpressionDef {
       const i = [{ type: n.found.refType, path: this.fieldReference.path }], s = (0, UO.expressionIsAggregate)(r.expressionType) ? "output" : r.evalSpace;
       return { ...r, value: i, evalSpace: s };
     }
-    return this.log(n.error), (0, NSe.errorFor)(n.error);
+    return this.log(n.error), (0, N4e.errorFor)(n.error);
   }
   apply(e, n, r) {
     const i = this.fieldReference.getField(e).found;
-    if (i instanceof DSe.SpaceParam) {
+    if (i instanceof D4e.SpaceParam) {
       const s = i.parameter();
       if ((0, UO.isConditionParameter)(s)) {
         const o = r.getExpression(e);
@@ -39372,11 +39377,11 @@ class wSe extends FSe.ExpressionDef {
     return super.apply(e, n, r);
   }
 }
-f1.ExprIdReference = wSe;
+f1.ExprIdReference = w4e;
 Object.defineProperty(X0, "__esModule", { value: !0 });
 X0.FunctionOrdering = X0.FunctionOrderBy = void 0;
-const qO = ne, eJ = Ve, LSe = f1;
-class ISe extends eJ.MalloyElement {
+const qO = ne, eJ = Ve, L4e = f1;
+class I4e extends eJ.MalloyElement {
   constructor(e, n) {
     super(), this.field = e, this.dir = n, this.elementType = "orderBy", e && this.has({ field: e });
   }
@@ -39384,7 +39389,7 @@ class ISe extends eJ.MalloyElement {
     if (!this.field)
       return this.log("analytic `order_by` must specify an aggregate expression or output field reference"), { e: ["error"], dir: this.dir };
     const n = this.field.getExpression(e);
-    return (0, qO.expressionIsAggregate)(n.expressionType) || ((0, qO.expressionIsScalar)(n.expressionType) ? (!(this.field instanceof LSe.ExprIdReference) || n.evalSpace === "input") && this.field.log("analytic `order_by` must be an aggregate or an output field reference") : this.field.log("analytic `order_by` must be scalar or aggregate")), { e: n.value, dir: this.dir };
+    return (0, qO.expressionIsAggregate)(n.expressionType) || ((0, qO.expressionIsScalar)(n.expressionType) ? (!(this.field instanceof L4e.ExprIdReference) || n.evalSpace === "input") && this.field.log("analytic `order_by` must be an aggregate or an output field reference") : this.field.log("analytic `order_by` must be scalar or aggregate")), { e: n.value, dir: this.dir };
   }
   getAggregateOrderBy(e, n) {
     if (this.field) {
@@ -39394,8 +39399,8 @@ class ISe extends eJ.MalloyElement {
       return this.dir === void 0 ? (this.log("field or order direction must be specified"), { e: void 0, dir: "asc" }) : { e: void 0, dir: this.dir };
   }
 }
-X0.FunctionOrderBy = ISe;
-class $Se extends eJ.ListOf {
+X0.FunctionOrderBy = I4e;
+class $4e extends eJ.ListOf {
   constructor(e) {
     super(e), this.elementType = "function-ordering";
   }
@@ -39406,22 +39411,22 @@ class $Se extends eJ.ListOf {
     return this.list.map((r) => r.getAggregateOrderBy(e, n));
   }
 }
-X0.FunctionOrdering = $Se;
+X0.FunctionOrdering = $4e;
 var vb = {};
 Object.defineProperty(vb, "__esModule", { value: !0 });
 vb.ExprAddSub = void 0;
-const BSe = c1;
-class kSe extends BSe.BinaryNumeric {
+const B4e = c1;
+class k4e extends B4e.BinaryNumeric {
   constructor() {
     super(...arguments), this.elementType = "+-";
   }
 }
-vb.ExprAddSub = kSe;
+vb.ExprAddSub = k4e;
 var Hl = {}, gt = {}, _y = {};
 Object.defineProperty(_y, "__esModule", { value: !0 });
 _y.ReferenceField = void 0;
 const eU = ui;
-class PSe extends eU.SpaceField {
+class P4e extends eU.SpaceField {
   constructor(e, n) {
     super(), this.fieldRef = e, this.inFS = n, this.didLookup = !1;
   }
@@ -39453,12 +39458,12 @@ class PSe extends eU.SpaceField {
     return e ? (this.memoTypeDesc = e.typeDesc(), this.memoTypeDesc) : { dataType: "error", expressionType: "scalar", evalSpace: "input" };
   }
 }
-_y.ReferenceField = PSe;
+_y.ReferenceField = P4e;
 var Vn = {};
 Object.defineProperty(Vn, "__esModule", { value: !0 });
 Vn.typecheckGroupBy = Vn.typecheckAggregate = Vn.typecheckCalculate = Vn.typecheckDeclare = Vn.typecheckMeasure = Vn.typecheckDimension = Vn.typecheckIndex = Vn.typecheckProject = void 0;
 const Nn = ca;
-function MSe(t, e) {
+function M4e(t, e) {
   if (t.dataType === "turtle" || !(0, Nn.expressionIsScalar)(t.expressionType)) {
     let n, r;
     if (t.dataType === "turtle")
@@ -39472,8 +39477,8 @@ function MSe(t, e) {
     e.log(`Cannot use ${r} field in a select operation, did you mean to use ${n} operation instead?`);
   }
 }
-Vn.typecheckProject = MSe;
-function jSe(t, e) {
+Vn.typecheckProject = M4e;
+function j4e(t, e) {
   if (t.dataType === "turtle" || !(0, Nn.expressionIsScalar)(t.expressionType)) {
     let n;
     if (t.dataType === "turtle")
@@ -39487,8 +39492,8 @@ function jSe(t, e) {
     e.log(`Cannot use ${n} field in an index operation`);
   }
 }
-Vn.typecheckIndex = jSe;
-function USe(t, e) {
+Vn.typecheckIndex = j4e;
+function U4e(t, e) {
   if (!(0, Nn.expressionIsScalar)(t.expressionType))
     if ((0, Nn.expressionIsAggregate)(t.expressionType))
       e.log("Cannot use an aggregate field in a dimension declaration, did you mean to use a measure declaration instead?");
@@ -39497,8 +39502,8 @@ function USe(t, e) {
     else
       throw new Error(`Unexpected expression type ${t.expressionType} not handled here`);
 }
-Vn.typecheckDimension = USe;
-function qSe(t, e) {
+Vn.typecheckDimension = U4e;
+function q4e(t, e) {
   if (!(0, Nn.expressionIsAggregate)(t.expressionType))
     if ((0, Nn.expressionIsScalar)(t.expressionType))
       e.log("Cannot use a scalar field in a measure declaration, did you mean to use a dimension declaration instead?");
@@ -39507,12 +39512,12 @@ function qSe(t, e) {
     else
       throw new Error(`Unexpected expression type ${t.expressionType} not handled here`);
 }
-Vn.typecheckMeasure = qSe;
-function zSe(t, e) {
+Vn.typecheckMeasure = q4e;
+function z4e(t, e) {
   t.dataType === "turtle" ? e.log("Query fields cannot be used in a declare block") : (0, Nn.expressionIsAnalytic)(t.expressionType) && e.log("Analytic expressions can not be used in a declare block");
 }
-Vn.typecheckDeclare = zSe;
-function HSe(t, e) {
+Vn.typecheckDeclare = z4e;
+function H4e(t, e) {
   if (t.dataType === "turtle" || !(0, Nn.expressionIsAnalytic)(t.expressionType)) {
     let n, r;
     if (t.dataType === "turtle")
@@ -39526,8 +39531,8 @@ function HSe(t, e) {
     e.log(`Cannot use ${r} field in a calculate operation, did you mean to use ${n} operation instead?`);
   }
 }
-Vn.typecheckCalculate = HSe;
-function QSe(t, e) {
+Vn.typecheckCalculate = H4e;
+function Q4e(t, e) {
   if (t.dataType === "turtle" || !(0, Nn.expressionIsAggregate)(t.expressionType)) {
     let n, r;
     if (t.dataType === "turtle")
@@ -39541,8 +39546,8 @@ function QSe(t, e) {
     e.log(`Cannot use ${r} field in an aggregate operation, did you mean to use ${n} operation instead?`);
   }
 }
-Vn.typecheckAggregate = QSe;
-function GSe(t, e) {
+Vn.typecheckAggregate = Q4e;
+function G4e(t, e) {
   if (t.dataType === "turtle" || !(0, Nn.expressionIsScalar)(t.expressionType)) {
     let n, r;
     if (t.dataType === "turtle")
@@ -39556,10 +39561,10 @@ function GSe(t, e) {
     e.log(`Cannot use ${r} field in a group_by operation, did you mean to use ${n} operation instead?`);
   }
 }
-Vn.typecheckGroupBy = GSe;
+Vn.typecheckGroupBy = G4e;
 Object.defineProperty(gt, "__esModule", { value: !0 });
 gt.FieldReferences = gt.WildcardFieldReference = gt.ViewOrScalarFieldReference = gt.DimensionFieldReference = gt.MeasureFieldReference = gt.DeclareFieldReference = gt.ProjectFieldReference = gt.GroupByFieldReference = gt.AggregateFieldReference = gt.IndexFieldReference = gt.CalculateFieldReference = gt.PartitionByFieldReference = gt.ExpressionFieldReference = gt.AcceptExceptFieldReference = gt.FieldReference = void 0;
-const WSe = _y, VSe = Hs, tJ = Ve, nJ = Xr, Nc = Vn;
+const W4e = _y, V4e = Hs, tJ = Ve, nJ = Xr, Nc = Vn;
 class Qs extends tJ.ListOf {
   constructor(e) {
     super(e), this.isNoteableObj = !0, this.extendNote = nJ.extendNoteMethod;
@@ -39570,7 +39575,7 @@ class Qs extends tJ.ListOf {
       this.log(`Output already has a field named '${n}'`);
     else {
       const r = e.isQueryFieldSpace() ? e.inputSpace() : e;
-      e.newEntry(n, this, new WSe.ReferenceField(this, r));
+      e.newEntry(n, this, new W4e.ReferenceField(this, r));
     }
   }
   get refToField() {
@@ -39605,7 +39610,7 @@ class Qs extends tJ.ListOf {
   }
 }
 gt.FieldReference = Qs;
-class YSe extends Qs {
+class Y4e extends Qs {
   constructor() {
     super(...arguments), this.elementType = "acceptExceptFieldReference";
   }
@@ -39613,8 +39618,8 @@ class YSe extends Qs {
   typecheck() {
   }
 }
-gt.AcceptExceptFieldReference = YSe;
-class KSe extends Qs {
+gt.AcceptExceptFieldReference = Y4e;
+class K4e extends Qs {
   constructor() {
     super(...arguments), this.elementType = "expressionFieldReference";
   }
@@ -39622,8 +39627,8 @@ class KSe extends Qs {
   typecheck() {
   }
 }
-gt.ExpressionFieldReference = KSe;
-class XSe extends Qs {
+gt.ExpressionFieldReference = K4e;
+class X4e extends Qs {
   constructor() {
     super(...arguments), this.elementType = "partitionByFieldReference";
   }
@@ -39631,8 +39636,8 @@ class XSe extends Qs {
   typecheck() {
   }
 }
-gt.PartitionByFieldReference = XSe;
-class JSe extends Qs {
+gt.PartitionByFieldReference = X4e;
+class J4e extends Qs {
   constructor() {
     super(...arguments), this.elementType = "calculateFieldReference";
   }
@@ -39640,7 +39645,7 @@ class JSe extends Qs {
     (0, Nc.typecheckCalculate)(e, this);
   }
 }
-gt.CalculateFieldReference = JSe;
+gt.CalculateFieldReference = J4e;
 class X9 extends Qs {
   constructor() {
     super(...arguments), this.elementType = "indexFieldReference";
@@ -39657,7 +39662,7 @@ class X9 extends Qs {
   }
 }
 gt.IndexFieldReference = X9;
-class ZSe extends Qs {
+class Z4e extends Qs {
   constructor() {
     super(...arguments), this.elementType = "aggregateFieldReference";
   }
@@ -39665,8 +39670,8 @@ class ZSe extends Qs {
     (0, Nc.typecheckAggregate)(e, this);
   }
 }
-gt.AggregateFieldReference = ZSe;
-class e4e extends Qs {
+gt.AggregateFieldReference = Z4e;
+class eSe extends Qs {
   constructor() {
     super(...arguments), this.elementType = "groupByFieldReference";
   }
@@ -39674,8 +39679,8 @@ class e4e extends Qs {
     (0, Nc.typecheckGroupBy)(e, this);
   }
 }
-gt.GroupByFieldReference = e4e;
-class t4e extends Qs {
+gt.GroupByFieldReference = eSe;
+class tSe extends Qs {
   constructor() {
     super(...arguments), this.elementType = "projectFieldReference";
   }
@@ -39683,8 +39688,8 @@ class t4e extends Qs {
     (0, Nc.typecheckProject)(e, this);
   }
 }
-gt.ProjectFieldReference = t4e;
-class n4e extends Qs {
+gt.ProjectFieldReference = tSe;
+class nSe extends Qs {
   constructor() {
     super(...arguments), this.elementType = "declareFieldReference";
   }
@@ -39692,8 +39697,8 @@ class n4e extends Qs {
     (0, Nc.typecheckDeclare)(e, this);
   }
 }
-gt.DeclareFieldReference = n4e;
-class r4e extends Qs {
+gt.DeclareFieldReference = nSe;
+class rSe extends Qs {
   constructor() {
     super(...arguments), this.elementType = "measureFieldReference";
   }
@@ -39701,8 +39706,8 @@ class r4e extends Qs {
     (0, Nc.typecheckMeasure)(e, this);
   }
 }
-gt.MeasureFieldReference = r4e;
-class i4e extends Qs {
+gt.MeasureFieldReference = rSe;
+class iSe extends Qs {
   constructor() {
     super(...arguments), this.elementType = "dimensionFieldReference";
   }
@@ -39710,16 +39715,16 @@ class i4e extends Qs {
     (0, Nc.typecheckDimension)(e, this);
   }
 }
-gt.DimensionFieldReference = i4e;
-class s4e extends Qs {
+gt.DimensionFieldReference = iSe;
+class sSe extends Qs {
   constructor() {
     super(...arguments), this.elementType = "viewOrScalarFieldReference";
   }
   typecheck(e) {
   }
 }
-gt.ViewOrScalarFieldReference = s4e;
-class o4e extends tJ.MalloyElement {
+gt.ViewOrScalarFieldReference = sSe;
+class oSe extends tJ.MalloyElement {
   constructor(e) {
     super(), this.joinPath = e, this.elementType = "wildcardFieldReference", this.isNoteableObj = !0, this.extendNote = nJ.extendNoteMethod, this.except = /* @__PURE__ */ new Set(), this.has({ joinPath: e });
   }
@@ -39730,19 +39735,19 @@ class o4e extends tJ.MalloyElement {
     return this.joinPath ? `${this.joinPath.refString}.*` : "*";
   }
 }
-gt.WildcardFieldReference = o4e;
-class u4e extends VSe.DefinitionList {
+gt.WildcardFieldReference = oSe;
+class uSe extends V4e.DefinitionList {
   constructor(e) {
     super(e), this.elementType = "fieldReferenceList";
   }
 }
-gt.FieldReferences = u4e;
+gt.FieldReferences = uSe;
 Object.defineProperty(Hl, "__esModule", { value: !0 });
 Hl.ExprAggregateFunction = void 0;
-const tU = ne, a4e = Yt, Xp = _r, l4e = ii, c4e = ld, f4e = cn, x4e = gt, d4e = pt, h4e = ui, p4e = f1;
-class g4e extends d4e.ExpressionDef {
+const tU = ne, aSe = Yt, Xp = _r, lSe = ii, cSe = ld, fSe = cn, xSe = gt, dSe = pt, hSe = ui, pSe = f1;
+class gSe extends dSe.ExpressionDef {
   constructor(e, n, r) {
-    super(), this.func = e, this.legalChildTypes = [f4e.FT.numberT], this.elementType = e, this.explicitSource = r, n && (this.expr = n, this.has({ expr: n }));
+    super(), this.func = e, this.legalChildTypes = [fSe.FT.numberT], this.elementType = e, this.explicitSource = r, n && (this.expr = n, this.has({ expr: n }));
   }
   returns(e) {
     return "number";
@@ -39772,8 +39777,8 @@ class g4e extends d4e.ExpressionDef {
             evalSpace: x.evalSpace
           }, u = this.source.path;
           const h = this.getJoinUsage(i);
-          (h.length === 1 || h.length > 1 && h.slice(1).every((m) => m4e(m, h[0]))) && (u = h[0].map((m) => m.name), a = h[0]);
-        } else if (!(f instanceof c4e.StructSpaceFieldBase))
+          (h.length === 1 || h.length > 1 && h.slice(1).every((m) => mSe(m, h[0]))) && (u = h[0].map((m) => m.name), a = h[0]);
+        } else if (!(f instanceof cSe.StructSpaceFieldBase))
           return this.log(`Aggregate source cannot be a ${x.dataType}`), (0, Xp.errorFor)(`Aggregate source cannot be a ${x.dataType}`);
       } else
         return this.log(`Reference to undefined value ${this.source.refString}`), (0, Xp.errorFor)(`Reference to undefined value ${this.source.refString}`);
@@ -39787,7 +39792,7 @@ class g4e extends d4e.ExpressionDef {
       if (s && !(!this.source && c.every((h) => h.length === 0)) && !this.isSymmetricFunction()) {
         const h = rD(a, c), p = iD(this.elementType, h), m = f ? p : "Join path is required for this calculation";
         if (m) {
-          const g = y4e(m, c, s, this.elementType);
+          const g = ySe(m, c, s, this.elementType);
           this.log(g, p ? "error" : "warn");
         }
       }
@@ -39826,8 +39831,8 @@ class g4e extends d4e.ExpressionDef {
     return n;
   }
 }
-Hl.ExprAggregateFunction = g4e;
-function m4e(t, e) {
+Hl.ExprAggregateFunction = gSe;
+function mSe(t, e) {
   let n = t.length;
   if (n !== e.length)
     return !1;
@@ -39841,7 +39846,7 @@ function nD(t, e) {
     const o = s[0], u = s.slice(1), a = i.entry(o);
     if (a === void 0)
       throw new Error(`Invalid field lookup ${o}`);
-    if (a instanceof l4e.StructSpaceField && u.length > 0) {
+    if (a instanceof lSe.StructSpaceField && u.length > 0) {
       const l = r(a.fieldSpace, u);
       return {
         ...l,
@@ -39850,7 +39855,7 @@ function nD(t, e) {
           ...l.relationship
         ]
       };
-    } else if (a instanceof h4e.SpaceField) {
+    } else if (a instanceof hSe.SpaceField) {
       if (u.length !== 0)
         throw new Error(`${o} cannot contain a ${u.join(".")}`);
       const l = a.fieldDef();
@@ -39864,7 +39869,7 @@ function nD(t, e) {
     } else
       throw new Error("expected a field def or struct");
   };
-  return (0, a4e.exprWalk)(e, (i) => {
+  return (0, aSe.exprWalk)(e, (i) => {
     if (typeof i != "string") {
       if (i.type === "field") {
         const s = r(t, i.path);
@@ -39908,7 +39913,7 @@ function iD(t, e) {
         return `Cannot compute \`${t}\` across repeated relationship \`${r.name}\``;
     }
 }
-function y4e(t, e, n, r) {
+function ySe(t, e, n, r) {
   if (e.length === 0)
     return t;
   let i = e[0];
@@ -39924,7 +39929,7 @@ function y4e(t, e, n, r) {
   if (o)
     return "Aggregated dimensional expression contains multiple join paths; rewrite, for example `sum(first_join.field + second_join.field)` as `first_join.field.sum() + second_join.field.sum()`";
   {
-    const p = n instanceof x4e.FieldReference ? `${n.refString}.${r}()` : n instanceof p4e.ExprIdReference ? `${n.fieldReference.refString}.${r}()` : `${x}.${r}(${n.code})`, m = `${h}.${r}(${n.code})`;
+    const p = n instanceof xSe.FieldReference ? `${n.refString}.${r}()` : n instanceof pSe.ExprIdReference ? `${n.fieldReference.refString}.${r}()` : `${x}.${r}(${n.code})`, m = `${h}.${r}(${n.code})`;
     let g = `${t}; use \`${p}\``;
     return f === void 0 && h !== x && (g += ` or \`${m}\` to get a result weighted with respect to \`${h}\``), g;
   }
@@ -39932,8 +39937,8 @@ function y4e(t, e, n, r) {
 var Sb = {};
 Object.defineProperty(Sb, "__esModule", { value: !0 });
 Sb.ExprAlternationTree = void 0;
-const nU = ne, E4e = _r, A4e = u1, v4e = yn;
-class S4e extends A4e.BinaryBoolean {
+const nU = ne, ESe = _r, ASe = u1, vSe = yn;
+class SSe extends ASe.BinaryBoolean {
   constructor(e, n, r) {
     super(e, n, r), this.elementType = "alternation", this.elementType = `${n}alternation${n}`;
   }
@@ -39943,21 +39948,21 @@ class S4e extends A4e.BinaryBoolean {
       dataType: "boolean",
       expressionType: (0, nU.maxExpressionType)(i.expressionType, s.expressionType),
       evalSpace: (0, nU.mergeEvalSpaces)(i.evalSpace, s.evalSpace),
-      value: (0, v4e.compose)(i.value, this.op === "&" ? "and" : "or", s.value)
+      value: (0, vSe.compose)(i.value, this.op === "&" ? "and" : "or", s.value)
     };
   }
   requestExpression(e) {
   }
   getExpression(e) {
-    return this.log("Alternation tree has no value"), (0, E4e.errorFor)("no value from alternation tree");
+    return this.log("Alternation tree has no value"), (0, ESe.errorFor)("no value from alternation tree");
   }
 }
-Sb.ExprAlternationTree = S4e;
+Sb.ExprAlternationTree = SSe;
 var x1 = {};
 Object.defineProperty(x1, "__esModule", { value: !0 });
 x1.ExprAsymmetric = void 0;
-const _4e = Hl;
-class C4e extends _4e.ExprAggregateFunction {
+const _Se = Hl;
+class CSe extends _Se.ExprAggregateFunction {
   constructor(e, n, r, i) {
     super(e, n, i), this.func = e, this.expr = n, this.source = r, this.has({ source: r });
   }
@@ -39976,22 +39981,22 @@ class C4e extends _4e.ExprAggregateFunction {
     }
   }
 }
-x1.ExprAsymmetric = C4e;
+x1.ExprAsymmetric = CSe;
 var _b = {};
 Object.defineProperty(_b, "__esModule", { value: !0 });
 _b.ExprAvg = void 0;
-const b4e = x1;
-class T4e extends b4e.ExprAsymmetric {
+const bSe = x1;
+class TSe extends bSe.ExprAsymmetric {
   constructor(e, n, r) {
     super("avg", e, n, r), this.has({ source: n });
   }
 }
-_b.ExprAvg = T4e;
+_b.ExprAvg = TSe;
 var Cb = {};
 Object.defineProperty(Cb, "__esModule", { value: !0 });
 Cb.ExprCast = void 0;
-const R4e = bn, O4e = pt, N4e = yn;
-class D4e extends O4e.ExpressionDef {
+const RSe = bn, OSe = pt, NSe = yn;
+class DSe extends OSe.ExpressionDef {
   constructor(e, n, r = !1) {
     super({ expr: e }), this.expr = e, this.castType = n, this.safe = r, this.elementType = "cast";
   }
@@ -40008,17 +40013,17 @@ class D4e extends O4e.ExpressionDef {
     return {
       dataType: o,
       expressionType: s.expressionType,
-      value: (0, N4e.compressExpr)((0, R4e.castTo)(this.castType, s.value, s.dataType, this.safe)),
+      value: (0, NSe.compressExpr)((0, RSe.castTo)(this.castType, s.value, s.dataType, this.safe)),
       evalSpace: s.evalSpace
     };
   }
 }
-Cb.ExprCast = D4e;
+Cb.ExprCast = DSe;
 var bb = {};
 Object.defineProperty(bb, "__esModule", { value: !0 });
 bb.ExprCoalesce = void 0;
-const zO = ca, rU = cn, F4e = pt;
-class w4e extends F4e.ExpressionDef {
+const zO = ca, rU = cn, FSe = pt;
+class wSe extends FSe.ExpressionDef {
   constructor(e, n) {
     super({ expr: e, altExpr: n }), this.expr = e, this.altExpr = n, this.elementType = "coalesce expression", this.legalChildTypes = rU.FT.anyAtomicT;
   }
@@ -40033,12 +40038,12 @@ class w4e extends F4e.ExpressionDef {
     });
   }
 }
-bb.ExprCoalesce = w4e;
+bb.ExprCoalesce = wSe;
 var Tb = {};
 Object.defineProperty(Tb, "__esModule", { value: !0 });
 Tb.ExprCount = void 0;
-const L4e = Hl;
-class I4e extends L4e.ExprAggregateFunction {
+const LSe = Hl;
+class ISe extends LSe.ExprAggregateFunction {
   constructor(e) {
     super("count"), this.source = e, this.elementType = "count", this.has({ source: e });
   }
@@ -40060,42 +40065,42 @@ class I4e extends L4e.ExprAggregateFunction {
     };
   }
 }
-Tb.ExprCount = I4e;
+Tb.ExprCount = ISe;
 var Rb = {};
 Object.defineProperty(Rb, "__esModule", { value: !0 });
 Rb.ExprCountDistinct = void 0;
-const XE = cn, $4e = Hl;
-class B4e extends $4e.ExprAggregateFunction {
+const XE = cn, $Se = Hl;
+class BSe extends $Se.ExprAggregateFunction {
   constructor(e) {
     super("count_distinct", e), this.legalChildTypes = [XE.FT.numberT, XE.FT.stringT, XE.FT.dateT, XE.FT.timestampT];
   }
 }
-Rb.ExprCountDistinct = B4e;
+Rb.ExprCountDistinct = BSe;
 var Ob = {}, Dc = {};
 Object.defineProperty(Dc, "__esModule", { value: !0 });
 Dc.Limit = void 0;
-const k4e = Ve, P4e = Dn;
-class M4e extends k4e.MalloyElement {
+const kSe = Ve, PSe = Dn;
+class MSe extends kSe.MalloyElement {
   constructor(e) {
-    super(), this.limit = e, this.elementType = "limit", this.queryRefinementStage = P4e.LegalRefinementStage.Tail, this.forceQueryClass = void 0;
+    super(), this.limit = e, this.elementType = "limit", this.queryRefinementStage = PSe.LegalRefinementStage.Tail, this.forceQueryClass = void 0;
   }
 }
-Dc.Limit = M4e;
+Dc.Limit = MSe;
 var d1 = {};
 Object.defineProperty(d1, "__esModule", { value: !0 });
 d1.PartitionBy = void 0;
-const j4e = Ve;
-class U4e extends j4e.ListOf {
+const jSe = Ve;
+class USe extends jSe.ListOf {
   constructor(e) {
     super(e), this.partitionFields = e, this.elementType = "partition_by";
   }
 }
-d1.PartitionBy = U4e;
+d1.PartitionBy = USe;
 var Cy = {};
 Object.defineProperty(Cy, "__esModule", { value: !0 });
 Cy.ExprFunc = void 0;
-const eo = ne, Ha = _r, q4e = ld, z4e = pt, iU = yn;
-class H4e extends z4e.ExpressionDef {
+const eo = ne, Ha = _r, qSe = ld, zSe = pt, iU = yn;
+class HSe extends zSe.ExpressionDef {
   constructor(e, n, r, i, s) {
     super({ args: n }), this.name = e, this.args = n, this.isRaw = r, this.rawType = i, this.source = s, this.elementType = "function call()", this.has({ source: s });
   }
@@ -40144,7 +40149,7 @@ class H4e extends z4e.ExpressionDef {
             value: [{ type: "field", path: this.source.path }],
             evalSpace: L.evalSpace
           }, f = this.source.path.slice(0, -1);
-        else if (!(O instanceof q4e.StructSpaceFieldBase)) {
+        else if (!(O instanceof qSe.StructSpaceFieldBase)) {
           const M = `Aggregate source cannot be a ${L.dataType}`;
           return this.log(M), (0, Ha.errorFor)(M);
         }
@@ -40156,7 +40161,7 @@ class H4e extends z4e.ExpressionDef {
     const x = [
       ...c ? [c] : [],
       ...a
-    ], h = Q4e(l, x);
+    ], h = QSe(l, x);
     if (h === void 0)
       return this.log(`No matching overload for function ${this.name}(${x.map((O) => O.dataType).join(", ")})`), (0, Ha.errorFor)("no matching overload");
     const { overload: p, expressionTypeErrors: m, evalSpaceErrors: g, nullabilityErrors: y } = h;
@@ -40223,7 +40228,7 @@ class H4e extends z4e.ExpressionDef {
       if (O.length !== 1 || typeof O[0] == "string" || O[0].type !== "dialect" || O[0].function !== "stringLiteral")
         this.log(`Invalid string literal for \`${l.name}\``);
       else {
-        const L = O[0].literal, M = G4e(L), q = M.filter((W) => W.type === "interpolation" && W.name.includes(".")).map((W) => W.type === "interpolation" ? `\${${W.name}}` : `\${${W.value}}`);
+        const L = O[0].literal, M = GSe(L), q = M.filter((W) => W.type === "interpolation" && W.name.includes(".")).map((W) => W.type === "interpolation" ? `\${${W.name}}` : `\${${W.value}}`);
         if (q.length > 0) {
           const W = q.length === 1 ? `'.' paths are not yet supported in sql interpolations, found ${q.at(0)}` : `'.' paths are not yet supported in sql interpolations, found [${q.join(", ")}]`;
           return this.log(W), (0, Ha.errorFor)(`${W}. See LookML \${...} documentation at https://cloud.google.com/looker/docs/reference/param-field-sql#sql_for_dimensions`);
@@ -40247,8 +40252,8 @@ class H4e extends z4e.ExpressionDef {
     };
   }
 }
-Cy.ExprFunc = H4e;
-function Q4e(t, e) {
+Cy.ExprFunc = HSe;
+function QSe(t, e) {
   for (const n of t.overloads) {
     let r = 0, i = !0, s = !1;
     const o = [], u = [], a = [];
@@ -40295,7 +40300,7 @@ function Q4e(t, e) {
       };
   }
 }
-function G4e(t) {
+function GSe(t) {
   const e = [];
   let n = t;
   for (; n.length; ) {
@@ -40319,10 +40324,10 @@ function G4e(t) {
 }
 Object.defineProperty(Ob, "__esModule", { value: !0 });
 Ob.ExprProps = void 0;
-const W4e = ne, V4e = _r, Y4e = cn, K4e = X0, X4e = Dc, J4e = d1, Z4e = pt, e_e = Cy;
-class t_e extends Z4e.ExpressionDef {
+const WSe = ne, VSe = _r, YSe = cn, KSe = X0, XSe = Dc, JSe = d1, ZSe = pt, e_e = Cy;
+class t_e extends ZSe.ExpressionDef {
   constructor(e, n) {
-    super({ expr: e, statements: n }), this.expr = e, this.statements = n, this.elementType = "expression with props", this.legalChildTypes = Y4e.FT.anyAtomicT;
+    super({ expr: e, statements: n }), this.expr = e, this.statements = n, this.elementType = "expression with props", this.legalChildTypes = YSe.FT.anyAtomicT;
   }
   getFilteredExpression(e, n, r) {
     if (r.length > 0) {
@@ -40331,7 +40336,7 @@ class t_e extends Z4e.ExpressionDef {
       const i = [];
       for (const s of r) {
         const o = s.getFilterList(e);
-        if (o.find((u) => (0, W4e.expressionIsCalculation)(u.expressionType)))
+        if (o.find((u) => (0, WSe.expressionIsCalculation)(u.expressionType)))
           return s.log("Cannot filter an expresion with an aggregate or analytical computation"), n;
         i.push(...o);
       }
@@ -40344,7 +40349,7 @@ class t_e extends Z4e.ExpressionDef {
             filterList: i
           }
         ]
-      } : (this.expr.log(`Cannot filter '${n.dataType}' data`), (0, V4e.errorFor)("cannot filter type"));
+      } : (this.expr.log(`Cannot filter '${n.dataType}' data`), (0, VSe.errorFor)("cannot filter type"));
     }
     return n;
   }
@@ -40353,7 +40358,7 @@ class t_e extends Z4e.ExpressionDef {
     let r;
     const i = [], s = [];
     for (const u of this.statements)
-      u instanceof J4e.PartitionBy ? this.expr.canSupportPartitionBy() ? n.push(u) : u.log("`partition_by` is not supported for this kind of expression") : u instanceof X4e.Limit ? r ? u.log("limit already specified") : this.expr.canSupportLimit() ? r = u : u.log("`limit` is not supported for this kind of expression") : u instanceof K4e.FunctionOrdering ? this.expr.canSupportPartitionBy() ? i.push(u) : u.log("`order_by` is not supported for this kind of expression") : s.push(u);
+      u instanceof JSe.PartitionBy ? this.expr.canSupportPartitionBy() ? n.push(u) : u.log("`partition_by` is not supported for this kind of expression") : u instanceof XSe.Limit ? r ? u.log("limit already specified") : this.expr.canSupportLimit() ? r = u : u.log("`limit` is not supported for this kind of expression") : u instanceof KSe.FunctionOrdering ? this.expr.canSupportPartitionBy() ? i.push(u) : u.log("`order_by` is not supported for this kind of expression") : s.push(u);
     const o = this.expr instanceof e_e.ExprFunc ? this.expr.getPropsExpression(e, {
       partitionBys: n,
       limit: r,
@@ -40751,7 +40756,7 @@ var U_e = N && N.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(Qo, "__esModule", { value: !0 });
 Qo.ReduceFieldSpace = Qo.QuerySpace = Qo.QueryOperationSpace = void 0;
-const rS = z_e(ne), QO = G0, H_e = xd, Q_e = ui, G_e = gt, W_e = e1, V_e = xy, Y_e = ii, K_e = Hb;
+const r4 = z_e(ne), QO = G0, H_e = xd, Q_e = ui, G_e = gt, W_e = e1, V_e = xy, Y_e = ii, K_e = Hb;
 class rJ extends W_e.RefinedSpace {
   constructor(e, n, r, i) {
     super(e.emptyStructDef()), this.queryInputSpace = e, this.nestParent = r, this.astEl = i, this.expandedWild = {}, this.exprSpace = new K_e.QueryInputSpace(e, this), n && this.addRefineFromFields(n);
@@ -40794,7 +40799,7 @@ class rJ extends W_e.RefinedSpace {
           e.log(`Cannot expand '${u}' in '${e.refString}' because a field with that name already exists${l ? ` (conflicts with ${l})` : ""}`);
         } else {
           const l = a.typeDesc();
-          rS.isAtomicFieldType(l.dataType) && rS.expressionIsScalar(l.expressionType) && (s === void 0 || !s.ignoreInProject(u)) && (o.push({ name: u, entry: a }), this.expandedWild[u] = i.concat(u));
+          r4.isAtomicFieldType(l.dataType) && r4.expressionIsScalar(l.expressionType) && (s === void 0 || !s.ignoreInProject(u)) && (o.push({ name: u, entry: a }), this.expandedWild[u] = i.concat(u));
         }
     for (const u of o.sort((a, l) => a.name.localeCompare(l.name)))
       this.setEntry(u.name, u.entry);
@@ -40804,7 +40809,7 @@ Qo.QueryOperationSpace = rJ;
 class iJ extends rJ {
   addRefineFromFields(e) {
     var n;
-    if (rS.isQuerySegment(e))
+    if (r4.isQuerySegment(e))
       for (const r of e.queryFields)
         if (r.type === "fieldref") {
           const i = this.exprSpace.lookup(r.path.map((s) => new H_e.FieldName(s)));
@@ -40838,7 +40843,7 @@ class iJ extends rJ {
   }
   getQuerySegment(e) {
     const n = this.getPipeSegment(e);
-    if (rS.isQuerySegment(n))
+    if (r4.isQuerySegment(n))
       return n;
     throw new Error("TODO NOT POSSIBLE");
   }
@@ -41206,7 +41211,7 @@ function Ty(t) {
 function em(t) {
   return Ty(t) ? 366 : 365;
 }
-function iS(t, e) {
+function i4(t, e) {
   const n = h5e(e - 1, 12) + 1, r = t + (e - n) / 12;
   return n === 2 ? Ty(r) ? 29 : 28 : [31, null, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][n - 1];
 }
@@ -41222,7 +41227,7 @@ function eL(t) {
   );
   return t.year < 100 && t.year >= 0 && (e = new Date(e), e.setUTCFullYear(e.getUTCFullYear() - 1900)), +e;
 }
-function sS(t) {
+function s4(t) {
   const e = (t + Math.floor(t / 4) - Math.floor(t / 100) + Math.floor(t / 400)) % 7, n = t - 1, r = (n + Math.floor(n / 4) - Math.floor(n / 100) + Math.floor(n / 400)) % 7;
   return e === 4 || r === 3 ? 53 : 52;
 }
@@ -41254,7 +41259,7 @@ function RJ(t) {
     throw new ro(`Invalid unit value ${t}`);
   return e;
 }
-function oS(t, e) {
+function o4(t, e) {
   const n = {};
   for (const r in t)
     if (Jh(t, r)) {
@@ -42671,7 +42676,7 @@ class vt {
         `Duration.fromObject: argument expected to be an object, got ${e === null ? "null" : typeof e}`
       );
     return new vt({
-      values: oS(e, vt.normalizeUnit),
+      values: o4(e, vt.normalizeUnit),
       loc: pn.fromObject(n),
       conversionAccuracy: n.conversionAccuracy
     });
@@ -42994,7 +42999,7 @@ class vt {
   set(e) {
     if (!this.isValid)
       return this;
-    const n = { ...this.values, ...oS(e, vt.normalizeUnit) };
+    const n = { ...this.values, ...o4(e, vt.normalizeUnit) };
     return Af(this, { values: n });
   }
   /**
@@ -44136,7 +44141,7 @@ function XJ(t, e) {
 function fD(t) {
   const { year: e, month: n, day: r } = t, i = KJ(e, n, r), s = YJ(e, n, r);
   let o = Math.floor((i - s + 10) / 7), u;
-  return o < 1 ? (u = e - 1, o = sS(u)) : o > sS(e) ? (u = e + 1, o = 1) : u = e, { weekYear: u, weekNumber: o, weekday: s, ...Vb(t) };
+  return o < 1 ? (u = e - 1, o = s4(u)) : o > s4(e) ? (u = e + 1, o = 1) : u = e, { weekYear: u, weekNumber: o, weekday: s, ...Vb(t) };
 }
 function TU(t) {
   const { weekYear: e, weekNumber: n, weekday: r } = t, i = YJ(e, 1, 4), s = em(e);
@@ -44154,7 +44159,7 @@ function RU(t) {
   return { year: e, month: r, day: i, ...Vb(t) };
 }
 function XCe(t) {
-  const e = Gb(t.weekYear), n = nl(t.weekNumber, 1, sS(t.weekYear)), r = nl(t.weekday, 1, 7);
+  const e = Gb(t.weekYear), n = nl(t.weekNumber, 1, s4(t.weekYear)), r = nl(t.weekday, 1, 7);
   return e ? n ? r ? !1 : oo("weekday", t.weekday) : oo("week", t.week) : oo("weekYear", t.weekYear);
 }
 function JCe(t) {
@@ -44162,7 +44167,7 @@ function JCe(t) {
   return e ? n ? !1 : oo("ordinal", t.ordinal) : oo("year", t.year);
 }
 function JJ(t) {
-  const e = Gb(t.year), n = nl(t.month, 1, 12), r = nl(t.day, 1, iS(t.year, t.month));
+  const e = Gb(t.year), n = nl(t.month, 1, 12), r = nl(t.day, 1, i4(t.year, t.month));
   return e ? n ? r ? !1 : oo("day", t.day) : oo("month", t.month) : oo("year", t.year);
 }
 function ZJ(t) {
@@ -44217,7 +44222,7 @@ function DU(t, e) {
     ...t.c,
     year: r,
     month: i,
-    day: Math.min(t.c.day, iS(r, i)) + Math.trunc(e.days) + Math.trunc(e.weeks) * 7
+    day: Math.min(t.c.day, i4(r, i)) + Math.trunc(e.days) + Math.trunc(e.weeks) * 7
   }, o = vt.fromObject({
     years: e.years - Math.trunc(e.years),
     quarters: e.quarters - Math.trunc(e.quarters),
@@ -44525,7 +44530,7 @@ class ot {
     const r = v0(n.zone, Un.defaultZone);
     if (!r.isValid)
       return ot.invalid(iA(r));
-    const i = Un.now(), s = At(n.specificOffset) ? r.offset(i) : n.specificOffset, o = oS(e, wU), u = !At(o.ordinal), a = !At(o.year), l = !At(o.month) || !At(o.day), c = a || l, f = o.weekYear || o.weekNumber, x = pn.fromObject(n);
+    const i = Un.now(), s = At(n.specificOffset) ? r.offset(i) : n.specificOffset, o = o4(e, wU), u = !At(o.ordinal), a = !At(o.year), l = !At(o.month) || !At(o.day), c = a || l, f = o.weekYear || o.weekNumber, x = pn.fromObject(n);
     if ((c || u) && f)
       throw new Rg(
         "Can't mix weekYear/weekNumber units with year/month/day or ordinals"
@@ -44955,7 +44960,7 @@ class ot {
    * @type {number}
    */
   get daysInMonth() {
-    return iS(this.year, this.month);
+    return i4(this.year, this.month);
   }
   /**
    * Returns the number of days in this DateTime's year
@@ -44974,7 +44979,7 @@ class ot {
    * @type {number}
    */
   get weeksInWeekYear() {
-    return this.isValid ? sS(this.weekYear) : NaN;
+    return this.isValid ? s4(this.weekYear) : NaN;
   }
   /**
    * Returns the resolved Intl options for this DateTime.
@@ -45064,7 +45069,7 @@ class ot {
   set(e) {
     if (!this.isValid)
       return this;
-    const n = oS(e, wU), r = !At(n.weekYear) || !At(n.weekNumber) || !At(n.weekday), i = !At(n.ordinal), s = !At(n.year), o = !At(n.month) || !At(n.day), u = s || o, a = n.weekYear || n.weekNumber;
+    const n = o4(e, wU), r = !At(n.weekYear) || !At(n.weekNumber) || !At(n.weekday), i = !At(n.ordinal), s = !At(n.year), o = !At(n.month) || !At(n.day), u = s || o, a = n.weekYear || n.weekNumber;
     if ((u || i) && a)
       throw new Rg(
         "Can't mix weekYear/weekNumber units with year/month/day or ordinals"
@@ -45072,7 +45077,7 @@ class ot {
     if (o && i)
       throw new Rg("Can't mix ordinal dates with month/day");
     let l;
-    r ? l = TU({ ...fD(this.c), ...n }) : At(n.ordinal) ? (l = { ...this.toObject(), ...n }, At(n.day) && (l.day = Math.min(iS(l.year, l.month), l.day))) : l = RU({ ...JO(this.c), ...n });
+    r ? l = TU({ ...fD(this.c), ...n }) : At(n.ordinal) ? (l = { ...this.toObject(), ...n }, At(n.day) && (l.day = Math.min(i4(l.year, l.month), l.day))) : l = RU({ ...JO(this.c), ...n });
     const [c, f] = sv(l, this.o, this.zone);
     return Zp(this, { ts: c, o: f });
   }
@@ -48630,7 +48635,7 @@ var PRe = N && N.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(Mu, "__esModule", { value: !0 });
 Mu.MalloyParserErrorHandler = Mu.MalloyTranslator = Mu.MalloyChildTranslator = Mu.MalloyTranslation = void 0;
-const iq = U5, URe = IC, qRe = F, mZ = jRe(nb), zRe = vT, HRe = ST, QRe = dl, f7 = _T, GRe = CT, WRe = bT, VRe = TT, YRe = RT, uS = OT, KRe = Py, yZ = zl, XRe = NT;
+const iq = U5, URe = IC, qRe = F, mZ = jRe(nb), zRe = vT, HRe = ST, QRe = dl, f7 = _T, GRe = CT, WRe = bT, VRe = TT, YRe = RT, u4 = OT, KRe = Py, yZ = zl, XRe = NT;
 class JRe extends URe.MalloyLexer {
   popMode() {
     return this._modeStack.isEmpty ? this._mode : super.popMode();
@@ -48774,11 +48779,11 @@ class eOe {
       r = { tables: o };
     }
     const s = e.root.importZone.getUndefined();
-    if (s && (r = { ...r, urls: s }), (0, uS.isNeedResponse)(r))
+    if (s && (r = { ...r, urls: s }), (0, u4.isNeedResponse)(r))
       return r;
     for (const o of e.childTranslators.values()) {
       const u = o.importsAndTablesStep.step(o);
-      if ((0, uS.isNeedResponse)(u))
+      if ((0, u4.isNeedResponse)(u))
         return u;
     }
     return null;
@@ -48810,7 +48815,7 @@ class tOe {
       return this.response = e.fatalResponse(), this.response;
     for (const u of e.childTranslators.values()) {
       const a = u.astStep.step(u);
-      if ((0, uS.isNeedResponse)(a))
+      if ((0, u4.isNeedResponse)(a))
         return a;
     }
     return o.setTranslator(e), this.response = {
@@ -48922,7 +48927,7 @@ class oOe {
       e.compilerFlags = i.tag, this.importedAnnotations = !0;
     }
     const r = this.astStep.step(e);
-    if ((0, uS.isNeedResponse)(r))
+    if ((0, u4.isNeedResponse)(r))
       return r;
     if (!r.ast)
       return this.response = r, this.response;
@@ -49955,11 +49960,11 @@ class ws extends gL {
         if (r.type === "string")
           return [i, new SL(r, this, s)];
         if (r.type === "number")
-          return [i, new aS(r, this, s)];
+          return [i, new a4(r, this, s)];
         if (r.type === "date")
           return r.timeframe && ["day_of_month", "day_of_week", "day_of_year"].includes(r.timeframe) ? [
             i,
-            new aS({ ...r, type: "number" }, this, s)
+            new a4({ ...r, type: "number" }, this, s)
           ] : [i, new mL(r, this, s)];
         if (r.type === "timestamp")
           return [i, new yL(r, this, s)];
@@ -50147,7 +50152,7 @@ class Lc extends gL {
     return this instanceof SL;
   }
   isNumber() {
-    return this instanceof aS;
+    return this instanceof a4;
   }
   isDate() {
     return this instanceof mL;
@@ -50235,12 +50240,12 @@ class yL extends Lc {
   }
 }
 Ne.TimestampField = yL;
-class aS extends Lc {
+class a4 extends Lc {
   constructor(e, n, r) {
     super(e, n, r), this.fieldNumberDef = e;
   }
 }
-Ne.NumberField = aS;
+Ne.NumberField = a4;
 class EL extends Lc {
   constructor(e, n, r) {
     super(e, n, r), this.fieldBooleanDef = e;
@@ -50846,11 +50851,11 @@ class RZ extends jy {
    * @return The query results from running this loaded query.
    */
   async run(e) {
-    const n = this.runtime.connections, r = await this.getPreparedResult(), i = lS(r, e);
+    const n = this.runtime.connections, r = await this.getPreparedResult(), i = l4(r, e);
     return ln.run({ connections: n, preparedResult: r, options: i });
   }
   async *runStream(e) {
-    const n = await this.getPreparedResult(), r = this.runtime.connections, i = lS(n, e), s = ln.runStream({
+    const n = await this.getPreparedResult(), r = this.runtime.connections, i = l4(n, e), s = ln.runStream({
       connections: r,
       preparedResult: n,
       options: i
@@ -50902,7 +50907,7 @@ class RZ extends jy {
   }
 }
 Ne.QueryMaterializer = RZ;
-function lS(t, e) {
+function l4(t, e) {
   return {
     queryAnnotation: t.annotation,
     modelAnnotation: t.modelAnnotation,
@@ -50916,7 +50921,7 @@ class OZ extends jy {
    * @return A promise to the query result data.
    */
   async run(e) {
-    const n = await this.getPreparedResult(), r = this.runtime.connections, i = lS(n, e);
+    const n = await this.getPreparedResult(), r = this.runtime.connections, i = l4(n, e);
     return ln.run({
       connections: r,
       preparedResult: n,
@@ -50924,7 +50929,7 @@ class OZ extends jy {
     });
   }
   async *runStream(e) {
-    const n = await this.getPreparedResult(), r = this.runtime.connections, i = lS(n, e), s = ln.runStream({
+    const n = await this.getPreparedResult(), r = this.runtime.connections, i = l4(n, e), s = ln.runStream({
       connections: r,
       preparedResult: n,
       options: i
@@ -52121,7 +52126,7 @@ function fDe(t, e) {
 }
 let d7;
 const xDe = 100;
-async function cS() {
+async function c4() {
   const t = Date.now();
   if (!(d7 && t < d7 + xDe))
     return d7 = t, new Promise((e) => {
@@ -52242,7 +52247,7 @@ class lee {
     ), n;
   }
 }
-const Y4 = class Y4 extends fn {
+const YS = class YS extends fn {
   create(e, n, r, i, s) {
     return new lee(e);
   }
@@ -52250,8 +52255,8 @@ const Y4 = class Y4 extends fn {
     return "json";
   }
 };
-Y4.instance = new Y4();
-let AD = Y4;
+YS.instance = new YS();
+let AD = YS;
 function pDe(t) {
   return `'${t.replace(/(['\\])/g, "\\$1")}'`;
 }
@@ -52356,7 +52361,7 @@ class Ic {
     return r.appendChild(this.document.createTextNode(n)), r;
   }
 }
-const K4 = class K4 extends fn {
+const KS = class KS extends fn {
   activates(e) {
     return e.hasParentExplore() && !e.isExploreField();
   }
@@ -52366,9 +52371,9 @@ const K4 = class K4 extends fn {
   get rendererName() {
   }
 };
-K4.instance = new K4();
-let vD = K4;
-function fS(t) {
+KS.instance = new KS();
+let vD = KS;
+function f4(t) {
   return t.tagParse().tag.has("hidden");
 }
 class OL extends IT {
@@ -52394,7 +52399,7 @@ class OL extends IT {
       const a = this.document.createElement("div");
       a.style.position = "relative";
       for (const f of r) {
-        if (fS(f))
+        if (f4(f))
           continue;
         const h = await this.childRenderers[f.name].render(o.cell(f)), p = this.document.createElement("div");
         p.style.cssText = TDe;
@@ -52420,10 +52425,10 @@ class OL extends IT {
       const l = this.document.createElement("div");
       l.style.cssText = bDe;
       for (const f of i) {
-        if (fS(f))
+        if (f4(f))
           continue;
         const x = this.childRenderers[f.name];
-        await cS();
+        await c4();
         const h = await x.render(o.cell(f));
         if (x instanceof OL)
           l.appendChild(h);
@@ -52582,7 +52587,7 @@ class xee extends IT {
       const a = await this.childRenderers[n.name].render(o.cell(n));
       if (i.appendChild(a), r) {
         const l = this.childRenderers[r.name];
-        await cS();
+        await c4();
         const c = await l.render(o.cell(r));
         i.appendChild(this.document.createTextNode("(")), i.appendChild(c), i.appendChild(this.document.createTextNode(")"));
       }
@@ -53578,7 +53583,7 @@ var dee = { exports: {} };
   n(e), typeof DO_NOT_EXPORT_SSF > "u" && (t.exports = e);
 })(dee);
 var ov = dee.exports;
-class xS extends Ic {
+class x4 extends Ic {
   constructor(e, n) {
     super(e), this.options = n;
   }
@@ -53594,7 +53599,7 @@ class xS extends Ic {
     return e.number.value.toLocaleString();
   }
 }
-const X4 = class X4 extends fn {
+const XS = class XS extends fn {
   constructor() {
     super(), this.addExtractor(
       (e, n) => {
@@ -53608,14 +53613,14 @@ const X4 = class X4 extends fn {
     return e.hasParentExplore() && e.isAtomicField() && e.type === Lt.AtomicFieldType.Number;
   }
   create(e, n, r, i, s) {
-    return new xS(e, s);
+    return new x4(e, s);
   }
   get rendererName() {
     return "number";
   }
 };
-X4.instance = new X4();
-let SD = X4;
+XS.instance = new XS();
+let SD = XS;
 class yq {
   constructor(e, n, r) {
     this.parentField = e, this.values = n, this.span = r, this.key = JSON.stringify({
@@ -53682,7 +53687,7 @@ class Pm extends IT {
     const o = [];
     let u = 0;
     for (const p of e.field.intrinsicFields) {
-      if (fS(p))
+      if (f4(p))
         continue;
       const m = this.childRenderers[p.name];
       if (m instanceof Pm && m.tagged.has("pivot")) {
@@ -53823,7 +53828,7 @@ class Pm extends IT {
       for (const y of o)
         if (y instanceof nm) {
           const E = this.childRenderers[y.pivotedField.parentField.name], A = p.cell(y.pivotedField.parentField);
-          await cS(), y.pivotedField.key !== m && (g = await E.generatePivotedCells(
+          await c4(), y.pivotedField.key !== m && (g = await E.generatePivotedCells(
             A,
             n,
             y.userDefinedPivotDimensions
@@ -53840,7 +53845,7 @@ class Pm extends IT {
             n
           ), i++;
         else {
-          if (fS(y))
+          if (f4(y))
             continue;
           const E = this.childRenderers[y.name];
           s[r][i] = await this.createCellAndRender(
@@ -53984,7 +53989,7 @@ class Pm extends IT {
       this.options.dataStyles[e.name],
       e.parentExplore.queryTimezone
     );
-    const o = (r.childRenderer ?? this.childRenderers[e.name]) instanceof xS, u = this.document.createElement("th");
+    const o = (r.childRenderer ?? this.childRenderers[e.name]) instanceof x4, u = this.document.createElement("th");
     return u.style.cssText = `
       padding: 8px;
       color: var(--malloy-title-color, #505050);
@@ -53993,8 +53998,8 @@ class Pm extends IT {
     `, i = i.replace(/_/g, "_&#8203;"), u.innerHTML = i, u;
   }
   createCell(e, n) {
-    const r = e instanceof xS;
-    cS();
+    const r = e instanceof x4;
+    c4();
     const i = this.document.createElement("td");
     return i.style.cssText = `
       padding: ${e instanceof Pm ? "0" : "8px"};
@@ -105502,7 +105507,7 @@ const FDe = "Topology", wDe = [
       16
     ]
   ]
-], dS = {
+], d4 = {
   type: FDe,
   bbox: wDe,
   transform: LDe,
@@ -105630,7 +105635,7 @@ function _t(t) {
 function Ti(t) {
   return t == null || t === "" ? null : +t;
 }
-const yee = (t) => (e) => t * Math.exp(e), Eee = (t) => (e) => Math.log(t * e), Aee = (t) => (e) => Math.sign(e) * Math.log1p(Math.abs(e / t)), vee = (t) => (e) => Math.sign(e) * Math.expm1(Math.abs(e)) * t, hS = (t) => (e) => e < 0 ? -Math.pow(-e, t) : Math.pow(e, t);
+const yee = (t) => (e) => t * Math.exp(e), Eee = (t) => (e) => Math.log(t * e), Aee = (t) => (e) => Math.sign(e) * Math.log1p(Math.abs(e / t)), vee = (t) => (e) => Math.sign(e) * Math.expm1(Math.abs(e)) * t, h4 = (t) => (e) => e < 0 ? -Math.pow(-e, t) : Math.pow(e, t);
 function kT(t, e, n, r) {
   const i = n(t[0]), s = n(_t(t)), o = (s - i) * e;
   return [r(i - o), r(s - o)];
@@ -105643,7 +105648,7 @@ function HDe(t, e) {
   return kT(t, e, Eee(n), yee(n));
 }
 function QDe(t, e, n) {
-  return kT(t, e, hS(n), hS(1 / n));
+  return kT(t, e, h4(n), h4(1 / n));
 }
 function GDe(t, e, n) {
   return kT(t, e, Aee(n), vee(n));
@@ -105660,7 +105665,7 @@ function _ee(t, e, n) {
   return PT(t, e, n, Eee(r), yee(r));
 }
 function _D(t, e, n, r) {
-  return PT(t, e, n, hS(r), hS(1 / r));
+  return PT(t, e, n, h4(r), h4(1 / r));
 }
 function Cee(t, e, n, r) {
   return PT(t, e, n, Aee(r), vee(r));
@@ -106285,7 +106290,7 @@ function zt(t) {
   return Re(t).length === 0;
 }
 const Re = Object.keys, Ni = Object.values, Cx = Object.entries;
-function pS(t) {
+function p4(t) {
   return t === !0 || t === !1;
 }
 function mn(t) {
@@ -106346,7 +106351,7 @@ function b8e(t) {
 function T8e(t) {
   return t.startsWith("__");
 }
-function gS(t) {
+function g4(t) {
   if (t !== void 0)
     return (t % 360 + 360) % 360;
 }
@@ -107030,8 +107035,8 @@ function Bt(t, e, n, r = {}) {
 function Tx(t, e, n, { vgChannel: r } = {}) {
   return er(
     // style config has highest precedence
-    r ? mS(t, e, n.style) : void 0,
-    mS(t, e, n.style),
+    r ? m4(t, e, n.style) : void 0,
+    m4(t, e, n.style),
     // then mark-specific config
     r ? n[e.type][r] : void 0,
     n[e.type][t],
@@ -107042,7 +107047,7 @@ function Tx(t, e, n, { vgChannel: r } = {}) {
     // Need to cast for the same reason as above
   );
 }
-function mS(t, e, n) {
+function m4(t, e, n) {
   return Zee(t, Jee(e), n);
 }
 function Zee(t, e, n) {
@@ -107278,7 +107283,7 @@ function twe(t) {
 function nwe(t) {
   return `Stacking is applied even though the aggregate function is non-summative ("${t}").`;
 }
-function yS(t, e) {
+function y4(t, e) {
   return `Invalid ${t}: ${sn(e)}.`;
 }
 function rwe(t) {
@@ -107343,8 +107348,8 @@ const fte = [
 ], xwe = fte.map((t) => t.substr(0, 3)), xte = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"], dwe = xte.map((t) => t.substr(0, 3));
 function hwe(t) {
   if ($L(t) && (t = +t), on(t))
-    return t > 4 && Te(yS("quarter", t)), t - 1;
-  throw new Error(yS("quarter", t));
+    return t > 4 && Te(y4("quarter", t)), t - 1;
+  throw new Error(y4("quarter", t));
 }
 function pwe(t) {
   if ($L(t) && (t = +t), on(t))
@@ -107356,7 +107361,7 @@ function pwe(t) {
     const r = e.substr(0, 3), i = xwe.indexOf(r);
     if (i !== -1)
       return i;
-    throw new Error(yS("month", t));
+    throw new Error(y4("month", t));
   }
 }
 function gwe(t) {
@@ -107369,7 +107374,7 @@ function gwe(t) {
     const r = e.substr(0, 3), i = dwe.indexOf(r);
     if (i !== -1)
       return i;
-    throw new Error(yS("day", t));
+    throw new Error(y4("day", t));
   }
 }
 function GL(t, e) {
@@ -107967,7 +107972,7 @@ class Pq extends Map {
     return super.delete(_te(this, e));
   }
 }
-class ES extends Set {
+class E4 extends Set {
   constructor(e, n = Cte) {
     if (super(), Object.defineProperties(this, { _intern: { value: /* @__PURE__ */ new Map() }, _key: { value: n } }), e != null)
       for (const r of e)
@@ -108015,17 +108020,17 @@ function bte(t, e) {
   return (t == null || !(t >= t)) - (e == null || !(e >= e)) || (t < e ? -1 : t > e ? 1 : 0);
 }
 const Kwe = Math.sqrt(50), Xwe = Math.sqrt(10), Jwe = Math.sqrt(2);
-function AS(t, e, n) {
+function A4(t, e, n) {
   const r = (e - t) / Math.max(0, n), i = Math.floor(Math.log10(r)), s = r / Math.pow(10, i), o = s >= Kwe ? 10 : s >= Xwe ? 5 : s >= Jwe ? 2 : 1;
   let u, a, l;
-  return i < 0 ? (l = Math.pow(10, -i) / o, u = Math.round(t * l), a = Math.round(e * l), u / l < t && ++u, a / l > e && --a, l = -l) : (l = Math.pow(10, i) * o, u = Math.round(t / l), a = Math.round(e / l), u * l < t && ++u, a * l > e && --a), a < u && 0.5 <= n && n < 2 ? AS(t, e, n * 2) : [u, a, l];
+  return i < 0 ? (l = Math.pow(10, -i) / o, u = Math.round(t * l), a = Math.round(e * l), u / l < t && ++u, a / l > e && --a, l = -l) : (l = Math.pow(10, i) * o, u = Math.round(t / l), a = Math.round(e / l), u * l < t && ++u, a * l > e && --a), a < u && 0.5 <= n && n < 2 ? A4(t, e, n * 2) : [u, a, l];
 }
 function OD(t, e, n) {
   if (e = +e, t = +t, n = +n, !(n > 0))
     return [];
   if (t === e)
     return [t];
-  const r = e < t, [i, s, o] = r ? AS(e, t, n) : AS(t, e, n);
+  const r = e < t, [i, s, o] = r ? A4(e, t, n) : A4(t, e, n);
   if (!(s >= i))
     return [];
   const u = s - i + 1, a = new Array(u);
@@ -108045,7 +108050,7 @@ function OD(t, e, n) {
   return a;
 }
 function ND(t, e, n) {
-  return e = +e, t = +t, n = +n, AS(t, e, n)[2];
+  return e = +e, t = +t, n = +n, A4(t, e, n)[2];
 }
 function nc(t, e, n) {
   e = +e, t = +t, n = +n;
@@ -108164,7 +108169,7 @@ function Dte(t, e) {
 function t9e(t) {
   return Math.abs(t = Math.round(t)) >= 1e21 ? t.toLocaleString("en").replace(/,/g, "") : t.toString(10);
 }
-function vS(t, e) {
+function v4(t, e) {
   if ((n = (t = e ? t.toExponential(e - 1) : t.toExponential()).indexOf("e")) < 0)
     return null;
   var n, r = t.slice(0, n);
@@ -108174,7 +108179,7 @@ function vS(t, e) {
   ];
 }
 function i2(t) {
-  return t = vS(Math.abs(t)), t ? t[1] : NaN;
+  return t = v4(Math.abs(t)), t ? t[1] : NaN;
 }
 function n9e(t, e) {
   return function(n, r) {
@@ -108235,14 +108240,14 @@ function s9e(t) {
 }
 var Fte;
 function o9e(t, e) {
-  var n = vS(t, e);
+  var n = v4(t, e);
   if (!n)
     return t + "";
   var r = n[0], i = n[1], s = i - (Fte = Math.max(-8, Math.min(8, Math.floor(i / 3))) * 3) + 1, o = r.length;
-  return s === o ? r : s > o ? r + new Array(s - o + 1).join("0") : s > 0 ? r.slice(0, s) + "." + r.slice(s) : "0." + new Array(1 - s).join("0") + vS(t, Math.max(0, e + s - 1))[0];
+  return s === o ? r : s > o ? r + new Array(s - o + 1).join("0") : s > 0 ? r.slice(0, s) + "." + r.slice(s) : "0." + new Array(1 - s).join("0") + v4(t, Math.max(0, e + s - 1))[0];
 }
 function Mq(t, e) {
-  var n = vS(t, e);
+  var n = v4(t, e);
   if (!n)
     return t + "";
   var r = n[0], i = n[1];
@@ -108440,9 +108445,9 @@ function Ad(t) {
     e.setDate(e.getDate() + n * 7);
   }, (e, n) => (n - e - (n.getTimezoneOffset() - e.getTimezoneOffset()) * ao) / oI);
 }
-const S1 = Ad(0), SS = Ad(1), a9e = Ad(2), l9e = Ad(3), o2 = Ad(4), c9e = Ad(5), f9e = Ad(6);
+const S1 = Ad(0), S4 = Ad(1), a9e = Ad(2), l9e = Ad(3), o2 = Ad(4), c9e = Ad(5), f9e = Ad(6);
 S1.range;
-SS.range;
+S4.range;
 a9e.range;
 l9e.range;
 o2.range;
@@ -108455,9 +108460,9 @@ function vd(t) {
     e.setUTCDate(e.getUTCDate() + n * 7);
   }, (e, n) => (n - e) / oI);
 }
-const _1 = vd(0), _S = vd(1), x9e = vd(2), d9e = vd(3), u2 = vd(4), h9e = vd(5), p9e = vd(6);
+const _1 = vd(0), _4 = vd(1), x9e = vd(2), d9e = vd(3), u2 = vd(4), h9e = vd(5), p9e = vd(6);
 _1.range;
-_S.range;
+_4.range;
 x9e.range;
 d9e.range;
 u2.range;
@@ -108871,7 +108876,7 @@ function Wte(t) {
       if ($ && !("Z" in Q) && (Q.Z = 0), "p" in Q && (Q.H = Q.H % 12 + Q.p * 12), Q.m === void 0 && (Q.m = "q" in Q ? Q.q : 0), "V" in Q) {
         if (Q.V < 1 || Q.V > 53)
           return null;
-        "w" in Q || (Q.w = 1), "Z" in Q ? (z = b7(og(Q.y, 0, 1)), P = z.getUTCDay(), z = P > 4 || P === 0 ? _S.ceil(z) : _S(z), z = B0.offset(z, (Q.V - 1) * 7), Q.y = z.getUTCFullYear(), Q.m = z.getUTCMonth(), Q.d = z.getUTCDate() + (Q.w + 6) % 7) : (z = C7(og(Q.y, 0, 1)), P = z.getDay(), z = P > 4 || P === 0 ? SS.ceil(z) : SS(z), z = yl.offset(z, (Q.V - 1) * 7), Q.y = z.getFullYear(), Q.m = z.getMonth(), Q.d = z.getDate() + (Q.w + 6) % 7);
+        "w" in Q || (Q.w = 1), "Z" in Q ? (z = b7(og(Q.y, 0, 1)), P = z.getUTCDay(), z = P > 4 || P === 0 ? _4.ceil(z) : _4(z), z = B0.offset(z, (Q.V - 1) * 7), Q.y = z.getUTCFullYear(), Q.m = z.getUTCMonth(), Q.d = z.getUTCDate() + (Q.w + 6) % 7) : (z = C7(og(Q.y, 0, 1)), P = z.getDay(), z = P > 4 || P === 0 ? S4.ceil(z) : S4(z), z = yl.offset(z, (Q.V - 1) * 7), Q.y = z.getFullYear(), Q.m = z.getMonth(), Q.d = z.getDate() + (Q.w + 6) % 7);
       } else
         ("W" in Q || "U" in Q) && ("w" in Q || (Q.w = "u" in Q ? Q.u % 7 : "W" in Q ? 1 : 0), P = "Z" in Q ? b7(og(Q.y, 0, 1)).getUTCDay() : C7(og(Q.y, 0, 1)).getDay(), Q.m = 0, Q.d = "W" in Q ? (Q.w + 6) % 7 + Q.W * 7 - (P + 5) % 7 : Q.w + Q.U * 7 - (P + 6) % 7);
       return "Z" in Q ? (Q.H += Q.Z / 100 | 0, Q.M += Q.Z % 100, b7(Q)) : C7(Q);
@@ -109120,7 +109125,7 @@ function ALe(t) {
   return t.getDay();
 }
 function vLe(t, e) {
-  return Nt(SS.count(ta(t) - 1, t), e, 2);
+  return Nt(S4.count(ta(t) - 1, t), e, 2);
 }
 function SLe(t, e) {
   return Nt(t.getFullYear() % 100, e, 2);
@@ -109184,7 +109189,7 @@ function kLe(t) {
   return t.getUTCDay();
 }
 function PLe(t, e) {
-  return Nt(_S.count(na(t) - 1, t), e, 2);
+  return Nt(_4.count(na(t) - 1, t), e, 2);
 }
 function MLe(t, e) {
   return Nt(t.getUTCFullYear() % 100, e, 2);
@@ -109344,17 +109349,17 @@ function VLe() {
 function rne(t) {
   return nne(Wte(t));
 }
-function CS(t) {
+function C4(t) {
   return arguments.length ? MD = rne(t) : MD;
 }
 const jD = (t, e) => ct({}, t, e);
 function ine(t, e) {
-  const n = t ? tne(t) : PD(), r = e ? rne(e) : CS();
+  const n = t ? tne(t) : PD(), r = e ? rne(e) : C4();
   return jD(n, r);
 }
 function YLe(t, e) {
   const n = arguments.length;
-  return n && n !== 2 && ve("defaultLocale expects either zero or two arguments."), n ? jD(PD(t), CS(e)) : jD(PD(), CS());
+  return n && n !== 2 && ve("defaultLocale expects either zero or two arguments."), n ? jD(PD(t), C4(e)) : jD(PD(), C4());
 }
 const KLe = /^(data:|([A-Za-z]+:)?\/\/)/, XLe = /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp|file|data):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i, JLe = /[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205f\u3000]/g, iz = "file://";
 function ZLe(t, e) {
@@ -109480,7 +109485,7 @@ function mIe(t, e, n, r) {
 function yIe(t, e, n, r) {
   if (!t.length)
     return;
-  const i = CS();
+  const i = C4();
   n = n || i.timeParse, r = r || i.utcParse;
   let s = t.columns || Object.keys(t[0]), o, u, a, l, c, f;
   e === "auto" && (e = xIe(t, s)), s = Object.keys(e);
@@ -110015,7 +110020,7 @@ function jIe(t) {
       for (i = r.length; --i >= 0; )
         e.push(n = r[i]), n === t && ve("Cycle detected in dataflow graph.");
 }
-const bS = {}, wu = 1, m0 = 2, Ya = 4, UIe = wu | m0, az = wu | Ya, Gd = wu | m0 | Ya, lz = 8, lg = 16, cz = 32, fz = 64;
+const b4 = {}, wu = 1, m0 = 2, Ya = 4, UIe = wu | m0, az = wu | Ya, Gd = wu | m0 | Ya, lz = 8, lg = 16, cz = 32, fz = 64;
 function Xf(t, e, n) {
   this.dataflow = t, this.stamp = e ?? -1, this.add = [], this.rem = [], this.mod = [], this.fields = null, this.encode = n || null;
 }
@@ -110036,7 +110041,7 @@ Xf.prototype = {
   /**
    * Sentinel value indicating pulse propagation should stop.
    */
-  StopPropagation: bS,
+  StopPropagation: b4,
   /**
    * Boolean flag indicating ADD (added) tuples.
    */
@@ -110315,7 +110320,7 @@ async function qIe(t, e, n) {
         r._enqueue(u, !0);
         continue;
       }
-      a = u.run(r._getPulse(u, t)), a.then ? a = await a : a.async && (i.push(a.async), a = bS), a !== bS && u._targets && u._targets.forEach((c) => r._enqueue(c)), ++o;
+      a = u.run(r._getPulse(u, t)), a.then ? a = await a : a.async && (i.push(a.async), a = b4), a !== b4 && u._targets && u._targets.forEach((c) => r._enqueue(c)), ++o;
     }
   } catch (c) {
     r._heap.clear(), l = c;
@@ -110370,7 +110375,7 @@ function WIe(t, e) {
   return n && _e(n) ? new xne(this, r, n.map((i) => i.pulse), e) : this._input[t.id] || VIe(this._pulse, n && n.pulse);
 }
 function VIe(t, e) {
-  return e && e.stamp === t.stamp ? e : (t = t.fork(), e && e !== bS && (t.source = e.source), t);
+  return e && e.stamp === t.stamp ? e : (t = t.fork(), e && e !== b4 && (t.source = e.source), t);
 }
 const mI = {
   skip: !1,
@@ -113302,12 +113307,12 @@ function $t(t) {
     return t;
   };
 }
-const mz = Math.abs, Ur = Math.atan2, _f = Math.cos, cBe = Math.max, D7 = Math.min, Tu = Math.sin, qf = Math.sqrt, Hr = 1e-12, l2 = Math.PI, TS = l2 / 2, ore = 2 * l2;
+const mz = Math.abs, Ur = Math.atan2, _f = Math.cos, cBe = Math.max, D7 = Math.min, Tu = Math.sin, qf = Math.sqrt, Hr = 1e-12, l2 = Math.PI, T4 = l2 / 2, ore = 2 * l2;
 function fBe(t) {
   return t > 1 ? 0 : t < -1 ? l2 : Math.acos(t);
 }
 function yz(t) {
-  return t >= 1 ? TS : t <= -1 ? -TS : Math.asin(t);
+  return t >= 1 ? T4 : t <= -1 ? -T4 : Math.asin(t);
 }
 const qD = Math.PI, zD = 2 * qD, Df = 1e-6, xBe = zD - Df;
 function ure(t) {
@@ -113429,7 +113434,7 @@ function dA(t, e, n, r, i, s, o) {
 function ABe() {
   var t = hBe, e = pBe, n = $t(0), r = null, i = gBe, s = mBe, o = yBe, u = null, a = o6(l);
   function l() {
-    var c, f, x = +t.apply(this, arguments), h = +e.apply(this, arguments), p = i.apply(this, arguments) - TS, m = s.apply(this, arguments) - TS, g = mz(m - p), y = m > p;
+    var c, f, x = +t.apply(this, arguments), h = +e.apply(this, arguments), p = i.apply(this, arguments) - T4, m = s.apply(this, arguments) - T4, g = mz(m - p), y = m > p;
     if (u || (u = c = a()), h < x && (f = h, h = x, x = f), !(h > Hr))
       u.moveTo(0, 0);
     else if (g > ore - Hr)
@@ -113611,7 +113616,7 @@ function SBe(t, e) {
 }
 function ic() {
 }
-function RS(t, e, n) {
+function R4(t, e, n) {
   t._context.bezierCurveTo(
     (2 * t._x0 + t._x1) / 3,
     (2 * t._y0 + t._y1) / 3,
@@ -113637,7 +113642,7 @@ u6.prototype = {
   lineEnd: function() {
     switch (this._point) {
       case 3:
-        RS(this, this._x1, this._y1);
+        R4(this, this._x1, this._y1);
       case 2:
         this._context.lineTo(this._x1, this._y1);
         break;
@@ -113655,7 +113660,7 @@ u6.prototype = {
       case 2:
         this._point = 3, this._context.lineTo((5 * this._x0 + this._x1) / 6, (5 * this._y0 + this._y1) / 6);
       default:
-        RS(this, t, e);
+        R4(this, t, e);
         break;
     }
     this._x0 = this._x1, this._x1 = t, this._y0 = this._y1, this._y1 = e;
@@ -113701,7 +113706,7 @@ hre.prototype = {
         this._point = 3, this._x4 = t, this._y4 = e, this._context.moveTo((this._x0 + 4 * this._x1 + t) / 6, (this._y0 + 4 * this._y1 + e) / 6);
         break;
       default:
-        RS(this, t, e);
+        R4(this, t, e);
         break;
     }
     this._x0 = this._x1, this._x1 = t, this._y0 = this._y1, this._y1 = e;
@@ -113742,7 +113747,7 @@ pre.prototype = {
       case 3:
         this._point = 4;
       default:
-        RS(this, t, e);
+        R4(this, t, e);
         break;
     }
     this._x0 = this._x1, this._x1 = t, this._y0 = this._y1, this._y1 = e;
@@ -113780,7 +113785,7 @@ const TBe = function t(e) {
     return t(+r);
   }, n;
 }(0.85);
-function OS(t, e, n) {
+function O4(t, e, n) {
   t._context.bezierCurveTo(
     t._x1 + t._k * (t._x2 - t._x0),
     t._y1 + t._k * (t._y2 - t._y0),
@@ -113809,7 +113814,7 @@ KI.prototype = {
         this._context.lineTo(this._x2, this._y2);
         break;
       case 3:
-        OS(this, this._x1, this._y1);
+        O4(this, this._x1, this._y1);
         break;
     }
     (this._line || this._line !== 0 && this._point === 1) && this._context.closePath(), this._line = 1 - this._line;
@@ -113825,7 +113830,7 @@ KI.prototype = {
       case 2:
         this._point = 3;
       default:
-        OS(this, t, e);
+        O4(this, t, e);
         break;
     }
     this._x0 = this._x1, this._x1 = this._x2, this._x2 = t, this._y0 = this._y1, this._y1 = this._y2, this._y2 = e;
@@ -113876,7 +113881,7 @@ XI.prototype = {
         this._point = 3, this._x5 = t, this._y5 = e;
         break;
       default:
-        OS(this, t, e);
+        O4(this, t, e);
         break;
     }
     this._x0 = this._x1, this._x1 = this._x2, this._x2 = t, this._y0 = this._y1, this._y1 = this._y2, this._y2 = e;
@@ -113920,7 +113925,7 @@ JI.prototype = {
       case 3:
         this._point = 4;
       default:
-        OS(this, t, e);
+        O4(this, t, e);
         break;
     }
     this._x0 = this._x1, this._x1 = this._x2, this._x2 = t, this._y0 = this._y1, this._y1 = this._y2, this._y2 = e;
@@ -114136,10 +114141,10 @@ function F7(t, e, n) {
   var r = t._x0, i = t._y0, s = t._x1, o = t._y1, u = (s - r) / 3;
   t._context.bezierCurveTo(r + u, i + u * e, s - u, o - u * n, s, o);
 }
-function NS(t) {
+function N4(t) {
   this._context = t;
 }
-NS.prototype = {
+N4.prototype = {
   areaStart: function() {
     this._line = 0;
   },
@@ -114184,8 +114189,8 @@ NS.prototype = {
 function vre(t) {
   this._context = new Sre(t);
 }
-(vre.prototype = Object.create(NS.prototype)).point = function(t, e) {
-  NS.prototype.point.call(this, e, t);
+(vre.prototype = Object.create(N4.prototype)).point = function(t, e) {
+  N4.prototype.point.call(this, e, t);
 };
 function Sre(t) {
   this._context = t;
@@ -114205,7 +114210,7 @@ Sre.prototype = {
   }
 };
 function IBe(t) {
-  return new NS(t);
+  return new N4(t);
 }
 function $Be(t) {
   return new vre(t);
@@ -114579,7 +114584,7 @@ T1(dr, sc, tE(Hc, {
     return this;
   },
   clamp() {
-    return new dr(Jf(this.r), Jf(this.g), Jf(this.b), DS(this.opacity));
+    return new dr(Jf(this.r), Jf(this.g), Jf(this.b), D4(this.opacity));
   },
   displayable() {
     return -0.5 <= this.r && this.r < 255.5 && -0.5 <= this.g && this.g < 255.5 && -0.5 <= this.b && this.b < 255.5 && 0 <= this.opacity && this.opacity <= 1;
@@ -114598,10 +114603,10 @@ function KBe() {
   return `#${zf(this.r)}${zf(this.g)}${zf(this.b)}${zf((isNaN(this.opacity) ? 1 : this.opacity) * 255)}`;
 }
 function Oz() {
-  const t = DS(this.opacity);
+  const t = D4(this.opacity);
   return `${t === 1 ? "rgb(" : "rgba("}${Jf(this.r)}, ${Jf(this.g)}, ${Jf(this.b)}${t === 1 ? ")" : `, ${t})`}`;
 }
-function DS(t) {
+function D4(t) {
   return isNaN(t) ? 1 : Math.max(0, Math.min(1, t));
 }
 function Jf(t) {
@@ -114624,13 +114629,13 @@ function Cre(t) {
   var e = t.r / 255, n = t.g / 255, r = t.b / 255, i = Math.min(e, n, r), s = Math.max(e, n, r), o = NaN, u = s - i, a = (s + i) / 2;
   return u ? (e === s ? o = (n - r) / u + (n < r) * 6 : n === s ? o = (r - e) / u + 2 : o = (e - n) / u + 4, u /= a < 0.5 ? s + i : 2 - s - i, o *= 60) : u = a > 0 && a < 1 ? 0 : o, new Mo(o, u, a, t.opacity);
 }
-function FS(t, e, n, r) {
+function F4(t, e, n, r) {
   return arguments.length === 1 ? Cre(t) : new Mo(t, e, n, r ?? 1);
 }
 function Mo(t, e, n, r) {
   this.h = +t, this.s = +e, this.l = +n, this.opacity = +r;
 }
-T1(Mo, FS, tE(Hc, {
+T1(Mo, F4, tE(Hc, {
   brighter(t) {
     return t = t == null ? c2 : Math.pow(c2, t), new Mo(this.h, this.s, this.l * t, this.opacity);
   },
@@ -114647,13 +114652,13 @@ T1(Mo, FS, tE(Hc, {
     );
   },
   clamp() {
-    return new Mo(Dz(this.h), pA(this.s), pA(this.l), DS(this.opacity));
+    return new Mo(Dz(this.h), pA(this.s), pA(this.l), D4(this.opacity));
   },
   displayable() {
     return (0 <= this.s && this.s <= 1 || isNaN(this.s)) && 0 <= this.l && this.l <= 1 && 0 <= this.opacity && this.opacity <= 1;
   },
   formatHsl() {
-    const t = DS(this.opacity);
+    const t = D4(this.opacity);
     return `${t === 1 ? "hsl(" : "hsla("}${Dz(this.h)}, ${pA(this.s) * 100}%, ${pA(this.l) * 100}%${t === 1 ? ")" : `, ${t})`}`;
   }
 }));
@@ -114666,7 +114671,7 @@ function pA(t) {
 function w7(t, e, n) {
   return (t < 60 ? e + (n - e) * t / 60 : t < 180 ? n : t < 240 ? e + (n - e) * (240 - t) / 60 : e) * 255;
 }
-const bre = Math.PI / 180, Tre = 180 / Math.PI, wS = 18, Rre = 0.96422, Ore = 1, Nre = 0.82521, Dre = 4 / 29, Eh = 6 / 29, Fre = 3 * Eh * Eh, XBe = Eh * Eh * Eh;
+const bre = Math.PI / 180, Tre = 180 / Math.PI, w4 = 18, Rre = 0.96422, Ore = 1, Nre = 0.82521, Dre = 4 / 29, Eh = 6 / 29, Fre = 3 * Eh * Eh, XBe = Eh * Eh * Eh;
 function wre(t) {
   if (t instanceof Qu)
     return new Qu(t.l, t.a, t.b, t.opacity);
@@ -114676,18 +114681,18 @@ function wre(t) {
   var e = B7(t.r), n = B7(t.g), r = B7(t.b), i = L7((0.2225045 * e + 0.7168786 * n + 0.0606169 * r) / Ore), s, o;
   return e === n && n === r ? s = o = i : (s = L7((0.4360747 * e + 0.3850649 * n + 0.1430804 * r) / Rre), o = L7((0.0139322 * e + 0.0971045 * n + 0.7141733 * r) / Nre)), new Qu(116 * i - 16, 500 * (s - i), 200 * (i - o), t.opacity);
 }
-function LS(t, e, n, r) {
+function L4(t, e, n, r) {
   return arguments.length === 1 ? wre(t) : new Qu(t, e, n, r ?? 1);
 }
 function Qu(t, e, n, r) {
   this.l = +t, this.a = +e, this.b = +n, this.opacity = +r;
 }
-T1(Qu, LS, tE(Hc, {
+T1(Qu, L4, tE(Hc, {
   brighter(t) {
-    return new Qu(this.l + wS * (t ?? 1), this.a, this.b, this.opacity);
+    return new Qu(this.l + w4 * (t ?? 1), this.a, this.b, this.opacity);
   },
   darker(t) {
-    return new Qu(this.l - wS * (t ?? 1), this.a, this.b, this.opacity);
+    return new Qu(this.l - w4 * (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;
@@ -114719,7 +114724,7 @@ function JBe(t) {
   var e = Math.atan2(t.b, t.a) * Tre;
   return new ll(e < 0 ? e + 360 : e, Math.sqrt(t.a * t.a + t.b * t.b), t.l, t.opacity);
 }
-function IS(t, e, n, r) {
+function I4(t, e, n, r) {
   return arguments.length === 1 ? JBe(t) : new ll(t, e, n, r ?? 1);
 }
 function ll(t, e, n, r) {
@@ -114731,12 +114736,12 @@ function Lre(t) {
   var e = t.h * bre;
   return new Qu(t.l, Math.cos(e) * t.c, Math.sin(e) * t.c, t.opacity);
 }
-T1(ll, IS, tE(Hc, {
+T1(ll, I4, tE(Hc, {
   brighter(t) {
-    return new ll(this.h, this.c, this.l + wS * (t ?? 1), this.opacity);
+    return new ll(this.h, this.c, this.l + w4 * (t ?? 1), this.opacity);
   },
   darker(t) {
-    return new ll(this.h, this.c, this.l - wS * (t ?? 1), this.opacity);
+    return new ll(this.h, this.c, this.l - w4 * (t ?? 1), this.opacity);
   },
   rgb() {
     return Lre(this).rgb();
@@ -115029,7 +115034,7 @@ const gke = function t(e, n, r) {
 }(Math.SQRT2, 2, 4);
 function Wre(t) {
   return function(e, n) {
-    var r = t((e = FS(e)).h, (n = FS(n)).h), i = hr(e.s, n.s), s = hr(e.l, n.l), o = hr(e.opacity, n.opacity);
+    var r = t((e = F4(e)).h, (n = F4(n)).h), i = hr(e.s, n.s), s = hr(e.l, n.l), o = hr(e.opacity, n.opacity);
     return function(u) {
       return e.h = r(u), e.s = i(u), e.l = s(u), e.opacity = o(u), e + "";
     };
@@ -115038,14 +115043,14 @@ function Wre(t) {
 const mke = Wre(f6);
 var yke = Wre(hr);
 function Eke(t, e) {
-  var n = hr((t = LS(t)).l, (e = LS(e)).l), r = hr(t.a, e.a), i = hr(t.b, e.b), s = hr(t.opacity, e.opacity);
+  var n = hr((t = L4(t)).l, (e = L4(e)).l), r = hr(t.a, e.a), i = hr(t.b, e.b), s = hr(t.opacity, e.opacity);
   return function(o) {
     return t.l = n(o), t.a = r(o), t.b = i(o), t.opacity = s(o), t + "";
   };
 }
 function Vre(t) {
   return function(e, n) {
-    var r = t((e = IS(e)).h, (n = IS(n)).h), i = hr(e.c, n.c), s = hr(e.l, n.l), o = hr(e.opacity, n.opacity);
+    var r = t((e = I4(e)).h, (n = I4(n)).h), i = hr(e.c, n.c), s = hr(e.l, n.l), o = hr(e.opacity, n.opacity);
     return function(u) {
       return e.h = r(u), e.c = i(u), e.l = s(u), e.opacity = o(u), e + "";
     };
@@ -115696,7 +115701,7 @@ function die() {
     return die().domain(n.domain()).range(n.range());
   }, n;
 }
-const $S = /* @__PURE__ */ new Map(), hie = Symbol("vega_scale");
+const $4 = /* @__PURE__ */ new Map(), hie = Symbol("vega_scale");
 function pie(t) {
   return t[hie] = !0, t;
 }
@@ -115711,7 +115716,7 @@ function Jke(t, e, n) {
   return r.metadata = ea(ke(n)), r;
 }
 function Dt(t, e, n) {
-  return arguments.length > 1 ? ($S.set(t, Jke(t, e, n)), this) : gie(t) ? $S.get(t) : void 0;
+  return arguments.length > 1 ? ($4.set(t, Jke(t, e, n)), this) : gie(t) ? $4.get(t) : void 0;
 }
 Dt(Hke, Zre);
 Dt(f2, Jre, rr);
@@ -115740,10 +115745,10 @@ Dt(p$, e$, oE);
 Dt(fie, y$, oE);
 Dt(XD, Wke, oE);
 function gie(t) {
-  return $S.has(t);
+  return $4.has(t);
 }
 function Cd(t, e) {
-  const n = $S.get(t);
+  const n = $4.get(t);
   return n && n.metadata[e];
 }
 function E$(t) {
@@ -115991,14 +115996,14 @@ function Fie(t, e, n) {
   }
 }
 let APe = 0;
-const BS = "p_";
+const B4 = "p_";
 function _$(t) {
   return t && t.gradient;
 }
 function wie(t, e, n) {
   const r = t.gradient;
-  let i = t.id, s = r === "radial" ? BS : "";
-  return i || (i = t.id = "gradient_" + APe++, r === "radial" ? (t.x1 = Ru(t.x1, 0.5), t.y1 = Ru(t.y1, 0.5), t.r1 = Ru(t.r1, 0), t.x2 = Ru(t.x2, 0.5), t.y2 = Ru(t.y2, 0.5), t.r2 = Ru(t.r2, 0.5), s = BS) : (t.x1 = Ru(t.x1, 0), t.y1 = Ru(t.y1, 0), t.x2 = Ru(t.x2, 1), t.y2 = Ru(t.y2, 0))), e[i] = t, "url(" + (n || "") + "#" + s + i + ")";
+  let i = t.id, s = r === "radial" ? B4 : "";
+  return i || (i = t.id = "gradient_" + APe++, r === "radial" ? (t.x1 = Ru(t.x1, 0.5), t.y1 = Ru(t.y1, 0.5), t.r1 = Ru(t.r1, 0), t.x2 = Ru(t.x2, 0.5), t.y2 = Ru(t.y2, 0.5), t.r2 = Ru(t.r2, 0.5), s = B4) : (t.x1 = Ru(t.x1, 0), t.y1 = Ru(t.y1, 0), t.x2 = Ru(t.x2, 1), t.y2 = Ru(t.y2, 0))), e[i] = t, "url(" + (n || "") + "#" + s + i + ")";
 }
 function Ru(t, e) {
   return t ?? e;
@@ -116179,7 +116184,7 @@ function FPe(t, e, n) {
       Ks[i] = (i % 2 == 1 ? e : n) * t[i];
   return Ks;
 }
-function kS(t, e, n, r, i, s) {
+function k4(t, e, n, r, i, s) {
   var o, u = null, a = 0, l = 0, c = 0, f = 0, x, h, p, m, g = 0, y = 0;
   n == null && (n = 0), r == null && (r = 0), i == null && (i = 1), s == null && (s = i), t.beginPath && t.beginPath();
   for (var E = 0, A = e.length; E < A; ++E) {
@@ -116364,7 +116369,7 @@ function LPe(t) {
     const e = C$(t);
     j7[t] = {
       draw: function(n, r) {
-        kS(n, e, 0, 0, Math.sqrt(r) / 2);
+        k4(n, e, 0, 0, Math.sqrt(r) / 2);
       }
     };
   }
@@ -116765,7 +116770,7 @@ function vMe(t, e, n) {
 function Mie(t, e, n) {
   return _$(n) ? vMe(t, n, e.bounds) : n;
 }
-function PS(t, e, n) {
+function P4(t, e, n) {
   return n *= e.fillOpacity == null ? 1 : e.fillOpacity, n > 0 ? (t.globalAlpha = n, t.fillStyle = Mie(t, e, e.fill), !0) : !1;
 }
 var SMe = [];
@@ -116826,7 +116831,7 @@ function CMe(t) {
 }
 function Uie(t, e, n, r) {
   var i = n.opacity == null ? 1 : n.opacity;
-  i !== 0 && (t(e, r) || (h2(e, n), n.fill && PS(e, n, i) && e.fill(), n.stroke && p2(e, n, i) && e.stroke()));
+  i !== 0 && (t(e, r) || (h2(e, n), n.fill && P4(e, n, i) && e.fill(), n.stroke && p2(e, n, i) && e.stroke()));
 }
 function v6(t) {
   return t = t || Jo, function(e, n, r, i, s, o) {
@@ -116978,7 +116983,7 @@ const MMe = fE(Km), jMe = fE(Km, !1), UMe = fE(Km, !0);
 function qMe(t, e, n) {
   ia(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 && (Km(t, r, i, s), h2(t, r), r.fill && PS(t, r, u) && t.fill(), r.stroke && !o && p2(t, r, u) && t.stroke()), t.save(), t.translate(i, s), r.clip && zie(t, r), n && n.translate(-i, -s), ia(r, (a) => {
+    (r.stroke || r.fill) && u && (Km(t, r, i, s), h2(t, r), r.fill && P4(t, r, u) && t.fill(), r.stroke && !o && p2(t, r, u) && t.stroke()), t.save(), t.translate(i, s), r.clip && zie(t, r), n && n.translate(-i, -s), ia(r, (a) => {
       this.draw(t, a, n);
     }), n && n.translate(i, s), t.restore(), o && r.stroke && u && (Km(t, r, i, s), h2(t, r), p2(t, r, u) && t.stroke());
   });
@@ -117087,7 +117092,7 @@ function gv(t, e) {
   if (n == null)
     return !0;
   var r = e.x || 0, i = e.y || 0, s = e.scaleX || 1, o = e.scaleY || 1, u = (e.angle || 0) * oc, a = e.pathCache;
-  (!a || a.path !== n) && ((e.pathCache = a = C$(n)).path = n), u && t.rotate && t.translate ? (t.translate(r, i), t.rotate(u), kS(t, a, 0, 0, s, o), t.rotate(-u), t.translate(-r, -i)) : kS(t, a, r, i, s, o);
+  (!a || a.path !== n) && ((e.pathCache = a = C$(n)).path = n), u && t.rotate && t.translate ? (t.translate(r, i), t.rotate(u), k4(t, a, 0, 0, s, o), t.rotate(-u), t.translate(-r, -i)) : k4(t, a, r, i, s, o);
 }
 function JMe(t, e) {
   return gv(A6(t, e.angle), e) ? t.set(0, 0, 0, 0) : Wc(t, e, !0);
@@ -117263,9 +117268,9 @@ function pje(t, e, n) {
     i === 0 || r.fontSize <= 0 || r.text == null || r.text.length === 0)) {
       if (t.font = P$(r), t.textAlign = r.align || "left", s = b6(r), o = s.x1, u = s.y1, r.angle && (t.save(), t.translate(o, u), t.rotate(r.angle * oc), o = u = 0), o += r.dx || 0, u += (r.dy || 0) + M$(r), c = xE(r), h2(t, r), _e(c))
         for (l = Fx(r), a = 0; a < c.length; ++a)
-          f = uc(r, c[a]), r.fill && PS(t, r, i) && t.fillText(f, o, u), r.stroke && p2(t, r, i) && t.strokeText(f, o, u), u += l;
+          f = uc(r, c[a]), r.fill && P4(t, r, i) && t.fillText(f, o, u), r.stroke && p2(t, r, i) && t.strokeText(f, o, u), u += l;
       else
-        f = uc(r, c), r.fill && PS(t, r, i) && t.fillText(f, o, u), r.stroke && p2(t, r, i) && t.strokeText(f, o, u);
+        f = uc(r, c), r.fill && P4(t, r, i) && t.fillText(f, o, u), r.stroke && p2(t, r, i) && t.strokeText(f, o, u);
       r.angle && t.restore();
     }
   });
@@ -117776,11 +117781,11 @@ Jl.prototype = {
     return this._load("loadImage", t);
   }
 };
-const Tje = "keydown", Rje = "keypress", Oje = "keyup", nse = "dragenter", mv = "dragleave", rse = "dragover", o8 = "mousedown", Nje = "mouseup", MS = "mousemove", om = "mouseout", ise = "mouseover", jS = "click", Dje = "dblclick", Fje = "wheel", sse = "mousewheel", US = "touchstart", qS = "touchmove", zS = "touchend", wje = [Tje, Rje, Oje, nse, mv, rse, o8, Nje, MS, om, ise, jS, Dje, Fje, sse, US, qS, zS], u8 = MS, Jm = om, a8 = jS;
+const Tje = "keydown", Rje = "keypress", Oje = "keyup", nse = "dragenter", mv = "dragleave", rse = "dragover", o8 = "mousedown", Nje = "mouseup", M4 = "mousemove", om = "mouseout", ise = "mouseover", j4 = "click", Dje = "dblclick", Fje = "wheel", sse = "mousewheel", U4 = "touchstart", q4 = "touchmove", z4 = "touchend", wje = [Tje, Rje, Oje, nse, mv, rse, o8, Nje, M4, om, ise, j4, Dje, Fje, sse, U4, q4, z4], u8 = M4, Jm = om, a8 = j4;
 function T6(t, e) {
   wx.call(this, t, e), this._down = null, this._touch = null, this._first = !0, this._events = {};
 }
-const Lje = (t) => t === US || t === qS || t === zS ? [US, qS, zS] : [t];
+const Lje = (t) => t === U4 || t === q4 || t === z4 ? [U4, q4, z4] : [t];
 function uH(t, e) {
   Lje(e).forEach((n) => Ije(t, n));
 }
@@ -117801,7 +117806,7 @@ function lH(t) {
 }
 Fe(T6, wx, {
   initialize(t, e, n) {
-    return this._canvas = t && ese(t, "canvas"), [jS, o8, MS, om, mv].forEach((r) => uH(this, r)), wx.prototype.initialize.call(this, t, e, n);
+    return this._canvas = t && ese(t, "canvas"), [j4, o8, M4, om, mv].forEach((r) => uH(this, r)), wx.prototype.initialize.call(this, t, e, n);
   },
   // return the backing canvas instance
   canvas() {
@@ -117817,7 +117822,7 @@ Fe(T6, wx, {
   DOMMouseScroll(t) {
     this.fire(sse, t);
   },
-  mousemove: aH(MS, ise, om),
+  mousemove: aH(M4, ise, om),
   dragover: aH(rse, nse, mv),
   mouseout: lH(om),
   dragleave: lH(mv),
@@ -117825,16 +117830,16 @@ Fe(T6, wx, {
     this._down = this._active, this.fire(o8, t);
   },
   click(t) {
-    this._down === this._active && (this.fire(jS, t), this._down = null);
+    this._down === this._active && (this.fire(j4, t), this._down = null);
   },
   touchstart(t) {
-    this._touch = this.pickEvent(t.changedTouches[0]), this._first && (this._active = this._touch, this._first = !1), this.fire(US, t, !0);
+    this._touch = this.pickEvent(t.changedTouches[0]), this._first && (this._active = this._touch, this._first = !1), this.fire(U4, t, !0);
   },
   touchmove(t) {
-    this.fire(qS, t, !0);
+    this.fire(q4, t, !0);
   },
   touchend(t) {
-    this.fire(zS, t, !0), this._touch = null;
+    this.fire(z4, t, !0), this._touch = null;
   },
   // fire an event
   fire(t, e, n) {
@@ -118083,7 +118088,7 @@ function pse(t, e) {
   }
   return t.close();
 }
-const HS = {
+const H4 = {
   fill: "fill",
   fillOpacity: "fill-opacity",
   stroke: "stroke",
@@ -118095,7 +118100,7 @@ const HS = {
   strokeDashOffset: "stroke-dashoffset",
   strokeMiterLimit: "stroke-miterlimit",
   opacity: "opacity"
-}, QS = {
+}, Q4 = {
   blend: "mix-blend-mode"
 }, gse = {
   fill: "none",
@@ -118253,15 +118258,15 @@ Fe(mse, Jl, {
    */
   style(t, e) {
     if (e != null) {
-      for (const n in HS) {
+      for (const n in H4) {
         let r = n === "font" ? C6(e) : e[n];
         if (r === Wr[n])
           continue;
-        const i = HS[n];
+        const i = H4[n];
         r == null ? t.removeAttribute(i) : (_$(r) && (r = wie(r, this._defs.gradient, yse())), t.setAttribute(i, r + "")), Wr[n] = r;
       }
-      for (const n in QS)
-        yv(t, QS[n], e[n]);
+      for (const n in Q4)
+        yv(t, Q4[n], e[n]);
     }
   },
   /**
@@ -118298,7 +118303,7 @@ function Yje(t, e, n) {
   if (e.gradient === "radial") {
     let o = Rs(t, n++, "pattern", Kn);
     C0(o, {
-      id: BS + e.id,
+      id: B4 + e.id,
       viewBox: "0,0,1,1",
       width: "100%",
       height: "100%",
@@ -118521,7 +118526,7 @@ Fe(Ese, Jl, {
       for (const i in e) {
         const s = e[i], o = s.stops;
         s.gradient === "radial" ? (t.open("pattern", {
-          id: BS + i,
+          id: B4 + i,
           viewBox: "0,0,1,1",
           width: "100%",
           height: "100%",
@@ -118574,14 +118579,14 @@ function tUe(t, e, n, r, i) {
   if (e == null || (r === "bgrect" && n.interactive === !1 && (t["pointer-events"] = "none"), r === "bgfore" && (n.interactive === !1 && (t["pointer-events"] = "none"), t.display = "none", e.fill !== null)))
     return t;
   r === "image" && e.smooth === !1 && (s = ["image-rendering: optimizeSpeed;", "image-rendering: pixelated;"]), r === "text" && (t["font-family"] = C6(e), t["font-size"] = Xl(e) + "px", t["font-style"] = e.fontStyle, t["font-variant"] = e.fontVariant, t["font-weight"] = e.fontWeight);
-  for (const o in HS) {
+  for (const o in H4) {
     let u = e[o];
-    const a = HS[o];
+    const a = H4[o];
     u === "transparent" && (a === "fill" || a === "stroke") || u != null && (_$(u) && (u = wie(u, i.gradient, "")), t[a] = u);
   }
-  for (const o in QS) {
+  for (const o in Q4) {
     const u = e[o];
-    u != null && (s = s || [], s.push(`${QS[o]}: ${u};`));
+    u != null && (s = s || [], s.push(`${Q4[o]}: ${u};`));
   }
   return s && (t.style = s.join(" ")), t;
 }
@@ -119672,7 +119677,7 @@ const yqe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
   sortitems: Zse,
   stack: nB
 }, Symbol.toStringTag, { value: "Module" }));
-var tt = 1e-6, GS = 1e-12, ht = Math.PI, On = ht / 2, WS = ht / 4, Pi = ht * 2, Ln = 180 / ht, dt = ht / 180, yt = Math.abs, N1 = Math.atan, _o = Math.atan2, nt = Math.cos, SA = Math.ceil, roe = Math.exp, h8 = Math.hypot, VS = Math.log, Q7 = Math.pow, Xe = Math.sin, lo = Math.sign || function(t) {
+var tt = 1e-6, G4 = 1e-12, ht = Math.PI, On = ht / 2, W4 = ht / 4, Pi = ht * 2, Ln = 180 / ht, dt = ht / 180, yt = Math.abs, N1 = Math.atan, _o = Math.atan2, nt = Math.cos, SA = Math.ceil, roe = Math.exp, h8 = Math.hypot, V4 = Math.log, Q7 = Math.pow, Xe = Math.sin, lo = Math.sign || function(t) {
   return t > 0 ? 1 : t < 0 ? -1 : 0;
 }, Mi = Math.sqrt, rB = Math.tan;
 function ioe(t) {
@@ -119683,16 +119688,16 @@ function xs(t) {
 }
 function Dr() {
 }
-function YS(t, e) {
+function Y4(t, e) {
   t && DH.hasOwnProperty(t.type) && DH[t.type](t, e);
 }
 var NH = {
   Feature: function(t, e) {
-    YS(t.geometry, e);
+    Y4(t.geometry, e);
   },
   FeatureCollection: function(t, e) {
     for (var n = t.features, r = -1, i = n.length; ++r < i; )
-      YS(n[r].geometry, e);
+      Y4(n[r].geometry, e);
   }
 }, DH = {
   Sphere: function(t, e) {
@@ -119721,7 +119726,7 @@ var NH = {
   },
   GeometryCollection: function(t, e) {
     for (var n = t.geometries, r = -1, i = n.length; ++r < i; )
-      YS(n[r], e);
+      Y4(n[r], e);
   }
 };
 function p8(t, e, n) {
@@ -119737,21 +119742,21 @@ function FH(t, e) {
   e.polygonEnd();
 }
 function Za(t, e) {
-  t && NH.hasOwnProperty(t.type) ? NH[t.type](t, e) : YS(t, e);
+  t && NH.hasOwnProperty(t.type) ? NH[t.type](t, e) : Y4(t, e);
 }
-var KS = new Di(), XS = new Di(), soe, ooe, g8, m8, y8, sa = {
+var K4 = new Di(), X4 = new Di(), soe, ooe, g8, m8, y8, sa = {
   point: Dr,
   lineStart: Dr,
   lineEnd: Dr,
   polygonStart: function() {
-    KS = new Di(), sa.lineStart = Eqe, sa.lineEnd = Aqe;
+    K4 = new Di(), sa.lineStart = Eqe, sa.lineEnd = Aqe;
   },
   polygonEnd: function() {
-    var t = +KS;
-    XS.add(t < 0 ? Pi + t : t), this.lineStart = this.lineEnd = this.point = Dr;
+    var t = +K4;
+    X4.add(t < 0 ? Pi + t : t), this.lineStart = this.lineEnd = this.point = Dr;
   },
   sphere: function() {
-    XS.add(Pi);
+    X4.add(Pi);
   }
 };
 function Eqe() {
@@ -119761,17 +119766,17 @@ function Aqe() {
   uoe(soe, ooe);
 }
 function vqe(t, e) {
-  sa.point = uoe, soe = t, ooe = e, t *= dt, e *= dt, g8 = t, m8 = nt(e = e / 2 + WS), y8 = Xe(e);
+  sa.point = uoe, soe = t, ooe = e, t *= dt, e *= dt, g8 = t, m8 = nt(e = e / 2 + W4), y8 = Xe(e);
 }
 function uoe(t, e) {
-  t *= dt, e *= dt, e = e / 2 + WS;
+  t *= dt, e *= dt, e = e / 2 + W4;
   var n = t - g8, r = n >= 0 ? 1 : -1, i = r * n, s = nt(e), o = Xe(e), u = y8 * o, a = m8 * s + u * nt(i), l = u * r * Xe(i);
-  KS.add(_o(l, a)), g8 = t, m8 = s, y8 = o;
+  K4.add(_o(l, a)), g8 = t, m8 = s, y8 = o;
 }
 function Sqe(t) {
-  return XS = new Di(), Za(t, sa), XS * 2;
+  return X4 = new Di(), Za(t, sa), X4 * 2;
 }
-function JS(t) {
+function J4(t) {
   return [_o(t[1], t[0]), xs(t[2])];
 }
 function Lx(t) {
@@ -119790,7 +119795,7 @@ function G7(t, e) {
 function CA(t, e) {
   return [t[0] * e, t[1] * e, t[2] * e];
 }
-function ZS(t) {
+function Z4(t) {
   var e = Mi(t[0] * t[0] + t[1] * t[1] + t[2] * t[2]);
   t[0] /= e, t[1] /= e, t[2] /= e;
 }
@@ -119802,7 +119807,7 @@ var dn, Zi, An, bs, Ff, aoe, loe, Ah, am, y0, Ll, Ka = {
     Ka.point = foe, Ka.lineStart = _qe, Ka.lineEnd = Cqe, am = new Di(), sa.polygonStart();
   },
   polygonEnd: function() {
-    sa.polygonEnd(), Ka.point = E8, Ka.lineStart = wH, Ka.lineEnd = LH, KS < 0 ? (dn = -(An = 180), Zi = -(bs = 90)) : am > tt ? bs = 90 : am < -tt && (Zi = -90), Ll[0] = dn, Ll[1] = An;
+    sa.polygonEnd(), Ka.point = E8, Ka.lineStart = wH, Ka.lineEnd = LH, K4 < 0 ? (dn = -(An = 180), Zi = -(bs = 90)) : am > tt ? bs = 90 : am < -tt && (Zi = -90), Ll[0] = dn, Ll[1] = An;
   },
   sphere: function() {
     dn = -(An = 180), Zi = -(bs = 90);
@@ -119815,7 +119820,7 @@ function coe(t, e) {
   var n = Lx([t * dt, e * dt]);
   if (Ah) {
     var r = y2(Ah, n), i = [r[1], -r[0], 0], s = y2(i, r);
-    ZS(s), s = JS(s);
+    Z4(s), s = J4(s);
     var o = t - Ff, u = o > 0 ? 1 : -1, a = s[0] * Ln * u, l, c = yt(o) > 180;
     c ^ (u * Ff < a && a < u * t) ? (l = s[1] * Ln, l > bs && (bs = l)) : (a = (a + 360) % 360 - 180, c ^ (u * Ff < a && a < u * t) ? (l = -s[1] * Ln, l < Zi && (Zi = l)) : (e < Zi && (Zi = e), e > bs && (bs = e))), c ? t < Ff ? Cs(dn, t) > Cs(dn, An) && (An = t) : Cs(t, An) > Cs(dn, An) && (dn = t) : An >= dn ? (t < dn && (dn = t), t > An && (An = t)) : t > Ff ? Cs(dn, t) > Cs(dn, An) && (An = t) : Cs(t, An) > Cs(dn, An) && (dn = t);
   } else
@@ -119861,7 +119866,7 @@ function Tqe(t) {
   }
   return y0 = Ll = null, dn === 1 / 0 || Zi === 1 / 0 ? [[NaN, NaN], [NaN, NaN]] : [[dn, Zi], [An, bs]];
 }
-var Mg, e4, t4, n4, r4, i4, s4, o4, A8, v8, S8, xoe, doe, Ai, vi, Si, zo = {
+var Mg, eS, tS, nS, rS, iS, sS, oS, A8, v8, S8, xoe, doe, Ai, vi, Si, zo = {
   sphere: Dr,
   point: iB,
   lineStart: $H,
@@ -119879,7 +119884,7 @@ function iB(t, e) {
   dE(n * nt(t), n * Xe(t), Xe(e));
 }
 function dE(t, e, n) {
-  ++Mg, t4 += (t - t4) / Mg, n4 += (e - n4) / Mg, r4 += (n - r4) / Mg;
+  ++Mg, tS += (t - tS) / Mg, nS += (e - nS) / Mg, rS += (n - rS) / Mg;
 }
 function $H() {
   zo.point = Rqe;
@@ -119892,7 +119897,7 @@ function Rqe(t, e) {
 function Oqe(t, e) {
   t *= dt, e *= dt;
   var n = nt(e), r = n * nt(t), i = n * Xe(t), s = Xe(e), o = _o(Mi((o = vi * s - Si * i) * o + (o = Si * r - Ai * s) * o + (o = Ai * i - vi * r) * o), Ai * r + vi * i + Si * s);
-  e4 += o, i4 += o * (Ai + (Ai = r)), s4 += o * (vi + (vi = i)), o4 += o * (Si + (Si = s)), dE(Ai, vi, Si);
+  eS += o, iS += o * (Ai + (Ai = r)), sS += o * (vi + (vi = i)), oS += o * (Si + (Si = s)), dE(Ai, vi, Si);
 }
 function BH() {
   zo.point = iB;
@@ -119911,12 +119916,12 @@ function Fqe(t, e) {
 function hoe(t, e) {
   t *= dt, e *= dt;
   var n = nt(e), r = n * nt(t), i = n * Xe(t), s = Xe(e), o = vi * s - Si * i, u = Si * r - Ai * s, a = Ai * i - vi * r, l = h8(o, u, a), c = xs(l), f = l && -c / l;
-  A8.add(f * o), v8.add(f * u), S8.add(f * a), e4 += c, i4 += c * (Ai + (Ai = r)), s4 += c * (vi + (vi = i)), o4 += c * (Si + (Si = s)), dE(Ai, vi, Si);
+  A8.add(f * o), v8.add(f * u), S8.add(f * a), eS += c, iS += c * (Ai + (Ai = r)), sS += c * (vi + (vi = i)), oS += c * (Si + (Si = s)), dE(Ai, vi, Si);
 }
 function wqe(t) {
-  Mg = e4 = t4 = n4 = r4 = i4 = s4 = o4 = 0, A8 = new Di(), v8 = new Di(), S8 = new Di(), Za(t, zo);
+  Mg = eS = tS = nS = rS = iS = sS = oS = 0, A8 = new Di(), v8 = new Di(), S8 = new Di(), Za(t, zo);
   var e = +A8, n = +v8, r = +S8, i = h8(e, n, r);
-  return i < GS && (e = i4, n = s4, r = o4, e4 < tt && (e = t4, n = n4, r = r4), i = h8(e, n, r), i < GS) ? [NaN, NaN] : [_o(n, e) * Ln, xs(r / i) * Ln];
+  return i < G4 && (e = iS, n = sS, r = oS, eS < tt && (e = tS, n = nS, r = rS), i = h8(e, n, r), i < G4) ? [NaN, NaN] : [_o(n, e) * Ln, xs(r / i) * Ln];
 }
 function _8(t, e) {
   function n(r, i) {
@@ -119973,11 +119978,11 @@ function Iqe(t, e, n, r, i, s) {
     var o = nt(e), u = Xe(e), a = r * n;
     i == null ? (i = e + r * Pi, s = e - a / 2) : (i = jH(o, i), s = jH(o, s), (r > 0 ? i < s : i > s) && (i += r * Pi));
     for (var l, c = i; r > 0 ? c > s : c < s; c -= a)
-      l = JS([o, -u * nt(c), -u * Xe(c)]), t.point(l[0], l[1]);
+      l = J4([o, -u * nt(c), -u * Xe(c)]), t.point(l[0], l[1]);
   }
 }
 function jH(t, e) {
-  e = Lx(e), e[0] -= t, ZS(e);
+  e = Lx(e), e[0] -= t, Z4(e);
   var n = ioe(-e[1]);
   return ((-e[2] < 0 ? -n : n) + Pi - tt) % Pi;
 }
@@ -120067,18 +120072,18 @@ function $qe(t, e) {
   i === 1 ? r = On + tt : i === -1 && (r = -On - tt);
   for (var l = 0, c = t.length; l < c; ++l)
     if (x = (f = t[l]).length)
-      for (var f, x, h = f[x - 1], p = W7(h), m = h[1] / 2 + WS, g = Xe(m), y = nt(m), E = 0; E < x; ++E, p = v, g = C, y = _, h = A) {
-        var A = f[E], v = W7(A), S = A[1] / 2 + WS, C = Xe(S), _ = nt(S), b = v - p, R = b >= 0 ? 1 : -1, O = R * b, L = O > ht, M = g * C;
+      for (var f, x, h = f[x - 1], p = W7(h), m = h[1] / 2 + W4, g = Xe(m), y = nt(m), E = 0; E < x; ++E, p = v, g = C, y = _, h = A) {
+        var A = f[E], v = W7(A), S = A[1] / 2 + W4, C = Xe(S), _ = nt(S), b = v - p, R = b >= 0 ? 1 : -1, O = R * b, L = O > ht, M = g * C;
         if (a.add(_o(M * R * Xe(O), y * _ + M * nt(O))), o += L ? b + R * Pi : b, L ^ p >= n ^ v >= n) {
           var q = y2(Lx(h), Lx(A));
-          ZS(q);
+          Z4(q);
           var W = y2(s, q);
-          ZS(W);
+          Z4(W);
           var B = (L ^ b >= 0 ? -1 : 1) * xs(W[2]);
           (r > B || r === B && (q[0] || q[1])) && (u += L ^ b >= 0 ? 1 : -1);
         }
       }
-  return (o < -tt || o < tt && a < -GS) ^ u & 1;
+  return (o < -tt || o < tt && a < -G4) ^ u & 1;
 }
 function yoe(t, e, n, r) {
   return function(i) {
@@ -120223,14 +120228,14 @@ function Uqe(t) {
     var R = C, O = _A(_, R), L = _A(R, R), M = O * O - L * (_A(_, _) - 1);
     if (!(M < 0)) {
       var q = Mi(M), W = CA(R, (-O - q) / L);
-      if (G7(W, _), W = JS(W), !x)
+      if (G7(W, _), W = J4(W), !x)
         return W;
       var B = c[0], G = f[0], te = c[1], X = f[1], de;
       G < B && (de = B, B = G, G = de);
       var be = G - B, ee = yt(be - ht) < tt, U = ee || be < tt;
       if (!ee && X < te && (de = te, te = X, X = de), U ? ee ? te + X > 0 ^ W[1] < (yt(W[0] - B) < tt ? te : X) : te <= W[1] && W[1] <= X : be > ht ^ (B <= W[0] && W[0] <= G)) {
         var T = CA(R, (-O + q) / L);
-        return G7(T, _), [W, JS(T)];
+        return G7(T, _), [W, J4(T)];
       }
     }
   }
@@ -120444,21 +120449,21 @@ function Soe(t, e) {
 function Gqe() {
   Soe(Aoe, voe);
 }
-var E2 = 1 / 0, u4 = E2, e3 = -E2, a4 = e3, l4 = {
+var E2 = 1 / 0, uS = E2, e3 = -E2, aS = e3, lS = {
   point: Wqe,
   lineStart: Dr,
   lineEnd: Dr,
   polygonStart: Dr,
   polygonEnd: Dr,
   result: function() {
-    var t = [[E2, u4], [e3, a4]];
-    return e3 = a4 = -(u4 = E2 = 1 / 0), t;
+    var t = [[E2, uS], [e3, aS]];
+    return e3 = aS = -(uS = E2 = 1 / 0), t;
   }
 };
 function Wqe(t, e) {
-  t < E2 && (E2 = t), t > e3 && (e3 = t), e < u4 && (u4 = e), e > a4 && (a4 = e);
+  t < E2 && (E2 = t), t > e3 && (e3 = t), e < uS && (uS = e), e > aS && (aS = e);
 }
-var O8 = 0, N8 = 0, Ug = 0, c4 = 0, f4 = 0, fh = 0, D8 = 0, F8 = 0, qg = 0, _oe, Coe, ku, Pu, so = {
+var O8 = 0, N8 = 0, Ug = 0, cS = 0, fS = 0, fh = 0, D8 = 0, F8 = 0, qg = 0, _oe, Coe, ku, Pu, so = {
   point: Ix,
   lineStart: QH,
   lineEnd: GH,
@@ -120469,8 +120474,8 @@ var O8 = 0, N8 = 0, Ug = 0, c4 = 0, f4 = 0, fh = 0, D8 = 0, F8 = 0, qg = 0, _oe,
     so.point = Ix, so.lineStart = QH, so.lineEnd = GH;
   },
   result: function() {
-    var t = qg ? [D8 / qg, F8 / qg] : fh ? [c4 / fh, f4 / fh] : Ug ? [O8 / Ug, N8 / Ug] : [NaN, NaN];
-    return O8 = N8 = Ug = c4 = f4 = fh = D8 = F8 = qg = 0, t;
+    var t = qg ? [D8 / qg, F8 / qg] : fh ? [cS / fh, fS / fh] : Ug ? [O8 / Ug, N8 / Ug] : [NaN, NaN];
+    return O8 = N8 = Ug = cS = fS = fh = D8 = F8 = qg = 0, t;
   }
 };
 function Ix(t, e) {
@@ -120484,7 +120489,7 @@ function Vqe(t, e) {
 }
 function Yqe(t, e) {
   var n = t - ku, r = e - Pu, i = Mi(n * n + r * r);
-  c4 += i * (ku + t) / 2, f4 += i * (Pu + e) / 2, fh += i, Ix(ku = t, Pu = e);
+  cS += i * (ku + t) / 2, fS += i * (Pu + e) / 2, fh += i, Ix(ku = t, Pu = e);
 }
 function GH() {
   so.point = Ix;
@@ -120500,7 +120505,7 @@ function Jqe(t, e) {
 }
 function boe(t, e) {
   var n = t - ku, r = e - Pu, i = Mi(n * n + r * r);
-  c4 += i * (ku + t) / 2, f4 += i * (Pu + e) / 2, fh += i, i = Pu * t - ku * e, D8 += i * (ku + t), F8 += i * (Pu + e), qg += i * 3, Ix(ku = t, Pu = e);
+  cS += i * (ku + t) / 2, fS += i * (Pu + e) / 2, fh += i, i = Pu * t - ku * e, D8 += i * (ku + t), F8 += i * (Pu + e), qg += i * 3, Ix(ku = t, Pu = e);
 }
 function Toe(t) {
   this._context = t;
@@ -120565,7 +120570,7 @@ function Zqe(t, e) {
 function Noe(t, e) {
   zg -= t, Hg -= e, w8.add(Mi(zg * zg + Hg * Hg)), zg = t, Hg = e;
 }
-let WH, x4, VH, YH;
+let WH, xS, VH, YH;
 class KH {
   constructor(e) {
     this._append = e == null ? Doe : eze(e), this._radius = 4.5, this._ = "";
@@ -120596,9 +120601,9 @@ class KH {
         break;
       }
       default: {
-        if (this._append`M${e},${n}`, this._radius !== VH || this._append !== x4) {
+        if (this._append`M${e},${n}`, this._radius !== VH || this._append !== xS) {
           const r = this._radius, i = this._;
-          this._ = "", this._append`m0,${r}a${r},${r} 0 1,1 0,${-2 * r}a${r},${r} 0 1,1 0,${2 * r}z`, VH = r, x4 = this._append, YH = this._, this._ = i;
+          this._ = "", this._append`m0,${r}a${r},${r} 0 1,1 0,${-2 * r}a${r},${r} 0 1,1 0,${2 * r}z`, VH = r, xS = this._append, YH = this._, this._ = i;
         }
         this._ += YH;
         break;
@@ -120624,14 +120629,14 @@ function eze(t) {
     return Doe;
   if (e !== WH) {
     const n = 10 ** e;
-    WH = e, x4 = function(i) {
+    WH = e, xS = function(i) {
       let s = 1;
       this._ += i[0];
       for (const o = i.length; s < o; ++s)
         this._ += Math.round(arguments[s] * n) / n + i[s];
     };
   }
-  return x4;
+  return xS;
 }
 function Foe(t, e) {
   let n = 3, r = 4.5, i, s;
@@ -120643,7 +120648,7 @@ function Foe(t, e) {
   }, o.measure = function(u) {
     return Za(u, i(t3)), t3.result();
   }, o.bounds = function(u) {
-    return Za(u, i(l4)), l4.result();
+    return Za(u, i(lS)), lS.result();
   }, o.centroid = function(u) {
     return Za(u, i(so)), so.result();
   }, o.projection = function(u) {
@@ -120699,7 +120704,7 @@ L8.prototype = {
 };
 function sB(t, e, n) {
   var r = t.clipExtent && t.clipExtent();
-  return t.scale(150).translate([0, 0]), r != null && t.clipExtent(null), Za(n, t.stream(l4)), e(l4.result()), r != null && t.clipExtent(r), t;
+  return t.scale(150).translate([0, 0]), r != null && t.clipExtent(null), Za(n, t.stream(lS)), e(lS.result()), r != null && t.clipExtent(r), t;
 }
 function N6(t, e, n) {
   return sB(t, function(r) {
@@ -120898,11 +120903,11 @@ function aze(t, e) {
     return l * r < 0 && (c -= ht * lo(u) * lo(l)), [c / r, xs((i - (u * u + l * l) * r * r) / (2 * r))];
   }, o;
 }
-function d4() {
+function dS() {
   return lB(aze).scale(155.424).center([0, 33.6442]);
 }
 function Loe() {
-  return d4().parallels([29.5, 45.5]).scale(1070).translate([480, 250]).rotate([96, 0]).center([-0.6, 38.7]);
+  return dS().parallels([29.5, 45.5]).scale(1070).translate([480, 250]).rotate([96, 0]).center([-0.6, 38.7]);
 }
 function lze(t) {
   var e = t.length;
@@ -120934,7 +120939,7 @@ function lze(t) {
   };
 }
 function cze() {
-  var t, e, n = Loe(), r, i = d4().rotate([154, 0]).center([-2, 58.5]).parallels([55, 65]), s, o = d4().rotate([157, 0]).center([-3, 19.9]).parallels([8, 18]), u, a, l = { point: function(x, h) {
+  var t, e, n = Loe(), r, i = dS().rotate([154, 0]).center([-2, 58.5]).parallels([55, 65]), s, o = dS().rotate([157, 0]).center([-3, 19.9]).parallels([8, 18]), u, a, l = { point: function(x, h) {
     a = [x, h];
   } };
   function c(x) {
@@ -121006,7 +121011,7 @@ function xze() {
   return Ia(Boe).scale(79.4188).clipAngle(180 - 1e-3);
 }
 function D6(t, e) {
-  return [t, VS(rB((On + e) / 2))];
+  return [t, V4(rB((On + e) / 2))];
 }
 D6.invert = function(t, e) {
   return [t, 2 * N1(roe(e)) - On];
@@ -121035,7 +121040,7 @@ function RA(t) {
   return rB((On + t) / 2);
 }
 function hze(t, e) {
-  var n = nt(t), r = t === e ? Xe(t) : VS(n / nt(e)) / VS(RA(e) / RA(t)), i = n * Q7(RA(t), r) / r;
+  var n = nt(t), r = t === e ? Xe(t) : V4(n / nt(e)) / V4(RA(e) / RA(t)), i = n * Q7(RA(t), r) / r;
   if (!r)
     return D6;
   function s(o, u) {
@@ -121051,17 +121056,17 @@ function hze(t, e) {
 function pze() {
   return lB(hze).scale(109.5).parallels([30, 30]);
 }
-function h4(t, e) {
+function hS(t, e) {
   return [t, e];
 }
-h4.invert = h4;
+hS.invert = hS;
 function gze() {
-  return Ia(h4).scale(152.63);
+  return Ia(hS).scale(152.63);
 }
 function mze(t, e) {
   var n = nt(t), r = t === e ? Xe(t) : (n - nt(e)) / (e - t), i = n / r + t;
   if (yt(r) < tt)
-    return h4;
+    return hS;
   function s(o, u) {
     var a = i - u, l = r * o;
     return [a * Xe(l), i - a * nt(l)];
@@ -121074,20 +121079,20 @@ function mze(t, e) {
 function yze() {
   return lB(mze).scale(131.154).center([0, 13.9389]);
 }
-var lm = 1.340264, cm = -0.081106, fm = 893e-6, xm = 3796e-6, p4 = Mi(3) / 2, Eze = 12;
+var lm = 1.340264, cm = -0.081106, fm = 893e-6, xm = 3796e-6, pS = Mi(3) / 2, Eze = 12;
 function Poe(t, e) {
-  var n = xs(p4 * Xe(e)), r = n * n, i = r * r * r;
+  var n = xs(pS * Xe(e)), r = n * n, i = r * r * r;
   return [
-    t * nt(n) / (p4 * (lm + 3 * cm * r + i * (7 * fm + 9 * xm * r))),
+    t * nt(n) / (pS * (lm + 3 * cm * r + i * (7 * fm + 9 * xm * r))),
     n * (lm + cm * r + i * (fm + xm * r))
   ];
 }
 Poe.invert = function(t, e) {
-  for (var n = e, r = n * n, i = r * r * r, s = 0, o, u, a; s < Eze && (u = n * (lm + cm * r + i * (fm + xm * r)) - e, a = lm + 3 * cm * r + i * (7 * fm + 9 * xm * r), n -= o = u / a, r = n * n, i = r * r * r, !(yt(o) < GS)); ++s)
+  for (var n = e, r = n * n, i = r * r * r, s = 0, o, u, a; s < Eze && (u = n * (lm + cm * r + i * (fm + xm * r)) - e, a = lm + 3 * cm * r + i * (7 * fm + 9 * xm * r), n -= o = u / a, r = n * n, i = r * r * r, !(yt(o) < G4)); ++s)
     ;
   return [
-    p4 * t * (lm + 3 * cm * r + i * (7 * fm + 9 * xm * r)) / nt(n),
-    xs(Xe(n) / p4)
+    pS * t * (lm + 3 * cm * r + i * (7 * fm + 9 * xm * r)) / nt(n),
+    xs(Xe(n) / pS)
   ];
 };
 function Aze() {
@@ -121191,7 +121196,7 @@ function bze() {
   return Ia(qoe).scale(250).clipAngle(142);
 }
 function zoe(t, e) {
-  return [VS(rB((On + e) / 2)), -t];
+  return [V4(rB((On + e) / 2)), -t];
 }
 zoe.invert = function(t, e) {
   return [-e, 2 * N1(roe(t)) - On];
@@ -121204,7 +121209,7 @@ function Tze() {
     return arguments.length ? n([r[0], r[1], r.length > 2 ? r[2] + 90 : 90]) : (r = n(), [r[0], r[1], r[2] - 90]);
   }, n([0, 0, 90]).scale(159.155);
 }
-var Rze = Math.abs, I8 = Math.cos, g4 = Math.sin, Oze = 1e-6, Hoe = Math.PI, $8 = Hoe / 2, eQ = Nze(2);
+var Rze = Math.abs, I8 = Math.cos, gS = Math.sin, Oze = 1e-6, Hoe = Math.PI, $8 = Hoe / 2, eQ = Nze(2);
 function tQ(t) {
   return t > 1 ? $8 : t < -1 ? -$8 : Math.asin(t);
 }
@@ -121212,18 +121217,18 @@ function Nze(t) {
   return t > 0 ? Math.sqrt(t) : 0;
 }
 function Dze(t, e) {
-  var n = t * g4(e), r = 30, i;
+  var n = t * gS(e), r = 30, i;
   do
-    e -= i = (e + g4(e) - n) / (1 + I8(e));
+    e -= i = (e + gS(e) - n) / (1 + I8(e));
   while (Rze(i) > Oze && --r > 0);
   return e / 2;
 }
 function Fze(t, e, n) {
   function r(i, s) {
-    return [t * i * I8(s = Dze(n, s)), e * g4(s)];
+    return [t * i * I8(s = Dze(n, s)), e * gS(s)];
   }
   return r.invert = function(i, s) {
-    return s = tQ(s / e), [i / (t * I8(s)), tQ((2 * s + g4(2 * s)) / n)];
+    return s = tQ(s / e), [i / (t * I8(s)), tQ((2 * s + gS(2 * s)) / n)];
   }, r;
 }
 var wze = Fze(eQ / $8, eQ, Hoe);
@@ -121267,19 +121272,19 @@ function $ze(t, e) {
 function Qoe(t, e) {
   if (!t || typeof t != "string")
     throw new Error("Projection type must be a name string.");
-  return t = t.toLowerCase(), arguments.length > 1 ? (m4[t] = $ze(t, e), this) : m4[t] || null;
+  return t = t.toLowerCase(), arguments.length > 1 ? (mS[t] = $ze(t, e), this) : mS[t] || null;
 }
 function Goe(t) {
   return t && t.path || Ize;
 }
-const m4 = {
+const mS = {
   // base d3-geo projection types
   albers: Loe,
   albersusa: cze,
   azimuthalequalarea: fze,
   azimuthalequidistant: xze,
   conicconformal: pze,
-  conicequalarea: d4,
+  conicequalarea: dS,
   conicequidistant: yze,
   equalEarth: Aze,
   equirectangular: gze,
@@ -121292,8 +121297,8 @@ const m4 = {
   stereographic: bze,
   transversemercator: Tze
 };
-for (const t in m4)
-  Qoe(t, m4[t]);
+for (const t in mS)
+  Qoe(t, mS[t]);
 function Bze() {
 }
 const Ga = [[], [[[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]]], []];
@@ -122430,7 +122435,7 @@ function oQ(t, e, n) {
     }
   return n != null && t.push({ name: e, value: n }), t;
 }
-var A2 = 0, Qg = 0, pg = 0, nue = 1e3, y4, Gg, E4 = 0, $x = 0, F6 = 0, n3 = typeof performance == "object" && performance.now ? performance : Date, rue = typeof window == "object" && window.requestAnimationFrame ? window.requestAnimationFrame.bind(window) : function(t) {
+var A2 = 0, Qg = 0, pg = 0, nue = 1e3, yS, Gg, ES = 0, $x = 0, F6 = 0, n3 = typeof performance == "object" && performance.now ? performance : Date, rue = typeof window == "object" && window.requestAnimationFrame ? window.requestAnimationFrame.bind(window) : function(t) {
   setTimeout(t, 17);
 };
 function SB() {
@@ -122439,32 +122444,32 @@ function SB() {
 function NHe() {
   $x = 0;
 }
-function A4() {
+function AS() {
   this._call = this._time = this._next = null;
 }
-A4.prototype = iue.prototype = {
-  constructor: A4,
+AS.prototype = iue.prototype = {
+  constructor: AS,
   restart: function(t, e, n) {
     if (typeof t != "function")
       throw new TypeError("callback is not a function");
-    n = (n == null ? SB() : +n) + (e == null ? 0 : +e), !this._next && Gg !== this && (Gg ? Gg._next = this : y4 = this, Gg = this), this._call = t, this._time = n, P8();
+    n = (n == null ? SB() : +n) + (e == null ? 0 : +e), !this._next && Gg !== this && (Gg ? Gg._next = this : yS = this, Gg = this), this._call = t, this._time = n, P8();
   },
   stop: function() {
     this._call && (this._call = null, this._time = 1 / 0, P8());
   }
 };
 function iue(t, e, n) {
-  var r = new A4();
+  var r = new AS();
   return r.restart(t, e, n), r;
 }
 function DHe() {
   SB(), ++A2;
-  for (var t = y4, e; t; )
+  for (var t = yS, e; t; )
     (e = $x - t._time) >= 0 && t._call.call(void 0, e), t = t._next;
   --A2;
 }
 function uQ() {
-  $x = (E4 = n3.now()) + F6, A2 = Qg = 0;
+  $x = (ES = n3.now()) + F6, A2 = Qg = 0;
   try {
     DHe();
   } finally {
@@ -122472,23 +122477,23 @@ function uQ() {
   }
 }
 function FHe() {
-  var t = n3.now(), e = t - E4;
-  e > nue && (F6 -= e, E4 = t);
+  var t = n3.now(), e = t - ES;
+  e > nue && (F6 -= e, ES = t);
 }
 function wHe() {
-  for (var t, e = y4, n, r = 1 / 0; e; )
-    e._call ? (r > e._time && (r = e._time), t = e, e = e._next) : (n = e._next, e._next = null, e = t ? t._next = n : y4 = n);
+  for (var t, e = yS, n, r = 1 / 0; e; )
+    e._call ? (r > e._time && (r = e._time), t = e, e = e._next) : (n = e._next, e._next = null, e = t ? t._next = n : yS = n);
   Gg = t, P8(r);
 }
 function P8(t) {
   if (!A2) {
     Qg && (Qg = clearTimeout(Qg));
     var e = t - $x;
-    e > 24 ? (t < 1 / 0 && (Qg = setTimeout(uQ, t - n3.now() - F6)), pg && (pg = clearInterval(pg))) : (pg || (E4 = n3.now(), pg = setInterval(FHe, nue)), A2 = 1, rue(uQ));
+    e > 24 ? (t < 1 / 0 && (Qg = setTimeout(uQ, t - n3.now() - F6)), pg && (pg = clearInterval(pg))) : (pg || (ES = n3.now(), pg = setInterval(FHe, nue)), A2 = 1, rue(uQ));
   }
 }
 function LHe(t, e, n) {
-  var r = new A4(), i = e;
+  var r = new AS(), i = e;
   return e == null ? (r.restart(t, e, n), r) : (r._restart = r.restart, r.restart = function(s, o, u) {
     o = +o, u = u == null ? SB() : +u, r._restart(function a(l) {
       l += i, r._restart(a, i += o, u), s(l);
@@ -124072,7 +124077,7 @@ function lGe(t, e, n, r) {
     return g = c / 2, y = l / 2, x = o.x - g, h = o.x + g, p = o.y - y, m = o.y + y, o.align = "center", x < 0 && h <= i ? o.align = "left" : 0 <= x && i < h && (o.align = "right"), o.baseline = "middle", p < 0 && m <= s ? o.baseline = "top" : 0 <= p && s < m && (o.baseline = "bottom"), !0;
   };
 }
-function v4(t, e, n, r, i, s) {
+function vS(t, e, n, r, i, s) {
   let o = n / 2;
   return t - o < 0 || t + o > i || e - (o = r / 2) < 0 || e + o > s;
 }
@@ -124085,7 +124090,7 @@ function cGe(t, e, n, r) {
   function a(l, c, f, x, h) {
     const p = t.invert(l), m = t.invert(c);
     let g = f, y = s, E;
-    if (!v4(p, m, x, h, i, s) && !O0(t, p, m, h, x, g, o, u) && !O0(t, p, m, h, x, h, o, null)) {
+    if (!vS(p, m, x, h, i, s) && !O0(t, p, m, h, x, g, o, u) && !O0(t, p, m, h, x, h, o, null)) {
       for (; y - g >= 1; )
         E = (g + y) / 2, O0(t, p, m, h, x, E, o, u) ? y = E : g = E;
       if (g > f)
@@ -124102,7 +124107,7 @@ function cGe(t, e, n, r) {
       for (b = L; b <= M; ++b)
         for (R = W; R <= B; ++R)
           te = a(b, R, p, h, x), te && ([l.x, l.y, p, m] = te);
-      !m && !n && (G = Math.abs(A - E + S - v), C = (E + A) / 2, _ = (v + S) / 2, G >= y && !v4(C, _, h, x, i, s) && !O0(t, C, _, x, h, x, o, null) && (y = G, l.x = C, l.y = _, g = !0));
+      !m && !n && (G = Math.abs(A - E + S - v), C = (E + A) / 2, _ = (v + S) / 2, G >= y && !vS(C, _, h, x, i, s) && !O0(t, C, _, x, h, x, o, null) && (y = G, l.x = C, l.y = _, g = !0));
     }
     return m || g ? (C = h / 2, _ = x / 2, o.setRange(t(l.x - C), t(l.y - _), t(l.x + C), t(l.y + _)), l.align = "center", l.baseline = "middle", !0) : !1;
   };
@@ -124119,13 +124124,13 @@ function dGe(t, e, n, r) {
           a.set(R, O);
           for (let G = 0; G < 4; ++G)
             _ = R + fGe[G], b = O + xGe[G], a.outOfBounds(_, b, _, b) || p.push([_, b]);
-          if (_ = t.invert(R), b = t.invert(O), L = m, M = s, !v4(_, b, h, x, i, s) && !O0(t, _, b, x, h, L, o, u) && !O0(t, _, b, x, h, x, o, null)) {
+          if (_ = t.invert(R), b = t.invert(O), L = m, M = s, !vS(_, b, h, x, i, s) && !O0(t, _, b, x, h, L, o, u) && !O0(t, _, b, x, h, x, o, null)) {
             for (; M - L >= 1; )
               q = (L + M) / 2, O0(t, _, b, x, h, q, o, u) ? M = q : L = q;
             L > m && (l.x = _, l.y = b, m = L, g = !0);
           }
         }
-      !g && !n && (W = Math.abs(v - A + C - S), _ = (A + v) / 2, b = (S + C) / 2, W >= E && !v4(_, b, h, x, i, s) && !O0(t, _, b, x, h, x, o, null) && (E = W, l.x = _, l.y = b, y = !0));
+      !g && !n && (W = Math.abs(v - A + C - S), _ = (A + v) / 2, b = (S + C) / 2, W >= E && !vS(_, b, h, x, i, s) && !O0(t, _, b, x, h, x, o, null) && (E = W, l.x = _, l.y = b, y = !0));
     }
     return g || y ? (_ = h / 2, b = x / 2, o.setRange(t(l.x - _), t(l.y - b), t(l.x + _), t(l.y + b)), l.align = "center", l.baseline = "middle", !0) : !1;
   };
@@ -124508,14 +124513,14 @@ function DA(t, e, n, r, i, s) {
   return Math.abs(a) >= NGe * l ? a : -wGe(t, e, n, r, i, s, l);
 }
 const bQ = Math.pow(2, -52), FA = new Uint32Array(512);
-class S4 {
+class SS {
   static from(e, n = kGe, r = PGe) {
     const i = e.length, s = new Float64Array(i * 2);
     for (let o = 0; o < i; o++) {
       const u = e[o];
       s[2 * o] = n(u), s[2 * o + 1] = r(u);
     }
-    return new S4(s);
+    return new SS(s);
   }
   constructor(e) {
     const n = e.length >> 1;
@@ -125039,7 +125044,7 @@ class $B {
     return new $B("length" in e ? QGe(e, n, r, i) : Float64Array.from(GGe(e, n, r, i)));
   }
   constructor(e) {
-    this._delaunator = new S4(e), this.inedges = new Int32Array(e.length / 2), this._hullIndex = new Int32Array(e.length / 2), this.points = this._delaunator.coords, this._init();
+    this._delaunator = new SS(e), this.inedges = new Int32Array(e.length / 2), this._hullIndex = new Int32Array(e.length / 2), this.points = this._delaunator.coords, this._init();
   }
   update() {
     return this._delaunator.update(), this._init(), this;
@@ -125053,7 +125058,7 @@ class $B {
         const p = HGe(n[2 * x], n[2 * x + 1], f);
         n[2 * x] = p[0], n[2 * x + 1] = p[1];
       }
-      this._delaunator = new S4(n);
+      this._delaunator = new SS(n);
     } else
       delete this.collinear;
     const r = this.halfedges = this._delaunator.halfedges, i = this.hull = this._delaunator.hull, s = this.triangles = this._delaunator.triangles, o = this.inedges.fill(-1), u = this._hullIndex.fill(-1);
@@ -125882,7 +125887,7 @@ function EE(t) {
   t === 92 || // \ (backslash)
   t >= 128 && UWe.test(String.fromCharCode(t));
 }
-function _4(t) {
+function _S(t) {
   return t === 36 || t === 95 || // $ (dollar) and _ (underscore)
   t >= 65 && t <= 90 || // A..Z
   t >= 97 && t <= 122 || // a..z
@@ -125957,8 +125962,8 @@ function QWe() {
 }
 function _ue() {
   var t, e;
-  for (t = We.charCodeAt(Ee++), e = String.fromCharCode(t), t === 92 && (We.charCodeAt(Ee) !== 117 && Ot({}, pr, Fr), ++Ee, t = K8("u"), (!t || t === "\\" || !EE(t.charCodeAt(0))) && Ot({}, pr, Fr), e = t); Ee < Zr && (t = We.charCodeAt(Ee), !!_4(t)); )
-    ++Ee, e += String.fromCharCode(t), t === 92 && (e = e.substr(0, e.length - 1), We.charCodeAt(Ee) !== 117 && Ot({}, pr, Fr), ++Ee, t = K8("u"), (!t || t === "\\" || !_4(t.charCodeAt(0))) && Ot({}, pr, Fr), e += t);
+  for (t = We.charCodeAt(Ee++), e = String.fromCharCode(t), t === 92 && (We.charCodeAt(Ee) !== 117 && Ot({}, pr, Fr), ++Ee, t = K8("u"), (!t || t === "\\" || !EE(t.charCodeAt(0))) && Ot({}, pr, Fr), e = t); Ee < Zr && (t = We.charCodeAt(Ee), !!_S(t)); )
+    ++Ee, e += String.fromCharCode(t), t === 92 && (e = e.substr(0, e.length - 1), We.charCodeAt(Ee) !== 117 && Ot({}, pr, Fr), ++Ee, t = K8("u"), (!t || t === "\\" || !_S(t.charCodeAt(0))) && Ot({}, pr, Fr), e += t);
   return e;
 }
 function GWe() {
@@ -125966,7 +125971,7 @@ function GWe() {
   for (t = Ee++; Ee < Zr; ) {
     if (e = We.charCodeAt(Ee), e === 92)
       return Ee = t, _ue();
-    if (_4(e))
+    if (_S(e))
       ++Ee;
     else
       break;
@@ -126208,7 +126213,7 @@ function JWe() {
 }
 function ZWe() {
   var t, e, n;
-  for (e = "", n = ""; Ee < Zr && (t = We[Ee], !!_4(t.charCodeAt(0))); )
+  for (e = "", n = ""; Ee < Zr && (t = We[Ee], !!_S(t.charCodeAt(0))); )
     ++Ee, t === "\\" && Ee < Zr ? Ot({}, pr, Fr) : (n += t, e += t);
   return n.search(/[^gimuy]/g) >= 0 && Ot({}, Y8, n), {
     value: n,
@@ -126682,7 +126687,7 @@ function _Ve() {
   return 0;
 }
 function CVe(t, ...e) {
-  t = new ES(t), e = e.map(bVe);
+  t = new E4(t), e = e.map(bVe);
   e:
     for (const n of t)
       for (const r of e)
@@ -126693,16 +126698,16 @@ function CVe(t, ...e) {
   return t;
 }
 function bVe(t) {
-  return t instanceof ES ? t : new ES(t);
+  return t instanceof E4 ? t : new E4(t);
 }
 function TVe(...t) {
-  const e = new ES();
+  const e = new E4();
   for (const n of t)
     for (const r of n)
       e.add(r);
   return e;
 }
-const zB = "intersect", BQ = "union", RVe = "vlMulti", OVe = "vlPoint", kQ = "or", NVe = "and", Iu = "_vgsid_", o3 = Bs(Iu), DVe = "E", FVe = "R", wVe = "R-E", LVe = "R-LE", IVe = "R-RE", C4 = "index:unit";
+const zB = "intersect", BQ = "union", RVe = "vlMulti", OVe = "vlPoint", kQ = "or", NVe = "and", Iu = "_vgsid_", o3 = Bs(Iu), DVe = "E", FVe = "R", wVe = "R-E", LVe = "R-LE", IVe = "R-RE", CS = "index:unit";
 function PQ(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 = Bs.getter || Bs(u.field), o = u.getter(t), Yf(o) && (o = Ti(o)), Yf(r[s]) && (r[s] = Ti(r[s])), Yf(r[s][0]) && (r[s] = r[s].map(Ti)), u.type === DVe) {
@@ -126722,7 +126727,7 @@ function PQ(t, e) {
   return !0;
 }
 function $Ve(t, e, n) {
-  for (var r = this.context.data[t], i = r ? r.values.value : [], s = r ? r[C4] && r[C4].value : void 0, o = n === zB, u = i.length, a = 0, l, c, f, x, h; a < u; ++a)
+  for (var r = this.context.data[t], i = r ? r.values.value : [], s = r ? r[CS] && r[CS].value : void 0, o = n === zB, u = i.length, a = 0, l, c, f, x, h; a < u; ++a)
     if (l = i[a], s && o) {
       if (c = c || {}, f = c[x = l.unit] || 0, f === -1)
         continue;
@@ -126736,7 +126741,7 @@ function $Ve(t, e, n) {
 }
 const Nue = SVe(o3), BVe = Nue.left, kVe = Nue.right;
 function PVe(t, e, n) {
-  const r = this.context.data[t], i = r ? r.values.value : [], s = r ? r[C4] && r[C4].value : void 0, o = n === zB, u = o3(e), a = BVe(i, u);
+  const r = this.context.data[t], i = r ? r.values.value : [], s = r ? r[CS] && r[CS].value : void 0, o = n === zB, u = o3(e), a = BVe(i, u);
   if (a === i.length || o3(i[a]) !== u)
     return !1;
   if (s && o) {
@@ -127063,7 +127068,7 @@ function wYe(t, e, n) {
 function LYe(t) {
   let e = null;
   return function(n) {
-    return n ? kS(n, e = e || C$(t)) : t;
+    return n ? k4(n, e = e || C$(t)) : t;
   };
 }
 const $ue = (t) => t.data;
@@ -127190,9 +127195,9 @@ const u3 = {
   inrange: Dg,
   truncate: f8e,
   rgb: sc,
-  lab: LS,
-  hcl: IS,
-  hsl: FS,
+  lab: L4,
+  hcl: I4,
+  hsl: F4,
   luminance: J8,
   contrast: fYe,
   sequence: Os,
@@ -127656,16 +127661,16 @@ function eF(t, e) {
   if (n)
     return e == null ? n.style.removeProperty("cursor") : n.style.cursor = e;
 }
-function b4(t, e) {
+function bS(t, e) {
   var n = t._runtime.data;
   return et(n, e) || ve("Unrecognized data set: " + e), n[e];
 }
 function vKe(t, e) {
-  return arguments.length < 2 ? b4(this, t).values.value : P6.call(this, t, C1().remove(Jo).insert(e));
+  return arguments.length < 2 ? bS(this, t).values.value : P6.call(this, t, C1().remove(Jo).insert(e));
 }
 function P6(t, e) {
   fne(e) || ve("Second argument to changes must be a changeset.");
-  const n = b4(this, t);
+  const n = bS(this, t);
   return n.modified = !0, this.pulse(n.input, e);
 }
 function SKe(t, e) {
@@ -127884,12 +127889,12 @@ function HKe(t, e, n, r) {
     const a = {
       value: o
     };
-    T4(o, r) && (a.selected = !0), i.appendChild(Ls("option", a, (s[u] || o) + ""));
+    TS(o, r) && (a.selected = !0), i.appendChild(Ls("option", a, (s[u] || o) + ""));
   }), e.appendChild(i), i.addEventListener("change", () => {
     t.update(n.options[i.selectedIndex]);
   }), t.elements = [i], t.set = (o) => {
     for (let u = 0, a = n.options.length; u < a; ++u)
-      if (T4(n.options[u], o)) {
+      if (TS(n.options[u], o)) {
         i.selectedIndex = u;
         return;
       }
@@ -127905,7 +127910,7 @@ function QKe(t, e, n, r) {
       name: n.signal,
       value: o
     };
-    T4(o, r) && (a.checked = !0);
+    TS(o, r) && (a.checked = !0);
     const l = Ls("input", a);
     l.addEventListener("change", () => t.update(o));
     const c = Ls("label", {}, (s[u] || o) + "");
@@ -127913,7 +127918,7 @@ function QKe(t, e, n, r) {
   }), t.set = (o) => {
     const u = t.elements, a = u.length;
     for (let l = 0; l < a; ++l)
-      T4(u[l].value, o) && (u[l].checked = !0);
+      TS(u[l].value, o) && (u[l].checked = !0);
   };
 }
 function GKe(t, e, n, r) {
@@ -127935,7 +127940,7 @@ function GKe(t, e, n, r) {
     u.value = c, a.textContent = c;
   };
 }
-function T4(t, e) {
+function TS(t, e) {
   return t === e || t + "" == e + "";
 }
 function Gue(t, e, n, r, i, s) {
@@ -128235,10 +128240,10 @@ Fe(tk, im, {
     return ZQ(this, $A(this, t), e);
   },
   addDataListener(t, e) {
-    return JQ(this, t, b4(this, t).values, e);
+    return JQ(this, t, bS(this, t).values, e);
   },
   removeDataListener(t, e) {
-    return ZQ(this, b4(this, t).values, e);
+    return ZQ(this, bS(this, t).values, e);
   },
   globalCursor(t) {
     if (arguments.length) {
@@ -128274,7 +128279,7 @@ Fe(tk, im, {
   getState: iXe,
   setState: uXe
 });
-const xXe = "view", R4 = "[", O4 = "]", eae = "{", tae = "}", dXe = ":", nae = ",", hXe = "@", pXe = ">", gXe = /[[\]{}]/, mXe = {
+const xXe = "view", RS = "[", OS = "]", eae = "{", tae = "}", dXe = ":", nae = ",", hXe = "@", pXe = ">", gXe = /[[\]{}]/, mXe = {
   "*": 1,
   arc: 1,
   area: 1,
@@ -128310,7 +128315,7 @@ function sae(t) {
   const e = [], n = t.length;
   let r = 0, i = 0;
   for (; i < n; )
-    i = pm(t, i, nae, R4 + eae, O4 + tae), e.push(t.substring(r, i).trim()), r = ++i;
+    i = pm(t, i, nae, RS + eae, OS + tae), e.push(t.substring(r, i).trim()), r = ++i;
   if (e.length === 0)
     throw "Empty event selector: " + t;
   return e;
@@ -128321,7 +128326,7 @@ function tF(t) {
 function EXe(t) {
   const e = t.length;
   let n = 1, r;
-  if (n = pm(t, n, O4, R4, O4), n === e)
+  if (n = pm(t, n, OS, RS, OS), n === e)
     throw "Empty between selector: " + t;
   if (r = sae(t.substring(1, n)), r.length !== 2)
     throw "Between selector must have two elements: " + t;
@@ -128353,14 +128358,14 @@ function AXe(t) {
   }
   if (!o)
     throw t;
-  if (t[0] === hXe && (i = ++u), a = pm(t, u, dXe), a < o && (n.push(t.substring(s, a).trim()), s = u = ++a), u = pm(t, u, R4), u === o)
+  if (t[0] === hXe && (i = ++u), a = pm(t, u, dXe), a < o && (n.push(t.substring(s, a).trim()), s = u = ++a), u = pm(t, u, RS), u === o)
     n.push(t.substring(s, o).trim());
   else if (n.push(t.substring(s, u).trim()), l = [], s = ++u, s === o)
     throw "Unmatched left bracket: " + t;
   for (; u < o; ) {
-    if (u = pm(t, u, O4), u === o)
+    if (u = pm(t, u, OS), u === o)
       throw "Unmatched left bracket: " + t;
-    if (l.push(t.substring(s, u).trim()), u < o - 1 && t[++u] !== R4)
+    if (l.push(t.substring(s, u).trim()), u < o - 1 && t[++u] !== RS)
       throw "Expected left bracket: " + t;
     s = ++u;
   }
@@ -128541,7 +128546,7 @@ function nF(t, e, n, r) {
 function U6(t, e, n, r) {
   return new nF(t, e, n, r);
 }
-function N4(t, e) {
+function NS(t, e) {
   return U6("operator", t, e);
 }
 function Ke(t) {
@@ -129428,7 +129433,7 @@ function wZe(t, e, n) {
   };
 }
 function Nae(t, e, n) {
-  const r = t.remove, i = t.insert, s = t.toggle, o = t.modify, u = t.values, a = e.add(N4()), l = "if(" + t.trigger + ',modify("' + n + '",' + [i, r, s, o, u].map((f) => f ?? "null").join(",") + "),0)", c = oa(l, e);
+  const r = t.remove, i = t.insert, s = t.toggle, o = t.modify, u = t.values, a = e.add(NS()), l = "if(" + t.trigger + ',modify("' + n + '",' + [i, r, s, o, u].map((f) => f ?? "null").join(",") + "),0)", c = oa(l, e);
   a.update = c.$expr, a.params = c.$params;
 }
 function W6(t, e) {
@@ -130207,7 +130212,7 @@ const det = (t) => D1({
   }
 }, t);
 function het(t, e) {
-  const n = e.config, r = Ke(e.root = e.add(N4())), i = pet(t, n);
+  const n = e.config, r = Ke(e.root = e.add(NS())), i = pet(t, n);
   i.forEach((l) => fae(l, e)), e.description = t.description || n.description, e.eventConfig = n.events, e.legends = e.objectProperty(n.legend && n.legend.layout), e.locale = n.locale;
   const s = e.add(gu()), o = e.add(hae(cae(det(t.encode), H6, rk, t.style, e, {
     pulse: Ke(s)
@@ -130393,14 +130398,14 @@ Iae.prototype = yG.prototype = {
   },
   addSignal(t, e) {
     this.hasOwnSignal(t) && ve("Duplicate signal name: " + we(t));
-    const n = e instanceof nF ? e : this.add(N4(e));
+    const n = e instanceof nF ? e : this.add(NS(e));
     return this.signals[t] = n;
   },
   getSignal(t) {
     return this.signals[t] || ve("Unrecognized signal name: " + we(t)), this.signals[t];
   },
   signalRef(t) {
-    return this.signals[t] ? Ke(this.signals[t]) : (et(this.lambdas, t) || (this.lambdas[t] = this.add(N4(null))), Ke(this.lambdas[t]));
+    return this.signals[t] ? Ke(this.signals[t]) : (et(this.lambdas, t) || (this.lambdas[t] = this.add(NS(null))), Ke(this.lambdas[t]));
   },
   parseLambdas() {
     const t = Object.keys(this.lambdas);
@@ -131031,7 +131036,7 @@ const qi = {
   circle: "circle",
   square: "square",
   geoshape: "geoshape"
-}, zae = qi.arc, Y6 = qi.area, K6 = qi.bar, Bet = qi.image, X6 = qi.line, J6 = qi.point, ket = qi.rect, D4 = qi.rule, Hae = qi.text, Ek = qi.tick, Pet = qi.trail, Ak = qi.circle, vk = qi.square, Qae = qi.geoshape;
+}, zae = qi.arc, Y6 = qi.area, K6 = qi.bar, Bet = qi.image, X6 = qi.line, J6 = qi.point, ket = qi.rect, DS = qi.rule, Hae = qi.text, Ek = qi.tick, Pet = qi.trail, Ak = qi.circle, vk = qi.square, Qae = qi.geoshape;
 function Yc(t) {
   return ["line", "area", "trail"].includes(t);
 }
@@ -131156,7 +131161,7 @@ function nx(t, e, n, r) {
   }
   return i;
 }
-function F4({ scaleName: t, fieldOrDatumDef: e, fieldOrDatumDef2: n, offset: r, startSuffix: i, bandPosition: s = 0.5 }) {
+function FS({ scaleName: t, fieldOrDatumDef: e, fieldOrDatumDef2: n, offset: r, startSuffix: i, bandPosition: s = 0.5 }) {
   const o = 0 < s && s < 1 ? "datum" : void 0, u = $e(e, { expr: o, suffix: i }), a = n !== void 0 ? $e(n, { expr: o }) : $e(e, { suffix: "end", expr: o }), l = {};
   if (s === 0 || s === 1) {
     l.scale = t;
@@ -131182,12 +131187,12 @@ function Ck({ channel: t, channelDef: e, channel2Def: n, markDef: r, config: i,
         }));
         const { bin: h, timeUnit: p, type: m } = e;
         if (Xt(h) || c && p && m === _2)
-          return u != null && u.impute ? nx(e, s, { binSuffix: "mid" }, { offset: a }) : c && !Ar(x) ? F4({ scaleName: s, fieldOrDatumDef: e, bandPosition: c, offset: a }) : nx(e, s, TE(e, t) ? { binSuffix: "range" } : {}, {
+          return u != null && u.impute ? nx(e, s, { binSuffix: "mid" }, { offset: a }) : c && !Ar(x) ? FS({ scaleName: s, fieldOrDatumDef: e, bandPosition: c, offset: a }) : nx(e, s, TE(e, t) ? { binSuffix: "range" } : {}, {
             offset: a
           });
         if (Ei(h)) {
           if (Ie(n))
-            return F4({
+            return FS({
               scaleName: s,
               fieldOrDatumDef: e,
               fieldOrDatumDef2: n,
@@ -131419,7 +131424,7 @@ function Ba(t) {
   return t && "datum" in t;
 }
 function ju(t) {
-  return Co(t) && !w4(t) || dF(t);
+  return Co(t) && !wS(t) || dF(t);
 }
 function dF(t) {
   return Ba(t) && on(t.datum);
@@ -131471,7 +131476,7 @@ function $e(t, e = {}) {
   }
   return u && (s = `${s}_${u}`), o && (s = `${o}_${s}`), e.forAs ? Bee(s) : e.expr ? v8e(s, e.expr) + a : Zo(s) + a;
 }
-function w4(t) {
+function wS(t) {
   switch (t.type) {
     case "nominal":
     case "ordinal":
@@ -131551,7 +131556,7 @@ function Dk(t) {
 function Fk(t, e) {
   return lle(t, e);
 }
-function L4(t) {
+function LS(t) {
   var e;
   if (ule(t)) {
     const { format: n, formatType: r } = t;
@@ -131610,22 +131615,22 @@ function fle(t, e, n, r = {}) {
     const i = Ue(t) ? "string" : on(t) ? "number" : "boolean";
     return Te(TFe(e, i, t)), { value: t };
   }
-  return st(t) ? I4(t, e, n, r) : bE(t) ? Object.assign(Object.assign({}, t), {
+  return st(t) ? IS(t, e, n, r) : bE(t) ? Object.assign(Object.assign({}, t), {
     // Need to cast as normalizeFieldDef normally return FieldDef, but here we know that it is definitely Condition<FieldDef>
-    condition: I4(t.condition, e, n, r)
+    condition: IS(t.condition, e, n, r)
   }) : t;
 }
-function I4(t, e, n, r) {
+function IS(t, e, n, r) {
   if (ule(t)) {
     const { format: i, formatType: s } = t, o = fF(t, ["format", "formatType"]);
     if (Ux(s) && !n.customFormatTypes)
-      return Te(wq(e)), I4(o, e, n, r);
+      return Te(wq(e)), IS(o, e, n, r);
   } else {
     const i = Nk(t) ? "axis" : ole(t) ? "legend" : Rk(t) ? "header" : null;
     if (i && t[i]) {
       const s = t[i], { format: o, formatType: u } = s, a = fF(s, ["format", "formatType"]);
       if (Ux(u) && !n.customFormatTypes)
-        return Te(wq(e)), I4(Object.assign(Object.assign({}, t), { [i]: a }), e, n, r);
+        return Te(wq(e)), IS(Object.assign(Object.assign({}, t), { [i]: a }), e, n, r);
     }
   }
   return Ie(t) ? wk(t, e, r) : gtt(t);
@@ -131685,7 +131690,7 @@ function mtt(t, e) {
     case hl:
     case pl:
     case UT:
-      return w4(t) ? eh : {
+      return wS(t) ? eh : {
         compatible: !1,
         warning: LFe(e)
       };
@@ -131730,7 +131735,7 @@ function mtt(t, e) {
       } : eh;
     case cs:
     case Mc:
-      return !w4(t) && !ctt(t) ? {
+      return !wS(t) && !ctt(t) ? {
         compatible: !1,
         warning: IFe(e)
       } : eh;
@@ -131742,7 +131747,7 @@ function mtt(t, e) {
   }
 }
 function b2(t) {
-  const { formatType: e } = L4(t);
+  const { formatType: e } = LS(t);
   return e === "time" || !e && ytt(t);
 }
 function ytt(t) {
@@ -132396,7 +132401,7 @@ var Fv = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-const $4 = "boxplot", Ott = ["box", "median", "outliers", "rule", "ticks"], Ntt = new oR($4, Cle);
+const $S = "boxplot", Ott = ["box", "median", "outliers", "rule", "ticks"], Ntt = new oR($S, Cle);
 function _le(t) {
   return on(t) ? "tukey" : t;
 }
@@ -132538,7 +132543,7 @@ function ble(t) {
   ];
 }
 function Dtt(t, e, n) {
-  const r = Sle(t, $4), { continuousAxisChannelDef: i, continuousAxis: s } = vle(t, r, $4), o = i.field, u = _le(e), a = [
+  const r = Sle(t, $S), { continuousAxisChannelDef: i, continuousAxis: s } = vle(t, r, $S), o = i.field, u = _le(e), a = [
     ...ble(o),
     {
       op: "median",
@@ -132829,7 +132834,7 @@ function Mk(t, e, n) {
 function jtt() {
   return Re(Nle);
 }
-Mk($4, Cle, Ott);
+Mk($S, Cle, Ott);
 Mk(kk, Tle, Ftt);
 Mk(Pk, Ole, Ptt);
 const Utt = [
@@ -133061,11 +133066,11 @@ function gF(t, e) {
   var n;
   return (n = t[e]) !== null && n !== void 0 ? n : t[e === "width" ? "continuousWidth" : "continuousHeight"];
 }
-function B4(t, e) {
-  const n = k4(t, e);
+function BS(t, e) {
+  const n = kS(t, e);
   return la(n) ? n.step : Ble;
 }
-function k4(t, e) {
+function kS(t, e) {
   var n;
   const r = (n = t[e]) !== null && n !== void 0 ? n : t[e === "width" ? "discreteWidth" : "discreteHeight"];
   return er(r, { step: t.step });
@@ -133440,7 +133445,7 @@ const gnt = {
 function mnt(t) {
   return t in gnt;
 }
-const ynt = /* @__PURE__ */ new Set([zae, K6, Y6, D4, J6, Ak, vk, X6, Hae, Ek]), Ent = /* @__PURE__ */ new Set([K6, Y6, zae]);
+const ynt = /* @__PURE__ */ new Set([zae, K6, Y6, DS, J6, Ak, vk, X6, Hae, Ek]), Ent = /* @__PURE__ */ new Set([K6, Y6, zae]);
 function th(t) {
   return Ie(t) && xF(t) === "quantitative" && !t.bin;
 }
@@ -134743,7 +134748,7 @@ function $1(t, e, n, r) {
         const { param: c, empty: f } = a, x = m0e(t, { param: c, empty: f });
         return Object.assign({ test: x }, l);
       } else {
-        const c = j4(t, a.test);
+        const c = jS(t, a.test);
         return Object.assign({ test: c }, l);
       }
     });
@@ -134762,7 +134767,7 @@ function fR(t, e, n = "datum") {
     if (tu(t))
       return tn(t.value);
     if (st(t)) {
-      const { format: r, formatType: i } = L4(t);
+      const { format: r, formatType: i } = LS(t);
       return bk({ fieldOrDatumDef: t, format: r, formatType: i, expr: n, config: e });
     }
   }
@@ -134798,10 +134803,10 @@ function t0e(t, e, n, { reactiveGeom: r } = {}) {
     if (Ir(c)) {
       const g = c === "x" ? "x2" : "y2", y = aa(t[g]);
       if (Ei(x.bin) && y) {
-        const E = $e(x, { expr: s }), A = $e(y, { expr: s }), { format: v, formatType: S } = L4(x);
+        const E = $e(x, { expr: s }), A = $e(y, { expr: s }), { format: v, formatType: S } = LS(x);
         m = Z6(E, A, v, S, n), i[g] = !0;
       } else if (e && e.fieldChannel === c && e.offset === "normalize") {
-        const { format: E, formatType: A } = L4(x);
+        const { format: E, formatType: A } = LS(x);
         m = bk({
           fieldOrDatumDef: x,
           format: E,
@@ -134954,7 +134959,7 @@ function Srt(t) {
     if (Ie(n)) {
       let u = n.bandPosition;
       if (u === void 0 && o.type === "text" && (e === "radius" || e === "theta") && (u = 0.5), u !== void 0)
-        return F4({
+        return FS({
           scaleName: r,
           fieldOrDatumDef: n,
           startSuffix: "start",
@@ -135023,7 +135028,7 @@ function r0e(t, e, n, r = "middle") {
   let o;
   return Ye(s) ? (Te(BFe(i)), o = void 0) : o = s, t === "x" ? _rt[o || (r === "top" ? "left" : "center")] : Crt[o || r];
 }
-function P4(t, e, { defaultPos: n, defaultPos2: r, range: i }) {
+function PS(t, e, { defaultPos: n, defaultPos2: r, range: i }) {
   return i ? i0e(t, e, { defaultPos: n, defaultPos2: r }) : Yr(t, e, { defaultPos: n });
 }
 function i0e(t, e, { defaultPos: n, defaultPos2: r }) {
@@ -135059,8 +135064,8 @@ function brt(t, e, n) {
     defaultRef: void 0
   });
   return m !== void 0 ? { [c]: m } : PA(n, s) || PA(n, {
-    [n]: mS(n, s, u.style),
-    [l]: mS(l, s, u.style)
+    [n]: m4(n, s, u.style),
+    [l]: m4(l, s, u.style)
   }) || PA(n, u[i]) || PA(n, u.mark) || {
     [c]: Yk({
       model: t,
@@ -135132,7 +135137,7 @@ function Rrt(t, e, n, r, i) {
     if (qc(o) && on(o.step))
       return { value: o.step - 2 };
   }
-  return { value: B4(r.view, t) - 2 };
+  return { value: BS(r.view, t) - 2 };
 }
 function Ort(t, e, n) {
   const { markDef: r, encoding: i, config: s, stack: o } = n, u = r.orient, a = n.scaleName(e), l = n.getScaleComponent(e), c = fs(e), f = Kl(e), x = B8e(e), h = n.scaleName(x), p = u === "horizontal" && e === "y" || u === "vertical" && e === "x";
@@ -135217,7 +135222,7 @@ function Nrt({ fieldDef: t, fieldDef2: e, channel: n, model: r }) {
   Te(lte(E));
 }
 function zG({ fieldDef: t, scaleName: e, bandPosition: n, offset: r }) {
-  return F4({
+  return FS({
     scaleName: e,
     fieldOrDatumDef: t,
     bandPosition: n,
@@ -135344,15 +135349,15 @@ const RN = "voronoi", s0e = {
     const r = e.name, i = e.project, s = n.filter((l) => l.name === r + dc)[0], o = r + OE, u = i.items.map((l) => mn(`${r}_${l.field}`)), a = u.map((l) => `${l} !== null`).join(" && ");
     return u.length && (s.update = `${a} ? {fields: ${o}, values: [${u.join(", ")}]} : null`), delete s.value, delete s.on, n;
   }
-}, M4 = "_toggle", u0e = {
+}, MS = "_toggle", u0e = {
   defined: (t) => t.type === "point" && !!t.toggle,
   signals: (t, e, n) => n.concat({
-    name: e.name + M4,
+    name: e.name + MS,
     value: !1,
     on: [{ events: e.events, update: e.toggle }]
   }),
   modifyExpr: (t, e) => {
-    const n = e.name + dc, r = e.name + M4;
+    const n = e.name + dc, r = e.name + MS;
     return `${r} ? null : ${n}, ` + (e.resolve === "global" ? `${r} ? null : true, ` : `${r} ? null : {unit: ${O2(t)}}, `) + `${r} ? ${n} : null`;
   }
 }, Irt = {
@@ -135382,7 +135387,7 @@ const RN = "voronoi", s0e = {
       }
     else {
       let i = n.findIndex((s) => s.name === e.name + dc);
-      r(i, "null"), u0e.defined(e) && (i = n.findIndex((s) => s.name === e.name + M4), r(i, "false"));
+      r(i, "null"), u0e.defined(e) && (i = n.findIndex((s) => s.name === e.name + MS), r(i, "false"));
     }
     return n;
   }
@@ -135428,7 +135433,7 @@ const RN = "voronoi", s0e = {
       events: u.map((x) => ({ signal: x })),
       update: l
     }) : u.length > 0 && (s.update = l, delete s.value, delete s.on);
-    const c = n.find((x) => x.name === r + M4), f = CN(e.bind) && e.bind.legend;
+    const c = n.find((x) => x.name === r + MS), f = CN(e.bind) && e.bind.legend;
     return c && (e.events ? c.on.push(Object.assign(Object.assign({}, c.on[0]), { events: f })) : c.on[0].events = f), n;
   }
 };
@@ -135562,7 +135567,7 @@ function g0e(t) {
 }
 class B1 extends qt {
   constructor(e, n, r) {
-    super(e), this.model = n, this.filter = r, this.expr = j4(this.model, this.filter, this), this._dependentFields = g0e(this.expr);
+    super(e), this.model = n, this.filter = r, this.expr = jS(this.model, this.filter, this), this._dependentFields = g0e(this.expr);
   }
   clone() {
     return new B1(null, this.model, lt(this.filter));
@@ -135642,7 +135647,7 @@ function Urt(t, e) {
     t.component.data.outputNodes[s] = i.materialized = new wi(new B1(e, t, { param: r }), s, Vt.Lookup, t.component.data.outputNodeRefCounts);
   }
 }
-function j4(t, e, n) {
+function jS(t, e, n) {
   return av(e, (r) => Ue(r) ? r : Twe(r) ? m0e(t, r, n) : mte(r));
 }
 var MA = function(t, e) {
@@ -135676,7 +135681,7 @@ function Xg(t, e, n, r = { header: !1 }) {
           const { vgProp: S, part: C } = v, _ = [
             ...A.map((b) => {
               const { test: R } = b, O = MA(b, ["test"]);
-              return Object.assign({ test: j4(null, R) }, O);
+              return Object.assign({ test: jS(null, R) }, O);
             }),
             E
           ];
@@ -135685,7 +135690,7 @@ function Xg(t, e, n, r = { header: !1 }) {
           const S = {
             signal: A.map((C) => {
               const { test: _ } = C, b = MA(C, ["test"]);
-              return `${j4(null, _)} ? ${bq(b)} : `;
+              return `${jS(null, _)} ? ${bq(b)} : `;
             }).join("") + bq(E)
           };
           h[p] = S;
@@ -135884,10 +135889,10 @@ function Wrt(t, e) {
 function Vrt(t, e, n, r, i) {
   const s = e == null ? void 0 : e.labelAngle;
   if (s !== void 0)
-    return Ye(s) ? s : gS(s);
+    return Ye(s) ? s : g4(s);
   {
     const { configValue: o } = CF("labelAngle", r, e == null ? void 0 : e.style, i);
-    return o !== void 0 ? gS(o) : n === En && bt([yk, mk], t.type) && !(Ie(t) && t.timeUnit) ? 270 : void 0;
+    return o !== void 0 ? g4(o) : n === En && bt([yk, mk], t.type) && !(Ie(t) && t.timeUnit) ? 270 : void 0;
   }
 }
 function bF(t) {
@@ -135989,7 +135994,7 @@ function Zrt(t, e) {
     return n;
 }
 function eit(t, e) {
-  return t === "rect" && w4(e) ? 1 : 0;
+  return t === "rect" && wS(e) ? 1 : 0;
 }
 class N2 extends qt {
   constructor(e, n) {
@@ -136046,7 +136051,7 @@ function hR(t, e, n, r) {
 }
 const Jk = ["row", "column"], Zk = ["header", "footer"];
 function tit(t, e) {
-  const n = t.component.layoutHeaders[e].title, r = t.config ? t.config : void 0, i = t.component.layoutHeaders[e].facetFieldDef ? t.component.layoutHeaders[e].facetFieldDef : void 0, { titleAnchor: s, titleAngle: o, titleOrient: u } = hR(["titleAnchor", "titleAngle", "titleOrient"], i.header, r, e), a = dR(e, u), l = gS(o);
+  const n = t.component.layoutHeaders[e].title, r = t.config ? t.config : void 0, i = t.component.layoutHeaders[e].facetFieldDef ? t.component.layoutHeaders[e].facetFieldDef : void 0, { titleAnchor: s, titleAngle: o, titleOrient: u } = hR(["titleAnchor", "titleAngle", "titleOrient"], i.header, r, e), a = dR(e, u), l = g4(o);
   return {
     name: `${e}-title`,
     type: "group",
@@ -137984,7 +137989,7 @@ function x0(t, e, n, r) {
         {
           // If sort by aggregation of a specified sort field, we need to use RAW table,
           // so we can aggregate values for the scale independently from the main aggregation.
-          data: pS(l) ? n.requestDataName(Vt.Main) : n.requestDataName(Vt.Raw),
+          data: p4(l) ? n.requestDataName(Vt.Main) : n.requestDataName(Vt.Raw),
           // Use range if we added it and the scale does not support computing a range as a signal.
           field: n.vgField(r, TE(c, r) ? { binSuffix: "range" } : {}),
           // we have to use a sort object if sort = true to make the sort correct by bin start
@@ -138030,7 +138035,7 @@ function x0(t, e, n, r) {
       {
         // If sort by aggregation of a specified sort field, we need to use RAW table,
         // so we can aggregate values for the scale independently from the main aggregation.
-        data: pS(l) ? n.requestDataName(Vt.Main) : n.requestDataName(Vt.Raw),
+        data: p4(l) ? n.requestDataName(Vt.Main) : n.requestDataName(Vt.Raw),
         field: n.vgField(r),
         sort: l
       }
@@ -138115,7 +138120,7 @@ function yst(t) {
   const e = il(t.map((o) => sl(o) ? cst(o, ["sort"]) : o), Ct), n = il(t.map((o) => {
     if (sl(o)) {
       const u = o.sort;
-      return u !== void 0 && !pS(u) && ("op" in u && u.op === "count" && delete u.field, u.order === "ascending" && delete u.order), u;
+      return u !== void 0 && !p4(u) && ("op" in u && u.op === "count" && delete u.field, u.order === "ascending" && delete u.order), u;
     }
   }).filter((o) => o !== void 0), Ct);
   if (e.length === 0)
@@ -138134,7 +138139,7 @@ function yst(t) {
     }
     return o;
   }
-  const r = il(n.map((o) => pS(o) || !("op" in o) || Ue(o.op) && o.op in W8e ? o : (Te(KFe(o)), !0)), Ct);
+  const r = il(n.map((o) => p4(o) || !("op" in o) || Ue(o.op) && o.op in W8e ? o : (Te(KFe(o)), !0)), Ct);
   let i;
   r.length === 1 ? i = r[0] : r.length > 1 && (Te(Lq), i = !0);
   const s = il(t.map((o) => sl(o) ? o.data : null), (o) => o);
@@ -138392,7 +138397,7 @@ function Tst(t, e, n) {
 }
 function W0e(t, e, n) {
   const r = t === En ? "width" : "height", i = e[r];
-  return i || k4(n, r);
+  return i || kS(n, r);
 }
 function Rst(t, e, n, r) {
   switch (t) {
@@ -138463,7 +138468,7 @@ function Nst(t, e, n, r) {
   throw new Error(YT("size", t));
 }
 function aW(t, e, n) {
-  const r = la(t.width) ? t.width.step : B4(n, "width"), i = la(t.height) ? t.height.step : B4(n, "height");
+  const r = la(t.width) ? t.width.step : BS(n, "width"), i = la(t.height) ? t.height.step : BS(n, "height");
   return e.x || e.y ? new us(() => `min(${[
     e.x ? e.x.signal : r,
     e.y ? e.y.signal : i
@@ -139585,18 +139590,18 @@ function cW(t, e) {
   }
 }
 function eot(t) {
-  lP(t), U4(t, "width"), U4(t, "height");
+  lP(t), US(t, "width"), US(t, "height");
 }
 function tot(t) {
   lP(t);
   const e = t.layout.columns === 1 ? "width" : "childWidth", n = t.layout.columns === void 0 ? "height" : "childHeight";
-  U4(t, e), U4(t, n);
+  US(t, e), US(t, n);
 }
 function lP(t) {
   for (const e of t.children)
     e.parseLayoutSize();
 }
-function U4(t, e) {
+function US(t, e) {
   var n;
   const r = R0e(e), i = GT(r), s = t.component.resolve, o = t.component.layoutSize;
   let u;
@@ -139643,7 +139648,7 @@ function rot(t, e) {
   if (i) {
     const s = i.get("type"), o = i.get("range");
     if (Ar(s)) {
-      const u = k4(r.view, e);
+      const u = kS(r.view, e);
       return qc(o) || la(u) ? "step" : u;
     } else
       return gF(r.view, e);
@@ -139651,7 +139656,7 @@ function rot(t, e) {
     if (t.hasProjection || t.mark === "arc")
       return gF(r.view, e);
     {
-      const s = k4(r.view, e);
+      const s = kS(r.view, e);
       return la(s) ? s.step : s;
     }
   }
@@ -140187,7 +140192,7 @@ function got(t, e, n, r, i) {
   switch (n = n || {}, e) {
     case "titleAngle":
     case "labelAngle":
-      return t === (Ye(n.labelAngle) ? n.labelAngle : gS(n.labelAngle));
+      return t === (Ye(n.labelAngle) ? n.labelAngle : g4(n.labelAngle));
     case "values":
       return !!n.values;
     case "encode":
@@ -140283,7 +140288,7 @@ function _ot(t, e, { graticule: n }) {
   if (n)
     return !1;
   const r = Tx("filled", t, e), i = t.type;
-  return er(r, i !== J6 && i !== X6 && i !== D4);
+  return er(r, i !== J6 && i !== X6 && i !== DS);
 }
 function Cot(t, e, n) {
   switch (t) {
@@ -140310,7 +140315,7 @@ function Cot(t, e, n) {
         if (!o && (Ie(i) && i.type === jx && !Xt(i.bin) || dF(i)))
           return "vertical";
       }
-    case D4:
+    case DS:
       if (s && !(Ie(r) && Ei(r.bin)) && o && !(Ie(i) && Ei(i.bin)))
         return;
     case Y6:
@@ -140318,7 +140323,7 @@ function Cot(t, e, n) {
         return Ie(i) && Ei(i.bin) ? "horizontal" : "vertical";
       if (s)
         return Ie(r) && Ei(r.bin) ? "vertical" : "horizontal";
-      if (t === D4) {
+      if (t === DS) {
         if (r && !i)
           return "vertical";
         if (i && !r)
@@ -140361,11 +140366,11 @@ const bot = {
     orient: "include",
     size: "ignore",
     theta: "ignore"
-  })), P4("x", t, {
+  })), PS("x", t, {
     defaultPos: "zeroOrMin",
     defaultPos2: "zeroOrMin",
     range: t.markDef.orient === "horizontal"
-  })), P4("y", t, {
+  })), PS("y", t, {
     defaultPos: "zeroOrMin",
     defaultPos2: "zeroOrMin",
     range: t.markDef.orient === "vertical"
@@ -140472,12 +140477,12 @@ const Lot = {
       orient: "ignore",
       size: "ignore",
       theta: "ignore"
-    })), P4("x", t, {
+    })), PS("x", t, {
       defaultPos: n === "horizontal" ? "zeroOrMax" : "mid",
       defaultPos2: "zeroOrMin",
       range: n !== "vertical"
       // include x2 for horizontal or line segment rule
-    })), P4("y", t, {
+    })), PS("y", t, {
       defaultPos: n === "vertical" ? "zeroOrMax" : "mid",
       defaultPos2: "zeroOrMin",
       range: n !== "horizontal"
@@ -140536,7 +140541,7 @@ function qot(t) {
     return u;
   {
     const a = o ? o.get("range") : void 0;
-    return a && qc(a) && on(a.step) ? a.step * 3 / 4 : B4(n.view, s) * 3 / 4;
+    return a && qc(a) && on(a.step) ? a.step * 3 / 4 : BS(n.view, s) * 3 / 4;
   }
 }
 const qA = {
@@ -141226,7 +141231,7 @@ class eut extends FE {
       layer: [
         {
           data: {
-            values: dS,
+            values: d4,
             format: {
               type: "topojson",
               feature: "states"
@@ -141244,7 +141249,7 @@ class eut extends FE {
               lookup: n.name,
               from: {
                 data: {
-                  values: dS,
+                  values: d4,
                   format: {
                     type: "topojson",
                     feature: "states"
@@ -141295,7 +141300,7 @@ class eut extends FE {
     };
   }
 }
-const J4 = class J4 extends fn {
+const JS = class JS extends fn {
   create(e, n, r, i, s, o) {
     return new eut(
       e,
@@ -141309,8 +141314,8 @@ const J4 = class J4 extends fn {
     return "shape_map";
   }
 };
-J4.instance = new J4();
-let LF = J4;
+JS.instance = new JS();
+let LF = JS;
 class tut extends FE {
   getDataValue(e) {
     if (e.isNumber() || e.isString())
@@ -141384,7 +141389,7 @@ class tut extends FE {
       layer: [
         {
           data: {
-            values: dS,
+            values: d4,
             format: {
               type: "topojson",
               feature: "states"
@@ -141440,7 +141445,7 @@ class tut extends FE {
     };
   }
 }
-const Z4 = class Z4 extends fn {
+const ZS = class ZS extends fn {
   create(e, n, r, i, s, o) {
     return new tut(
       e,
@@ -141454,8 +141459,8 @@ const Z4 = class Z4 extends fn {
     return "point_map";
   }
 };
-Z4.instance = new Z4();
-let IF = Z4;
+ZS.instance = new ZS();
+let IF = ZS;
 class nut {
   constructor(e) {
     this.document = e;
@@ -141534,7 +141539,7 @@ class rut extends FE {
       layer: [
         {
           data: {
-            values: dS,
+            values: d4,
             format: {
               type: "topojson",
               feature: "states"
@@ -141683,7 +141688,7 @@ const Kc = {
       }
     }
   ]
-}, q4 = {
+}, qS = {
   ...Kc,
   mark: "bar",
   data: [],
@@ -141694,16 +141699,16 @@ const Kc = {
   }
 };
 ({
-  ...q4,
+  ...qS,
   encoding: {
-    ...q4.encoding,
+    ...qS.encoding,
     color: gs("quantitative", !0, !0)
   }
 });
 ({
-  ...q4,
+  ...qS,
   encoding: {
-    ...q4.encoding,
+    ...qS.encoding,
     color: gs("nominal", !0, !0)
   }
 });
@@ -141727,7 +141732,7 @@ const Kc = {
     }
   }, N0.layer[1])
 });
-const z4 = {
+const zS = {
   ...Kc,
   mark: "bar",
   data: [],
@@ -141738,16 +141743,16 @@ const z4 = {
   }
 };
 ({
-  ...z4,
+  ...zS,
   encoding: {
-    ...z4.encoding,
+    ...zS.encoding,
     color: gs("nominal", !0)
   }
 });
 ({
-  ...z4,
+  ...zS,
   encoding: {
-    ...z4.encoding,
+    ...zS.encoding,
     color: gs("quantitative", !0)
   }
 });
@@ -142410,7 +142415,7 @@ const f_ = class f_ extends fn {
 };
 f_.instance = new f_();
 let GF = f_;
-class fut extends xS {
+class fut extends x4 {
   getText(e) {
     if (e.isNull())
       return null;
@@ -142812,11 +142817,11 @@ function but(t, e = {}, n = {}) {
     return o ? (o.prototype.Component = s, o) : (o = _ut(r, mut(e)), o.prototype.Component = s, o.prototype.registeredTag = t, customElements.define(t, o, i), o);
   };
 }
-const Tut = (t, e) => t === e, rw = Symbol("solid-proxy"), Rut = Symbol("solid-track"), H4 = {
+const Tut = (t, e) => t === e, rw = Symbol("solid-proxy"), Rut = Symbol("solid-track"), HS = {
   equals: Tut
 };
 let cce = gce;
-const Xc = 1, Q4 = 2, fce = {
+const Xc = 1, QS = 2, fce = {
   owned: null,
   cleanups: null,
   context: null,
@@ -142839,7 +142844,7 @@ function wv(t, e) {
   }
 }
 function mP(t, e) {
-  e = e ? Object.assign({}, H4, e) : H4;
+  e = e ? Object.assign({}, HS, e) : HS;
   const n = {
     value: t,
     observers: null,
@@ -142858,7 +142863,7 @@ function iw(t, e, n) {
   i && (r.suspense = i), (!n || !n.render) && (r.user = !0), vl ? vl.push(r) : wE(r);
 }
 function bo(t, e, n) {
-  n = n ? Object.assign({}, H4, n) : H4;
+  n = n ? Object.assign({}, HS, n) : HS;
   const r = EP(t, e, !0, 0);
   return r.observers = null, r.observerSlots = null, r.comparator = n.equals || void 0, wE(r), hce.bind(r);
 }
@@ -142901,7 +142906,7 @@ function hce() {
       wE(this);
     else {
       const t = ti;
-      ti = null, LE(() => W4(this), !1), ti = t;
+      ti = null, LE(() => WS(this), !1), ti = t;
     }
   if (qn) {
     const t = this.observers ? this.observers.length : 0;
@@ -142960,11 +142965,11 @@ function EP(t, e, n, r = Xc, i) {
   };
   return en === null || en !== fce && (en.owned ? en.owned.push(s) : en.owned = [s]), s;
 }
-function G4(t) {
+function GS(t) {
   if (t.state === 0)
     return;
-  if (t.state === Q4)
-    return W4(t);
+  if (t.state === QS)
+    return WS(t);
   if (t.suspense && nu(t.suspense.inFallback))
     return t.suspense.effects.push(t);
   const e = [t];
@@ -142973,9 +142978,9 @@ function G4(t) {
   for (let n = e.length - 1; n >= 0; n--)
     if (t = e[n], t.state === Xc)
       wE(t);
-    else if (t.state === Q4) {
+    else if (t.state === QS) {
       const r = ti;
-      ti = null, LE(() => W4(t, e[0]), !1), ti = r;
+      ti = null, LE(() => WS(t, e[0]), !1), ti = r;
     }
 }
 function LE(t, e) {
@@ -142998,31 +143003,31 @@ function Fut(t) {
 }
 function gce(t) {
   for (let e = 0; e < t.length; e++)
-    G4(t[e]);
+    GS(t[e]);
 }
 function wut(t) {
   let e, n = 0;
   for (e = 0; e < t.length; e++) {
     const r = t[e];
-    r.user ? t[n++] = r : G4(r);
+    r.user ? t[n++] = r : GS(r);
   }
   for (e = 0; e < n; e++)
-    G4(t[e]);
+    GS(t[e]);
 }
-function W4(t, e) {
+function WS(t, e) {
   t.state = 0;
   for (let n = 0; n < t.sources.length; n += 1) {
     const r = t.sources[n];
     if (r.sources) {
       const i = r.state;
-      i === Xc ? r !== e && (!r.updatedAt || r.updatedAt < bR) && G4(r) : i === Q4 && W4(r, e);
+      i === Xc ? r !== e && (!r.updatedAt || r.updatedAt < bR) && GS(r) : i === QS && WS(r, e);
     }
   }
 }
 function mce(t) {
   for (let e = 0; e < t.observers.length; e += 1) {
     const n = t.observers[e];
-    n.state || (n.state = Q4, n.pure ? ti.push(n) : vl.push(n), n.observers && mce(n));
+    n.state || (n.state = QS, n.pure ? ti.push(n) : vl.push(n), n.observers && mce(n));
   }
 }
 function TR(t) {
@@ -143370,10 +143375,10 @@ function Qut(t, e, n) {
 }
 function tl(t, e, n, r) {
   if (n !== void 0 && !r && (r = []), typeof e != "function")
-    return V4(t, e, r, n);
-  pc((i) => V4(t, e(), i, n), r);
+    return VS(t, e, r, n);
+  pc((i) => VS(t, e(), i, n), r);
 }
-function V4(t, e, n, r, i) {
+function VS(t, e, n, r, i) {
   for (; typeof n == "function"; )
     n = n();
   if (e === n)
@@ -143393,12 +143398,12 @@ function V4(t, e, n, r, i) {
         let u = e();
         for (; typeof u == "function"; )
           u = u();
-        n = V4(t, u, n, r);
+        n = VS(t, u, n, r);
       }), () => n;
     if (Array.isArray(e)) {
       const u = [], a = n && Array.isArray(n);
       if (uw(u, e, n, i))
-        return pc(() => n = V4(t, u, n, r, !0)), () => n;
+        return pc(() => n = VS(t, u, n, r, !0)), () => n;
       if (u.length === 0) {
         if (n = nh(t, n, r), o)
           return n;