@malloydata/render 0.0.218-dev241203023241 → 0.0.218

package/dist/register/register.mjs

@@ -14250,7 +14250,7 @@ function M2e() {
   };
   Object.defineProperty(xp, "__esModule", { value: !0 }), xp.LL1Analyzer = void 0;
   const n = Kh, r = Po, i = ox, s = jo, o = xx(), u = Ee, a = C8(), l = As, c = Mo(), f = J0, x = Xh, d = Xt, p = Mm;
-  let m = class e7 {
+  let m = class eD {
     constructor(y) {
       this.atn = y;
     }
@@ -14272,7 +14272,7 @@ function M2e() {
         let A = new o.IntervalSet();
         E[v] = A;
         let _ = new r.Array2DHashSet(l.ObjectEqualityComparator.INSTANCE);
-        this._LOOK(y.transition(v).target, void 0, c.PredictionContext.EMPTY_LOCAL, A, _, new s.BitSet(), !1, !1), (A.size === 0 || A.contains(e7.HIT_PRED)) && (A = void 0, E[v] = A);
+        this._LOOK(y.transition(v).target, void 0, c.PredictionContext.EMPTY_LOCAL, A, _, new s.BitSet(), !1, !1), (A.size === 0 || A.contains(eD.HIT_PRED)) && (A = void 0, E[v] = A);
       }
       return E;
     }
@@ -14361,7 +14361,7 @@ function M2e() {
             S.clear(j.ruleIndex);
           }
         } else if (j instanceof n.AbstractPredicateTransition)
-          b ? this._LOOK(j.target, E, v, A, _, S, b, C) : A.add(e7.HIT_PRED);
+          b ? this._LOOK(j.target, E, v, A, _, S, b, C) : A.add(eD.HIT_PRED);
         else if (j.isEpsilon)
           this._LOOK(j.target, E, v, A, _, S, b, C);
         else if (j instanceof p.WildcardTransition)
@@ -15816,12 +15816,12 @@ function io() {
   };
   Object.defineProperty(vp, "__esModule", { value: !0 }), vp.ParserRuleContext = void 0;
   const e = G0, n = fr, r = Ee, i = IW(), s = Bo;
-  let o = class t7 extends i.RuleContext {
+  let o = class tD extends i.RuleContext {
     constructor(a, l) {
       l == null ? super() : super(a, l);
     }
     static emptyContext() {
-      return t7.EMPTY;
+      return tD.EMPTY;
     }
     /**
      * COPY a ctx (I'm deliberately not using copy constructor) to avoid
@@ -15895,7 +15895,7 @@ function io() {
     }
     get parent() {
       let a = super.parent;
-      if (a === void 0 || a instanceof t7)
+      if (a === void 0 || a instanceof tD)
         return a;
       throw new TypeError("Invalid parent type for ParserRuleContext");
     }
@@ -18282,15 +18282,15 @@ var Jpe = T && T.__decorate || function(t, e, n, r) {
 Object.defineProperty(hx, "__esModule", { value: !0 });
 hx.InputMismatchException = void 0;
 const e1e = ro, t1e = Ee;
-let n7 = class extends e1e.RecognitionException {
+let nD = class extends e1e.RecognitionException {
   constructor(e, n, r) {
     r === void 0 && (r = e.context), super(e, e.inputStream, r), n !== void 0 && this.setOffendingState(n), this.setOffendingToken(e, e.currentToken);
   }
 };
-n7 = Jpe([
+nD = Jpe([
   Zpe(0, t1e.NotNull)
-], n7);
-hx.InputMismatchException = n7;
+], nD);
+hx.InputMismatchException = nD;
 var nP;
 function T8() {
   if (nP)
@@ -20064,9 +20064,9 @@ function YW() {
   };
   Object.defineProperty(Tp, "__esModule", { value: !0 }), Tp.ParserInterpreter = void 0;
   const n = Vu, r = xr, i = jo, s = ec, o = hx, u = VW(), a = Vm, l = Ee, c = Ee, f = o2(), x = n2(), d = ro, p = Vh, m = Xt;
-  let g = class r7 extends f.Parser {
+  let g = class rD extends f.Parser {
     constructor(E, v, A, _, S) {
-      if (super(E instanceof r7 ? E.inputStream : S), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof r7) {
+      if (super(E instanceof rD ? E.inputStream : S), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof rD) {
         let b = E;
         this._grammarFileName = b._grammarFileName, this._atn = b._atn, this.pushRecursionContextStates = b.pushRecursionContextStates, this._ruleNames = b._ruleNames, this._vocabulary = b._vocabulary, this.interpreter = new x.ParserATNSimulator(this._atn, this);
       } else {
@@ -31220,7 +31220,7 @@ class h extends Jge.Parser {
             i = new ZY(i), this._ctx = i, s = i, this.state = 1101, this.match(h.NOT), this.state = 1102, this.fieldExpr(13);
             break;
           case 7:
-            i = new i7(i), this._ctx = i, s = i, this.state = 1103, this.match(h.CAST), this.state = 1104, this.match(h.OPAREN), this.state = 1105, this.fieldExpr(0), this.state = 1106, this.match(h.AS), this.state = 1107, this.malloyOrSQLType(), this.state = 1108, this.match(h.CPAREN);
+            i = new iD(i), this._ctx = i, s = i, this.state = 1103, this.match(h.CAST), this.state = 1104, this.match(h.OPAREN), this.state = 1105, this.fieldExpr(0), this.state = 1106, this.match(h.AS), this.state = 1107, this.malloyOrSQLType(), this.state = 1108, this.match(h.CPAREN);
             break;
           case 8:
             {
@@ -31409,7 +31409,7 @@ class h extends Jge.Parser {
                 break;
               case 12:
                 {
-                  if (i = new i7(new Se(n, r)), this.pushNewRecursionContext(i, o, h.RULE_fieldExpr), this.state = 1211, !this.precpred(this._ctx, 27))
+                  if (i = new iD(new Se(n, r)), this.pushNewRecursionContext(i, o, h.RULE_fieldExpr), this.state = 1211, !this.precpred(this._ctx, 27))
                     throw this.createFailedPredicateException("this.precpred(this._ctx, 27)");
                   this.state = 1212, this.match(h.DOUBLECOLON), this.state = 1213, this.malloyOrSQLType();
                 }
@@ -37711,7 +37711,7 @@ class MY extends Se {
   }
 }
 L.ExprTimeTruncContext = MY;
-class i7 extends Se {
+class iD extends Se {
   fieldExpr() {
     return this.getRuleContext(0, Se);
   }
@@ -37749,7 +37749,7 @@ class i7 extends Se {
     return e.visitExprCast ? e.visitExprCast(this) : e.visitChildren(this);
   }
 }
-L.ExprCastContext = i7;
+L.ExprCastContext = iD;
 class jY extends Se {
   fieldExpr() {
     return this.getRuleContext(0, Se);
@@ -39520,10 +39520,10 @@ class Eu {
   }
   document() {
     var e;
-    return this instanceof o7 ? this : (e = this.parent) === null || e === void 0 ? void 0 : e.document();
+    return this instanceof oD ? this : (e = this.parent) === null || e === void 0 ? void 0 : e.document();
   }
   namespace() {
-    if (this instanceof o7)
+    if (this instanceof oD)
       return this;
     if (this.parent)
       return this.parent.namespace();
@@ -39535,8 +39535,8 @@ class Eu {
   }
   modelEntry(e) {
     var n;
-    const r = e instanceof s7 ? e.name : e, i = (n = this.namespace()) === null || n === void 0 ? void 0 : n.getEntry(r);
-    return e instanceof s7 && ((i == null ? void 0 : i.entry.type) === "query" ? this.addReference({
+    const r = e instanceof sD ? e.name : e, i = (n = this.namespace()) === null || n === void 0 ? void 0 : n.getEntry(r);
+    return e instanceof sD && ((i == null ? void 0 : i.entry.type) === "query" ? this.addReference({
       type: "queryReference",
       text: r,
       definition: i.entry,
@@ -39662,7 +39662,7 @@ class Eme extends Eu {
   }
 }
 Ye.Unimplemented = Eme;
-class s7 extends Eu {
+class sD extends Eu {
   constructor(e) {
     super(), this.name = e, this.elementType = "modelEntryReference";
   }
@@ -39677,7 +39677,7 @@ class s7 extends Eu {
     return (e = this.modelEntry(this)) === null || e === void 0 ? void 0 : e.entry;
   }
 }
-Ye.ModelEntryReference = s7;
+Ye.ModelEntryReference = sD;
 class vme extends Eu {
   constructor(e) {
     super(), this.id = e, this.elementType = "experimentalExperiment";
@@ -39754,7 +39754,7 @@ function Sme(t) {
   const e = SK(t).join("");
   return (0, yme.v5)(e, _me);
 }
-class o7 extends Eu {
+class oD extends Eu {
   constructor(e) {
     super(), this.elementType = "document", this.globalNameSpace = new mme.GlobalNameSpace(), this.documentModel = {}, this.queryList = [], this.sqlBlocks = [], this.didInitModel = !1, this.annotation = {}, this.experiments = new dme.Tag({}), this.modelAnnotationTodoList = [], this.dialectNameSpaces = /* @__PURE__ */ new Map(), this.statements = new m3(e), this.has({ statements: e });
   }
@@ -39852,7 +39852,7 @@ class o7 extends Eu {
     return this.dialectNameSpaces.set(e, r), r;
   }
 }
