@graphysdk/viz-engine 0.0.1-experimental.1 → 0.0.1-experimental.3

package/dist/index.mjs

@@ -1,17 +1,17 @@
-import { isValid as K, isBefore as Qo, parse as ze, differenceInDays as Zo, isWithinInterval as Jo, addDays as fs } from "date-fns";
-import { table as Ne, desc as ea, op as hs } from "arquero";
-import { isEqual as ta, isInteger as na, merge as Ee } from "lodash-es";
-import { utcYear as ra, utcMonth as sa, utcMonday as oa, utcDay as aa, utcHour as ia } from "d3-time";
-import { differenceInDays as ca } from "date-fns/differenceInDays";
-import { scaleBand as ys, scaleLog as la, scaleSqrt as ua, scaleLinear as da, scaleUtc as pa, scaleOrdinal as gs } from "d3-scale";
+import { isValid as K, isBefore as Zo, parse as ze, differenceInDays as Jo, isWithinInterval as ea, addDays as fs } from "date-fns";
+import { table as Ne, desc as ta, op as hs } from "arquero";
+import { isEqual as na, isInteger as ra, merge as Ee } from "lodash-es";
+import { utcYear as sa, utcMonth as oa, utcMonday as aa, utcDay as ia, utcHour as ca } from "d3-time";
+import { differenceInDays as la } from "date-fns/differenceInDays";
+import { scaleBand as ys, scaleLog as ua, scaleSqrt as da, scaleLinear as pa, scaleUtc as ma, scaleOrdinal as gs } from "d3-scale";
 import bs from "lodash-es/merge";
-import { regressionLoess as ma, regressionPoly as fa, regressionPow as ha, regressionQuad as ya, regressionLog as ga, regressionExp as ba, regressionLinear as va } from "d3-regression";
-import xa from "humanize-duration";
+import { regressionLoess as fa, regressionPoly as ha, regressionPow as ya, regressionQuad as ga, regressionLog as ba, regressionExp as va, regressionLinear as xa } from "d3-regression";
+import Sa from "humanize-duration";
 import "@graphysdk/i18n";
