@graphysdk/viz-engine 0.0.1-plugins.2 → 0.0.1-plugins.3

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as Nn, G as F, e as v, V as we, C as Kt, a as J, p as ee, d as Rr, D as ge, b as Ge, s as en, P as b, c as h, R as je, f as Ma, g as T, h as La, I as Pr, r as Nr, v as W, S as dt, j as Or } from "./geom.utils-BbMUNkrO.js";
+import { i as Nn, G as F, e as v, V as we, C as Kt, a as J, p as ee, d as Rr, D as ge, b as Ge, s as en, P as g, c as h, R as je, f as Ma, g as T, h as La, I as Pr, r as Nr, v as W, S as dt, j as Or } from "./geom.utils-BbMUNkrO.js";
 import { m as Gy } from "./geom.utils-BbMUNkrO.js";
 import { isValid as Y, isBefore as Va, parse as Ne, differenceInDays as ka, isWithinInterval as Ia, addDays as Br } from "date-fns";
 import { isInteger as Ea, merge as Ae } from "lodash-es";
@@ -9,7 +9,7 @@ import Ur from "lodash-es/merge";
 import { regressionLoess as $a, regressionPoly as Ua, regressionPow as Ya, regressionQuad as Wa, regressionLog as Ha, regressionExp as Ka, regressionLinear as za } from "d3-regression";
 import Xa from "humanize-duration";
 import { Delaunay as qa } from "d3-delaunay";
-typeof window < "u" && (window.__GRAPHY_SDK__ ??= {}, window.__GRAPHY_SDK__.vizEngine = "0.0.1-plugins.2");
+typeof window < "u" && (window.__GRAPHY_SDK__ ??= {}, window.__GRAPHY_SDK__.vizEngine = "0.0.1-plugins.3");
 function $e(e, t) {
   return Yr(
     e,
@@ -414,7 +414,7 @@ class vs {
     return t.layers;
   }
 }
-class xs {
+class Ss {
   constructor(t) {
     this.geomRegistry = t, this.coordType = "flip";
   }
@@ -430,7 +430,7 @@ class xs {
           y: { position: "bottom", geometry: "linear" }
         }
       },
-      scales: Ss(t.scales, t.layers)
+      scales: xs(t.scales, t.layers)
     };
   }
   transform(t) {
@@ -440,7 +440,7 @@ class xs {
     });
   }
 }
