@malloydata/render 0.0.203-dev241021134413 → 0.0.203-dev241021171612

package/dist/module/index.mjs

@@ -4881,14 +4881,14 @@ var rb = function() {
       return rb;
     }
   }
-}() : rb, ux = _fe(), zfe = Tfe(), Qn = Object.getPrototypeOf || (zfe ? function(t) {
+}() : rb, ux = _fe(), zfe = Tfe(), Gn = Object.getPrototypeOf || (zfe ? function(t) {
   return t.__proto__;
-} : null), _x = {}, Qfe = typeof Uint8Array > "u" || !Qn ? mt : Qn(Uint8Array), Rc = {
+} : null), _x = {}, Qfe = typeof Uint8Array > "u" || !Gn ? mt : Gn(Uint8Array), Rc = {
   __proto__: null,
   "%AggregateError%": typeof AggregateError > "u" ? mt : AggregateError,
   "%Array%": Array,
   "%ArrayBuffer%": typeof ArrayBuffer > "u" ? mt : ArrayBuffer,
-  "%ArrayIteratorPrototype%": ux && Qn ? Qn([][Symbol.iterator]()) : mt,
+  "%ArrayIteratorPrototype%": ux && Gn ? Gn([][Symbol.iterator]()) : mt,
   "%AsyncFromSyncIteratorPrototype%": mt,
   "%AsyncFunction%": _x,
   "%AsyncGenerator%": _x,
@@ -4919,10 +4919,10 @@ var rb = function() {
   "%Int32Array%": typeof Int32Array > "u" ? mt : Int32Array,
   "%isFinite%": isFinite,
   "%isNaN%": isNaN,
-  "%IteratorPrototype%": ux && Qn ? Qn(Qn([][Symbol.iterator]())) : mt,
+  "%IteratorPrototype%": ux && Gn ? Gn(Gn([][Symbol.iterator]())) : mt,
   "%JSON%": typeof JSON == "object" ? JSON : mt,
   "%Map%": typeof Map > "u" ? mt : Map,
-  "%MapIteratorPrototype%": typeof Map > "u" || !ux || !Qn ? mt : Qn((/* @__PURE__ */ new Map())[Symbol.iterator]()),
+  "%MapIteratorPrototype%": typeof Map > "u" || !ux || !Gn ? mt : Gn((/* @__PURE__ */ new Map())[Symbol.iterator]()),
   "%Math%": Math,
   "%Number%": Number,
   "%Object%": Object,
@@ -4935,10 +4935,10 @@ var rb = function() {
   "%Reflect%": typeof Reflect > "u" ? mt : Reflect,
   "%RegExp%": RegExp,
   "%Set%": typeof Set > "u" ? mt : Set,
-  "%SetIteratorPrototype%": typeof Set > "u" || !ux || !Qn ? mt : Qn((/* @__PURE__ */ new Set())[Symbol.iterator]()),
+  "%SetIteratorPrototype%": typeof Set > "u" || !ux || !Gn ? mt : Gn((/* @__PURE__ */ new Set())[Symbol.iterator]()),
   "%SharedArrayBuffer%": typeof SharedArrayBuffer > "u" ? mt : SharedArrayBuffer,
   "%String%": String,
-  "%StringIteratorPrototype%": ux && Qn ? Qn(""[Symbol.iterator]()) : mt,
+  "%StringIteratorPrototype%": ux && Gn ? Gn(""[Symbol.iterator]()) : mt,
   "%Symbol%": ux ? Symbol : mt,
   "%SyntaxError%": Kx,
   "%ThrowTypeError%": Hfe,
@@ -4953,11 +4953,11 @@ var rb = function() {
   "%WeakRef%": typeof WeakRef > "u" ? mt : WeakRef,
   "%WeakSet%": typeof WeakSet > "u" ? mt : WeakSet
 };
-if (Qn)
+if (Gn)
   try {
     null.error;
   } catch (t) {
-    var Gfe = Qn(Qn(t));
+    var Gfe = Gn(Gn(t));
     Rc["%Error.prototype%"] = Gfe;
   }
 var Wfe = function t(e) {
@@ -4973,7 +4973,7 @@ var Wfe = function t(e) {
     r && (n = r.prototype);
   } else if (e === "%AsyncIteratorPrototype%") {
     var i = t("%AsyncGenerator%");
-    i && Qn && (n = Qn(i.prototype));
+    i && Gn && (n = Gn(i.prototype));
   }
   return Rc[e] = n, n;
 }, sB = {
@@ -10285,7 +10285,7 @@ var Ru = D && D.__decorate || function(t, e, n, r) {
 Object.defineProperty(h0, "__esModule", { value: !0 });
 h0.Recognizer = void 0;
 const bde = Ig, Rde = Zd, us = Ee, QB = zt, Ode = xn;
-class Bn {
+class kn {
   constructor() {
     this._listeners = [bde.ConsoleErrorListener.INSTANCE], this._stateNumber = -1;
   }
@@ -10295,7 +10295,7 @@ class Bn {
    * Used for XPath and tree pattern compilation.
    */
   getTokenTypeMap() {
-    let e = this.vocabulary, n = Bn.tokenTypeMapCache.get(e);
+    let e = this.vocabulary, n = kn.tokenTypeMapCache.get(e);
     if (n == null) {
       let r = /* @__PURE__ */ new Map();
       for (let i = 0; i <= this.atn.maxTokenType; i++) {
@@ -10304,7 +10304,7 @@ class Bn {
         let o = e.getSymbolicName(i);
         o != null && r.set(o, i);
       }
-      r.set("EOF", QB.Token.EOF), n = r, Bn.tokenTypeMapCache.set(e, n);
+      r.set("EOF", QB.Token.EOF), n = r, kn.tokenTypeMapCache.set(e, n);
     }
     return n;
   }
@@ -10317,8 +10317,8 @@ class Bn {
     let e = this.ruleNames;
     if (e == null)
       throw new Error("The current recognizer does not provide a list of rule names.");
-    let n = Bn.ruleIndexMapCache.get(e);
-    return n == null && (n = Ode.toMap(e), Bn.ruleIndexMapCache.set(e, n)), n;
+    let n = kn.ruleIndexMapCache.get(e);
+    return n == null && (n = Ode.toMap(e), kn.ruleIndexMapCache.set(e, n)), n;
   }
   getTokenType(e) {
     let n = this.getTokenTypeMap().get(e);
@@ -10420,43 +10420,43 @@ class Bn {
     this._stateNumber = e;
   }
 }
-Bn.EOF = -1;
-Bn.tokenTypeMapCache = /* @__PURE__ */ new WeakMap();
-Bn.ruleIndexMapCache = /* @__PURE__ */ new WeakMap();
+kn.EOF = -1;
+kn.tokenTypeMapCache = /* @__PURE__ */ new WeakMap();
+kn.ruleIndexMapCache = /* @__PURE__ */ new WeakMap();
 Ru([
   us.SuppressWarnings("serial"),
   us.NotNull
-], Bn.prototype, "_listeners", void 0);
+], kn.prototype, "_listeners", void 0);
 Ru([
   us.NotNull
-], Bn.prototype, "getTokenTypeMap", null);
+], kn.prototype, "getTokenTypeMap", null);
 Ru([
   us.NotNull
-], Bn.prototype, "getRuleIndexMap", null);
+], kn.prototype, "getRuleIndexMap", null);
 Ru([
   us.NotNull
-], Bn.prototype, "serializedATN", null);
+], kn.prototype, "serializedATN", null);
 Ru([
   us.NotNull
-], Bn.prototype, "atn", null);
+], kn.prototype, "atn", null);
 Ru([
   us.NotNull,
   sS(0, us.NotNull)
-], Bn.prototype, "interpreter", null);
+], kn.prototype, "interpreter", null);
 Ru([
   us.NotNull,
   sS(0, us.NotNull)
-], Bn.prototype, "getErrorHeader", null);
+], kn.prototype, "getErrorHeader", null);
 Ru([
   sS(0, us.NotNull)
-], Bn.prototype, "addErrorListener", null);
+], kn.prototype, "addErrorListener", null);
 Ru([
   sS(0, us.NotNull)
-], Bn.prototype, "removeErrorListener", null);
+], kn.prototype, "removeErrorListener", null);
 Ru([
   us.NotNull
-], Bn.prototype, "getErrorListeners", null);
-h0.Recognizer = Bn;
+], kn.prototype, "getErrorListeners", null);
+h0.Recognizer = kn;
 var ps = {};
 /*!
  * Copyright 2016 The ANTLR Project. All rights reserved.
@@ -16573,8 +16573,8 @@ function lh() {
       )));
       let ye = Qe.toInt(L[H++]);
       for (let G = 0; G < ye; G++) {
-        let ce = Qe.toInt(L[H]), Ne = Qe.toInt(L[H + 1]), He = Qe.toInt(L[H + 2]), tt = Qe.toInt(L[H + 3]), gt = Qe.toInt(L[H + 4]), nt = Qe.toInt(L[H + 5]), zn = this.edgeFactory(ue, He, ce, Ne, tt, gt, nt, we);
-        ue.states[ce].addTransition(zn), H += 6;
+        let ce = Qe.toInt(L[H]), Ne = Qe.toInt(L[H + 1]), He = Qe.toInt(L[H + 2]), tt = Qe.toInt(L[H + 3]), gt = Qe.toInt(L[H + 4]), nt = Qe.toInt(L[H + 5]), Qn = this.edgeFactory(ue, He, ce, Ne, tt, gt, nt, we);
+        ue.states[ce].addTransition(Qn), H += 6;
       }
       let K = new r.Array2DHashSet({
         hashCode: (G) => G.stopState ^ G.returnState ^ G.outermostPrecedenceReturn,
@@ -16591,8 +16591,8 @@ function lh() {
             continue;
           let nt = -1;
           ue.ruleToStartState[tt.target.ruleIndex].isPrecedenceRule && tt.precedence === 0 && (nt = tt.target.ruleIndex);
-          let zn = { stopState: tt.target.ruleIndex, returnState: tt.followState.stateNumber, outermostPrecedenceReturn: nt };
-          K.add(zn) && te.push(zn);
+          let Qn = { stopState: tt.target.ruleIndex, returnState: tt.followState.stateNumber, outermostPrecedenceReturn: nt };
+          K.add(Qn) && te.push(Qn);
         }
       }
       for (let G of te) {
@@ -16667,8 +16667,8 @@ function lh() {
             for (let nt of ue.states) {
               if (nt.ruleIndex !== G || !(nt instanceof M.StarLoopEntryState))
                 continue;
-              let zn = nt.transition(nt.numberOfTransitions - 1).target;
-              if (zn instanceof O.LoopEndState && zn.epsilonOnlyTransitions && zn.transition(0).target instanceof ae.RuleStopState) {
+              let Qn = nt.transition(nt.numberOfTransitions - 1).target;
+              if (Qn instanceof O.LoopEndState && Qn.epsilonOnlyTransitions && Qn.transition(0).target instanceof ae.RuleStopState) {
                 He = nt;
                 break;
               }
@@ -16679,8 +16679,8 @@ function lh() {
           } else
             He = ue.ruleToStopState[G];
           for (let nt of ue.states)
-            for (let zn = 0; zn < nt.numberOfTransitions; zn++) {
-              let sl = nt.transition(zn);
+            for (let Qn = 0; Qn < nt.numberOfTransitions; Qn++) {
+              let sl = nt.transition(Qn);
               sl !== tt && sl.target === He && (sl.target = Ne);
             }
           for (; ue.ruleToStartState[G].numberOfTransitions > 0; ) {
@@ -24627,7 +24627,7 @@ class qo {
       if (n.fieldUsage.type === "result") {
         if (cr(n.f))
           return "nested";
-        n.f instanceof Vn && (e = "inline");
+        n.f instanceof $n && (e = "inline");
       }
     return e;
   }
@@ -24795,7 +24795,7 @@ class SW extends YE {
 }
 class u1e {
   static nextStructDef(e, n) {
-    const r = new Vn(e, void 0, {
+    const r = new $n(e, void 0, {
       model: new _W(void 0)
     }, {}), i = {
       type: "turtle",
@@ -24819,7 +24819,7 @@ class Fs extends YE {
   static makeQuery(e, n, r = void 0, i) {
     let s = n, o = n.applyStructFiltersToTurtleDef(e);
     const u = o.pipeline[0], a = n.structDef;
-    switch (r !== void 0 && (0, ke.isQuerySegment)(u) && u.extendSource !== void 0 && (s = new Vn({
+    switch (r !== void 0 && (0, ke.isQuerySegment)(u) && u.extendSource !== void 0 && (s = new $n({
       ...a,
       fields: [...a.fields, ...u.extendSource]
     }, n.sourceArguments, s.parent ? { struct: s } : { model: s.model }, s.prepareResultOptions), o = {
@@ -24857,7 +24857,7 @@ class Fs extends YE {
     let u;
     if (o instanceof YE)
       u = o.parent;
-    else if (o instanceof Vn)
+    else if (o instanceof $n)
       u = o;
     else
       throw new Error("Internal Error:  Unknown object type");
@@ -24935,7 +24935,18 @@ class Fs extends YE {
     return r;
   }
   prepare(e) {
-    this.prepared || (this.expandFields(this.rootResult), this.rootResult.addStructToJoin(this.parent, this, void 0, []), this.rootResult.findJoins(this), this.rootResult.calculateSymmetricAggregates(), this.prepared = !0);
+    this.prepared || (this.expandFields(this.rootResult), this.rootResult.addStructToJoin(this.parent, this, void 0, []), this.rootResult.findJoins(this), this.addAlwaysJoins(this.rootResult), this.rootResult.calculateSymmetricAggregates(), this.prepared = !0);
+  }
+  addAlwaysJoins(e) {
+    var n;
+    const r = this.fieldDef.pipeline[0];
+    if (r.type !== "raw") {
+      const i = (n = r.alwaysJoins) !== null && n !== void 0 ? n : [];
+      for (const s of i) {
+        const o = this.parent.getChildByName(s);
+        o instanceof $n && e.addStructToJoin(o, this, void 0, []);
+      }
+    }
   }
   // get the source fieldname and filters associated with the field (so we can drill later)
   getResultMetadata(e) {
@@ -25456,7 +25467,7 @@ FROM ${n}
         fields: i.fields,
         connection: i.connection,
         dialect: i.dialect
-      }, f = new Vn(c, void 0, { model: this.parent.getModel() }, this.parent.prepareResultOptions);
+      }, f = new $n(c, void 0, { model: this.parent.getModel() }, this.parent.prepareResultOptions);
       u = Fs.makeQuery(l, f, n, this.isJoinedSubquery).generateSQLFromPipeline(n), i = u.outputStruct;
     }
     return i.annotation = e.turtleDef.annotation, {
@@ -25489,7 +25500,7 @@ FROM ${n}
       };
       i.shift();
       for (const o of i) {
-        const u = new Vn(s, void 0, {
+        const u = new $n(s, void 0, {
           model: this.parent.getModel()
         }, this.parent.prepareResultOptions), a = Fs.makeQuery({ type: "turtle", name: "~computeLastStage~", pipeline: [o] }, u, e, this.isJoinedSubquery);
         a.prepare(e), n = a.generateSQL(e), r = a.getResultStructDef(), s = {
@@ -25629,7 +25640,7 @@ class x1e extends Fs {
         const i = EW(r.path.slice(0, r.path.length - 1)), s = n[i];
         if (s === void 0) {
           const o = this.parent.nameMap.get(r.path[0]);
-          if (o instanceof Vn && (0, ke.isJoined)(o.structDef) && o.structDef.join === "many" && o.structDef.fields.length > 1) {
+          if (o instanceof $n && (0, ke.isJoined)(o.structDef) && o.structDef.join === "many" && o.structDef.fields.length > 1) {
             const u = [r];
             n[i] = u, this.stages.push(u);
             continue;
@@ -25686,7 +25697,7 @@ class x1e extends Fs {
     return this.parent.structDef.modelAnnotation && (e.modelAnnotation = this.parent.structDef.modelAnnotation), e;
   }
 }
-class Vn extends AW {
+class $n extends AW {
   constructor(e, n, r, i, s) {
     if (super(s), this.structDef = e, this.sourceArguments = n, this.prepareResultOptions = i, this.nameMap = /* @__PURE__ */ new Map(), this._arguments = void 0, this.setParent(r), "model" in r)
       if (this.model = r.model, this.pathAliasMap = /* @__PURE__ */ new Map(), (0, ke.isSourceDef)(e))