-Ye.Document = o7;
+Ye.Document = oD;
 var cb = {}, f2 = {}, nn = {};
 (function(t) {
   Object.defineProperty(t, "__esModule", { value: !0 }), t.atomicDef = t.inspect = t.typeEq = t.typeIn = t.eq = t.any = t.anyAtomicT = t.aggregateBoolT = t.viewT = t.errorT = t.boolT = t.timestampT = t.dateT = t.stringT = t.numberT = t.nullT = void 0;
@@ -40270,15 +40270,15 @@ so.Source = i3e;
 var y3 = {}, x2 = {}, fb = {}, v0 = {};
 Object.defineProperty(v0, "__esModule", { value: !0 });
 v0.mergeFields = v0.nameFromDef = void 0;
-function u7(t) {
+function uD(t) {
   var e;
   return t.type === "fieldref" ? t.path[t.path.length - 1] : (e = t.as) !== null && e !== void 0 ? e : t.name;
 }
-v0.nameFromDef = u7;
+v0.nameFromDef = uD;
 function s3e(t, e) {
   if (t === void 0)
     return e;
-  const n = new Set(e.map((i) => u7(i))), r = t.filter((i) => !n.has(u7(i)));
+  const n = new Set(e.map((i) => uD(i))), r = t.filter((i) => !n.has(uD(i)));
   return r.push(...e), r;
 }
 v0.mergeFields = s3e;
@@ -40987,7 +40987,7 @@ _0.Renames = yye;
 var Ii = {};
 Object.defineProperty(Ii, "__esModule", { value: !0 });
 Ii.JoinStatement = Ii.ExpressionJoin = Ii.KeyJoin = Ii.Join = void 0;
-const a7 = Xe, Eye = E3, vye = Cs, Aye = Ye, _ye = qr, FK = Kr, Sye = Nn;
+const aD = Xe, Eye = E3, vye = Cs, Aye = Ye, _ye = qr, FK = Kr, Sye = Nn;
 class VN extends Aye.MalloyElement {
   constructor() {
     super(...arguments), this.isNoteableObj = !0, this.extendNote = _ye.extendNoteMethod;
@@ -41008,7 +41008,7 @@ class bye extends VN {
   structDef(e) {
     var n;
     const r = this.getStructDefFromExpr(e);
-    if (!(0, a7.isJoinable)(r))
+    if (!(0, aD.isJoinable)(r))
       throw this.internalError(`Cannot join struct type '${r.type}'`);
     const i = {
       ...r,
@@ -41022,7 +41022,7 @@ class bye extends VN {
   }
   fixupJoinOn(e, n) {
     const r = this.keyExpr.getExpression(e);
-    if ((0, a7.isSourceDef)(n) && n.primaryKey) {
+    if ((0, aD.isSourceDef)(n) && n.primaryKey) {
       const i = n.fields.find((s) => (s.as || s.name) === n.primaryKey);
       if (i)
         if (i.type === r.type) {
@@ -41073,7 +41073,7 @@ class Cye extends VN {
       return this.sourceExpr.sqLog("invalid-join-source", "Cannot create a source to join from"), FK.ErrorFactory.joinDef;
     const i = r.getSourceDef(e);
     let s = "left";
-    if (this.inExperiment("join_types", !0) && (s = this.matrixOperation), !(0, a7.isJoinable)(i))
+    if (this.inExperiment("join_types", !0) && (s = this.matrixOperation), !(0, aD.isJoinable)(i))
       throw this.internalError(`Can't join struct type ${i.type}`);
     const o = {
       ...i,
@@ -41498,10 +41498,10 @@ ct.applyBinary = ct.getMorphicValue = ct.ExprDuration = ct.ExpressionDef = ct.AT
 const S0 = Xe, Kc = SEe(nn), JN = bs, rl = Qt, bEe = $i, $K = A2, CEe = Ye, Bg = Co;
 class TEe extends Error {
 }
-var l7;
+var lD;
 (function(t) {
   t[t.And = 0] = "And", t[t.Or = 1] = "Or", t[t.Value = 2] = "Value", t[t.Partial = 3] = "Partial";
-})(l7 || (ct.ATNodeType = l7 = {}));
+})(lD || (ct.ATNodeType = lD = {}));
 class BK extends CEe.MalloyElement {
   constructor() {
     super(...arguments), this.legalChildTypes = Kc.anyAtomicT;
@@ -41557,14 +41557,14 @@ class BK extends CEe.MalloyElement {
     return (0, S0.expressionIsAggregate)(e.expressionType);
   }
   atNodeType() {
-    return l7.Value;
+    return lD.Value;
   }
   atExpr() {
     return this;
   }
 }
 ct.ExpressionDef = BK;
-class c7 extends BK {
+class cD extends BK {
   constructor(e, n) {
     super({ n: e }), this.n = e, this.timeframe = n, this.elementType = "duration", this.legalChildTypes = [Kc.timestampT, Kc.dateT];
   }
@@ -41593,7 +41593,7 @@ class c7 extends BK {
     });
   }
 }
-ct.ExprDuration = c7;
+ct.ExprDuration = cD;
 function aM(t, e) {
   return t.type === e ? t.value : t.morphic && t.morphic[e];
 }
@@ -41726,9 +41726,9 @@ function FEe(t, e, n, r) {
     let l = r;
     if (s.type !== "duration")
       if ((0, $K.isGranularResult)(i))
-        l = new c7(r, i.timeframe);
+        l = new cD(r, i.timeframe);
       else if (i.type === "date")
-        l = new c7(r, "day");
+        l = new cD(r, "day");
       else
         return e.loggedErrorExpr("time-offset-type-mismatch", `Can not offset time by '${s.type}'`);
     return l.apply(t, n, e);
@@ -43095,7 +43095,7 @@ class d_e extends c_e.ExpressionDef {
     if (!(u.type === "error")) {
       const f = this.getJoinUsage(s), x = this.source !== void 0 || this.explicitSource;
       if (o && !(!this.source && f.every((p) => p.length === 0)) && !this.isSymmetricFunction()) {
-        const p = x7(l, f), m = d7(this.elementType, p), g = x ? m == null ? void 0 : m.message : "Join path is required for this calculation";
+        const p = xD(l, f), m = dD(this.elementType, p), g = x ? m == null ? void 0 : m.message : "Join path is required for this calculation";
         if (g) {
           const y = p_e(g, f, o, this.elementType), E = (i = m == null ? void 0 : m.code) !== null && i !== void 0 ? i : "bad-join-usage";
           m ? this.logError(E, y) : this.logWarning(E, y);
@@ -43127,11 +43127,11 @@ class d_e extends c_e.ExpressionDef {
     const n = [];
     if (this.source && this.source.getField(e).found) {
       const i = { node: "field", path: this.source.path };
-      n.push(...f7(e, i));
+      n.push(...fD(e, i));
     }
     if (this.expr) {
       const r = this.expr.getExpression(e).value;
-      n.push(...f7(e, r));
+      n.push(...fD(e, r));
     }
     return n;
   }
@@ -43146,7 +43146,7 @@ function h_e(t, e) {
       return !1;
   return !0;
 }
-function f7(t, e) {
+function fD(t, e) {
   const n = [], r = (i, s) => {
     const o = s[0], u = s.slice(1), a = i.entry(o);
     if (a === void 0)
@@ -43176,7 +43176,7 @@ function f7(t, e) {
       const s = r(t, i.path), o = s.def;
       if ((0, og.isAtomic)(o) && !(0, og.isJoined)(o))
         if ((0, og.hasExpression)(o)) {
-          const u = f7(s.fs, o.e);
+          const u = fD(s.fs, o.e);
           n.push(...u.map((a) => [...s.joinPath, ...a]));
         } else
           n.push(s.joinPath);
@@ -43188,7 +43188,7 @@ function f7(t, e) {
         n.push([]);
   return n;
 }
-function x7(t, e) {
+function xD(t, e) {
   const n = [];
   for (const r of e) {
     let i = 0;
@@ -43202,7 +43202,7 @@ function x7(t, e) {
   }
   return n;
 }
-function d7(t, e) {
+function dD(t, e) {
   for (const n of e)
     for (const r of n) {
       if (r.joinType === "cross")
@@ -43234,7 +43234,7 @@ function p_e(t, e, n, r) {
         break;
       }
     }
-  const s = x7(i, e), o = d7(r, s), u = i.slice().reverse().findIndex((p) => p.joinType === "many" || p.joinType === "cross"), a = u === -1 ? 0 : i.length - u, l = i.slice(0, a), c = x7(l, e), f = d7(r, c), x = i.length > 0 ? i.map((p) => p.name).join(".") : "source", d = l.length > 0 ? l.map((p) => p.name).join(".") : "source";
+  const s = xD(i, e), o = dD(r, s), u = i.slice().reverse().findIndex((p) => p.joinType === "many" || p.joinType === "cross"), a = u === -1 ? 0 : i.length - u, l = i.slice(0, a), c = xD(l, e), f = dD(r, c), x = i.length > 0 ? i.map((p) => p.name).join(".") : "source", d = l.length > 0 ? l.map((p) => p.name).join(".") : "source";
   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()`";
   {
@@ -43247,7 +43247,7 @@ var Cb = {};
 Object.defineProperty(Cb, "__esModule", { value: !0 });
 Cb.ExprAlternationTree = void 0;
 const EM = Qt, Rd = ct, g_e = Co;
-function h7(t) {
+function hD(t) {
   const e = t.atExpr();
   switch (e.atNodeType()) {
     case Rd.ATNodeType.And:
@@ -43255,9 +43255,9 @@ function h7(t) {
       return;
     case Rd.ATNodeType.Or: {
       if (e instanceof QK) {
-        const n = h7(e.left);
+        const n = hD(e.left);
         if (n) {
-          const r = h7(e.right);
+          const r = hD(e.right);
           if (r)
             return [...n, ...r];
         }
@@ -43273,7 +43273,7 @@ class QK extends Rd.ExpressionDef {
     super({ left: e, right: r }), this.left = e, this.op = n, this.right = r, this.elementType = "alternation", this.elementType = `${n}alternation${n}`;
   }
   equalityList() {
-    return this.inList === void 0 && (this.inList = h7(this) || []), this.inList;
+    return this.inList === void 0 && (this.inList = hD(this) || []), this.inList;
   }
   apply(e, n, r, i) {
     if ((0, g_e.isEquality)(n)) {
@@ -44662,7 +44662,7 @@ class Pl extends bx {
     super("Zone is an abstract class");
   }
 }
-const Ue = "numeric", No = "short", cs = "long", p7 = {
+const Ue = "numeric", No = "short", cs = "long", pD = {
   year: Ue,
   month: Ue,
   day: Ue
@@ -44873,7 +44873,7 @@ function AA(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;
 }
-function g7(t) {
+function gD(t) {
   return t > 99 ? t : t > 60 ? 1900 + t : 2e3 + t;
 }
 function gX(t, e, n, r = null) {
@@ -45020,7 +45020,7 @@ function LM(t, e) {
   return n;
 }
 const ibe = {
-  D: p7,
+  D: pD,
   DD: KK,
   DDD: XK,
   DDDD: JK,
@@ -45806,26 +45806,26 @@ function lbe(t, e = {}) {
   let r = jM[n];
   return r || (r = new Intl.ListFormat(t, e), jM[n] = r), r;
 }
-let m7 = {};
-function y7(t, e = {}) {
+let mD = {};
+function yD(t, e = {}) {
   const n = JSON.stringify([t, e]);
-  let r = m7[n];
-  return r || (r = new Intl.DateTimeFormat(t, e), m7[n] = r), r;
+  let r = mD[n];
+  return r || (r = new Intl.DateTimeFormat(t, e), mD[n] = r), r;
 }
-let E7 = {};
+let ED = {};
 function cbe(t, e = {}) {
   const n = JSON.stringify([t, e]);
-  let r = E7[n];
-  return r || (r = new Intl.NumberFormat(t, e), E7[n] = r), r;
+  let r = ED[n];
+  return r || (r = new Intl.NumberFormat(t, e), ED[n] = r), r;
 }
-let v7 = {};
+let vD = {};
 function fbe(t, e = {}) {
   const {
     base: n,
     ...r
   } = e, i = JSON.stringify([t, r]);
-  let s = v7[i];
-  return s || (s = new Intl.RelativeTimeFormat(t, e), v7[i] = s), s;
+  let s = vD[i];
+  return s || (s = new Intl.RelativeTimeFormat(t, e), vD[i] = s), s;
 }
 let F1 = null;
 function xbe() {
@@ -45839,9 +45839,9 @@ function dbe(t) {
     let n;
     const r = t.substring(0, e);
     try {
-      n = y7(t).resolvedOptions();
+      n = yD(t).resolvedOptions();
     } catch {
-      n = y7(r).resolvedOptions();
+      n = yD(r).resolvedOptions();
     }
     const {
       numberingSystem: i,
@@ -45914,7 +45914,7 @@ class Ebe {
     const s = {
       ...this.opts
     };
-    i && (s.timeZone = i), this.dtf = y7(n, s);
+    i && (s.timeZone = i), this.dtf = yD(n, s);
   }
   format() {
     return this.dtf.format(this.dt.toJSDate());
@@ -45949,7 +45949,7 @@ class mn {
     return new mn(o, u, a, s);
   }
   static resetCache() {
-    F1 = null, m7 = {}, E7 = {}, v7 = {};
+    F1 = null, mD = {}, ED = {}, vD = {};
   }
   static fromObject({
     locale: e,
@@ -46144,7 +46144,7 @@ const Lbe = {
 };
 function oF(t, e, n, r, i, s, o) {
   const u = {
-    year: e.length === 2 ? g7(Ql(e)) : Ql(e),
+    year: e.length === 2 ? gD(Ql(e)) : Ql(e),
     month: EX.indexOf(n) + 1,
     day: Ql(r),
     hour: Ql(i),
@@ -47632,7 +47632,7 @@ function E5e(t, e) {
       case "y":
         return Pt(l);
       case "yy":
-        return Pt(f, g7);
+        return Pt(f, gD);
       case "yyyy":
         return Pt(s);
       case "yyyyy":
@@ -47698,7 +47698,7 @@ function E5e(t, e) {
       case "kkkk":
         return Pt(s);
       case "kk":
-        return Pt(f, g7);
+        return Pt(f, gD);
       case "W":
         return Pt(u);
       case "WW":
@@ -47907,7 +47907,7 @@ function UX(t, e) {
     day: i
   };
 }
-function A7(t) {
+function AD(t) {
   const {
     year: e,
     month: n,
@@ -47993,7 +47993,7 @@ function oE(t) {
   return new Ao("unsupported zone", `the zone "${t.name}" is not supported`);
 }
 function V6(t) {
-  return t.weekData === null && (t.weekData = A7(t.c)), t.weekData;
+  return t.weekData === null && (t.weekData = AD(t.c)), t.weekData;
 }
 function t1(t, e) {
   const n = {
@@ -48370,7 +48370,7 @@ class xt {
       throw new N1("Can't mix ordinal dates with month/day");
     const d = f || o.weekday && !c;
     let p, m, g = YM(i, s);
-    d ? (p = L5e, m = N5e, g = A7(g)) : u ? (p = I5e, m = F5e, g = G6(g)) : (p = GX, m = QX);
+    d ? (p = L5e, m = N5e, g = AD(g)) : u ? (p = I5e, m = F5e, g = G6(g)) : (p = GX, m = QX);
     let y = !1;
     for (const C of p) {
       const w = o[C];
@@ -48945,7 +48945,7 @@ class xt {
       throw new N1("Can't mix ordinal dates with month/day");
     let l;
     r ? l = GM({
-      ...A7(this.c),
+      ...AD(this.c),
       ...n
     }) : Ct(n.ordinal) ? (l = {
       ...this.toObject(),
@@ -49078,7 +49078,7 @@ class xt {
    * @example DateTime.now().toLocaleString({ hour: '2-digit', minute: '2-digit', hourCycle: 'h23' }); //=> '11:32'
    * @return {string}
    */
-  toLocaleString(e = p7, n = {}) {
+  toLocaleString(e = pD, n = {}) {
     return this.isValid ? Bi.create(this.loc.clone(n), e).formatDateTime(this) : W6;
   }
   /**
@@ -49482,7 +49482,7 @@ class xt {
    * @type {Object}
    */
   static get DATE_SHORT() {
-    return p7;
+    return pD;
   }
   /**
    * {@link DateTime#toLocaleString} format like 'Oct 14, 1983'
@@ -49655,7 +49655,7 @@ Yi.VERSION = $5e;
 Yi.Zone = T2;
 Object.defineProperty(er, "__esModule", { value: !0 });
 er.LiteralYear = er.LiteralQuarter = er.LiteralMonth = er.LiteralWeek = er.LiteralDay = er.LiteralHour = er.LiteralTimestamp = er.TimeFormatError = void 0;
-const C0 = Yi, k5e = Xe, P5e = Qt, M5e = sc, nj = _2, _7 = ct;
+const C0 = Yi, k5e = Xe, P5e = Qt, M5e = sc, nj = _2, _D = ct;
 class j5e extends Error {
 }
 er.TimeFormatError = j5e;
@@ -49671,8 +49671,8 @@ function Cx(t, e) {
   }
   return { text: n };
 }
-const WX = "yyyy", VX = `${WX}-LL`, Hs = `${VX}-dd`, YX = `${Hs} HH`, KX = `${YX}:mm`, S7 = `${KX}:ss`;
-class XX extends _7.ExpressionDef {
+const WX = "yyyy", VX = `${WX}-LL`, Hs = `${VX}-dd`, YX = `${Hs} HH`, KX = `${YX}:mm`, SD = `${KX}:ss`;
+class XX extends _D.ExpressionDef {
   constructor(e, n, r) {
     super(), this.units = n, this.timeType = r, this.literalPart = e.text, e.tzSpec && (this.timeZone = e.tzSpec);
   }
@@ -49713,12 +49713,12 @@ class aF extends XX {
     e = r.text, e[10] === "T" && (e = e.slice(0, 10) + " " + e.slice(11), r.text = e);
     const i = e.match(/^([^.,]+)[,.](\d+)$/);
     i && (e = i[1]);
-    let s = C0.DateTime.fromFormat(e, S7);
+    let s = C0.DateTime.fromFormat(e, SD);
     if (s.isValid)
       return new aF(r, n);
     if (s = C0.DateTime.fromFormat(e, KX), s.isValid) {
       r.text = r.text + ":00", n = "minute";
-      const o = s.plus({ minute: 1 }).toFormat(S7);
+      const o = s.plus({ minute: 1 }).toFormat(SD);
       return new lF(r, n, "timestamp", o);
     }
   }
@@ -49733,7 +49733,7 @@ class lF extends XX {
     if (s) {
       const o = r.getExpression(e);
       if (o.type === "timestamp") {
-        const u = (0, _7.getMorphicValue)(i, "timestamp"), a = (0, _7.getMorphicValue)(s, "timestamp");
+        const u = (0, _D.getMorphicValue)(i, "timestamp"), a = (0, _D.getMorphicValue)(s, "timestamp");
         if (u && a)
           i = u, s = a;
         else
@@ -49756,7 +49756,7 @@ class cF extends lF {
     let r = n.text;
     const i = C0.DateTime.fromFormat(n.text, YX);
     if (i.isValid)
-      return n.text = n.text + ":00:00", r = i.plus({ hour: 1 }).toFormat(S7), new cF(n, r);
+      return n.text = n.text + ":00:00", r = i.plus({ hour: 1 }).toFormat(SD), new cF(n, r);
   }
 }
 er.LiteralHour = cF;
@@ -50859,7 +50859,7 @@ class cc extends WTe.MalloyElement {
     super({ expr: e }), this.expr = e, this.defineName = n, this.exprSrc = r, this.isNoteableObj = !0, this.extendNote = VTe.extendNoteMethod;
   }
   fieldDef(e, n) {
-    return this.queryFieldDef(new b7(e, this), n);
+    return this.queryFieldDef(new bD(e, this), n);
   }
   executesInOutputSpace() {
     return !1;
@@ -50930,7 +50930,7 @@ class cc extends WTe.MalloyElement {
       }
       return r.expressionType && (u.expressionType = r.expressionType), this.exprSrc && (u.code = this.exprSrc), this.note && (u.annotation = this.note), u;
     }
-    if (!(e instanceof b7 && e.foundCircle) && r.type !== "error") {
+    if (!(e instanceof bD && e.foundCircle) && r.type !== "error") {
       const u = QTe.inspect(r);
       this.logError("invalid-type-for-field-definition", `Cannot define '${n}', unexpected type: ${u}`);
     }
@@ -51010,7 +51010,7 @@ class n6e extends cc {
   }
 }
 pn.DimensionFieldDeclaration = n6e;
-class b7 {
+class bD {
   constructor(e, n) {
     this.realFS = e, this.circular = n, this.type = "fieldSpace", this.foundCircle = !1;
   }
@@ -51055,7 +51055,7 @@ class b7 {
     throw new Error("Not a query field space");
   }
 }
-pn.DefSpace = b7;
+pn.DefSpace = bD;
 class tJ extends YTe.SpaceField {
   constructor(e, n) {
     super(), this.space = e, this.exprDef = n, this.fieldName = n.defineName;
@@ -51156,14 +51156,14 @@ m5.ProjectStatement = p6e;
 var c0 = {}, za = {};
 Object.defineProperty(za, "__esModule", { value: !0 });
 za.findReferences = za.deprecatedParseTableURI = za.constructTableKey = void 0;
-const g6e = W0, C7 = fn;
+const g6e = W0, CD = fn;
 function rO(t) {
-  const e = (0, C7.getStringIfShort)(t);
+  const e = (0, CD.getStringIfShort)(t);
   if (e)
     return e;
   const n = [], r = t.string().sqlString();
   if (r) {
-    for (const i of (0, C7.getStringParts)(r))
+    for (const i of (0, CD.getStringParts)(r))
       typeof i == "string" && n.push(i);
     return n.join("");
   }
@@ -51182,7 +51182,7 @@ class m6e {
     });
   }
   enterTableMethod(e) {
-    const n = (0, C7.getId)(e.connectionId()), r = rO(e.tablePath()), i = this.trans.rangeFromContext(e);
+    const n = (0, CD.getId)(e.connectionId()), r = rO(e.tablePath()), i = this.trans.rangeFromContext(e);
     this.registerTableReference(n, r, i);
   }
   enterTableFunction(e) {
@@ -52907,7 +52907,7 @@ var IOe = T && T.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(pu, "__esModule", { value: !0 });
 pu.MalloyParserErrorHandler = pu.MalloyTranslator = pu.MalloyChildTranslator = pu.MalloyTranslation = void 0;
-const Cj = w4, kOe = Xe, POe = j4, MOe = L, aJ = BOe(ub), jOe = T5, T7 = ab, UOe = za, uO = O5, qOe = R5, zOe = D5, HOe = w5, QOe = N5, SA = F5, GOe = Xa, lJ = Hu, WOe = L5, VOe = I5;
+const Cj = w4, kOe = Xe, POe = j4, MOe = L, aJ = BOe(ub), jOe = T5, TD = ab, UOe = za, uO = O5, qOe = R5, zOe = D5, HOe = w5, QOe = N5, SA = F5, GOe = Xa, lJ = Hu, WOe = L5, VOe = I5;
 class YOe extends POe.MalloyLexer {
   popMode() {
     return this._modeStack.isEmpty ? this._mode : super.popMode();
@@ -53432,14 +53432,14 @@ class cJ extends yF {
 pu.MalloyChildTranslator = cJ;
 class sRe extends yF {
   constructor(e, n = null, r = null, i = null) {
-    super(e, n), this.eventStream = i, this.schemaZone = new uO.Zone(), this.importZone = new uO.Zone(), this.sqlQueryZone = new uO.Zone(), this.root = this, this.logger = new T7.BaseMessageLogger(i), r && this.update(r);
+    super(e, n), this.eventStream = i, this.schemaZone = new uO.Zone(), this.importZone = new uO.Zone(), this.sqlQueryZone = new uO.Zone(), this.root = this, this.logger = new TD.BaseMessageLogger(i), r && this.update(r);
   }
   update(e) {
     var n, r, i;
     this.schemaZone.updateFrom(e.tables, (n = e.errors) === null || n === void 0 ? void 0 : n.tables), this.importZone.updateFrom(e.urls, (r = e.errors) === null || r === void 0 ? void 0 : r.urls), this.sqlQueryZone.updateFrom(e.compileSQL, (i = e.errors) === null || i === void 0 ? void 0 : i.compileSQL);
   }
   logError(e, n, r) {
-    return this.logger.log((0, T7.makeLogMessage)(e, n, { severity: "error", ...r })), e;
+    return this.logger.log((0, TD.makeLogMessage)(e, n, { severity: "error", ...r })), e;
   }
 }
 pu.MalloyTranslator = sRe;
@@ -53448,7 +53448,7 @@ class fJ {
     this.translator = e, this.messages = n;
   }
   logError(e, n, r) {
-    return this.messages.log((0, T7.makeLogMessage)(e, n, { severity: "error", ...r })), e;
+    return this.messages.log((0, TD.makeLogMessage)(e, n, { severity: "error", ...r })), e;
   }
   syntaxError(e, n, r, i, s, o) {
     const u = { line: r - 1, character: i }, a = n ? this.translator.rangeFromToken(n) : { start: u, end: u };
@@ -53982,11 +53982,11 @@ class fh {
    * Construct a DocumentRange from JSON.
    */
   static fromJSON(e) {
-    return new fh(new O7(e.start.line, e.start.character), new O7(e.end.line, e.end.character));
+    return new fh(new OD(e.start.line, e.start.character), new OD(e.end.line, e.end.character));
   }
 }
 Ne.DocumentRange = fh;
-class O7 {
+class OD {
   constructor(e, n) {
     this._line = e, this._character = n;
   }
@@ -54009,7 +54009,7 @@ class O7 {
     return { line: this.line, character: this.character };
   }
 }
-Ne.DocumentPosition = O7;
+Ne.DocumentPosition = OD;
 class B5 {
   constructor(e) {
     this._range = fh.fromJSON(e.range), this._lensRange = e.lensRange ? fh.fromJSON(e.lensRange) : void 0, this._type = e.type, this._name = e.name, this._children = e.children.map((n) => new B5(n));
@@ -54295,7 +54295,7 @@ class fs extends EF {
       this._fieldMap = new Map(this.structDef.fields.map((r) => {
         const i = r.as || r.name, s = n.get(r.name);
         if ((0, yr.isJoined)(r))
-          return [i, new R7(r, this, s)];
+          return [i, new RD(r, this, s)];
         if (r.type === "turtle")
           return [i, new TF(r, this, s)];
         if (r.type === "string")
@@ -54368,7 +54368,7 @@ class fs extends EF {
     return this._parentExplore;
   }
   hasParentExplore() {
-    return this instanceof R7;
+    return this instanceof RD;
   }
   // TODO wrapper type for FilterCondition
   get filters() {
@@ -54672,7 +54672,7 @@ var Ad;
 (function(t) {
   t.OneToOne = "one_to_one", t.OneToMany = "one_to_many", t.ManyToOne = "many_to_one";
 })(Ad || (Ne.JoinRelationship = Ad = {}));
-class R7 extends fs {
+class RD extends fs {
   constructor(e, n, r) {
     super(e, n, r), this._parentExplore = n;
   }
@@ -54713,7 +54713,7 @@ class R7 extends fs {
     return e ? [e] : [];
   }
 }
-Ne.ExploreField = R7;
+Ne.ExploreField = RD;
 class OF {
   constructor(...e) {
     this.isTestRuntime = !1;
@@ -57238,105 +57238,105 @@ function VRe(t) {
   return WRe.call(t);
 }
 var YRe = VRe, Dj = wF, KRe = QRe, XRe = YRe, JRe = "[object Null]", ZRe = "[object Undefined]", wj = Dj ? Dj.toStringTag : void 0;
-function e7e(t) {
+function eDe(t) {
   return t == null ? t === void 0 ? ZRe : JRe : wj && wj in Object(t) ? KRe(t) : XRe(t);
 }
-var t7e = e7e;
-function n7e(t) {
+var tDe = eDe;
+function nDe(t) {
   return t != null && typeof t == "object";
 }
-var r7e = n7e, i7e = t7e, s7e = r7e, o7e = "[object Symbol]";
-function u7e(t) {
-  return typeof t == "symbol" || s7e(t) && i7e(t) == o7e;
+var rDe = nDe, iDe = tDe, sDe = rDe, oDe = "[object Symbol]";
+function uDe(t) {
+  return typeof t == "symbol" || sDe(t) && iDe(t) == oDe;
 }
-var a7e = u7e, Nj = wF, l7e = MRe, c7e = URe, f7e = a7e, x7e = 1 / 0, Fj = Nj ? Nj.prototype : void 0, Lj = Fj ? Fj.toString : void 0;
+var aDe = uDe, Nj = wF, lDe = MRe, cDe = URe, fDe = aDe, xDe = 1 / 0, Fj = Nj ? Nj.prototype : void 0, Lj = Fj ? Fj.toString : void 0;
 function PJ(t) {
   if (typeof t == "string")
     return t;
-  if (c7e(t))
-    return l7e(t, PJ) + "";
-  if (f7e(t))
+  if (cDe(t))
+    return lDe(t, PJ) + "";
+  if (fDe(t))
     return Lj ? Lj.call(t) : "";
   var e = t + "";
-  return e == "0" && 1 / t == -x7e ? "-0" : e;
+  return e == "0" && 1 / t == -xDe ? "-0" : e;
 }
-var d7e = PJ, h7e = d7e;
-function p7e(t) {
-  return t == null ? "" : h7e(t);
+var dDe = PJ, hDe = dDe;
+function pDe(t) {
+  return t == null ? "" : hDe(t);
 }
-var NF = p7e, g7e = DRe, m7e = NF, y7e = /[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g, E7e = "\\u0300-\\u036f", v7e = "\\ufe20-\\ufe2f", A7e = "\\u20d0-\\u20ff", _7e = E7e + v7e + A7e, S7e = "[" + _7e + "]", b7e = RegExp(S7e, "g");
-function C7e(t) {
-  return t = m7e(t), t && t.replace(y7e, g7e).replace(b7e, "");
+var NF = pDe, gDe = DRe, mDe = NF, yDe = /[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g, EDe = "\\u0300-\\u036f", vDe = "\\ufe20-\\ufe2f", ADe = "\\u20d0-\\u20ff", _De = EDe + vDe + ADe, SDe = "[" + _De + "]", bDe = RegExp(SDe, "g");
+function CDe(t) {
+  return t = mDe(t), t && t.replace(yDe, gDe).replace(bDe, "");
 }
-var T7e = C7e, O7e = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
-function R7e(t) {
-  return t.match(O7e) || [];
+var TDe = CDe, ODe = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
+function RDe(t) {
+  return t.match(ODe) || [];
 }
-var D7e = R7e, w7e = /[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
-function N7e(t) {
-  return w7e.test(t);
+var DDe = RDe, wDe = /[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/;
+function NDe(t) {
+  return wDe.test(t);
 }
-var F7e = N7e, MJ = "\\ud800-\\udfff", L7e = "\\u0300-\\u036f", I7e = "\\ufe20-\\ufe2f", $7e = "\\u20d0-\\u20ff", B7e = L7e + I7e + $7e, jJ = "\\u2700-\\u27bf", UJ = "a-z\\xdf-\\xf6\\xf8-\\xff", k7e = "\\xac\\xb1\\xd7\\xf7", P7e = "\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf", M7e = "\\u2000-\\u206f", j7e = " \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000", qJ = "A-Z\\xc0-\\xd6\\xd8-\\xde", U7e = "\\ufe0e\\ufe0f", zJ = k7e + P7e + M7e + j7e, HJ = "['’]", Ij = "[" + zJ + "]", q7e = "[" + B7e + "]", QJ = "\\d+", z7e = "[" + jJ + "]", GJ = "[" + UJ + "]", WJ = "[^" + MJ + zJ + QJ + jJ + UJ + qJ + "]", H7e = "\\ud83c[\\udffb-\\udfff]", Q7e = "(?:" + q7e + "|" + H7e + ")", G7e = "[^" + MJ + "]", VJ = "(?:\\ud83c[\\udde6-\\uddff]){2}", YJ = "[\\ud800-\\udbff][\\udc00-\\udfff]", hd = "[" + qJ + "]", W7e = "\\u200d", $j = "(?:" + GJ + "|" + WJ + ")", V7e = "(?:" + hd + "|" + WJ + ")", Bj = "(?:" + HJ + "(?:d|ll|m|re|s|t|ve))?", kj = "(?:" + HJ + "(?:D|LL|M|RE|S|T|VE))?", KJ = Q7e + "?", XJ = "[" + U7e + "]?", Y7e = "(?:" + W7e + "(?:" + [G7e, VJ, YJ].join("|") + ")" + XJ + KJ + ")*", K7e = "\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])", X7e = "\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])", J7e = XJ + KJ + Y7e, Z7e = "(?:" + [z7e, VJ, YJ].join("|") + ")" + J7e, eDe = RegExp([
+var FDe = NDe, MJ = "\\ud800-\\udfff", LDe = "\\u0300-\\u036f", IDe = "\\ufe20-\\ufe2f", $De = "\\u20d0-\\u20ff", BDe = LDe + IDe + $De, jJ = "\\u2700-\\u27bf", UJ = "a-z\\xdf-\\xf6\\xf8-\\xff", kDe = "\\xac\\xb1\\xd7\\xf7", PDe = "\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf", MDe = "\\u2000-\\u206f", jDe = " \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000", qJ = "A-Z\\xc0-\\xd6\\xd8-\\xde", UDe = "\\ufe0e\\ufe0f", zJ = kDe + PDe + MDe + jDe, HJ = "['’]", Ij = "[" + zJ + "]", qDe = "[" + BDe + "]", QJ = "\\d+", zDe = "[" + jJ + "]", GJ = "[" + UJ + "]", WJ = "[^" + MJ + zJ + QJ + jJ + UJ + qJ + "]", HDe = "\\ud83c[\\udffb-\\udfff]", QDe = "(?:" + qDe + "|" + HDe + ")", GDe = "[^" + MJ + "]", VJ = "(?:\\ud83c[\\udde6-\\uddff]){2}", YJ = "[\\ud800-\\udbff][\\udc00-\\udfff]", hd = "[" + qJ + "]", WDe = "\\u200d", $j = "(?:" + GJ + "|" + WJ + ")", VDe = "(?:" + hd + "|" + WJ + ")", Bj = "(?:" + HJ + "(?:d|ll|m|re|s|t|ve))?", kj = "(?:" + HJ + "(?:D|LL|M|RE|S|T|VE))?", KJ = QDe + "?", XJ = "[" + UDe + "]?", YDe = "(?:" + WDe + "(?:" + [GDe, VJ, YJ].join("|") + ")" + XJ + KJ + ")*", KDe = "\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])", XDe = "\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])", JDe = XJ + KJ + YDe, ZDe = "(?:" + [zDe, VJ, YJ].join("|") + ")" + JDe, e7e = RegExp([
   hd + "?" + GJ + "+" + Bj + "(?=" + [Ij, hd, "$"].join("|") + ")",
-  V7e + "+" + kj + "(?=" + [Ij, hd + $j, "$"].join("|") + ")",
+  VDe + "+" + kj + "(?=" + [Ij, hd + $j, "$"].join("|") + ")",
   hd + "?" + $j + "+" + Bj,
   hd + "+" + kj,
-  X7e,
-  K7e,
+  XDe,
+  KDe,
   QJ,
-  Z7e
+  ZDe
 ].join("|"), "g");
-function tDe(t) {
-  return t.match(eDe) || [];
+function t7e(t) {
+  return t.match(e7e) || [];
 }
-var nDe = tDe, rDe = D7e, iDe = F7e, sDe = NF, oDe = nDe;
-function uDe(t, e, n) {
-  return t = sDe(t), e = n ? void 0 : e, e === void 0 ? iDe(t) ? oDe(t) : rDe(t) : t.match(e) || [];
+var n7e = t7e, r7e = DDe, i7e = FDe, s7e = NF, o7e = n7e;
+function u7e(t, e, n) {
+  return t = s7e(t), e = n ? void 0 : e, e === void 0 ? i7e(t) ? o7e(t) : r7e(t) : t.match(e) || [];
 }
-var aDe = uDe, lDe = SRe, cDe = T7e, fDe = aDe, xDe = "['’]", dDe = RegExp(xDe, "g");
-function hDe(t) {
+var a7e = u7e, l7e = SRe, c7e = TDe, f7e = a7e, x7e = "['’]", d7e = RegExp(x7e, "g");
+function h7e(t) {
   return function(e) {
-    return lDe(fDe(cDe(e).replace(dDe, "")), t, "");
+    return l7e(f7e(c7e(e).replace(d7e, "")), t, "");
   };
 }
-var pDe = hDe;
-function gDe(t, e, n) {
+var p7e = h7e;
+function g7e(t, e, n) {
   var r = -1, i = t.length;
   e < 0 && (e = -e > i ? 0 : i + e), n = n > i ? i : n, n < 0 && (n += i), i = e > n ? 0 : n - e >>> 0, e >>>= 0;
   for (var s = Array(i); ++r < i; )
     s[r] = t[r + e];
   return s;
 }
-var mDe = gDe, yDe = mDe;
-function EDe(t, e, n) {
+var m7e = g7e, y7e = m7e;
+function E7e(t, e, n) {
   var r = t.length;
-  return n = n === void 0 ? r : n, !e && n >= r ? t : yDe(t, e, n);
+  return n = n === void 0 ? r : n, !e && n >= r ? t : y7e(t, e, n);
 }
-var vDe = EDe, ADe = "\\ud800-\\udfff", _De = "\\u0300-\\u036f", SDe = "\\ufe20-\\ufe2f", bDe = "\\u20d0-\\u20ff", CDe = _De + SDe + bDe, TDe = "\\ufe0e\\ufe0f", ODe = "\\u200d", RDe = RegExp("[" + ODe + ADe + CDe + TDe + "]");
-function DDe(t) {
-  return RDe.test(t);
+var v7e = E7e, A7e = "\\ud800-\\udfff", _7e = "\\u0300-\\u036f", S7e = "\\ufe20-\\ufe2f", b7e = "\\u20d0-\\u20ff", C7e = _7e + S7e + b7e, T7e = "\\ufe0e\\ufe0f", O7e = "\\u200d", R7e = RegExp("[" + O7e + A7e + C7e + T7e + "]");
+function D7e(t) {
+  return R7e.test(t);
 }
-var JJ = DDe;
-function wDe(t) {
+var JJ = D7e;
+function w7e(t) {
   return t.split("");
 }
-var NDe = wDe, ZJ = "\\ud800-\\udfff", FDe = "\\u0300-\\u036f", LDe = "\\ufe20-\\ufe2f", IDe = "\\u20d0-\\u20ff", $De = FDe + LDe + IDe, BDe = "\\ufe0e\\ufe0f", kDe = "[" + ZJ + "]", D7 = "[" + $De + "]", w7 = "\\ud83c[\\udffb-\\udfff]", PDe = "(?:" + D7 + "|" + w7 + ")", eZ = "[^" + ZJ + "]", tZ = "(?:\\ud83c[\\udde6-\\uddff]){2}", nZ = "[\\ud800-\\udbff][\\udc00-\\udfff]", MDe = "\\u200d", rZ = PDe + "?", iZ = "[" + BDe + "]?", jDe = "(?:" + MDe + "(?:" + [eZ, tZ, nZ].join("|") + ")" + iZ + rZ + ")*", UDe = iZ + rZ + jDe, qDe = "(?:" + [eZ + D7 + "?", D7, tZ, nZ, kDe].join("|") + ")", zDe = RegExp(w7 + "(?=" + w7 + ")|" + qDe + UDe, "g");
-function HDe(t) {
-  return t.match(zDe) || [];
+var N7e = w7e, ZJ = "\\ud800-\\udfff", F7e = "\\u0300-\\u036f", L7e = "\\ufe20-\\ufe2f", I7e = "\\u20d0-\\u20ff", $7e = F7e + L7e + I7e, B7e = "\\ufe0e\\ufe0f", k7e = "[" + ZJ + "]", DD = "[" + $7e + "]", wD = "\\ud83c[\\udffb-\\udfff]", P7e = "(?:" + DD + "|" + wD + ")", eZ = "[^" + ZJ + "]", tZ = "(?:\\ud83c[\\udde6-\\uddff]){2}", nZ = "[\\ud800-\\udbff][\\udc00-\\udfff]", M7e = "\\u200d", rZ = P7e + "?", iZ = "[" + B7e + "]?", j7e = "(?:" + M7e + "(?:" + [eZ, tZ, nZ].join("|") + ")" + iZ + rZ + ")*", U7e = iZ + rZ + j7e, q7e = "(?:" + [eZ + DD + "?", DD, tZ, nZ, k7e].join("|") + ")", z7e = RegExp(wD + "(?=" + wD + ")|" + q7e + U7e, "g");
+function H7e(t) {
+  return t.match(z7e) || [];
 }
-var QDe = HDe, GDe = NDe, WDe = JJ, VDe = QDe;
-function YDe(t) {
-  return WDe(t) ? VDe(t) : GDe(t);
+var Q7e = H7e, G7e = N7e, W7e = JJ, V7e = Q7e;
+function Y7e(t) {
+  return W7e(t) ? V7e(t) : G7e(t);
 }
-var KDe = YDe, XDe = vDe, JDe = JJ, ZDe = KDe, ewe = NF;
+var K7e = Y7e, X7e = v7e, J7e = JJ, Z7e = K7e, ewe = NF;
 function twe(t) {
   return function(e) {
     e = ewe(e);
-    var n = JDe(e) ? ZDe(e) : void 0, r = n ? n[0] : e.charAt(0), i = n ? XDe(n, 1).join("") : e.slice(1);
+    var n = J7e(e) ? Z7e(e) : void 0, r = n ? n[0] : e.charAt(0), i = n ? X7e(n, 1).join("") : e.slice(1);
     return r[t]() + i;
   };
 }
-var nwe = twe, rwe = nwe, iwe = rwe("toUpperCase"), swe = iwe, owe = pDe, uwe = swe, awe = owe(function(t, e, n) {
+var nwe = twe, rwe = nwe, iwe = rwe("toUpperCase"), swe = iwe, owe = p7e, uwe = swe, awe = owe(function(t, e, n) {
   return t + (n ? " " : "") + uwe(e);
 }), lwe = awe;
 const cwe = /* @__PURE__ */ mS(lwe);
@@ -57749,7 +57749,7 @@ function mZ(t, e, n) {
   const r = Math.sign(t[0]);
   return z5(t, e, n, dZ(r), xZ(r));
 }
-function N7(t, e, n, r) {
+function ND(t, e, n, r) {
   return z5(t, e, n, TA(r), TA(1 / r));
 }
 function yZ(t, e, n, r) {
@@ -58424,10 +58424,10 @@ class Qj extends Map {
         this.set(r, i);
   }
   get(e) {
-    return super.get(F7(this, e));
+    return super.get(FD(this, e));
   }
   has(e) {
-    return super.has(F7(this, e));
+    return super.has(FD(this, e));
   }
   set(e, n) {
     return super.set(DZ(this, e), n);
@@ -58443,7 +58443,7 @@ class OA extends Set {
         this.add(r);
   }
   has(e) {
-    return super.has(F7(this, e));
+    return super.has(FD(this, e));
   }
   add(e) {
     return super.add(DZ(this, e));
@@ -58452,7 +58452,7 @@ class OA extends Set {
     return super.delete(wZ(this, e));
   }
 }
-function F7({ _intern: t, _key: e }, n) {
+function FD({ _intern: t, _key: e }, n) {
   const r = e(n);
   return t.has(r) ? t.get(r) : n;
 }
@@ -58489,7 +58489,7 @@ function RA(t, e, n) {
   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 ? RA(t, e, n * 2) : [u, a, l];
 }
-function L7(t, e, n) {
+function LD(t, e, n) {
   if (e = +e, t = +t, n = +n, !(n > 0))
     return [];
   if (t === e)
@@ -58513,12 +58513,12 @@ function L7(t, e, n) {
       a[l] = (i + l) * o;
   return a;
 }
-function I7(t, e, n) {
+function ID(t, e, n) {
   return e = +e, t = +t, n = +n, RA(t, e, n)[2];
 }
 function R0(t, e, n) {
   e = +e, t = +t, n = +n;
-  const r = e < t, i = r ? I7(e, t, n) : I7(t, e, n);
+  const r = e < t, i = r ? ID(e, t, n) : ID(t, e, n);
   return (r ? -1 : 1) * (i < 0 ? 1 / -i : i);
 }
 function af(t, e) {
@@ -58533,7 +58533,7 @@ function af(t, e) {
   }
   return n;
 }
-function $7(t, e) {
+function $D(t, e) {
   let n;
   if (e === void 0)
     for (const r of t)
@@ -58569,13 +58569,13 @@ function o1(t, e, n) {
   const r = t[e];
   t[e] = t[n], t[n] = r;
 }
-function B7(t, e, n) {
+function BD(t, e, n) {
   if (t = Float64Array.from(f8e(t, n)), !(!(r = t.length) || isNaN(e = +e))) {
     if (e <= 0 || r < 2)
-      return $7(t);
+      return $D(t);
     if (e >= 1)
       return af(t);
-    var r, i = (r - 1) * e, s = Math.floor(i), o = af(LZ(t, s).subarray(0, s + 1)), u = $7(t.subarray(s + 1));
+    var r, i = (r - 1) * e, s = Math.floor(i), o = af(LZ(t, s).subarray(0, s + 1)), u = $D(t.subarray(s + 1));
     return o + (u - o) * (i - s);
   }
 }
@@ -58603,7 +58603,7 @@ function v8e(t, e) {
     return r / n;
 }
 function $Z(t, e) {
-  return B7(t, 0.5, e);
+  return BD(t, 0.5, e);
 }
 function* A8e(t) {
   for (const e of t)
@@ -59040,15 +59040,15 @@ function z8e(t) {
   return WZ(new Date(t));
 }
 function H8e(t) {
-  return k7(new Date(t));
+  return kD(new Date(t));
 }
 function WZ(t) {
   return Qa.count(kF(t.getFullYear()) - 1, t);
 }
-function k7(t) {
+function kD(t) {
   return F2.count(kF(t.getFullYear()) - 1, t);
 }
-function P7(t) {
+function PD(t) {
   return kF(t).getDay();
 }
 function Q8e(t, e, n, r, i, s, o) {
@@ -59062,17 +59062,17 @@ function G8e(t) {
   return VZ(new Date(t));
 }
 function W8e(t) {
-  return M7(new Date(t));
+  return MD(new Date(t));
 }
 function VZ(t) {
   const e = Date.UTC(t.getUTCFullYear(), 0, 1);
   return f0.count(e - 1, t);
 }
-function M7(t) {
+function MD(t) {
   const e = Date.UTC(t.getUTCFullYear(), 0, 1);
   return L2.count(e - 1, t);
 }
-function j7(t) {
+function jD(t) {
   return Qc.setTime(Date.UTC(t, 0, 1)), Qc.getUTCDay();
 }
 function V8e(t, e, n, r, i, s, o) {
@@ -59107,12 +59107,12 @@ const K8e = {
   [Lo]: (t) => t.getSeconds(),
   [Bu]: (t) => t.getMilliseconds(),
   [ol]: (t) => WZ(t),
-  [nr]: (t) => k7(t),
-  [nr + oi]: (t, e) => mh(k7(t), t.getDay(), P7(e)),
-  [oi]: (t, e) => mh(1, t.getDay(), P7(e))
+  [nr]: (t) => kD(t),
+  [nr + oi]: (t, e) => mh(kD(t), t.getDay(), PD(e)),
+  [oi]: (t, e) => mh(1, t.getDay(), PD(e))
 }, X8e = {
   [ms]: (t) => 3 * t,
-  [nr]: (t, e) => mh(t, 0, P7(e))
+  [nr]: (t, e) => mh(t, 0, PD(e))
 };
 function J8e(t, e) {
   return YZ(t, e || 1, K8e, X8e, Q8e);
@@ -59127,12 +59127,12 @@ const Z8e = {
   [Lo]: (t) => t.getUTCSeconds(),
   [Bu]: (t) => t.getUTCMilliseconds(),
   [ol]: (t) => VZ(t),
-  [nr]: (t) => M7(t),
-  [oi]: (t, e) => mh(1, t.getUTCDay(), j7(e)),
-  [nr + oi]: (t, e) => mh(M7(t), t.getUTCDay(), j7(e))
+  [nr]: (t) => MD(t),
+  [oi]: (t, e) => mh(1, t.getUTCDay(), jD(e)),
+  [nr + oi]: (t, e) => mh(MD(t), t.getUTCDay(), jD(e))
 }, eNe = {
   [ms]: (t) => 3 * t,
-  [nr]: (t, e) => mh(t, 0, j7(e))
+  [nr]: (t, e) => mh(t, 0, jD(e))
 };
 function tNe(t, e) {
   return YZ(t, e || 1, Z8e, eNe, V8e);
@@ -59186,11 +59186,11 @@ function oNe(t, e, n, r) {
 function uNe(t, e, n, r) {
   return XZ(K3(t), e, n, r);
 }
-const $1 = 1e3, B1 = $1 * 60, k1 = B1 * 60, K5 = k1 * 24, aNe = K5 * 7, Jj = K5 * 30, U7 = K5 * 365, JZ = [zr, xi, ys, Ys, Ks, Lo, Bu], P1 = JZ.slice(0, -1), M1 = P1.slice(0, -1), j1 = M1.slice(0, -1), lNe = j1.slice(0, -1), cNe = [zr, nr], Zj = [zr, xi], ZZ = [zr], u1 = [[P1, 1, $1], [P1, 5, 5 * $1], [P1, 15, 15 * $1], [P1, 30, 30 * $1], [M1, 1, B1], [M1, 5, 5 * B1], [M1, 15, 15 * B1], [M1, 30, 30 * B1], [j1, 1, k1], [j1, 3, 3 * k1], [j1, 6, 6 * k1], [j1, 12, 12 * k1], [lNe, 1, K5], [cNe, 1, aNe], [Zj, 1, Jj], [Zj, 3, 3 * Jj], [ZZ, 1, U7]];
+const $1 = 1e3, B1 = $1 * 60, k1 = B1 * 60, K5 = k1 * 24, aNe = K5 * 7, Jj = K5 * 30, UD = K5 * 365, JZ = [zr, xi, ys, Ys, Ks, Lo, Bu], P1 = JZ.slice(0, -1), M1 = P1.slice(0, -1), j1 = M1.slice(0, -1), lNe = j1.slice(0, -1), cNe = [zr, nr], Zj = [zr, xi], ZZ = [zr], u1 = [[P1, 1, $1], [P1, 5, 5 * $1], [P1, 15, 15 * $1], [P1, 30, 30 * $1], [M1, 1, B1], [M1, 5, 5 * B1], [M1, 15, 15 * B1], [M1, 30, 30 * B1], [j1, 1, k1], [j1, 3, 3 * k1], [j1, 6, 6 * k1], [j1, 12, 12 * k1], [lNe, 1, K5], [cNe, 1, aNe], [Zj, 1, Jj], [Zj, 3, 3 * Jj], [ZZ, 1, UD]];
 function fNe(t) {
   const e = t.extent, n = t.maxbins || 40, r = Math.abs(H5(e)) / n;
   let i = V3((u) => u[2]).right(u1, r), s, o;
-  return i === u1.length ? (s = ZZ, o = R0(e[0] / U7, e[1] / U7, n)) : i ? (i = u1[r / u1[i - 1][2] < u1[i][2] / r ? i - 1 : i], s = i[0], o = i[1]) : (s = JZ, o = Math.max(R0(e[0], e[1], n), 1)), {
+  return i === u1.length ? (s = ZZ, o = R0(e[0] / UD, e[1] / UD, n)) : i ? (i = u1[r / u1[i - 1][2] < u1[i][2] / r ? i - 1 : i], s = i[0], o = i[1]) : (s = JZ, o = Math.max(R0(e[0], e[1], n), 1)), {
     units: s,
     step: o
   };
@@ -59766,10 +59766,10 @@ function uee(t) {
     }
   };
 }
-let q7;
+let qD;
 hFe();
 function hFe() {
-  return q7 = uee({
+  return qD = uee({
     format: Q5,
     formatPrefix: $F
   });
@@ -59777,8 +59777,8 @@ function hFe() {
 function aee(t) {
   return uee(MZ(t));
 }
-function z7(t) {
-  return arguments.length ? q7 = aee(t) : q7;
+function zD(t) {
+  return arguments.length ? qD = aee(t) : qD;
 }
 function cU(t, e, n) {
   n = n || {}, Qe(n) || Ae(`Invalid time multi-format specifier: ${n}`);
@@ -59794,10 +59794,10 @@ function lee(t) {
     utcParse: U1(t.utcParse)
   };
 }
-let H7;
+let HD;
 pFe();
 function pFe() {
-  return H7 = lee({
+  return HD = lee({
     format: PF,
     parse: see,
     utcFormat: MF,
@@ -59808,16 +59808,16 @@ function cee(t) {
   return lee(eee(t));
 }
 function FA(t) {
-  return arguments.length ? H7 = cee(t) : H7;
+  return arguments.length ? HD = cee(t) : HD;
 }
-const Q7 = (t, e) => ht({}, t, e);
+const QD = (t, e) => ht({}, t, e);
 function fee(t, e) {
-  const n = t ? aee(t) : z7(), r = e ? cee(e) : FA();
-  return Q7(n, r);
+  const n = t ? aee(t) : zD(), r = e ? cee(e) : FA();
+  return QD(n, r);
 }
 function gFe(t, e) {
   const n = arguments.length;
-  return n && n !== 2 && Ae("defaultLocale expects either zero or two arguments."), n ? Q7(z7(t), FA(e)) : Q7(z7(), FA());
+  return n && n !== 2 && Ae("defaultLocale expects either zero or two arguments."), n ? QD(zD(t), FA(e)) : QD(zD(), FA());
 }
 const mFe = /^(data:|([A-Za-z]+:)?\/\/)/, yFe = /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp|file|data):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i, EFe = /[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205f\u3000]/g, fU = "file://";
 function vFe(t, e) {
@@ -61114,7 +61114,7 @@ function b9e(t, e, n, r) {
       u += i[~~(ul() * s)];
     c[l] = u / s;
   }
-  return c.sort(Ha), [B7(c, n / 2), B7(c, 1 - n / 2)];
+  return c.sort(Ha), [BD(c, n / 2), BD(c, 1 - n / 2)];
 }
 function C9e(t, e, n, r) {
   r = r || ((x) => x);
@@ -61580,7 +61580,7 @@ function Q9e(t) {
     return i;
   };
 }
-function G7(t) {
+function GD(t) {
   return !t || !t.length ? function() {
     return "";
   } : t.length === 1 ? t[0] : Q9e(t);
@@ -61942,7 +61942,7 @@ Fe(D0, ye, {
     this._dims = je(t.groupby), this._dnames = this._dims.map((g) => {
       const y = wn(g);
       return i(g), n.push(y), y;
-    }), this.cellkey = t.key ? t.key : G7(this._dims), this._countOnly = !0, this._counts = [], this._measures = [];
+    }), this.cellkey = t.key ? t.key : GD(this._dims), this._countOnly = !0, this._counts = [], this._measures = [];
     const s = t.fields || [null], o = t.ops || ["count"], u = t.as || [], a = s.length, l = {};
     let c, f, x, d, p, m;
     for (a !== o.length && Ae("Unmatched number of fields and aggregate ops."), m = 0; m < a; ++m) {
@@ -61955,7 +61955,7 @@ Fe(D0, ye, {
     return this._measures = this._measures.map((g) => zee(g, g.field)), {};
   },
   // -- Cell Management -----
-  cellkey: G7(),
+  cellkey: GD(),
   cell(t, e) {
     let n = this.value[t];
     return n ? n.num === 0 && this._drop && n.stamp < this.stamp ? (n.stamp = this.stamp, this._adds[this._alen++] = n) : n.stamp < this.stamp && (n.stamp = this.stamp, this._mods[this._mlen++] = n) : (n = this.value[t] = this.newcell(t, e), this._adds[this._alen++] = n), n;
@@ -62757,7 +62757,7 @@ const pE = {
   value: "value",
   median: $Z,
   mean: v8e,
-  min: $7,
+  min: $D,
   max: af
 }, cLe = [];
 function x9(t) {
@@ -63684,7 +63684,7 @@ _9.Definition = {
 Fe(_9, ye, {
   transform(t, e) {
     this.stamp = e.stamp;
-    const n = t.modified(), r = wx(t.sort), i = G7(t.groupby), s = (u) => this.group(i(u));
+    const n = t.modified(), r = wx(t.sort), i = GD(t.groupby), s = (u) => this.group(i(u));
     let o = this.state;
     (!o || n) && (o = this.state = new fte(t)), n || e.modified(o.inputs) ? (this.value = {}, e.visit(e.SOURCE, (u) => s(u).add(u))) : (e.visit(e.REM, (u) => s(u).remove(u)), e.visit(e.ADD, (u) => s(u).add(u)));
     for (let u = 0, a = this._mlen; u < a; ++u)
@@ -63772,7 +63772,7 @@ function FLe(t) {
 function CU(t) {
   return t >= 1 ? IA : t <= -1 ? -IA : Math.asin(t);
 }
-const W7 = Math.PI, V7 = 2 * W7, Mc = 1e-6, LLe = V7 - Mc;
+const WD = Math.PI, VD = 2 * WD, Mc = 1e-6, LLe = VD - Mc;
 function hte(t) {
   this._ += t[0];
   for (let e = 1, n = t.length; e < n; ++e)
@@ -63821,7 +63821,7 @@ let S9 = class {
       if (!(Math.abs(f * a - l * c) > Mc) || !s)
         this._append`L${this._x1 = e},${this._y1 = n}`;
       else {
-        let d = r - o, p = i - u, m = a * a + l * l, g = d * d + p * p, y = Math.sqrt(m), E = Math.sqrt(x), v = s * Math.tan((W7 - Math.acos((m + x - g) / (2 * y * E))) / 2), A = v / E, _ = v / y;
+        let d = r - o, p = i - u, m = a * a + l * l, g = d * d + p * p, y = Math.sqrt(m), E = Math.sqrt(x), v = s * Math.tan((WD - Math.acos((m + x - g) / (2 * y * E))) / 2), A = v / E, _ = v / y;
         Math.abs(A - 1) > Mc && this._append`L${e + A * c},${n + A * f}`, this._append`A${s},${s},0,0,${+(f * d > c * p)},${this._x1 = e + _ * a},${this._y1 = n + _ * l}`;
       }
   }
@@ -63829,7 +63829,7 @@ let S9 = class {
     if (e = +e, n = +n, r = +r, o = !!o, r < 0)
       throw new Error(`negative radius: ${r}`);
     let u = r * Math.cos(i), a = r * Math.sin(i), l = e + u, c = n + a, f = 1 ^ o, x = o ? i - s : s - i;
-    this._x1 === null ? this._append`M${l},${c}` : (Math.abs(this._x1 - l) > Mc || Math.abs(this._y1 - c) > Mc) && this._append`L${l},${c}`, r && (x < 0 && (x = x % V7 + V7), x > LLe ? this._append`A${r},${r},0,1,${f},${e - u},${n - a}A${r},${r},0,1,${f},${this._x1 = l},${this._y1 = c}` : x > Mc && this._append`A${r},${r},0,${+(x >= W7)},${f},${this._x1 = e + r * Math.cos(s)},${this._y1 = n + r * Math.sin(s)}`);
+    this._x1 === null ? this._append`M${l},${c}` : (Math.abs(this._x1 - l) > Mc || Math.abs(this._y1 - c) > Mc) && this._append`L${l},${c}`, r && (x < 0 && (x = x % VD + VD), x > LLe ? this._append`A${r},${r},0,1,${f},${e - u},${n - a}A${r},${r},0,1,${f},${this._x1 = l},${this._y1 = c}` : x > Mc && this._append`A${r},${r},0,${+(x >= WD)},${f},${this._x1 = e + r * Math.cos(s)},${this._y1 = n + r * Math.sin(s)}`);
   }
   rect(e, n, r, i) {
     this._append`M${this._x0 = this._x1 = +e},${this._y0 = this._y1 = +n}h${r = +r}v${+i}h${-r}Z`;
@@ -64797,13 +64797,13 @@ function xc(t, e) {
   }
   return this;
 }
-const Y7 = Symbol("implicit");
+const YD = Symbol("implicit");
 function w9() {
-  var t = new Qj(), e = [], n = [], r = Y7;
+  var t = new Qj(), e = [], n = [], r = YD;
   function i(s) {
     let o = t.get(s);
     if (o === void 0) {
-      if (r !== Y7)
+      if (r !== YD)
         return r;
       t.set(s, o = e.push(s) - 1);
     }
@@ -65213,13 +65213,13 @@ function vIe(t) {
   var e = t.r / 255, n = t.g / 255, r = t.b / 255, i = (jU * r + PU * e - MU * n) / (jU + PU - MU), s = r - i, o = (Xg * (n - i) - L9 * s) / iC, u = Math.sqrt(o * o + s * s) / (Xg * i * (1 - i)), a = u ? Math.atan2(o, s) * Lte - 120 : NaN;
   return new ff(a < 0 ? a + 360 : a, u, i, t.opacity);
 }
-function K7(t, e, n, r) {
+function KD(t, e, n, r) {
   return arguments.length === 1 ? vIe(t) : new ff(t, e, n, r ?? 1);
 }
 function ff(t, e, n, r) {
   this.h = +t, this.s = +e, this.l = +n, this.opacity = +r;
 }
-B2(ff, K7, ey(dc, {
+B2(ff, KD, ey(dc, {
   brighter(t) {
     return t = t == null ? Eh : Math.pow(Eh, t), new ff(this.h, this.s, this.l * t, this.opacity);
   },
@@ -65278,7 +65278,7 @@ function ir(t, e) {
   var n = e - t;
   return n ? Qte(t, n) : sC(isNaN(t) ? e : t);
 }
-const X7 = function t(e) {
+const XD = function t(e) {
   var n = _Ie(e);
   function r(i, s) {
     var o = n((i = N0(i)).r, (s = N0(s)).r), u = n(i.g, s.g), a = n(i.b, s.b), l = ir(i.opacity, s.opacity);
@@ -65348,7 +65348,7 @@ function Kte(t, e) {
     return r;
   };
 }
-var J7 = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g, wO = new RegExp(J7.source, "g");
+var JD = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g, wO = new RegExp(JD.source, "g");
 function TIe(t) {
   return function() {
     return t;
@@ -65360,8 +65360,8 @@ function OIe(t) {
   };
 }
 function Xte(t, e) {
-  var n = J7.lastIndex = wO.lastIndex = 0, r, i, s, o = -1, u = [], a = [];
-  for (t = t + "", e = e + ""; (r = J7.exec(t)) && (i = wO.exec(e)); )
+  var n = JD.lastIndex = wO.lastIndex = 0, r, i, s, o = -1, u = [], a = [];
+  for (t = t + "", e = e + ""; (r = JD.exec(t)) && (i = wO.exec(e)); )
     (s = i.index) > n && (s = e.slice(n, s), u[o] ? u[o] += s : u[++o] = s), (r = r[0]) === (i = i[0]) ? u[o] ? u[o] += i : u[++o] = i : (u[++o] = null, a.push({ i: o, x: mo(r, i) })), n = wO.lastIndex;
   return n < e.length && (s = e.slice(n), u[o] ? u[o] += s : u[++o] = s), u.length < 2 ? a[0] ? OIe(a[0].x) : TIe(e) : (e = a.length, function(l) {
     for (var c = 0, f; c < e; ++c)
@@ -65371,7 +65371,7 @@ function Xte(t, e) {
 }
 function hc(t, e) {
   var n = typeof e, r;
-  return e == null || n === "boolean" ? sC(e) : (n === "number" ? mo : n === "string" ? (r = Kg(e)) ? (e = r, X7) : Xte : e instanceof Kg ? X7 : e instanceof Date ? Yte : Wte(e) ? I9 : Array.isArray(e) ? Vte : typeof e.valueOf != "function" && typeof e.toString != "function" || isNaN(e) ? Kte : mo)(t, e);
+  return e == null || n === "boolean" ? sC(e) : (n === "number" ? mo : n === "string" ? (r = Kg(e)) ? (e = r, XD) : Xte : e instanceof Kg ? XD : e instanceof Date ? Yte : Wte(e) ? I9 : Array.isArray(e) ? Vte : typeof e.valueOf != "function" && typeof e.toString != "function" || isNaN(e) ? Kte : mo)(t, e);
 }
 function RIe(t) {
   var e = t.length;
@@ -65391,7 +65391,7 @@ function ty(t, e) {
     return Math.round(t * (1 - n) + e * n);
   };
 }
-var UU = 180 / Math.PI, Z7 = {
+var UU = 180 / Math.PI, ZD = {
   translateX: 0,
   translateY: 0,
   rotate: 0,
@@ -65413,10 +65413,10 @@ function Jte(t, e, n, r, i, s) {
 var EE;
 function wIe(t) {
   const e = new (typeof DOMMatrix == "function" ? DOMMatrix : WebKitCSSMatrix)(t + "");
-  return e.isIdentity ? Z7 : Jte(e.a, e.b, e.c, e.d, e.e, e.f);
+  return e.isIdentity ? ZD : Jte(e.a, e.b, e.c, e.d, e.e, e.f);
 }
 function NIe(t) {
-  return t == null || (EE || (EE = document.createElementNS("http://www.w3.org/2000/svg", "g")), EE.setAttribute("transform", t), !(t = EE.transform.baseVal.consolidate())) ? Z7 : (t = t.matrix, Jte(t.a, t.b, t.c, t.d, t.e, t.f));
+  return t == null || (EE || (EE = document.createElementNS("http://www.w3.org/2000/svg", "g")), EE.setAttribute("transform", t), !(t = EE.transform.baseVal.consolidate())) ? ZD : (t = t.matrix, Jte(t.a, t.b, t.c, t.d, t.e, t.f));
 }
 function Zte(t, e, n, r) {
   function i(l) {
@@ -65520,7 +65520,7 @@ function nne(t) {
   return function e(n) {
     n = +n;
     function r(i, s) {
-      var o = t((i = K7(i)).h, (s = K7(s)).h), u = ir(i.s, s.s), a = ir(i.l, s.l), l = ir(i.opacity, s.opacity);
+      var o = t((i = KD(i)).h, (s = KD(s)).h), u = ir(i.s, s.s), a = ir(i.l, s.l), l = ir(i.opacity, s.opacity);
       return function(c) {
         return i.h = o(c), i.s = u(c), i.l = a(Math.pow(c, n)), i.opacity = l(c), i + "";
       };
@@ -65563,7 +65563,7 @@ const GIe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
   interpolateNumber: mo,
   interpolateNumberArray: I9,
   interpolateObject: Kte,
-  interpolateRgb: X7,
+  interpolateRgb: XD,
   interpolateRgbBasis: SIe,
   interpolateRgbBasisClosed: bIe,
   interpolateRound: ty,
@@ -65579,14 +65579,14 @@ function WIe(t) {
     return t;
   };
 }
-function eD(t) {
+function e7(t) {
   return +t;
 }
 var zU = [0, 1];
 function ki(t) {
   return t;
 }
-function tD(t, e) {
+function t7(t, e) {
   return (e -= t = +t) ? function(n) {
     return (n - t) / e;
   } : WIe(isNaN(e) ? NaN : 0.5);
@@ -65599,14 +65599,14 @@ function VIe(t, e) {
 }
 function YIe(t, e, n) {
   var r = t[0], i = t[1], s = e[0], o = e[1];
-  return i < r ? (r = tD(i, r), s = n(o, s)) : (r = tD(r, i), s = n(s, o)), function(u) {
+  return i < r ? (r = t7(i, r), s = n(o, s)) : (r = t7(r, i), s = n(s, o)), function(u) {
     return s(r(u));
   };
 }
 function KIe(t, e, n) {
   var r = Math.min(t.length, e.length) - 1, i = new Array(r), s = new Array(r), o = -1;
   for (t[r] < t[0] && (t = t.slice().reverse(), e = e.slice().reverse()); ++o < r; )
-    i[o] = tD(t[o], t[o + 1]), s[o] = n(e[o], e[o + 1]);
+    i[o] = t7(t[o], t[o + 1]), s[o] = n(e[o], e[o + 1]);
   return function(u) {
     var a = O0(t, u, 1, r) - 1;
     return s[a](i[a](u));
@@ -65627,7 +65627,7 @@ function uC() {
   return f.invert = function(x) {
     return o(i((l || (l = u(e, t.map(r), mo)))(x)));
   }, f.domain = function(x) {
-    return arguments.length ? (t = Array.from(x, eD), c()) : t.slice();
+    return arguments.length ? (t = Array.from(x, e7), c()) : t.slice();
   }, f.range = function(x) {
     return arguments.length ? (e = Array.from(x), c()) : e.slice();
   }, f.rangeRound = function(x) {
@@ -65672,7 +65672,7 @@ function Nx(t) {
   var e = t.domain;
   return t.ticks = function(n) {
     var r = e();
-    return L7(r[0], r[r.length - 1], n ?? 10);
+    return LD(r[0], r[r.length - 1], n ?? 10);
   }, t.tickFormat = function(n, r) {
     var i = e();
     return ine(i[0], i[i.length - 1], n ?? 10, r);
@@ -65680,7 +65680,7 @@ function Nx(t) {
     n == null && (n = 10);
     var r = e(), i = 0, s = r.length - 1, o = r[i], u = r[s], a, l, c = 10;
     for (u < o && (l = o, o = u, u = l, l = i, i = s, s = l); c-- > 0; ) {
-      if (l = I7(o, u, n), l === a)
+      if (l = ID(o, u, n), l === a)
         return r[i] = o, r[s] = u, e(r);
       if (l > 0)
         o = Math.floor(o / l) * l, u = Math.ceil(u / l) * l;
@@ -65705,12 +65705,12 @@ function one(t) {
     return r == null || isNaN(r = +r) ? e : r;
   }
   return n.invert = n, n.domain = n.range = function(r) {
-    return arguments.length ? (t = Array.from(r, eD), n) : t.slice();
+    return arguments.length ? (t = Array.from(r, e7), n) : t.slice();
   }, n.unknown = function(r) {
     return arguments.length ? (e = r, n) : e;
   }, n.copy = function() {
     return one(t).unknown(e);
-  }, t = arguments.length ? Array.from(t, eD) : [0, 1], Nx(n);
+  }, t = arguments.length ? Array.from(t, e7) : [0, 1], Nx(n);
 }
 function une(t, e) {
   t = t.slice();
@@ -65776,9 +65776,9 @@ function B9(t) {
                 break;
               y.push(m);
             }
-      y.length * 2 < g && (y = L7(l, c, g));
+      y.length * 2 < g && (y = LD(l, c, g));
     } else
-      y = L7(x, d, Math.min(d - x, g)).map(s);
+      y = LD(x, d, Math.min(d - x, g)).map(s);
     return f ? y.reverse() : y;
   }, e.tickFormat = (u, a) => {
     if (u == null && (u = 10), a == null && (a = r === 10 ? "s" : ","), typeof a != "function" && (!(r % 1) && (a = Bf(a)).precision == null && (a.trim = !0), a = Q5(a)), u === 1 / 0)
@@ -66068,7 +66068,7 @@ function H9(t, e, n) {
   const r = t - e + n * 2;
   return t ? r > 0 ? r : 1 : 0;
 }
-const f$e = "identity", vh = "linear", al = "log", ry = "pow", iy = "sqrt", cC = "symlog", Pf = "time", Mf = "utc", Su = "sequential", k2 = "diverging", Ah = "quantile", fC = "quantize", xC = "threshold", Q9 = "ordinal", nD = "point", yne = "band", G9 = "bin-ordinal", Yn = "continuous", sy = "discrete", oy = "discretizing", oo = "interpolating", W9 = "temporal";
+const f$e = "identity", vh = "linear", al = "log", ry = "pow", iy = "sqrt", cC = "symlog", Pf = "time", Mf = "utc", Su = "sequential", k2 = "diverging", Ah = "quantile", fC = "quantize", xC = "threshold", Q9 = "ordinal", n7 = "point", yne = "band", G9 = "bin-ordinal", Yn = "continuous", sy = "discrete", oy = "discretizing", oo = "interpolating", W9 = "temporal";
 function x$e(t) {
   return function(e) {
     let n = e[0], r = e[1], i;
@@ -66201,7 +66201,7 @@ kt(xC, xne, oy);
 kt(G9, vne, [sy, oy]);
 kt(Q9, w9, sy);
 kt(yne, V9, sy);
-kt(nD, h$e, sy);
+kt(n7, h$e, sy);
 function Sne(t) {
   return zA.has(t);
 }
@@ -66215,7 +66215,7 @@ function Y9(t) {
 function _h(t) {
   return Fx(t, sy);
 }
-function rD(t) {
+function r7(t) {
   return Fx(t, oy);
 }
 function bne(t) {
@@ -66391,7 +66391,7 @@ function Ine(t, e, n) {
   };
   return n ? r.filter(u) : u;
 }
-const iD = {
+const i7 = {
   [Ah]: "quantiles",
   [fC]: "thresholds",
   [xC]: "domain"
@@ -66400,7 +66400,7 @@ const iD = {
   [fC]: "domain"
 };
 function Bne(t, e) {
-  return t.bins ? I$e(t.bins) : t.type === al ? Ine(t, e, !0) : iD[t.type] ? L$e(t[iD[t.type]]()) : J9(t, e);
+  return t.bins ? I$e(t.bins) : t.type === al ? Ine(t, e, !0) : i7[t.type] ? L$e(t[i7[t.type]]()) : J9(t, e);
 }
 function F$e(t, e, n) {
   const r = e[$ne[e.type]](), i = r.length;
@@ -66417,7 +66417,7 @@ function I$e(t) {
   const e = t.slice(0, -1);
   return e.max = Rt(t), e;
 }
-const $$e = (t) => iD[t.type] || t.bins;
+const $$e = (t) => i7[t.type] || t.bins;
 function kne(t, e, n, r, i, s, o) {
   const u = $ne[e.type] && s !== Pf && s !== Mf ? F$e(t, e, i) : Lne(t, e, n, i, s, o);
   return r === cv && $$e(e) ? B$e(u) : r === O$e ? k$e(u) : P$e(u);
@@ -66442,7 +66442,7 @@ function j$e(t, e, n, r) {
 function Pne(t, e, n) {
   n = n || {};
   const r = Math.max(3, n.maxlen || 7), i = j$e(t, e, n.format, n.formatType);
-  if (rD(e.type)) {
+  if (r7(e.type)) {
     const s = Bne(e).slice(1).map(i), o = s.length;
     return `${o} boundar${o === 1 ? "y" : "ies"}: ${s.join(", ")}`;
   } else if (_h(e.type)) {
@@ -67091,10 +67091,10 @@ function PBe(t, e) {
   return t.strokeJoin && t.strokeJoin !== "miter" ? 0 : e;
 }
 const MBe = fu - 1e-8;
-let hC, fv, xv, Zc, sD, dv, oD, uD;
-const e0 = (t, e) => hC.add(t, e), hv = (t, e) => e0(fv = t, xv = e), iq = (t) => e0(t, hC.y1), sq = (t) => e0(hC.x1, t), Wc = (t, e) => sD * t + oD * e, Vc = (t, e) => dv * t + uD * e, IO = (t, e) => e0(Wc(t, e), Vc(t, e)), $O = (t, e) => hv(Wc(t, e), Vc(t, e));
+let hC, fv, xv, Zc, s7, dv, o7, u7;
+const e0 = (t, e) => hC.add(t, e), hv = (t, e) => e0(fv = t, xv = e), iq = (t) => e0(t, hC.y1), sq = (t) => e0(hC.x1, t), Wc = (t, e) => s7 * t + o7 * e, Vc = (t, e) => dv * t + u7 * e, IO = (t, e) => e0(Wc(t, e), Vc(t, e)), $O = (t, e) => hv(Wc(t, e), Vc(t, e));
 function pC(t, e) {
-  return hC = t, e ? (Zc = e * F0, sD = uD = Math.cos(Zc), dv = Math.sin(Zc), oD = -dv) : (sD = uD = 1, Zc = dv = oD = 0), jBe;
+  return hC = t, e ? (Zc = e * F0, s7 = u7 = Math.cos(Zc), dv = Math.sin(Zc), o7 = -dv) : (s7 = u7 = 1, Zc = dv = o7 = 0), jBe;
 }
 const jBe = {
   beginPath() {
@@ -67144,18 +67144,18 @@ function aq(t, e, n, r, i) {
   return o * s * e + 3 * o * t * n + 3 * s * u * r + u * t * i;
 }
 var d0 = (d0 = x0(1, 1)) ? d0.getContext("2d") : null;
-const aD = new Gn();
+const a7 = new Gn();
 function zne(t) {
   return function(e, n) {
     if (!d0)
       return !0;
-    t(d0, e), aD.clear().union(e.bounds).intersect(n).round();
+    t(d0, e), a7.clear().union(e.bounds).intersect(n).round();
     const {
       x1: r,
       y1: i,
       x2: s,
       y2: o
-    } = aD;
+    } = a7;
     for (let u = i; u <= o; ++u)
       for (let a = r; a <= s; ++a)
         if (d0.isPointInPath(a, u))
@@ -67168,7 +67168,7 @@ function Hne(t, e) {
 }
 function Qne(t, e) {
   const n = t.x || 0, r = t.y || 0, i = t.width || 0, s = t.height || 0;
-  return e.intersects(aD.set(n, r, n + i, r + s));
+  return e.intersects(a7.set(n, r, n + i, r + s));
 }
 function UBe(t, e) {
   const n = t.x || 0, r = t.y || 0, i = t.x2 != null ? t.x2 : n, s = t.y2 != null ? t.y2 : r;
@@ -67260,7 +67260,7 @@ function ku(t, e) {
   for (r = 0, i = n.length; r < i; ++r)
     e(n[r]);
 }
-function lD(t, e) {
+function l7(t, e) {
   var n = t.items, r, i;
   if (!n || !n.length)
     return null;
@@ -67293,7 +67293,7 @@ function Vne(t, e, n, r) {
 }
 function gC(t) {
   return t = t || Fo, function(e, n, r, i, s, o) {
-    return r *= e.pixelRatio, i *= e.pixelRatio, lD(n, (u) => {
+    return r *= e.pixelRatio, i *= e.pixelRatio, l7(n, (u) => {
       const a = u.bounds;
       if (!(a && !a.contains(s, o) || !a) && t(e, u, r, i, s, o))
         return u;
@@ -67450,7 +67450,7 @@ function cke(t, e, n, r, i, s) {
   if (e.bounds && !e.bounds.contains(i, s) || !e.items)
     return null;
   const o = n * t.pixelRatio, u = r * t.pixelRatio;
-  return lD(e, (a) => {
+  return l7(e, (a) => {
     let l, c, f;
     const x = a.bounds;
     if (x && !x.contains(i, s))
@@ -67462,7 +67462,7 @@ function cke(t, e, n, r, i, s) {
     if (t.save(), t.translate(c, f), c = i - c, f = s - f, m && tL(a) && !ake(t, a, o, u))
       return t.restore(), null;
     const g = a.strokeForeground, y = e.interactive !== !1;
-    return y && g && a.stroke && uke(t, a, o, u) ? (t.restore(), a) : (l = lD(a, (E) => fke(E, c, f) ? this.pick(E, n, r, c, f) : null), !l && y && (a.fill || !g && a.stroke) && oke(t, a, o, u) && (l = a), t.restore(), l || null);
+    return y && g && a.stroke && uke(t, a, o, u) ? (t.restore(), a) : (l = l7(a, (E) => fke(E, c, f) ? this.pick(E, n, r, c, f) : null), !l && y && (a.fill || !g && a.stroke) && oke(t, a, o, u) && (l = a), t.restore(), l || null);
   });
 }
 function fke(t, e, n) {
@@ -67621,15 +67621,15 @@ const fq = Gwe();
 var bu = {
   height: bl,
   measureWidth: dL,
-  estimateWidth: cD,
-  width: cD,
+  estimateWidth: c7,
+  width: c7,
   canvas: ere
 };
 ere(!0);
 function ere(t) {
-  bu.width = t && d0 ? dL : cD;
+  bu.width = t && d0 ? dL : c7;
 }
-function cD(t, e) {
+function c7(t, e) {
   return tre(L0(t, e), bl(t));
 }
 function tre(t, e) {
@@ -68239,7 +68239,7 @@ Cl.prototype = {
     return this._load("loadImage", t);
   }
 };
-const Wke = "keydown", Vke = "keypress", Yke = "keyup", lre = "dragenter", gv = "dragleave", cre = "dragover", fD = "mousedown", Kke = "mouseup", WA = "mousemove", dg = "mouseout", fre = "mouseover", VA = "click", Xke = "dblclick", Jke = "wheel", xre = "mousewheel", YA = "touchstart", KA = "touchmove", XA = "touchend", Zke = [Wke, Vke, Yke, lre, gv, cre, fD, Kke, WA, dg, fre, VA, Xke, Jke, xre, YA, KA, XA], xD = WA, em = dg, dD = VA;
+const Wke = "keydown", Vke = "keypress", Yke = "keyup", lre = "dragenter", gv = "dragleave", cre = "dragover", f7 = "mousedown", Kke = "mouseup", WA = "mousemove", dg = "mouseout", fre = "mouseover", VA = "click", Xke = "dblclick", Jke = "wheel", xre = "mousewheel", YA = "touchstart", KA = "touchmove", XA = "touchend", Zke = [Wke, Vke, Yke, lre, gv, cre, f7, Kke, WA, dg, fre, VA, Xke, Jke, xre, YA, KA, XA], x7 = WA, em = dg, d7 = VA;
 function AC(t, e) {
   Uf.call(this, t, e), this._down = null, this._touch = null, this._first = !0, this._events = {};
 }
@@ -68264,7 +68264,7 @@ function gq(t) {
 }
 Fe(AC, Uf, {
   initialize(t, e, n) {
-    return this._canvas = t && ure(t, "canvas"), [VA, fD, WA, dg, gv].forEach((r) => hq(this, r)), Uf.prototype.initialize.call(this, t, e, n);
+    return this._canvas = t && ure(t, "canvas"), [VA, f7, WA, dg, gv].forEach((r) => hq(this, r)), Uf.prototype.initialize.call(this, t, e, n);
   },
   // return the backing canvas instance
   canvas() {
@@ -68285,7 +68285,7 @@ Fe(AC, Uf, {
   mouseout: gq(dg),
   dragleave: gq(gv),
   mousedown(t) {
-    this._down = this._active, this.fire(fD, t);
+    this._down = this._active, this.fire(f7, t);
   },
   click(t) {
     this._down === this._active && (this.fire(VA, t), this._down = null);
@@ -68302,7 +68302,7 @@ Fe(AC, Uf, {
   // fire an event
   fire(t, e, n) {
     const r = n ? this._touch : this._active, i = this._handlers[t];
-    if (e.vegaType = t, t === dD && r && r.href ? this.handleHref(e, r, r.href) : (t === xD || t === em) && this.handleTooltip(e, r, t !== em), i)
+    if (e.vegaType = t, t === d7 && r && r.href ? this.handleHref(e, r, r.href) : (t === x7 || t === em) && this.handleTooltip(e, r, t !== em), i)
       for (let s = 0, o = i.length; s < o; ++s)
         i[s].handler.call(this._obj, e, r);
   },
@@ -68342,14 +68342,14 @@ function iPe(t, e, n, r, i, s) {
     u[l] = s[l];
   return o && a !== 1 && (t.style.width = e + "px", t.style.height = n + "px"), u.pixelRatio = a, u.setTransform(a, 0, 0, a, a * r[0], a * r[1]), t;
 }
-function hD(t) {
+function h7(t) {
   Cl.call(this, t), this._options = {}, this._redraw = !1, this._dirty = new Gn(), this._tempb = new Gn();
 }
 const mq = Cl.prototype, sPe = (t, e, n) => new Gn().set(0, 0, e, n).translate(-t[0], -t[1]);
 function oPe(t, e, n) {
   return e.expand(1).round(), t.pixelRatio % 1 && e.scale(t.pixelRatio).round().scale(1 / t.pixelRatio), e.translate(-(n[0] % 1), -(n[1] % 1)), t.beginPath(), t.rect(e.x1, e.y1, e.width(), e.height()), t.clip(), e;
 }
-Fe(hD, Cl, {
+Fe(h7, Cl, {
   initialize(t, e, n, r, i, s) {
     return this._options = s || {}, this._canvas = this._options.externalContext ? null : x0(1, 1, this._options.type), t && this._canvas && (xu(t, 0).appendChild(this._canvas), this._canvas.setAttribute("class", "marks")), mq.initialize.call(this, t, e, n, r, i);
   },
@@ -68393,20 +68393,20 @@ Fe(hD, Cl, {
 function dre(t, e) {
   Uf.call(this, t, e);
   const n = this;
-  n._hrefHandler = pD(n, (r, i) => {
+  n._hrefHandler = p7(n, (r, i) => {
     i && i.href && n.handleHref(r, i, i.href);
-  }), n._tooltipHandler = pD(n, (r, i) => {
+  }), n._tooltipHandler = p7(n, (r, i) => {
     n.handleTooltip(r, i, r.type !== em);
   });
 }
-const pD = (t, e) => (n) => {
+const p7 = (t, e) => (n) => {
   let r = n.target.__data__;
   r = Array.isArray(r) ? r[0] : r, n.vegaType = n.type, e.call(t._obj, n, r);
 };
 Fe(dre, Uf, {
   initialize(t, e, n) {
     let r = this._svg;
-    return r && (r.removeEventListener(dD, this._hrefHandler), r.removeEventListener(xD, this._tooltipHandler), r.removeEventListener(em, this._tooltipHandler)), this._svg = r = t && ure(t, "svg"), r && (r.addEventListener(dD, this._hrefHandler), r.addEventListener(xD, this._tooltipHandler), r.addEventListener(em, this._tooltipHandler)), Uf.prototype.initialize.call(this, t, e, n);
+    return r && (r.removeEventListener(d7, this._hrefHandler), r.removeEventListener(x7, this._tooltipHandler), r.removeEventListener(em, this._tooltipHandler)), this._svg = r = t && ure(t, "svg"), r && (r.addEventListener(d7, this._hrefHandler), r.addEventListener(x7, this._tooltipHandler), r.addEventListener(em, this._tooltipHandler)), Uf.prototype.initialize.call(this, t, e, n);
   },
   canvas() {
     return this._svg;
@@ -68418,7 +68418,7 @@ Fe(dre, Uf, {
       const s = {
         type: t,
         handler: e,
-        listener: pD(this, e)
+        listener: p7(this, e)
       };
       (r[n] || (r[n] = [])).push(s), this._svg && this._svg.addEventListener(n, s.listener);
     }
@@ -69055,8 +69055,8 @@ const Ore = "canvas", Rre = "png", Dre = "svg", wre = "none", tf = {
   None: wre
 }, Ch = {};
 Ch[Ore] = Ch[Rre] = {
-  renderer: hD,
-  headless: hD,
+  renderer: h7,
+  headless: h7,
   handler: AC
 };
 Ch[Dre] = {
@@ -69117,7 +69117,7 @@ function CPe(t) {
     return;
   t.bounds.intersect(kO);
 }
-const Th = "top", vo = "left", _o = "right", I0 = "bottom", TPe = "top-left", OPe = "top-right", RPe = "bottom-left", DPe = "bottom-right", SL = "start", gD = "middle", ti = "end", wPe = "x", NPe = "y", _C = "group", bL = "axis", CL = "title", FPe = "frame", LPe = "scope", TL = "legend", Ire = "row-header", $re = "row-footer", Bre = "row-title", kre = "column-header", Pre = "column-footer", Mre = "column-title", IPe = "padding", $Pe = "symbol", jre = "fit", Ure = "fit-x", qre = "fit-y", BPe = "pad", OL = "none", AE = "all", mD = "each", RL = "flush", n0 = "column", r0 = "row";
+const Th = "top", vo = "left", _o = "right", I0 = "bottom", TPe = "top-left", OPe = "top-right", RPe = "bottom-left", DPe = "bottom-right", SL = "start", g7 = "middle", ti = "end", wPe = "x", NPe = "y", _C = "group", bL = "axis", CL = "title", FPe = "frame", LPe = "scope", TL = "legend", Ire = "row-header", $re = "row-footer", Bre = "row-title", kre = "column-header", Pre = "column-footer", Mre = "column-title", IPe = "padding", $Pe = "symbol", jre = "fit", Ure = "fit-x", qre = "fit-y", BPe = "pad", OL = "none", AE = "all", m7 = "each", RL = "flush", n0 = "column", r0 = "row";
 function zre(t) {
   ye.call(this, null, t);
 }
@@ -69359,7 +69359,7 @@ function Vre(t, e, n) {
     F = e[b], I = _[b] = i(F), F.x = F.x || 0, v[b] = 0, F.y = F.y || 0, A[b] = 0, C = b % c, w = ~~(b / c), m = Math.max(m, j = Math.ceil(I.x2)), E = Math.max(E, q = Math.ceil(I.y2)), p[C] = Math.max(p[C], j), y[w] = Math.max(y[w], q), d[b] = a + Nq(I.x1), g[b] = l + Nq(I.y1), r && t.dirty(e[b]);
   for (b = 0; b < x; ++b)
     b % c === 0 && (d[b] = 0), b < c && (g[b] = 0);
-  if (o === mD)
+  if (o === m7)
     for (C = 1; C < c; ++C) {
       for (ae = 0, b = C; b < x; b += c)
         ae < d[b] && (ae = d[b]);
@@ -69375,7 +69375,7 @@ function Vre(t, e, n) {
     for (o = !1, C = 1; C < c; ++C)
       for (b = C; b < x; b += c)
         d[b] += p[C - 1];
-  if (u === mD)
+  if (u === m7)
     for (w = 1; w < f; ++w) {
       for (ae = 0, b = w * c, S = b + c; b < S; ++b)
         ae < g[b] && (ae = g[b]);
@@ -69408,14 +69408,14 @@ function Vre(t, e, n) {
     case ti:
       K -= s.width();
       break;
-    case gD:
+    case g7:
       K -= s.width() / 2;
   }
   switch (ln(n.anchor, r0)) {
     case ti:
       V -= s.height();
       break;
-    case gD:
+    case g7:
       V -= s.height() / 2;
   }
   for (K = Math.round(K), V = Math.round(V), s.clear(), b = 0; b < x; ++b)
@@ -69470,8 +69470,8 @@ function XPe(t, e) {
   }), n > -1 / 0 ? n : e;
 }
 function JPe(t, e, n, r, i, s, o) {
-  const u = KPe(n, e), a = XPe(t, u("offset", 0)), l = u("anchor", SL), c = l === ti ? 1 : l === gD ? 0.5 : 0, f = {
-    align: mD,
+  const u = KPe(n, e), a = XPe(t, u("offset", 0)), l = u("anchor", SL), c = l === ti ? 1 : l === g7 ? 0.5 : 0, f = {
+    align: m7,
     bounds: u("bounds", RL),
     columns: u("direction") === "vertical" ? 1 : t.length,
     padding: u("margin", 8),
@@ -69995,13 +69995,13 @@ function RMe(t, e, n) {
     const l = a > i[u] ? u + 1 : a < i[0] ? 0 : u;
     l !== u && n.warn("Scale domainMid exceeds domain min or max.", a), i.splice(l, 0, a);
   }
-  return t.domain(sie(s, i, n)), s === Q9 && t.unknown(e.domainImplicit ? Y7 : void 0), e.nice && t.nice && t.nice(e.nice !== !0 && X9(t, e.nice) || null), i.length;
+  return t.domain(sie(s, i, n)), s === Q9 && t.unknown(e.domainImplicit ? YD : void 0), e.nice && t.nice && t.nice(e.nice !== !0 && X9(t, e.nice) || null), i.length;
 }
 function DMe(t, e, n) {
   return e ? (t.domain(sie(t.type, e, n)), e.length) : -1;
 }
 function wMe(t, e, n, r, i, s) {
-  var o = Math.abs(Rt(n) - n[0]), u = o / (o - 2 * r), a = t === al ? mZ(e, null, u) : t === iy ? N7(e, null, u, 0.5) : t === ry ? N7(e, null, u, i || 1) : t === cC ? yZ(e, null, u, s || 1) : gZ(e, null, u);
+  var o = Math.abs(Rt(n) - n[0]), u = o / (o - 2 * r), a = t === al ? mZ(e, null, u) : t === iy ? ND(e, null, u, 0.5) : t === ry ? ND(e, null, u, i || 1) : t === cC ? yZ(e, null, u, s || 1) : gZ(e, null, u);
   return e = e.slice(), e[0] = a[0], e[e.length - 1] = a[1], e;
 }
 function sie(t, e, n) {
@@ -70030,12 +70030,12 @@ function FMe(t, e, n) {
     Ae(`Scale type ${r} does not support interpolating color schemes.`);
   }
   if (s && Cne(r))
-    return t.interpolator(K9(yD(s, e.reverse), e.interpolate, e.interpolateGamma));
-  s && e.interpolate && t.interpolate ? t.interpolate(Rne(e.interpolate, e.interpolateGamma)) : pt(t.round) ? t.round(i) : pt(t.rangeRound) && t.interpolate(i ? ty : hc), s && t.range(yD(s, e.reverse));
+    return t.interpolator(K9(y7(s, e.reverse), e.interpolate, e.interpolateGamma));
+  s && e.interpolate && t.interpolate ? t.interpolate(Rne(e.interpolate, e.interpolateGamma)) : pt(t.round) ? t.round(i) : pt(t.rangeRound) && t.interpolate(i ? ty : hc), s && t.range(y7(s, e.reverse));
 }
 function LMe(t, e, n) {
-  t !== yne && t !== nD && Ae("Only band and point scales support rangeStep.");
-  var r = (e.paddingOuter != null ? e.paddingOuter : e.padding) || 0, i = t === nD ? 1 : (e.paddingInner != null ? e.paddingInner : e.padding) || 0;
+  t !== yne && t !== n7 && Ae("Only band and point scales support rangeStep.");
+  var r = (e.paddingOuter != null ? e.paddingOuter : e.padding) || 0, i = t === n7 ? 1 : (e.paddingInner != null ? e.paddingInner : e.padding) || 0;
   return [0, e.rangeStep * H9(n, i, r)];
 }
 function IMe(t, e, n) {
@@ -70043,9 +70043,9 @@ function IMe(t, e, n) {
   return _e(e.scheme) ? s = K9(e.scheme, e.interpolate, e.interpolateGamma) : (i = e.scheme.toLowerCase(), s = Nne(i), s || Ae(`Unrecognized scheme name: ${e.scheme}`)), n = t === xC ? n + 1 : t === G9 ? n - 1 : t === Ah || t === fC ? +e.schemeCount || SMe : n, Cne(t) ? Iq(s, r, e.reverse) : pt(s) ? S$e(Iq(s, r), n) : t === Q9 ? s : s.slice(0, n);
 }
 function Iq(t, e, n) {
-  return pt(t) && (e || n) ? _$e(t, yD(e || [0, 1], n)) : t;
+  return pt(t) && (e || n) ? _$e(t, y7(e || [0, 1], n)) : t;
 }
-function yD(t, e) {
+function y7(t, e) {
   return e ? t.slice().reverse() : t;
 }
 function oie(t) {
@@ -70135,7 +70135,7 @@ const MMe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
   sortitems: oie,
   stack: FL
 }, Symbol.toStringTag, { value: "Module" }));
-var rt = 1e-6, e_ = 1e-12, vt = Math.PI, bn = vt / 2, t_ = vt / 4, vi = vt * 2, Rn = 180 / vt, mt = vt / 180, St = Math.abs, M2 = Math.atan, Js = Math.atan2, it = Math.cos, CE = Math.ceil, cie = Math.exp, ED = Math.hypot, n_ = Math.log, PO = Math.pow, et = Math.sin, Ps = Math.sign || function(t) {
+var rt = 1e-6, e_ = 1e-12, vt = Math.PI, bn = vt / 2, t_ = vt / 4, vi = vt * 2, Rn = 180 / vt, mt = vt / 180, St = Math.abs, M2 = Math.atan, Js = Math.atan2, it = Math.cos, CE = Math.ceil, cie = Math.exp, E7 = Math.hypot, n_ = Math.log, PO = Math.pow, et = Math.sin, Ps = Math.sign || function(t) {
   return t > 0 ? 1 : t < 0 ? -1 : 0;
 }, Ai = Math.sqrt, LL = Math.tan;
 function fie(t) {
@@ -70169,11 +70169,11 @@ var Bq = {
       t = n[r], e.point(t[0], t[1], t[2]);
   },
   LineString: function(t, e) {
-    vD(t.coordinates, e, 0);
+    v7(t.coordinates, e, 0);
   },
   MultiLineString: function(t, e) {
     for (var n = t.coordinates, r = -1, i = n.length; ++r < i; )
-      vD(n[r], e, 0);
+      v7(n[r], e, 0);
   },
   Polygon: function(t, e) {
     Pq(t.coordinates, e);
@@ -70187,7 +70187,7 @@ var Bq = {
       r_(n[r], e);
   }
 };
-function vD(t, e, n) {
+function v7(t, e, n) {
   var r = -1, i = t.length - n, s;
   for (e.lineStart(); ++r < i; )
     s = t[r], e.point(s[0], s[1], s[2]);
@@ -70196,13 +70196,13 @@ function vD(t, e, n) {
 function Pq(t, e) {
   var n = -1, r = t.length;
   for (e.polygonStart(); ++n < r; )
-    vD(t[n], e, 1);
+    v7(t[n], e, 1);
   e.polygonEnd();
 }
 function Ra(t, e) {
   t && Bq.hasOwnProperty(t.type) ? Bq[t.type](t, e) : r_(t, e);
 }
-var i_ = new fi(), s_ = new fi(), xie, die, AD, _D, SD, Pu = {
+var i_ = new fi(), s_ = new fi(), xie, die, A7, _7, S7, Pu = {
   point: Er,
   lineStart: Er,
   lineEnd: Er,
@@ -70224,12 +70224,12 @@ function UMe() {
   hie(xie, die);
 }
 function qMe(t, e) {
-  Pu.point = hie, xie = t, die = e, t *= mt, e *= mt, AD = t, _D = it(e = e / 2 + t_), SD = et(e);
+  Pu.point = hie, xie = t, die = e, t *= mt, e *= mt, A7 = t, _7 = it(e = e / 2 + t_), S7 = et(e);
 }
 function hie(t, e) {
   t *= mt, e *= mt, e = e / 2 + t_;
-  var n = t - AD, r = n >= 0 ? 1 : -1, i = r * n, s = it(e), o = et(e), u = SD * o, a = _D * s + u * it(i), l = u * r * et(i);
-  i_.add(Js(l, a)), AD = t, _D = s, SD = o;
+  var n = t - A7, r = n >= 0 ? 1 : -1, i = r * n, s = it(e), o = et(e), u = S7 * o, a = _7 * s + u * it(i), l = u * r * et(i);
+  i_.add(Js(l, a)), A7 = t, _7 = s, S7 = o;
 }
 function zMe(t) {
   return s_ = new fi(), Ra(t, Pu), s_ * 2;
@@ -70258,20 +70258,20 @@ function u_(t) {
   t[0] /= e, t[1] /= e, t[2] /= e;
 }
 var hn, wi, _n, is, jc, pie, gie, Ld, pg, Wl, ll, Ca = {
-  point: bD,
+  point: b7,
   lineStart: Mq,
   lineEnd: jq,
   polygonStart: function() {
     Ca.point = yie, Ca.lineStart = HMe, Ca.lineEnd = QMe, pg = new fi(), Pu.polygonStart();
   },
   polygonEnd: function() {
-    Pu.polygonEnd(), Ca.point = bD, Ca.lineStart = Mq, Ca.lineEnd = jq, i_ < 0 ? (hn = -(_n = 180), wi = -(is = 90)) : pg > rt ? is = 90 : pg < -rt && (wi = -90), ll[0] = hn, ll[1] = _n;
+    Pu.polygonEnd(), Ca.point = b7, Ca.lineStart = Mq, Ca.lineEnd = jq, i_ < 0 ? (hn = -(_n = 180), wi = -(is = 90)) : pg > rt ? is = 90 : pg < -rt && (wi = -90), ll[0] = hn, ll[1] = _n;
   },
   sphere: function() {
     hn = -(_n = 180), wi = -(is = 90);
   }
 };
-function bD(t, e) {
+function b7(t, e) {
   Wl.push(ll = [hn = t, _n = t]), e < wi && (wi = e), e > is && (is = e);
 }
 function mie(t, e) {
@@ -70289,7 +70289,7 @@ function Mq() {
   Ca.point = mie;
 }
 function jq() {
-  ll[0] = hn, ll[1] = _n, Ca.point = bD, Ld = null;
+  ll[0] = hn, ll[1] = _n, Ca.point = b7, Ld = null;
 }
 function yie(t, e) {
   if (Ld) {
@@ -70324,7 +70324,7 @@ function WMe(t) {
   }
   return Wl = ll = null, hn === 1 / 0 || wi === 1 / 0 ? [[NaN, NaN], [NaN, NaN]] : [[hn, wi], [_n, is]];
 }
-var z1, a_, l_, c_, f_, x_, d_, h_, CD, TD, OD, Eie, vie, ni, ri, ii, So = {
+var z1, a_, l_, c_, f_, x_, d_, h_, C7, T7, O7, Eie, vie, ni, ri, ii, So = {
   sphere: Er,
   point: IL,
   lineStart: qq,
@@ -70373,15 +70373,15 @@ function JMe(t, e) {
 }
 function Aie(t, e) {
   t *= mt, e *= mt;
-  var n = it(e), r = n * it(t), i = n * et(t), s = et(e), o = ri * s - ii * i, u = ii * r - ni * s, a = ni * i - ri * r, l = ED(o, u, a), c = qi(l), f = l && -c / l;
-  CD.add(f * o), TD.add(f * u), OD.add(f * a), a_ += c, x_ += c * (ni + (ni = r)), d_ += c * (ri + (ri = i)), h_ += c * (ii + (ii = s)), xy(ni, ri, ii);
+  var n = it(e), r = n * it(t), i = n * et(t), s = et(e), o = ri * s - ii * i, u = ii * r - ni * s, a = ni * i - ri * r, l = E7(o, u, a), c = qi(l), f = l && -c / l;
+  C7.add(f * o), T7.add(f * u), O7.add(f * a), a_ += c, x_ += c * (ni + (ni = r)), d_ += c * (ri + (ri = i)), h_ += c * (ii + (ii = s)), xy(ni, ri, ii);
 }
 function ZMe(t) {
-  z1 = a_ = l_ = c_ = f_ = x_ = d_ = h_ = 0, CD = new fi(), TD = new fi(), OD = new fi(), Ra(t, So);
-  var e = +CD, n = +TD, r = +OD, i = ED(e, n, r);
-  return i < e_ && (e = x_, n = d_, r = h_, a_ < rt && (e = l_, n = c_, r = f_), i = ED(e, n, r), i < e_) ? [NaN, NaN] : [Js(n, e) * Rn, qi(r / i) * Rn];
+  z1 = a_ = l_ = c_ = f_ = x_ = d_ = h_ = 0, C7 = new fi(), T7 = new fi(), O7 = new fi(), Ra(t, So);
+  var e = +C7, n = +T7, r = +O7, i = E7(e, n, r);
+  return i < e_ && (e = x_, n = d_, r = h_, a_ < rt && (e = l_, n = c_, r = f_), i = E7(e, n, r), i < e_) ? [NaN, NaN] : [Js(n, e) * Rn, qi(r / i) * Rn];
 }
-function RD(t, e) {
+function R7(t, e) {
   function n(r, i) {
     return r = t(r, i), e(r[0], r[1]);
   }
@@ -70389,12 +70389,12 @@ function RD(t, e) {
     return r = e.invert(r, i), r && t.invert(r[0], r[1]);
   }), n;
 }
-function DD(t, e) {
+function D7(t, e) {
   return St(t) > vt && (t -= Math.round(t / vi) * vi), [t, e];
 }
-DD.invert = DD;
+D7.invert = D7;
 function _ie(t, e, n) {
-  return (t %= vi) ? e || n ? RD(Qq(t), Gq(e, n)) : Qq(t) : e || n ? Gq(e, n) : DD;
+  return (t %= vi) ? e || n ? R7(Qq(t), Gq(e, n)) : Qq(t) : e || n ? Gq(e, n) : D7;
 }
 function Hq(t) {
   return function(e, n) {
@@ -70880,7 +70880,7 @@ function cje() {
   }, y.extentMajor([[-180, -90 + rt], [180, 90 - rt]]).extentMinor([[-180, -80 - rt], [180, 80 + rt]]);
 }
 const tm = (t) => t;
-var UO = new fi(), wD = new fi(), Oie, Rie, ND, FD, Da = {
+var UO = new fi(), w7 = new fi(), Oie, Rie, N7, F7, Da = {
   point: Er,
   lineStart: Er,
   lineEnd: Er,
@@ -70888,7 +70888,7 @@ var UO = new fi(), wD = new fi(), Oie, Rie, ND, FD, Da = {
     Da.lineStart = fje, Da.lineEnd = dje;
   },
   polygonEnd: function() {
-    Da.lineStart = Da.lineEnd = Da.point = Er, UO.add(St(wD)), wD = new fi();
+    Da.lineStart = Da.lineEnd = Da.point = Er, UO.add(St(w7)), w7 = new fi();
   },
   result: function() {
     var t = UO / 2;
@@ -70899,10 +70899,10 @@ function fje() {
   Da.point = xje;
 }
 function xje(t, e) {
-  Da.point = Die, Oie = ND = t, Rie = FD = e;
+  Da.point = Die, Oie = N7 = t, Rie = F7 = e;
 }
 function Die(t, e) {
-  wD.add(FD * t - ND * e), ND = t, FD = e;
+  w7.add(F7 * t - N7 * e), N7 = t, F7 = e;
 }
 function dje() {
   Die(Oie, Rie);
@@ -70921,7 +70921,7 @@ var Rh = 1 / 0, p_ = Rh, nm = -Rh, g_ = nm, m_ = {
 function hje(t, e) {
   t < Rh && (Rh = t), t > nm && (nm = t), e < p_ && (p_ = e), e > g_ && (g_ = e);
 }
-var LD = 0, ID = 0, Q1 = 0, y_ = 0, E_ = 0, Sd = 0, $D = 0, BD = 0, G1 = 0, wie, Nie, du, hu, $s = {
+var L7 = 0, I7 = 0, Q1 = 0, y_ = 0, E_ = 0, Sd = 0, $7 = 0, B7 = 0, G1 = 0, wie, Nie, du, hu, $s = {
   point: zf,
   lineStart: Jq,
   lineEnd: Zq,
@@ -70932,12 +70932,12 @@ var LD = 0, ID = 0, Q1 = 0, y_ = 0, E_ = 0, Sd = 0, $D = 0, BD = 0, G1 = 0, wie,
     $s.point = zf, $s.lineStart = Jq, $s.lineEnd = Zq;
   },
   result: function() {
-    var t = G1 ? [$D / G1, BD / G1] : Sd ? [y_ / Sd, E_ / Sd] : Q1 ? [LD / Q1, ID / Q1] : [NaN, NaN];
-    return LD = ID = Q1 = y_ = E_ = Sd = $D = BD = G1 = 0, t;
+    var t = G1 ? [$7 / G1, B7 / G1] : Sd ? [y_ / Sd, E_ / Sd] : Q1 ? [L7 / Q1, I7 / Q1] : [NaN, NaN];
+    return L7 = I7 = Q1 = y_ = E_ = Sd = $7 = B7 = G1 = 0, t;
   }
 };
 function zf(t, e) {
-  LD += t, ID += e, ++Q1;
+  L7 += t, I7 += e, ++Q1;
 }
 function Jq() {
   $s.point = pje;
@@ -70963,7 +70963,7 @@ function Eje(t, e) {
 }
 function Fie(t, e) {
   var n = t - du, r = e - hu, i = Ai(n * n + r * r);
-  y_ += i * (du + t) / 2, E_ += i * (hu + e) / 2, Sd += i, i = hu * t - du * e, $D += i * (du + t), BD += i * (hu + e), G1 += i * 3, zf(du = t, hu = e);
+  y_ += i * (du + t) / 2, E_ += i * (hu + e) / 2, Sd += i, i = hu * t - du * e, $7 += i * (du + t), B7 += i * (hu + e), G1 += i * 3, zf(du = t, hu = e);
 }
 function Lie(t) {
   this._context = t;
@@ -71003,7 +71003,7 @@ Lie.prototype = {
   },
   result: Er
 };
-var kD = new fi(), qO, Iie, $ie, W1, V1, rm = {
+var k7 = new fi(), qO, Iie, $ie, W1, V1, rm = {
   point: Er,
   lineStart: function() {
     rm.point = vje;
@@ -71018,15 +71018,15 @@ var kD = new fi(), qO, Iie, $ie, W1, V1, rm = {
     qO = null;
   },
   result: function() {
-    var t = +kD;
-    return kD = new fi(), t;
+    var t = +k7;
+    return k7 = new fi(), t;
   }
 };
 function vje(t, e) {
   rm.point = Bie, Iie = W1 = t, $ie = V1 = e;
 }
 function Bie(t, e) {
-  W1 -= t, V1 -= e, kD.add(Ai(W1 * W1 + V1 * V1)), W1 = t, V1 = e;
+  W1 -= t, V1 -= e, k7.add(Ai(W1 * W1 + V1 * V1)), W1 = t, V1 = e;
 }
 let ez, v_, tz, nz;
 class rz {
@@ -71131,16 +71131,16 @@ function Pie(t, e) {
 }
 function SC(t) {
   return function(e) {
-    var n = new PD();
+    var n = new P7();
     for (var r in t)
       n[r] = t[r];
     return n.stream = e, n;
   };
 }
-function PD() {
+function P7() {
 }
-PD.prototype = {
-  constructor: PD,
+P7.prototype = {
+  constructor: P7,
   point: function(t, e) {
     this.stream.point(t, e);
   },
@@ -71323,7 +71323,7 @@ function Mie(t) {
   };
   function q() {
     var V = oz(n, 0, 0, x, d, f).apply(null, e(s, o)), ae = oz(n, r - V[0], i - V[1], x, d, f);
-    return c = _ie(u, a, l), b = RD(e, ae), C = RD(c, b), S = sz(b, _), K();
+    return c = _ie(u, a, l), b = R7(e, ae), C = R7(c, b), S = sz(b, _), K();
   }
   function K() {
     return w = I = null, F;
@@ -71667,9 +71667,9 @@ function Wje() {
     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 Vje = Math.abs, MD = Math.cos, b_ = Math.sin, Yje = 1e-6, Xie = Math.PI, jD = Xie / 2, uz = Kje(2);
+var Vje = Math.abs, M7 = Math.cos, b_ = Math.sin, Yje = 1e-6, Xie = Math.PI, j7 = Xie / 2, uz = Kje(2);
 function az(t) {
-  return t > 1 ? jD : t < -1 ? -jD : Math.asin(t);
+  return t > 1 ? j7 : t < -1 ? -j7 : Math.asin(t);
 }
 function Kje(t) {
   return t > 0 ? Math.sqrt(t) : 0;
@@ -71677,23 +71677,23 @@ function Kje(t) {
 function Xje(t, e) {
   var n = t * b_(e), r = 30, i;
   do
-    e -= i = (e + b_(e) - n) / (1 + MD(e));
+    e -= i = (e + b_(e) - n) / (1 + M7(e));
   while (Vje(i) > Yje && --r > 0);
   return e / 2;
 }
 function Jje(t, e, n) {
   function r(i, s) {
-    return [t * i * MD(s = Xje(n, s)), e * b_(s)];
+    return [t * i * M7(s = Xje(n, s)), e * b_(s)];
   }
   return r.invert = function(i, s) {
-    return s = az(s / e), [i / (t * MD(s)), az((2 * s + b_(2 * s)) / n)];
+    return s = az(s / e), [i / (t * M7(s)), az((2 * s + b_(2 * s)) / n)];
   }, r;
 }
-var Zje = Jje(uz / jD, uz, Xie);
+var Zje = Jje(uz / j7, uz, Xie);
 function eUe() {
   return ua(Zje).scale(169.529);
 }
-const tUe = Pie(), UD = [
+const tUe = Pie(), U7 = [
   // standard properties in d3-geo
   "clipAngle",
   "clipExtent",
@@ -71721,7 +71721,7 @@ function nUe(t, e) {
     const r = e();
     return r.type = t, r.path = Pie().projection(r), r.copy = r.copy || function() {
       const i = n();
-      return UD.forEach((s) => {
+      return U7.forEach((s) => {
         r[s] && i[s](r[s]());
       }), i.path.pointRadius(r.path.pointRadius()), i;
     }, _ne(r);
@@ -72148,7 +72148,7 @@ Fe(qL, ye, {
     return i || (i = e.materialize(e.SOURCE).source, u = ise(rse(), t)(i, !0), a = nse(u, u.scale || 1, u.scale || 1, 0, 0), o = [u.width, u.height], i = u.values), s = _e(s) ? s : s(i), i = r.size(o)(i, s), a && i.forEach(a), this.value && (n.rem = this.value), this.value = n.source = n.add = (i || []).map(jt), n;
   }
 });
-const qD = "Feature", zL = "FeatureCollection", hUe = "MultiPoint";
+const q7 = "Feature", zL = "FeatureCollection", hUe = "MultiPoint";
 function HL(t) {
   ye.call(this, null, t);
 }
@@ -72172,7 +72172,7 @@ Fe(HL, ye, {
       var f = s(c), x = o(c);
       f != null && x != null && (f = +f) === f && (x = +x) === x && r.push([f, x]);
     }), n = n.concat({
-      type: qD,
+      type: q7,
       geometry: {
         type: hUe,
         coordinates: r
@@ -72443,9 +72443,9 @@ function ose(t) {
 Fe(ose, ye, {
   transform(t, e) {
     let n = this.value;
-    return !n || t.modified("type") ? (this.value = n = AUe(t.type), UD.forEach((r) => {
+    return !n || t.modified("type") ? (this.value = n = AUe(t.type), U7.forEach((r) => {
       t[r] != null && cz(n, r, t[r]);
-    })) : UD.forEach((r) => {
+    })) : U7.forEach((r) => {
       t.modified(r) && cz(n, r, t[r]);
     }), t.pointRadius != null && n.path.pointRadius(t.pointRadius), t.fit && vUe(n, t), e.fork(e.NO_SOURCE | e.NO_FIELDS);
   }
@@ -72468,8 +72468,8 @@ function _Ue(t) {
   };
 }
 function SUe(t) {
-  return t.type === zL ? t.features : je(t).filter((e) => e != null).map((e) => e.type === qD ? e : {
-    type: qD,
+  return t.type === zL ? t.features : je(t).filter((e) => e != null).map((e) => e.type === q7 ? e : {
+    type: q7,
     geometry: e
   });
 }
@@ -72910,10 +72910,10 @@ R_.prototype = fse.prototype = {
   restart: function(t, e, n) {
     if (typeof t != "function")
       throw new TypeError("callback is not a function");
-    n = (n == null ? JL() : +n) + (e == null ? 0 : +e), !this._next && K1 !== this && (K1 ? K1._next = this : T_ = this, K1 = this), this._call = t, this._time = n, zD();
+    n = (n == null ? JL() : +n) + (e == null ? 0 : +e), !this._next && K1 !== this && (K1 ? K1._next = this : T_ = this, K1 = this), this._call = t, this._time = n, z7();
   },
   stop: function() {
-    this._call && (this._call = null, this._time = 1 / 0, zD());
+    this._call && (this._call = null, this._time = 1 / 0, z7());
   }
 };
 function fse(t, e, n) {
@@ -72941,9 +72941,9 @@ function JUe() {
 function ZUe() {
   for (var t, e = T_, 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 : T_ = n);
-  K1 = t, zD(r);
+  K1 = t, z7(r);
 }
-function zD(t) {
+function z7(t) {
   if (!Dh) {
     Y1 && (Y1 = clearTimeout(Y1));
     var e = t - Hf;
@@ -73145,7 +73145,7 @@ const gz = {
   link: GUe,
   x: cqe,
   y: fqe
-}, X1 = "forces", HD = ["alpha", "alphaMin", "alphaTarget", "velocityDecay", "forces"], xqe = ["static", "iterations"], xse = ["x", "y", "vx", "vy"];
+}, X1 = "forces", H7 = ["alpha", "alphaMin", "alphaTarget", "velocityDecay", "forces"], xqe = ["static", "iterations"], xse = ["x", "y", "vx", "vy"];
 function ZL(t) {
   ye.call(this, null, t);
 }
@@ -73295,7 +73295,7 @@ ZL.Definition = {
 };
 Fe(ZL, ye, {
   transform(t, e) {
-    var n = this.value, r = e.changed(e.ADD_REM), i = t.modified(HD), s = t.iterations || 300;
+    var n = this.value, r = e.changed(e.ADD_REM), i = t.modified(H7), s = t.iterations || 300;
     if (n ? (r && (e.modifies("index"), n.nodes(e.source)), (i || e.changed(e.MOD)) && dse(n, t, 0, e)) : (this.value = n = hqe(e.source, t), n.on("tick", dqe(e.dataflow, this)), t.static || (r = !0, n.tick()), e.modifies("index")), i || r || t.modified(xqe) || e.changed() && t.restart) {
       if (n.alpha(Math.max(n.alpha(), t.alpha || 1)).alphaDecay(1 - Math.pow(n.alphaMin(), 1 / s)), t.static)
         for (n.stop(); --s >= 0; )
@@ -73328,8 +73328,8 @@ function hqe(t, e) {
 }
 function dse(t, e, n, r) {
   var i = je(e.forces), s, o, u, a;
-  for (s = 0, o = HD.length; s < o; ++s)
-    u = HD[s], u !== X1 && e.modified(u) && t[u](e[u]);
+  for (s = 0, o = H7.length; s < o; ++s)
+    u = H7[s], u !== X1 && e.modified(u) && t[u](e[u]);
   for (s = 0, o = i.length; s < o; ++s)
     a = X1 + s, u = n || e.modified(X1, s) ? gqe(i[s]) : r && pqe(i[s], r) ? t.force(a) : null, u && t.force(a, u);
   for (o = t.numForces || 0; s < o; ++s)
@@ -73820,17 +73820,17 @@ function bz() {
 function aze(t) {
   t = `${t}`;
   let e = t.length;
-  return QD(t, e - 1) && !QD(t, e - 2) && (t = t.slice(0, -1)), t[0] === "/" ? t : `/${t}`;
+  return Q7(t, e - 1) && !Q7(t, e - 2) && (t = t.slice(0, -1)), t[0] === "/" ? t : `/${t}`;
 }
 function Cz(t) {
   let e = t.length;
   if (e < 2)
     return "";
-  for (; --e > 1 && !QD(t, e); )
+  for (; --e > 1 && !Q7(t, e); )
     ;
   return t.slice(0, e);
 }
-function QD(t, e) {
+function Q7(t, e) {
   if (t[e] === "/") {
     let n = 0;
     for (; e > 0 && t[--e] === "\\"; )
@@ -74028,7 +74028,7 @@ const yze = function t(e) {
     return t((r = +r) > 1 ? r : 1);
   }, n;
 }(Ese);
-function GD(t, e, n) {
+function G7(t, e, n) {
   const r = {};
   return t.each((i) => {
     const s = i.data;
@@ -74064,7 +74064,7 @@ Fe(tI, ye, {
       values: je(t.keys).reduce((o, u) => (o.key(u), o), vze()).entries(i.source)
     }, Eze), n && s.each((o) => {
       o.children && (o = jt(o.data), i.add.push(o), i.source.push(o));
-    }), GD(s, tt, tt)), i.source.root = s, i;
+    }), G7(s, tt, tt)), i.source.root = s, i;
   }
 });
 function vze() {
@@ -74123,7 +74123,7 @@ function Sze(t, e, n) {
     r[n[s]] = t[e[s]];
   r[n[i]] = t.children ? t.children.length : 0;
 }
-const WD = ["x", "y", "r", "depth", "children"];
+const W7 = ["x", "y", "r", "depth", "children"];
 function nI(t) {
   Tl.call(this, t);
 }
@@ -74156,16 +74156,16 @@ nI.Definition = {
     name: "as",
     type: "string",
     array: !0,
-    length: WD.length,
-    default: WD
+    length: W7.length,
+    default: W7
   }]
 };
 Fe(nI, Tl, {
   layout: rze,
   params: ["radius", "size", "padding"],
-  fields: WD
+  fields: W7
 });
-const VD = ["x0", "y0", "x1", "y1", "depth", "children"];
+const V7 = ["x0", "y0", "x1", "y1", "depth", "children"];
 function rI(t) {
   Tl.call(this, t);
 }
@@ -74198,14 +74198,14 @@ rI.Definition = {
     name: "as",
     type: "string",
     array: !0,
-    length: VD.length,
-    default: VD
+    length: V7.length,
+    default: V7
   }]
 };
 Fe(rI, Tl, {
   layout: ize,
   params: ["size", "round", "padding"],
-  fields: VD
+  fields: V7
 });
 function iI(t) {
   ye.call(this, null, t);
@@ -74230,13 +74230,13 @@ Fe(iI, ye, {
     e.source || Ae("Stratify transform requires an upstream data source.");
     let n = this.value;
     const r = t.modified(), i = e.fork(e.ALL).materialize(e.SOURCE), s = !n || r || e.changed(e.ADD_REM) || e.modified(t.key.fields) || e.modified(t.parentKey.fields);
-    return i.source = i.source.slice(), s && (n = i.source.length ? GD(bz().id(t.key).parentId(t.parentKey)(i.source), t.key, Fo) : GD(bz()([{}]), t.key, t.key)), i.source.root = this.value = n, i;
+    return i.source = i.source.slice(), s && (n = i.source.length ? G7(bz().id(t.key).parentId(t.parentKey)(i.source), t.key, Fo) : G7(bz()([{}]), t.key, t.key)), i.source.root = this.value = n, i;
   }
 });
 const Tz = {
   tidy: hze,
   cluster: Tqe
-}, YD = ["x", "y", "depth", "children"];
+}, Y7 = ["x", "y", "depth", "children"];
 function sI(t) {
   Tl.call(this, t);
 }
@@ -74275,8 +74275,8 @@ sI.Definition = {
     name: "as",
     type: "string",
     array: !0,
-    length: YD.length,
-    default: YD
+    length: Y7.length,
+    default: Y7
   }]
 };
 Fe(sI, Tl, {
@@ -74290,7 +74290,7 @@ Fe(sI, Tl, {
     Ae("Unrecognized Tree layout method: " + e);
   },
   params: ["size", "nodeSize"],
-  fields: YD
+  fields: Y7
 });
 function oI(t) {
   ye.call(this, [], t);
@@ -74325,7 +74325,7 @@ const Oz = {
   slicedice: mze,
   squarify: Ase,
   resquarify: yze
-}, KD = ["x0", "y0", "x1", "y1", "depth", "children"];
+}, K7 = ["x0", "y0", "x1", "y1", "depth", "children"];
 function uI(t) {
   Tl.call(this, t);
 }
@@ -74391,8 +74391,8 @@ uI.Definition = {
     name: "as",
     type: "string",
     array: !0,
-    length: KD.length,
-    default: KD
+    length: K7.length,
+    default: K7
   }]
 };
 Fe(uI, Tl, {
@@ -74410,7 +74410,7 @@ Fe(uI, Tl, {
     }, t;
   },
   params: ["method", "ratio", "size", "round", "padding", "paddingInner", "paddingOuter", "paddingTop", "paddingRight", "paddingBottom", "paddingLeft"],
-  fields: KD
+  fields: K7
 });
 const bze = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -74695,7 +74695,7 @@ function Hze(t, e, n, r) {
     return [o.x1, (o.x1 + o.x2) / 2, o.x2, o.y1, (o.y1 + o.y2) / 2, o.y2];
   } : i;
 }
-const XD = ["x", "y", "opacity", "align", "baseline"], _se = ["top-left", "left", "bottom-left", "top", "bottom", "top-right", "right", "bottom-right"];
+const X7 = ["x", "y", "opacity", "align", "baseline"], _se = ["top-left", "left", "bottom-left", "top", "bottom", "top-right", "right", "bottom-right"];
 function aI(t) {
   ye.call(this, null, t);
 }
@@ -74753,8 +74753,8 @@ aI.Definition = {
     name: "as",
     type: "string",
     array: !0,
-    length: XD.length,
-    default: XD
+    length: X7.length,
+    default: X7
   }]
 };
 Fe(aI, ye, {
@@ -74767,7 +74767,7 @@ Fe(aI, ye, {
     if (!(r || e.changed(e.ADD_REM) || n("sort")))
       return;
     (!t.size || t.size.length !== 2) && Ae("Size parameter should be specified as a [width, height] array.");
-    const i = t.as || XD;
+    const i = t.as || X7;
     return jze(e.materialize(e.SOURCE).source || [], t.size, t.sort, je(t.offset == null ? 1 : t.offset), je(t.anchor || _se), t.avoidMarks || [], t.avoidBaseMark !== !1, t.lineAnchor || "end", t.markIndex || 0, t.padding === void 0 ? 0 : t.padding, t.method || "naive").forEach((s) => {
       const o = s.datum;
       o[i[0]] = s.x, o[i[1]] = s.y, o[i[2]] = s.opacity, o[i[3]] = s.align, o[i[4]] = s.baseline;
@@ -74836,7 +74836,7 @@ Fe(lI, ye, {
     return n;
   }
 });
-const JD = {
+const J7 = {
   linear: Pee,
   log: F9e,
   exp: L9e,
@@ -74868,7 +74868,7 @@ cI.Definition = {
     name: "method",
     type: "string",
     default: "linear",
-    values: Object.keys(JD)
+    values: Object.keys(J7)
   }, {
     name: "order",
     type: "number",
@@ -74892,9 +74892,9 @@ Fe(cI, ye, {
   transform(t, e) {
     const n = e.fork(e.NO_SOURCE | e.NO_FIELDS);
     if (!this.value || e.changed() || t.modified()) {
-      const r = e.materialize(e.SOURCE).source, i = Sse(r, t.groupby), s = (t.groupby || []).map(wn), o = t.method || "linear", u = t.order || 3, a = Gze(o, u), l = t.as || [wn(t.x), wn(t.y)], c = JD[o], f = [];
+      const r = e.materialize(e.SOURCE).source, i = Sse(r, t.groupby), s = (t.groupby || []).map(wn), o = t.method || "linear", u = t.order || 3, a = Gze(o, u), l = t.as || [wn(t.x), wn(t.y)], c = J7[o], f = [];
       let x = t.extent;
-      nt(JD, o) || Ae("Invalid regression method: " + o), x != null && o === "log" && x[0] <= 0 && (e.dataflow.warn("Ignoring extent with values <= 0 for log regression."), x = null), i.forEach((d) => {
+      nt(J7, o) || Ae("Invalid regression method: " + o), x != null && o === "log" && x[0] <= 0 && (e.dataflow.warn("Ignoring extent with values <= 0 for log regression."), x = null), i.forEach((d) => {
         if (d.length <= a) {
           e.dataflow.warn("Skipping regression with more parameters than data points.");
           return;
@@ -75216,7 +75216,7 @@ class nf {
     return this._ || null;
   }
 }
-class ZD {
+class Z7 {
   constructor() {
     this._ = [];
   }
@@ -75311,7 +75311,7 @@ let oHe = class {
     }
   }
   cellPolygon(e) {
-    const n = new ZD();
+    const n = new Z7();
     return this.renderCell(e, n), n.value();
   }
   _renderSegment(e, n, r, i, s) {
@@ -75611,7 +75611,7 @@ class fI {
     return e.closePath(), n && n.value();
   }
   hullPolygon() {
-    const e = new ZD();
+    const e = new Z7();
     return this.renderHull(e), e.value();
   }
   renderTriangle(e, n) {
@@ -75624,7 +75624,7 @@ class fI {
       yield this.trianglePolygon(n);
   }
   trianglePolygon(e) {
-    const n = new ZD();
+    const n = new Z7();
     return this.renderTriangle(e, n), n.value();
   }
 }
@@ -77703,7 +77703,7 @@ const lm = {
   panSymlog: Nwe,
   zoomLinear: gZ,
   zoomLog: mZ,
-  zoomPow: N7,
+  zoomPow: ND,
   zoomSymlog: yZ,
   encode: xGe,
   modify: $Ge,
@@ -80014,7 +80014,7 @@ function tXe(t, e) {
 }
 function nXe(t, e) {
   let n = t.type || xH;
-  return !t.type && rXe(t) === 1 && (t.fill || t.stroke) && (n = Y9(e) ? Rv : rD(e) ? xw : xH), n !== Rv ? n : rD(e) ? xw : Rv;
+  return !t.type && rXe(t) === 1 && (t.fill || t.stroke) && (n = Y9(e) ? Rv : r7(e) ? xw : xH), n !== Rv ? n : r7(e) ? xw : Rv;
 }
 function rXe(t) {
   return MI.reduce((e, n) => e + (t[n] ? 1 : 0), 0);
@@ -149823,12 +149823,14 @@ function Iat() {
   return {
     get: (e) => {
       if (!t.has(e) && e.isArray()) {
-        const n = [];
-        for (const r of e) {
-          const i = Object.assign({}, r.toObject(), {
-            __malloyDataRecord: r
-          });
-          n.push(i);
+        const n = [], r = e.field.allFields;
+        for (const i of e) {
+          const s = { __malloyDataRecord: i };
+          for (const o of r) {
+            const u = i.cell(o).value;
+            s[o.name] = u instanceof Date ? u.valueOf() : i.cell(o).value;
+          }
+          n.push(s);
         }
         t.set(e, n);
       }