-const Bn = ee("flipSwap"), Ss = (e, t) => ws(t) ? e.map((n) => n.scaledAesthetic !== "x" || n.scaleType !== "continuous" && n.scaleType !== "datetime" && n.scaleType !== "discrete" ? n : { ...n, reverse: !n.reverse }) : e, ws = (e) => {
+const Bn = ee("flipSwap"), xs = (e, t) => ws(t) ? e.map((n) => n.scaledAesthetic !== "x" || n.scaleType !== "continuous" && n.scaleType !== "datetime" && n.scaleType !== "discrete" ? n : { ...n, reverse: !n.reverse }) : e, ws = (e) => {
   for (const t of e) {
     const n = v(t.mapping.x);
     if (!n || !t.data.hasVariable(n)) continue;
@@ -515,7 +515,7 @@ function ks(e, t) {
 }
 class Is extends Me {
   constructor(t) {
-    super("coord"), this.register("cartesian", new vs()), this.register("flip", new xs(t)), this.register("polar", new Ts(t));
+    super("coord"), this.register("cartesian", new vs()), this.register("flip", new Ss(t)), this.register("polar", new Ts(t));
   }
 }
 class zr {
@@ -998,34 +998,34 @@ class ui extends Ge {
     ], this.swatchShape = "area", this.highlightStrategy = "overlay-anchor", this.spatialKind = "buckets", this.directLabelPositions = ["identity", "stack", "dodge", "fill"], this.supportsPerGroupHeadline = !0;
   }
   compile({ data: t, mapping: n }) {
-    if (t = en(t, n), t.hasVariable(b.yMin) || (t = t.addConstantVariable(b.yMin, "numeric", 0)), !t.hasVariable(b.yMax)) {
+    if (t = en(t, n), t.hasVariable(g.yMin) || (t = t.addConstantVariable(g.yMin, "numeric", 0)), !t.hasVariable(g.yMax)) {
       const r = v(n.y);
-      h(r) && t.hasVariable(r) && (t = t.addVariable(b.yMax, "numeric", t.getValues(r, { type: "numeric" })));
+      h(r) && t.hasVariable(r) && (t = t.addVariable(g.yMax, "numeric", t.getValues(r, { type: "numeric" })));
     }
     return { data: t, mapping: {} };
   }
 }
 const fo = 0.7, di = 0.1;
 function Ke(e) {
-  return e[b.x];
+  return e[g.x];
 }
 function te(e) {
-  return e[b.y];
+  return e[g.y];
 }
 function mt(e) {
-  return e[b.xMin];
+  return e[g.xMin];
 }
 function Pe(e) {
-  return e[b.xMax];
+  return e[g.xMax];
 }
-function xe(e) {
-  return e[b.yMin];
+function Se(e) {
+  return e[g.yMin];
 }
 function Q(e) {
-  return e[b.yMax];
+  return e[g.yMax];
 }
 function mi(e) {
-  return e[b.yRaw];
+  return e[g.yRaw];
 }
 class pi extends Ge {
   constructor() {
@@ -1043,12 +1043,12 @@ class pi extends Ge {
     }, this.emitsGrandTotal = !0, this.emitsStackTotals = !0, this.supportsPerGroupHeadline = !0;
   }
   compile({ data: t, mapping: n }) {
-    if (t = en(t, n), t.hasVariable(b.yMin) || (t = t.addConstantVariable(b.yMin, "numeric", 0)), !t.hasVariable(b.yMax)) {
+    if (t = en(t, n), t.hasVariable(g.yMin) || (t = t.addConstantVariable(g.yMin, "numeric", 0)), !t.hasVariable(g.yMax)) {
       const o = v(n.y);
-      h(o) && t.hasVariable(o) && (t = t.addVariable(b.yMax, "numeric", t.getValues(o, { type: "numeric" })));
+      h(o) && t.hasVariable(o) && (t = t.addVariable(g.yMax, "numeric", t.getValues(o, { type: "numeric" })));
     }
     const r = fo / 2;
-    return t = t.addConstantVariable(b.xMin, "numeric", -r).addConstantVariable(b.xMax, "numeric", r), { data: t, mapping: {} };
+    return t = t.addConstantVariable(g.xMin, "numeric", -r).addConstantVariable(g.xMax, "numeric", r), { data: t, mapping: {} };
   }
   /**
    * Cartesian: the top-edge midpoint of the bar (the right-edge midpoint when flipped). Polar (pie
@@ -1057,7 +1057,7 @@ class pi extends Ge {
    */
   resolveAnchorPosition(t, n) {
     if (n.type === "polar") {
-      const s = mt(t), i = Pe(t), c = xe(t), l = Q(t);
+      const s = mt(t), i = Pe(t), c = Se(t), l = Q(t);
       if (s === null || i === null || c === null || l === null) return null;
       const u = (s + i) / 2, d = (c + l) / 2;
       return {
@@ -1070,7 +1070,7 @@ class pi extends Ge {
       const s = mt(t), i = Pe(t), c = Q(t) ?? te(t);
       return s === null || i === null || c === null ? null : { x: (s + i) / 2, y: c, geom: "bar" };
     }
-    const r = xe(t), o = Q(t), a = Pe(t) ?? Ke(t);
+    const r = Se(t), o = Q(t), a = Pe(t) ?? Ke(t);
     return r === null || o === null || a === null ? null : { x: a, y: (r + o) / 2, geom: "bar" };
   }
 }
@@ -1187,20 +1187,20 @@ const ho = /* @__PURE__ */ new Set([
   "x",
   "y",
   "ySecondary"
-]), xt = /* @__PURE__ */ new Set([
+]), St = /* @__PURE__ */ new Set([
   "color",
   "size",
   "alpha",
   "strokeWidth",
   "lineType"
-]), St = (e) => ho.has(e), vi = (e) => xt.has(e), xi = (e) => St(e) || vi(e);
+]), xt = (e) => ho.has(e), vi = (e) => St.has(e), Si = (e) => xt(e) || vi(e);
 function wt(e) {
   return e === "secondary" ? "ySecondary" : "y";
 }
 function H(e) {
   return e === "ySecondary" ? "y" : e;
 }
-const Si = (e) => {
+const xi = (e) => {
   if (e === void 0) return {};
   const t = {};
   for (const n of e.columns)
@@ -1499,7 +1499,7 @@ function vo({
   layers: n,
   coordSystem: r
 }) {
-  const o = Wi({ layers: n, coordSystem: r, aesthetics: t }), a = xo({ layers: n, aesthetics: t });
+  const o = Wi({ layers: n, coordSystem: r, aesthetics: t }), a = So({ layers: n, aesthetics: t });
   return e.domain.map((s) => ({
     value: s,
     swatchShape: o(s),
@@ -1511,13 +1511,13 @@ function Wi({
   coordSystem: t,
   aesthetics: n
 }) {
-  const r = xo({ layers: e, aesthetics: n }), o = e.find((s) => n.some((i) => h(s.mapping[i]))), a = o ? Be(o.swatchShape, t) : "square";
+  const r = So({ layers: e, aesthetics: n }), o = e.find((s) => n.some((i) => h(s.mapping[i]))), a = o ? Be(o.swatchShape, t) : "square";
   return (s) => {
     const i = r(s);
     return i ? Be(i.layer.swatchShape, t) : a;
   };
 }
-function xo({
+function So({
   layers: e,
   aesthetics: t,
   layerFilter: n
@@ -1546,7 +1546,7 @@ function Hi({ scales: e, layers: t, coordSystem: n, valueLabels: r }) {
   if (o === void 0 || !cn(o)) return [];
   if (!t.some((u) => h(u.mapping.color))) return [];
   const a = ce(t, "color");
-  if (So({
+  if (xo({
     colorVariableName: a,
     xVariableName: ce(t, "x"),
     mapsColorAcrossMultipleLayers: zi(t) > 1,
@@ -1569,7 +1569,7 @@ function Hi({ scales: e, layers: t, coordSystem: n, valueLabels: r }) {
     };
   });
 }
-const So = ({
+const xo = ({
   colorVariableName: e,
   xVariableName: t,
   mapsColorAcrossMultipleLayers: n,
@@ -1577,7 +1577,7 @@ const So = ({
 }) => r ? !1 : e === null || La(e) ? !n : t !== null && e === t;
 function Ki(e, t, n) {
   if (n === null) return !1;
-  for (const r of xt) {
+  for (const r of St) {
     if (r === "color") continue;
     const o = e[r];
     if (!(o === void 0 || !cn(o)) && ce(t, r) === n)
@@ -1681,17 +1681,17 @@ function ec({ group: e, show: t, compareWith: n, layers: r, scales: o }) {
     layers: [a],
     scaleType: d ? "datetime" : o.x?.spec.scaleType ?? "discrete",
     variableName: i
-  }), p = oc(a.data, i), f = p.getValues(s, { type: "numeric" }), y = i !== null ? p.getValues(i) : [], g = c !== null ? p.getValues(c) : null, S = Xn(f, g, e.value), x = Xn(y, g, e.value);
+  }), p = oc(a.data, i), f = p.getValues(s, { type: "numeric" }), y = i !== null ? p.getValues(i) : [], b = c !== null ? p.getValues(c) : null, x = Xn(f, b, e.value), S = Xn(y, b, e.value);
   return {
     value: e.value,
     swatch: e.swatch,
-    aggregate: qi(S, t),
+    aggregate: qi(x, t),
     valueFormat: u,
     groupLabelFormat: e.groupLabelFormat,
     mainValueFormat: m,
     label: e.label,
-    observationLabel: tc(t, d, x),
-    comparison: nc(t, n, d, x, S)
+    observationLabel: tc(t, d, S),
+    comparison: nc(t, n, d, S, x)
   };
 }
 function tc(e, t, n) {
@@ -1732,17 +1732,17 @@ function lc({
   geomCompiler: s
 }) {
   if (t.legend.position === "none") return [];
-  const i = new Map(a.map((g) => [T(g.value), g])), c = mc({ scales: e, layers: n, geomCompiler: s }), l = gc(c), u = ce(n, "x"), d = l.map((g) => {
-    if (hc(g, u, n)) return null;
-    const S = vc({ group: g, variableLabels: o, layers: n, coordSystem: r, colorGroupsByValue: i });
-    return S.items.length === 0 ? null : { group: g, built: S };
+  const i = new Map(a.map((b) => [T(b.value), b])), c = mc({ scales: e, layers: n, geomCompiler: s }), l = gc(c), u = ce(n, "x"), d = l.map((b) => {
+    if (hc(b, u, n)) return null;
+    const x = vc({ group: b, variableLabels: o, layers: n, coordSystem: r, colorGroupsByValue: i });
+    return x.items.length === 0 ? null : { group: b, built: x };
   }).filter(h);
   if (d.length === 0) return [];
   const m = uc(d);
   if (t.legend.position === "auto" && Tc(m, n, r))
     return [];
   const p = Mc(t.legend.position, m, n, r), f = Vc(t.legend.display, p, n, r, s), y = f === "direct" ? Ec(n) : null;
-  return d.map(({ built: g }) => dc(g, p, f, y));
+  return d.map(({ built: b }) => dc(b, p, f, y));
 }
 function uc(e) {
   return e.reduce((t, { group: n, built: r }) => {
@@ -1763,7 +1763,7 @@ function dc(e, t, n, r) {
 }
 function mc(e) {
   const { scales: t, layers: n, geomCompiler: r } = e, o = pc(n, r), a = [];
-  for (const s of xt) {
+  for (const s of St) {
     if (!o.has(s)) continue;
     const i = t[s];
     if (i === void 0 || i.kind === "identity" || !fc(s, n)) continue;
@@ -1785,7 +1785,7 @@ function fc(e, t) {
 }
 function hc(e, t, n) {
   const [r] = e;
-  return r.scaleAestheticKey !== "color" ? !1 : So({
+  return r.scaleAestheticKey !== "color" ? !1 : xo({
     colorVariableName: r.variableName,
     xVariableName: t,
     mapsColorAcrossMultipleLayers: yc(r.scaleAestheticKey, n),
@@ -1830,24 +1830,24 @@ function vc({
   return {
     aesthetics: e.map((u) => u.scaleAestheticKey),
     title: c,
-    items: i.map((u) => xc(u, e, s, l, o))
+    items: i.map((u) => Sc(u, e, s, l, o))
   };
 }
-function xc(e, t, n, r, o) {
+function Sc(e, t, n, r, o) {
   const a = {};
   for (const i of t)
     bc(a, i.scaleAestheticKey, i.scale.map(e.value));
   const s = wc(e, t, n, r, o);
   return {
     value: e.value,
-    label: Sc(t, e, o),
+    label: xc(t, e, o),
     visual: a,
     normalizedY: null,
     swatchShape: e.swatchShape,
     valueFormat: s
   };
 }
-function Sc(e, t, n) {
+function xc(e, t, n) {
   return e[0].scaleAestheticKey !== "color" ? null : n.get(T(t.value))?.label ?? null;
 }
 function wc(e, t, n, r, o) {
@@ -1921,7 +1921,7 @@ function Ec(e) {
     if (!o) return;
     const a = Ue(o);
     if (!h(a)) return;
-    const s = xe(o), i = Q(o) ?? te(o);
+    const s = Se(o), i = Q(o) ?? te(o);
     if (!h(i)) return;
     const c = h(s) ? (s + i) / 2 : i;
     n.set(String(a), c);
@@ -1944,7 +1944,7 @@ class Cc extends ne {
     ];
   }
   run(t) {
-    const n = Si(t.originalData), r = Hi({
+    const n = xi(t.originalData), r = Hi({
       scales: t.scales,
       layers: t.layers,
       coordSystem: t.coordSystem,
@@ -1988,7 +1988,7 @@ const Dc = (e, t) => e?.kind !== "perGroup" || t.some((r) => r.display === "dire
         return null;
     }
   } : () => null;
-}, Ao = (e, t) => z(e, t.x), _c = (e, t) => z(e, t.y), sy = (e, t) => z(e, t.label), Rc = (e, t) => z(e, t.color), iy = (e, t) => z(e, t.size), cy = (e, t) => z(e, t.alpha), ly = (e, t) => z(e, t.group), uy = (e, t) => z(e, t.strokeWidth), jn = { variable: b.yRaw };
+}, Ao = (e, t) => z(e, t.x), _c = (e, t) => z(e, t.y), sy = (e, t) => z(e, t.label), Rc = (e, t) => z(e, t.color), iy = (e, t) => z(e, t.size), cy = (e, t) => z(e, t.alpha), ly = (e, t) => z(e, t.group), uy = (e, t) => z(e, t.strokeWidth), jn = { variable: g.yRaw };
 function At(e, t) {
   return K(e) ? jn : t.y ?? jn;
 }
@@ -2139,11 +2139,11 @@ function $c({
       predicate: at(A.predicate, a),
       scope: A.scope
     })
-  ), i = s.some(({ scope: A }) => A === "series"), c = s.some(({ scope: A }) => A === "x-value"), l = r === "overlay-anchor", u = e.data.size(), d = i ? new Array(u) : null, m = c ? new Array(u) : null, p = l ? new Array(u) : null, f = new Uint8Array(u), y = /* @__PURE__ */ new Set(), g = /* @__PURE__ */ new Set();
-  let S = !1, x = 0;
+  ), i = s.some(({ scope: A }) => A === "series"), c = s.some(({ scope: A }) => A === "x-value"), l = r === "overlay-anchor", u = e.data.size(), d = i ? new Array(u) : null, m = c ? new Array(u) : null, p = l ? new Array(u) : null, f = new Uint8Array(u), y = /* @__PURE__ */ new Set(), b = /* @__PURE__ */ new Set();
+  let x = !1, S = 0;
   for (const A of e.data) {
     let X, oe;
-    d !== null && (X = Fc(A), d[x] = X), m !== null && (oe = un(A, o), m[x] = oe), p !== null && (p[x] = A);
+    d !== null && (X = Fc(A), d[S] = X), m !== null && (oe = un(A, o), m[S] = oe), p !== null && (p[S] = A);
     for (const { predicate: Xe, scope: qe } of s)
       if (Xe(A))
         switch (qe) {
@@ -2151,20 +2151,20 @@ function $c({
             X !== void 0 && y.add(X);
             break;
           case "x-value":
-            oe !== void 0 && g.add(oe);
+            oe !== void 0 && b.add(oe);
             break;
           case "data-point":
-            f[x] = 1, S = !0;
+            f[S] = 1, x = !0;
             break;
         }
-    x++;
+    S++;
   }
-  if (y.size === 0 && g.size === 0 && !S)
+  if (y.size === 0 && b.size === 0 && !x)
     return Mo();
   const w = new Uint8Array(u), M = [];
   let V = 0;
   for (let A = 0; A < u; A++) {
-    const X = d?.[A], oe = m?.[A], Xe = X !== void 0 && y.has(X), qe = oe !== void 0 && g.has(oe), Rn = f[A] === 1;
+    const X = d?.[A], oe = m?.[A], Xe = X !== void 0 && y.has(X), qe = oe !== void 0 && b.has(oe), Rn = f[A] === 1;
     if (r === "observation-rerender")
       (Xe || Rn || qe) && (w[A] = 1, V++);
     else if (Xe)
@@ -2228,7 +2228,7 @@ function Kc(e, t, n) {
   const r = v(t[e]);
   return r === null ? null : { valueVariable: r, formatVariable: r };
 }
-const zc = Object.values(b);
+const zc = Object.values(g);
 function Jn(e) {
   const t = new ge({});
   return {
@@ -2347,7 +2347,8 @@ class Vo extends Error {
     const n = t.map((r) => `- ${r.message}`).join(`
 `);
     super(`Spec validation failed:
-${n}`), this.issues = t, this.name = "SpecValidationError";
+${n}`), this.issues = t, this.name = "SpecValidationError", console.warn(`Spec validation failed:
+${n}`);
   }
 }
 class el {
@@ -2466,10 +2467,10 @@ const tr = ee("__ungrouped__"), nl = (e, t) => t === null ? !0 : e.some(
     skipNulls: !0
   }), i = s.length === 0, c = i ? [tr] : s, l = e.getValues(a), u = e.getValues(o, { type: "numeric" }), d = e.getValues(F.group, { type: "categorical" }), m = e.size(), p = /* @__PURE__ */ new Map();
   for (let f = 0; f < m; f++) {
-    const y = l[f] ?? null, g = d[f], S = i ? tr : g;
-    if (!h(S)) continue;
-    let x = p.get(y);
-    x || (x = /* @__PURE__ */ new Map(), p.set(y, x)), x.set(S, f);
+    const y = l[f] ?? null, b = d[f], x = i ? tr : b;
+    if (!h(x)) continue;
+    let S = p.get(y);
+    S || (S = /* @__PURE__ */ new Map(), p.set(y, S)), S.set(x, f);
   }
   return { values: u, observationIndexByPartitionAndGroup: p, uniqueGroupKeys: c, observationCount: m };
 };
@@ -2515,10 +2516,10 @@ class ol extends Tt {
     for (let f = 0; f < a; f++) {
       const y = s[f];
       if (!h(y)) continue;
-      const g = l(String(y));
-      h(g) && (d[f] = g, m[f] = g + u);
+      const b = l(String(y));
+      h(b) && (d[f] = b, m[f] = b + u);
     }
-    return { data: t.addVariable(b.xMin, "numeric", d).addVariable(b.xMax, "numeric", m), mapping: {} };
+    return { data: t.addVariable(g.xMin, "numeric", d).addVariable(g.xMax, "numeric", m), mapping: {} };
   }
 }
 class al extends Tt {
@@ -2535,33 +2536,33 @@ class al extends Tt {
     const { values: a, observationIndexByPartitionAndGroup: s, uniqueGroupKeys: i, observationCount: c } = o, l = [...a], u = new Array(c).fill(0);
     for (const [, m] of s) {
       let p = 0, f = 0;
-      for (const S of i) {
-        const x = m.get(S);
-        if (x === void 0) continue;
-        const w = a[x];
+      for (const x of i) {
+        const S = m.get(x);
+        if (S === void 0) continue;
+        const w = a[S];
         w != null && (w >= 0 ? p += w : f -= w);
       }
-      let y = 0, g = 0;
-      for (const S of i) {
-        const x = m.get(S);
-        if (x === void 0) continue;
-        const w = a[x];
+      let y = 0, b = 0;
+      for (const x of i) {
+        const S = m.get(x);
+        if (S === void 0) continue;
+        const w = a[S];
         if (w === void 0) continue;
         if (w === null) {
-          u[x] = null, l[x] = null;
+          u[S] = null, l[S] = null;
           continue;
         }
         const M = w >= 0 ? p : f;
         if (M === 0) {
-          u[x] = 0, l[x] = 0;
+          u[S] = 0, l[S] = 0;
           continue;
         }
         const V = w / M;
-        w >= 0 ? (u[x] = y, l[x] = y += V) : (l[x] = g, u[x] = g += V);
+        w >= 0 ? (u[S] = y, l[S] = y += V) : (l[S] = b, u[S] = b += V);
       }
     }
     let d = t.addVariable(W(r, "lower"), "numeric", u).addVariable(W(r, "upper"), "numeric", l);
-    return r === "y" && (d = d.addVariable(b.yRaw, "numeric", a)), { data: d, mapping: {} };
+    return r === "y" && (d = d.addVariable(g.yRaw, "numeric", a)), { data: d, mapping: {} };
   }
 }
 class sl extends Tt {
@@ -2589,21 +2590,21 @@ class il extends Tt {
     const { values: a, observationIndexByPartitionAndGroup: s, uniqueGroupKeys: i, observationCount: c } = o, l = [...a], u = new Array(c).fill(0);
     for (const [, p] of s) {
       let f = 0, y = 0;
-      for (const g of i) {
-        const S = p.get(g);
-        if (S === void 0) continue;
-        const x = a[S];
-        if (x !== void 0) {
-          if (x === null) {
-            u[S] = null, l[S] = null;
+      for (const b of i) {
+        const x = p.get(b);
+        if (x === void 0) continue;
+        const S = a[x];
+        if (S !== void 0) {
+          if (S === null) {
+            u[x] = null, l[x] = null;
             continue;
           }
-          x >= 0 ? (u[S] = f, l[S] = f += x) : (l[S] = y, u[S] = y += x);
+          S >= 0 ? (u[x] = f, l[x] = f += S) : (l[x] = y, u[x] = y += S);
         }
       }
     }
     let d = t.addVariable(W(r, "lower"), "numeric", u).addVariable(W(r, "upper"), "numeric", l);
-    r === "y" && (d = d.addVariable(b.yRaw, "numeric", a));
+    r === "y" && (d = d.addVariable(g.yRaw, "numeric", a));
     const m = v(n[r]);
     return m !== null && (d = d.addVariable(m, "numeric", l)), { data: d, mapping: {} };
   }
@@ -2671,8 +2672,8 @@ function hl(e, t, n, r, o) {
   if (!n.bandwidth || !t.hasVariable(a)) return t;
   const s = n.bandwidth, i = t.getValues(a, { type: "numeric" }), c = t.getValues(r, { type: "numeric" }), l = t.getValues(o, { type: "numeric" }), u = t.size(), d = new Array(u), m = new Array(u);
   for (let p = 0; p < u; p++) {
-    const f = i[p], y = c[p], g = l[p];
-    h(f) && h(y) && h(g) ? (d[p] = f + y * s, m[p] = f + g * s) : (d[p] = null, m[p] = null);
+    const f = i[p], y = c[p], b = l[p];
+    h(f) && h(y) && h(b) ? (d[p] = f + y * s, m[p] = f + b * s) : (d[p] = null, m[p] = null);
   }
   return t.addVariable(r, "numeric", d).addVariable(o, "numeric", m);
 }
@@ -2759,7 +2760,7 @@ class bl extends ne {
     for (const o of t)
       for (const [a, s] of Object.entries(o.mapping)) {
         const i = a, c = i === "y" ? wt(o.yScaleType) : i;
-        if (!xi(c) || !n.has(c)) continue;
+        if (!Si(c) || !n.has(c)) continue;
         const l = this.resolveVariables(i, s, o.data);
         this.collectFromVariables(o.data, l, c, r);
       }
@@ -2773,12 +2774,12 @@ class bl extends ne {
    */
   resolveVariables(t, n, r) {
     if (t === "y" && this.hasPositionAdjustedY(r))
-      return [b.yMin, b.yMax];
+      return [g.yMin, g.yMax];
     const o = v(n);
     return !o || !r.hasVariable(o) ? [] : [o];
   }
   hasPositionAdjustedY(t) {
-    return t.hasVariable(b.yMin) && t.hasVariable(b.yMax);
+    return t.hasVariable(g.yMin) && t.hasVariable(g.yMax);
   }
   collectFromVariables(t, n, r, o) {
     if (n.length === 0) return;
@@ -2814,7 +2815,7 @@ class vl extends ze {
   compile(t, n) {
     if (t.scaleType !== "continuous")
       throw new Error("ContinuousScale.compile received non-continuous spec");
-    const r = St(t.scaledAesthetic), o = this.computeDataDomain(n, t);
+    const r = xt(t.scaledAesthetic), o = this.computeDataDomain(n, t);
     return r ? this.buildPositionScale(o, t) : this.buildVisualScale(o, t);
   }
   computeDataDomain(t, n) {
@@ -2825,7 +2826,7 @@ class vl extends ze {
   }
   createD3Scale(t, n, r) {
     let o = [r.domainMin ?? t[0], r.domainMax ?? t[1]];
-    const a = r.transform === "log" && xl(o), s = a ? Na() : r.transform === "sqrt" ? Oa() : Ba();
+    const a = r.transform === "log" && Sl(o), s = a ? Na() : r.transform === "sqrt" ? Oa() : Ba();
     return r.nice && !a && (o = s.copy().domain(o).nice().domain()), s.domain([r.domainMin ?? o[0], r.domainMax ?? o[1]]).range(n).clamp(r.clamp);
   }
   buildPositionScale(t, n) {
@@ -2846,18 +2847,18 @@ class vl extends ze {
     });
   }
 }
-const xl = (e) => {
+const Sl = (e) => {
   const [t, n] = e;
   return t > 0 && n > 0 || t < 0 && n < 0;
 };
-class Sl extends ze {
+class xl extends ze {
   constructor() {
     super(...arguments), this.compatibleDataTypes = ["temporal"];
   }
   compile(t, n) {
     if (t.scaleType !== "datetime")
       throw new Error("DatetimeScale.compile received non-datetime spec");
-    const r = St(t.scaledAesthetic), o = this.computeDataDomain(n);
+    const r = xt(t.scaledAesthetic), o = this.computeDataDomain(n);
     if (!r)
       throw new Error("Datetime scale is not supported for non-position aesthetics");
     return this.buildScale(o, t, this.collectInputDates(n));
@@ -2937,7 +2938,7 @@ class Tl extends ze {
   compile(t, n) {
     if (t.scaleType !== "discrete")
       throw new Error("DiscreteScale.compile received non-discrete spec");
-    const r = St(t.scaledAesthetic), o = this.computeDataDomain(n, t);
+    const r = xt(t.scaledAesthetic), o = this.computeDataDomain(n, t);
     return r ? this.buildPositionScale(o, t) : this.buildVisualScale(o, t);
   }
   computeDataDomain(t, n) {
@@ -3252,7 +3253,7 @@ class Nl extends ze {
 }
 class Ol extends Me {
   constructor() {
-    super("scale"), this.register("continuous", new vl()), this.register("discrete", new Tl()), this.register("datetime", new Sl()), this.register("identity", new Ml()), this.register("palette", new Nl());
+    super("scale"), this.register("continuous", new vl()), this.register("discrete", new Tl()), this.register("datetime", new xl()), this.register("identity", new Ml()), this.register("palette", new Nl());
   }
 }
 const Bl = (e) => !("layers" in e), I = {
@@ -3518,8 +3519,8 @@ const uu = "#E5E5E5", du = { x: "top", y: "left" }, mu = /* @__PURE__ */ new Set
 function pu(e) {
   return lu({
     legend: bu(e.legend),
-    axes: xu(e.axes),
-    headline: Su(e),
+    axes: Su(e.axes),
+    headline: xu(e),
     numberFormat: wu(e.appearance),
     content: Au(e.content),
     appearance: fu(e.appearance, e.themeOverrides)
@@ -3568,7 +3569,7 @@ function vu(e) {
     ...e.label !== void 0 ? { label: e.label } : void 0
   };
 }
-function xu(e) {
+function Su(e) {
   if (e)
     return {
       x: ar("x", e.x, e.showGridLines),
@@ -3576,7 +3577,7 @@ function xu(e) {
       ...e.y2 ? { ySecondary: vu(e.y2) } : void 0
     };
 }
-function Su(e) {
+function xu(e) {
   const { headlineNumbers: t, options: n, type: r } = e, o = r !== void 0 && mu.has(r) ? n?.pieTotalPosition : void 0;
   if (t === void 0 && o === void 0) return;
   const a = {};
@@ -3641,7 +3642,7 @@ const P = {
   format: "absolute",
   showStackTotals: !1,
   showCategoryLabels: !1,
-  labelSource: { variable: b.yRaw }
+  labelSource: { variable: g.yRaw }
 }, it = {
   stat: { type: "identity" },
   position: "identity",
@@ -3961,23 +3962,23 @@ const ve = {
     ...t ? { yScaleType: "secondary" } : void 0
   });
 }, Fu = (e, t, n) => {
-  const { numeric: r, categorical: o, temporal: a } = e.dataset.groupVariableNamesByType(), s = mn(e.dataset), i = [...o, ...a], c = r.filter((g) => g !== s), l = t?.comboType ?? "grouped-bars", u = l === "lines";
+  const { numeric: r, categorical: o, temporal: a } = e.dataset.groupVariableNamesByType(), s = mn(e.dataset), i = [...o, ...a], c = r.filter((b) => b !== s), l = t?.comboType ?? "grouped-bars", u = l === "lines";
   if (c.length === 1)
     return u ? Fo(e, t, n) : ae(e, "dodge", P.cartesian(), t, n);
   const d = e.axes?.hasDualYAxis === !0, m = u ? [] : c.slice(0, -1), p = u ? c : c.slice(-1), f = [], y = [];
   if (m.length > 0) {
-    const g = l === "stacked-bars" ? "stack" : "dodge", S = m.length === 1 ? m[0] : null;
-    h(S) ? f.push(
+    const b = l === "stacked-bars" ? "stack" : "dodge", x = m.length === 1 ? m[0] : null;
+    h(x) ? f.push(
       I.bar({
         transforms: [
           be.constant({
             variableName: ir,
             type: "categorical",
-            value: S
+            value: x
           })
         ],
-        aes: { y: S, color: ir },
-        position: g
+        aes: { y: x, color: ir },
+        position: b
       })
     ) : f.push(
       I.bar({
@@ -3990,40 +3991,40 @@ const ve = {
           })
         ],
         aes: { y: j, color: N },
-        position: g
+        position: b
       })
     );
   }
   if (u && p.length >= 2) {
-    const g = d ? p.slice(0, -1) : p, S = g.length === 1 ? g[0] : null;
-    if (h(S))
-      f.push(Ft(S, !1, n));
+    const b = d ? p.slice(0, -1) : p, x = b.length === 1 ? b[0] : null;
+    if (h(x))
+      f.push(Ft(x, !1, n));
     else {
-      const x = fn({
+      const S = fn({
         appearance: n,
-        seriesVariables: g
+        seriesVariables: b
       });
       f.push(
         I.line({
           transforms: [
             be.reshape({
               keep: i,
-              reshape: g,
+              reshape: b,
               keyName: N,
               valueName: j
             })
           ],
-          aes: { y: j, color: N, ...x.mapping }
+          aes: { y: j, color: N, ...S.mapping }
         })
-      ), y.push(...x.scales);
+      ), y.push(...S.scales);
     }
     if (d) {
-      const x = p[p.length - 1];
-      h(x) && f.push(Ft(x, !0, n));
+      const S = p[p.length - 1];
+      h(S) && f.push(Ft(S, !0, n));
     }
   } else
-    for (const g of p)
-      f.push(Ft(g, d, n));
+    for (const b of p)
+      f.push(Ft(b, d, n));
   return {
     dataset: e.dataset,
     layers: f,
@@ -4336,7 +4337,7 @@ const Rt = {
   coordinates: e.coordinates.map((n) => nd(n, t)),
   params: e.params ?? {},
   zOrder: e.zOrder ?? null
-}), nd = (e, t) => "observation" in e ? { observation: Se(e.observation, t) } : e, rd = (e) => ({
+}), nd = (e, t) => "observation" in e ? { observation: xe(e.observation, t) } : e, rd = (e) => ({
   id: e.id ?? crypto.randomUUID(),
   content: e.content,
   x: e.x,
@@ -4346,13 +4347,13 @@ const Rt = {
   backgroundColorStyle: e.backgroundColorStyle ?? mr.backgroundColorStyle
 }), od = (e, t) => ({
   id: e.id ?? crypto.randomUUID(),
-  start: Se(e.start, t),
-  end: Se(e.end, t),
+  start: xe(e.start, t),
+  end: xe(e.end, t),
   label: e.label,
   color: e.color ?? Rt.color,
   size: e.size ?? Rt.size,
   labelCrossPosition: e.labelCrossPosition ?? Rt.labelCrossPosition
-}), Se = (e, t) => {
+}), xe = (e, t) => {
   if (e.layerIndex === void 0)
     return { anchorValue: e.anchorValue, groupValue: e.groupValue };
   const n = t[e.layerIndex]?.id;
@@ -4363,14 +4364,14 @@ const Rt = {
   return { layerId: n, anchorValue: e.anchorValue, groupValue: e.groupValue };
 }, ad = (e, t) => ({
   id: e.id ?? crypto.randomUUID(),
-  anchor: Se(e.anchor, t),
+  anchor: xe(e.anchor, t),
   sticker: e.sticker
 }), sd = (e, t) => ({
   id: e.id ?? crypto.randomUUID(),
-  anchor: Se(e.anchor, t)
+  anchor: xe(e.anchor, t)
 }), id = (e, t) => ({
   id: e.id ?? crypto.randomUUID(),
-  anchor: Se(e.anchor, t),
+  anchor: xe(e.anchor, t),
   content: e.content
 }), cd = (e) => ({
   id: e.id ?? crypto.randomUUID(),
@@ -4507,7 +4508,7 @@ function Ve(e, t) {
   return { type: r };
 }
 function bd(e, t, n) {
-  if (!Sd(n))
+  if (!xd(n))
     return wd(e, t, n);
   switch (n.geom) {
     case "point":
@@ -4526,7 +4527,7 @@ function vd(e, t, n) {
   const r = n.map((o) => bd(e, t, o));
   return kd(r);
 }
-const xd = (e, t, n) => n.label !== void 0 ? n.label : Id(e, t, n), Sd = (e) => ic(e.geom);
+const Sd = (e, t, n) => n.label !== void 0 ? n.label : Id(e, t, n), xd = (e) => ic(e.geom);
 function wd(e, t, n) {
   const r = n.position ?? "identity";
   return {
@@ -4544,7 +4545,7 @@ function wd(e, t, n) {
   };
 }
 const ke = (e, t, n, r) => {
-  const o = { ...e, ...t.mapping }, a = xd(t.geom, n, o);
+  const o = { ...e, ...t.mapping }, a = Sd(t.geom, n, o);
   return {
     ...Lu(t.geom, r),
     ...t.dataLabels,
@@ -5078,11 +5079,11 @@ const nm = ({ layer: e }) => {
 }, rm = ({ layer: e }) => {
   if (e.position !== "stack") return;
   const t = v(e.mapping.x);
-  if (t === null || !e.data.hasVariable(b.yMin) || !e.data.hasVariable(b.yMax))
+  if (t === null || !e.data.hasVariable(g.yMin) || !e.data.hasVariable(g.yMax))
     return;
   const n = /* @__PURE__ */ new Map();
   for (const o of e.data) {
-    const a = o[t], s = xe(o), i = Q(o), c = mt(o), l = Pe(o), u = mi(o);
+    const a = o[t], s = Se(o), i = Q(o), c = mt(o), l = Pe(o), u = mi(o);
     if (!h(a) || !h(s) || !h(i) || !h(c) || !h(l) || !h(u))
       continue;
     const d = u >= 0;
@@ -5223,7 +5224,7 @@ class mm extends Te {
     super(), this.geomCompiler = t;
   }
   dependencies(t) {
-    return [...xt].map((n) => t.scales[n]);
+    return [...St].map((n) => t.scales[n]);
   }
   compileLayer(t, n) {
     const r = this.geomCompiler.getVisualAesthetics(t.geom), o = pm(t.data, t.mapping, r, n.scales);
@@ -5425,7 +5426,7 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
   } catch {
     return Uo;
   }
-}, re = (e) => (t) => L(t) ? e(t) : hn, yn = (e) => (t) => Ye(t) ? t : hn, ym = 2, gm = 3, bm = 2, vm = 0, xm = 1, Sm = 2, wm = Xa.humanizer({
+}, re = (e) => (t) => L(t) ? e(t) : hn, yn = (e) => (t) => Ye(t) ? t : hn, ym = 2, gm = 3, bm = 2, vm = 0, Sm = 1, xm = 2, wm = Xa.humanizer({
   language: "en",
   spacer: "",
   delimiter: " ",
@@ -5447,7 +5448,7 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
   numberFormat: n,
   intlOptions: r
 }) => re((o) => {
-  const a = typeof n.decimals == "number" ? n.decimals : ym, s = xn(o, a), { base: i, suffix: c } = vn(o, n.abbreviation), l = {
+  const a = typeof n.decimals == "number" ? n.decimals : ym, s = Sn(o, a), { base: i, suffix: c } = vn(o, n.abbreviation), l = {
     ...s,
     ...jr(e) ? { style: "currency", currencyDisplay: "narrowSymbol", currency: e.iso } : {},
     ...r
@@ -5458,7 +5459,7 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
   numberFormat: t,
   intlOptions: n
 }) => re((r) => {
-  const { base: o, suffix: a } = vn(r, t.abbreviation), i = { ...xn(o, t.decimals), ...n };
+  const { base: o, suffix: a } = vn(r, t.abbreviation), i = { ...Sn(o, t.decimals), ...n };
   return `${Intl.NumberFormat(e, i).format(o)}${a}`;
 }), bn = (e) => re((t) => wm(t)), Wo = ({ locale: e, intlOptions: t }) => re(
   (n) => Intl.NumberFormat(e, { maximumFractionDigits: 0, ...t }).format(n)
@@ -5467,7 +5468,7 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
   numberFormat: t,
   intlOptions: n
 }) => re((r) => {
-  const o = xn(r, t.decimals);
+  const o = Sn(r, t.decimals);
   return Intl.NumberFormat(e, { ...o, ...n, style: "percent" }).format(r);
 }), vn = (e, t = "none") => {
   switch (t) {
@@ -5480,10 +5481,10 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
     default:
       return { base: e / Re[t], suffix: t };
   }
-}, xn = (e, t) => {
+}, Sn = (e, t) => {
   if (typeof t == "number")
     return { minimumFractionDigits: t, maximumFractionDigits: t };
-  const n = Math.ceil(Math.log10(Math.abs(e))), r = n >= gm ? vm : n === bm ? xm : Sm;
+  const n = Math.ceil(Math.log10(Math.abs(e))), r = n >= gm ? vm : n === bm ? Sm : xm;
   return {
     minimumFractionDigits: t === "auto" ? 0 : r,
     maximumFractionDigits: r
@@ -5510,7 +5511,7 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
   }).format(n)
 ), zo = ({ locale: e, intlOptions: t }) => C(
   (n) => Intl.DateTimeFormat(e, { month: "long", ...D, ...t }).format(n)
-), Sn = ({ locale: e, intlOptions: t }) => C(
+), xn = ({ locale: e, intlOptions: t }) => C(
   (n) => Intl.DateTimeFormat(e, {
     month: "short",
     year: "numeric",
@@ -5630,7 +5631,7 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
     case "month":
       return Pm(e);
     case "month_year":
-      return Sn(e);
+      return xn(e);
     case "percentage":
       return Fm(e);
     case "quarter":
@@ -5816,7 +5817,7 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
     case "month":
       return zo(e);
     case "month_year":
-      return Sn(e);
+      return xn(e);
     case "percentage":
       return Ho(e);
     case "quarter":
@@ -5879,9 +5880,9 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
     height: e.containerSize.height
   };
 }, Jm = (e) => {
-  const t = vr(e.rows, e.height), n = vr(e.cols, e.width), r = xr(t), o = xr(n), a = /* @__PURE__ */ new Map();
+  const t = vr(e.rows, e.height), n = vr(e.cols, e.width), r = Sr(t), o = Sr(n), a = /* @__PURE__ */ new Map();
   for (const s of e.placements) {
-    const i = s.rowSpan ?? 1, c = s.colSpan ?? 1, l = o[s.col] ?? 0, u = r[s.row] ?? 0, d = Sr(n, s.col, c), m = Sr(t, s.row, i);
+    const i = s.rowSpan ?? 1, c = s.colSpan ?? 1, l = o[s.col] ?? 0, u = r[s.row] ?? 0, d = xr(n, s.col, c), m = xr(t, s.row, i);
     a.set(s.name, { x: l, y: u, width: Math.max(0, d), height: Math.max(0, m) });
   }
   return a;
@@ -5925,13 +5926,13 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
     a.type === "fixed" ? n += a.pixels : r += a.weight;
   const o = Math.max(0, t - n);
   return e.map((a) => a.type === "fixed" ? a.pixels : r === 0 ? 0 : a.weight / r * o);
-}, xr = (e) => {
+}, Sr = (e) => {
   const t = new Array(e.length);
   let n = 0;
   for (let r = 0; r < e.length; r++)
     t[r] = n, n += e[r] ?? 0;
   return t;
-}, Sr = (e, t, n) => {
+}, xr = (e, t, n) => {
   let r = 0;
   const o = Math.min(t + n, e.length);
   for (let a = t; a < o; a++)
@@ -6017,19 +6018,19 @@ const hn = "–", Uo = "n/a", D = { timeZone: "UTC" }, C = (e) => (t) => {
   const i = t === "y", c = n.height + s.top, l = n.width + s.right;
   let u = 0, d = 0;
   for (const m of e.differenceArrows) {
-    const { start: p, end: f, size: y, label: g } = m;
+    const { start: p, end: f, size: y, label: b } = m;
     if (!wr(p.x, p.y) || !wr(f.x, f.y)) continue;
-    const S = Jo(y, r), x = S.offsetFromHigherObservation + S.arrowheadSize + S.arrowEndGap, w = ea({
+    const x = Jo(y, r), S = x.offsetFromHigherObservation + x.arrowheadSize + x.arrowEndGap, w = ea({
       locale: o,
-      kind: g,
+      kind: b,
       startValue: p.measurementValue,
       endValue: f.measurementValue
     }), M = a(w, y);
     if (i) {
-      const V = Math.max(p.x, f.x), B = x + M.width / 2 + S.labelPaddingX;
+      const V = Math.max(p.x, f.x), B = S + M.width / 2 + x.labelPaddingX;
       d = Math.max(d, Ar(B, V, l));
     } else {
-      const V = Math.max(p.y, f.y), B = x + S.labelLineHeight / 2 + S.labelPaddingY;
+      const V = Math.max(p.y, f.y), B = S + x.labelLineHeight / 2 + x.labelPaddingY;
       u = Math.max(u, Ar(B, V, c));
     }
   }
@@ -6115,90 +6116,128 @@ class hy {
     this.measurer = t;
   }
   compile(t) {
-    const n = t.formattingLocale ?? t.parsingLocale, r = t.axes.filter((l) => l.geometry === "linear"), a = t.axes.filter((l) => l.geometry !== "linear").map(
-      (l) => gp(l, Lr(l, n, t.numberFormat))
-    ), s = bp(a, this.measurer.measureTickLabel), { formattedAxes: i, layout: c } = bt({
-      axes: r,
+    const n = bt({
+      axes: t.axes,
       numberFormat: t.numberFormat,
       formattedLegends: t.formattedLegends,
       containerSize: t.containerSize,
       externalMeasurements: t.externalMeasurements,
       annotationOverflow: Vn,
       headline: t.headline,
-      locale: n
-    }).pipe(({ axes: l, numberFormat: u, locale: d }) => ({
-      axisBundles: l.map((m) => ({
-        axis: m,
-        resolveFormatter: Lr(m, d, u),
-        formatted: this.seedAxis(m)
+      locale: t.formattingLocale ?? t.parsingLocale
+    }).pipe(({ axes: r, numberFormat: o, locale: a }) => {
+      const s = r.filter((i) => i.geometry !== "linear").map((i) => gp(i, Lr(i, a, o)));
+      return {
+        cartesianAxes: r.filter((i) => i.geometry === "linear"),
+        formattedPolarAxes: s,
+        polarMargin: bp(s, this.measurer.measureTickLabel)
+      };
+    }).pipe(({ cartesianAxes: r, numberFormat: o, locale: a }) => ({
+      axisBundles: r.map((s) => ({
+        axis: s,
+        resolveFormatter: Lr(s, a, o),
+        formatted: this.seedAxis(s)
       }))
-    })).pipe(({ axisBundles: l, formattedLegends: u, containerSize: d, externalMeasurements: m, annotationOverflow: p, headline: f }) => ({
-      layout: this.resolveLayout({
-        axes: l.map((y) => y.formatted),
-        formattedLegends: u,
-        containerSize: d,
-        externalMeasurements: m,
-        annotationOverflow: p,
-        headline: f,
-        polarMargin: s
+    })).pipe(
+      ({
+        axisBundles: r,
+        formattedLegends: o,
+        containerSize: a,
+        externalMeasurements: s,
+        annotationOverflow: i,
+        headline: c,
+        polarMargin: l
+      }) => ({
+        layout: this.resolveLayout({
+          axes: r.map((u) => u.formatted),
+          formattedLegends: o,
+          containerSize: a,
+          externalMeasurements: s,
+          annotationOverflow: i,
+          headline: c,
+          polarMargin: l
+        })
       })
-    })).pipe(({ axisBundles: l, layout: u }) => ({
-      axisBundles: l.map(
-        (d) => Tr(d.axis.position) ? { ...d, formatted: this.finalizeAxis(d.axis, d.resolveFormatter, u.panel) } : d
+    ).pipe(({ axisBundles: r, layout: o }) => ({
+      axisBundles: r.map(
+        (a) => Mr(a.axis.position) ? { ...a, formatted: this.finalizeAxis(a.axis, a.resolveFormatter, o.panel) } : a
       )
-    })).pipe(({ axisBundles: l, formattedLegends: u, containerSize: d, externalMeasurements: m, annotationOverflow: p, headline: f }) => ({
-      layout: this.resolveLayout({
-        axes: l.map((y) => y.formatted),
-        formattedLegends: u,
-        containerSize: d,
-        externalMeasurements: m,
-        annotationOverflow: p,
-        headline: f,
-        polarMargin: s
+    })).pipe(
+      ({
+        axisBundles: r,
+        formattedLegends: o,
+        containerSize: a,
+        externalMeasurements: s,
+        annotationOverflow: i,
+        headline: c,
+        polarMargin: l
+      }) => ({
+        layout: this.resolveLayout({
+          axes: r.map((u) => u.formatted),
+          formattedLegends: o,
+          containerSize: a,
+          externalMeasurements: s,
+          annotationOverflow: i,
+          headline: c,
+          polarMargin: l
+        })
       })
-    })).pipe(({ axisBundles: l, layout: u }) => ({
-      formattedAxes: l.map(
-        (d) => Tr(d.axis.position) ? d.formatted : this.finalizeAxis(d.axis, d.resolveFormatter, u.panel)
+    ).pipe(({ axisBundles: r, layout: o }) => ({
+      formattedAxes: r.map(
+        (a) => Mr(a.axis.position) ? a.formatted : this.finalizeAxis(a.axis, a.resolveFormatter, o.panel)
       )
     })).pipe(
-      ({ formattedAxes: l, formattedLegends: u, containerSize: d, externalMeasurements: m, annotationOverflow: p, headline: f }) => ({
+      ({
+        formattedAxes: r,
+        formattedLegends: o,
+        containerSize: a,
+        externalMeasurements: s,
+        annotationOverflow: i,
+        headline: c,
+        polarMargin: l
+      }) => ({
         layout: this.resolveLayout({
-          axes: l,
-          formattedLegends: u,
-          containerSize: d,
-          externalMeasurements: m,
-          annotationOverflow: p,
-          headline: f,
-          polarMargin: s
+          axes: r,
+          formattedLegends: o,
+          containerSize: a,
+          externalMeasurements: s,
+          annotationOverflow: i,
+          headline: c,
+          polarMargin: l
         })
       })
     ).pipe(
       ({
-        formattedAxes: l,
-        formattedLegends: u,
-        containerSize: d,
-        externalMeasurements: m,
-        layout: p,
-        annotationOverflow: f,
-        headline: y,
-        locale: g
+        formattedAxes: r,
+        formattedLegends: o,
+        containerSize: a,
+        externalMeasurements: s,
+        layout: i,
+        annotationOverflow: c,
+        headline: l,
+        polarMargin: u,
+        locale: d
       }) => {
-        const S = this.measureAnnotationOverflow(t, p.panel, g, f);
-        return S === f ? { formattedAxes: l, layout: p } : {
-          formattedAxes: l,
+        const m = this.measureAnnotationOverflow(t, i.panel, d, c);
+        return m === c ? { formattedAxes: r, layout: i } : {
+          formattedAxes: r,
           layout: this.resolveLayout({
-            axes: l,
-            formattedLegends: u,
-            containerSize: d,
-            externalMeasurements: m,
-            annotationOverflow: S,
-            headline: y,
-            polarMargin: s
+            axes: r,
+            formattedLegends: o,
+            containerSize: a,
+            externalMeasurements: s,
+            annotationOverflow: m,
+            headline: l,
+            polarMargin: u
           })
         };
       }
     ).result();
-    return { formattedAxes: i, layout: c, formattedPolarAxes: a };
+    return {
+      formattedAxes: n.formattedAxes,
+      layout: n.layout,
+      formattedPolarAxes: n.formattedPolarAxes
+    };
   }
   /**
    * Computes the panel pad needed so annotation labels stay inside the graph and don't overlap the panel edges.
@@ -6295,11 +6334,11 @@ class hy {
     return t === void 0 ? 0 : pp({ headline: t, containerSize: n, measurer: this.measurer });
   }
 }
-const Tr = (e) => e === "left" || e === "right", Mr = 5, tt = 8, yp = (e) => {
+const Tr = 5, tt = 8, Mr = (e) => e === "left" || e === "right", yp = (e) => {
   const [t, ...n] = e.tickCandidates;
   if (t)
     return e.geometry === "circular" ? t : n.reduce(
-      (r, o) => Math.abs(o.ticks.length - Mr) < Math.abs(r.ticks.length - Mr) ? o : r,
+      (r, o) => Math.abs(o.ticks.length - Tr) < Math.abs(r.ticks.length - Tr) ? o : r,
       t
     );
 }, gp = (e, t) => {
@@ -6374,7 +6413,7 @@ function yt(e, t) {
 function kn(e, t) {
   return e === "x" ? t.y : t.x;
 }
-function xp(e, t) {
+function Sp(e, t) {
   return {
     main: yt(e, t),
     cross: kn(e, t)
@@ -6383,7 +6422,7 @@ function xp(e, t) {
 function gy(e) {
   return e.type === "cartesian";
 }
-const In = 12, Sp = 4, wp = (e) => {
+const In = 12, xp = 4, wp = (e) => {
   const t = [];
   if (!e.layer.dataLabels.showDataLabels) return t;
   for (const n of e.layer.data) {
@@ -6480,8 +6519,8 @@ const In = 12, Sp = 4, wp = (e) => {
     if (m === "") continue;
     const { width: p, height: f } = r("dataLabel", m), y = aa(d, n);
     p > y.width && (c = !0);
-    const g = l === null ? null : u[l], S = L(g) && g < 0;
-    i.push({ key: s(u), isNegative: S, text: m, labelWidth: p, labelHeight: f, bounds: y });
+    const b = l === null ? null : u[l], x = L(b) && b < 0;
+    i.push({ key: s(u), isNegative: x, text: m, labelWidth: p, labelHeight: f, bounds: y });
   }
   return { entries: i, shouldRotate: !a && c };
 }, aa = (e, t) => ({
@@ -6497,7 +6536,7 @@ const In = 12, Sp = 4, wp = (e) => {
   let a = t, s = n - t;
   return s < 0 && (a += s, s = -s), { x: a, y: 1 - o, width: s, height: o - r };
 }, Vp = (e, t) => {
-  const n = mt(t), r = Pe(t), o = xe(t), a = Q(t) ?? te(t);
+  const n = mt(t), r = Pe(t), o = Se(t), a = Q(t) ?? te(t);
   return n === null || r === null || o === null || a === null ? null : sa(e, n, r, o, a);
 }, kp = (e, t) => {
   const { xMin: n, xMax: r, yMin: o, yMax: a } = t.anchor;
@@ -6543,19 +6582,19 @@ const In = 12, Sp = 4, wp = (e) => {
   panelWidth: a,
   panelHeight: s
 }) => {
-  const i = e === "top" || e === "bottom", c = t.x + t.width / 2, l = t.y + t.height / 2, u = ia(n, r, o), d = i ? u.height : u.width, m = i ? u.width : u.height, p = i ? t.height : t.width, f = i ? t.width : t.height, y = d / 2, { edgeCoord: g, outwardSign: S, panelExtent: x } = Dp(e, t, a, s);
+  const i = e === "top" || e === "bottom", c = t.x + t.width / 2, l = t.y + t.height / 2, u = ia(n, r, o), d = i ? u.height : u.width, m = i ? u.width : u.height, p = i ? t.height : t.width, f = i ? t.width : t.height, y = d / 2, { edgeCoord: b, outwardSign: x, panelExtent: S } = Dp(e, t, a, s);
   if (d + Ht < p) {
     if (m > f) return null;
     if (o) return { x: c, y: l, isRotated: !0, position: "inside" };
-    const M = g - S * (y + Ht);
+    const M = b - x * (y + Ht);
     return {
       ...i ? { x: c, y: M } : { x: M, y: l },
       isRotated: !1,
       position: "inside"
     };
   }
-  const w = g + S * (y + Ht);
-  return w - y < 0 || w + y > x ? null : {
+  const w = b + x * (y + Ht);
+  return w - y < 0 || w + y > S ? null : {
     ...i ? { x: c, y: w } : { x: w, y: l },
     isRotated: o,
     position: "outside"
@@ -6642,14 +6681,14 @@ const In = 12, Sp = 4, wp = (e) => {
 };
 function Bp(e) {
   return {
-    startAngle: e[b.xMin],
-    endAngle: e[b.xMax]
+    startAngle: e[g.xMin],
+    endAngle: e[g.xMax]
   };
 }
 function Gp(e) {
   return {
-    innerRadius: e[b.yMin],
-    outerRadius: e[b.yMax] ?? e[b.y]
+    innerRadius: e[g.yMin],
+    outerRadius: e[g.yMax] ?? e[g.y]
   };
 }
 const $p = " · ", Up = (e) => typeof e == "string" ? e : e instanceof Date ? e.toISOString() : String(e), Yp = (e, t) => {
@@ -6664,11 +6703,11 @@ const $p = " · ", Up = (e) => typeof e == "string" ? e : e instanceof Date ? e.
     if (i === null || c === null || l === null) continue;
     const u = e.formatLabel(s);
     if (u === "") continue;
-    const d = n === null ? null : n(s), m = d === null ? u : `${Up(d)}${$p}${u}`, { width: p, height: f } = e.measureDataLabel("dataLabel", m), y = (i + c) / 2, g = Math.abs(Math.sin(y)) * (p / 2) + Math.abs(Math.cos(y)) * (f / 2), S = l * a + Sp + g, x = r + Math.sin(y) * S, w = o - Math.cos(y) * S, M = p / 2, V = f / 2;
-    x - M < 0 || x + M > e.panelRect.width || w - V < 0 || w + V > e.panelRect.height || t.push({
+    const d = n === null ? null : n(s), m = d === null ? u : `${Up(d)}${$p}${u}`, { width: p, height: f } = e.measureDataLabel("dataLabel", m), y = (i + c) / 2, b = Math.abs(Math.sin(y)) * (p / 2) + Math.abs(Math.cos(y)) * (f / 2), x = l * a + xp + b, S = r + Math.sin(y) * x, w = o - Math.cos(y) * x, M = p / 2, V = f / 2;
+    S - M < 0 || S + M > e.panelRect.width || w - V < 0 || w + V > e.panelRect.height || t.push({
       layerId: e.layer.id,
       key: e.getObservationKey(s),
-      x,
+      x: S,
       y: w,
       text: m,
       width: p,
@@ -6752,7 +6791,7 @@ const Xp = ({
 }, Zp = (e) => {
   const t = To(e);
   return (n) => {
-    const r = xe(n), o = Q(n);
+    const r = Se(n), o = Q(n);
     if (!L(r) || !L(o)) return null;
     const a = Math.abs(o - r);
     if (a === 0) return null;
@@ -6925,7 +6964,7 @@ const Xp = ({
     labelStrokeWidth: l.labelStrokeWidth,
     labelFontWeight: l.labelFontWeight
   };
-}, df = 100, xy = ({
+}, df = 100, Sy = ({
   items: e,
   containerHeight: t,
   labelHeight: n
@@ -6951,7 +6990,7 @@ const Xp = ({
       break;
   }
   return { placements: r.filter((l) => l.y >= 0 && l.y <= t).map((l) => ({ y: l.y, anchorY: l.anchorY, payload: l.payload })), hasOverlap: a };
-}, Sy = ({
+}, xy = ({
   headline: e,
   show: t,
   numberFormat: n,
@@ -7019,12 +7058,12 @@ const Ty = ({ guides: e, numberFormat: t, layer: n, locale: r }) => {
   if (i === null) return null;
   const c = a ? wt(n.yScaleType) : "x", l = En(e, c)?.valueFormat ?? { type: "decimal" };
   return E({ valueFormat: l, locale: r, numberFormat: t })(i);
-}, vf = 800, Vr = 400, xf = {
+}, vf = 800, Vr = 400, Sf = {
   thin: { strokeWidth: { minValue: 1.5, targetValue: 2 }, arrowheadLength: { minValue: 7, targetValue: 8 } },
   medium: { strokeWidth: { minValue: 3, targetValue: 4 }, arrowheadLength: { minValue: 14, targetValue: 16 } },
   thick: { strokeWidth: { minValue: 6, targetValue: 8 }, arrowheadLength: { minValue: 28, targetValue: 32 } }
-}, Sf = (e) => Math.max(1, (e - Vr) / (vf - Vr) + 1), wf = (e, t) => {
-  const n = Sf(t), r = xf[e];
+}, xf = (e) => Math.max(1, (e - Vr) / (vf - Vr) + 1), wf = (e, t) => {
+  const n = xf(t), r = Sf[e];
   return {
     strokeWidth: Math.min(r.strokeWidth.targetValue, r.strokeWidth.minValue * n),
     arrowheadLength: Math.min(r.arrowheadLength.targetValue, r.arrowheadLength.minValue * n)
@@ -7252,10 +7291,10 @@ function Bf(e) {
 function Gf(e) {
   const t = e.data;
   if (t.size() === 0) return [];
-  const n = [b.xMin, b.xMax, b.yMin, b.yMax];
+  const n = [g.xMin, g.xMax, g.yMin, g.yMax];
   for (const l of n)
     if (!t.hasVariable(l)) return [];
-  const r = t.getValues(b.xMin, { type: "numeric" }), o = t.getValues(b.xMax, { type: "numeric" }), a = t.getValues(b.yMin, { type: "numeric" }), s = t.getValues(b.yMax, { type: "numeric" }), i = [];
+  const r = t.getValues(g.xMin, { type: "numeric" }), o = t.getValues(g.xMax, { type: "numeric" }), a = t.getValues(g.yMin, { type: "numeric" }), s = t.getValues(g.yMax, { type: "numeric" }), i = [];
   let c = 0;
   for (const l of t) {
     const u = r[c], d = o[c], m = a[c], p = s[c];
@@ -7294,43 +7333,43 @@ function Uf(e, t) {
 function Yf(e, t) {
   const n = e.data;
   if (n.size() === 0) return [];
-  const o = n.hasVariable(b.x), a = n.hasVariable(b.y);
+  const o = n.hasVariable(g.x), a = n.hasVariable(g.y);
   if (!o || !a) return [];
-  const s = n.getValues(b.x, { type: "numeric" }), i = n.getValues(b.y, { type: "numeric" }), c = t === "y", l = c ? b.xMin : b.yMin, u = c ? b.xMax : b.yMax, d = K(e.position), m = d ? n.getValues(l, { type: "numeric" }) : null, p = d ? n.getValues(u, { type: "numeric" }) : null, f = n.hasVariable(F.group) ? n.getValues(F.group, { type: "categorical" }) : null, y = [];
-  let g = 0;
-  for (const S of n) {
-    const x = s[g], w = i[g];
-    if (!h(x) || !h(w)) {
-      g += 1;
+  const s = n.getValues(g.x, { type: "numeric" }), i = n.getValues(g.y, { type: "numeric" }), c = t === "y", l = c ? g.xMin : g.yMin, u = c ? g.xMax : g.yMax, d = K(e.position), m = d ? n.getValues(l, { type: "numeric" }) : null, p = d ? n.getValues(u, { type: "numeric" }) : null, f = n.hasVariable(F.group) ? n.getValues(F.group, { type: "categorical" }) : null, y = [];
+  let b = 0;
+  for (const x of n) {
+    const S = s[b], w = i[b];
+    if (!h(S) || !h(w)) {
+      b += 1;
       continue;
     }
-    const M = f?.[g] ?? null, V = c ? w : x;
+    const M = f?.[b] ?? null, V = c ? w : S;
     if (d) {
-      const B = m?.[g], Ie = p?.[g];
+      const B = m?.[b], Ie = p?.[b];
       if (!h(B) || !h(Ie)) {
-        g += 1;
+        b += 1;
         continue;
       }
-      const A = c ? Ie : x, X = c ? w : Ie;
+      const A = c ? Ie : S, X = c ? w : Ie;
       y.push({
         main: V,
         entry: {
           isStacked: d,
-          pointIndex: g,
+          pointIndex: b,
           x: A,
           y: X,
           stackMin: B,
           stackMax: Ie,
           groupKey: M,
-          observation: S
+          observation: x
         }
       });
     } else
       y.push({
         main: V,
-        entry: { isStacked: d, pointIndex: g, x, y: w, groupKey: M, observation: S }
+        entry: { isStacked: d, pointIndex: b, x: S, y: w, groupKey: M, observation: x }
       });
-    g += 1;
+    b += 1;
   }
   return y;
 }
@@ -7362,8 +7401,8 @@ function ua(e, t) {
 function Kf(e) {
   const t = e.data;
   if (t.size() === 0) return [];
-  if (!t.hasVariable(b.x) || !t.hasVariable(b.y)) return [];
-  const n = t.getValues(b.x, { type: "numeric" }), r = t.getValues(b.y, { type: "numeric" }), o = [];
+  if (!t.hasVariable(g.x) || !t.hasVariable(g.y)) return [];
+  const n = t.getValues(g.x, { type: "numeric" }), r = t.getValues(g.y, { type: "numeric" }), o = [];
   let a = 0;
   for (const s of t) {
     const i = n[a], c = r[a];
@@ -7382,8 +7421,8 @@ function zf(e) {
 function Xf(e) {
   const t = e.data;
   if (t.size() === 0) return [];
-  if (!t.hasVariable(b.x) || !t.hasVariable(b.y)) return [];
-  const n = t.getValues(b.x, { type: "numeric" }), r = t.getValues(b.y, { type: "numeric" }), o = [];
+  if (!t.hasVariable(g.x) || !t.hasVariable(g.y)) return [];
+  const n = t.getValues(g.x, { type: "numeric" }), r = t.getValues(g.y, { type: "numeric" }), o = [];
   let a = 0;
   for (const s of t) {
     const i = n[a], c = r[a];
@@ -7425,25 +7464,25 @@ function Er(e) {
 function Qf(e, t) {
   const n = e.data;
   if (n.size() === 0) return [];
-  if (!(n.hasVariable(b.xMin) && n.hasVariable(b.xMax) && n.hasVariable(b.yMin) && n.hasVariable(b.yMax))) return [];
-  const o = n.getValues(b.xMin, { type: "numeric" }), a = n.getValues(b.xMax, { type: "numeric" }), s = n.getValues(b.yMin, { type: "numeric" }), i = n.getValues(b.yMax, { type: "numeric" }), c = t === "y", l = c ? b.y : b.x, u = n.hasVariable(l) ? n.getValues(l, { type: "numeric" }) : null, d = n.hasVariable(F.group) ? n.getValues(F.group, { type: "categorical" }) : null, m = [];
+  if (!(n.hasVariable(g.xMin) && n.hasVariable(g.xMax) && n.hasVariable(g.yMin) && n.hasVariable(g.yMax))) return [];
+  const o = n.getValues(g.xMin, { type: "numeric" }), a = n.getValues(g.xMax, { type: "numeric" }), s = n.getValues(g.yMin, { type: "numeric" }), i = n.getValues(g.yMax, { type: "numeric" }), c = t === "y", l = c ? g.y : g.x, u = n.hasVariable(l) ? n.getValues(l, { type: "numeric" }) : null, d = n.hasVariable(F.group) ? n.getValues(F.group, { type: "categorical" }) : null, m = [];
   let p = 0;
   for (const f of n) {
-    const y = o[p], g = a[p], S = s[p], x = i[p];
-    if (!h(y) || !h(g) || !h(S) || !h(x)) {
+    const y = o[p], b = a[p], x = s[p], S = i[p];
+    if (!h(y) || !h(b) || !h(x) || !h(S)) {
       p++;
       continue;
     }
-    const w = c ? (S + x) / 2 : (y + g) / 2, M = u?.[p] ?? w;
+    const w = c ? (x + S) / 2 : (y + b) / 2, M = u?.[p] ?? w;
     m.push({
       mainMid: w,
       bandCenter: M,
       entry: {
         pointIndex: p,
         xMin: y,
-        xMax: g,
-        yMin: S,
-        yMax: x,
+        xMax: b,
+        yMin: x,
+        yMax: S,
         segmentKey: d?.[p] ?? null,
         observation: f
       }
@@ -7559,7 +7598,7 @@ function oh(e, t, n) {
 }
 function ah(e, t, n) {
   if (e.buckets.length === 0) return null;
-  const { main: r, cross: o } = xp(e.mainAxis, t), a = la(e, r), s = a?.entries ?? [];
+  const { main: r, cross: o } = Sp(e.mainAxis, t), a = la(e, r), s = a?.entries ?? [];
   if (!a || !Or(s)) return null;
   const i = lh(s, o, e.mainAxis);
   return {
@@ -7854,7 +7893,7 @@ const bh = ({
     case "month":
       return zo(e);
     case "month_year":
-      return Sn(e);
+      return xn(e);
     case "percentage":
       return Ho(e);
     case "quarter":
@@ -7876,7 +7915,7 @@ const bh = ({
       throw new Error(`Unhandled value format: ${n.type}`);
     }
   }
-}, xh = { type: "decimal" }, Vy = ({
+}, Sh = { type: "decimal" }, Vy = ({
   layers: e,
   coordSystem: t,
   scales: n,
@@ -7890,11 +7929,11 @@ const bh = ({
   if (c === null) return null;
   const l = i ?? a;
   return {
-    header: Sh({ layers: e, coordSystem: t, guides: r, primary: c, locale: l, numberFormat: o }),
+    header: xh({ layers: e, coordSystem: t, guides: r, primary: c, locale: l, numberFormat: o }),
     rows: wh({ layers: e, coordSystem: t, scales: n, guides: r, hover: s, locale: l, numberFormat: o })
   };
 };
-function Sh(e) {
+function xh(e) {
   if (e.coordSystem.type !== "cartesian") return null;
   const t = En(e.guides, "x");
   if (!t) return null;
@@ -7937,12 +7976,12 @@ function wh(e) {
       numberFormat: e.numberFormat
     }), u = Vh(e.guides, o), d = o.mapping.color !== void 0, m = Be(o.swatchShape, e.coordSystem);
     for (const p of i) {
-      const f = d ? s(p.observation) : null, y = Kr(p.observation) ?? null, g = rs(p.observation), S = d && f !== null ? r(f) : u, x = Ih(c, p), w = x === null ? "" : l(x, p.observation);
+      const f = d ? s(p.observation) : null, y = Kr(p.observation) ?? null, b = rs(p.observation), x = d && f !== null ? r(f) : u, S = Ih(c, p), w = S === null ? "" : l(S, p.observation);
       t.push({
         swatchColor: y,
         swatchShape: m,
-        swatchLineType: g,
-        label: S,
+        swatchLineType: b,
+        label: x,
         value: w,
         isPrimary: p === e.hover.primary,
         key: `${p.layerId}:${p.pointIndex}`
@@ -8006,7 +8045,7 @@ function Vh(e, t) {
   return En(e, n)?.label ?? "";
 }
 function kh(e) {
-  return e.semanticMap.encodings.find((n) => n.aesthetic === "y")?.valueFormat ?? xh;
+  return e.semanticMap.encodings.find((n) => n.aesthetic === "y")?.valueFormat ?? Sh;
 }
 function Ih(e, t) {
   return e(t.observation).encodings.find((r) => r.aesthetic === "y")?.value ?? null;
@@ -8391,7 +8430,7 @@ class va {
     return { spec: a, revert: i };
   }
 }
-const xa = 500, Sa = "normal", wa = {
+const Sa = 500, xa = "normal", wa = {
   thin: 100,
   hairline: 100,
   extraLight: 200,
@@ -8410,9 +8449,9 @@ const xa = 500, Sa = "normal", wa = {
   extraBlack: 950,
   ultraBlack: 950
 }, _y = (e) => {
-  const t = e.style ?? Sa, n = e.weight ?? xa, r = e.family.includes(",") ? e.family : `'${e.family}'`;
+  const t = e.style ?? xa, n = e.weight ?? Sa, r = e.family.includes(",") ? e.family : `'${e.family}'`;
   return `${t} ${n} ${e.size}px ${r}`;
-}, Ry = (e) => typeof e == "string" ? e : Aa(e), Aa = (e) => e.text !== void 0 ? e.text : e.content ? e.content.map(Aa).join("") : "", Ta = (e) => typeof e != "string" ? e ?? xa : wa[e], Gh = "\0";
+}, Ry = (e) => typeof e == "string" ? e : Aa(e), Aa = (e) => e.text !== void 0 ? e.text : e.content ? e.content.map(Aa).join("") : "", Ta = (e) => typeof e != "string" ? e ?? Sa : wa[e], Gh = "\0";
 class Py {
   constructor(t) {
     this.inner = t, this.cache = /* @__PURE__ */ new Map();
@@ -8425,7 +8464,7 @@ class Py {
     return this.cache.set(r, a), a;
   }
   getCacheKey(t, n) {
-    return [n.family, n.size, Ta(n.weight), n.style ?? Sa, t].join(Gh);
+    return [n.family, n.size, Ta(n.weight), n.style ?? xa, t].join(Gh);
   }
 }
 const $h = {
@@ -8549,8 +8588,8 @@ export {
   Fy as CommandStackManager,
   hm as Compiler,
   Io as DEFAULT_COLOR_PALETTE,
-  Sa as DEFAULT_FONT_STYLE,
-  xa as DEFAULT_FONT_WEIGHT,
+  xa as DEFAULT_FONT_STYLE,
+  Sa as DEFAULT_FONT_WEIGHT,
   tn as DEFAULT_LOCALE,
   ge as Dataset,
   ac as GEOM_NAMES,
@@ -8561,7 +8600,7 @@ export {
   hy as LayoutCompiler,
   Ll as MONO_BASES,
   Vl as NEON_BASES,
-  b as POSITION_VARIABLES,
+  g as POSITION_VARIABLES,
   ye as RESTING_HOVER_STATE,
   pa as SetAxisPositionCommand,
   fa as SetContentCaptionCommand,
@@ -8578,7 +8617,7 @@ export {
   zp as buildLayerYValueFormatter,
   Vy as buildTooltipContent,
   vy as computeDifferenceArrow,
-  xy as computeDirectLabelsLayout,
+  Sy as computeDirectLabelsLayout,
   My as computeFreeformArrow,
   lu as config,
   Dy as convertSpecToInput,
@@ -8601,7 +8640,7 @@ export {
   Ry as extractPlainText,
   En as findAxisGuide,
   Ay as findLegendForAesthetic,
-  Sy as formatHeadline,
+  xy as formatHeadline,
   wy as formatLegends,
   Ty as formatRuleValue,
   I as geom,
@@ -8622,7 +8661,7 @@ export {
   mt as getXMin,
   te as getY,
   Q as getYMax,
-  xe as getYMin,
+  Se as getYMin,
   mi as getYRaw,
   Cy as highlight,
   ic as isBuiltinGeomName,