@@ -25746,7 +25757,7 @@ class Vn extends AW {
   addFieldsFromFieldList(e) {
     for (const n of e) {
       const r = (0, ke.getIdentifier)(n);
-      (0, ke.isJoined)(n) ? this.addFieldToNameMap(r, new Vn(n, void 0, { struct: this }, this.prepareResultOptions)) : n.type === "turtle" ? this.addFieldToNameMap(r, Fs.makeQuery(n, this, void 0, !1)) : this.addFieldToNameMap(r, this.makeQueryField(n));
+      (0, ke.isJoined)(n) ? this.addFieldToNameMap(r, new $n(n, void 0, { struct: this }, this.prepareResultOptions)) : n.type === "turtle" ? this.addFieldToNameMap(r, Fs.makeQuery(n, this, void 0, !1)) : this.addFieldToNameMap(r, this.makeQueryField(n));
     }
     this.nameMap.has("__distinct_key") || this.addFieldToNameMap("__distinct_key", new i1e({ type: "string", name: "__distinct_key" }, this));
   }
@@ -25824,7 +25835,7 @@ class Vn extends AW {
       this.structDef = n, !this.structDef.primaryKey && e.primaryKey && (this.structDef.primaryKey = e.primaryKey);
     }
     for (const [, e] of this.nameMap)
-      e instanceof Vn && e.resolveQueryFields();
+      e instanceof $n && e.resolveQueryFields();
   }
   getModel() {
     if (this.model)
@@ -25908,7 +25919,7 @@ class Vn extends AW {
   // structs referenced in queries are converted to fields.
   getQueryFieldByName(e) {
     const n = this.getFieldByName(e);
-    if (n instanceof Vn)
+    if (n instanceof $n)
       throw new Error(`Cannot reference ${e.join(".")} as a scalar'`);
     return n;
   }
@@ -25917,9 +25928,9 @@ class Vn extends AW {
     if (n) {
       if (r.parent === void 0)
         throw new Error("Unexpected reference to orphaned query field");
-      if (r instanceof Vn) {
+      if (r instanceof $n) {
         const i = { ...r.structDef, annotation: n };
-        return new Vn(i, void 0, r.parent, {}, r.referenceId);
+        return new $n(i, void 0, r.parent, {}, r.referenceId);
       } else {
         const i = { ...r.fieldDef, annotation: n };
         return r.parent.makeQueryField(i, r.referenceId);
@@ -25943,7 +25954,7 @@ class Vn extends AW {
   /** returns a query object for the given name */
   getStructByName(e) {
     const n = this.getFieldByName(e);
-    if (n instanceof Vn)
+    if (n instanceof $n)
       return n;
     throw new Error(`Error: Path to structure not found '${e.join(".")}'`);
   }
@@ -25975,7 +25986,7 @@ class _W {
     for (const n of Object.values(this.modelDef.contents)) {
       let r;
       if ((0, ke.isSourceDef)(n))
-        r = new Vn(n, void 0, { model: this }, {}), this.structs.set((0, ke.getIdentifier)(n), r), r.resolveQueryFields();
+        r = new $n(n, void 0, { model: this }, {}), this.structs.set((0, ke.getIdentifier)(n), r), r.resolveQueryFields();
       else if (n.type !== "query")
         throw new Error("Internal Error: Unknown structure type");
     }
@@ -25990,9 +26001,9 @@ class _W {
     var i;
     if (r ?? (r = {}), typeof e == "string") {
       const s = this.getStructByName(e);
-      return n !== void 0 ? new Vn(s.structDef, n, (i = s.parent) !== null && i !== void 0 ? i : { model: this }, r) : s;
+      return n !== void 0 ? new $n(s.structDef, n, (i = s.parent) !== null && i !== void 0 ? i : { model: this }, r) : s;
     }
-    return new Vn(e, n, { model: this }, r);
+    return new $n(e, n, { model: this }, r);
   }
   loadQuery(e, n, r, i = !1, s = !1) {
     const o = "";
@@ -26041,7 +26052,7 @@ class _W {
     const o = this.getStructByName(n);
     let u = [];
     for (const [y, E] of o.nameMap)
-      E instanceof Vn || cr(E) && E.includeInWildcard() && u.push({ type: "fieldref", path: [y] });
+      E instanceof $n || cr(E) && E.includeInWildcard() && u.push({ type: "fieldref", path: [y] });
     u = u.sort((y, E) => y.path[0].localeCompare(E.path[0]));
     const a = {
       structRef: n,
@@ -39424,7 +39435,7 @@ class Fme extends bme.DefinitionList {
   }
   queryExecute(e) {
     for (const n of this.list)
-      e.inputFS.extendSource(n);
+      e.inputFS.extendSource(n), e.alwaysJoins.push(n.name.refString);
   }
 }
 bi.JoinStatement = Fme;
@@ -42470,7 +42481,7 @@ class mve extends gve.ExpressionDef {
   }
 }
 n5.ForRange = mve;
-var Gn = {};
+var Wn = {};
 class qf extends Error {
 }
 class yve extends qf {
@@ -47252,12 +47263,12 @@ const gSe = "2.5.2", mSe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.
   VERSION: gSe,
   Zone: Ih
 }, Symbol.toStringTag, { value: "Module" })), IJ = /* @__PURE__ */ Kz(mSe);
-Object.defineProperty(Gn, "__esModule", { value: !0 });
-Gn.LiteralYear = Gn.LiteralQuarter = Gn.LiteralMonth = Gn.LiteralWeek = Gn.LiteralDay = Gn.LiteralHour = Gn.LiteralTimestamp = Gn.TimeFormatError = void 0;
+Object.defineProperty(Wn, "__esModule", { value: !0 });
+Wn.LiteralYear = Wn.LiteralQuarter = Wn.LiteralMonth = Wn.LiteralWeek = Wn.LiteralDay = Wn.LiteralHour = Wn.LiteralTimestamp = Wn.TimeFormatError = void 0;
 const Ql = IJ, ySe = oe, ESe = C0, cM = Nh, vO = ut;
 class ASe extends Error {
 }
-Gn.TimeFormatError = ASe;
+Wn.TimeFormatError = ASe;
 function Hf(t, e) {
   const n = t.slice(1);
   if (e) {
@@ -47324,7 +47335,7 @@ class Cw extends MJ {
     }
   }
 }
-Gn.LiteralTimestamp = Cw;
+Wn.LiteralTimestamp = Cw;
 class Tw extends MJ {
   constructor(e, n, r, i) {
     super(e, n, r), this.nextLit = i, this.elementType = "granularTimeLiteral";
@@ -47360,7 +47371,7 @@ class bw extends Tw {
       return n.text = n.text + ":00:00", r = i.plus({ hour: 1 }).toFormat(SO), new bw(n, r);
   }
 }
-Gn.LiteralHour = bw;
+Wn.LiteralHour = bw;
 class Pm extends Tw {
   constructor(e, n, r) {
     super(e, n, "date", r);
@@ -47386,7 +47397,7 @@ class Rw extends Pm {
       return r = i.plus({ day: 1 }).toFormat(Ls), new Rw(n, r);
   }
 }
-Gn.LiteralDay = Rw;
+Wn.LiteralDay = Rw;
 class Ow extends Pm {
   constructor(e, n) {
     super(e, "week", n), this.elementType = "literal:week";
@@ -47401,7 +47412,7 @@ class Ow extends Pm {
     }
   }
 }
-Gn.LiteralWeek = Ow;
+Wn.LiteralWeek = Ow;
 class Dw extends Pm {
   constructor(e, n) {
     super(e, "month", n), this.elementType = "literal:month";
@@ -47416,7 +47427,7 @@ class Dw extends Pm {
     }
   }
 }
-Gn.LiteralMonth = Dw;
+Wn.LiteralMonth = Dw;
 class Nw extends Pm {
   constructor(e, n) {
     super(e, "quarter", n), this.elementType = "literal:quarter";
@@ -47434,7 +47445,7 @@ class Nw extends Pm {
     }
   }
 }
-Gn.LiteralQuarter = Nw;
+Wn.LiteralQuarter = Nw;
 class ww extends Pm {
   constructor(e, n) {
     super(e, "year", n), this.elementType = "literal:year";
@@ -47449,7 +47460,7 @@ class ww extends Pm {
     }
   }
 }
-Gn.LiteralYear = ww;
+Wn.LiteralYear = ww;
 var u5 = {};
 Object.defineProperty(u5, "__esModule", { value: !0 });
 u5.PartialCompare = void 0;
@@ -48126,7 +48137,7 @@ m5.IndexBuilder = void 0;
 const s6 = oe, T_e = zr, b_e = ho, R_e = Um, O_e = b0, D_e = qm, N_e = y5;
 class w_e {
   constructor(e, n, r, i) {
-    this.filters = [], this.type = "index", this.resultFS = new N_e.IndexFieldSpace(e, n, r, i), this.inputFS = this.resultFS.inputSpace();
+    this.filters = [], this.alwaysJoins = [], this.type = "index", this.resultFS = new N_e.IndexFieldSpace(e, n, r, i), this.inputFS = this.resultFS.inputSpace();
   }
   execute(e) {
     e instanceof b_e.Filter ? this.filters.push(...e.getFilterList(this.inputFS)) : e instanceof O_e.Limit ? (this.limit && this.limit.logError("index-limit-already-specified", "Ignored, too many limit: statements"), this.limit = e) : e instanceof R_e.Index ? (this.resultFS.pushFields(...e.fields.list), e.weightBy && (this.indexOn && this.indexOn.logError("index-by-already-specified", "Ignoring previous BY"), this.indexOn = e.weightBy)) : e instanceof D_e.SampleProperty ? this.sample = e.sampling() : e.logError("illegal-operation-for-index", "Not legal in an index query operation");
@@ -48135,7 +48146,7 @@ class w_e {
     if (e && !(0, s6.isIndexSegment)(e) && !(0, s6.isPartialSegment)(e))
       return this.resultFS.logError("refinement-of-index-segment", `Can't refine index with ${e.type}`), T_e.ErrorFactory.indexSegment;
     const n = this.resultFS.getPipeSegment(e), r = (e == null ? void 0 : e.filterList) || [];
-    return this.filters.length > 0 && !r ? n.filterList = this.filters : r && (n.filterList = [...r, ...this.filters]), e != null && e.limit && (n.limit = e.limit), this.limit && (n.limit = this.limit.limit), this.indexOn && (n.weightMeasure = this.indexOn.refString), e && (0, s6.isIndexSegment)(e) && (e != null && e.sample) && (n.sample = e.sample), this.sample && (n.sample = this.sample), n;
+    return this.filters.length > 0 && !r ? n.filterList = this.filters : r && (n.filterList = [...r, ...this.filters]), e != null && e.limit && (n.limit = e.limit), this.limit && (n.limit = this.limit.limit), this.indexOn && (n.weightMeasure = this.indexOn.refString), e && (0, s6.isIndexSegment)(e) && (e != null && e.sample) && (n.sample = e.sample), this.sample && (n.sample = this.sample), this.alwaysJoins.length > 0 && (n.alwaysJoins = [...this.alwaysJoins]), n;
   }
 }
 m5.IndexBuilder = w_e;
@@ -48222,7 +48233,7 @@ Gl.ReduceBuilder = Gl.QuerySegmentBuilder = void 0;
 const SM = oe, z_e = zr, Q_e = ho, G_e = b0, _M = tf, CM = zm, W_e = ao, V_e = ms;
 class UJ {
   constructor() {
-    this.filters = [];
+    this.alwaysJoins = [], this.filters = [];
   }
   execute(e) {
     if (e.queryExecute) {
@@ -48244,7 +48255,7 @@ class UJ {
     }
     this.order instanceof _M.Ordering && (n.orderBy = this.order.getOrderBy(this.inputFS));
     const r = (e == null ? void 0 : e.filterList) || [];
-    this.filters.length > 0 && !r ? n.filterList = this.filters : r && (n.filterList = [...r, ...this.filters]);
+    this.filters.length > 0 && !r ? n.filterList = this.filters : r && (n.filterList = [...r, ...this.filters]), this.alwaysJoins.length > 0 && (n.alwaysJoins = [...this.alwaysJoins]);
   }
 }
 Gl.QuerySegmentBuilder = UJ;
@@ -48919,7 +48930,7 @@ L5.isFieldPropStatement = TCe;
     for (var s in r)
       s !== "default" && !Object.prototype.hasOwnProperty.call(i, s) && e(i, r, s);
   };
-  Object.defineProperty(t, "__esModule", { value: !0 }), n(M1, t), n(fd, t), n(xd, t), n(Oo, t), n(Am, t), n(ku, t), n(C_, t), n(T_, t), n(R_, t), n(Cm, t), n(D_, t), n(Sh, t), n(_h, t), n(Hl, t), n(Ch, t), n(Th, t), n(N_, t), n(wh, t), n(w_, t), n(zl, t), n(F_, t), n(Ga, t), n(L_, t), n(Fh, t), n(I_, t), n($_, t), n(B_, t), n(ma, t), n(k_, t), n(P_, t), n(M_, t), n(Lm, t), n(wm, t), n(jf, t), n(j_, t), n(U_, t), n(q_, t), n(H_, t), n(z_, t), n(Q_, t), n(G_, t), n(W_, t), n(V_, t), n(Y_, t), n(J_, t), n(X_, t), n(K_, t), n(Z_, t), n(e5, t), n(n5, t), n(Gn, t), n(u5, t), n(Lh, t), n(hd, t), n(pd, t), n(gd, t), n(C0, t), n(a5, t), n(l5, t), n(Im, t), n(Nl, t), n(q1, t), n(c5, t), n(f5, t), n(x5, t), n(Rh, t), n(bh, t), n(O0, t), n(d5, t), n(h5, t), n(p5, t), n(g5, t), n(ln, t), n(ht, t), n(S5, t), n(_5, t), n(_0, t), n(Qm, t), n(q1, t), n(ho, t), n(Hm, t), n(Um, t), n(bi, t), n(ym, t), n(b0, t), n(Gm, t), n(M1, t), n(C5, t), n(tf, t), n(T5, t), n(jm, t), n(qm, t), n(zm, t), n(Oh, t), n(Mf, t), n(Dm, t), n(wl, t), n(b5, t), n(ql, t), n(uo, t), n(R5, t), n(O5, t), n(ut, t), n(D5, t), n(R0, t), n(We, t), n(N5, t), n(VJ, t), n(w5, t), n(F5, t), n(L5, t);
+  Object.defineProperty(t, "__esModule", { value: !0 }), n(M1, t), n(fd, t), n(xd, t), n(Oo, t), n(Am, t), n(ku, t), n(C_, t), n(T_, t), n(R_, t), n(Cm, t), n(D_, t), n(Sh, t), n(_h, t), n(Hl, t), n(Ch, t), n(Th, t), n(N_, t), n(wh, t), n(w_, t), n(zl, t), n(F_, t), n(Ga, t), n(L_, t), n(Fh, t), n(I_, t), n($_, t), n(B_, t), n(ma, t), n(k_, t), n(P_, t), n(M_, t), n(Lm, t), n(wm, t), n(jf, t), n(j_, t), n(U_, t), n(q_, t), n(H_, t), n(z_, t), n(Q_, t), n(G_, t), n(W_, t), n(V_, t), n(Y_, t), n(J_, t), n(X_, t), n(K_, t), n(Z_, t), n(e5, t), n(n5, t), n(Wn, t), n(u5, t), n(Lh, t), n(hd, t), n(pd, t), n(gd, t), n(C0, t), n(a5, t), n(l5, t), n(Im, t), n(Nl, t), n(q1, t), n(c5, t), n(f5, t), n(x5, t), n(Rh, t), n(bh, t), n(O0, t), n(d5, t), n(h5, t), n(p5, t), n(g5, t), n(ln, t), n(ht, t), n(S5, t), n(_5, t), n(_0, t), n(Qm, t), n(q1, t), n(ho, t), n(Hm, t), n(Um, t), n(bi, t), n(ym, t), n(b0, t), n(Gm, t), n(M1, t), n(C5, t), n(tf, t), n(T5, t), n(jm, t), n(qm, t), n(zm, t), n(Oh, t), n(Mf, t), n(Dm, t), n(wl, t), n(b5, t), n(ql, t), n(uo, t), n(R5, t), n(O5, t), n(ut, t), n(D5, t), n(R0, t), n(We, t), n(N5, t), n(VJ, t), n(w5, t), n(F5, t), n(L5, t);
 })(m_);
 var I5 = {}, md = {};
 Object.defineProperty(md, "__esModule", { value: !0 });
@@ -49241,8 +49252,7 @@ class BCe extends wCe.AbstractParseTreeVisitor {
     return i ? { joinFrom: this.astAt(new Z.SQReference(r, this.getSQArguments(i)), e), notes: [], joinAs: r } : { joinAs: r, joinFrom: new Z.SQReference(r), notes: [] };
   }
   visitQueryJoinStatement(e) {
-    const n = this.astAt(this.visit(e.joinStatement()), e);
-    return this.m4advisory(e, "join-statement-in-view", "Joins in queries are deprecated, move into an `extend:` block."), n;
+    return this.astAt(this.visit(e.joinStatement()), e);
   }
   visitJoinOn(e) {
     var n;
@@ -54877,8 +54887,8 @@ var YX = { exports: {} };
           return G = h(te, 0), K.length <= G.length ? G : ue(K.substr(0, K.length - G.length)) + G;
         if (ce = K.match(/^([#0?]+)\.([#0]+)$/)) {
           G = "" + te.toFixed(Math.min(ce[2].length, 10)).replace(/([^0])0+$/, "$1"), Ne = G.indexOf(".");
-          var zn = K.indexOf(".") - Ne, sl = K.length - G.length - zn;
-          return ue(K.substr(0, zn) + G + K.substr(K.length - sl));
+          var Qn = K.indexOf(".") - Ne, sl = K.length - G.length - Qn;
+          return ue(K.substr(0, Qn) + G + K.substr(K.length - sl));
         }
         if (ce = K.match(/^00,000\.([#0]*0)$/))
           return Ne = st(te, ce[1].length), te < 0 ? "-" + re(ye, K, -te) : ge(X(te)).replace(/^\d,\d{3}$/, "0$&").replace(/^\d*$/, function(zi) {
@@ -54978,8 +54988,8 @@ var YX = { exports: {} };
           return G = "" + te, K.length <= G.length ? G : ue(K.substr(0, K.length - G.length)) + G;
         if (ce = K.match(/^([#0]+)\.([#0]+)$/)) {
           G = "" + te.toFixed(Math.min(ce[2].length, 10)).replace(/([^0])0+$/, "$1"), Ne = G.indexOf(".");
-          var zn = K.indexOf(".") - Ne, sl = K.length - G.length - zn;
-          return ue(K.substr(0, zn) + G + K.substr(K.length - sl));
+          var Qn = K.indexOf(".") - Ne, sl = K.length - G.length - Qn;
+          return ue(K.substr(0, Qn) + G + K.substr(K.length - sl));
         }
         if (ce = K.match(/^00,000\.([#0]*0)$/))
           return te < 0 ? "-" + we(ye, K, -te) : ge("" + te).replace(/^\d,\d{3}$/, "0$&").replace(/^\d*$/, function(zi) {
@@ -108205,7 +108215,7 @@ function EK(t) {
 function J1(t) {
   return t ? Wa(t).length : 0;
 }
-function Mn(...t) {
+function jn(...t) {
   for (const e of t)
     if (e !== void 0)
       return e;
@@ -108903,7 +108913,7 @@ function Bt(t, e, n, r = {}) {
   return i && e[i] !== void 0 ? e[i] : e[t] !== void 0 ? e[t] : s && (!i || i === t) ? void 0 : of(t, e, n, r);
 }
 function of(t, e, n, { vgChannel: r } = {}) {
-  return Mn(
+  return jn(
     // style config has highest precedence
     r ? DA(t, e, n.style) : void 0,
     DA(t, e, n.style),
@@ -110217,7 +110227,7 @@ function yZ(t, e) {
   return t = Math.abs(t), e = Math.abs(e) - t, Math.max(0, _d(e) - _d(t)) + 1;
 }
 const v6 = /* @__PURE__ */ new Date(), S6 = /* @__PURE__ */ new Date();
-function Un(t, e, n, r) {
+function qn(t, e, n, r) {
   function i(s) {
     return t(s = arguments.length === 0 ? /* @__PURE__ */ new Date() : /* @__PURE__ */ new Date(+s)), s;
   }
@@ -110233,7 +110243,7 @@ function Un(t, e, n, r) {
       a.push(l = /* @__PURE__ */ new Date(+s)), e(s, u), t(s);
     while (l < s && s < o);
     return a;
-  }, i.filter = (s) => Un((o) => {
+  }, i.filter = (s) => qn((o) => {
     if (o >= o)
       for (; t(o), !s(o); )
         o.setTime(o - 1);
@@ -110249,67 +110259,67 @@ function Un(t, e, n, r) {
             ;
   }), n && (i.count = (s, o) => (v6.setTime(+s), S6.setTime(+o), t(v6), t(S6), Math.floor(n(v6, S6))), i.every = (s) => (s = Math.floor(s), !isFinite(s) || !(s > 0) ? null : s > 1 ? i.filter(r ? (o) => r(o) % s === 0 : (o) => i.count(0, o) % s === 0) : i)), i;
 }
-const Cd = Un(() => {
+const Cd = qn(() => {
 }, (t, e) => {
   t.setTime(+t + e);
 }, (t, e) => e - t);
-Cd.every = (t) => (t = Math.floor(t), !isFinite(t) || !(t > 0) ? null : t > 1 ? Un((e) => {
+Cd.every = (t) => (t = Math.floor(t), !isFinite(t) || !(t > 0) ? null : t > 1 ? qn((e) => {
   e.setTime(Math.floor(e / t) * t);
 }, (e, n) => {
   e.setTime(+e + n * t);
 }, (e, n) => (n - e) / t) : Cd);
 Cd.range;
-const ca = 1e3, Os = ca * 60, fa = Os * 60, La = fa * 24, TF = La * 7, Cj = La * 30, _6 = La * 365, xa = Un((t) => {
+const ca = 1e3, Os = ca * 60, fa = Os * 60, La = fa * 24, TF = La * 7, Cj = La * 30, _6 = La * 365, xa = qn((t) => {
   t.setTime(t - t.getMilliseconds());
 }, (t, e) => {
   t.setTime(+t + e * ca);
 }, (t, e) => (e - t) / ca, (t) => t.getUTCSeconds());
 xa.range;
-const xC = Un((t) => {
+const xC = qn((t) => {
   t.setTime(t - t.getMilliseconds() - t.getSeconds() * ca);
 }, (t, e) => {
   t.setTime(+t + e * Os);
 }, (t, e) => (e - t) / Os, (t) => t.getMinutes());
 xC.range;
-const dC = Un((t) => {
+const dC = qn((t) => {
   t.setUTCSeconds(0, 0);
 }, (t, e) => {
   t.setTime(+t + e * Os);
 }, (t, e) => (e - t) / Os, (t) => t.getUTCMinutes());
 dC.range;
-const hC = Un((t) => {
+const hC = qn((t) => {
   t.setTime(t - t.getMilliseconds() - t.getSeconds() * ca - t.getMinutes() * Os);
 }, (t, e) => {
   t.setTime(+t + e * fa);
 }, (t, e) => (e - t) / fa, (t) => t.getHours());
 hC.range;
-const pC = Un((t) => {
+const pC = qn((t) => {
   t.setUTCMinutes(0, 0, 0);
 }, (t, e) => {
   t.setTime(+t + e * fa);
 }, (t, e) => (e - t) / fa, (t) => t.getUTCHours());
 pC.range;
-const _a = Un(
+const _a = qn(
   (t) => t.setHours(0, 0, 0, 0),
   (t, e) => t.setDate(t.getDate() + e),
   (t, e) => (e - t - (e.getTimezoneOffset() - t.getTimezoneOffset()) * Os) / La,
   (t) => t.getDate() - 1
 );
 _a.range;
-const Fl = Un((t) => {
+const Fl = qn((t) => {
   t.setUTCHours(0, 0, 0, 0);
 }, (t, e) => {
   t.setUTCDate(t.getUTCDate() + e);
 }, (t, e) => (e - t) / La, (t) => t.getUTCDate() - 1);
 Fl.range;
-const EZ = Un((t) => {
+const EZ = qn((t) => {
   t.setUTCHours(0, 0, 0, 0);
 }, (t, e) => {
   t.setUTCDate(t.getUTCDate() + e);
 }, (t, e) => (e - t) / La, (t) => Math.floor(t / La));
 EZ.range;
 function Yf(t) {
-  return Un((e) => {
+  return qn((e) => {
     e.setDate(e.getDate() - (e.getDay() + 7 - t) % 7), e.setHours(0, 0, 0, 0);
   }, (e, n) => {
     e.setDate(e.getDate() + n * 7);
@@ -110324,7 +110334,7 @@ Td.range;
 $Ne.range;
 BNe.range;
 function Jf(t) {
-  return Un((e) => {
+  return qn((e) => {
     e.setUTCDate(e.getUTCDate() - (e.getUTCDay() + 7 - t) % 7), e.setUTCHours(0, 0, 0, 0);
   }, (e, n) => {
     e.setUTCDate(e.getUTCDate() + n * 7);
@@ -110338,35 +110348,35 @@ PNe.range;
 bd.range;
 MNe.range;
 jNe.range;
-const K1 = Un((t) => {
+const K1 = qn((t) => {
   t.setDate(1), t.setHours(0, 0, 0, 0);
 }, (t, e) => {
   t.setMonth(t.getMonth() + e);
 }, (t, e) => e.getMonth() - t.getMonth() + (e.getFullYear() - t.getFullYear()) * 12, (t) => t.getMonth());
 K1.range;
-const Z1 = Un((t) => {
+const Z1 = qn((t) => {
   t.setUTCDate(1), t.setUTCHours(0, 0, 0, 0);
 }, (t, e) => {
   t.setUTCMonth(t.getUTCMonth() + e);
 }, (t, e) => e.getUTCMonth() - t.getUTCMonth() + (e.getUTCFullYear() - t.getUTCFullYear()) * 12, (t) => t.getUTCMonth());
 Z1.range;
-const du = Un((t) => {
+const du = qn((t) => {
   t.setMonth(0, 1), t.setHours(0, 0, 0, 0);
 }, (t, e) => {
   t.setFullYear(t.getFullYear() + e);
 }, (t, e) => e.getFullYear() - t.getFullYear(), (t) => t.getFullYear());
-du.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Un((e) => {
+du.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : qn((e) => {
   e.setFullYear(Math.floor(e.getFullYear() / t) * t), e.setMonth(0, 1), e.setHours(0, 0, 0, 0);
 }, (e, n) => {
   e.setFullYear(e.getFullYear() + n * t);
 });
 du.range;
-const hu = Un((t) => {
+const hu = qn((t) => {
   t.setUTCMonth(0, 1), t.setUTCHours(0, 0, 0, 0);
 }, (t, e) => {
   t.setUTCFullYear(t.getUTCFullYear() + e);
 }, (t, e) => e.getUTCFullYear() - t.getUTCFullYear(), (t) => t.getUTCFullYear());
-hu.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : Un((e) => {
+hu.every = (t) => !isFinite(t = Math.floor(t)) || !(t > 0) ? null : qn((e) => {
   e.setUTCFullYear(Math.floor(e.getUTCFullYear() / t) * t), e.setUTCMonth(0, 1), e.setUTCHours(0, 0, 0, 0);
 }, (e, n) => {
   e.setUTCFullYear(e.getUTCFullYear() + n * t);
@@ -117480,7 +117490,7 @@ function L9(t, e, n) {
   const r = t - e + n * 2;
   return t ? r > 0 ? r : 1 : 0;
 }
-const gIe = "identity", Nd = "linear", Ba = "log", x3 = "pow", d3 = "sqrt", NC = "symlog", lf = "time", cf = "utc", iu = "sequential", Wh = "diverging", wd = "quantile", wC = "quantize", FC = "threshold", I9 = "ordinal", uD = "point", Wte = "band", $9 = "bin-ordinal", qn = "continuous", h3 = "discrete", p3 = "discretizing", Qs = "interpolating", B9 = "temporal";
+const gIe = "identity", Nd = "linear", Ba = "log", x3 = "pow", d3 = "sqrt", NC = "symlog", lf = "time", cf = "utc", iu = "sequential", Wh = "diverging", wd = "quantile", wC = "quantize", FC = "threshold", I9 = "ordinal", uD = "point", Wte = "band", $9 = "bin-ordinal", Hn = "continuous", h3 = "discrete", p3 = "discretizing", Qs = "interpolating", B9 = "temporal";
 function mIe(t) {
   return function(e) {
     let n = e[0], r = e[1], i;
@@ -117589,24 +117599,24 @@ function Lt(t, e, n) {
   return arguments.length > 1 ? (WA.set(t, CIe(t, e, n)), this) : Kte(t) ? WA.get(t) : void 0;
 }
 Lt(gIe, $te);
-Lt(Nd, Ite, qn);
-Lt(Ba, kte, [qn, Ba]);
-Lt(x3, O9, qn);
-Lt(d3, lIe, qn);
-Lt(NC, Pte, qn);
-Lt(lf, xIe, [qn, B9]);
-Lt(cf, dIe, [qn, B9]);
-Lt(iu, N9, [qn, Qs]);
-Lt(`${iu}-${Nd}`, N9, [qn, Qs]);
-Lt(`${iu}-${Ba}`, qte, [qn, Qs, Ba]);
-Lt(`${iu}-${x3}`, w9, [qn, Qs]);
-Lt(`${iu}-${d3}`, hIe, [qn, Qs]);
-Lt(`${iu}-${NC}`, Hte, [qn, Qs]);
-Lt(`${Wh}-${Nd}`, zte, [qn, Qs]);
-Lt(`${Wh}-${Ba}`, Qte, [qn, Qs, Ba]);
-Lt(`${Wh}-${x3}`, F9, [qn, Qs]);
-Lt(`${Wh}-${d3}`, pIe, [qn, Qs]);
-Lt(`${Wh}-${NC}`, Gte, [qn, Qs]);
+Lt(Nd, Ite, Hn);
+Lt(Ba, kte, [Hn, Ba]);
+Lt(x3, O9, Hn);
+Lt(d3, lIe, Hn);
+Lt(NC, Pte, Hn);
+Lt(lf, xIe, [Hn, B9]);
+Lt(cf, dIe, [Hn, B9]);
+Lt(iu, N9, [Hn, Qs]);
+Lt(`${iu}-${Nd}`, N9, [Hn, Qs]);
+Lt(`${iu}-${Ba}`, qte, [Hn, Qs, Ba]);
+Lt(`${iu}-${x3}`, w9, [Hn, Qs]);
+Lt(`${iu}-${d3}`, hIe, [Hn, Qs]);
+Lt(`${iu}-${NC}`, Hte, [Hn, Qs]);
+Lt(`${Wh}-${Nd}`, zte, [Hn, Qs]);
+Lt(`${Wh}-${Ba}`, Qte, [Hn, Qs, Ba]);
+Lt(`${Wh}-${x3}`, F9, [Hn, Qs]);
+Lt(`${Wh}-${d3}`, pIe, [Hn, Qs]);
+Lt(`${Wh}-${NC}`, Gte, [Hn, Qs]);
 Lt(wd, Mte, [p3, wd]);
 Lt(wC, jte, p3);
 Lt(FC, Ute, p3);
@@ -117622,7 +117632,7 @@ function Zf(t, e) {
   return n && n.metadata[e];
 }
 function P9(t) {
-  return Zf(t, qn);
+  return Zf(t, Hn);
 }
 function Fd(t) {
   return Zf(t, h3);
@@ -118363,12 +118373,12 @@ function Q9(t, e, n) {
   });
   return ft(r) ? o.path = r(null) : z9(n) ? o.path = Vh(null, n, 0, 0) : (o.width = n.width || 0, o.height = n.height || 0), "url(#" + s + ")";
 }
-function jn(t) {
+function Un(t) {
   this.clear(), t && this.union(t);
 }
-jn.prototype = {
+Un.prototype = {
   clone() {
-    return new jn(this);
+    return new Un(this);
   },
   clear() {
     return this.x1 = +Number.MAX_VALUE, this.y1 = +Number.MAX_VALUE, this.x2 = -Number.MAX_VALUE, this.y2 = -Number.MAX_VALUE, this;
@@ -118436,7 +118446,7 @@ jn.prototype = {
   }
 };
 function G9(t) {
-  this.mark = t, this.bounds = this.bounds || new jn();
+  this.mark = t, this.bounds = this.bounds || new Un();
 }
 function W9(t) {
   G9.call(this, t), this.items = this.items || [];
@@ -118556,7 +118566,7 @@ function $U(t, e, n, r, i) {
   return o * s * e + 3 * o * t * n + 3 * s * u * r + u * t * i;
 }
 var Il = (Il = Ll(1, 1)) ? Il.getContext("2d") : null;
-const dD = new jn();
+const dD = new Un();
 function yne(t) {
   return function(e, n) {
     if (!Il)
@@ -119114,7 +119124,7 @@ const MBe = {
   left: "start",
   center: "middle",
   right: "end"
-}, g1 = new jn();
+}, g1 = new Un();
 function jC(t) {
   var e = t.x || 0, n = t.y || 0, r = t.radius || 0, i;
   return r && (i = (t.theta || 0) - hc, e += r * Math.cos(i), n += r * Math.sin(i)), g1.x1 = e, g1.y1 = n, g1;
@@ -119182,7 +119192,7 @@ var zBe = {
 };
 function MU(t, e, n) {
   var r = js[t.mark.marktype], i = e || r.bound;
-  return r.nested && (t = t.mark), i(t.bounds || (t.bounds = new jn()), t, n);
+  return r.nested && (t = t.mark), i(t.bounds || (t.bounds = new Un()), t, n);
 }
 var jU = {
   mark: null
@@ -119191,7 +119201,7 @@ function GBe(t, e, n) {
   var r = js[t.marktype], i = r.bound, s = t.items, o = s && s.length, u, a, l, c;
   if (r.nested)
     return o ? l = s[0] : (jU.mark = t, l = jU), c = MU(l, i, n), e = e && e.union(c) || c, e;
-  if (e = e || t.bounds && t.bounds.clear() || new jn(), o)
+  if (e = e || t.bounds && t.bounds.clear() || new Un(), o)
     for (u = 0, a = s.length; u < a; ++u)
       e.union(MU(s[u], i, n));
   return t.bounds = e;
@@ -119316,7 +119326,7 @@ Ine.prototype = {
 };
 function $ne(t, e) {
   const n = {
-    bounds: new jn(),
+    bounds: new Un(),
     clip: !!t.clip,
     group: e,
     interactive: t.interactive !== !1,
@@ -119755,9 +119765,9 @@ function lke(t, e, n, r, i, s) {
   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 ED(t) {
-  el.call(this, t), this._options = {}, this._redraw = !1, this._dirty = new jn(), this._tempb = new jn();
+  el.call(this, t), this._options = {}, this._redraw = !1, this._dirty = new Un(), this._tempb = new Un();
 }
-const zU = el.prototype, cke = (t, e, n) => new jn().set(0, 0, e, n).translate(-t[0], -t[1]);
+const zU = el.prototype, cke = (t, e, n) => new Un().set(0, 0, e, n).translate(-t[0], -t[1]);
 function fke(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;
 }
@@ -119975,7 +119985,7 @@ const nv = {
 }, Kne = {
   fill: "none",
   "stroke-miterlimit": 10
-}, _p = 0, VU = "http://www.w3.org/2000/xmlns/", $n = ug.xmlns;
+}, _p = 0, VU = "http://www.w3.org/2000/xmlns/", Bn = ug.xmlns;
 function Zne(t) {
   el.call(this, t), this._dirtyID = 0, this._dirty = [], this._svg = null, this._root = null, this._defs = null;
 }
@@ -119993,7 +120003,7 @@ De(Zne, el, {
    * @return {SVGRenderer} - This renderer instance.
    */
   initialize(t, e, n, r, i) {
-    return this._defs = {}, this._clearDefs(), t && (this._svg = Zi(t, 0, "svg", $n), this._svg.setAttributeNS(VU, "xmlns", $n), this._svg.setAttributeNS(VU, "xmlns:xlink", ug["xmlns:xlink"]), this._svg.setAttribute("version", ug.version), this._svg.setAttribute("class", "marks"), Vo(t, 1), this._root = Zi(this._svg, _p, "g", $n), _l(this._root, Kne), Vo(this._svg, _p + 1)), this.background(this._bgcolor), z6.initialize.call(this, t, e, n, r, i);
+    return this._defs = {}, this._clearDefs(), t && (this._svg = Zi(t, 0, "svg", Bn), this._svg.setAttributeNS(VU, "xmlns", Bn), this._svg.setAttributeNS(VU, "xmlns:xlink", ug["xmlns:xlink"]), this._svg.setAttribute("version", ug.version), this._svg.setAttribute("class", "marks"), Vo(t, 1), this._root = Zi(this._svg, _p, "g", Bn), _l(this._root, Kne), Vo(this._svg, _p + 1)), this.background(this._bgcolor), z6.initialize.call(this, t, e, n, r, i);
   },
   /**
    * Get / set the background color.
@@ -120034,7 +120044,7 @@ De(Zne, el, {
     if (!t)
       return null;
     let n;
-    e && (t.removeAttribute("style"), n = Zi(t, _p, "rect", $n), _l(n, {
+    e && (t.removeAttribute("style"), n = Zi(t, _p, "rect", Bn), _l(n, {
       width: this._width,
       height: this._height,
       fill: e
@@ -120148,9 +120158,9 @@ De(Zne, el, {
     const t = this._svg, e = this._defs;
     let n = e.el, r = 0;
     for (const i in e.gradient)
-      n || (e.el = n = Zi(t, _p + 1, "defs", $n)), r = vke(n, e.gradient[i], r);
+      n || (e.el = n = Zi(t, _p + 1, "defs", Bn)), r = vke(n, e.gradient[i], r);
     for (const i in e.clipping)
-      n || (e.el = n = Zi(t, _p + 1, "defs", $n)), r = Ske(n, e.clipping[i], r);
+      n || (e.el = n = Zi(t, _p + 1, "defs", Bn)), r = Ske(n, e.clipping[i], r);
     n && (r === 0 ? (t.removeChild(n), e.el = null) : Vo(n, r));
   },
   /**
@@ -120171,18 +120181,18 @@ function YU(t, e) {
 function vke(t, e, n) {
   let r, i, s;
   if (e.gradient === "radial") {
-    let o = Zi(t, n++, "pattern", $n);
+    let o = Zi(t, n++, "pattern", Bn);
     _l(o, {
       id: VA + e.id,
       viewBox: "0,0,1,1",
       width: "100%",
       height: "100%",
       preserveAspectRatio: "xMidYMid slice"
-    }), o = Zi(o, 0, "rect", $n), _l(o, {
+    }), o = Zi(o, 0, "rect", Bn), _l(o, {
       width: 1,
       height: 1,
       fill: `url(${ere()}#${e.id})`
-    }), t = Zi(t, n++, "radialGradient", $n), _l(t, {
+    }), t = Zi(t, n++, "radialGradient", Bn), _l(t, {
       id: e.id,
       fx: e.x1,
       fy: e.y1,
@@ -120192,7 +120202,7 @@ function vke(t, e, n) {
       r: e.r2
     });
   } else
-    t = Zi(t, n++, "linearGradient", $n), _l(t, {
+    t = Zi(t, n++, "linearGradient", Bn), _l(t, {
       id: e.id,
       x1: e.x1,
       x2: e.x2,
@@ -120200,12 +120210,12 @@ function vke(t, e, n) {
       y2: e.y2
     });
   for (r = 0, i = e.stops.length; r < i; ++r)
-    s = Zi(t, r, "stop", $n), s.setAttribute("offset", e.stops[r].offset), s.setAttribute("stop-color", e.stops[r].color);
+    s = Zi(t, r, "stop", Bn), s.setAttribute("offset", e.stops[r].offset), s.setAttribute("stop-color", e.stops[r].color);
   return Vo(t, r), n;
 }
 function Ske(t, e, n) {
   let r;
-  return t = Zi(t, n, "clipPath", $n), t.setAttribute("id", e.id), e.path ? (r = Zi(t, 0, "path", $n), r.setAttribute("d", e.path)) : (r = Zi(t, 0, "rect", $n), _l(r, {
+  return t = Zi(t, n, "clipPath", Bn), t.setAttribute("id", e.id), e.path ? (r = Zi(t, 0, "path", Bn), r.setAttribute("d", e.path)) : (r = Zi(t, 0, "rect", Bn), _l(r, {
     x: 0,
     y: 0,
     width: e.width,
@@ -120221,14 +120231,14 @@ function _ke(t, e, n) {
 }
 function JU(t, e, n, r, i) {
   let s = t._svg, o;
-  if (!s && (o = e.ownerDocument, s = _c(o, r, $n), t._svg = s, t.mark && (s.__data__ = t, s.__values__ = {
+  if (!s && (o = e.ownerDocument, s = _c(o, r, Bn), t._svg = s, t.mark && (s.__data__ = t, s.__values__ = {
     fill: "default"
   }, r === "g"))) {
-    const u = _c(o, "path", $n);
+    const u = _c(o, "path", Bn);
     s.appendChild(u), u.__data__ = t;
-    const a = _c(o, "g", $n);
+    const a = _c(o, "g", Bn);
     s.appendChild(a), a.__data__ = t;
-    const l = _c(o, "path", $n);
+    const l = _c(o, "path", Bn);
     s.appendChild(l), l.__data__ = t, l.__values__ = {
       fill: "default"
     };
@@ -120260,7 +120270,7 @@ const Tke = {
     let i, s, o, u;
     Se(r) ? (s = r.map((a) => e0(n, a)), i = s.join(`
 `), i !== Fr.text && (Vo(e, 0), o = e.ownerDocument, u = ff(n), s.forEach((a, l) => {
-      const c = _c(o, "tspan", $n);
+      const c = _c(o, "tspan", Bn);
       c.__data__ = n, c.textContent = a, l && (c.setAttribute("x", 0), c.setAttribute("dy", u)), e.appendChild(c);
     }), Fr.text = i)) : (s = e0(n, r), s !== Fr.text && (e.textContent = s, Fr.text = s)), Wr(e, "font-family", MC(n)), Wr(e, "font-size", Za(n) + "px"), Wr(e, "font-style", n.fontStyle), Wr(e, "font-variant", n.fontVariant), Wr(e, "font-weight", n.fontWeight);
   }
@@ -120481,7 +120491,7 @@ function fL(t, e) {
   return t = String(t || "").toLowerCase(), arguments.length > 1 ? ($d[t] = e, this) : $d[t];
 }
 function Oke(t, e, n) {
-  const r = [], i = new jn().union(e), s = t.marktype;
+  const r = [], i = new Un().union(e), s = t.marktype;
   return s ? ore(t, i, n, r) : s === "group" ? ure(t, i, n, r) : ve("Intersect scene must be mark node or group item.");
 }
 function ore(t, e, n, r) {
@@ -120518,7 +120528,7 @@ function are(t, e, n) {
   const r = t.bounds;
   return e.encloses(r) || e.intersects(r) && n(t, e);
 }
-const Q6 = new jn();
+const Q6 = new Un();
 function Nke(t) {
   const e = t.clip;
   if (ft(e))
@@ -120617,7 +120627,7 @@ const KU = {
   const e = t.bounds;
   return e.width() > 1 && e.height() > 1;
 }, Qke = (t, e, n) => {
-  var r = t.range(), i = new jn();
+  var r = t.range(), i = new Un();
   return e === Bd || e === t0 ? i.set(r[0], -1 / 0, r[1], 1 / 0) : i.set(-1 / 0, r[0], 1 / 0, r[1]), i.expand(n || 1), (s) => i.encloses(s.bounds);
 }, eq = (t) => (t.forEach((e) => e.opacity = 1), t), tq = (t, e) => t.reflow(e.modified()).modifies("opacity");
 De(Are, me, {
@@ -120657,7 +120667,7 @@ De(Sre, me, {
     }
   }
 });
-const Nr = new jn();
+const Nr = new Un();
 function Fx(t, e, n) {
   return t[e] === n ? 0 : (t[e] = n, 1);
 }
@@ -120748,7 +120758,7 @@ function Yke(t) {
   return o;
 }
 function Jke(t) {
-  return new jn().set(0, 0, t.width || 0, t.height || 0);
+  return new Un().set(0, 0, t.width || 0, t.height || 0);
 }
 function Xke(t) {
   const e = t.bounds.clone();
@@ -121055,7 +121065,7 @@ function lPe(t) {
   return t && t.mark.role !== "legend-entry";
 }
 function cPe(t, e, n) {
-  var r = e.items, i = Math.max(0, e.width || 0), s = Math.max(0, e.height || 0), o = new jn().set(0, 0, i, s), u = o.clone(), a = o.clone(), l = [], c, f, x, h, p, m;
+  var r = e.items, i = Math.max(0, e.width || 0), s = Math.max(0, e.height || 0), o = new Un().set(0, 0, i, s), u = o.clone(), a = o.clone(), l = [], c, f, x, h, p, m;
   for (p = 0, m = r.length; p < m; ++p)
     switch (f = r[p], f.role) {
       case dL:
@@ -128970,7 +128980,7 @@ function cGe() {
 function Ase(t, e, n) {
   if (!t)
     return [];
-  const [r, i] = t, s = new jn().set(r[0], r[1], i[0], i[1]), o = n || this.context.dataflow.scenegraph().root;
+  const [r, i] = t, s = new Un().set(r[0], r[1], i[0], i[1]), o = n || this.context.dataflow.scenegraph().root;
   return Oke(o, s, fGe(e));
 }
 function fGe(t) {
@@ -128998,7 +129008,7 @@ function hGe(t, e, n) {
     x: r,
     y: i,
     mark: s
-  } = n, o = new jn().set(Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER, Number.MIN_SAFE_INTEGER, Number.MIN_SAFE_INTEGER);
+  } = n, o = new Un().set(Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER, Number.MIN_SAFE_INTEGER, Number.MIN_SAFE_INTEGER);
   for (const [a, l] of e)
     a < o.x1 && (o.x1 = a), a > o.x2 && (o.x2 = a), l < o.y1 && (o.y1 = l), l > o.y2 && (o.y2 = l);
   return o.translate(r, i), Ase([[o.x1, o.y1], [o.x2, o.y2]], t, s).filter((a) => pGe(a.x, a.y, e));
@@ -129138,28 +129148,28 @@ function yGe(t) {
     e[n] = vse + n;
   return ct(e, DQe(t, mg, pI)), e;
 }
-function Hn(t, e, n) {
+function zn(t, e, n) {
   return arguments.length === 1 ? mg[t] : (mg[t] = e, n && (pI[t] = n), l7 && (l7.functions[t] = vse + t), this);
 }
-Hn("bandwidth", XQe, Di);
-Hn("copy", KQe, Di);
-Hn("domain", ZQe, Di);
-Hn("range", tGe, Di);
-Hn("invert", eGe, Di);
-Hn("scale", nGe, Di);
-Hn("gradient", rGe, Di);
-Hn("geoArea", NQe, Di);
-Hn("geoBounds", wQe, Di);
-Hn("geoCentroid", FQe, Di);
-Hn("geoShape", iGe, Di);
-Hn("indata", pQe, OQe);
-Hn("data", xse, cI);
-Hn("treePath", oGe, cI);
-Hn("treeAncestors", uGe, cI);
-Hn("vlSelectionTest", uQe, lI);
-Hn("vlSelectionIdTest", cQe, lI);
-Hn("vlSelectionResolve", xQe, lI);
-Hn("vlSelectionTuples", fQe);
+zn("bandwidth", XQe, Di);
+zn("copy", KQe, Di);
+zn("domain", ZQe, Di);
+zn("range", tGe, Di);
+zn("invert", eGe, Di);
+zn("scale", nGe, Di);
+zn("gradient", rGe, Di);
+zn("geoArea", NQe, Di);
+zn("geoBounds", wQe, Di);
+zn("geoCentroid", FQe, Di);
+zn("geoShape", iGe, Di);
+zn("indata", pQe, OQe);
+zn("data", xse, cI);
+zn("treePath", oGe, cI);
+zn("treeAncestors", uGe, cI);
+zn("vlSelectionTest", uQe, lI);
+zn("vlSelectionIdTest", cQe, lI);
+zn("vlSelectionResolve", xQe, lI);
+zn("vlSelectionTuples", fQe);
 function yu(t, e) {
   const n = {};
   let r;
@@ -130454,14 +130464,14 @@ function rT(t, e) {
   return (t && t.signal ? "$" + t.signal : t || "") + (t && e ? "_" : "") + (e && e.signal ? "$" + e.signal : e || "");
 }
 const _I = "scope", h7 = "view";
-function Pn(t) {
+function Mn(t) {
   return t && t.signal;
 }
 function bVe(t) {
   return t && t.expr;
 }
 function wE(t) {
-  if (Pn(t))
+  if (Mn(t))
     return !0;
   if (ze(t)) {
     for (const e in t)
@@ -131154,11 +131164,11 @@ function JYe(t, e, n) {
     if (r === "projection")
       return n.projectionRef(e[t.name]);
   }
-  return t.array && !Pn(i) ? i.map((s) => qH(t, s, n)) : qH(t, i, n);
+  return t.array && !Mn(i) ? i.map((s) => qH(t, s, n)) : qH(t, i, n);
 }
 function qH(t, e, n) {
   const r = t.type;
-  if (Pn(e))
+  if (Mn(e))
     return zH(r) ? ve("Expression references can not be signals.") : _R(r) ? n.fieldRef(e) : QH(r) ? n.compareRef(e) : n.signalRef(e.signal);
   {
     const i = t.expr || _R(r);
@@ -131364,15 +131374,15 @@ function aT(t, e) {
 }
 function sJe(t, e, n) {
   const r = t.method, i = t.bound, s = t.separation, o = {
-    separation: Pn(s) ? n.signalRef(s.signal) : s,
-    method: Pn(r) ? n.signalRef(r.signal) : r,
+    separation: Mn(s) ? n.signalRef(s.signal) : s,
+    method: Mn(r) ? n.signalRef(r.signal) : r,
     pulse: e
   };
   if (t.order && (o.sort = n.compareRef({
     field: t.order
   })), i) {
     const u = i.tolerance;
-    o.boundTolerance = Pn(u) ? n.signalRef(u.signal) : +u, o.boundScale = n.scaleRef(i.scale), o.boundOrient = i.orient;
+    o.boundTolerance = Mn(u) ? n.signalRef(u.signal) : +u, o.boundScale = n.scaleRef(i.scale), o.boundOrient = i.orient;
   }
   return Ye(n.add(VVe(o)));
 }
@@ -131619,7 +131629,7 @@ function yJe(t, e) {
 function EJe(t, e, n) {
   const r = [];
   let i = null, s = !1, o = !1, u, a, l, c, f;
-  for (t.values ? Pn(t.values) || wE(t.format) ? (r.push(VH(e, t)), r.push(i = rc())) : r.push(i = rc({
+  for (t.values ? Mn(t.values) || wE(t.format) ? (r.push(VH(e, t)), r.push(i = rc())) : r.push(i = rc({
     $ingest: t.values,
     $format: t.format
   })) : t.url ? wE(t.url) || wE(t.format) ? (r.push(VH(e, t)), r.push(i = rc())) : r.push(i = rc({
@@ -131646,11 +131656,11 @@ function VH(t, e) {
     format: t.objectProperty(e.format)
   });
 }
-const doe = (t) => t === n0 || t === Io, lT = (t, e, n) => Pn(t) ? _Je(t.signal, e, n) : t === Xh || t === Io ? e : n, nr = (t, e, n) => Pn(t) ? vJe(t.signal, e, n) : doe(t) ? e : n, lo = (t, e, n) => Pn(t) ? SJe(t.signal, e, n) : doe(t) ? n : e, hoe = (t, e, n) => Pn(t) ? CJe(t.signal, e, n) : t === Io ? {
+const doe = (t) => t === n0 || t === Io, lT = (t, e, n) => Mn(t) ? _Je(t.signal, e, n) : t === Xh || t === Io ? e : n, nr = (t, e, n) => Mn(t) ? vJe(t.signal, e, n) : doe(t) ? e : n, lo = (t, e, n) => Mn(t) ? SJe(t.signal, e, n) : doe(t) ? n : e, hoe = (t, e, n) => Mn(t) ? CJe(t.signal, e, n) : t === Io ? {
   value: e
 } : {
   value: n
-}, AJe = (t, e, n) => Pn(t) ? TJe(t.signal, e, n) : t === Kh ? {
+}, AJe = (t, e, n) => Mn(t) ? TJe(t.signal, e, n) : t === Kh ? {
   value: e
 } : {
   value: n
@@ -131662,7 +131672,7 @@ const doe = (t) => t === n0 || t === Io, lT = (t, e, n) => Pn(t) ? _Je(t.signal,
   signal: `${t} ? (${$x(e)}) : (${$x(n)})`
 }), bJe = (t, e, n, r, i) => ({
   signal: (r != null ? `${t} === '${Xh}' ? (${$x(r)}) : ` : "") + (n != null ? `${t} === '${n0}' ? (${$x(n)}) : ` : "") + (i != null ? `${t} === '${Kh}' ? (${$x(i)}) : ` : "") + (e != null ? `${t} === '${Io}' ? (${$x(e)}) : ` : "") + "(null)"
-}), $x = (t) => Pn(t) ? t.signal : t == null ? null : Fe(t), RJe = (t, e) => e === 0 ? 0 : Pn(t) ? {
+}), $x = (t) => Mn(t) ? t.signal : t == null ? null : Fe(t), RJe = (t, e) => e === 0 ? 0 : Mn(t) ? {
   signal: `(${t.signal}) * ${e}`
 } : {
   value: t * e
@@ -131712,7 +131722,7 @@ function JH(t) {
 }
 function OJe(t, e) {
   var n = e.config, r = n.style, i = n.axis, s = e.scaleType(t.scale) === "band" && n.axisBand, o = t.orient, u, a, l;
-  if (Pn(o)) {
+  if (Mn(o)) {
     const f = JH([n.axisX, n.axisY]), x = JH([n.axisTop, n.axisBottom, n.axisLeft, n.axisRight]);
     u = {};
     for (l of f)
@@ -131821,7 +131831,7 @@ function NJe(t, e, n, r, i) {
 function wJe(t, e) {
   if (e !== 1)
     if (!ze(t))
-      t = Pn(e) ? {
+      t = Mn(e) ? {
         signal: `(${e.signal}) * (${t || 0})`
       } : e * (t || 0);
     else {
@@ -131830,7 +131840,7 @@ function wJe(t, e) {
         if (ze(n.mult))
           n = n.mult = ct({}, n.mult);
         else
-          return n.mult = Pn(e) ? {
+          return n.mult = Mn(e) ? {
             signal: `(${n.mult}) * (${e.signal})`
           } : n.mult * e, t;
       n.mult = e;
@@ -132226,7 +132236,7 @@ moe.prototype = KH.prototype = {
   },
   compareRef(t) {
     let e = !1;
-    const n = (s) => Pn(s) ? (e = !0, this.signalRef(s.signal)) : bVe(s) ? (e = !0, this.exprRef(s.expr)) : s, r = Pe(t.field).map(n), i = Pe(t.order).map(n);
+    const n = (s) => Mn(s) ? (e = !0, this.signalRef(s.signal)) : bVe(s) ? (e = !0, this.exprRef(s.expr)) : s, r = Pe(t.field).map(n), i = Pe(t.order).map(n);
     return e ? Ye(this.add(PH({
       fields: r,
       orders: i
@@ -132234,7 +132244,7 @@ moe.prototype = KH.prototype = {
   },
   keyRef(t, e) {
     let n = !1;
-    const r = (s) => Pn(s) ? (n = !0, Ye(i[s.signal])) : s, i = this.signals;
+    const r = (s) => Mn(s) ? (n = !0, Ye(i[s.signal])) : s, i = this.signals;
     return t = Pe(t).map(r), n ? Ye(this.add(qVe({
       fields: t,
       flat: e
@@ -133413,7 +133423,7 @@ function Wx(t, e, { allowDisabling: n, includeDefault: r = !0 }) {
   if (!Le(t))
     return o ?? t.title;
   const u = t, a = r ? YI(u, e) : void 0;
-  return n ? Mn(o, u.title, a) : (s = o ?? u.title) !== null && s !== void 0 ? s : a;
+  return n ? jn(o, u.title, a) : (s = o ?? u.title) !== null && s !== void 0 ? s : a;
 }
 function VI(t) {
   if (WI(t) && t.axis)
@@ -133474,7 +133484,7 @@ function Au(t) {
   if (yT(t))
     return t.condition;
 }
-function kn(t) {
+function Pn(t) {
   if (it(t))
     return t;
   if (L3(t))
@@ -134201,7 +134211,7 @@ function T7(t, e, n, r = !0) {
 }
 function ZI(t) {
   const { title: e, field: n } = t;
-  return Mn(e, n);
+  return jn(e, n);
 }
 function e$(t, e, n, r, i) {
   const { scale: s, axis: o } = n;
@@ -134943,7 +134953,7 @@ function Vv(t, e) {
 function Yv(t, e) {
   var n;
   const r = (n = t[e]) !== null && n !== void 0 ? n : t[e === "width" ? "discreteWidth" : "discreteHeight"];
-  return Mn(r, { step: t.step });
+  return jn(r, { step: t.step });
 }
 const yue = 20, TKe = {
   continuousWidth: 200,
@@ -135952,7 +135962,7 @@ class il {
     return Object.assign(Object.assign({}, this.explicit), this.implicit);
   }
   get(e) {
-    return Mn(this.explicit[e], this.implicit[e]);
+    return jn(this.explicit[e], this.implicit[e]);
   }
   getWithExplicit(e) {
     return this.explicit[e] !== void 0 ? { explicit: !0, value: this.explicit[e] } : this.implicit[e] !== void 0 ? { explicit: !1, value: this.implicit[e] } : { explicit: !1, value: void 0 };
@@ -137593,7 +137603,7 @@ function u1(t, e, n, r = { header: !1 }) {
         maxExtent: 0,
         minExtent: 0,
         ticks: !1,
-        zindex: Mn(x, 0)
+        zindex: jn(x, 0)
         // put grid behind marks by default
       });
     } else {
@@ -137614,7 +137624,7 @@ function u1(t, e, n, r = { header: !1 }) {
         orient: a,
         grid: !1
       }, p ? { title: p } : {}), h), n.aria === !1 ? { aria: !1 } : {}), {
-        zindex: Mn(x, 0)
+        zindex: jn(x, 0)
         // put axis line above marks by default
       });
     }
@@ -137909,7 +137919,7 @@ function OT(t, e) {
 }
 function Jd(t, e, n, r) {
   const i = r === "row" ? n.headerRow : r === "column" ? n.headerColumn : n.headerFacet;
-  return Mn((e || {})[t], i[t], n.header[t]);
+  return jn((e || {})[t], i[t], n.header[t]);
 }
 function DT(t, e, n, r) {
   const i = {};
@@ -138085,7 +138095,7 @@ function Nz(t, e) {
   return Ve(e.step) ? { name: n, update: e.step.signal } : { name: n, value: e.step };
 }
 function aae(t, e, n) {
-  const r = e.get("type"), i = e.get("padding"), s = Mn(e.get("paddingOuter"), i);
+  const r = e.get("type"), i = e.get("padding"), s = jn(e.get("paddingOuter"), i);
   let o = e.get("paddingInner");
   return o = r === "band" ? (
     // only band has real paddingInner
@@ -138164,7 +138174,7 @@ function ket(t, { fieldOrDatumDef: e, model: n, channel: r, legendCmpt: i, legen
     else if (A.stroke.field || S)
       delete A.stroke;
     else if (Se(A.stroke)) {
-      const T = Mn(k7(m.stroke || m.color), p.stroke, E ? p.color : void 0);
+      const T = jn(k7(m.stroke || m.color), p.stroke, E ? p.color : void 0);
       T && (A.stroke = { value: T });
     }
   }
@@ -138204,7 +138214,7 @@ function dae(t) {
   return hae(t, (e, n) => Math.max(e, n.value));
 }
 function k7(t) {
-  return hae(t, (e, n) => Mn(e, n.value));
+  return hae(t, (e, n) => jn(e, n.value));
 }
 function hae(t, e) {
   if (FXe(t))
@@ -138289,7 +138299,7 @@ function qet(t, e, n, r) {
 }
 function Het(t) {
   const { legend: e } = t;
-  return Mn(e.type, zet(t));
+  return jn(e.type, zet(t));
 }
 function zet({ channel: t, timeUnit: e, scaleType: n }) {
   if (qx(t)) {
@@ -138337,7 +138347,7 @@ function gae(t) {
 function Yet(t) {
   const { encoding: e } = t, n = {};
   for (const r of [Li, ...pue]) {
-    const i = kn(e[r]);
+    const i = Pn(e[r]);
     !i || !t.getScaleComponent(r) || r === Ii && Le(i) && i.type === Zh || (n[r] = Ket(t, r));
   }
   return n;
@@ -138373,7 +138383,7 @@ function Ket(t, e) {
   if (c.set("disable", f, s !== void 0), f)
     return c;
   s = s || {};
-  const x = t.getScaleComponent(e).get("type"), h = kn(u[e]), p = Le(h) ? (n = hi(h.timeUnit)) === null || n === void 0 ? void 0 : n.unit : void 0, m = s.orient || a.legend.orient || "right", g = Het({ legend: s, channel: e, timeUnit: p, scaleType: x }), y = Qet({ legend: s, legendType: g, orient: m, legendConfig: l }), E = {
+  const x = t.getScaleComponent(e).get("type"), h = Pn(u[e]), p = Le(h) ? (n = hi(h.timeUnit)) === null || n === void 0 ? void 0 : n.unit : void 0, m = s.orient || a.legend.orient || "right", g = Het({ legend: s, channel: e, timeUnit: p, scaleType: x }), y = Qet({ legend: s, legendType: g, orient: m, legendConfig: l }), E = {
     legend: s,
     channel: e,
     model: t,
@@ -138576,7 +138586,7 @@ function att(t) {
     [qu, Uu],
     [ks, wo]
   ])
-    (kn(n[r[0]]) || kn(n[r[1]])) && e.push({
+    (Pn(n[r[0]]) || Pn(n[r[1]])) && e.push({
       signal: t.getName(`geojson_${e.length}`)
     });
   return t.channelHasField(Ii) && t.typedFieldDef(Ii).type === Zh && e.push({
@@ -139513,7 +139523,7 @@ class Ta extends jt {
     const { stack: r, groupby: i, as: s, offset: o = "zero" } = n, u = [], a = [];
     if (n.sort !== void 0)
       for (const f of n.sort)
-        u.push(f.field), a.push(Mn(f.order, "ascending"));
+        u.push(f.field), a.push(jn(f.order, "ascending"));
     const l = {
       field: u,
       order: a
@@ -139798,7 +139808,7 @@ function jtt(t, e, n, r) {
 }
 function Utt(t, e) {
   const n = t.getScaleComponent(e).get("type"), { encoding: r } = t, i = jtt(t.scaleDomain(e), t.typedFieldDef(e), n, t.config.scale);
-  return i !== t.scaleDomain(e) && (t.specifiedScales[e] = Object.assign(Object.assign({}, t.specifiedScales[e]), { domain: i })), e === "x" && kn(r.x2) ? kn(r.x) ? r0(xl(n, i, t, "x"), xl(n, i, t, "x2"), "domain", "scale", U7) : xl(n, i, t, "x2") : e === "y" && kn(r.y2) ? kn(r.y) ? r0(xl(n, i, t, "y"), xl(n, i, t, "y2"), "domain", "scale", U7) : xl(n, i, t, "y2") : xl(n, i, t, e);
+  return i !== t.scaleDomain(e) && (t.specifiedScales[e] = Object.assign(Object.assign({}, t.specifiedScales[e]), { domain: i })), e === "x" && Pn(r.x2) ? Pn(r.x) ? r0(xl(n, i, t, "x"), xl(n, i, t, "x2"), "domain", "scale", U7) : xl(n, i, t, "x2") : e === "y" && Pn(r.y2) ? Pn(r.y) ? r0(xl(n, i, t, "y"), xl(n, i, t, "y2"), "domain", "scale", U7) : xl(n, i, t, "y2") : xl(n, i, t, e);
 }
 function qtt(t, e, n) {
   return t.map((r) => ({ signal: `{data: ${AT(r, { timeUnit: n, type: e })}}` }));
@@ -139809,7 +139819,7 @@ function NR(t, e, n) {
   return e === "temporal" || i ? qtt(t, e, i) : [t];
 }
 function xl(t, e, n, r) {
-  const { encoding: i } = n, s = kn(i[r]), { type: o } = s, u = s.timeUnit;
+  const { encoding: i } = n, s = Pn(i[r]), { type: o } = s, u = s.timeUnit;
   if (eXe(e)) {
     const f = xl(t, void 0, n, r), x = NR(e.unionWith, o, u);
     return zo([...f.value, ...x]);
@@ -140177,7 +140187,7 @@ function Xtt(t) {
   return ZJe(t) ? Object.assign({ scheme: t.name }, Is(t, ["name"])) : { scheme: t };
 }
 function Ktt(t, e) {
-  const { size: n, config: r, mark: i, encoding: s } = e, o = e.getSignalName.bind(e), { type: u } = kn(s[t]), l = e.getScaleComponent(t).get("type"), { domain: c, domainMid: f } = e.specifiedScales[t];
+  const { size: n, config: r, mark: i, encoding: s } = e, o = e.getSignalName.bind(e), { type: u } = Pn(s[t]), l = e.getScaleComponent(t).get("type"), { domain: c, domainMid: f } = e.specifiedScales[t];
   switch (t) {
     case pn:
     case ir: {
@@ -140350,7 +140360,7 @@ function wae(t, e) {
 function rnt(t, e) {
   const n = t.component.scales, { config: r, encoding: i, markDef: s, specifiedScales: o } = t;
   for (const u of be(n)) {
-    const a = o[u], l = n[u], c = t.getScaleComponent(u), f = kn(i[u]), x = a[e], h = c.get("type"), p = c.get("padding"), m = c.get("paddingInner"), g = A7(h, e), y = Coe(u, e);
+    const a = o[u], l = n[u], c = t.getScaleComponent(u), f = Pn(i[u]), x = a[e], h = c.get("type"), p = c.get("padding"), m = c.get("paddingInner"), g = A7(h, e), y = Coe(u, e);
     if (x !== void 0 && (g ? y && Te(y) : Te(zK(h, e, u))), g && y === void 0)
       if (x !== void 0) {
         const E = f.timeUnit, A = f.type;
@@ -140455,7 +140465,7 @@ function ant(t, e, n, r, i, s = !1) {
   if (t === void 0) {
     if (Er(e)) {
       const { bandPaddingInner: o, barBandPaddingInner: u, rectBandPaddingInner: a, bandWithNestedOffsetPaddingInner: l } = i;
-      return s ? l : Mn(o, n === "bar" ? u : a);
+      return s ? l : jn(o, n === "bar" ? u : a);
     } else if (Uh(e) && r === Ni.BAND)
       return i.offsetBandPaddingInner;
   }
@@ -140467,7 +140477,7 @@ function lnt(t, e, n, r, i, s = !1) {
       if (s)
         return u;
       if (n === Ni.BAND)
-        return Mn(
+        return jn(
           o,
           /* By default, paddingOuter is paddingInner / 2. The reason is that
             size (width/height) = step * (cardinality - paddingInner + 2 * paddingOuter).
@@ -140546,7 +140556,7 @@ function Iae(t) {
 function pnt(t) {
   const { encoding: e, mark: n, markDef: r } = t, i = {};
   for (const s of aC) {
-    const o = kn(e[s]);
+    const o = Pn(e[s]);
     if (o && n === Roe && s === Ii && o.type === Zh)
       continue;
     let u = o && o.scale;
@@ -141013,7 +141023,7 @@ class Yx extends jt {
       [ks, wo]
     ]) {
       const s = i.map((o) => {
-        const u = kn(n.encoding[o]);
+        const u = Pn(n.encoding[o]);
         return Le(u) ? u.field : Yu(u) ? { expr: `${u.datum}` } : Eo(u) ? { expr: `${u.value}` } : void 0;
       });
       (s[0] || s[1]) && (e = new Yx(e, s, null, n.getName(`geojson_${r++}`)));
@@ -141062,7 +141072,7 @@ class Tg extends jt {
       [ks, wo]
     ]) {
       const i = r.map((o) => {
-        const u = kn(n.encoding[o]);
+        const u = Pn(n.encoding[o]);
         return Le(u) ? u.field : Yu(u) ? { expr: `${u.datum}` } : Eo(u) ? { expr: `${u.value}` } : void 0;
       }), s = r[0] === ks ? "2" : "";
       (i[0] || i[1]) && (e = new Tg(e, n.projectionName(), i, [
@@ -141427,7 +141437,7 @@ function bnt(t, e) {
       includeDefault: a === void 0 || !!a
     });
     s.component.layoutHeaders[e].title && (l = Se(l) ? l.join(", ") : l, l += ` / ${s.component.layoutHeaders[e].title}`, s.component.layoutHeaders[e].title = null);
-    const c = Jd("labelOrient", u.header, i, e), f = u.header !== null ? Mn((n = u.header) === null || n === void 0 ? void 0 : n.labels, i.header.labels, !0) : !1, x = bt(["bottom", "right"], c) ? "footer" : "header";
+    const c = Jd("labelOrient", u.header, i, e), f = u.header !== null ? jn((n = u.header) === null || n === void 0 ? void 0 : n.labels, i.header.labels, !0) : !1, x = bt(["bottom", "right"], c) ? "footer" : "header";
     o.layoutHeaders[e] = {
       title: u.header !== null ? l : null,
       facetFieldDef: u,
@@ -141962,7 +141972,7 @@ class O$ extends il {
 }
 function knt(t, e, n) {
   var r;
-  const { encoding: i, config: s } = t, o = (r = kn(i[e])) !== null && r !== void 0 ? r : kn(i[Ka(e)]), u = t.axis(e) || {}, { format: a, formatType: l } = u;
+  const { encoding: i, config: s } = t, o = (r = Pn(i[e])) !== null && r !== void 0 ? r : Pn(i[Ka(e)]), u = t.axis(e) || {}, { format: a, formatType: l } = u;
   return vf(l) ? Object.assign({ text: zI({
     fieldOrDatumDef: o,
     field: "datum.value",
@@ -142046,7 +142056,7 @@ function qnt(t, e) {
           case "gridScale":
             return {
               explicit: i.explicit,
-              value: Mn(i.value, s.value)
+              value: jn(i.value, s.value)
             };
         }
         return TT(i, s, n, "axis");
@@ -142088,7 +142098,7 @@ const znt = /* @__PURE__ */ new Set([
 function Qnt(t, e) {
   var n, r, i;
   let s = e.axis(t);
-  const o = new O$(), u = kn(e.encoding[t]), { mark: a, config: l } = e, c = (s == null ? void 0 : s.orient) || ((n = l[t === "x" ? "axisX" : "axisY"]) === null || n === void 0 ? void 0 : n.orient) || ((r = l.axis) === null || r === void 0 ? void 0 : r.orient) || Cet(t), f = e.getScaleComponent(t).get("type"), x = get(t, f, c, e.config), h = s !== void 0 ? !s : I7("disable", l.style, s == null ? void 0 : s.style, x).configValue;
+  const o = new O$(), u = Pn(e.encoding[t]), { mark: a, config: l } = e, c = (s == null ? void 0 : s.orient) || ((n = l[t === "x" ? "axisX" : "axisY"]) === null || n === void 0 ? void 0 : n.orient) || ((r = l.axis) === null || r === void 0 ? void 0 : r.orient) || Cet(t), f = e.getScaleComponent(t).get("type"), x = get(t, f, c, e.config), h = s !== void 0 ? !s : I7("disable", l.style, s == null ? void 0 : s.style, x).configValue;
   if (o.set("disable", h, s !== void 0), h)
     return o;
   s = s || {};
@@ -142158,7 +142168,7 @@ function Jnt(t, e, { graticule: n }) {
   if (n)
     return !1;
   const r = of("filled", t, e), i = t.type;
-  return Mn(r, i !== dT && i !== xT && i !== qv);
+  return jn(r, i !== dT && i !== xT && i !== qv);
 }
 function Xnt(t, e, n) {
   switch (t) {
@@ -142587,7 +142597,7 @@ function Ert(t) {
   }
 }
 function N$(t, e = { fromPrefix: "" }) {
-  const { mark: n, markDef: r, encoding: i, config: s } = t, o = Mn(r.clip, Art(t), vrt(t)), u = $K(r), a = i.key, l = Ert(t), c = Srt(t), f = Bt("aria", r, s), x = Yy[n].postEncodingTransform ? Yy[n].postEncodingTransform(t) : null;
+  const { mark: n, markDef: r, encoding: i, config: s } = t, o = jn(r.clip, Art(t), vrt(t)), u = $K(r), a = i.key, l = Ert(t), c = Srt(t), f = Bt("aria", r, s), x = Yy[n].postEncodingTransform ? Yy[n].postEncodingTransform(t) : null;
   return [
     Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name: t.getName("marks"), type: Yy[n].vgMark }, o ? { clip: !0 } : {}), u ? { style: u } : {}), a ? { key: a.field } : {}), l ? { sort: l } : {}), c || {}), f === !1 ? { aria: f } : {}), { from: { data: e.fromPrefix + t.requestDataName(Gt.Main) }, encode: {
       update: Yy[n].encodeEntry(t)
@@ -142650,7 +142660,7 @@ class jae extends $ae {
   initScales(e, n) {
     return aC.reduce((r, i) => {
       var s;
-      const o = kn(n[i]);
+      const o = Pn(n[i]);
       return o && (r[i] = this.initScale((s = o.scale) !== null && s !== void 0 ? s : {})), r;
     }, {});
   }
@@ -142678,7 +142688,7 @@ class jae extends $ae {
   }
   initLegends(e) {
     return fDe.reduce((n, r) => {
-      const i = kn(e[r]);
+      const i = Pn(e[r]);
       if (i && dDe(r)) {
         const s = i.legend;
         n[r] = s && Si(s);
@@ -144263,9 +144273,9 @@ const m4 = class m4 extends on {
 };
 m4.instance = new m4();
 let tN = m4;
-var D1 = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds = "pound", t))(D1 || {}), yc = /* @__PURE__ */ ((t) => (t.Bytes = "bytes", t.Kilobytes = "kb", t.Megabytes = "mb", t.Gigabytes = "gb", t.Terabytes = "tb", t))(yc || {}), Wn = /* @__PURE__ */ ((t) => (t.Nanoseconds = "nanoseconds", t.Microseconds = "microseconds", t.Milliseconds = "milliseconds", t.Seconds = "seconds", t.Minutes = "minutes", t.Hours = "hours", t.Days = "days", t))(Wn || {});
+var D1 = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds = "pound", t))(D1 || {}), yc = /* @__PURE__ */ ((t) => (t.Bytes = "bytes", t.Kilobytes = "kb", t.Megabytes = "mb", t.Gigabytes = "gb", t.Terabytes = "tb", t))(yc || {}), Vn = /* @__PURE__ */ ((t) => (t.Nanoseconds = "nanoseconds", t.Microseconds = "microseconds", t.Milliseconds = "milliseconds", t.Seconds = "seconds", t.Minutes = "minutes", t.Hours = "hours", t.Days = "days", t))(Vn || {});
 function Prt(t) {
-  return Object.values(Wn).includes(t);
+  return Object.values(Vn).includes(t);
 }
 class Mrt extends w0 {
   constructor(e, n) {
@@ -144480,24 +144490,24 @@ function Jz(t, e, n = {}) {
   return n.terse ? r = Qrt.get(e) ?? r : t === 1 && (r = r.substring(0, r.length - 1)), `${n.numFormat ? JX.format(n.numFormat, t) : t.toLocaleString()}${n.terse ? "" : " "}${r}`;
 }
 const Qrt = /* @__PURE__ */ new Map([
-  [Wn.Nanoseconds, "ns"],
-  [Wn.Microseconds, "µs"],
-  [Wn.Milliseconds, "ms"],
-  [Wn.Seconds, "s"],
-  [Wn.Minutes, "m"],
-  [Wn.Hours, "h"],
-  [Wn.Days, "d"]
+  [Vn.Nanoseconds, "ns"],
+  [Vn.Microseconds, "µs"],
+  [Vn.Milliseconds, "ms"],
+  [Vn.Seconds, "s"],
+  [Vn.Minutes, "m"],
+  [Vn.Hours, "h"],
+  [Vn.Days, "d"]
 ]), Grt = /* @__PURE__ */ new Map([
-  [Wn.Nanoseconds, 1e3],
-  [Wn.Microseconds, 1e3],
-  [Wn.Milliseconds, 1e3],
-  [Wn.Seconds, 60],
-  [Wn.Minutes, 60],
-  [Wn.Hours, 24],
-  [Wn.Days, Number.MAX_VALUE]
+  [Vn.Nanoseconds, 1e3],
+  [Vn.Microseconds, 1e3],
+  [Vn.Milliseconds, 1e3],
+  [Vn.Seconds, 60],
+  [Vn.Minutes, 60],
+  [Vn.Hours, 24],
+  [Vn.Days, Number.MAX_VALUE]
 ]);
 function Wrt(t, e, n) {
-  const r = n.durationUnit && Prt(n.durationUnit) ? n.durationUnit : Wn.Seconds, i = t.tagParse().tag, s = i.text("number"), o = i.has("duration", "terse");
+  const r = n.durationUnit && Prt(n.durationUnit) ? n.durationUnit : Vn.Seconds, i = t.tagParse().tag, s = i.text("number"), o = i.has("duration", "terse");
   let u = e, a = 0, l = [], c = !1;
   for (const [f, x] of Grt)
     if (f === r && (c = !0), !!c && (a = u % x, u = Math.floor(u /= x), a > 0 && (l = [
@@ -144526,7 +144536,7 @@ class Vrt extends w0 {
 const T4 = class T4 extends on {
   constructor() {
     super(), this.addExtractor((e, n) => {
-      e.duration_unit = (n == null ? void 0 : n.text()) ?? Wn.Seconds;
+      e.duration_unit = (n == null ? void 0 : n.text()) ?? Vn.Seconds;
     }, this.rendererName);
   }
   create(e, n, r, i, s) {
@@ -144751,7 +144761,7 @@ function Ky(t, e, n, r, i) {
 export {
   D1 as Currency,
   yc as DataVolumeUnit,
-  Wn as DurationUnit,
+  Vn as DurationUnit,
   xst as HTMLView,
   dst as JSONView,
   GX as getDrillQuery,