-import { curveCatmullRom as Sa, curveLinear as wa, area as Aa, line as vs, arc as Ta } from "d3-shape";
-import { Delaunay as Ma } from "d3-delaunay";
-import La from "lodash-es/isEqual";
-typeof window < "u" && (window.__GRAPHY_SDK__ ??= {}, window.__GRAPHY_SDK__.vizEngine = "0.0.1-experimental.1");
+import { curveCatmullRom as wa, curveLinear as Aa, area as Ta, line as vs, arc as Ma } from "d3-shape";
+import { Delaunay as La } from "d3-delaunay";
+import Va from "lodash-es/isEqual";
+typeof window < "u" && (window.__GRAPHY_SDK__ ??= {}, window.__GRAPHY_SDK__.vizEngine = "0.0.1-experimental.3");
 const pn = (e) => e.length > 0;
 function h(e) {
   return e != null;
@@ -60,7 +60,7 @@ function Lt(e) {
 let Vt = !0;
 const Zy = (e) => {
   Vt = e;
-}, Jy = () => Vt, Va = () => {
+}, Jy = () => Vt, Ea = () => {
   let e = null;
   const t = { hits: 0, misses: 0 };
   return Object.assign((r, s) => {
@@ -92,7 +92,7 @@ const Zy = (e) => {
     const i = o();
     return a ? a.push({ args: s, out: i }) : e.set(r, [{ args: s, out: i }]), i;
   }, { stats: t });
-}, Ea = (...e) => e.reduce((t, n) => ({ hits: t.hits + n.hits, misses: t.misses + n.misses }), {
+}, ka = (...e) => e.reduce((t, n) => ({ hits: t.hits + n.hits, misses: t.misses + n.misses }), {
   hits: 0,
   misses: 0
 }), ws = (e, t) => {
@@ -119,7 +119,7 @@ class ce {
     return this.singletonKey;
   }
 }
-const O = (e) => e instanceof Date && K(e), ka = (e) => O(e) || e === null, Ue = (e) => typeof e == "string", I = (e) => typeof e == "number" && !Number.isNaN(e) && Number.isFinite(e);
+const O = (e) => e instanceof Date && K(e), Ia = (e) => O(e) || e === null, Ue = (e) => typeof e == "string", I = (e) => typeof e == "number" && !Number.isNaN(e) && Number.isFinite(e);
 function eg(e) {
   return { type: "mapping", mapping: e };
 }
@@ -160,7 +160,7 @@ const As = "\0graphy\0_", A = (e) => `${As}${e}`, rn = {
   ...f,
   ...ye
 });
-const Ia = new Set(Object.values(Ge)), Ca = (e) => e.startsWith(As), Da = (e) => Ia.has(e), ke = (e) => e[W.group];
+const Ca = new Set(Object.values(Ge)), Da = (e) => e.startsWith(As), Fa = (e) => Ca.has(e), ke = (e) => e[W.group];
 function G(e) {
   return e[f.x];
 }
@@ -179,7 +179,7 @@ function se(e) {
 function H(e) {
   return e[f.yMax];
 }
-function Fa(e) {
+function _a(e) {
   return e[f.yRaw];
 }
 function mn(e) {
@@ -188,13 +188,13 @@ function mn(e) {
 function tg(e) {
   return e[ye.alpha];
 }
-function _a(e) {
+function Ra(e) {
   return e[ye.size];
 }
-function Ra(e) {
+function Na(e) {
   return e[ye.strokeWidth];
 }
-function Na(e) {
+function Pa(e) {
   return e[ye.lineType] ?? "solid";
 }
 const sn = (e, t, n) => {
@@ -205,7 +205,7 @@ const sn = (e, t, n) => {
     const o = v(r.mapping.y);
     for (const a of r.data) {
       if (a[s] !== e.anchorValue || ke(a) !== e.groupValue) continue;
-      const i = Pa(a, r.geom, n);
+      const i = Oa(a, r.geom, n);
       if (i === null) continue;
       const c = o !== null ? a[o] ?? null : null;
       if (I(c))
@@ -213,12 +213,12 @@ const sn = (e, t, n) => {
     }
   }
   return null;
-}, Pa = (e, t, n) => {
+}, Oa = (e, t, n) => {
   if (n.type === "polar")
-    return t !== "bar" ? null : $a(e);
-  const r = Oa(e, t, n.mainAxis);
+    return t !== "bar" ? null : Ba(e);
+  const r = $a(e, t, n.mainAxis);
   return r === null ? null : { ...r, geom: t };
-}, Oa = (e, t, n) => {
+}, $a = (e, t, n) => {
   if (t === "line") {
     const a = G(e), i = C(e);
     return a === null || i === null ? null : { x: a, y: i };
@@ -229,19 +229,19 @@ const sn = (e, t, n) => {
   }
   const r = se(e), s = H(e), o = ie(e) ?? G(e);
   return r === null || s === null || o === null ? null : { x: o, y: (r + s) / 2 };
-}, $a = (e) => {
+}, Ba = (e) => {
   const t = ge(e), n = ie(e), r = se(e), s = H(e);
   if (t === null || n === null || r === null || s === null) return null;
   const o = (t + n) / 2, a = (r + s) / 2, i = 0.5 + 0.5 * a * Math.sin(o), c = 0.5 - 0.5 * a * Math.cos(o);
   return { x: i, y: c, geom: "polar-bar" };
 };
-class Ba extends ce {
+class za extends ce {
   dependencies(t) {
     return [t.annotations, t.layers, t.coordSystem];
   }
   run(t) {
     return {
-      differenceArrows: za(t),
+      differenceArrows: Ga(t),
       shapes: t.annotations.shapes,
       freeformArrows: t.annotations.freeformArrows,
       textAnnotations: t.annotations.textAnnotations,
@@ -258,7 +258,7 @@ const Pt = (e, t, n) => {
     o !== null && r.push({ ...s, anchor: o });
   }
   return r;
-}, za = ({
+}, Ga = ({
   annotations: e,
   layers: t,
   coordSystem: n
@@ -266,29 +266,29 @@ const Pt = (e, t, n) => {
   if (n.type !== "cartesian") return [];
   const r = [];
   for (const s of e.differenceArrows) {
-    if (Ga(s.start, s.end)) continue;
+    if (Wa(s.start, s.end)) continue;
     const o = sn(s.start, t, n), a = sn(s.end, t, n);
     o === null || a === null || r.push({
       id: s.id,
       start: o,
       end: a,
-      color: Wa(s, o, a),
+      color: Ya(s, o, a),
       size: s.size,
       label: s.label,
       labelCrossPosition: s.labelCrossPosition
     });
   }
   return r;
-}, Ga = (e, t) => e.layerId === t.layerId && e.anchorValue === t.anchorValue && e.groupValue === t.groupValue, Wa = (e, t, n) => e.color !== null ? e.color : e.start.groupValue !== e.end.groupValue || t.color === void 0 || t.color !== n.color ? null : t.color;
-function Ya(e, t) {
-  const n = Ka(t);
+}, Wa = (e, t) => e.layerId === t.layerId && e.anchorValue === t.anchorValue && e.groupValue === t.groupValue, Ya = (e, t, n) => e.color !== null ? e.color : e.start.groupValue !== e.end.groupValue || t.color === void 0 || t.color !== n.color ? null : t.color;
+function Ha(e, t) {
+  const n = Xa(t);
   return {
     ...e,
-    background: Ha(e.background, n),
-    border: Ua(e.border, n)
+    background: Ua(e.background, n),
+    border: Ka(e.border, n)
   };
 }
-function Ha(e, t) {
+function Ua(e, t) {
   if (e.type === "tinted") {
     const n = e.color ?? t;
     if (!n)
@@ -297,7 +297,7 @@ function Ha(e, t) {
   }
   return e;
 }
-function Ua(e, t) {
+function Ka(e, t) {
   if (e.type === "tinted" || e.type === "gradient") {
     const n = e.color ?? t;
     if (!n)
@@ -306,7 +306,7 @@ function Ua(e, t) {
   }
   return e;
 }
-function Ka(e) {
+function Xa(e) {
   const t = e.color, n = t?.domain[0];
   if (!n)
     return;
@@ -314,7 +314,7 @@ function Ka(e) {
   if (typeof r == "string")
     return r;
 }
-class Xa extends ce {
+class ja extends ce {
   dependencies(t) {
     return [t.scales, t.config];
   }
@@ -322,11 +322,11 @@ class Xa extends ce {
     const { scales: n, config: r } = t;
     return {
       ...r,
-      appearance: Ya(r.appearance, n)
+      appearance: Ha(r.appearance, n)
     };
   }
 }
-class ja extends ce {
+class qa extends ce {
   dependencies(t) {
     return [t.data, t.mapping];
   }
@@ -337,18 +337,18 @@ class ja extends ce {
       const o = ae(r[s]);
       if (o === void 0) continue;
       const a = A(`const_${s}`);
-      n = n.addConstantVariable(a, qa(o), o), r = { ...r, [s]: a };
+      n = n.addConstantVariable(a, Qa(o), o), r = { ...r, [s]: a };
     }
     return { data: n, mapping: r };
   }
 }
-const qa = (e) => typeof e == "number" ? "numeric" : e instanceof Date ? "temporal" : "categorical";
+const Qa = (e) => typeof e == "number" ? "numeric" : e instanceof Date ? "temporal" : "categorical";
 class Ie {
   constructor() {
-    this.perLayerMemo = Ss(), this.listMemo = Va();
+    this.perLayerMemo = Ss(), this.listMemo = Ea();
   }
   get stats() {
-    return Ea(this.perLayerMemo.stats, this.listMemo.stats);
+    return ka(this.perLayerMemo.stats, this.listMemo.stats);
   }
   compile(t) {
     const n = this.dependencies(t), r = t.layers.map(
@@ -357,7 +357,7 @@ class Ie {
     return this.listMemo(r, () => r);
   }
 }
-class Qa extends ce {
+class Za extends ce {
   constructor(t) {
     super(), this.registry = t;
   }
@@ -368,7 +368,7 @@ class Qa extends ce {
     return this.registry.get(t.coordSpec.coordType).setup(t);
   }
 }
-class Za extends Ie {
+class Ja extends Ie {
   constructor(t) {
     super(), this.registry = t;
   }
@@ -382,9 +382,9 @@ class Za extends Ie {
     return s;
   }
 }
-class Ja {
+class ei {
   constructor(t) {
-    this.setupStage = new Qa(t), this.transformStage = new Za(t);
+    this.setupStage = new Za(t), this.transformStage = new Ja(t);
   }
   get setupStats() {
     return this.setupStage.stats;
@@ -429,7 +429,7 @@ class Ce {
     return this.items.has(t);
   }
 }
-class ei {
+class ti {
   constructor() {
     this.coordType = "cartesian";
   }
@@ -452,7 +452,7 @@ class ei {
     return t.layers;
   }
 }
-class ti {
+class ni {
   constructor() {
     this.coordType = "flip";
   }
@@ -468,18 +468,18 @@ class ti {
           y: { position: "bottom", geometry: "linear" }
         }
       },
-      scales: ri(t.scales, t.layers)
+      scales: si(t.scales, t.layers)
     };
   }
   transform(t) {
-    return t.layers.map((n) => oi(n));
+    return t.layers.map((n) => ai(n));
   }
 }
-const ni = [
+const ri = [
   [f.x, f.y],
   [f.xMin, f.yMin],
   [f.xMax, f.yMax]
-], Ar = A("flipSwap"), ri = (e, t) => si(t) ? e.map((n) => n.scaledAesthetic !== "x" || n.scaleType !== "continuous" && n.scaleType !== "datetime" && n.scaleType !== "discrete" ? n : { ...n, reverse: !n.reverse }) : e, si = (e) => {
+], Ar = A("flipSwap"), si = (e, t) => oi(t) ? e.map((n) => n.scaledAesthetic !== "x" || n.scaleType !== "continuous" && n.scaleType !== "datetime" && n.scaleType !== "discrete" ? n : { ...n, reverse: !n.reverse }) : e, oi = (e) => {
   for (const t of e) {
     const n = v(t.mapping.x);
     if (!n || !t.data.hasVariable(n)) continue;
@@ -487,15 +487,15 @@ const ni = [
     if (r === "categorical" || r === "temporal") return !0;
   }
   return !1;
-}, oi = (e) => {
+}, ai = (e) => {
   let t = e.data;
-  for (const [n, r] of ni) {
+  for (const [n, r] of ri) {
     const s = t.hasVariable(n), o = t.hasVariable(r);
     s && o ? t = t.renameVariable(n, Ar).renameVariable(r, n).renameVariable(Ar, r) : s ? t = t.renameVariable(n, r) : o && (t = t.renameVariable(r, n));
   }
   return { ...e, data: t };
 };
-class ai {
+class ii {
   constructor() {
     this.coordType = "polar";
   }
@@ -515,27 +515,27 @@ class ai {
   transform(t) {
     if (t.coordSpec.coordType !== "polar")
       throw new Error(`Invalid coordinate type: ${t.coordSpec.coordType}`);
-    const { params: n } = t.coordSpec, r = ci(n), s = li(n);
+    const { params: n } = t.coordSpec, r = li(n), s = ui(n);
     return t.layers.map((o) => {
-      const a = n.theta === "y" ? di(o) : o;
-      return ui(a, r, s);
+      const a = n.theta === "y" ? pi(o) : o;
+      return di(a, r, s);
     });
   }
 }
-const ii = [
+const ci = [
   [f.x, f.y],
   [f.xMin, f.yMin],
   [f.xMax, f.yMax]
 ];
-function ci(e) {
+function li(e) {
   const t = e.startAngle * (Math.PI / 180);
   return (n) => n * 2 * Math.PI + t;
 }
-function li(e) {
+function ui(e) {
   const { innerRadius: t } = e;
   return (n) => t + n * (1 - t);
 }
-function ui(e, t, n) {
+function di(e, t, n) {
   let r = e.data;
   return r = be(r, f.x, t), r = be(r, f.xMin, t), r = be(r, f.xMax, t), r = be(r, f.y, n), r = be(r, f.yMin, n), r = be(r, f.yMax, n), { ...e, data: r };
 }
@@ -544,9 +544,9 @@ function be(e, t, n) {
   const s = e.getValues(t, { type: "numeric" }).map((o) => o === null ? null : n(o));
   return e.addVariable(t, "numeric", s);
 }
-function di(e) {
+function pi(e) {
   let t = e.data;
-  for (const [n, r] of ii) {
+  for (const [n, r] of ci) {
     const s = t.hasVariable(n), o = t.hasVariable(r);
     if (!s && !o) continue;
     const a = s ? t.getValues(n) : null, i = o ? t.getValues(r) : null;
@@ -554,20 +554,20 @@ function di(e) {
   }
   return { ...e, data: t };
 }
-class pi extends Ce {
+class mi extends Ce {
   constructor() {
-    super("coord"), this.register("cartesian", new ei()), this.register("flip", new ti()), this.register("polar", new ai());
+    super("coord"), this.register("cartesian", new ti()), this.register("flip", new ni()), this.register("polar", new ii());
   }
 }
-const mi = /* @__PURE__ */ new Set(["count", "sum", "mean", "median"]);
+const fi = /* @__PURE__ */ new Set(["count", "sum", "mean", "median"]);
 function Ts(e, t) {
-  return mi.has(e) ? "numeric" : t;
+  return fi.has(e) ? "numeric" : t;
 }
-const V = (e) => (Array.isArray(e) ? e : [e]).map((n) => n instanceof Date ? n.toISOString() : String(n ?? "<null>")).join("\0"), fi = "key", hi = "value", Tr = "\0__rowMaskIndex", $e = {
+const V = (e) => (Array.isArray(e) ? e : [e]).map((n) => n instanceof Date ? n.toISOString() : String(n ?? "<null>")).join("\0"), hi = "key", yi = "value", Tr = "\0__rowMaskIndex", $e = {
   numeric: { type: "decimal" },
   categorical: { type: "text" },
   temporal: { type: "datetime" }
-}, yi = {
+}, gi = {
   eq: (e, t) => e[t.__variableName] === t.__value,
   neq: (e, t) => e[t.__variableName] !== t.__value,
   // @ts-expect-error — Arquero table expression; TS can't verify the comparison types
@@ -717,7 +717,7 @@ class E {
    * Filters the dataset using a declarative predicate.
    */
   filter(t, n, r) {
-    const s = yi[n], o = this.table.params({ __variableName: t, __value: r }).filter(s);
+    const s = gi[n], o = this.table.params({ __variableName: t, __value: r }).filter(s);
     return E.fromTrusted(o, this.variableMetadata);
   }
   /**
@@ -735,7 +735,7 @@ class E {
    * Orders the dataset by a variable, in ascending (default) or descending order.
    */
   orderBy(t, n = "asc") {
-    const r = this.table.orderby(n === "asc" ? t : ea(t));
+    const r = this.table.orderby(n === "asc" ? t : ta(t));
     return E.fromTrusted(r, this.variableMetadata);
   }
   /**
@@ -765,7 +765,7 @@ class E {
    */
   groupBy(...t) {
     const n = this.table.groupby(...t);
-    return new gi(t, n, this.variableMetadata);
+    return new bi(t, n, this.variableMetadata);
   }
   /**
    * Aggregates the dataset.
@@ -824,8 +824,8 @@ class E {
   reshapeFromWideToLong({
     keep: t,
     reshape: n,
-    keyName: r = fi,
-    valueName: s = hi
+    keyName: r = hi,
+    valueName: s = yi
   } = {}) {
     const { numeric: o, categorical: a, temporal: i } = this.groupVariableNamesByType(), c = t ?? [...a, ...i], l = n ?? o.filter((y) => !c.includes(y));
     if (c.includes(r) || c.includes(s))
@@ -849,7 +849,7 @@ class E {
     }
     return m[r] = { type: "categorical", valueFormat: { type: "text" } }, m[s] = {
       type: "numeric",
-      valueFormat: bi(this.variableMetadata, l, r)
+      valueFormat: vi(this.variableMetadata, l, r)
     }, E.fromTrusted(p, m);
   }
   /**
@@ -916,7 +916,7 @@ class E {
     return o;
   }
 }
-class gi {
+class bi {
   constructor(t, n, r) {
     this.groupedBy = t, this.grouped = n, this.variableMetadata = r;
   }
@@ -968,13 +968,13 @@ class gi {
     return V(t.map((r) => r.get(n)));
   }
 }
-function bi(e, t, n) {
+function vi(e, t, n) {
   const r = t.map((c) => e[c]?.valueFormat ?? { type: "decimal" }), [s, ...o] = r;
   if (!s) return { type: "decimal" };
   for (const c of r)
     if (c.type === "lookup")
       throw new Error("Cannot reshape: a source column has a lookup format and lookups cannot nest");
-  if (o.every((c) => ta(c, s)) || s.type === "lookup") return s;
+  if (o.every((c) => na(c, s)) || s.type === "lookup") return s;
   const i = {};
   for (const [c, l] of t.entries()) {
     const u = V([l]), d = r[c];
@@ -996,7 +996,7 @@ class Ls {
    */
   incrementYearIfNeeded(t) {
     this.previousYear === null ? this.previousYear = t.getUTCFullYear() : this.previousDate !== null && // Compares the current date with the previous date, but ignores the year.
-    Qo(
+    Zo(
       new Date(this.currentYear, t.getUTCMonth(), t.getUTCDate()),
       new Date(this.currentYear, this.previousDate.getUTCMonth(), this.previousDate.getUTCDate())
     ) && this.previousYear++;
@@ -1007,11 +1007,11 @@ class Ls {
 const Vs = (e) => {
   const t = Object.entries(e);
   return !t.length || !t.some(([, n]) => !Ke(n));
-}, Ke = (e) => typeof e == "string" && e.trim() === "" || e === void 0 || e === null || e === "-", fn = "en-GB", vi = (e) => e.type === "lookup", xi = (e) => e.type === "text", Xe = (e) => e.type === "date" || e.type === "datetime" || e.type === "year" || e.type === "month_year" || e.type === "month" || e.type === "day_month" || e.type === "weekly_date_range" || e.type === "weekly_date_range_with_year" || e.type === "quarter" || e.type === "time", Es = (e) => e.type === "decimal" || e.type === "integer" || e.type === "percentage" || e.type === "duration" || e.type === "currency", ks = (e) => e.type === "currency", Is = (e) => e.type === "month" || e.type === "day_month" || e.type === "weekly_date_range", Cs = (e) => {
-  if (vi(e)) return Cs(e.fallback);
+}, Ke = (e) => typeof e == "string" && e.trim() === "" || e === void 0 || e === null || e === "-", fn = "en-GB", xi = (e) => e.type === "lookup", Si = (e) => e.type === "text", Xe = (e) => e.type === "date" || e.type === "datetime" || e.type === "year" || e.type === "month_year" || e.type === "month" || e.type === "day_month" || e.type === "weekly_date_range" || e.type === "weekly_date_range_with_year" || e.type === "quarter" || e.type === "time", Es = (e) => e.type === "decimal" || e.type === "integer" || e.type === "percentage" || e.type === "duration" || e.type === "currency", ks = (e) => e.type === "currency", Is = (e) => e.type === "month" || e.type === "day_month" || e.type === "weekly_date_range", Cs = (e) => {
+  if (xi(e)) return Cs(e.fallback);
   if (Xe(e)) return "temporal";
   if (Es(e)) return "numeric";
-  if (xi(e)) return "categorical";
+  if (Si(e)) return "categorical";
   const t = e;
   throw new Error(`No data type found for value format: ${t.type}`);
 }, Be = {
@@ -1019,7 +1019,7 @@ const Vs = (e) => {
   m: 1e6,
   b: 1e9,
   t: 1e12
-}, hn = ["k", "m", "b", "t"], Si = new RegExp(`^-?(\\d{1,3}(,\\d{3})*|\\d+)\\.?\\d*(${hn.join("|")})?$`, "i"), wi = /^-?\d{1,3}(?:,\d{3})*(?:\.\d+)?%?$/, me = (e) => e === null || e instanceof Date || Array.isArray(e) || typeof e == "boolean" ? !1 : typeof e == "string" ? Si.test(e) && !Number.isNaN(Number(e.replace(new RegExp(`[,${hn.join("")}]`, "gi"), ""))) : !Number.isNaN(Number(e)), Ds = (e) => me(e) ? !0 : typeof e == "string" ? wi.test(e) : !1, Ai = /^\d{4}-\d{2}-\d{2}(T|\s)\d{1,2}:\d{2}(:\d{2}(\.\d{3})?)?(Z|\+00:00)?$/, Ti = /^\s*(19\d{2}|2[01]\d{2})\s*$/, Mi = [
+}, hn = ["k", "m", "b", "t"], wi = new RegExp(`^-?(\\d{1,3}(,\\d{3})*|\\d+)\\.?\\d*(${hn.join("|")})?$`, "i"), Ai = /^-?\d{1,3}(?:,\d{3})*(?:\.\d+)?%?$/, me = (e) => e === null || e instanceof Date || Array.isArray(e) || typeof e == "boolean" ? !1 : typeof e == "string" ? wi.test(e) && !Number.isNaN(Number(e.replace(new RegExp(`[,${hn.join("")}]`, "gi"), ""))) : !Number.isNaN(Number(e)), Ds = (e) => me(e) ? !0 : typeof e == "string" ? Ai.test(e) : !1, Ti = /^\d{4}-\d{2}-\d{2}(T|\s)\d{1,2}:\d{2}(:\d{2}(\.\d{3})?)?(Z|\+00:00)?$/, Mi = /^\s*(19\d{2}|2[01]\d{2})\s*$/, Li = [
   [/\bJan\b/i, "January"],
   [/\bFeb\b/i, "February"],
   [/\bMar\b/i, "March"],
@@ -1032,7 +1032,7 @@ const Vs = (e) => {
   [/\bOct\b/i, "October"],
   [/\bNov\b/i, "November"],
   [/\bDec\b/i, "December"]
-], Li = {
+], Vi = {
   "en-US": "MDY",
   "en-GB": "DMY",
   "pt-PT": "DMY",
@@ -1123,7 +1123,7 @@ const Vs = (e) => {
   // February 01
   ["MMMM", "do"]
   // February 1st
-], Vi = [
+], Ei = [
   { dateFormat: "MMMM d, yyyy", type: "date" },
   // February 1, 2022
   { dateFormat: "MMMM dd, yyyy", type: "date" },
@@ -1132,31 +1132,31 @@ const Vs = (e) => {
   // February 1st, 2022
   { dateFormat: "yyyy-MM", type: "month_year" }
   // 2022-02 (this format seems to be the most common format ChatGPT uses when generating sample data)
-], Rs = 1900, Ns = 2199, Ei = 3, ki = 6, Ii = 5, Ci = 1, Di = 28, Fi = /\s*[–—]\s*|\s-\s/, _i = (e) => typeof e == "number" ? Number.isNaN(e) ? !1 : e >= Rs && e <= Ns : typeof e == "string" ? Ti.test(e) : !1, Ps = (e, t) => {
+], Rs = 1900, Ns = 2199, ki = 3, Ii = 6, Ci = 5, Di = 1, Fi = 28, _i = /\s*[–—]\s*|\s-\s/, Ri = (e) => typeof e == "number" ? Number.isNaN(e) ? !1 : e >= Rs && e <= Ns : typeof e == "string" ? Mi.test(e) : !1, Ps = (e, t) => {
   const n = We(e);
-  return me(n) ? Pi(n) : typeof n == "string" ? !!Os(n) || yn(n) && K(new Date(n)) : K(n);
+  return me(n) ? Oi(n) : typeof n == "string" ? !!Os(n) || yn(n) && K(new Date(n)) : K(n);
 }, We = (e) => {
   if (typeof e != "string") return e;
   let t = e;
-  for (const [n, r] of Mi)
+  for (const [n, r] of Li)
     t = t.replace(n, r);
   return t;
 }, Os = (e, t = fn) => {
   const n = We(e);
-  return yn(n) ? { type: "datetime" } : $s(t).find((r) => !Xe(r) || r.type === "month" && n.length < Ei ? !1 : r.dateFormat && K(ze(n, r.dateFormat, /* @__PURE__ */ new Date())));
-}, yn = (e) => Ai.test(e.trim()), Ri = (e, t = fn) => {
-  const [n, r] = e.split(Fi);
+  return yn(n) ? { type: "datetime" } : $s(t).find((r) => !Xe(r) || r.type === "month" && n.length < ki ? !1 : r.dateFormat && K(ze(n, r.dateFormat, /* @__PURE__ */ new Date())));
+}, yn = (e) => Ti.test(e.trim()), Ni = (e, t = fn) => {
+  const [n, r] = e.split(_i);
   if (!n || !r) return;
   const s = We(n).trim(), o = We(r).trim();
-  return Ni(t).find((a) => {
+  return Pi(t).find((a) => {
     if (!Xe(a) || !a.dateFormat) return !1;
     const i = ze(s, a.dateFormat, /* @__PURE__ */ new Date()), c = ze(o, a.dateFormat, /* @__PURE__ */ new Date());
     if (!K(i) || !K(c)) return !1;
-    const l = new Ls(), u = l.incrementYearIfNeeded(i), d = l.incrementYearIfNeeded(c), p = Zo(d, u);
-    return Jo(new Date(u.getFullYear(), Ci, Di), {
+    const l = new Ls(), u = l.incrementYearIfNeeded(i), d = l.incrementYearIfNeeded(c), p = Jo(d, u);
+    return ea(new Date(u.getFullYear(), Di, Fi), {
       start: u,
       end: d
-    }) && p === Ii ? !0 : p === ki;
+    }) && p === Ci ? !0 : p === Ii;
   });
 }, $s = (e) => {
   const t = {
@@ -1186,18 +1186,18 @@ const Vs = (e) => {
     ]
   };
   return [
-    ...Vi,
+    ...Ei,
     ...Object.entries(t).flatMap(([n, r]) => r.flatMap((s) => Fs.map((o) => ({ dateFormat: s.join(o), type: n }))))
   ];
-}, Bs = (e) => Li[e] === "MDY" ? [...Lr, ...Mr, ...Vr] : [...Mr, ...Lr, ...Vr], Ni = (e) => {
+}, Bs = (e) => Vi[e] === "MDY" ? [...Lr, ...Mr, ...Vr] : [...Mr, ...Lr, ...Vr], Pi = (e) => {
   const t = {
     weekly_date_range: _s,
     weekly_date_range_with_year: Bs(e)
   };
   return Object.entries(t).flatMap(([n, r]) => r.flatMap((s) => Fs.map((o) => ({ dateFormat: s.join(o), type: n }))));
-}, Pi = (e) => {
+}, Oi = (e) => {
   const t = Number(e);
-  if (!na(t)) return !1;
+  if (!ra(t)) return !1;
   const n = new Date(t), r = new Date(t * 1e3), s = (o) => K(o) && o.getFullYear() >= Rs && o.getFullYear() <= Ns;
   return s(n) || s(r);
 }, zs = {
@@ -1238,7 +1238,7 @@ const Vs = (e) => {
     return t.length ? me(t) : !1;
   }
   return me(e);
-}, Oi = (e) => {
+}, $i = (e) => {
   const t = Ys(e), n = t ? zs[t] : void 0;
   if (!n) throw new Error("Could not get currency ISO");
   return n;
@@ -1250,15 +1250,15 @@ const Vs = (e) => {
     r === 0 ? n = e.slice(t.length) : r === e.length - t.length ? n = e.slice(0, e.length - t.length) : e[0] === "-" && r === 1 && (n = `-${e.slice(t.length + 1)}`);
   }
   return me(n) ? n.split(",").join("") : "";
-}, Ys = (e) => Object.keys(zs).sort((n, r) => r.length - n.length).find((n) => e.includes(n)), $i = (e, t) => {
+}, Ys = (e) => Object.keys(zs).sort((n, r) => r.length - n.length).find((n) => e.includes(n)), Bi = (e, t) => {
   const n = typeof e == "string" ? e.trim() : e;
   if (me(n))
     return { type: "decimal" };
   const r = typeof n == "string" && Os(n, t);
   if (r) return r;
-  const s = typeof n == "string" && Ri(n, t);
-  return s || (Ps(e) ? { type: "date" } : Ds(e) ? { type: "percentage" } : Gs(e) && typeof e == "string" ? { type: "currency", iso: Oi(e) } : { type: "text" });
-}, Bi = /\s*[–—]\s*|\s-\s/, zi = (e, t, n) => {
+  const s = typeof n == "string" && Ni(n, t);
+  return s || (Ps(e) ? { type: "date" } : Ds(e) ? { type: "percentage" } : Gs(e) && typeof e == "string" ? { type: "currency", iso: $i(e) } : { type: "text" });
+}, zi = /\s*[–—]\s*|\s-\s/, Gi = (e, t, n) => {
   if (Ke(e)) return null;
   switch (t.type) {
     case "decimal":
@@ -1266,9 +1266,9 @@ const Vs = (e) => {
     case "duration":
       return Hs(e);
     case "percentage":
-      return Gi(e);
-    case "currency":
       return Wi(e);
+    case "currency":
+      return Yi(e);
     case "datetime":
     case "date":
     case "year":
@@ -1280,9 +1280,9 @@ const Vs = (e) => {
       return gn(e, t.dateFormat, n);
     case "weekly_date_range":
     case "weekly_date_range_with_year":
-      return Yi(e, t.dateFormat, n);
+      return Hi(e, t.dateFormat, n);
     case "text":
-      return Hi(e);
+      return Ui(e);
     case "lookup":
       throw new Error("Cannot parse: lookup value formats are produced by transforms, not raw input");
     default: {
@@ -1320,7 +1320,7 @@ const Vs = (e) => {
       break;
     }
   return Number(t.split(",").join("")) * n;
-}, Gi = (e) => {
+}, Wi = (e) => {
   if (typeof e == "number")
     return Number.isNaN(e) ? null : e;
   if (typeof e != "string") return null;
@@ -1328,16 +1328,16 @@ const Vs = (e) => {
   if (!Ds(t)) return null;
   const n = Number(t.replace(/%/g, "").replace(/,/g, "")) / 100;
   return Number.isNaN(n) ? null : n;
-}, Wi = (e) => {
+}, Yi = (e) => {
   if (typeof e == "number")
     return Number.isNaN(e) ? null : e;
   if (typeof e != "string") return null;
   const t = e.trim();
   return Gs(t) ? Hs(Ws(t)) : null;
-}, Yi = (e, t, n) => {
-  const r = String(e).trim().split(Bi), [s, o] = [r[0]?.trim(), r[1]?.trim()];
+}, Hi = (e, t, n) => {
+  const r = String(e).trim().split(zi), [s, o] = [r[0]?.trim(), r[1]?.trim()];
   return !s || !o ? null : gn(s, t, n);
-}, Hi = (e) => String(e).trim(), Ot = (e) => new Date(
+}, Ui = (e) => String(e).trim(), Ot = (e) => new Date(
   Date.UTC(
     e.getFullYear(),
     e.getMonth(),
@@ -1347,37 +1347,37 @@ const Vs = (e) => {
     e.getSeconds(),
     e.getMilliseconds()
   )
-), Ui = { type: "year", dateFormat: "yyyy" };
-class Ki extends ce {
+), Ki = { type: "year", dateFormat: "yyyy" };
+class Xi extends ce {
   dependencies(t) {
     return [t];
   }
   run(t) {
-    const n = t._metadata?.parsingLocale ?? fn, r = {}, s = qi(t), o = Xi(t);
+    const n = t._metadata?.parsingLocale ?? fn, r = {}, s = Qi(t), o = ji(t);
     for (const [a, i] of t.columns.entries()) {
       if (i._metadata?.isHidden) continue;
       const c = s.get(i.key);
       if (Ke(c)) continue;
-      const l = a === o ? Ui : $i(c, n), u = Cs(l);
-      r[i.key] = ji(i.key, t.rows, l, u, n);
+      const l = a === o ? Ki : Bi(c, n), u = Cs(l);
+      r[i.key] = qi(i.key, t.rows, l, u, n);
     }
     return new E(r);
   }
 }
-const Xi = (e) => {
-  const t = Qi(e.rows, 5);
+const ji = (e) => {
+  const t = Zi(e.rows, 5);
   return e.columns.findIndex((n) => {
     const r = t.map((s) => s[n.key]).filter((s) => !Ke(s));
-    return r.length >= 2 && r.every(_i);
+    return r.length >= 2 && r.every(Ri);
   });
-}, ji = (e, t, n, r, s) => {
+}, qi = (e, t, n, r, s) => {
   const o = new Ls(), a = t.reduce((i, c) => {
     if (Vs(c)) return i;
-    const l = zi(c[e], n, s);
+    const l = Gi(c[e], n, s);
     return Is(n) && O(l) ? i.push(o.incrementYearIfNeeded(l)) : i.push(l), i;
   }, []);
   return { type: r, values: a, valueFormat: n };
-}, qi = (e) => {
+}, Qi = (e) => {
   const t = /* @__PURE__ */ new Map(), n = new Set(e.columns.map((r) => r.key));
   for (const r of e.rows) {
     for (const s of n) {
@@ -1388,14 +1388,14 @@ const Xi = (e) => {
       break;
   }
   return t;
-}, Qi = (e, t) => {
+}, Zi = (e, t) => {
   const n = [];
   for (const r of e)
     if (Vs(r) || n.push(r), n.length === t)
       return n;
   return n;
 };
-class Zi {
+class Ji {
   constructor(t) {
     this.registry = t;
   }
@@ -1412,7 +1412,7 @@ const bn = (e, t) => {
   const n = v(t.x);
   return !n || !["numeric", "temporal"].includes(e.getType(n)) ? e : e.orderBy(n, "asc");
 };
-class Ji extends je {
+class ec extends je {
   constructor() {
     super(...arguments), this.type = "area", this.requiredAesthetics = ["x", "y"];
   }
@@ -1424,8 +1424,8 @@ class Ji extends je {
     return { data: t, mapping: {} };
   }
 }
-const Us = 0.7, ec = 0.1;
-class tc extends je {
+const Us = 0.7, tc = 0.1;
+class nc extends je {
   constructor() {
     super(...arguments), this.type = "bar";
   }
@@ -1438,7 +1438,7 @@ class tc extends je {
     return t = t.addConstantVariable(f.xMin, "numeric", -r).addConstantVariable(f.xMax, "numeric", r), { data: t, mapping: {} };
   }
 }
-class nc extends je {
+class rc extends je {
   constructor() {
     super(...arguments), this.type = "line", this.requiredAesthetics = ["x", "y"];
   }
@@ -1446,7 +1446,7 @@ class nc extends je {
     return { data: bn(t.data, t.mapping), mapping: {} };
   }
 }
-class rc extends je {
+class sc extends je {
   constructor() {
     super(...arguments), this.type = "point", this.requiredAesthetics = ["x", "y"];
   }
@@ -1454,7 +1454,7 @@ class rc extends je {
     return { data: t, mapping: {} };
   }
 }
-class sc extends je {
+class oc extends je {
   constructor() {
     super(...arguments), this.type = "rule";
   }
@@ -1474,13 +1474,13 @@ const Er = (e, t) => {
   const n = ae(e);
   if (I(n)) return { value: n, sourceFormat: void 0 };
   const r = v(e);
-  if (r === null || !Da(r) || !t.hasVariable(r)) return null;
+  if (r === null || !Fa(r) || !t.hasVariable(r)) return null;
   const [s] = t.getValues(r);
   return I(s) ? { value: s, sourceFormat: t.getValueFormat(r) } : null;
 };
-class oc extends Ce {
+class ac extends Ce {
   constructor() {
-    super("geom"), this.register("bar", new tc()), this.register("point", new rc()), this.register("line", new nc()), this.register("area", new Ji()), this.register("rule", new sc());
+    super("geom"), this.register("bar", new nc()), this.register("point", new sc()), this.register("line", new rc()), this.register("area", new ec()), this.register("rule", new oc());
   }
 }
 const vn = (e, t) => {
@@ -1499,7 +1499,7 @@ const vn = (e, t) => {
   }
   return [...r];
 };
-class ac {
+class ic {
   compute({ data: t, mapping: n }) {
     const r = vn(t, n);
     if (r.length === 0)
@@ -1520,20 +1520,20 @@ const Ks = /* @__PURE__ */ new Set([
   "alpha",
   "strokeWidth",
   "lineType"
-]), Et = (e) => Ks.has(e), ic = (e) => xn.has(e), cc = (e) => Et(e) || ic(e);
+]), Et = (e) => Ks.has(e), cc = (e) => xn.has(e), lc = (e) => Et(e) || cc(e);
 function qe(e) {
   return e === "secondary" ? "ySecondary" : "y";
 }
 function Z(e) {
   return e === "ySecondary" ? "y" : e;
 }
-const lc = (e) => {
+const uc = (e) => {
   if (e === void 0) return {};
   const t = {};
   for (const n of e.columns)
     n.label !== void 0 && (t[n.key] = n.label);
   return t;
-}, uc = (e, t, n) => {
+}, dc = (e, t, n) => {
   const r = fe(t, "color");
   return r === null ? {} : (e?.columns ?? []).some((a) => a.key === r) ? {} : n;
 };
@@ -1545,7 +1545,7 @@ function fe(e, t) {
   }
   return null;
 }
-const Sn = (e, t) => e === null ? null : t[e] ?? e, dc = (e, t) => e === null ? null : t[String(e)] ?? null, he = ({
+const Sn = (e, t) => e === null ? null : t[e] ?? e, pc = (e, t) => e === null ? null : t[String(e)] ?? null, he = ({
   layers: e,
   scaleType: t,
   variableName: n
@@ -1554,10 +1554,10 @@ const Sn = (e, t) => e === null ? null : t[e] ?? e, dc = (e, t) => e === null ?
   for (const r of e) {
     if (!r.data.hasVariable(n)) continue;
     const s = r.data.getValueFormat(n), o = s.type === "lookup" ? s.fallback : s;
-    return mc(o, t) ? o : $t(t);
+    return fc(o, t) ? o : $t(t);
   }
   return $t(t);
-}, pc = (e, t) => t !== "y" && t !== "ySecondary" ? !1 : Xs(t, e).some((n) => n.position === "fill");
+}, mc = (e, t) => t !== "y" && t !== "ySecondary" ? !1 : Xs(t, e).some((n) => n.position === "fill");
 function Xs(e, t) {
   return e === "ySecondary" ? t.filter((n) => n.yScaleType === "secondary") : e === "y" ? t.filter((n) => n.yScaleType === "primary") : t;
 }
@@ -1572,7 +1572,7 @@ const $t = (e) => {
     case "identity":
       return { type: "text" };
   }
-}, mc = (e, t) => {
+}, fc = (e, t) => {
   switch (t) {
     case "continuous":
       return Es(e);
@@ -1583,7 +1583,7 @@ const $t = (e) => {
     case "identity":
       return !0;
   }
-}, fc = [
+}, hc = [
   { unit: "year", step: 1e3 },
   { unit: "year", step: 100 },
   { unit: "year", step: 50 },
@@ -1610,16 +1610,16 @@ const $t = (e) => {
   week: 3,
   day: 4,
   hour: 5
-}, ve = 40, hc = (e, t, n) => {
+}, ve = 40, yc = (e, t, n) => {
   const r = n.unit === "quarter" ? n.step * 3 : n.step;
-  return vc(n.unit).range(e, new Date(t.valueOf() + 1), r);
-}, yc = ({
+  return xc(n.unit).range(e, new Date(t.valueOf() + 1), r);
+}, gc = ({
   unit: e,
   step: t,
   start: n,
   stop: r
 }) => {
-  const s = ca(r, n);
+  const s = la(r, n);
   switch (e) {
     case "hour":
       return 24 * s / t > ve;
@@ -1634,7 +1634,7 @@ const $t = (e) => {
     case "year":
       return s / (365 * t) > ve;
   }
-}, gc = (e, t) => {
+}, bc = (e, t) => {
   const n = !Is(t);
   switch (e.unit) {
     case "year":
@@ -1650,24 +1650,24 @@ const $t = (e) => {
     case "hour":
       return n ? { type: "datetime" } : { type: "time" };
   }
-}, bc = (e, t) => {
-  const n = xc(t);
+}, vc = (e, t) => {
+  const n = Sc(t);
   return n === null ? !1 : kr[e] > kr[n];
-}, vc = (e) => {
+}, xc = (e) => {
   switch (e) {
     case "hour":
-      return ia;
+      return ca;
     case "day":
-      return aa;
+      return ia;
     case "week":
-      return oa;
+      return aa;
     case "month":
     case "quarter":
-      return sa;
+      return oa;
     case "year":
-      return ra;
+      return sa;
   }
-}, xc = (e) => {
+}, Sc = (e) => {
   switch (e.type) {
     case "year":
       return "year";
@@ -1693,24 +1693,24 @@ const $t = (e) => {
   right: "left",
   top: "bottom",
   bottom: "top"
-}, Sc = { x: !0, y: !0, ySecondary: !1 }, wc = {
+}, wc = { x: !0, y: !0, ySecondary: !1 }, Ac = {
   bar: {
     cartesian: { hideGridX: !0 },
     flip: { hideGridX: !0 },
     polar: { hideGridX: !0, hideGridY: !0 }
   }
-}, Ac = 20, Ir = /* @__PURE__ */ new Set(["top", "bottom"]), Tc = { type: "percentage" };
-function Mc(e, t) {
+}, Tc = 20, Ir = /* @__PURE__ */ new Set(["top", "bottom"]), Mc = { type: "percentage" };
+function Lc(e, t) {
   const { scales: n, config: r, layers: s, coordSystem: o, variableLabels: a } = e;
   if (o.type === "polar") return [];
-  const i = Vc(s, o.type, r), c = new Set(t.map((d) => d.position)), l = kc(
+  const i = Ec(s, o.type, r), c = new Set(t.map((d) => d.position)), l = Ic(
     qs(r.axes.y.position, o.axisMapping.y.position),
     c
   ), u = [];
   for (const d of Ks) {
     const p = n[d];
     if (!h(p) || p.kind !== "position") continue;
-    const m = Lc({
+    const m = Vc({
       scaleAestheticKey: d,
       scale: p,
       config: r,
@@ -1724,26 +1724,26 @@ function Mc(e, t) {
   }
   return u;
 }
-function Lc(e) {
-  const { scaleAestheticKey: t, scale: n, config: r, layers: s, axisMapping: o, resolvedYPosition: a, gridOverrides: i, variableLabels: c } = e, l = Z(t), { axisConfig: u, position: d } = Ec(t, r, o, a), p = fe(s, t), m = pc(s, t) ? Tc : he({ layers: s, scaleType: n.spec.scaleType, variableName: p }), y = Sn(p, c);
+function Vc(e) {
+  const { scaleAestheticKey: t, scale: n, config: r, layers: s, axisMapping: o, resolvedYPosition: a, gridOverrides: i, variableLabels: c } = e, l = Z(t), { axisConfig: u, position: d } = kc(t, r, o, a), p = fe(s, t), m = mc(s, t) ? Mc : he({ layers: s, scaleType: n.spec.scaleType, variableName: p }), y = Sn(p, c);
   return {
     scaleAestheticKey: t,
     aesthetic: l,
     position: d,
     label: u.label ?? y,
     isVisible: u.isVisible,
-    tickCandidates: Cc(n, m),
+    tickCandidates: Dc(n, m),
     valueFormat: m,
     tickMode: u.ticks.mode,
     ticksVisible: u.ticks.isVisible,
-    gridVisible: Ic(u, i, t),
+    gridVisible: Cc(u, i, t),
     scaleType: n.spec.scaleType,
     bandwidth: n.bandwidth ?? void 0
   };
 }
-function Vc(e, t, n) {
+function Ec(e, t, n) {
   const r = e.flatMap((i) => {
-    const c = wc[i.geom]?.[t];
+    const c = Ac[i.geom]?.[t];
     return c ? [c] : [];
   }), s = r.some((i) => i.hideGridX), o = r.some((i) => i.hideGridY), a = r.some((i) => i.hideBorder);
   return {
@@ -1756,7 +1756,7 @@ function Cr(e, t) {
   if (e && t === null)
     return !1;
 }
-function Ec(e, t, n, r) {
+function kc(e, t, n, r) {
   switch (e) {
     case "x":
       return {
@@ -1789,24 +1789,24 @@ function Ec(e, t, n, r) {
 function qs(e, t) {
   return Ir.has(e) === Ir.has(t) ? e : t;
 }
-function kc(e, t) {
+function Ic(e, t) {
   return t.has(e) ? js[e] : e;
 }
-function Ic(e, t, n) {
+function Cc(e, t, n) {
   const { gridVisible: r } = n === "x" ? t.x : t.y;
-  return r ?? e.grid.isVisible ?? Sc[n];
+  return r ?? e.grid.isVisible ?? wc[n];
 }
-const Cc = (e, t) => {
+const Dc = (e, t) => {
   if (e.spec.scaleType === "continuous") {
     const r = /* @__PURE__ */ new Set(), s = [];
-    for (let o = 1; o <= Ac; o++) {
+    for (let o = 1; o <= Tc; o++) {
       const a = e.generateTicks({ count: o }), i = V(a);
       r.has(i) || (r.add(i), s.push({ ticks: a.map((c) => xt(e, c)) }));
     }
     return s;
   }
-  return e.spec.scaleType === "datetime" ? Dc(e, t) : [{ ticks: e.generateTicks().map((r) => xt(e, r)) }];
-}, Dc = (e, t) => {
+  return e.spec.scaleType === "datetime" ? Fc(e, t) : [{ ticks: e.generateTicks().map((r) => xt(e, r)) }];
+}, Fc = (e, t) => {
   const [n, r] = e.domain;
   if (!O(n) || !O(r))
     return [{ ticks: e.generateTicks().map((c) => xt(e, c)) }];
@@ -1818,8 +1818,8 @@ const Cc = (e, t) => {
       valueFormat: c
     }));
   };
-  for (const i of fc)
-    yc({ ...i, start: n, stop: r }) || bc(i.unit, t) || a(e.generateTicks({ interval: i }), gc(i, t));
+  for (const i of hc)
+    gc({ ...i, start: n, stop: r }) || vc(i.unit, t) || a(e.generateTicks({ interval: i }), bc(i, t));
   return a(e.generateTicks({ atInputs: !0 })), o.sort((i, c) => i.ticks.length - c.ticks.length), o;
 }, xt = (e, t) => ({ value: t, position: e.map(t) });
 function St(e, t) {
@@ -1842,14 +1842,14 @@ function Qs({
   layers: n,
   coordSystem: r
 }) {
-  const s = Fc({ layers: n, coordSystem: r, aesthetics: t }), o = Zs({ layers: n, aesthetics: t });
+  const s = _c({ layers: n, coordSystem: r, aesthetics: t }), o = Zs({ layers: n, aesthetics: t });
   return e.domain.map((a) => ({
     value: a,
     swatchShape: s(a),
     owner: o(a)
   }));
 }
-function Fc({
+function _c({
   layers: e,
   coordSystem: t,
   aesthetics: n
@@ -1884,7 +1884,7 @@ const wn = (e) => {
   const t = e.spec.scaleType;
   return t !== "continuous" && t !== "datetime";
 };
-function _c({ scales: e, layers: t, coordSystem: n, valueLabels: r }) {
+function Rc({ scales: e, layers: t, coordSystem: n, valueLabels: r }) {
   const s = e.color;
   if (s === void 0 || !wn(s)) return [];
   if (!t.some((u) => h(u.mapping.color))) return [];
@@ -1892,8 +1892,8 @@ function _c({ scales: e, layers: t, coordSystem: n, valueLabels: r }) {
   if (Js({
     colorVariableName: o,
     xVariableName: fe(t, "x"),
-    mapsColorAcrossMultipleLayers: Nc(t) > 1,
-    isMergedWithAnotherAesthetic: Rc(e, t, o)
+    mapsColorAcrossMultipleLayers: Pc(t) > 1,
+    isMergedWithAnotherAesthetic: Nc(e, t, o)
   })) return [];
   const i = s.spec.scaleType, c = t.findIndex((u) => h(u.mapping.color));
   return Qs({ scale: s, aesthetics: ["color"], layers: t, coordSystem: n }).map(({ value: u, swatchShape: d, owner: p }) => {
@@ -1908,7 +1908,7 @@ function _c({ scales: e, layers: t, coordSystem: n, valueLabels: r }) {
         scaleType: i,
         variableName: g
       }),
-      label: dc(u, r)
+      label: pc(u, r)
     };
   });
 }
@@ -1917,8 +1917,8 @@ const Js = ({
   xVariableName: t,
   mapsColorAcrossMultipleLayers: n,
   isMergedWithAnotherAesthetic: r
-}) => r ? !1 : e === null || Ca(e) ? !n : t !== null && e === t;
-function Rc(e, t, n) {
+}) => r ? !1 : e === null || Da(e) ? !n : t !== null && e === t;
+function Nc(e, t, n) {
   if (n === null) return !1;
   for (const r of xn) {
     if (r === "color") continue;
@@ -1928,8 +1928,8 @@ function Rc(e, t, n) {
   }
   return !1;
 }
-const Nc = (e) => e.filter((t) => h(t.mapping.color)).length, eo = ["bar", "line", "area", "point"];
-function Pc(e, t, n) {
+const Pc = (e) => e.filter((t) => h(t.mapping.color)).length, eo = ["bar", "line", "area", "point"];
+function Oc(e, t, n) {
   const r = t.findIndex((s) => eo.includes(s.geom));
   if (r === -1) return [];
   if (e.length < 2) {
@@ -1957,7 +1957,7 @@ function Dr(e, t, n) {
   const r = V(n);
   return e.filter((s, o) => V(t[o] ?? null) === r);
 }
-const Oc = (e, t) => {
+const $c = (e, t) => {
   switch (t) {
     case "total": {
       const { sum: n, count: r } = Fr(e);
@@ -1970,7 +1970,7 @@ const Oc = (e, t) => {
     case "current":
       return e.at(-1) ?? null;
   }
-}, $c = (e, t) => {
+}, Bc = (e, t) => {
   if (e.length < 2) return null;
   const n = e.at(-1), r = t === "previous" ? e.at(-2) : e.at(0);
   return n === void 0 || r === void 0 || n.cross === null || r.cross === null || r.cross === 0 ? null : {
@@ -1984,11 +1984,11 @@ const Oc = (e, t) => {
   },
   { sum: 0, count: 0 }
 );
-function Bc(e) {
+function zc(e) {
   const { config: t, coordSystem: n } = e, r = t.headline.show;
-  return r === "none" || r === "conversion" ? null : n.type === "polar" ? zc(e, r) : Gc(e, r);
+  return r === "none" || r === "conversion" ? null : n.type === "polar" ? Gc(e, r) : Wc(e, r);
 }
-function zc(e, t) {
+function Gc(e, t) {
   if (t !== "total") return null;
   const { scales: n, layers: r } = e, s = r.find((c) => c.geom === "bar");
   if (s === void 0) return null;
@@ -2003,15 +2003,15 @@ function zc(e, t) {
   });
   return { kind: "grandTotal", value: o, valueFormat: i };
 }
-function Gc(e, t) {
+function Wc(e, t) {
   const { config: n, scales: r, layers: s, variableLabels: o, colorGroups: a } = e;
   if (!s.some((l) => eo.includes(l.geom))) return null;
-  const i = Pc(a, s, o);
+  const i = Oc(a, s, o);
   if (i.length === 0) return null;
-  const c = i.map((l) => Wc({ group: l, show: t, compareWith: n.headline.compareWith, layers: s, scales: r })).filter((l) => l !== null);
+  const c = i.map((l) => Yc({ group: l, show: t, compareWith: n.headline.compareWith, layers: s, scales: r })).filter((l) => l !== null);
   return c.length === 0 ? null : { kind: "perGroup", items: c };
 }
-function Wc({ group: e, show: t, compareWith: n, layers: r, scales: s }) {
+function Yc({ group: e, show: t, compareWith: n, layers: r, scales: s }) {
   const o = r[e.layerIndex];
   if (o === void 0) return null;
   const a = v(o.mapping.y);
@@ -2020,24 +2020,24 @@ function Wc({ group: e, show: t, compareWith: n, layers: r, scales: s }) {
     layers: [o],
     scaleType: l?.spec.scaleType ?? "continuous",
     variableName: a
-  }), d = Uc(o.data, i), p = he({
+  }), d = Kc(o.data, i), p = he({
     layers: [o],
     scaleType: d ? "datetime" : s.x?.spec.scaleType ?? "discrete",
     variableName: i
-  }), m = Kc(o.data, i), y = m.getValues(a, { type: "numeric" }), g = i !== null ? m.getValues(i) : [], b = c !== null ? m.getValues(c) : null, x = Dr(y, b, e.value), S = Dr(g, b, e.value);
+  }), m = Xc(o.data, i), y = m.getValues(a, { type: "numeric" }), g = i !== null ? m.getValues(i) : [], b = c !== null ? m.getValues(c) : null, x = Dr(y, b, e.value), S = Dr(g, b, e.value);
   return {
     value: e.value,
     swatch: e.swatch,
-    aggregate: Oc(x, t),
+    aggregate: $c(x, t),
     valueFormat: u,
     groupLabelFormat: e.groupLabelFormat,
     mainValueFormat: p,
     label: e.label,
-    observationLabel: Yc(t, d, S),
-    comparison: Hc(t, n, d, S, x)
+    observationLabel: Hc(t, d, S),
+    comparison: Uc(t, n, d, S, x)
   };
 }
-function Yc(e, t, n) {
+function Hc(e, t, n) {
   if (e === "current") {
     const o = n.at(-1);
     return o === void 0 ? null : { kind: "point", value: o };
@@ -2046,26 +2046,26 @@ function Yc(e, t, n) {
   const r = n.at(0), s = n.at(-1);
   return r === void 0 || s === void 0 ? null : { kind: "range", from: r, to: s };
 }
-function Hc(e, t, n, r, s) {
+function Uc(e, t, n, r, s) {
   if (e !== "current" || !n) return null;
   const o = t === "none" ? "first" : t, a = r.map((i, c) => ({ main: i, cross: s[c] ?? null }));
-  return $c(a, o);
+  return Bc(a, o);
 }
-function Uc(e, t) {
+function Kc(e, t) {
   return t !== null && e.hasVariable(t) && e.getType(t) === "temporal";
 }
-function Kc(e, t) {
+function Xc(e, t) {
   return t === null || !["numeric", "temporal"].includes(e.getType(t)) ? e : e.orderBy(t);
 }
 function J(e) {
   return e === "stack" || e === "fill";
 }
-const Xc = 3, jc = {
+const jc = 3, qc = {
   line: { stack: !0, dodge: !0, identity: !0, fill: !0 },
   area: { stack: !0, dodge: !0, identity: !0, fill: !0 },
   bar: { stack: !0, fill: !0 }
 };
-function qc({
+function Qc({
   scales: e,
   config: t,
   layers: n,
@@ -2074,25 +2074,25 @@ function qc({
   colorGroups: o
 }) {
   if (t.legend.position === "none") return [];
-  const a = new Map(o.map((g) => [V(g.value), g])), i = Jc({ scales: e, layers: n }), c = rl(i), l = fe(n, "x"), u = c.map((g) => {
-    if (tl(g, l, n)) return null;
-    const b = ol({ group: g, variableLabels: s, layers: n, coordSystem: r, colorGroupsByValue: a });
+  const a = new Map(o.map((g) => [V(g.value), g])), i = el({ scales: e, layers: n }), c = sl(i), l = fe(n, "x"), u = c.map((g) => {
+    if (nl(g, l, n)) return null;
+    const b = al({ group: g, variableLabels: s, layers: n, coordSystem: r, colorGroupsByValue: a });
     return b.items.length === 0 ? null : { group: g, built: b };
   }).filter(h);
   if (u.length === 0) return [];
-  const d = Qc(u);
-  if (t.legend.position === "auto" && ul(d, n, r))
+  const d = Zc(u);
+  if (t.legend.position === "auto" && dl(d, n, r))
     return [];
-  const p = dl(t.legend.position, d, n, r), m = ml(t.legend.display, p, n, r), y = m === "direct" ? yl(n) : null;
-  return u.map(({ built: g }) => Zc(g, p, m, y));
+  const p = pl(t.legend.position, d, n, r), m = fl(t.legend.display, p, n, r), y = m === "direct" ? gl(n) : null;
+  return u.map(({ built: g }) => Jc(g, p, m, y));
 }
-function Qc(e) {
+function Zc(e) {
   return e.reduce((t, { group: n, built: r }) => {
     const s = n.some((o) => o.guideType !== "discrete");
     return t + (s ? 1 : r.items.length);
   }, 0);
 }
-function Zc(e, t, n, r) {
+function Jc(e, t, n, r) {
   return n !== "direct" || r === null ? { ...e, position: t, display: n } : {
     ...e,
     position: t,
@@ -2103,42 +2103,42 @@ function Zc(e, t, n, r) {
     }))
   };
 }
-function Jc(e) {
+function el(e) {
   const { scales: t, layers: n } = e, r = [];
   for (const s of xn) {
     const o = t[s];
-    if (o === void 0 || o.kind === "identity" || !el(s, n)) continue;
-    const a = fe(n, s), i = hl(s, o);
+    if (o === void 0 || o.kind === "identity" || !tl(s, n)) continue;
+    const a = fe(n, s), i = yl(s, o);
     r.push({ scaleAestheticKey: s, scale: o, variableName: a, guideType: i });
   }
   return r;
 }
-function el(e, t) {
+function tl(e, t) {
   const n = Z(e);
   return t.some((r) => h(r.mapping[n]));
 }
-function tl(e, t, n) {
+function nl(e, t, n) {
   const [r] = e;
   return r.scaleAestheticKey !== "color" ? !1 : Js({
     colorVariableName: r.variableName,
     xVariableName: t,
-    mapsColorAcrossMultipleLayers: nl(r.scaleAestheticKey, n),
+    mapsColorAcrossMultipleLayers: rl(r.scaleAestheticKey, n),
     isMergedWithAnotherAesthetic: e.length > 1
   });
 }
-function nl(e, t) {
+function rl(e, t) {
   const n = Z(e);
   return t.filter((r) => h(r.mapping[n])).length > 1;
 }
-function rl(e) {
+function sl(e) {
   const t = /* @__PURE__ */ new Map();
   for (const n of e) {
-    const r = fl(n), s = t.get(r);
+    const r = hl(n), s = t.get(r);
     s ? s.push(n) : t.set(r, [n]);
   }
   return [...t.values()];
 }
-function sl(e, t, n) {
+function ol(e, t, n) {
   if (t === "lineType") {
     e.lineType = n;
     return;
@@ -2149,7 +2149,7 @@ function sl(e, t, n) {
   }
   e[t] = n;
 }
-function ol({
+function al({
   group: e,
   variableLabels: t,
   layers: n,
@@ -2164,37 +2164,37 @@ function ol({
   return {
     aesthetics: e.map((u) => u.scaleAestheticKey),
     title: c,
-    items: i.map((u) => al(u, e, a, l, s))
+    items: i.map((u) => il(u, e, a, l, s))
   };
 }
-function al(e, t, n, r, s) {
+function il(e, t, n, r, s) {
   const o = {};
   for (const i of t)
-    sl(o, i.scaleAestheticKey, i.scale.map(e.value));
-  const a = cl(e, t, n, r, s);
+    ol(o, i.scaleAestheticKey, i.scale.map(e.value));
+  const a = ll(e, t, n, r, s);
   return {
     value: e.value,
-    label: il(t, e, s),
+    label: cl(t, e, s),
     visual: o,
     normalizedY: null,
     swatchShape: e.swatchShape,
     valueFormat: a
   };
 }
-function il(e, t, n) {
+function cl(e, t, n) {
   return e[0].scaleAestheticKey !== "color" ? null : n.get(V(t.value))?.label ?? null;
 }
-function cl(e, t, n, r, s) {
+function ll(e, t, n, r, s) {
   if (t[0].scaleAestheticKey === "color")
     return s.get(V(e.value))?.valueFormat ?? r;
-  const o = e.owner?.layer, a = ll(o, n);
+  const o = e.owner?.layer, a = ul(o, n);
   return o === void 0 || a === null ? r : he({
     layers: [o],
     scaleType: t[0].scale.spec.scaleType,
     variableName: a
   });
 }
-function ll(e, t) {
+function ul(e, t) {
   if (e === void 0) return null;
   for (const n of t) {
     const r = e.mapping[n];
@@ -2204,23 +2204,23 @@ function ll(e, t) {
   }
   return null;
 }
-function ul(e, t, n) {
+function dl(e, t, n) {
   if (e > 1) return !1;
   const r = n.type === "polar";
   return mt(t, ["line", "area", "bar"]) || r;
 }
-function dl(e, t, n, r) {
+function pl(e, t, n, r) {
   if (e !== "auto") return e;
   if (r.type === "polar") return "top";
-  const s = mt(n, ["line", "area"]), o = mt(n, ["bar"]), a = mt(n, ["bar"], (c) => J(c.position)), i = t >= Xc;
+  const s = mt(n, ["line", "area"]), o = mt(n, ["bar"]), a = mt(n, ["bar"], (c) => J(c.position)), i = t >= jc;
   return s && o ? "top" : s ? i ? "right" : "top" : a ? to(r) ? "top" : i ? "right" : "top" : "top";
 }
-function pl(e) {
+function ml(e) {
   if (e.length !== 1) return !1;
   const t = e[0];
-  return t ? jc[t.geom]?.[t.position] === !0 : !1;
+  return t ? qc[t.geom]?.[t.position] === !0 : !1;
 }
-function ml(e, t, n, r) {
+function fl(e, t, n, r) {
   if (!(t === "right" && !to(r))) return "pill";
   switch (e) {
     case "pill":
@@ -2228,7 +2228,7 @@ function ml(e, t, n, r) {
     case "direct":
       return "direct";
     case "auto":
-      return pl(n) ? "direct" : "pill";
+      return ml(n) ? "direct" : "pill";
   }
 }
 function to(e) {
@@ -2237,14 +2237,14 @@ function to(e) {
 function mt(e, t, n) {
   return e.some((r) => t.includes(r.geom) && (n?.(r) ?? !0));
 }
-function fl(e) {
+function hl(e) {
   const t = e.scale.domain.map(V);
   return JSON.stringify([e.variableName, e.guideType, ...t]);
 }
-function hl(e, t) {
+function yl(e, t) {
   return wn(t) ? "discrete" : `continuous:${e}`;
 }
-function yl(e) {
+function gl(e) {
   const t = e[0];
   if (!t) return /* @__PURE__ */ new Map();
   const n = /* @__PURE__ */ new Map();
@@ -2261,7 +2261,7 @@ function yl(e) {
     n.set(String(o), c);
   }), n;
 }
-class gl extends ce {
+class bl extends ce {
   dependencies(t) {
     return [
       t.scales,
@@ -2275,11 +2275,11 @@ class gl extends ce {
     ];
   }
   run(t) {
-    const n = lc(t.originalData), r = _c({
+    const n = uc(t.originalData), r = Rc({
       scales: t.scales,
       layers: t.layers,
       coordSystem: t.coordSystem,
-      valueLabels: uc(t.originalData, t.layers, n)
+      valueLabels: dc(t.originalData, t.layers, n)
     }), s = {
       scales: t.scales,
       config: t.config,
@@ -2287,9 +2287,9 @@ class gl extends ce {
       coordSystem: t.coordSystem,
       variableLabels: n,
       colorGroups: r
-    }, o = Bc(s), a = bl(o, qc(s));
+    }, o = zc(s), a = vl(o, Qc(s));
     return {
-      axes: Mc(s, a),
+      axes: Lc(s, a),
       legends: a,
       headline: o,
       panel: { border: { isVisible: t.config.panel.border.isVisible } },
@@ -2297,7 +2297,7 @@ class gl extends ce {
     };
   }
 }
-const bl = (e, t) => e?.kind !== "perGroup" || t.some((r) => r.display === "direct") ? t : [], vl = (e) => V([ke(e)]), An = (e, t) => {
+const vl = (e, t) => e?.kind !== "perGroup" || t.some((r) => r.display === "direct") ? t : [], xl = (e) => V([ke(e)]), An = (e, t) => {
   const n = t !== null ? e[t] ?? null : null;
   return V([n]);
 }, ee = (e, t) => {
@@ -2318,14 +2318,14 @@ const bl = (e, t) => e?.kind !== "perGroup" || t.some((r) => r.display === "dire
         return null;
     }
   } : () => null;
-}, Tn = (e, t) => ee(e, t.x), xl = (e, t) => ee(e, t.y), ng = (e, t) => ee(e, t.label), Sl = (e, t) => ee(e, t.color), rg = (e, t) => ee(e, t.size), sg = (e, t) => ee(e, t.alpha), og = (e, t) => ee(e, t.group), ag = (e, t) => ee(e, t.strokeWidth), _r = { variable: f.yRaw };
+}, Tn = (e, t) => ee(e, t.x), Sl = (e, t) => ee(e, t.y), ng = (e, t) => ee(e, t.label), wl = (e, t) => ee(e, t.color), rg = (e, t) => ee(e, t.size), sg = (e, t) => ee(e, t.alpha), og = (e, t) => ee(e, t.group), ag = (e, t) => ee(e, t.strokeWidth), _r = { variable: f.yRaw };
 function Mn(e, t) {
   return J(e) ? _r : t.y ?? _r;
 }
 function Ln(e) {
   return ee(e.data, Mn(e.position, e.mapping));
 }
-const wl = ["lt", "lte", "gt", "gte", "range"];
+const Al = ["lt", "lte", "gt", "gte", "range"];
 function ft(e, t) {
   if ("and" in e) {
     const n = e.and.map((r) => ft(r, t));
@@ -2345,7 +2345,7 @@ function ft(e, t) {
     const n = ft(e.not, t);
     return (r) => !n(r);
   }
-  return Al(e, t);
+  return Tl(e, t);
 }
 function ht(e, t) {
   if ("and" in e) {
@@ -2360,14 +2360,14 @@ function ht(e, t) {
     ht(e.not, t);
     return;
   }
-  const n = Tl(e);
+  const n = Ml(e);
   if (n !== null && t.hasVariable(e.variable) && t.getType(e.variable) === "categorical")
     throw new Error(
       `Highlight predicate uses ordering operator '${n}' on categorical variable '${e.variable}'. Use 'eq' or 'oneOf' instead.`
     );
 }
 const Rr = () => !1;
-function Al(e, t) {
+function Tl(e, t) {
   if (!t.hasVariable(e.variable)) return Rr;
   const n = t.getType(e.variable);
   if ("eq" in e) {
@@ -2413,8 +2413,8 @@ function Al(e, t) {
   }
   return Rr;
 }
-function Tl(e) {
-  for (const t of wl)
+function Ml(e) {
+  for (const t of Al)
     if (t in e) return t;
   return null;
 }
@@ -2432,21 +2432,21 @@ function Nr(e, t) {
 function oe(e, t, n) {
   return t !== "temporal" || !Ue(e) ? e : gn(e, void 0, n);
 }
-const Ml = {
+const Ll = {
   bar: "observation-rerender",
   rule: null,
   line: "overlay-anchor",
   area: "overlay-anchor",
   point: "overlay-anchor"
 };
-function Ll(e) {
-  const t = Ml[e];
+function Vl(e) {
+  const t = Ll[e];
   return t === null ? null : { strategy: t, composition: no() };
 }
 function no() {
   return { isDimmed: !1, matchedLayer: null, overlayCandidates: [] };
 }
-class Vl extends Ie {
+class El extends Ie {
   dependencies(t) {
     return [t.highlights, t.config.parsingLocale];
   }
@@ -2455,7 +2455,7 @@ class Vl extends Ie {
     if (r === null) return t;
     const s = n.highlights.filter(({ layerId: a }) => a === void 0 || a === t.id);
     if (s.length === 0) return t;
-    const o = El({
+    const o = kl({
       layer: t,
       highlights: s,
       parsingLocale: n.config.parsingLocale,
@@ -2464,7 +2464,7 @@ class Vl extends Ie {
     return { ...t, highlight: { ...r, composition: o } };
   }
 }
-function El({
+function kl({
   layer: e,
   highlights: t,
   parsingLocale: n,
@@ -2472,7 +2472,7 @@ function El({
 }) {
   for (const T of t)
     ht(T.predicate, e.data);
-  const s = v(e.mapping.x), o = kl(e, n), a = t.map(
+  const s = v(e.mapping.x), o = Il(e, n), a = t.map(
     (T) => ({
       predicate: ft(T.predicate, o),
       scope: T.scope
@@ -2481,7 +2481,7 @@ function El({
   let x = !1, S = 0;
   for (const T of e.data) {
     let te, ue;
-    d !== null && (te = vl(T), d[S] = te), p !== null && (ue = An(T, s), p[S] = ue), m !== null && (m[S] = T);
+    d !== null && (te = xl(T), d[S] = te), p !== null && (ue = An(T, s), p[S] = ue), m !== null && (m[S] = T);
     for (const { predicate: nt, scope: rt } of a)
       if (nt(T))
         switch (rt) {
@@ -2515,7 +2515,7 @@ function El({
   const X = $ > 0 ? { ...e, data: e.data.filterByMask(w) } : null;
   return { isDimmed: (r === "observation-rerender" || g.size > 0) && X !== null, matchedLayer: X, overlayCandidates: k };
 }
-function kl(e, t) {
+function Il(e, t) {
   const n = v(e.mapping.y), r = Ln(e);
   return {
     hasVariable: (s) => e.data.hasVariable(s),
@@ -2524,7 +2524,7 @@ function kl(e, t) {
     parsingLocale: t
   };
 }
-class Il extends Ie {
+class Cl extends Ie {
   constructor(t, n, r, s, o) {
     super(), this.transformCompiler = t, this.statCompiler = n, this.groupCompiler = r, this.geomCompiler = s, this.positionAdjusterCompiler = o;
   }
@@ -2568,7 +2568,7 @@ class Il extends Ie {
       interactive: t.interactive,
       dataLabels: t.dataLabels,
       summary: {},
-      highlight: Ll(t.geom)
+      highlight: Vl(t.geom)
     };
   }
 }
@@ -2583,7 +2583,7 @@ class ro extends Error {
 ${n}`), this.issues = t, this.name = "SpecValidationError";
   }
 }
-class Cl {
+class Dl {
   constructor(t, n) {
     this.transformCompiler = t, this.validator = n;
   }
@@ -2606,7 +2606,7 @@ class Cl {
       throw new ro(n);
   }
 }
-class Dl {
+class Fl {
   constructor(t, n) {
     this.geomRegistry = t, this.statRegistry = n;
   }
@@ -2694,7 +2694,7 @@ class Dl {
     ] : [];
   }
 }
-class Fl {
+class _l {
   constructor(t) {
     this.registry = t;
   }
@@ -2704,7 +2704,7 @@ class Fl {
 }
 class kt {
 }
-class _l extends kt {
+class Rl extends kt {
   constructor() {
     super(...arguments), this.type = "dodge";
   }
@@ -2718,7 +2718,7 @@ class _l extends kt {
     });
     if (s.length === 0)
       return { data: t, mapping: {} };
-    const o = t.size(), a = t.getValues(W.group, { type: "categorical" }), i = Us / 2, c = s.length > 1 ? ec : 0, l = ys().domain(s.map(String)).range([-i, i]).paddingInner(c).paddingOuter(0), u = l.bandwidth(), d = new Array(o).fill(null), p = new Array(o).fill(null);
+    const o = t.size(), a = t.getValues(W.group, { type: "categorical" }), i = Us / 2, c = s.length > 1 ? tc : 0, l = ys().domain(s.map(String)).range([-i, i]).paddingInner(c).paddingOuter(0), u = l.bandwidth(), d = new Array(o).fill(null), p = new Array(o).fill(null);
     for (let y = 0; y < o; y++) {
       const g = a[y];
       if (!h(g)) continue;
@@ -2745,7 +2745,7 @@ const Or = A("__ungrouped__"), so = (e, t) => {
   }
   return { yValues: c, observationIndexByXAndGroup: d, uniqueGroupKeys: a, observationCount: u };
 };
-class Rl extends kt {
+class Nl extends kt {
   constructor() {
     super(...arguments), this.type = "fill";
   }
@@ -2784,7 +2784,7 @@ class Rl extends kt {
     return { data: t.addVariable(f.yMin, "numeric", l).addVariable(f.yMax, "numeric", c).addVariable(f.yRaw, "numeric", s), mapping: {} };
   }
 }
-class Nl extends kt {
+class Pl extends kt {
   constructor() {
     super(...arguments), this.type = "identity";
   }
@@ -2795,7 +2795,7 @@ class Nl extends kt {
     };
   }
 }
-class Pl extends kt {
+class Ol extends kt {
   constructor() {
     super(...arguments), this.type = "stack";
   }
@@ -2824,12 +2824,12 @@ class Pl extends kt {
     return d !== null && (u = u.addVariable(d, "numeric", c)), { data: u, mapping: {} };
   }
 }
-class Ol extends Ce {
+class $l extends Ce {
   constructor() {
-    super("position"), this.register("identity", new Nl()), this.register("stack", new Pl()), this.register("fill", new Rl()), this.register("dodge", new _l());
+    super("position"), this.register("identity", new Pl()), this.register("stack", new Ol()), this.register("fill", new Nl()), this.register("dodge", new Rl());
   }
 }
-class $l {
+class Bl {
   map({ data: t, layer: n, getPositionScale: r }) {
     const s = v(n.mapping.x), o = r("x");
     if (!s || !o) return t;
@@ -2837,7 +2837,7 @@ class $l {
     return t.addVariable(f.x, "numeric", i);
   }
 }
-class Bl {
+class zl {
   map({ data: t, getPositionScale: n }) {
     const r = n("x");
     if (!r?.bandwidth || !t.hasVariable(f.x) || !t.hasVariable(f.xMin) || !t.hasVariable(f.xMax))
@@ -2850,7 +2850,7 @@ class Bl {
     return t.addVariable(f.xMin, "numeric", c).addVariable(f.xMax, "numeric", l);
   }
 }
-class zl {
+class Gl {
   map({ data: t, layer: n, getPositionScale: r }) {
     const s = v(n.mapping.y), o = qe(n.yScaleType), a = r(o);
     if (!s || !a) return t;
@@ -2858,7 +2858,7 @@ class zl {
     return t.addVariable(f.y, "numeric", c);
   }
 }
-class Gl {
+class Wl {
   map({ data: t, layer: n, getPositionScale: r }) {
     const s = qe(n.yScaleType), o = r(s);
     if (!o || !t.hasVariable(f.yMin) || !t.hasVariable(f.yMax))
@@ -2871,33 +2871,33 @@ class Gl {
     return t.addVariable(f.yMin, "numeric", l).addVariable(f.yMax, "numeric", u);
   }
 }
-const Wl = [
-  new $l(),
-  new zl(),
-  // Extent mappers must come after their primary mappers (they read the previously mapped x and y values).
+const Yl = [
   new Bl(),
-  new Gl()
+  new Gl(),
+  // Extent mappers must come after their primary mappers (they read the previously mapped x and y values).
+  new zl(),
+  new Wl()
 ];
-function Yl(e, t) {
+function Hl(e, t) {
   const n = e[t];
   return n?.kind === "position" ? n : null;
 }
-class Hl extends Ie {
-  constructor(t = Wl) {
+class Ul extends Ie {
+  constructor(t = Yl) {
     super(), this.mappers = t;
   }
   dependencies(t) {
     return [t.scales.x, t.scales.y, t.scales.ySecondary];
   }
   compileLayer(t, n) {
-    const r = (o) => Yl(n.scales, o);
+    const r = (o) => Hl(n.scales, o);
     let s = t.data;
     for (const o of this.mappers)
       s = o.map({ data: s, layer: t, getPositionScale: r });
     return { ...t, data: s };
   }
 }
-class Ul extends ce {
+class Kl extends ce {
   constructor(t) {
     super(), this.registry = t;
   }
@@ -2958,7 +2958,7 @@ class Ul extends ce {
     for (const s of t)
       for (const [o, a] of Object.entries(s.mapping)) {
         const i = o, c = i === "y" ? qe(s.yScaleType) : i;
-        if (!cc(c) || !n.has(c)) continue;
+        if (!lc(c) || !n.has(c)) continue;
         const l = this.resolveVariables(i, a, s.data);
         this.collectFromVariables(s.data, l, c, r);
       }
@@ -3006,7 +3006,7 @@ class Qe {
     };
   }
 }
-class Kl extends Qe {
+class Xl extends Qe {
   constructor() {
     super(...arguments), this.compatibleDataTypes = ["numeric"];
   }
@@ -3024,7 +3024,7 @@ class Kl extends Qe {
   }
   createD3Scale(t, n, r) {
     let s = [r.domainMin ?? t[0], r.domainMax ?? t[1]];
-    const o = r.transform === "log" && Xl(s), a = o ? la() : r.transform === "sqrt" ? ua() : da();
+    const o = r.transform === "log" && jl(s), a = o ? ua() : r.transform === "sqrt" ? da() : pa();
     return r.nice && !o && (s = a.copy().domain(s).nice().domain()), a.domain([r.domainMin ?? s[0], r.domainMax ?? s[1]]).range(n).clamp(r.clamp);
   }
   buildPositionScale(t, n) {
@@ -3045,11 +3045,11 @@ class Kl extends Qe {
     });
   }
 }
-const Xl = (e) => {
+const jl = (e) => {
   const [t, n] = e;
   return t > 0 && n > 0 || t < 0 && n < 0;
 };
-class jl extends Qe {
+class ql extends Qe {
   constructor() {
     super(...arguments), this.compatibleDataTypes = ["temporal"];
   }
@@ -3085,7 +3085,7 @@ class jl extends Qe {
     return n === 1 / 0 ? [] : [new Date(n), new Date(r)];
   }
   createD3Scale(t, n, r) {
-    const s = ql(t) ? t : [], o = pa().domain(s).range(n).clamp(r.clamp);
+    const s = Ql(t) ? t : [], o = ma().domain(s).range(n).clamp(r.clamp);
     if (r.nice && o.nice(), h(r.domainMin) || h(r.domainMax)) {
       const [a, i] = o.domain();
       a !== void 0 && i !== void 0 && o.domain([r.domainMin ?? a, r.domainMax ?? i]);
@@ -3098,11 +3098,11 @@ class jl extends Qe {
       map: o,
       domain: o.domain(),
       bandwidth: null,
-      generateTicks: (l) => l && "atInputs" in l ? c : l && "interval" in l ? a && i ? hc(a, i, l.interval) : [] : o.ticks(l?.count)
+      generateTicks: (l) => l && "atInputs" in l ? c : l && "interval" in l ? a && i ? yc(a, i, l.interval) : [] : o.ticks(l?.count)
     });
   }
 }
-const ql = (e) => e.length === 2 && O(e[0]) && O(e[1]), Se = {
+const Ql = (e) => e.length === 2 && O(e[0]) && O(e[1]), Se = {
   transform: "linear",
   reverse: !1,
   nice: !0,
@@ -3126,10 +3126,10 @@ const ql = (e) => e.length === 2 && O(e[0]) && O(e[1]), Se = {
   domain: null,
   padding: 0.1,
   reverse: !1
-}, Ql = {
+}, Zl = {
   palette: { type: "default" }
 };
-class Zl extends Qe {
+class Jl extends Qe {
   constructor() {
     super(...arguments), this.compatibleDataTypes = ["categorical", "numeric", "temporal"];
   }
@@ -3171,7 +3171,7 @@ class Zl extends Qe {
     });
   }
 }
-class Jl extends Qe {
+class eu extends Qe {
   constructor() {
     super(...arguments), this.compatibleDataTypes = ["numeric", "categorical", "temporal"];
   }
@@ -3188,7 +3188,7 @@ class Jl extends Qe {
     };
   }
 }
-const eu = ["grey", "red", "orange", "yellow", "green", "cyan", "blue", "purple", "pink"], tu = ["cyan", "pink", "purple", "red", "orange", "yellow", "green", "blue"], oo = [
+const tu = ["grey", "red", "orange", "yellow", "green", "cyan", "blue", "purple", "pink"], nu = ["cyan", "pink", "purple", "red", "orange", "yellow", "green", "blue"], oo = [
   "#B399FE",
   "#FC7E91",
   "#33B6E0",
@@ -3212,7 +3212,7 @@ const eu = ["grey", "red", "orange", "yellow", "green", "cyan", "blue", "purple"
   dark_purple: "#6D48D2",
   plum: "#C82184",
   pink: "#FC8497"
-}, nu = [
+}, ru = [
   j.purple,
   j.pink,
   j.yellow,
@@ -3233,7 +3233,7 @@ const eu = ["grey", "red", "orange", "yellow", "green", "cyan", "blue", "purple"
   red: "#FFADAD",
   orange: "#FFDEB4",
   yellow: "#FDF7C3"
-}, ru = [
+}, su = [
   U.green,
   U.purple,
   U.red,
@@ -3334,7 +3334,7 @@ const eu = ["grey", "red", "orange", "yellow", "green", "cyan", "blue", "purple"
   pink200: "#FED0F3",
   pink100: "#FFE8F9",
   pink50: "#FFF4FC"
-}, su = [
+}, ou = [
   on.grey200,
   U.green,
   U.red,
@@ -3378,7 +3378,7 @@ const eu = ["grey", "red", "orange", "yellow", "green", "cyan", "blue", "purple"
   B.yellow,
   B.green,
   B.blue
-], ou = [
+], au = [
   B.cyan,
   B.green,
   B.red,
@@ -3388,36 +3388,36 @@ const eu = ["grey", "red", "orange", "yellow", "green", "cyan", "blue", "purple"
   positive: "#84FC89",
   negative: "#FC8497",
   total: "#84D1FC"
-}, au = [
+}, iu = [
   it.start,
   it.positive,
   it.negative,
   it.total
 ];
-function iu(e, t = "light", n) {
+function cu(e, t = "light", n) {
   return ((n !== void 0 ? Br[t][n] : void 0) ?? Br[t].default).map((s) => on[`${e}${s}`]);
 }
-function cu(e) {
+function lu(e) {
   const t = at.indexOf(B[e]);
   return t <= 0 ? at : [...at.slice(t), ...at.slice(0, t)];
 }
-function lu(e, t) {
+function uu(e, t) {
   switch (e.type) {
     case "default":
       return oo;
     case "graphy":
-      return e.variant === "waterfall" ? au : nu;
+      return e.variant === "waterfall" ? iu : ru;
     case "pastel":
-      return e.variant === "waterfall" ? su : ru;
+      return e.variant === "waterfall" ? ou : su;
     case "neon":
-      return e.variant === "waterfall" ? ou : cu(e.base);
+      return e.variant === "waterfall" ? au : lu(e.base);
     case "mono":
-      return iu(e.base, e.variant ?? "light", t);
+      return cu(e.base, e.variant ?? "light", t);
     case "custom":
       return e.colors;
   }
 }
-function uu(e, t) {
+function du(e, t) {
   if (!t) return e;
   const n = [...e];
   for (const [r, s] of Object.entries(t)) {
@@ -3428,7 +3428,7 @@ function uu(e, t) {
   }
   return n;
 }
-function du(e, t, n) {
+function pu(e, t, n) {
   if (!e) return;
   const r = t?.type === "custom" ? n[t.id] : void 0, s = {};
   for (const [o, a] of Object.entries(e)) {
@@ -3448,9 +3448,9 @@ function du(e, t, n) {
   }
   return Object.keys(s).length > 0 ? s : void 0;
 }
-function pu(e, t) {
+function mu(e, t) {
   if (!e)
-    return Ql.palette;
+    return Zl.palette;
   if (e.type === "custom") {
     const n = t[e.id];
     if (!n)
@@ -3460,14 +3460,14 @@ function pu(e, t) {
   }
   return e;
 }
-class mu extends Qe {
+class fu extends Qe {
   constructor() {
     super(...arguments), this.compatibleDataTypes = ["categorical", "temporal"];
   }
   compile(t, n) {
     if (t.scaleType !== "palette")
       throw new Error("PaletteScale.compile received non-palette spec");
-    const r = this.computeDomain(n), s = lu(t.palette, r.length), o = s.length > 0 ? s : [...oo], a = uu(o, t.overrides), i = gs().domain(r.map(String)).range(a).unknown(a[0]);
+    const r = this.computeDomain(n), s = uu(t.palette, r.length), o = s.length > 0 ? s : [...oo], a = du(o, t.overrides), i = gs().domain(r.map(String)).range(a).unknown(a[0]);
     return this.createVisualScale(t, {
       map: (c) => i(String(c)),
       domain: r,
@@ -3481,19 +3481,19 @@ class mu extends Qe {
     return r;
   }
 }
-class fu extends Ce {
+class hu extends Ce {
   constructor() {
-    super("scale"), this.register("continuous", new Kl()), this.register("discrete", new Zl()), this.register("datetime", new jl()), this.register("identity", new Jl()), this.register("palette", new mu());
+    super("scale"), this.register("continuous", new Xl()), this.register("discrete", new Jl()), this.register("datetime", new ql()), this.register("identity", new eu()), this.register("palette", new fu());
   }
 }
-const hu = (e) => !("layers" in e), F = {
-  point: yu,
-  line: gu,
-  area: bu,
-  bar: vu,
-  rule: xu
+const yu = (e) => !("layers" in e), F = {
+  point: gu,
+  line: bu,
+  area: vu,
+  bar: xu,
+  rule: Su
 };
-function yu(e = {}) {
+function gu(e = {}) {
   return {
     type: "layer",
     geom: "point",
@@ -3507,7 +3507,7 @@ function yu(e = {}) {
     dataLabels: e.dataLabels
   };
 }
-function gu(e = {}) {
+function bu(e = {}) {
   return {
     type: "layer",
     geom: "line",
@@ -3521,7 +3521,7 @@ function gu(e = {}) {
     dataLabels: e.dataLabels
   };
 }
-function bu(e = {}) {
+function vu(e = {}) {
   return {
     type: "layer",
     geom: "area",
@@ -3535,7 +3535,7 @@ function bu(e = {}) {
     dataLabels: e.dataLabels
   };
 }
-function vu(e = {}) {
+function xu(e = {}) {
   return {
     type: "layer",
     geom: "bar",
@@ -3549,7 +3549,7 @@ function vu(e = {}) {
     dataLabels: e.dataLabels
   };
 }
-function xu(e = {}) {
+function Su(e = {}) {
   return {
     type: "layer",
     geom: "rule",
@@ -3564,12 +3564,12 @@ function xu(e = {}) {
   };
 }
 const ao = {
-  identity: wu,
-  count: Au,
-  smooth: Su,
-  mean: Tu
+  identity: Au,
+  count: Tu,
+  smooth: wu,
+  mean: Mu
 };
-function Su(e) {
+function wu(e) {
   return {
     type: "smooth",
     method: e.method,
@@ -3577,45 +3577,45 @@ function Su(e) {
     bandwidth: e.bandwidth
   };
 }
-function wu() {
+function Au() {
   return { type: "identity" };
 }
-function Au() {
+function Tu() {
   return { type: "count" };
 }
-function Tu() {
+function Mu() {
   return { type: "mean" };
 }
-const Me = { reshape: Mu, filter: Lu, sort: Vu, aggregate: Eu, constant: ku };
-function Mu(e = {}) {
+const Me = { reshape: Lu, filter: Vu, sort: Eu, aggregate: ku, constant: Iu };
+function Lu(e = {}) {
   return {
     type: "transform",
     transformType: "reshape",
     options: e
   };
 }
-function Lu(e) {
+function Vu(e) {
   return {
     type: "transform",
     transformType: "filter",
     options: e
   };
 }
-function Vu(e) {
+function Eu(e) {
   return {
     type: "transform",
     transformType: "sort",
     options: e
   };
 }
-function Eu(e) {
+function ku(e) {
   return {
     type: "transform",
     transformType: "aggregate",
     options: e
   };
 }
-function ku(e) {
+function Iu(e) {
   return {
     type: "transform",
     transformType: "constant",
@@ -3630,36 +3630,36 @@ const zr = "#%_ENCODED_%#", io = (e) => {
   } catch {
     return e;
   }
-}, Iu = ({ annotations: e, dataset: t, mapping: n }) => {
+}, Cu = ({ annotations: e, dataset: t, mapping: n }) => {
   const r = [], s = [], o = [], a = [], i = [], c = [], l = [], u = v(n.x);
   for (const d of e ?? [])
     switch (d.type) {
       case "difference-arrow": {
-        const p = Cu(d, u, t);
+        const p = Du(d, u, t);
         p !== null && r.push(p);
         break;
       }
       case "shape": {
-        s.push(Du(d));
+        s.push(Fu(d));
         break;
       }
       case "arrow": {
-        o.push(Nu(d));
+        o.push(Pu(d));
         break;
       }
       case "highlight":
         break;
       case "text": {
-        a.push(Fu(d));
+        a.push(_u(d));
         break;
       }
       case "sticker": {
-        const p = _u(d, u, t);
+        const p = Ru(d, u, t);
         p !== null && i.push(p);
         break;
       }
       case "tooltip": {
-        const p = Ru(d, u, t);
+        const p = Nu(d, u, t);
         if (p === null) break;
         p.kind === "pinnedNumber" ? c.push(p.value) : l.push(p.value);
         break;
@@ -3670,7 +3670,7 @@ const zr = "#%_ENCODED_%#", io = (e) => {
       }
     }
   return { differenceArrows: r, shapes: s, freeformArrows: o, textAnnotations: a, stickers: i, pinnedNumbers: c, comments: l };
-}, Cu = (e, t, n) => {
+}, Du = (e, t, n) => {
   const r = wt({ dataset: n, input: e.start, anchorVariable: t }), s = wt({ dataset: n, input: e.end, anchorVariable: t });
   return r === null || s === null ? null : {
     id: e.id,
@@ -3681,7 +3681,7 @@ const zr = "#%_ENCODED_%#", io = (e) => {
     size: e.size,
     labelCrossPosition: e.labelPosition
   };
-}, Du = (e) => ({
+}, Fu = (e) => ({
   id: e.id,
   kind: e.shape,
   zOrder: e.layer === "abovePlot" ? "foreground" : "background",
@@ -3693,7 +3693,7 @@ const zr = "#%_ENCODED_%#", io = (e) => {
   fillOpacity: e.fillOpacity,
   strokeWidth: e.strokeWidth,
   strokeColor: e.fillColor
-}), Fu = (e) => ({
+}), _u = (e) => ({
   id: e.id,
   content: e.content,
   x: e.x,
@@ -3701,13 +3701,13 @@ const zr = "#%_ENCODED_%#", io = (e) => {
   width: e.width,
   backgroundColor: e.backgroundColor ?? null,
   backgroundColorStyle: e.backgroundColorStyle
-}), _u = (e, t, n) => {
+}), Ru = (e, t, n) => {
   const r = wt({ dataset: n, input: e, anchorVariable: t });
   return r === null ? null : { id: e.id, anchor: r, sticker: e.sticker };
-}, Ru = (e, t, n) => {
+}, Nu = (e, t, n) => {
   const r = wt({ dataset: n, input: e, anchorVariable: t });
   return r === null ? null : e.caption === null || e.caption === void 0 ? { kind: "pinnedNumber", value: { id: e.id, anchor: r } } : { kind: "comment", value: { id: e.id, anchor: r, content: e.caption } };
-}, Nu = (e) => ({
+}, Pu = (e) => ({
   id: e.id,
   start: { x: e.startX, y: e.startY },
   end: { x: e.endX, y: e.endY },
@@ -3723,9 +3723,9 @@ const zr = "#%_ENCODED_%#", io = (e) => {
   anchorVariable: n
 }) => {
   if (!h(t) || !h(t.columnKey)) return null;
-  const r = Pu(t, n, e);
+  const r = Ou(t, n, e);
   return r === null ? null : { anchorValue: r, groupValue: io(t.columnKey) };
-}, Pu = (e, t, n) => e.rowValue !== void 0 ? e.rowValue : t === null || !h(e.rowIndex) || !n.hasVariable(t) ? null : n.getValues(t)[e.rowIndex] ?? null, Ou = [
+}, Ou = (e, t, n) => e.rowValue !== void 0 ? e.rowValue : t === null || !h(e.rowIndex) || !n.hasVariable(t) ? null : n.getValues(t)[e.rowIndex] ?? null, $u = [
   "lilac",
   "neon_pink",
   "blackberry",
@@ -3739,47 +3739,47 @@ const zr = "#%_ENCODED_%#", io = (e) => {
   "cool",
   "fresh"
 ];
-function $u(e) {
+function Bu(e) {
   return {
     type: "config",
     config: e
   };
 }
-const Bu = "#E5E5E5", zu = { x: "top", y: "left" }, Gu = /* @__PURE__ */ new Set(["pie", "donut"]);
-function Wu(e) {
-  return $u({
-    legend: Xu(e.legend),
-    axes: qu(e.axes),
-    headline: Qu(e),
-    numberFormat: Zu(e.appearance),
-    content: Ju(e.content),
-    appearance: Yu(e.appearance, e.themeOverrides)
+const zu = "#E5E5E5", Gu = { x: "top", y: "left" }, Wu = /* @__PURE__ */ new Set(["pie", "donut"]);
+function Yu(e) {
+  return Bu({
+    legend: ju(e.legend),
+    axes: Qu(e.axes),
+    headline: Zu(e),
+    numberFormat: Ju(e.appearance),
+    content: ed(e.content),
+    appearance: Hu(e.appearance, e.themeOverrides)
   }).config;
 }
-function Yu(e, t) {
-  const n = Ku(e?.border), r = e?.hasRoundedCorners === !1 ? 0 : void 0, s = Hu(e, t), o = {};
+function Hu(e, t) {
+  const n = Xu(e?.border), r = e?.hasRoundedCorners === !1 ? 0 : void 0, s = Uu(e, t), o = {};
   return e?.textScale !== void 0 && (o.textScale = e.textScale), n !== void 0 && (o.border = n), r !== void 0 && (o.cornerRadius = r), s !== void 0 && (o.background = s), e?.highlightStyle !== void 0 && (o.highlightStyle = e.highlightStyle === "grey" ? "desaturate" : "dim"), Object.keys(o).length > 0 ? o : void 0;
 }
-function Hu(e, t) {
+function Uu(e, t) {
   if (e?.backgroundModifier === "tint")
     return { type: "tinted" };
   const n = t?.graphBackground;
   if (typeof n == "string")
     return { type: "solid", color: n };
 }
-const Uu = (e) => Ou.includes(e);
-function Ku(e) {
+const Ku = (e) => $u.includes(e);
+function Xu(e) {
   if (!e?.style) return;
   if (e.style === "none") return { type: "none" };
   const t = e.width ?? 0;
   if (e.style === "grey")
-    return { type: "solid", color: Bu, width: t };
+    return { type: "solid", color: zu, width: t };
   if (e.style === "preset")
-    return e.color === void 0 || !Uu(e.color) ? void 0 : { type: "preset", preset: e.color, width: t };
+    return e.color === void 0 || !Ku(e.color) ? void 0 : { type: "preset", preset: e.color, width: t };
   if (e.color !== void 0)
     return e.style === "custom" ? { type: "solid", color: e.color, width: t } : { type: e.style, color: e.color, width: t };
 }
-function Xu(e) {
+function ju(e) {
   if (e)
     return {
       position: e.position
@@ -3789,45 +3789,45 @@ function Gr(e, t, n) {
   return !t && n === void 0 ? {} : {
     ...t?.isHidden !== void 0 ? { isVisible: !t.isHidden } : void 0,
     ...t?.label !== void 0 ? { label: t.label } : void 0,
-    ...t?.isReversed ? { position: zu[e] } : void 0,
+    ...t?.isReversed ? { position: Gu[e] } : void 0,
     ...t?.tickDisplayMode ? { labels: { mode: t.tickDisplayMode } } : void 0,
     ...n !== void 0 ? { grid: { isVisible: n } } : void 0
   };
 }
-function ju(e) {
+function qu(e) {
   return {
     ...e.label !== void 0 ? { label: e.label } : void 0
   };
 }
-function qu(e) {
+function Qu(e) {
   if (e)
     return {
       x: Gr("x", e.x, e.showGridLines),
       y: Gr("y", e.y, e.showGridLines),
-      ...e.y2 ? { ySecondary: ju(e.y2) } : void 0
+      ...e.y2 ? { ySecondary: qu(e.y2) } : void 0
     };
 }
-function Qu(e) {
-  const { headlineNumbers: t, options: n, type: r } = e, s = r !== void 0 && Gu.has(r) ? n?.pieTotalPosition : void 0;
+function Zu(e) {
+  const { headlineNumbers: t, options: n, type: r } = e, s = r !== void 0 && Wu.has(r) ? n?.pieTotalPosition : void 0;
   if (t === void 0 && s === void 0) return;
   const o = {};
   return t?.show !== void 0 && (o.show = t.show), t?.compareWith !== void 0 && (o.compareWith = t.compareWith), t?.size !== void 0 && (o.size = t.size), s !== void 0 && (o.show = "total", o.position = s === "center" ? "center" : "above"), o;
 }
-function Zu(e) {
+function Ju(e) {
   if (e?.numberFormat)
     return {
       decimals: e.numberFormat.decimalPlaces,
       abbreviation: e.numberFormat.abbreviation
     };
 }
-function Ju(e) {
+function ed(e) {
   if (!e) return;
   const t = {};
   e.title !== void 0 && (t.title = e.title), e.isTitleHidden !== void 0 && (t.isTitleVisible = !e.isTitleHidden), e.subtitle !== void 0 && (t.subtitle = e.subtitle), e.isSubtitleHidden !== void 0 && (t.isSubtitleVisible = !e.isSubtitleHidden), e.caption !== void 0 && (t.caption = e.caption), e.isCaptionHidden !== void 0 && (t.isCaptionVisible = !e.isCaptionHidden);
-  const n = ed(e.source);
+  const n = td(e.source);
   return n !== void 0 && (t.source = n), e.isSourceHidden !== void 0 && (t.isSourceVisible = !e.isSourceHidden), t;
 }
-function ed(e) {
+function td(e) {
   if (!e) return;
   const t = {};
   return e.label !== void 0 && (t.label = e.label), e.url !== void 0 && (t.url = e.url), Object.keys(t).length === 0 ? void 0 : t;
@@ -3867,7 +3867,7 @@ const z = {
     coordType: "polar",
     params: e
   })
-}, td = {
+}, nd = {
   showDataLabels: !1,
   format: "absolute",
   showStackTotals: !1,
@@ -3907,8 +3907,8 @@ const z = {
     labelPosition: "start"
   }
 }, Ze = "primary";
-function nd(e, t) {
-  const n = { ...td };
+function rd(e, t) {
+  const n = { ...nd };
   return e === "bar" && t === "polar" && (n.format = "percentage"), n;
 }
 function D(e, t = {}) {
@@ -4019,7 +4019,7 @@ const Le = {
     discrete: (e) => q("lineType", e),
     identity: (e) => Oe("lineType", e)
   }
-}, Y = "key", re = "value", Wr = A("lineSeriesLabel"), Yr = A("barSeriesLabel"), At = A("constantY"), rd = (e, t, n, r) => ud[t](e, n, r), Vn = (e) => {
+}, Y = "key", re = "value", Wr = A("lineSeriesLabel"), Yr = A("barSeriesLabel"), At = A("constantY"), sd = (e, t, n, r) => dd[t](e, n, r), Vn = (e) => {
   const { numeric: t, categorical: n, temporal: r } = e.groupVariableNamesByType();
   return h(r[0]) ? r[0] : h(n[0]) ? n[0] : h(t[0]) ? t[0] : "";
 }, En = (e) => {
@@ -4053,7 +4053,7 @@ const Le = {
     mapping: { lineType: Y },
     scales: [Le.lineType.discrete({ domain: e.seriesVariables, range: r })]
   };
-}, sd = (e) => {
+}, od = (e) => {
   const { categorical: t, temporal: n, numeric: r } = e.groupVariableNamesByType(), s = r[0];
   if (!h(s))
     throw new Error("No first numeric variable found");
@@ -4072,7 +4072,7 @@ const Le = {
     }),
     mapping: { x: s, y: re, label: t[0], color: Y }
   };
-}, od = (e) => {
+}, ad = (e) => {
   const { categorical: t, temporal: n, numeric: r } = e.groupVariableNamesByType();
   let s, o;
   if (h(t[0]) && h(r[0]))
@@ -4107,7 +4107,7 @@ const Le = {
     scales: a.scales,
     seriesVariables: o
   };
-}, ad = (e, t, n) => {
+}, id = (e, t, n) => {
   const { dataset: r, mapping: s, seriesVariables: o } = En(e.dataset), a = kn({ appearance: n, seriesVariables: o }), i = [
     F.area({
       position: "stack",
@@ -4155,11 +4155,11 @@ const Le = {
   dataset: e.dataset,
   layers: [F.bar({ position: "fill" })],
   coords: z.polar({ theta: "y", innerRadius: t === "donut" ? 0.55 : 0 }),
-  mapping: od(e.dataset),
+  mapping: ad(e.dataset),
   scales: [],
   seriesVariables: []
-}), id = (e) => {
-  const { dataset: t, mapping: n } = sd(e.dataset);
+}), cd = (e) => {
+  const { dataset: t, mapping: n } = od(e.dataset);
   return {
     dataset: t,
     layers: [F.point()],
@@ -4168,7 +4168,7 @@ const Le = {
     scales: [],
     seriesVariables: []
   };
-}, cd = (e) => {
+}, ld = (e) => {
   const { numeric: t, categorical: n } = e.dataset.groupVariableNamesByType(), r = t[0];
   if (!h(r))
     throw new Error("No first numeric variable found");
@@ -4192,7 +4192,7 @@ const Le = {
     },
     ...t ? { yScaleType: "secondary" } : void 0
   });
-}, ld = (e, t, n) => {
+}, ud = (e, t, n) => {
   const { numeric: r, categorical: s, temporal: o } = e.dataset.groupVariableNamesByType(), a = Vn(e.dataset), i = [...s, ...o], c = r.filter((b) => b !== a), l = t?.comboType ?? "grouped-bars", u = l === "lines";
   if (c.length === 1)
     return u ? lo(e, t, n) : de(e, "dodge", z.cartesian(), t, n);
@@ -4266,9 +4266,9 @@ const Le = {
   };
 }, uo = (e = "auto") => e === "auto" ? yt.params.size : e, _e = (e) => () => {
   throw new Error(`Unsupported graph type: ${e}`);
-}, ud = {
+}, dd = {
   line: (e, t, n) => lo(e, t, n),
-  areaStacked: (e, t, n) => ad(e, t, n),
+  areaStacked: (e, t, n) => id(e, t, n),
   bar: (e, t, n) => de(e, "dodge", z.flip(), t, n),
   barStacked: (e, t, n) => de(e, "stack", z.flip(), t, n),
   barStackedFill: (e, t, n) => de(e, "fill", z.flip(), t, n),
@@ -4277,9 +4277,9 @@ const Le = {
   columnStackedFill: (e, t, n) => de(e, "fill", z.cartesian(), t, n),
   pie: (e) => Hr(e, "pie"),
   donut: (e) => Hr(e, "donut"),
-  scatter: (e) => id(e),
-  bubble: (e) => cd(e),
-  combo: (e, t, n) => ld(e, t, n),
+  scatter: (e) => cd(e),
+  bubble: (e) => ld(e),
+  combo: (e, t, n) => ud(e, t, n),
   funnel: _e("funnel"),
   heatmap: _e("heatmap"),
   waterfall: _e("waterfall"),
@@ -4290,11 +4290,11 @@ const Le = {
   A("lineSeriesLabel"),
   A("barSeriesLabel")
 ];
-function dd(e) {
-  const t = e.annotations ?? [], n = pd(e.mapping), r = hd(e.convertedDataset, e.layers), s = [];
+function pd(e) {
+  const t = e.annotations ?? [], n = md(e.mapping), r = yd(e.convertedDataset, e.layers), s = [];
   for (const o of t) {
     if (o.type !== "highlight") continue;
-    const a = md({
+    const a = fd({
       annotation: o,
       rowIdentityVariable: n,
       dataset: e.dataset,
@@ -4304,11 +4304,11 @@ function dd(e) {
   }
   return s;
 }
-function pd(e) {
+function md(e) {
   const t = v(e.x);
   return t !== null && t !== "" ? t : v(e.color);
 }
-function md({
+function fd({
   annotation: e,
   rowIdentityVariable: t,
   dataset: n,
@@ -4327,28 +4327,28 @@ function md({
 }
 function Ur(e, t, n) {
   if (t === null) return null;
-  const r = yd(e, t, n);
+  const r = gd(e, t, n);
   return r === null ? null : { variable: t, eq: r };
 }
 function Kr(e, t) {
-  if (!fd(t)) return null;
+  if (!hd(t)) return null;
   const n = e.columnKey;
   return h(n) ? { or: po.map((r) => ({ variable: r, eq: n })) } : null;
 }
-function fd(e) {
+function hd(e) {
   return po.some((t) => e.includes(t));
 }
-function hd(e, t) {
+function yd(e, t) {
   const n = [...e.getVariableNames()];
   for (const r of t)
     for (const s of r.transforms ?? [])
       s.transformType === "reshape" ? n.push(s.options.keyName ?? Y) : s.transformType === "constant" && n.push(s.options.variableName);
   return n;
 }
-function yd(e, t, n) {
+function gd(e, t, n) {
   return e.rowValue !== void 0 ? e.rowValue : !h(e.rowIndex) || !n.getVariableNames().includes(t) ? null : n.getValues(t)[e.rowIndex] ?? null;
 }
-function gd(e, t, n) {
+function bd(e, t, n) {
   const { theme: r, customPalettes: s } = n;
   if (s && e && s[e])
     return {
@@ -4362,12 +4362,12 @@ function gd(e, t, n) {
   const i = "preset:mono:";
   if (e?.startsWith(i)) {
     const l = e.slice(i.length);
-    if (bd(l)) return { type: "mono", base: l, variant: r };
+    if (vd(l)) return { type: "mono", base: l, variant: r };
   }
   const c = "preset:neon:";
   if (e?.startsWith(c)) {
     const l = e.slice(c.length);
-    if (vd(l)) return { type: "neon", base: l, variant: Yt(t) };
+    if (xd(l)) return { type: "neon", base: l, variant: Yt(t) };
   }
   return {
     type: "default"
@@ -4377,13 +4377,13 @@ function Yt(e) {
   if (e === "waterfall")
     return "waterfall";
 }
-function bd(e) {
-  return eu.includes(e);
-}
 function vd(e) {
   return tu.includes(e);
 }
 function xd(e) {
+  return nu.includes(e);
+}
+function Sd(e) {
   if (!e) return;
   const t = {};
   for (const [n, r] of Object.entries(e)) {
@@ -4398,10 +4398,10 @@ function xd(e) {
   }
   return Object.keys(t).length > 0 ? t : void 0;
 }
-function Sd(e, t, n, r = {}) {
+function wd(e, t, n, r = {}) {
   const s = [];
   s.push(Xr("x", t?.x)), s.push(Xr("y", t?.y));
-  const o = gd(n?.paletteId, e, r), a = xd(n?.seriesStyles);
+  const o = bd(n?.paletteId, e, r), a = Sd(n?.seriesStyles);
   return s.push(Le.color.palette({ palette: o, overrides: a })), s;
 }
 function Xr(e, t) {
@@ -4413,7 +4413,7 @@ function Xr(e, t) {
     domainMax: t.max ?? void 0
   }) : Le[e]();
 }
-const wd = /* @__PURE__ */ new Set([
+const Ad = /* @__PURE__ */ new Set([
   "column",
   "columnStacked",
   "columnStackedFill",
@@ -4426,7 +4426,7 @@ const wd = /* @__PURE__ */ new Set([
   "bubble",
   "funnel",
   "combo"
-]), Ad = /* @__PURE__ */ new Set([
+]), Td = /* @__PURE__ */ new Set([
   "column",
   "columnStacked",
   "columnStackedFill",
@@ -4437,37 +4437,37 @@ const wd = /* @__PURE__ */ new Set([
   "areaStacked",
   "combo"
 ]);
-function Td(e, t, n) {
-  const r = t.type ?? "column", s = { dataset: e, axes: t.axes }, o = rd(s, r, t.options ?? void 0, t.appearance ?? void 0);
+function Md(e, t, n) {
+  const r = t.type ?? "column", s = { dataset: e, axes: t.axes }, o = sd(s, r, t.options ?? void 0, t.appearance ?? void 0);
   return {
     data: o.dataset,
     mapping: o.mapping,
-    layers: Md(r, t, o.layers, o.coords, o.mapping, o.seriesVariables),
-    scales: [...Sd(r, t.axes, t.appearance, n), ...o.scales],
+    layers: Ld(r, t, o.layers, o.coords, o.mapping, o.seriesVariables),
+    scales: [...wd(r, t.axes, t.appearance, n), ...o.scales],
     transforms: o.transforms ?? [],
-    highlights: dd({
+    highlights: pd({
       annotations: t.annotations,
       dataset: e,
       mapping: o.mapping,
       convertedDataset: o.dataset,
       layers: o.layers
     }),
-    annotations: Iu({
+    annotations: Cu({
       annotations: t.annotations,
       dataset: e,
       mapping: o.mapping
     }),
     coords: o.coords,
-    config: Wu(t)
+    config: Yu(t)
   };
 }
-function Md(e, t, n, r, s, o) {
-  const a = Id(t.dataLabels), i = a === void 0 ? n : n.filter((l) => l.interactive !== !1).map((l) => ({ ...l, dataLabels: { ...a, ...l.dataLabels } })), c = t.axes?.hasDualYAxis ?? !1;
+function Ld(e, t, n, r, s, o) {
+  const a = Cd(t.dataLabels), i = a === void 0 ? n : n.filter((l) => l.interactive !== !1).map((l) => ({ ...l, dataLabels: { ...a, ...l.dataLabels } })), c = t.axes?.hasDualYAxis ?? !1;
   return [
     ...i,
-    ...Ld({ type: e, trendline: t.referenceLines?.trendline, coords: r }),
-    ...Vd({ type: e, hasDualYAxis: c, goalLine: t.referenceLines?.goalLine, coords: r }),
-    ...kd({
+    ...Vd({ type: e, trendline: t.referenceLines?.trendline, coords: r }),
+    ...Ed({ type: e, hasDualYAxis: c, goalLine: t.referenceLines?.goalLine, coords: r }),
+    ...Id({
       type: e,
       hasDualYAxis: c,
       averageLine: t.referenceLines?.averageLine,
@@ -4477,12 +4477,12 @@ function Md(e, t, n, r, s, o) {
     })
   ];
 }
-function Ld({
+function Vd({
   type: e,
   trendline: t,
   coords: n
 }) {
-  return t === void 0 ? [] : wd.has(e) ? n.coordType === "polar" ? [] : [
+  return t === void 0 ? [] : Ad.has(e) ? n.coordType === "polar" ? [] : [
     F.line({
       aes: { lineType: { value: "dashed" } },
       stat: ao.smooth({ method: t }),
@@ -4490,13 +4490,13 @@ function Ld({
     })
   ] : [];
 }
-function Vd({
+function Ed({
   type: e,
   hasDualYAxis: t,
   goalLine: n,
   coords: r
 }) {
-  if (!Ed(n)) return [];
+  if (!kd(n)) return [];
   if (r.coordType === "polar") return [];
   const s = r.coordType === "flip" ? "end" : "start";
   return [
@@ -4511,10 +4511,10 @@ function Vd({
     })
   ];
 }
-function Ed(e) {
+function kd(e) {
   return e !== void 0 && Number.isFinite(e.target);
 }
-function kd({
+function Id({
   type: e,
   hasDualYAxis: t,
   averageLine: n,
@@ -4523,7 +4523,7 @@ function kd({
   seriesVariables: o
 }) {
   if (n === void 0) return [];
-  if (!Ad.has(e)) return [];
+  if (!Td.has(e)) return [];
   if (r.coordType === "polar") return [];
   const a = io(n.columnKey);
   if (!o.includes(a)) return [];
@@ -4542,7 +4542,7 @@ function kd({
     })
   ];
 }
-function Id(e) {
+function Cd(e) {
   if (!e) return;
   const t = {};
   return e.showDataLabels !== void 0 && (t.showDataLabels = e.showDataLabels), e.dataLabelFormat !== void 0 && (t.format = e.dataLabelFormat), e.showStackTotals !== void 0 && (t.showStackTotals = e.showStackTotals), e.showCategoryLabels !== void 0 && (t.showCategoryLabels = e.showCategoryLabels), Object.keys(t).length === 0 ? void 0 : t;
@@ -4568,15 +4568,15 @@ const Ht = {
   endArrowheadStyle: "line-arrow",
   lineStyle: "solid",
   hasStickerStyle: !1
-}, Cd = (e, t) => ({
-  differenceArrows: (e?.differenceArrows ?? []).map((n) => Fd(n, t)),
-  shapes: (e?.shapes ?? []).map(Pd),
-  freeformArrows: (e?.freeformArrows ?? []).map(Od),
-  textAnnotations: (e?.textAnnotations ?? []).map(Dd),
-  stickers: (e?.stickers ?? []).map((n) => _d(n, t)),
-  pinnedNumbers: (e?.pinnedNumbers ?? []).map((n) => Rd(n, t)),
-  comments: (e?.comments ?? []).map((n) => Nd(n, t))
-}), Dd = (e) => ({
+}, Dd = (e, t) => ({
+  differenceArrows: (e?.differenceArrows ?? []).map((n) => _d(n, t)),
+  shapes: (e?.shapes ?? []).map(Od),
+  freeformArrows: (e?.freeformArrows ?? []).map($d),
+  textAnnotations: (e?.textAnnotations ?? []).map(Fd),
+  stickers: (e?.stickers ?? []).map((n) => Rd(n, t)),
+  pinnedNumbers: (e?.pinnedNumbers ?? []).map((n) => Nd(n, t)),
+  comments: (e?.comments ?? []).map((n) => Pd(n, t))
+}), Fd = (e) => ({
   id: e.id ?? crypto.randomUUID(),
   content: e.content,
   x: e.x,
@@ -4584,7 +4584,7 @@ const Ht = {
   width: e.width,
   backgroundColor: e.backgroundColor ?? jr.backgroundColor,
   backgroundColorStyle: e.backgroundColorStyle ?? jr.backgroundColorStyle
-}), Fd = (e, t) => ({
+}), _d = (e, t) => ({
   id: e.id ?? crypto.randomUUID(),
   start: Ye(e.start, t),
   end: Ye(e.end, t),
@@ -4601,18 +4601,18 @@ const Ht = {
       `Annotation references layerIndex ${e.layerIndex} but only ${t.length} layer(s) are defined.`
     );
   return { layerId: n, anchorValue: e.anchorValue, groupValue: e.groupValue };
-}, _d = (e, t) => ({
+}, Rd = (e, t) => ({
   id: e.id ?? crypto.randomUUID(),
   anchor: Ye(e.anchor, t),
   sticker: e.sticker
-}), Rd = (e, t) => ({
+}), Nd = (e, t) => ({
   id: e.id ?? crypto.randomUUID(),
   anchor: Ye(e.anchor, t)
-}), Nd = (e, t) => ({
+}), Pd = (e, t) => ({
   id: e.id ?? crypto.randomUUID(),
   anchor: Ye(e.anchor, t),
   content: e.content
-}), Pd = (e) => ({
+}), Od = (e) => ({
   id: e.id ?? crypto.randomUUID(),
   kind: e.kind ?? we.kind,
   zOrder: e.zOrder ?? we.zOrder,
@@ -4624,7 +4624,7 @@ const Ht = {
   fillOpacity: e.fillOpacity ?? we.fillOpacity,
   strokeWidth: e.strokeWidth ?? we.strokeWidth,
   strokeColor: e.strokeColor ?? we.strokeColor
-}), Od = (e) => ({
+}), $d = (e) => ({
   id: e.id ?? crypto.randomUUID(),
   start: e.start,
   end: e.end,
@@ -4634,7 +4634,7 @@ const Ht = {
   endArrowheadStyle: e.endArrowheadStyle ?? Ae.endArrowheadStyle,
   lineStyle: e.lineStyle ?? Ae.lineStyle,
   hasStickerStyle: e.hasStickerStyle ?? Ae.hasStickerStyle
-}), $d = {
+}), Bd = {
   parsingLocale: "en-US",
   legend: {
     position: "auto",
@@ -4687,10 +4687,10 @@ const Ht = {
     highlightStyle: "dim"
   }
 };
-function Bd(e) {
-  return Ee({}, $d, e);
+function zd(e) {
+  return Ee({}, Bd, e);
 }
-const zd = {
+const Gd = {
   xLimits: null,
   yLimits: null
 }, Ut = {
@@ -4698,8 +4698,8 @@ const zd = {
   startAngle: 0,
   innerRadius: 0
 };
-function Gd(e) {
-  const t = e ?? { type: "coord", coordType: "cartesian" }, n = bs({}, zd, t.params ?? {});
+function Wd(e) {
+  const t = e ?? { type: "coord", coordType: "cartesian" }, n = bs({}, Gd, t.params ?? {});
   switch (t.coordType) {
     case "cartesian":
     case "flip":
@@ -4716,7 +4716,7 @@ function Gd(e) {
       };
   }
 }
-function Wd(e, t) {
+function Yd(e, t) {
   return e.map((n) => {
     const r = n.layerIndex !== void 0 ? t[n.layerIndex]?.id : void 0;
     if (n.layerIndex !== void 0 && r === void 0)
@@ -4732,16 +4732,16 @@ function Wd(e, t) {
     };
   });
 }
-const Yd = "linear", Hd = 3, Ud = 0.3;
+const Hd = "linear", Ud = 3, Kd = 0.3;
 function Je(e, t) {
   const n = e ?? t, r = typeof n == "string" ? n : n.type;
   if (r === "smooth") {
     const s = typeof n == "string" ? void 0 : n;
     return {
       type: "smooth",
-      method: s?.method ?? Yd,
-      order: s?.order ?? Hd,
-      bandwidth: s?.bandwidth ?? Ud
+      method: s?.method ?? Hd,
+      order: s?.order ?? Ud,
+      bandwidth: s?.bandwidth ?? Kd
     };
   }
   return { type: r };
@@ -4749,30 +4749,30 @@ function Je(e, t) {
 function mo(e, t, n) {
   switch (n.geom) {
     case "point":
-      return jd(e, t, n);
-    case "line":
       return qd(e, t, n);
-    case "area":
+    case "line":
       return Qd(e, t, n);
-    case "bar":
+    case "area":
       return Zd(e, t, n);
-    case "rule":
+    case "bar":
       return Jd(e, t, n);
+    case "rule":
+      return ep(e, t, n);
   }
 }
-function Kd(e, t, n) {
+function Xd(e, t, n) {
   const r = n.map((s) => mo(e, t, s));
-  return ep(r);
+  return tp(r);
 }
-const Xd = (e, t, n) => n.label !== void 0 ? n.label : tp(e, t, n), et = (e, t, n, r) => {
-  const s = { ...e, ...t.mapping }, o = Xd(t.geom, n, s);
+const jd = (e, t, n) => n.label !== void 0 ? n.label : np(e, t, n), et = (e, t, n, r) => {
+  const s = { ...e, ...t.mapping }, o = jd(t.geom, n, s);
   return {
-    ...nd(t.geom, r),
+    ...rd(t.geom, r),
     ...t.dataLabels,
     labelSource: o
   };
 };
-function jd(e, t, n) {
+function qd(e, t, n) {
   const r = n.position ?? yt.position;
   return {
     id: n.id ?? crypto.randomUUID(),
@@ -4788,7 +4788,7 @@ function jd(e, t, n) {
     dataLabels: et(e, n, r, t)
   };
 }
-function qd(e, t, n) {
+function Qd(e, t, n) {
   const r = n.position ?? Bt.position;
   return {
     id: n.id ?? crypto.randomUUID(),
@@ -4804,7 +4804,7 @@ function qd(e, t, n) {
     dataLabels: et(e, n, r, t)
   };
 }
-function Qd(e, t, n) {
+function Zd(e, t, n) {
   const r = Ee({}, zt.params, n.params);
   r.missingValues === "gap" && (r.missingValues = "zero");
   const s = n.position ?? zt.position;
@@ -4822,7 +4822,7 @@ function Qd(e, t, n) {
     dataLabels: et(e, n, s, t)
   };
 }
-function Zd(e, t, n) {
+function Jd(e, t, n) {
   const r = n.position ?? Gt.position;
   return {
     id: n.id ?? crypto.randomUUID(),
@@ -4838,7 +4838,7 @@ function Zd(e, t, n) {
     dataLabels: et(e, n, r, t)
   };
 }
-function Jd(e, t, n) {
+function ep(e, t, n) {
   const r = n.position ?? Fe.position;
   return {
     id: n.id ?? crypto.randomUUID(),
@@ -4854,7 +4854,7 @@ function Jd(e, t, n) {
     dataLabels: et(e, n, r, t)
   };
 }
-const ep = (e) => {
+const tp = (e) => {
   const t = /* @__PURE__ */ new Set();
   for (const n of e)
     n.position === "fill" && t.add(n.yScaleType);
@@ -4865,7 +4865,7 @@ const ep = (e) => {
     const s = Math.min(1, Math.max(0, r));
     return { ...n, mapping: { ...n.mapping, y: { value: s } } };
   });
-}, tp = (e, t, n) => {
+}, np = (e, t, n) => {
   if (e === "point") {
     const r = v(n.size);
     if (r !== null) return { variable: r };
@@ -4887,7 +4887,7 @@ function In(e, t, n) {
   const s = e.layers.map((o, a) => a === r ? n : o);
   return { ...e, layers: s };
 }
-function np(e, t) {
+function rp(e, t) {
   const n = e.layers.findIndex((s) => s.id === t);
   if (n === -1 || e.layers.length <= 1) return e;
   const r = e.layers.filter((s, o) => o !== n);
@@ -4902,7 +4902,7 @@ const fo = {
   alpha: "continuous-range",
   strokeWidth: "continuous-range",
   lineType: "discrete-only"
-}, rp = {
+}, sp = {
   numeric: {
     position: "continuous",
     "color-range": "continuous",
@@ -4928,7 +4928,7 @@ const fo = {
 function ho(e, t, n, r, s) {
   switch (e.scaleType) {
     case "inferred": {
-      const o = ap(e, t, n, r);
+      const o = ip(e, t, n, r);
       return ho(o, t, n, r, s);
     }
     case "continuous": {
@@ -4973,8 +4973,8 @@ function ho(e, t, n, r, s) {
         type: e.type,
         scaledAesthetic: e.scaledAesthetic,
         scaleType: e.scaleType,
-        palette: pu(e.palette, s),
-        overrides: du(e.overrides, e.palette, s)
+        palette: mu(e.palette, s),
+        overrides: pu(e.overrides, e.palette, s)
       };
     case "identity":
       return {
@@ -4988,16 +4988,16 @@ function ho(e, t, n, r, s) {
     }
   }
 }
-function sp(e, t, n, r, s, o) {
-  const a = cp(t, n), i = lp(a), c = /* @__PURE__ */ new Map();
+function op(e, t, n, r, s, o) {
+  const a = lp(t, n), i = up(a), c = /* @__PURE__ */ new Map();
   for (const u of i)
     c.set(u.scaledAesthetic, u);
   const l = [...c.values()].map((u) => ho(u, e, n, r, o));
-  return s.coordType === "polar" ? op(l) : l;
+  return s.coordType === "polar" ? ap(l) : l;
 }
-const op = (e) => e.map((t) => t.scaleType === "discrete" ? { ...t, padding: 0 } : t);
-function ap(e, t, n, r) {
-  const s = Z(e.scaledAesthetic), o = e.scaledAesthetic === "ySecondary" ? ip(n, r) : r[s], a = tt(n, "bar");
+const ap = (e) => e.map((t) => t.scaleType === "discrete" ? { ...t, padding: 0 } : t);
+function ip(e, t, n, r) {
+  const s = Z(e.scaledAesthetic), o = e.scaledAesthetic === "ySecondary" ? cp(n, r) : r[s], a = tt(n, "bar");
   if (e.scaledAesthetic === "x" && a)
     return q(e.scaledAesthetic, e.options);
   if (a && e.scaledAesthetic === (a.yScaleType === "secondary" ? "ySecondary" : "y")) {
@@ -5008,7 +5008,7 @@ function ap(e, t, n, r) {
   if (!h(i) || !t.hasVariable(i))
     return D(e.scaledAesthetic, e.options);
   const c = t.getType(i), l = fo[e.scaledAesthetic];
-  switch (rp[c][l]) {
+  switch (sp[c][l]) {
     case "discrete":
       return q(e.scaledAesthetic, e.options);
     case "datetime":
@@ -5020,18 +5020,18 @@ function ap(e, t, n, r) {
       return Oe(e.scaledAesthetic);
   }
 }
-function ip(e, t) {
+function cp(e, t) {
   const n = e.find((r) => r.yScaleType === "secondary");
   return n ? n.mapping.y ?? t.y : t.y;
 }
-function cp(e, t) {
+function lp(e, t) {
   return !t.some((s) => s.yScaleType === "secondary") || e.some((s) => s.scaledAesthetic === "ySecondary") ? e : [...e, bt("ySecondary")];
 }
-function lp(e) {
+function up(e) {
   return e.some((n) => n.scaledAesthetic === "color") ? e : [...e, co("color")];
 }
 function qr(e, t) {
-  const n = Gd(e.coords), r = Kd(e.mapping, n.coordType, e.layers), s = sp(e.data, e.scales, r, e.mapping, n, t), o = Bd(e.config), a = Wd(e.highlights, r), i = Cd(e.annotations, r);
+  const n = Wd(e.coords), r = Xd(e.mapping, n.coordType, e.layers), s = op(e.data, e.scales, r, e.mapping, n, t), o = zd(e.config), a = Yd(e.highlights, r), i = Dd(e.annotations, r);
   return {
     data: e.data,
     mapping: e.mapping,
@@ -5044,17 +5044,17 @@ function qr(e, t) {
     config: o
   };
 }
-class up {
+class dp {
   /**
    * Resolve user input into a fully defaulted {@link Spec}. Accepts either a viz-engine
    * `SpecInput` or a legacy `GraphConfig`, converting the latter before resolution.
    */
   compile({ input: t, dataset: n, ctx: r }) {
     const s = r.customPalettes ?? {};
-    return hu(t) ? qr(Td(n, t, r), s) : qr({ ...t, data: n }, s);
+    return yu(t) ? qr(Md(n, t, r), s) : qr({ ...t, data: n }, s);
   }
 }
-class dp {
+class pp {
   constructor(t) {
     this.registry = t;
   }
@@ -5072,7 +5072,7 @@ class Dt {
     return t.data.size() === 0 ? { data: t.data, mapping: {} } : this.computeStat(t);
   }
 }
-class pp extends Dt {
+class mp extends Dt {
   constructor() {
     super(...arguments), this.type = "count", this.computedVariables = /* @__PURE__ */ new Set(["y"]);
   }
@@ -5089,7 +5089,7 @@ class pp extends Dt {
     };
   }
 }
-class mp extends Dt {
+class fp extends Dt {
   constructor() {
     super(...arguments), this.type = "identity", this.computedVariables = /* @__PURE__ */ new Set();
   }
@@ -5097,7 +5097,7 @@ class mp extends Dt {
     return { data: t, mapping: {} };
   }
 }
-class fp extends Dt {
+class hp extends Dt {
   constructor() {
     super(...arguments), this.type = "mean", this.computedVariables = /* @__PURE__ */ new Set(["y"]);
   }
@@ -5111,8 +5111,8 @@ class fp extends Dt {
     };
   }
 }
-const hp = 2, yo = 1440 * 60 * 1e3;
-class yp extends Dt {
+const yp = 2, yo = 1440 * 60 * 1e3;
+class gp extends Dt {
   constructor() {
     super(...arguments), this.type = "smooth", this.computedVariables = /* @__PURE__ */ new Set();
   }
@@ -5127,9 +5127,9 @@ class yp extends Dt {
     const i = t.getType(o), c = t.getType(a);
     if (c !== "numeric")
       throw new Error(`'smooth' stat requires a numeric 'y' (got '${c}' for variable '${a}')`);
-    const l = vn(t, n), u = Ap(o, i, a, l, t);
+    const l = vn(t, n), u = Tp(o, i, a, l, t);
     return l.length === 0 ? Qr({ data: t, xVariable: o, xType: i, yVariable: a, spec: r, output: u, groupObservation: {}, xScaleIsDiscrete: s }) : t.groupBy(...l).forEach((d) => {
-      const p = Tp(d, l);
+      const p = Mp(d, l);
       Qr({
         data: d,
         xVariable: o,
@@ -5153,23 +5153,23 @@ const Qr = ({
   groupObservation: a,
   xScaleIsDiscrete: i
 }) => {
-  const { observations: c, temporalOrigin: l } = gp({ data: e, xVariable: t, yVariable: r, xType: n });
-  c.length < hp || (i ? wp({ observations: c, spec: s, output: o, groupObservation: a }) : xp({ observations: c, xType: n, temporalOrigin: l, spec: s, output: o, groupObservation: a }));
-}, gp = ({
+  const { observations: c, temporalOrigin: l } = bp({ data: e, xVariable: t, yVariable: r, xType: n });
+  c.length < yp || (i ? Ap({ observations: c, spec: s, output: o, groupObservation: a }) : Sp({ observations: c, xType: n, temporalOrigin: l, spec: s, output: o, groupObservation: a }));
+}, bp = ({
   data: e,
   xVariable: t,
   yVariable: n,
   xType: r
 }) => {
-  const s = e.getValues(t), o = e.getValues(n, { type: "numeric" }), a = r === "temporal" ? bp(s) : null, i = [], c = /* @__PURE__ */ new Map();
+  const s = e.getValues(t), o = e.getValues(n, { type: "numeric" }), a = r === "temporal" ? vp(s) : null, i = [], c = /* @__PURE__ */ new Map();
   for (let l = 0; l < s.length; l++) {
     const u = s[l], d = o[l];
     if (!h(u) || !h(d) || !Number.isFinite(d)) continue;
-    const p = vp({ xValue: u, xType: r, categoryRank: c, temporalOrigin: a });
+    const p = xp({ xValue: u, xType: r, categoryRank: c, temporalOrigin: a });
     p !== null && i.push({ x: p, y: d, originalX: u });
   }
   return { observations: i, temporalOrigin: a };
-}, bp = (e) => {
+}, vp = (e) => {
   let t = null;
   for (const n of e) {
     if (!O(n)) continue;
@@ -5177,7 +5177,7 @@ const Qr = ({
     (t === null || r < t) && (t = r);
   }
   return t;
-}, vp = ({
+}, xp = ({
   xValue: e,
   xType: t,
   categoryRank: n,
@@ -5203,7 +5203,7 @@ const Qr = ({
       throw new Error(`Unexpected xType: ${s}`);
     }
   }
-}, xp = ({
+}, Sp = ({
   observations: e,
   xType: t,
   temporalOrigin: n,
@@ -5214,10 +5214,10 @@ const Qr = ({
   const a = go(r, e);
   for (const [i, c] of a) {
     if (!Number.isFinite(i) || !Number.isFinite(c)) continue;
-    const l = t === "temporal" ? Sp(i, n) : i;
+    const l = t === "temporal" ? wp(i, n) : i;
     s.push({ x: l, y: c, groupObservation: o });
   }
-}, Sp = (e, t) => t === null ? new Date(e) : new Date((e - 1) * yo + t), wp = ({
+}, wp = (e, t) => t === null ? new Date(e) : new Date((e - 1) * yo + t), Ap = ({
   observations: e,
   spec: t,
   output: n,
@@ -5242,25 +5242,25 @@ const Qr = ({
     const c = s.get(i), l = a.predict(i);
     c === void 0 || !Number.isFinite(l) || n.push({ x: c, y: l, groupObservation: r });
   }
-}, go = (e, t) => e.method === "loess" ? ma().x((r) => r.x).y((r) => r.y).bandwidth(e.bandwidth)(t) : bo(e, t), bo = (e, t) => {
+}, go = (e, t) => e.method === "loess" ? fa().x((r) => r.x).y((r) => r.y).bandwidth(e.bandwidth)(t) : bo(e, t), bo = (e, t) => {
   const n = (s) => s.x, r = (s) => s.y;
   switch (e.method) {
     case "linear":
-      return va().x(n).y(r)(t);
+      return xa().x(n).y(r)(t);
     case "exponential":
-      return ba().x(n).y(r)(t);
+      return va().x(n).y(r)(t);
     case "logarithmic":
-      return ga().x(n).y(r)(t);
+      return ba().x(n).y(r)(t);
     case "quadratic":
-      return ya().x(n).y(r)(t);
+      return ga().x(n).y(r)(t);
     case "power":
-      return ha().x(n).y(r)(t);
+      return ya().x(n).y(r)(t);
     case "polynomial":
-      return fa().x(n).y(r).order(e.order)(t);
+      return ha().x(n).y(r).order(e.order)(t);
     case "loess":
       throw new Error("'loess' does not expose a 'predict' function");
   }
-}, Ap = (e, t, n, r, s) => {
+}, Tp = (e, t, n, r, s) => {
   const o = [], a = [], i = Object.fromEntries(
     r.map((c) => [c, []])
   );
@@ -5284,7 +5284,7 @@ const Qr = ({
       return new E(c);
     }
   };
-}, Tp = (e, t) => {
+}, Mp = (e, t) => {
   const n = {};
   for (const r of t) {
     const s = e.getValues(r);
@@ -5292,12 +5292,12 @@ const Qr = ({
   }
   return n;
 };
-class Mp extends Ce {
+class Lp extends Ce {
   constructor() {
-    super("stat"), this.register("identity", new mp()), this.register("count", new pp()), this.register("smooth", new yp()), this.register("mean", new fp());
+    super("stat"), this.register("identity", new fp()), this.register("count", new mp()), this.register("smooth", new gp()), this.register("mean", new hp());
   }
 }
-const Lp = ({ layer: e }) => {
+const Vp = ({ layer: e }) => {
   if (e.geom !== "bar" || e.position === "stack") return;
   const t = v(e.mapping.y);
   if (t === null) return;
@@ -5307,14 +5307,14 @@ const Lp = ({ layer: e }) => {
     I(o) && (n += o, r += Math.abs(o));
   }
   return { grandTotal: n, absoluteGrandTotal: r };
-}, Vp = ({ layer: e }) => {
+}, Ep = ({ layer: e }) => {
   if (e.geom !== "bar" || e.position !== "stack") return;
   const t = v(e.mapping.x);
   if (t === null || !e.data.hasVariable(f.yMin) || !e.data.hasVariable(f.yMax))
     return;
   const n = /* @__PURE__ */ new Map();
   for (const s of e.data) {
-    const o = s[t], a = se(s), i = H(s), c = ge(s), l = ie(s), u = Fa(s);
+    const o = s[t], a = se(s), i = H(s), c = ge(s), l = ie(s), u = _a(s);
     if (!h(o) || !h(a) || !h(i) || !h(c) || !h(l) || !h(u))
       continue;
     const d = u >= 0;
@@ -5349,18 +5349,18 @@ const Lp = ({ layer: e }) => {
   }
   return r;
 };
-class Ep extends Ie {
+class kp extends Ie {
   dependencies() {
     return [];
   }
   compileLayer(t) {
-    const n = {}, r = Vp({ layer: t });
+    const n = {}, r = Ep({ layer: t });
     r !== void 0 && (n.stackTotals = r);
-    const s = Lp({ layer: t });
+    const s = Vp({ layer: t });
     return s !== void 0 && (n.grandTotal = s.grandTotal, n.absoluteGrandTotal = s.absoluteGrandTotal), { ...t, summary: n };
   }
 }
-class kp extends ce {
+class Ip extends ce {
   constructor(t) {
     super(), this.registry = t;
   }
@@ -5374,7 +5374,7 @@ class kp extends ce {
     return t.transforms.reduce((n, r) => this.registry.get(r.transformType).apply(n, r), t.data);
   }
 }
-class Ip {
+class Cp {
   constructor() {
     this.transformType = "aggregate";
   }
@@ -5388,7 +5388,7 @@ class Ip {
     return t.groupBy(...r.groupby).rollup(s);
   }
 }
-class Cp {
+class Dp {
   constructor() {
     this.transformType = "constant";
   }
@@ -5397,7 +5397,7 @@ class Cp {
     return t.addConstantVariable(r.variableName, r.type, r.value);
   }
 }
-class Dp {
+class Fp {
   constructor() {
     this.transformType = "filter";
   }
@@ -5406,7 +5406,7 @@ class Dp {
     return t.filter(r.variableName, r.operator, r.value);
   }
 }
-class Fp {
+class _p {
   constructor() {
     this.transformType = "reshape";
   }
@@ -5420,7 +5420,7 @@ class Fp {
     });
   }
 }
-class _p {
+class Rp {
   constructor() {
     this.transformType = "sort";
   }
@@ -5429,9 +5429,9 @@ class _p {
     return t.orderBy(r.variableName, r.direction ?? "asc");
   }
 }
-class Rp extends Ce {
+class Np extends Ce {
   constructor() {
-    super("transform"), this.register("aggregate", new Ip()), this.register("constant", new Cp()), this.register("filter", new Dp()), this.register("reshape", new Fp()), this.register("sort", new _p());
+    super("transform"), this.register("aggregate", new Cp()), this.register("constant", new Dp()), this.register("filter", new Fp()), this.register("reshape", new _p()), this.register("sort", new Rp());
   }
 }
 const Zr = {
@@ -5440,16 +5440,16 @@ const Zr = {
   alpha: "numeric",
   strokeWidth: "numeric",
   lineType: "categorical"
-}, Np = [
+}, Pp = [
   "color",
   "size",
   "alpha",
   "strokeWidth",
   "lineType"
 ];
-class Pp extends Ie {
+class Op extends Ie {
   dependencies(t) {
-    return Np.map((n) => t.scales[n]);
+    return Pp.map((n) => t.scales[n]);
   }
   compileLayer(t, n) {
     let r = t.data;
@@ -5462,13 +5462,13 @@ class Pp extends Ie {
       }
       const c = v(t.mapping[o]), l = n.scales[o];
       if (!l || l.kind !== "visual") continue;
-      const u = Op(o, c, l);
+      const u = $p(o, c, l);
       u && (r = r.deriveVariable(a, Zr[o], u));
     }
     return { ...t, data: r };
   }
 }
-const Op = (e, t, n) => {
+const $p = (e, t, n) => {
   if (!t) {
     if (e !== "color" || n.spec.scaleType !== "palette") return null;
     const r = n.map(null);
@@ -5491,7 +5491,7 @@ const Op = (e, t, n) => {
   "config",
   "annotations"
 ];
-class $p {
+class Bp {
   constructor(t, n, r, s, o, a, i, c, l, u, d, p, m, y, g) {
     this.dataCompiler = t, this.specCompiler = n, this.transformCompiler = r, this.constantMappingCompiler = s, this.layerValidationCheck = o, this.layerCompiler = a, this.scaleCompiler = i, this.coordCompiler = c, this.positionMapperCompiler = l, this.visualMapperCompiler = u, this.guideCompiler = d, this.summariseCompiler = p, this.highlightsCompiler = m, this.configCompiler = y, this.annotationsCompiler = g, this.lastCompile = null, this.lastData = void 0, this.stages = [
       { name: "data", getStats: () => this.dataCompiler.stats },
@@ -5629,29 +5629,29 @@ class $p {
   }
 }
 const cg = () => {
-  const e = new Mp(), t = new fu(), n = new oc(), r = new kp(new Rp());
-  return new $p(
-    new Ki(),
-    new up(),
+  const e = new Lp(), t = new hu(), n = new ac(), r = new Ip(new Np());
+  return new Bp(
+    new Xi(),
+    new dp(),
     r,
-    new ja(),
-    new Cl(r, new Dl(n, e)),
-    new Il(
+    new qa(),
+    new Dl(r, new Fl(n, e)),
+    new Cl(
       r,
-      new dp(e),
-      new ac(),
-      new Zi(n),
-      new Fl(new Ol())
+      new pp(e),
+      new ic(),
+      new Ji(n),
+      new _l(new $l())
     ),
-    new Ul(t),
-    new Ja(new pi()),
-    new Hl(),
-    new Pp(),
-    new gl(),
-    new Ep(),
-    new Vl(),
-    new Xa(),
-    new Ba()
+    new Kl(t),
+    new ei(new mi()),
+    new Ul(),
+    new Op(),
+    new bl(),
+    new kp(),
+    new El(),
+    new ja(),
+    new za()
   );
 };
 function lg(e, t) {
@@ -5665,7 +5665,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   } catch {
     return vo;
   }
-}, le = (e) => (t) => I(t) ? e(t) : Cn, Dn = (e) => (t) => Ue(t) ? t : Cn, Bp = 2, zp = 3, Gp = 2, Wp = 0, Yp = 1, Hp = 2, Up = xa.humanizer({
+}, le = (e) => (t) => I(t) ? e(t) : Cn, Dn = (e) => (t) => Ue(t) ? t : Cn, zp = 2, Gp = 3, Wp = 2, Yp = 0, Hp = 1, Up = 2, Kp = Sa.humanizer({
   language: "en",
   spacer: "",
   delimiter: " ",
@@ -5687,7 +5687,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   numberFormat: n,
   intlOptions: r
 }) => le((s) => {
-  const o = typeof n.decimals == "number" ? n.decimals : Bp, a = Nn(s, o), { base: i, suffix: c } = Rn(s, n.abbreviation), l = {
+  const o = typeof n.decimals == "number" ? n.decimals : zp, a = Nn(s, o), { base: i, suffix: c } = Rn(s, n.abbreviation), l = {
     ...a,
     ...ks(e) ? { style: "currency", currencyDisplay: "narrowSymbol", currency: e.iso } : {},
     ...r
@@ -5700,7 +5700,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
 }) => le((r) => {
   const { base: s, suffix: o } = Rn(r, t.abbreviation), i = { ...Nn(s, t.decimals), ...n };
   return `${Intl.NumberFormat(e, i).format(s)}${o}`;
-}), _n = (e) => le((t) => Up(t)), So = ({ locale: e, intlOptions: t }) => le(
+}), _n = (e) => le((t) => Kp(t)), So = ({ locale: e, intlOptions: t }) => le(
   (n) => Intl.NumberFormat(e, { maximumFractionDigits: 0, ...t }).format(n)
 ), wo = ({
   locale: e,
@@ -5714,7 +5714,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     case "none":
       return { base: e, suffix: "" };
     case "auto": {
-      const n = Kp(e);
+      const n = Xp(e);
       return Rn(e, n);
     }
     default:
@@ -5723,24 +5723,24 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
 }, Nn = (e, t) => {
   if (typeof t == "number")
     return { minimumFractionDigits: t, maximumFractionDigits: t };
-  const n = Math.ceil(Math.log10(Math.abs(e))), r = n >= zp ? Wp : n === Gp ? Yp : Hp;
+  const n = Math.ceil(Math.log10(Math.abs(e))), r = n >= Gp ? Yp : n === Wp ? Hp : Up;
   return {
     minimumFractionDigits: t === "auto" ? 0 : r,
     maximumFractionDigits: r
   };
-}, Kp = (e) => {
+}, Xp = (e) => {
   const t = Math.abs(e);
   return t >= Be.b ? "b" : t >= Be.m ? "m" : t >= Be.k ? "k" : "none";
-}, Xp = ({ locale: e, intlOptions: t }) => R(
+}, jp = ({ locale: e, intlOptions: t }) => R(
   (n) => Intl.DateTimeFormat(e, { dateStyle: "medium", ...N, ...t }).format(n)
-), jp = ({ locale: e, intlOptions: t }) => R((n) => {
+), qp = ({ locale: e, intlOptions: t }) => R((n) => {
   const r = Intl.DateTimeFormat(e, {
     dateStyle: "medium",
     timeStyle: "medium",
     ...N,
     ...t
   }).formatToParts(n);
-  return qp(r.map(Qp));
+  return Qp(r.map(Zp));
 }), Ao = ({ locale: e, intlOptions: t }) => R(
   (n) => Intl.DateTimeFormat(e, {
     day: "numeric",
@@ -5784,7 +5784,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   (n) => Intl.DateTimeFormat(e, { year: "numeric", ...N, ...t }).format(n)
 ), Vo = ({ locale: e, intlOptions: t }) => R(
   (n) => Intl.DateTimeFormat(e, { timeStyle: "short", ...N, ...t }).format(n)
-), qp = (e) => e.map((t) => t.value).join(""), Qp = (e) => e.type !== "literal" || e.value !== ", " ? e : { type: "literal", value: " • " }, Zp = 1, Jp = 4, em = 1, Jr = 1e3, tm = ({
+), Qp = (e) => e.map((t) => t.value).join(""), Zp = (e) => e.type !== "literal" || e.value !== ", " ? e : { type: "literal", value: " • " }, Jp = 1, em = 4, tm = 1, Jr = 1e3, nm = ({
   valueFormat: e,
   locale: t,
   tickValues: n,
@@ -5797,14 +5797,14 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     ...r
   };
   return Bn(s, t, a);
-}), nm = ({
+}), rm = ({
   locale: e,
   tickValues: t,
   intlOptions: n
 }) => le((r) => {
   const o = { ...zn(r, t), notation: "compact", ...n };
   return Bn(r, e, o);
-}), rm = ({
+}), sm = ({
   locale: e,
   tickValues: t,
   intlOptions: n
@@ -5816,11 +5816,11 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     style: "percent"
   };
   return Bn(r, e, o);
-}), Bn = (e, t, n) => Intl.NumberFormat(t, n).formatToParts(e).map((s) => s.type === "compact" ? s.value.toLowerCase() : s.value).join(""), Eo = (e) => Math.abs(e) > Jr ? Eo(e / Jr) : Number.isInteger(e), sm = (e) => {
+}), Bn = (e, t, n) => Intl.NumberFormat(t, n).formatToParts(e).map((s) => s.type === "compact" ? s.value.toLowerCase() : s.value).join(""), Eo = (e) => Math.abs(e) > Jr ? Eo(e / Jr) : Number.isInteger(e), om = (e) => {
   if (e.length < 2) return !1;
   const [t, n] = e;
-  return typeof t != "number" || typeof n != "number" ? !1 : Math.abs(n - t) < Zp;
-}, zn = (e, t) => Eo(e) ? { minimumFractionDigits: 0, maximumFractionDigits: 0 } : sm(t) ? { minimumFractionDigits: 0, maximumFractionDigits: Jp } : { minimumFractionDigits: 0, maximumFractionDigits: em }, om = ({
+  return typeof t != "number" || typeof n != "number" ? !1 : Math.abs(n - t) < Jp;
+}, zn = (e, t) => Eo(e) ? { minimumFractionDigits: 0, maximumFractionDigits: 0 } : om(t) ? { minimumFractionDigits: 0, maximumFractionDigits: em } : { minimumFractionDigits: 0, maximumFractionDigits: tm }, am = ({
   locale: e,
   intlOptions: t
 }) => R(
@@ -5830,12 +5830,12 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     ...N,
     ...t
   }).format(n)
-), am = ({
+), im = ({
   locale: e,
   intlOptions: t
 }) => R(
   (n) => Intl.DateTimeFormat(e, { month: "short", ...N, ...t }).format(n)
-), im = ({
+), cm = ({
   locale: e,
   intlOptions: t
 }) => R(
@@ -5845,7 +5845,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     ...N,
     ...t
   }).format(n)
-), cm = ({
+), lm = ({
   locale: e,
   intlOptions: t
 }) => R(
@@ -5854,31 +5854,31 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   const { valueFormat: t } = e;
   switch (t.type) {
     case "currency":
-      return tm(e);
+      return nm(e);
     case "date":
     case "datetime":
-      return om(e);
+      return am(e);
     case "day_month":
     case "weekly_date_range":
     case "weekly_date_range_with_year":
-      return im(e);
+      return cm(e);
     case "decimal":
     case "integer":
-      return nm(e);
+      return rm(e);
     case "duration":
       return _n();
     case "month":
-      return am(e);
+      return im(e);
     case "month_year":
       return Pn(e);
     case "percentage":
-      return rm(e);
+      return sm(e);
     case "quarter":
       return On();
     case "text":
       return Dn();
     case "time":
-      return cm(e);
+      return lm(e);
     case "year":
       return $n(e);
     case "lookup":
@@ -5888,7 +5888,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
       throw new Error(`Unhandled value format: ${n.type}`);
     }
   }
-}, lm = 40, um = 60, es = 8, dm = 50, pm = 1 / 3, mm = 1 / 4, Kt = "…", fm = (e, t, n) => {
+}, um = 40, dm = 60, es = 8, pm = 50, mm = 1 / 3, fm = 1 / 4, Kt = "…", hm = (e, t, n) => {
   if (t <= 0 || e.length === 0) return "";
   if (n(e) <= t) return e;
   if (n(Kt) > t) return "";
@@ -5898,7 +5898,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     n(i) <= t ? (o = a, r = a + 1) : s = a - 1;
   }
   return e.slice(0, o) + Kt;
-}, hm = (e) => e.formattedAxis.position === "top" || e.formattedAxis.position === "bottom" ? ym(e) : gm(e), ym = ({
+}, ym = (e) => e.formattedAxis.position === "top" || e.formattedAxis.position === "bottom" ? gm(e) : bm(e), gm = ({
   formattedAxis: e,
   bandwidthPx: t,
   panelRect: n,
@@ -5907,7 +5907,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   const { widths: s, maxWidth: o, maxHeight: a } = ko(e.ticks, r), i = t - es;
   if (o <= i)
     return { ...e, labelRotation: 0, labelMaxWidthPx: null };
-  if (t >= dm) {
+  if (t >= pm) {
     const l = cn(i);
     return {
       ...e,
@@ -5918,14 +5918,14 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   }
   if (a + es > t)
     return { ...e, ticks: [], labelRotation: 0, labelMaxWidthPx: null };
-  const c = cn(n.height * pm);
+  const c = cn(n.height * mm);
   return {
     ...e,
     ticks: an(e.ticks, s, c, r),
     labelRotation: -90,
     labelMaxWidthPx: c
   };
-}, gm = ({
+}, bm = ({
   formattedAxis: e,
   bandwidthPx: t,
   panelRect: n,
@@ -5934,7 +5934,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   const { widths: s, maxWidth: o, maxHeight: a } = ko(e.ticks, r);
   if (a > t)
     return { ...e, ticks: [], labelRotation: 0, labelMaxWidthPx: null };
-  const i = cn(n.width * mm);
+  const i = cn(n.width * fm);
   return o <= i ? { ...e, labelRotation: 0, labelMaxWidthPx: null } : {
     ...e,
     ticks: an(e.ticks, s, i, r),
@@ -5951,17 +5951,17 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   return { widths: n, maxWidth: r, maxHeight: s };
 }, an = (e, t, n, r) => {
   const s = (o) => r(o).width;
-  return e.map((o, a) => (t[a] ?? 0) <= n ? o : { ...o, formattedLabel: fm(o.formattedLabel, n, s) });
-}, cn = (e) => Math.max(0, Math.floor(e)), bm = (e, t, n, r) => {
+  return e.map((o, a) => (t[a] ?? 0) <= n ? o : { ...o, formattedLabel: hm(o.formattedLabel, n, s) });
+}, cn = (e) => Math.max(0, Math.floor(e)), vm = (e, t, n, r) => {
   if (e.length === 0) return !0;
-  const s = t === "top" || t === "bottom", o = s ? um : lm;
+  const s = t === "top" || t === "bottom", o = s ? dm : um;
   let a = n - (e.length - 1) * o;
   for (const i of e) {
     const { width: c, height: l } = r(i);
     if (a -= s ? c : l, a < 0) return !1;
   }
   return !0;
-}, vm = ({
+}, xm = ({
   axis: e,
   availableSpacePx: t,
   measureLabel: n,
@@ -5972,16 +5972,16 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   const a = /* @__PURE__ */ new Map(), i = (d) => {
     const p = a.get(d);
     if (p) return p;
-    const m = s[d], y = m ? xm(m.ticks, r(m)) : [];
+    const m = s[d], y = m ? Sm(m.ticks, r(m)) : [];
     return a.set(d, y), y;
   };
   let c = 0, l = s.length - 1, u = -1;
   for (; c <= l; ) {
     const d = c + l >>> 1, m = i(d).map((y) => y.formattedLabel);
-    bm(m, o, t, n) ? (u = d, c = d + 1) : l = d - 1;
+    vm(m, o, t, n) ? (u = d, c = d + 1) : l = d - 1;
   }
   return u >= 0 ? i(u) : i(0);
-}, xm = (e, t) => e.map((n) => ({ ...n, formattedLabel: t(n.value) })), Xt = 6, jt = 6, qt = 15, Qt = 5, Zt = 15, Io = (e, t) => {
+}, Sm = (e, t) => e.map((n) => ({ ...n, formattedLabel: t(n.value) })), Xt = 6, jt = 6, qt = 15, Qt = 5, Zt = 15, Io = (e, t) => {
   switch (e) {
     case "small":
       return {
@@ -6026,7 +6026,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
         labelFontWeight: 600
       };
   }
-}, Sm = (e) => {
+}, wm = (e) => {
   const t = P({ ...e, valueFormat: e.valueFormat.fallback }), n = {};
   for (const [s, o] of Object.entries(e.valueFormat.cases))
     n[s] = P({ ...e, valueFormat: o });
@@ -6042,9 +6042,9 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     case "currency":
       return xo(e);
     case "date":
-      return Xp(e);
-    case "datetime":
       return jp(e);
+    case "datetime":
+      return qp(e);
     case "day_month":
       return Ao(e);
     case "decimal":
@@ -6072,7 +6072,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     case "time":
       return Vo(e);
     case "lookup":
-      return Sm({ ...e, valueFormat: e.valueFormat });
+      return wm({ ...e, valueFormat: e.valueFormat });
     default: {
       const t = e.valueFormat;
       throw new Error(`Unhandled value format: ${t.type}`);
@@ -6109,16 +6109,16 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
       })(s)}x`;
     }
   }
-}, wm = (e) => {
+}, Am = (e) => {
   const t = e.padding ?? 0, n = ts(e.rows, t), r = ts(e.cols, t);
   return {
     rows: n.tracks,
     cols: r.tracks,
-    placements: Lm(e.placements, n.nameToIndex, r.nameToIndex),
+    placements: Vm(e.placements, n.nameToIndex, r.nameToIndex),
     width: e.containerSize.width,
     height: e.containerSize.height
   };
-}, Am = (e) => {
+}, Tm = (e) => {
   const t = ns(e.rows, e.height), n = ns(e.cols, e.width), r = rs(t), s = rs(n), o = /* @__PURE__ */ new Map();
   for (const a of e.placements) {
     const i = a.rowSpan ?? 1, c = a.colSpan ?? 1, l = s[a.col] ?? 0, u = r[a.row] ?? 0, d = ss(n, a.col, c), p = ss(t, a.row, i);
@@ -6131,20 +6131,20 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   for (let s = 0; s < e.length; s++) {
     const o = e[s];
     if (!o) continue;
-    r.set(o.name, n.length), n.push(Tm(o));
-    const a = Mm(e, s);
+    r.set(o.name, n.length), n.push(Mm(o));
+    const a = Lm(e, s);
     if (Do(o) && a) {
       const i = o.gaps?.after ?? 0, c = a.gaps?.before ?? 0, l = Math.max(i, c);
       l > 0 && n.push({ type: "fixed", pixels: l });
     }
   }
   return t > 0 && n.push({ type: "fixed", pixels: t }), { tracks: n, nameToIndex: r };
-}, Tm = (e) => typeof e.size == "number" ? { type: "fixed", pixels: e.size } : { type: "flex", weight: e.size.flex }, Do = (e) => typeof e.size == "number" ? e.size > 0 : e.size.flex > 0, Mm = (e, t) => {
+}, Mm = (e) => typeof e.size == "number" ? { type: "fixed", pixels: e.size } : { type: "flex", weight: e.size.flex }, Do = (e) => typeof e.size == "number" ? e.size > 0 : e.size.flex > 0, Lm = (e, t) => {
   for (let n = t + 1; n < e.length; n++) {
     const r = e[n];
     if (r && Do(r)) return r;
   }
-}, Lm = (e, t, n) => {
+}, Vm = (e, t, n) => {
   const r = [];
   for (const s of e) {
     const o = t.get(s.row), a = n.get(s.col);
@@ -6177,7 +6177,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   for (let o = t; o < s; o++)
     r += e[o] ?? 0;
   return r;
-}, Vm = 24, ne = {
+}, Fo = 24, ne = {
   header: { after: 10, before: 0 },
   headline: { after: 4, before: 0 },
   topLegend: { after: 16, before: 0 },
@@ -6192,14 +6192,14 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   leftAxis: { after: 4, before: 0 },
   panel: { after: 4, before: 0 },
   rightAxis: { after: 10, before: 0 }
-}, Wn = { top: 0, right: 0, bottom: 0, left: 0 }, Em = (e, t, n, r = Wn) => {
-  const o = n.axes.top > 0 || n.axesLabels.top > 0 ? n.axesLabels.top : Math.max(n.axesLabels.top, n.axesLabels.left, n.axesLabels.right);
-  return wm({
+}, Wn = { top: 0, right: 0, bottom: 0, left: 0 }, Em = (e, t, n, r = Wn, s = Fo) => {
+  const a = n.axes.top > 0 || n.axesLabels.top > 0 ? n.axesLabels.top : Math.max(n.axesLabels.top, n.axesLabels.left, n.axesLabels.right);
+  return Am({
     rows: [
       { name: "header", size: t.headerSize.height, gaps: ne.header },
       { name: "topLegend", size: n.legends.top, gaps: ne.topLegend },
       { name: "headline", size: n.headline, gaps: ne.headline },
-      { name: "topAxisLabel", size: o, gaps: ne.topAxisLabel },
+      { name: "topAxisLabel", size: a, gaps: ne.topAxisLabel },
       { name: "topAxis", size: n.axes.top, gaps: ne.topAxis },
       { name: "topAnnotation", size: r.top },
       { name: "panel", size: { flex: 1 }, gaps: ne.panel },
@@ -6233,7 +6233,7 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
       ...Cm(n.legends)
     ],
     containerSize: e,
-    padding: Vm
+    padding: s
   });
 }, km = (e) => {
   const t = [];
@@ -6320,8 +6320,8 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   containerSize: t,
   measurer: n
 }) => {
-  if (Fo(e)) return 0;
-  const r = _o(e, t.width, n);
+  if (_o(e)) return 0;
+  const r = Ro(e, t.width, n);
   return n.measureHeadline(e.formatted, r).height;
 }, ug = ({
   headline: e,
@@ -6330,15 +6330,15 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
   measurer: r,
   itemGap: s
 }) => {
-  if (Fo(e)) {
+  if (_o(e)) {
     const i = Om(t.panel, e.innerRadius), c = Rm({
       size: e.size,
       availableWidth: i.width,
-      measureStripWidth: Ro(e, r)
+      measureStripWidth: No(e, r)
     });
     return c === null ? null : { rect: i, resolvedSize: c, visibleItemCount: 1 };
   }
-  const o = _o(e, n.width, r);
+  const o = Ro(e, n.width, r);
   if (e.formatted.kind !== "perGroup") return { rect: t.headline, resolvedSize: o, visibleItemCount: 1 };
   const a = Nm({
     itemWidths: r.measureHeadlineItemWidths(e.formatted, o),
@@ -6346,10 +6346,10 @@ const Cn = "–", vo = "n/a", N = { timeZone: "UTC" }, R = (e) => (t) => {
     availableWidth: t.headline.width
   });
   return a === 0 ? null : { rect: t.headline, resolvedSize: o, visibleItemCount: a };
-}, Fo = (e) => e.formatted.kind === "grandTotal" && e.position === "center" && e.innerRadius > 0, Om = (e, t) => {
+}, _o = (e) => e.formatted.kind === "grandTotal" && e.position === "center" && e.innerRadius > 0, Om = (e, t) => {
   const n = Math.min(e.width, e.height) / 2, r = t * n * Math.SQRT2, s = e.x + e.width / 2, o = e.y + e.height / 2;
   return { x: s - r / 2, y: o - r / 2, width: r, height: r };
-}, _o = (e, t, n) => _m({ size: e.size, availableWidth: t, measureStripWidth: Ro(e, n) }), Ro = (e, t) => (n) => t.measureHeadline(e.formatted, n).width, Re = { x: 0, y: 0, width: 0, height: 0 }, $m = "0000";
+}, Ro = (e, t, n) => _m({ size: e.size, availableWidth: t, measureStripWidth: No(e, n) }), No = (e, t) => (n) => t.measureHeadline(e.formatted, n).width, Re = { x: 0, y: 0, width: 0, height: 0 }, $m = "0000";
 class dg {
   constructor(t) {
     this.measurer = t;
@@ -6363,48 +6363,80 @@ class dg {
       externalMeasurements: t.externalMeasurements,
       annotationOverflow: Wn,
       headline: t.headline,
-      locale: t.formattingLocale ?? t.parsingLocale
+      locale: t.formattingLocale ?? t.parsingLocale,
+      padding: t.padding ?? Fo
     }).pipe(({ axes: n, numberFormat: r, locale: s }) => ({
       axisBundles: n.map((o) => ({
         axis: o,
         resolveFormatter: Bm(o, s, r),
         formatted: this.seedAxis(o)
       }))
-    })).pipe(({ axisBundles: n, formattedLegends: r, containerSize: s, externalMeasurements: o, annotationOverflow: a, headline: i }) => ({
-      layout: this.resolveLayout({
-        axes: n.map((c) => c.formatted),
+    })).pipe(
+      ({
+        axisBundles: n,
         formattedLegends: r,
         containerSize: s,
         externalMeasurements: o,
         annotationOverflow: a,
-        headline: i
+        headline: i,
+        padding: c
+      }) => ({
+        layout: this.resolveLayout({
+          axes: n.map((l) => l.formatted),
+          formattedLegends: r,
+          containerSize: s,
+          externalMeasurements: o,
+          annotationOverflow: a,
+          headline: i,
+          padding: c
+        })
       })
-    })).pipe(({ axisBundles: n, layout: r }) => ({
+    ).pipe(({ axisBundles: n, layout: r }) => ({
       axisBundles: n.map(
         (s) => is(s.axis.position) ? { ...s, formatted: this.finalizeAxis(s.axis, s.resolveFormatter, r.panel) } : s
       )
-    })).pipe(({ axisBundles: n, formattedLegends: r, containerSize: s, externalMeasurements: o, annotationOverflow: a, headline: i }) => ({
-      layout: this.resolveLayout({
-        axes: n.map((c) => c.formatted),
+    })).pipe(
+      ({
+        axisBundles: n,
         formattedLegends: r,
         containerSize: s,
         externalMeasurements: o,
         annotationOverflow: a,
-        headline: i
+        headline: i,
+        padding: c
+      }) => ({
+        layout: this.resolveLayout({
+          axes: n.map((l) => l.formatted),
+          formattedLegends: r,
+          containerSize: s,
+          externalMeasurements: o,
+          annotationOverflow: a,
+          headline: i,
+          padding: c
+        })
       })
-    })).pipe(({ axisBundles: n, layout: r }) => ({
+    ).pipe(({ axisBundles: n, layout: r }) => ({
       formattedAxes: n.map(
         (s) => is(s.axis.position) ? s.formatted : this.finalizeAxis(s.axis, s.resolveFormatter, r.panel)
       )
     })).pipe(
-      ({ formattedAxes: n, formattedLegends: r, containerSize: s, externalMeasurements: o, annotationOverflow: a, headline: i }) => ({
+      ({
+        formattedAxes: n,
+        formattedLegends: r,
+        containerSize: s,
+        externalMeasurements: o,
+        annotationOverflow: a,
+        headline: i,
+        padding: c
+      }) => ({
         layout: this.resolveLayout({
           axes: n,
           formattedLegends: r,
           containerSize: s,
           externalMeasurements: o,
           annotationOverflow: a,
-          headline: i
+          headline: i,
+          padding: c
         })
       })
     ).pipe(
@@ -6416,18 +6448,20 @@ class dg {
         layout: a,
         annotationOverflow: i,
         headline: c,
-        locale: l
+        locale: l,
+        padding: u
       }) => {
-        const u = this.measureAnnotationOverflow(t, a.panel, l, i);
-        return u === i ? { formattedAxes: n, layout: a } : {
+        const d = this.measureAnnotationOverflow(t, a.panel, l, i);
+        return d === i ? { formattedAxes: n, layout: a } : {
           formattedAxes: n,
           layout: this.resolveLayout({
             axes: n,
             formattedLegends: r,
             containerSize: s,
             externalMeasurements: o,
-            annotationOverflow: u,
-            headline: c
+            annotationOverflow: d,
+            headline: c,
+            padding: u
           })
         };
       }
@@ -6463,7 +6497,7 @@ class dg {
     };
   }
   finalizeAxis(t, n, r) {
-    const o = t.position === "top" || t.position === "bottom" ? r.width : r.height, a = vm({
+    const o = t.position === "top" || t.position === "bottom" ? r.width : r.height, a = xm({
       axis: t,
       availableSpacePx: o,
       measureLabel: this.measurer.measureTickLabel,
@@ -6471,7 +6505,7 @@ class dg {
     }), { tickCandidates: i, ...c } = t, l = { ...c, ticks: a, labelRotation: 0, labelMaxWidthPx: null };
     if (t.scaleType === "discrete" && t.bandwidth !== void 0) {
       const u = t.bandwidth * o;
-      return hm({
+      return ym({
         formattedAxis: l,
         bandwidthPx: u,
         panelRect: r,
@@ -6486,18 +6520,19 @@ class dg {
     containerSize: r,
     externalMeasurements: s,
     annotationOverflow: o,
-    headline: a
+    headline: a,
+    padding: i
   }) {
-    const i = this.measureGuides(t, n, a, r), c = Em(r, s, i, o), l = Am(c);
+    const c = this.measureGuides(t, n, a, r), l = Em(r, s, c, o, i), u = Tm(l);
     return {
-      header: l.get("header") ?? Re,
-      headline: l.get("headline") ?? Re,
-      footer: l.get("footer") ?? Re,
-      plot: l.get("plot") ?? Re,
-      panel: l.get("panel") ?? Re,
-      axes: en(l, "Axis"),
-      axisLabels: en(l, "AxisLabel"),
-      legends: en(l, "Legend")
+      header: u.get("header") ?? Re,
+      headline: u.get("headline") ?? Re,
+      footer: u.get("footer") ?? Re,
+      plot: u.get("plot") ?? Re,
+      panel: u.get("panel") ?? Re,
+      axes: en(u, "Axis"),
+      axisLabels: en(u, "AxisLabel"),
+      legends: en(u, "Legend")
     };
   }
   /**
@@ -6687,18 +6722,18 @@ const Te = (e) => `${Number.parseFloat((e * 100).toFixed(4))}%`, Hn = 12, Wm = 4
     if (d === null) continue;
     const p = s(u);
     if (p === "") continue;
-    const { width: m, height: y } = r("dataLabel", p), g = No(d, n);
+    const { width: m, height: y } = r("dataLabel", p), g = Po(d, n);
     m > g.width && (c = !0);
     const b = l === null ? null : u[l], x = I(b) && b < 0;
     i.push({ key: a(u), isNegative: x, text: p, labelWidth: m, labelHeight: y, bounds: g });
   }
   return { entries: i, shouldRotate: !o && c };
-}, No = (e, t) => ({
+}, Po = (e, t) => ({
   x: e.x * t.width,
   y: e.y * t.height,
   width: e.width * t.width,
   height: e.height * t.height
-}), Po = (e, t, n, r, s) => {
+}), Oo = (e, t, n, r, s) => {
   if (e === "x") {
     let i = 1 - s, c = s - r;
     return c < 0 && (i += c, c = -c), { x: t, y: i, width: n - t, height: c };
@@ -6707,11 +6742,11 @@ const Te = (e) => `${Number.parseFloat((e * 100).toFixed(4))}%`, Hn = 12, Wm = 4
   return a < 0 && (o += a, a = -a), { x: o, y: 1 - s, width: a, height: s - r };
 }, jm = (e, t) => {
   const n = ge(t), r = ie(t), s = se(t), o = H(t) ?? C(t);
-  return n === null || r === null || s === null || o === null ? null : Po(e, n, r, s, o);
+  return n === null || r === null || s === null || o === null ? null : Oo(e, n, r, s, o);
 }, qm = (e, t) => {
   const { xMin: n, xMax: r, yMin: s, yMax: o } = t.anchor;
-  return Po(e, n, r, s, o);
-}, Qm = (e, t) => e === "x" ? t ? "bottom" : "top" : t ? "left" : "right", Oo = (e, t, n) => n ? { width: t, height: e } : { width: e, height: t }, Zm = (e) => e.isStacked ? Jm({
+  return Oo(e, n, r, s, o);
+}, Qm = (e, t) => e === "x" ? t ? "bottom" : "top" : t ? "left" : "right", $o = (e, t, n) => n ? { width: t, height: e } : { width: e, height: t }, Zm = (e) => e.isStacked ? Jm({
   bounds: e.bounds,
   labelWidth: e.labelWidth,
   labelHeight: e.labelHeight,
@@ -6730,7 +6765,7 @@ const Te = (e) => `${Number.parseFloat((e * 100).toFixed(4))}%`, Hn = 12, Wm = 4
   labelHeight: n,
   isRotated: r
 }) => {
-  const s = Oo(t, n, r);
+  const s = $o(t, n, r);
   return s.width > e.width || s.height > e.height ? null : { x: e.x + e.width / 2, y: e.y + e.height / 2, isRotated: r, position: "inside" };
 }, ef = (e, t, n, r) => {
   switch (e) {
@@ -6752,7 +6787,7 @@ const Te = (e) => `${Number.parseFloat((e * 100).toFixed(4))}%`, Hn = 12, Wm = 4
   panelWidth: o,
   panelHeight: a
 }) => {
-  const i = e === "top" || e === "bottom", c = t.x + t.width / 2, l = t.y + t.height / 2, u = Oo(n, r, s), d = i ? u.height : u.width, p = i ? u.width : u.height, m = i ? t.height : t.width, y = i ? t.width : t.height, g = d / 2, { edgeCoord: b, outwardSign: x, panelExtent: S } = ef(e, t, o, a);
+  const i = e === "top" || e === "bottom", c = t.x + t.width / 2, l = t.y + t.height / 2, u = $o(n, r, s), d = i ? u.height : u.width, p = i ? u.width : u.height, m = i ? t.height : t.width, y = i ? t.width : t.height, g = d / 2, { edgeCoord: b, outwardSign: x, panelExtent: S } = ef(e, t, o, a);
   if (d + tn < m) {
     if (p > y) return null;
     if (s) return { x: c, y: l, isRotated: !0, position: "inside" };
@@ -6780,7 +6815,7 @@ const Te = (e) => `${Number.parseFloat((e * 100).toFixed(4))}%`, Hn = 12, Wm = 4
   if (a === void 0 || a.length === 0) return o;
   const i = t === "y";
   for (const c of a) {
-    const l = No(qm(t, c), n), u = s(c.total), { width: d, height: p } = r("stackTotal", u), m = c.anchor.direction === "positive";
+    const l = Po(qm(t, c), n), u = s(c.total), { width: d, height: p } = r("stackTotal", u), m = c.anchor.direction === "positive";
     let y, g;
     i ? (y = m ? l.x + l.width + lt + d / 2 : l.x - lt - d / 2, g = l.y + l.height / 2) : (y = l.x + l.width / 2, g = m ? l.y - lt - p / 2 : l.y + l.height + lt + p / 2), o.push({
       layerId: e.id,
@@ -6830,7 +6865,7 @@ const Te = (e) => `${Number.parseFloat((e * 100).toFixed(4))}%`, Hn = 12, Wm = 4
     if (r === null || s === null || r < 0 || r > 1 || s < 0 || s > 1) continue;
     const o = e.formatLabel(n);
     if (o === "") continue;
-    const { width: a, height: i } = e.measureDataLabel("dataLabel", o), c = (_a(n) ?? e.layer.params.size) / 2, l = r * e.panelRect.width, u = (1 - s) * e.panelRect.height - c - Hn - i / 2;
+    const { width: a, height: i } = e.measureDataLabel("dataLabel", o), c = (Ra(n) ?? e.layer.params.size) / 2, l = r * e.panelRect.width, u = (1 - s) * e.panelRect.height - c - Hn - i / 2;
     t.push({
       layerId: e.layer.id,
       key: e.getObservationKey(n),
@@ -6892,7 +6927,7 @@ const uf = " · ", df = (e) => typeof e == "string" ? e : e instanceof Date ? e.
   place: mf,
   getPercentageValueStrategy: () => "absoluteGrandTotal"
 }, hf = { type: "decimal" };
-function $o({
+function Bo({
   layer: e,
   numberFormat: t,
   locale: n
@@ -6910,7 +6945,7 @@ const yf = ({
   formattingLocale: a,
   percentageValueStrategy: i
 }) => {
-  const c = $o({
+  const c = Bo({
     layer: e,
     numberFormat: r,
     locale: a
@@ -6986,7 +7021,7 @@ const yf = ({
     valueFormat: { type: "percentage" },
     locale: r,
     numberFormat: t
-  }), u = e.dataLabels.format === "percentage" && Bo(e);
+  }), u = e.dataLabels.format === "percentage" && zo(e);
   return (d) => {
     const p = a(d);
     if (p === null) return "";
@@ -7003,7 +7038,7 @@ const yf = ({
 }) => {
   const o = e.dataLabels.labelSource, a = v(o);
   if (a !== null) {
-    if (Bo(e)) return s;
+    if (zo(e)) return s;
     const i = Af(e, n, t, r, a);
     if (i !== null) return i;
   }
@@ -7012,7 +7047,7 @@ const yf = ({
     locale: r,
     numberFormat: t
   });
-}, Bo = (e) => {
+}, zo = (e) => {
   const t = v(e.dataLabels.labelSource);
   return t === null ? !1 : t === v(Mn(e.position, e.mapping));
 }, Af = (e, t, n, r, s) => {
@@ -7027,7 +7062,7 @@ const yf = ({
 }, Tf = (e, t) => {
   const n = ae(t);
   if (n !== void 0)
-    return typeof n == "number" ? { type: "decimal" } : ka(n) ? { type: "date" } : { type: "text" };
+    return typeof n == "number" ? { type: "decimal" } : Ia(n) ? { type: "date" } : { type: "text" };
   const r = v(t);
   return r === null || !e.hasVariable(r) ? { type: "text" } : e.getValueFormat(r);
 }, Mf = {
@@ -7233,7 +7268,7 @@ function xg(e, t) {
 const Sg = ({ guides: e, numberFormat: t, layer: n, locale: r }) => {
   const s = n.data.getFirst();
   if (!s) return null;
-  const o = n.mapping.y !== void 0, i = (o ? xl : Tn)(n.data, n.mapping)(s);
+  const o = n.mapping.y !== void 0, i = (o ? Sl : Tn)(n.data, n.mapping)(s);
   if (i === null) return null;
   const c = o ? qe(n.yScaleType) : "x", l = Un(e, c)?.valueFormat ?? { type: "decimal" };
   return P({ valueFormat: l, locale: r, numberFormat: t })(i);
@@ -7322,7 +7357,7 @@ const Sg = ({ guides: e, numberFormat: t, layer: n, locale: r }) => {
     dashOffset: th(s, c),
     arrowheadExtent: d
   };
-}, rh = (e, t) => Math.min(e, t * e / nh), sh = 2, zo = (e) => e === "catmull-rom" ? Sa : wa, Tg = (e) => {
+}, rh = (e, t) => Math.min(e, t * e / nh), sh = 2, Go = (e) => e === "catmull-rom" ? wa : Aa, Tg = (e) => {
   switch (e) {
     case "dashed":
       return "8 4";
@@ -7331,8 +7366,8 @@ const Sg = ({ guides: e, numberFormat: t, layer: n, locale: r }) => {
     case "solid":
       return;
   }
-}, Mg = (e, t) => t.lineWidth !== "auto" ? t.lineWidth : Ra(e) ?? sh, Lg = (e, t) => {
-  const n = zo(t.interpolate), r = Aa().curve(n), s = vs().curve(n);
+}, Mg = (e, t) => t.lineWidth !== "auto" ? t.lineWidth : Na(e) ?? sh, Lg = (e, t) => {
+  const n = Go(t.interpolate), r = Ta().curve(n), s = vs().curve(n);
   if (e.mainAxis === "y") {
     const o = (c) => Ve(C(c) ?? 0), a = (c) => ge(c) ?? 0, i = (c) => ie(c) ?? G(c) ?? 0;
     r.y(o).x0(a).x1(i), s.y(o).x(i);
@@ -7355,16 +7390,16 @@ const Sg = ({ guides: e, numberFormat: t, layer: n, locale: r }) => {
   let a = n, i = r - n;
   return i < 0 && (a += i, i = -i), { x: a, y: 1 - o, width: i, height: o - s };
 }, kg = (e) => {
-  const t = vs().x((n) => G(n) ?? 0).y((n) => Ve(C(n) ?? 0)).curve(zo(e.interpolate));
+  const t = vs().x((n) => G(n) ?? 0).y((n) => Ve(C(n) ?? 0)).curve(Go(e.interpolate));
   return e.missingValues === "gap" && t.defined((n) => G(n) !== null && C(n) !== null), t;
-}, Ig = (e, t) => t !== "connect" ? e : e.filter((n) => G(n) !== null && C(n) !== null), oh = Ta(), Cg = (e) => oh(e), Dg = (e, t, n) => {
+}, Ig = (e, t) => t !== "connect" ? e : e.filter((n) => G(n) !== null && C(n) !== null), oh = Ma(), Cg = (e) => oh(e), Dg = (e, t, n) => {
   const r = Tn(e, t);
   return (s) => {
     const o = ke(s) ?? "default", a = r(s);
     return `${n}-${o}${a !== null && a !== "" ? `-${a}` : ""}`;
   };
 }, Fg = () => (e, t) => mn(e) ?? `default-${t}`;
-function Go(e, t) {
+function Wo(e, t) {
   return Kn(e.buckets, t, (n) => n.main);
 }
 function ah(e, t) {
@@ -7483,7 +7518,7 @@ function yh(e, t, n) {
 function gh(e, t, n) {
   switch (t.kind) {
     case "buckets": {
-      const r = Go(t, He(t.mainAxis, n));
+      const r = Wo(t, He(t.mainAxis, n));
       if (!r) return;
       const s = vt(e, t.layerId);
       for (const o of r.entries)
@@ -7650,10 +7685,10 @@ function Th(e, t) {
     delaunay: null,
     delaunayAspectRatio: null
   };
-  return Wo(n, t), n;
+  return Yo(n, t), n;
 }
-function Wo(e, t) {
-  e.delaunay && e.delaunayAspectRatio === t || (e.delaunay = Ma.from(
+function Yo(e, t) {
+  e.delaunay && e.delaunayAspectRatio === t || (e.delaunay = La.from(
     e.points,
     (n) => n.x * t,
     (n) => n.y
@@ -7781,7 +7816,7 @@ function Dh(e, t) {
 }
 function Fh(e, t, n) {
   if (e.buckets.length === 0) return null;
-  const { main: r, cross: s } = Gm(e.mainAxis, t), o = Go(e, r), a = o?.entries ?? [];
+  const { main: r, cross: s } = Gm(e.mainAxis, t), o = Wo(e, r), a = o?.entries ?? [];
   if (!o || !pn(a)) return null;
   const i = Ph(a, s, e.mainAxis);
   return {
@@ -7817,7 +7852,7 @@ function _h(e, t, n) {
     // Distance to the rect itself (not the centroid): zero when the cursor is inside, else the
     // aspect-corrected Euclidean distance to the nearest rect edge. Matches hit-test's intent
     // that a dense bar should win over a line whose nearest point is also near the cursor.
-    distance: Yo(a, t, n)
+    distance: Ho(a, t, n)
   };
 }
 function Rh(e, t, n) {
@@ -7825,7 +7860,7 @@ function Rh(e, t, n) {
   return qn(e, (o) => Oh(o, n, r), { shortCircuitOnZero: !0 });
 }
 function Nh(e, t, n) {
-  return qn(e, (s) => Yo(s, t, n));
+  return qn(e, (s) => Ho(s, t, n));
 }
 function Ph(e, t, n) {
   return qn(e, (s) => Math.abs(Yn(n, s) - t));
@@ -7842,7 +7877,7 @@ function qn(e, t, { shortCircuitOnZero: n = !1 } = {}) {
   }
   return r;
 }
-function Yo(e, t, n) {
+function Ho(e, t, n) {
   const r = dn(t.x, e.xMin, e.xMax), s = dn(t.y, e.yMin, e.yMax);
   return Xn(r, s, n);
 }
@@ -7945,7 +7980,7 @@ class _g {
   setViewport(t) {
     this.aspectRatio = t.width / t.height;
     for (const n of this.layerIndexes)
-      n.kind === "points" && Wo(n, this.aspectRatio);
+      n.kind === "points" && Yo(n, this.aspectRatio);
   }
   /**
    * Synchronous query. The `cursor` is the pointer normalized to `[0, 1]` against the **same rect
@@ -8141,13 +8176,13 @@ function Qh(e) {
   for (const s of e.layers) {
     const o = Zh(s, e.hover);
     if (o.length === 0) continue;
-    const a = Sl(s.data, s.mapping), i = Jh(o, s, n, a), c = $o({
+    const a = wl(s.data, s.mapping), i = Jh(o, s, n, a), c = Bo({
       layer: s,
       numberFormat: e.numberFormat,
       locale: e.locale
     }), l = ty(e.guides, s), u = Ln(s), d = s.mapping.color !== void 0, p = St(s.geom, e.coordSystem);
     for (const m of i) {
-      const y = d ? a(m.observation) : null, g = mn(m.observation) ?? null, b = Na(m.observation), x = d && y !== null ? r(y) : l, S = u(m.observation), w = S === null ? "" : c(S, m.observation);
+      const y = d ? a(m.observation) : null, g = mn(m.observation) ?? null, b = Pa(m.observation), x = d && y !== null ? r(y) : l, S = u(m.observation), w = S === null ? "" : c(S, m.observation);
       t.push({
         swatchColor: g,
         swatchShape: p,
@@ -8231,15 +8266,15 @@ function zg(...e) {
     highlights: [],
     config: {}
   };
-  return n.reduce((a, i) => Ho(a, i), o);
+  return n.reduce((a, i) => Uo(a, i), o);
 }
 function Gg(e, ...t) {
-  return t.reduce((n, r) => Ho(n, r), e);
+  return t.reduce((n, r) => Uo(n, r), e);
 }
 function ny(e) {
   return typeof e == "object" && e !== null && "type" in e;
 }
-function Ho(e, t) {
+function Uo(e, t) {
   switch (t.type) {
     case "scale":
       return { ...e, scales: [...e.scales, t] };
@@ -8703,14 +8738,14 @@ class Mt {
     const r = this.findAssociatedPointLayer(t, n);
     if (!r)
       return null;
-    const s = np(t, r.id), o = new Mt(
+    const s = rp(t, r.id), o = new Mt(
       { layerId: n.id, showPoints: !0, removedLayer: r },
       this.metadata
     );
     return { spec: s, revert: o };
   }
   findAssociatedPointLayer(t, n) {
-    return t.layers.find((r) => r.geom === "point" && La(r.mapping, n.mapping));
+    return t.layers.find((r) => r.geom === "point" && Va(r.mapping, n.mapping));
   }
 }
 const Vy = {
@@ -8987,7 +9022,7 @@ class Yg {
       }
   }
 }
-const Uo = 500, Ko = "normal", Xo = {
+const Ko = 500, Xo = "normal", jo = {
   thin: 100,
   hairline: 100,
   extraLight: 200,
@@ -9006,9 +9041,9 @@ const Uo = 500, Ko = "normal", Xo = {
   extraBlack: 950,
   ultraBlack: 950
 }, Hg = (e) => {
-  const t = e.style ?? Ko, n = e.weight ?? Uo, r = e.family.includes(",") ? e.family : `'${e.family}'`;
+  const t = e.style ?? Xo, n = e.weight ?? Ko, r = e.family.includes(",") ? e.family : `'${e.family}'`;
   return `${t} ${n} ${e.size}px ${r}`;
-}, Ug = (e) => typeof e == "string" ? e : jo(e), jo = (e) => e.text !== void 0 ? e.text : e.content ? e.content.map(jo).join("") : "", qo = (e) => typeof e != "string" ? e ?? Uo : Xo[e], Fy = "\0";
+}, Ug = (e) => typeof e == "string" ? e : qo(e), qo = (e) => e.text !== void 0 ? e.text : e.content ? e.content.map(qo).join("") : "", Qo = (e) => typeof e != "string" ? e ?? Ko : jo[e], Fy = "\0";
 class Kg {
   constructor(t) {
     this.inner = t, this.cache = /* @__PURE__ */ new Map();
@@ -9021,7 +9056,7 @@ class Kg {
     return this.cache.set(r, o), o;
   }
   getCacheKey(t, n) {
-    return [n.family, n.size, qo(n.weight), n.style ?? Ko, t].join(Fy);
+    return [n.family, n.size, Qo(n.weight), n.style ?? Xo, t].join(Fy);
   }
 }
 const _y = {
@@ -9126,7 +9161,7 @@ class Xg {
     let r = 0;
     for (const i of t)
       r += (_y[i] ?? Ry) * n.size;
-    qo(n.weight) >= Xo.semiBold && (r *= Ny);
+    Qo(n.weight) >= jo.semiBold && (r *= Ny);
     const o = Py * n.size, a = Oy * n.size;
     return {
       width: r,
@@ -9137,15 +9172,15 @@ class Xg {
   }
 }
 export {
-  Ou as BORDER_PRESETS,
+  $u as BORDER_PRESETS,
   $g as BORDER_PRESET_GRADIENTS,
   ig as COMPILER_STAGE_KEYS,
   Kg as CachedTextMeasurer,
   Dy as CommandRegistry,
   Yg as CommandStackManager,
-  $p as Compiler,
-  Ko as DEFAULT_FONT_STYLE,
-  Uo as DEFAULT_FONT_WEIGHT,
+  Bp as Compiler,
+  Xo as DEFAULT_FONT_STYLE,
+  Ko as DEFAULT_FONT_WEIGHT,
   sh as DEFAULT_LINE_WIDTH,
   fn as DEFAULT_LOCALE,
   E as Dataset,
@@ -9157,11 +9192,11 @@ export {
   Gf as HEADLINE_VALUE_LABEL_GAP,
   Xg as HeuristicTextMeasurer,
   _g as HoverEngine,
-  Vm as LAYOUT_PADDING,
+  Fo as LAYOUT_PADDING,
   dg as LayoutCompiler,
-  eu as MONO_BASES,
-  Xo as NAMED_WEIGHTS,
-  tu as NEON_BASES,
+  tu as MONO_BASES,
+  jo as NAMED_WEIGHTS,
+  nu as NEON_BASES,
   f as POSITION_VARIABLES,
   pt as RESTING_HOVER_STATE,
   Jn as SetAxisPositionCommand,
@@ -9171,26 +9206,26 @@ export {
   cr as SetHeadlineShowCommand,
   fr as SetLineWidthCommand,
   yr as SetScaleDomainCommand,
-  up as SpecResolver,
+  dp as SpecResolver,
   ye as VISUAL_VARIABLES,
   pg as buildAverageLineSymbols,
   hg as buildDataLabelsContent,
   Hg as buildFontString,
-  $o as buildLayerYValueFormatter,
+  Bo as buildLayerYValueFormatter,
   Cg as buildPolarBarArcPath,
   Og as buildTooltipContent,
   L as commandRegistry,
   yg as computeDifferenceArrow,
   gg as computeDirectLabelsLayout,
   Ag as computeFreeformArrow,
-  $u as config,
+  Bu as config,
   Wg as convertSpecToInput,
   z as coord,
   sg as createAlphaValueReader,
   Lg as createAreaPathGenerators,
-  Sl as createColorValueReader,
+  wl as createColorValueReader,
   cg as createCompiler,
-  Ll as createEmptyHighlight,
+  Vl as createEmptyHighlight,
   og as createGroupValueReader,
   wg as createHeadlineItemRows,
   ng as createLabelValueReader,
@@ -9203,7 +9238,7 @@ export {
   ag as createStrokeWidthValueReader,
   P as createValueFormatter,
   Tn as createXValueReader,
-  xl as createYValueReader,
+  Sl as createYValueReader,
   Ug as extractPlainText,
   Un as findAxisGuide,
   xg as findLegendForAesthetic,
@@ -9216,36 +9251,36 @@ export {
   Eg as getBarRectBounds,
   mn as getColor,
   Yn as getCrossAxisCoordinate,
-  zo as getCurve,
+  Go as getCurve,
   Tg as getDashArray,
   Io as getDifferenceArrowDimensions,
   ke as getGroup,
   Rg as getHoverGuideLineProps,
   Ng as getHoverGuideRectProps,
-  Na as getLineType,
+  Pa as getLineType,
   He as getMainAxisCoordinate,
-  qo as getNumericWeight,
+  Qo as getNumericWeight,
   lf as getRadiusExtent,
-  _a as getSize,
+  Ra as getSize,
   Fg as getStablePolarBarKeyGenerator,
-  Ra as getStrokeWidth,
+  Na as getStrokeWidth,
   G as getX,
   ie as getXMax,
   ge as getXMin,
   C as getY,
   H as getYMax,
   se as getYMin,
-  Fa as getYRaw,
+  _a as getYRaw,
   Bg as highlight,
   mg as isCartesian,
-  xi as isCategoricalValueFormat,
+  Si as isCategoricalValueFormat,
   Jy as isCompilerCachingEnabled,
   ks as isCurrencyValueFormat,
   Is as isDateWithoutYearValueFormat,
   h as isDefined,
-  hu as isGraphConfig,
+  yu as isGraphConfig,
   lg as isLayerOf,
-  vi as isLookupValueFormat,
+  xi as isLookupValueFormat,
   Es as isNumericValueFormat,
   Pg as isSafeUrl,
   J as isStackedPosition,