@milaboratories/graph-maker 1.1.139 → 1.1.140

package/dist/node_modules/@milaboratories/pf-plots/dist/index.js

@@ -1,8 +1,8 @@
 import z from "../../../canonicalize/lib/canonicalize.js";
-import { deriveLabels as _e, isLabelColumn as Le } from "../../../@platforma-sdk/model/dist/index.js";
+import { deriveLabels as Fe, isLabelColumn as Le } from "../../../@platforma-sdk/model/dist/index.js";
 import { canonicalizeJson as j, pTableValue as Te } from "../../pl-model-common/dist/index.js";
-import ue from "../../../lodash/lodash.js";
-var ke = "pl7.app/axisNature", we = "pl7.app/label", Ee = "pl7.app/columnAsAxis/name", Ne = "pl7.app/columnAsAxis/domain", $ = "pl7.app/isSubset", ee = "pl7.app/isDiscreteFilter", Ge = "pl7.app/discreteValues", Me = "pl7.app/graph/axis/highCardinality", qe = "pl7.app/graph/isVirtual", Ce = "pl7.app/isLinkerColumn", pe = "pl7.app/format", _ = class se {
+import pe from "../../../lodash/lodash.js";
+var ke = "pl7.app/axisNature", we = "pl7.app/label", Ee = "pl7.app/columnAsAxis/name", Ne = "pl7.app/columnAsAxis/domain", $ = "pl7.app/isSubset", te = "pl7.app/isDiscreteFilter", Ge = "pl7.app/discreteValues", Me = "pl7.app/graph/axis/highCardinality", qe = "pl7.app/graph/isVirtual", ve = "pl7.app/isLinkerColumn", ne = "pl7.app/format", F = class ae {
   constructor({ type: e, name: o, domain: n }) {
     this.kind = "axis", this.type = e, this.name = o, this.domain = { ...n };
   }
@@ -10,13 +10,13 @@ var ke = "pl7.app/axisNature", we = "pl7.app/label", Ee = "pl7.app/columnAsAxis/
     return z(this);
   }
   static fromAxisSpec(e) {
-    return new se({ name: e.name, type: e.type, domain: e.domain });
+    return new ae({ name: e.name, type: e.type, domain: e.domain });
   }
   static fromAxesSpec(e) {
-    return e.map((o) => se.fromAxisSpec(o));
+    return e.map((o) => ae.fromAxisSpec(o));
   }
   copy() {
-    return new se({ type: this.type, name: this.name, domain: this.domain });
+    return new ae({ type: this.type, name: this.name, domain: this.domain });
   }
   toPFrameId() {
     return {
@@ -26,9 +26,9 @@ var ke = "pl7.app/axisNature", we = "pl7.app/label", Ee = "pl7.app/columnAsAxis/
     };
   }
   static fromPojo(e) {
-    return new se(e);
+    return new ae(e);
   }
-}, W = class ve {
+}, W = class Ce {
   constructor({ name: e, type: o }) {
     this.kind = "column", this.name = e, this.type = o;
   }
@@ -36,21 +36,21 @@ var ke = "pl7.app/axisNature", we = "pl7.app/label", Ee = "pl7.app/columnAsAxis/
     return z(this);
   }
   static fromPojo(e) {
-    return new ve(e);
+    return new Ce(e);
   }
 };
-function P(t) {
+function O(t) {
   return t !== null && t.kind === "column";
 }
-function ae(t) {
+function re(t) {
   return t !== null && t.kind === "axis";
 }
-function A(t) {
+function b(t) {
   const e = JSON.parse(t);
   if (e.kind === "column")
     return W.fromPojo(e);
   if (e.kind === "axis")
-    return _.fromPojo(e);
+    return F.fromPojo(e);
   throw Error("wrong column or axis object");
 }
 var fe = "pl7.app/parents";
@@ -111,7 +111,7 @@ function Ue(t) {
   }
   return e;
 }
-function te(t) {
+function oe(t) {
   if (!t.length)
     return [];
   let e = t;
@@ -132,7 +132,7 @@ function We(t) {
   var e, o;
   const n = /* @__PURE__ */ new Map();
   for (const l of t) {
-    const s = new W({ name: l.columnId, type: l.spec.valueType }), c = te(l.spec.axesSpec);
+    const s = new W({ name: l.columnId, type: l.spec.valueType }), c = oe(l.spec.axesSpec);
     if (!c || c.length !== 2)
       continue;
     const [r, a] = c, u = j(r), p = j(a);
@@ -141,59 +141,59 @@ function We(t) {
   return n;
 }
 async function He(t, e, o, n, l, s, c, r = !0, a) {
-  var u, p, m, y;
-  const x = A(e);
-  if (P(x)) {
-    const g = await t.pFrameProvider.getColumnSpecById(x);
-    if (!g)
+  var u, p, m, S;
+  const h = b(e);
+  if (O(h)) {
+    const x = await t.pFrameProvider.getColumnSpecById(h);
+    if (!x)
       return;
     const w = De(
-      g,
+      x,
       l,
       s,
       c,
       a
-    ).map((d) => _.fromAxisSpec(d).toCanonicalString()), C = new Set(w), D = g.axesSpec.map((d) => _.fromAxisSpec(d).toCanonicalString()), B = {};
+    ).map((d) => F.fromAxisSpec(d).toCanonicalString()), v = new Set(w), D = x.axesSpec.map((d) => F.fromAxisSpec(d).toCanonicalString()), B = {};
     r && D.forEach((d, i) => {
-      C.has(d) && (B[d] = i);
+      v.has(d) && (B[d] = i);
     });
-    const v = {
+    const C = {
       kind: "column",
-      name: g.name,
+      name: x.name,
       label: o ?? await T(t, e, []),
-      type: g.valueType,
-      spec: g,
-      annotations: g.annotations,
-      isSubsetFilter: ((u = g.annotations) == null ? void 0 : u[$]) === "true",
-      isDiscreteFilter: g.valueType === "String" || ((p = g.annotations) == null ? void 0 : p[ee]) === "true",
+      type: x.valueType,
+      spec: x,
+      annotations: x.annotations,
+      isSubsetFilter: ((u = x.annotations) == null ? void 0 : u[$]) === "true",
+      isDiscreteFilter: x.valueType === "String" || ((p = x.annotations) == null ? void 0 : p[te]) === "true",
       axesToBeFixed: w,
       axesToBeFixedIndexes: B
     };
-    n.set(x.toCanonicalString(), v);
-    for (const d of g.axesSpec) {
-      const S = _.fromAxisSpec(d).toCanonicalString();
-      if (n.has(S))
+    n.set(h.toCanonicalString(), C);
+    for (const d of x.axesSpec) {
+      const y = F.fromAxisSpec(d).toCanonicalString();
+      if (n.has(y))
         continue;
-      const f = Ie(d), h = {
+      const f = Ie(d), g = {
         kind: "axis",
         name: d.name,
-        label: await T(t, S, [e]),
+        label: await T(t, y, [e]),
         type: d.type,
         mustBeConsumed: f,
         dividable: !1,
         spec: d,
         annotations: d.annotations,
         isSubsetFilter: ((m = d.annotations) == null ? void 0 : m[$]) === "true",
-        isDiscreteFilter: d.type === "String" || ((y = d.annotations) == null ? void 0 : y[ee]) === "true",
+        isDiscreteFilter: d.type === "String" || ((S = d.annotations) == null ? void 0 : S[te]) === "true",
         parentSources: [e]
       };
-      n.set(S, h);
+      n.set(y, g);
     }
   }
 }
 function ge(t) {
-  const e = A(t), { name: o, type: n } = e;
-  return P(e) ? {
+  const e = b(t), { name: o, type: n } = e;
+  return O(e) ? {
     kind: "column",
     name: "",
     label: " ",
@@ -226,21 +226,21 @@ function me(t) {
   };
 }
 function Ye(t) {
-  const { selectedSource: e, type: o, selectedFilterRange: n, selectedFilterValue: l } = t, s = A(e);
+  const { selectedSource: e, type: o, selectedFilterRange: n, selectedFilterValue: l } = t, s = b(e);
   if (!s)
     throw Error("Empty source selected");
   if (o === "range") {
     const c = [];
     return (n == null ? void 0 : n.max) !== void 0 && c.push({
       type: "bySingleColumnV2",
-      column: ae(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
+      column: re(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
       predicate: {
         operator: "LessOrEqual",
         reference: n.max
       }
     }), (n == null ? void 0 : n.min) !== void 0 && c.push({
       type: "bySingleColumnV2",
-      column: ae(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
+      column: re(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
       predicate: {
         operator: "GreaterOrEqual",
         reference: n == null ? void 0 : n.min
@@ -250,7 +250,7 @@ function Ye(t) {
     return [
       {
         type: "bySingleColumnV2",
-        column: ae(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
+        column: re(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
         predicate: {
           operator: "Not",
           operand: { operator: "IsNA" }
@@ -260,7 +260,7 @@ function Ye(t) {
   return typeof l > "u" ? [] : [
     {
       type: "bySingleColumnV2",
-      column: ae(s) ? { type: "axis", id: s.toPFrameId() } : {
+      column: re(s) ? { type: "axis", id: s.toPFrameId() } : {
         type: "column",
         id: s.name
       },
@@ -289,10 +289,10 @@ function xe(t) {
 async function be(t, e, o) {
   var n;
   for (const l of o) {
-    const s = A(l);
-    if (P(s)) {
+    const s = b(l);
+    if (O(s)) {
       const c = await t.pFrameProvider.getColumnSpecById(s), r = ((n = c == null ? void 0 : c.axesSpec) != null ? n : []).find(
-        (a) => _.fromAxisSpec(a).toCanonicalString() === e.toCanonicalString()
+        (a) => F.fromAxisSpec(a).toCanonicalString() === e.toCanonicalString()
       );
       if (r)
         return r;
@@ -302,8 +302,8 @@ async function be(t, e, o) {
 }
 var Re = "pl7.app/label";
 async function k(t, e, o) {
-  const n = A(e);
-  if (P(n))
+  const n = b(e);
+  if (O(n))
     return;
   async function l(a) {
     const u = await be(t, a, o);
@@ -312,14 +312,14 @@ async function k(t, e, o) {
   const s = await t.pFrameProvider.getColumnsFull([], !1, void 0, [Re]), c = await l(n), r = s.find(({ spec: a }) => a && a.axesSpec.length === 1 && xe(a.axesSpec[0]) === c);
   return r ? new W({ name: r.columnId, type: r.spec.valueType }) : void 0;
 }
-async function le(t, e, o) {
-  const n = A(e), l = await k(t, e, o);
+async function J(t, e, o) {
+  const n = b(e), l = await k(t, e, o);
   let s;
-  return P(n) ? s = await t.pFrameProvider.getColumnSpecById(l ?? n) : s = l ? await t.pFrameProvider.getColumnSpecById(l) : await be(t, n, o), s;
+  return O(n) ? s = await t.pFrameProvider.getColumnSpecById(l ?? n) : s = l ? await t.pFrameProvider.getColumnSpecById(l) : await be(t, n, o), s;
 }
 async function T(t, e, o) {
   var n, l;
-  const s = await le(t, e, o);
+  const s = await J(t, e, o);
   if (!s)
     return "";
   const c = (l = (n = s.annotations) == null ? void 0 : n[we]) != null ? l : s.name;
@@ -332,7 +332,7 @@ function Ie(t) {
 }
 function R(t) {
   var e, o;
-  return ((e = t.annotations) == null ? void 0 : e[$]) === "true" || ((o = t.annotations) == null ? void 0 : o[ee]) === "true", !0;
+  return ((e = t.annotations) == null ? void 0 : e[$]) === "true" || ((o = t.annotations) == null ? void 0 : o[te]) === "true", !0;
 }
 function Xe(t) {
   var e, o;
@@ -344,22 +344,22 @@ function $e(t) {
   for (const n of t.filter((l) => l.spec.axesSpec.length === 2)) {
     const l = new W({ name: n.columnId, type: n.spec.valueType }), s = (e = n.spec.axesSpec) != null ? e : [];
     if (s.length) {
-      const [c, r] = s, a = _.fromAxisSpec(c).toCanonicalString(), u = _.fromAxisSpec(r).toCanonicalString();
+      const [c, r] = s, a = F.fromAxisSpec(c).toCanonicalString(), u = F.fromAxisSpec(r).toCanonicalString();
       o[a] || (o[a] = {}), o[u] || (o[u] = {}), o[a][u] = { id: l, spec: n.spec }, o[u][a] = { id: l, spec: n.spec };
     }
   }
   return o;
 }
-async function J(t, e) {
+async function Q(t, e) {
   const o = /* @__PURE__ */ new Set(), n = [];
   for (const l of e) {
-    const s = A(l);
-    if (P(s)) {
+    const s = b(l);
+    if (O(s)) {
       const c = await t.pFrameProvider.getColumnSpecById(s);
       if (!c)
         continue;
       c.axesSpec.forEach((r) => {
-        const a = _.fromAxisSpec(r).toCanonicalString();
+        const a = F.fromAxisSpec(r).toCanonicalString();
         o.has(a) || (o.add(a), n.push(r));
       });
     }
@@ -380,7 +380,7 @@ function Je(t, e, o) {
             let m = o;
             for (; n[m] !== e; )
               p.push(m), m = n[m];
-            return p.push(m), p.map((y) => t[y][n[y]].id);
+            return p.push(m), p.map((S) => t[S][n[S]].id);
           } else l.has(u) || (c.add(u), l.add(u));
       }
     s = [...c];
@@ -402,84 +402,84 @@ async function X(t) {
     !1,
     void 0,
     void 0,
-    { [Ce]: "true" }
+    { [ve]: "true" }
   ), o = $e(e.filter((l) => l.spec.axesSpec.length === 2)), n = We(e.filter((l) => l.spec.axesSpec.length > 2));
   return { linkerColumnsMap: o, compositeLinkerMap: n };
 }
 async function V(t, e, o, n, l, s) {
-  const c = A(l);
-  if (!P(c))
+  const c = b(l);
+  if (!O(c))
     return [];
   const r = await t.pFrameProvider.getColumnSpecById(c);
   if (!r)
     return [];
   const a = r.axesSpec.filter(
     (w) => {
-      const C = _.fromAxisSpec(w).toCanonicalString();
-      return !(s != null && s.some((D) => D.axisSource === C));
+      const v = F.fromAxisSpec(w).toCanonicalString();
+      return !(s != null && s.some((D) => D.axisSource === v));
     }
-  ), u = new Set(n.map((w) => _.fromAxisSpec(w).toCanonicalString())), p = a.filter((w) => {
-    const C = _.fromAxisSpec(w).toCanonicalString();
-    return !u.has(C);
+  ), u = new Set(n.map((w) => F.fromAxisSpec(w).toCanonicalString())), p = a.filter((w) => {
+    const v = F.fromAxisSpec(w).toCanonicalString();
+    return !u.has(v);
   });
   if (!p.length)
     return [];
-  const m = te(n), y = te(p);
-  if (!m || !y)
+  const m = oe(n), S = oe(p);
+  if (!m || !S)
     throw Error(`Can't create axes tree for ${r.name}`);
-  const x = new Set(m.map(j)), g = /* @__PURE__ */ new Set();
-  return y.forEach((w) => {
-    var C;
+  const h = new Set(m.map(j)), x = /* @__PURE__ */ new Set();
+  return S.forEach((w) => {
+    var v;
     const D = j(w);
     if (o.has(D)) {
-      const B = o.get(D), d = (B ? [...B.keys()] : []).find((S) => x.has(S));
+      const B = o.get(D), d = (B ? [...B.keys()] : []).find((y) => h.has(y));
       if (!d)
         throw Error(`Can't find composite linker column for ${r.name}, ${D}`);
-      const i = (C = o.get(D)) == null ? void 0 : C.get(d);
-      g.add(i.toCanonicalString());
+      const i = (v = o.get(D)) == null ? void 0 : v.get(d);
+      x.add(i.toCanonicalString());
     } else if (w.length === 1) {
-      const B = _.fromAxisSpec(w[0]).toCanonicalString();
+      const B = F.fromAxisSpec(w[0]).toCanonicalString();
       Qe(e, u, B).forEach((d) => {
-        g.add(d.toCanonicalString());
+        x.add(d.toCanonicalString());
       });
     }
-  }), [...g].map((w) => A(w));
+  }), [...x].map((w) => b(w));
 }
 function De(t, e, o, n, l) {
   const c = t.axesSpec.filter(
-    (p) => !o.has(_.fromAxisSpec(p).toCanonicalString())
+    (p) => !o.has(F.fromAxisSpec(p).toCanonicalString())
   );
   if (!c.length)
     return [];
-  const r = te(e);
-  let a = te(c);
+  const r = oe(e);
+  let a = oe(c);
   if (!r || !a)
     return c;
   const u = new Set(r.map(j));
   return a = a.filter(
     (p) => {
-      const m = j(p), y = l.get(m);
-      return !(y ? [...y.keys()] : []).some((g) => u.has(g));
+      const m = j(p), S = l.get(m);
+      return !(S ? [...S.keys()] : []).some((x) => u.has(x));
     }
-  ), a.some((p) => p.length > 1) ? a.flatMap((p) => p) : (a = a.filter(([p]) => !n.has(_.fromAxisSpec(p).toCanonicalString())), a.flatMap((p) => p));
+  ), a.some((p) => p.length > 1) ? a.flatMap((p) => p) : (a = a.filter(([p]) => !n.has(F.fromAxisSpec(p).toCanonicalString())), a.flatMap((p) => p));
 }
 function Be(t, e) {
   const o = e.columnsData[Object.keys(e.columnsData)[0]].length, n = new Int32Array(o).fill(0);
   for (let l = 0; l < o; l++) {
     let s = !1;
     for (let c = 0; c < t.length; c++) {
-      const { selectedSource: r, selectedFilterValue: a, selectedFilterRange: u, type: p } = t[c], m = A(r), y = (P(m) ? e.columnsData[r] : e.axesData[r])[l];
-      if (a !== void 0 && (s = s || y === a), u !== void 0 && (u.min !== void 0 || u.max !== void 0) && typeof y == "number") {
-        let x = !0;
-        u.min !== void 0 && (x = x && y >= u.min), u.max !== void 0 && (x = x && y <= u.max), s = s || x;
+      const { selectedSource: r, selectedFilterValue: a, selectedFilterRange: u, type: p } = t[c], m = b(r), S = (O(m) ? e.columnsData[r] : e.axesData[r])[l];
+      if (a !== void 0 && (s = s || S === a), u !== void 0 && (u.min !== void 0 || u.max !== void 0) && typeof S == "number") {
+        let h = !0;
+        u.min !== void 0 && (h = h && S >= u.min), u.max !== void 0 && (h = h && S <= u.max), s = s || h;
       }
-      p === "subset" && (s = s || y != null);
+      p === "subset" && (s = s || S != null);
     }
     s && (n[l] = 1);
   }
   return n;
 }
-var Q = class {
+var Z = class {
   constructor(t, e) {
     this.simpleComponentControllers = t, this.filterComponentControllers = e, this.ignoredOptionIdNames = [], this.dataInputs = [], this.dontAllowUnfilteredHighCardinality = !1;
   }
@@ -550,13 +550,13 @@ var Q = class {
     var s;
     const c = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set(), a = [];
     for (const m of this.dataInputs)
-      for (const y of e.components[m].selectorStates) {
-        const x = A(y.selectedSource);
-        if (P(x)) {
-          const g = await t.pFrameProvider.getColumnSpecById(x);
-          g && g.axesSpec.forEach((w) => {
-            const C = _.fromAxisSpec(w).toCanonicalString();
-            r.has(C) || (r.add(C), a.push(w));
+      for (const S of e.components[m].selectorStates) {
+        const h = b(S.selectedSource);
+        if (O(h)) {
+          const x = await t.pFrameProvider.getColumnSpecById(h);
+          x && x.axesSpec.forEach((w) => {
+            const v = F.fromAxisSpec(w).toCanonicalString();
+            r.has(v) || (r.add(v), a.push(w));
           });
         }
       }
@@ -564,17 +564,17 @@ var Q = class {
     let p = [...r];
     for (; p.length; ) {
       const m = [];
-      for (const y of p)
-        if (n[y]) {
-          const x = Object.keys(n[y]);
-          for (const g of x)
-            !u.has(g) && !r.has(g) && (m.push(g), u.add(g));
+      for (const S of p)
+        if (n[S]) {
+          const h = Object.keys(n[S]);
+          for (const x of h)
+            !u.has(x) && !r.has(x) && (m.push(x), u.add(x));
         }
       p = m;
     }
-    for (const [m, { selectorStates: y }] of Object.entries(e.components)) {
-      const g = ((s = this.simpleComponentControllers[m]) != null ? s : this.filterComponentControllers[m]).settings.columnsWithExtraAxesAllowed;
-      for (const { selectedSource: w } of y)
+    for (const [m, { selectorStates: S }] of Object.entries(e.components)) {
+      const x = ((s = this.simpleComponentControllers[m]) != null ? s : this.filterComponentControllers[m]).settings.columnsWithExtraAxesAllowed;
+      for (const { selectedSource: w } of S)
         await He(
           t,
           w,
@@ -583,7 +583,7 @@ var Q = class {
           a,
           r,
           u,
-          g,
+          x,
           l
         );
     }
@@ -610,24 +610,24 @@ var Q = class {
   async getLabelsMap(t, e) {
     const o = await t.pFrameProvider.getColumnsFull(
       this.dataInputs.reduce((n, l) => {
-        const c = e.components[l].selectorStates.map((r) => A(r.selectedSource));
+        const c = e.components[l].selectorStates.map((r) => b(r.selectedSource));
         return n.concat(c);
       }, []),
       !1
     );
-    return _e(o, (n) => n.spec).reduce((n, l) => {
+    return Fe(o, (n) => n.spec).reduce((n, l) => {
       const s = new W({ name: l.value.columnId, type: l.value.spec.valueType }).toCanonicalString();
       return n[s] = l.label, n;
     }, {});
   }
   async calculateOptions(t, e, o = [], n = Xe) {
     var l, s;
-    const c = this.createEmptyComponentsGuide(e), r = this.getConsumedOptionsSet(e), a = new Set(this.ignoredOptionIdNames), u = new Set(o), { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), y = await this.getLabelsMap(t, e), x = await this.getSelectedSourcesInfo(t, e, y, p, m), g = /* @__PURE__ */ new Map(), w = { ...this.simpleComponentControllers, ...this.filterComponentControllers }, C = /* @__PURE__ */ new Set();
-    for (const [S, f] of Object.entries(w)) {
-      const h = await f.getOptions(
+    const c = this.createEmptyComponentsGuide(e), r = this.getConsumedOptionsSet(e), a = new Set(this.ignoredOptionIdNames), u = new Set(o), { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), S = await this.getLabelsMap(t, e), h = await this.getSelectedSourcesInfo(t, e, S, p, m), x = /* @__PURE__ */ new Map(), w = { ...this.simpleComponentControllers, ...this.filterComponentControllers }, v = /* @__PURE__ */ new Set();
+    for (const [y, f] of Object.entries(w)) {
+      const g = await f.getOptions(
         t,
         e,
-        y,
+        S,
         r,
         p,
         m,
@@ -635,92 +635,92 @@ var Q = class {
         a,
         u
       );
-      this.dataInputs.includes(S) || h.options.forEach((b) => {
-        C.add(b.value);
+      this.dataInputs.includes(y) || g.options.forEach((A) => {
+        v.add(A.value);
       });
-      for (const [b, O] of h.optionsInfo)
-        g.set(b, O);
-      c[S] = h;
+      for (const [A, P] of g.optionsInfo)
+        x.set(A, P);
+      c[y] = g;
     }
-    const D = (S) => {
-      const f = g.get(S);
+    const D = (y) => {
+      const f = x.get(y);
       f && f.kind === "axis" && (f.mustBeConsumed = !0);
-      const h = x.get(S);
-      h && h.kind === "axis" && (h.mustBeConsumed = !0);
+      const g = h.get(y);
+      g && g.kind === "axis" && (g.mustBeConsumed = !0);
     }, B = await this.getMustBeConsumedAxes(t, e);
-    for (const S of B)
-      D(S);
+    for (const y of B)
+      D(y);
     if (this.dontAllowUnfilteredHighCardinality) {
-      const S = (h) => {
-        var b;
-        return ((b = h == null ? void 0 : h.annotations) == null ? void 0 : b[Me]) === "true";
-      }, f = (s = (l = e.components.filters) == null ? void 0 : l.selectorStates.reduce((h, b) => {
-        const O = x.get(b.selectedSource);
-        return (O == null ? void 0 : O.kind) === "column" && O.spec.axesSpec.filter(S).forEach((L) => h.add(_.fromAxisSpec(L).toCanonicalString())), (O == null ? void 0 : O.kind) === "axis" && S(O.spec) && h.add(_.fromAxisSpec(O.spec).toCanonicalString()), h;
+      const y = (g) => {
+        var A;
+        return ((A = g == null ? void 0 : g.annotations) == null ? void 0 : A[Me]) === "true";
+      }, f = (s = (l = e.components.filters) == null ? void 0 : l.selectorStates.reduce((g, A) => {
+        const P = h.get(A.selectedSource);
+        return (P == null ? void 0 : P.kind) === "column" && P.spec.axesSpec.filter(y).forEach((L) => g.add(F.fromAxisSpec(L).toCanonicalString())), (P == null ? void 0 : P.kind) === "axis" && y(P.spec) && g.add(F.fromAxisSpec(P.spec).toCanonicalString()), g;
       }, /* @__PURE__ */ new Set())) != null ? s : /* @__PURE__ */ new Set();
-      this.dataInputs.forEach((h) => {
-        for (const { selectedSource: b } of e.components[h].selectorStates) {
-          const O = x.get(b);
-          if ((O == null ? void 0 : O.kind) === "column" && O.spec.axesSpec.filter(S).forEach((L) => {
-            const N = _.fromAxisSpec(L).toCanonicalString();
-            !C.has(N) && !f.has(N) && C.add(N), f.has(N) || D(N);
-          }), (O == null ? void 0 : O.kind) === "axis" && S(O.spec)) {
-            const E = _.fromAxisSpec(O.spec).toCanonicalString();
-            C.has(E) || C.add(E), f.has(E) || D(E);
+      this.dataInputs.forEach((g) => {
+        for (const { selectedSource: A } of e.components[g].selectorStates) {
+          const P = h.get(A);
+          if ((P == null ? void 0 : P.kind) === "column" && P.spec.axesSpec.filter(y).forEach((L) => {
+            const N = F.fromAxisSpec(L).toCanonicalString();
+            !v.has(N) && !f.has(N) && v.add(N), f.has(N) || D(N);
+          }), (P == null ? void 0 : P.kind) === "axis" && y(P.spec)) {
+            const E = F.fromAxisSpec(P.spec).toCanonicalString();
+            v.has(E) || v.add(E), f.has(E) || D(E);
           }
         }
       });
     }
-    const v = /* @__PURE__ */ new Set();
-    for (const { selectorStates: S } of Object.values(e.components))
-      for (const { selectedSource: f } of S) {
-        const h = x.get(f);
-        h && h.kind === "column" && h.axesToBeFixed.forEach((b) => {
-          v.add(b);
+    const C = /* @__PURE__ */ new Set();
+    for (const { selectorStates: y } of Object.values(e.components))
+      for (const { selectedSource: f } of y) {
+        const g = h.get(f);
+        g && g.kind === "column" && g.axesToBeFixed.forEach((A) => {
+          C.add(A);
         });
       }
-    const d = await this.isConsistent(t, e, p, m), i = (S) => {
-      var f, h, b;
-      const O = (f = A(S).toCanonicalString()) != null ? f : S;
-      return (b = (h = g.get(O)) != null ? h : x.get(O)) != null ? b : ge(S);
+    const d = await this.isConsistent(t, e, p, m), i = (y) => {
+      var f, g, A;
+      const P = (f = b(y).toCanonicalString()) != null ? f : y;
+      return (A = (g = x.get(P)) != null ? g : h.get(P)) != null ? A : ge(y);
     };
     return {
       components: c,
       getSourceInfo: i,
-      freeOptionsSet: C,
-      axesToBeFixedSet: v,
+      freeOptionsSet: v,
+      axesToBeFixedSet: C,
       readyData: this.readyDataInputs(e),
-      ready: this.readyForPlotBuilding(t, e, d, C, i),
+      ready: this.readyForPlotBuilding(t, e, d, v, i),
       consistent: d
     };
   }
   async getUniqueSourceValuesWithLabels(t, e, o, n, l, s) {
     var c;
-    const r = (p) => p.sort((m, y) => m.label.localeCompare(y.label, "en", { numeric: !0 })), a = e.getSourceInfo(o), u = (c = a.annotations) == null ? void 0 : c[Ge];
+    const r = (p) => p.sort((m, S) => m.label.localeCompare(S.label, "en", { numeric: !0 })), a = e.getSourceInfo(o), u = (c = a.annotations) == null ? void 0 : c[Ge];
     try {
       const p = u ? JSON.parse(u).map((m) => String(m)) : null;
       if (p) {
-        const m = p.map((y) => ({ value: y, label: y }));
+        const m = p.map((S) => ({ value: S, label: S }));
         return r(m), { values: m, overflow: !1 };
       }
     } catch {
       console.error(`Parsing error: discrete values annotation ${u} in ${o}`);
     }
     if (a.kind === "axis") {
-      const p = A(o), m = a.parentSources.map(A), y = await k(t, o, a.parentSources);
-      let x = [];
-      if (y) {
-        l && (x = [{
+      const p = b(o), m = a.parentSources.map(b), S = await k(t, o, a.parentSources);
+      let h = [];
+      if (S) {
+        l && (h = [{
           type: "bySingleColumnV2",
           column: {
             type: "column",
-            id: y.name
+            id: S.name
           },
           predicate: {
             operator: "StringIContains",
             substring: l
           }
-        }]), s && (x = [{
+        }]), s && (h = [{
           type: "bySingleColumnV2",
           column: {
             type: "axis",
@@ -731,13 +731,13 @@ var Q = class {
             substring: s
           }
         }]);
-        const { data: D, axesData: B } = await t.pFrameProvider.getSingleColumnData(y, x), v = B[p.toCanonicalString()], d = [];
-        for (let i = 0; i < Math.min(v.length, n ?? v.length); i++)
-          d.push({ value: String(v[i]), label: String(D[i]) });
-        return r(d), { values: d, overflow: !(n === void 0 || v.length < n) };
+        const { data: D, axesData: B } = await t.pFrameProvider.getSingleColumnData(S, h), C = B[p.toCanonicalString()], d = [];
+        for (let i = 0; i < Math.min(C.length, n ?? C.length); i++)
+          d.push({ value: String(C[i]), label: String(D[i]) });
+        return r(d), { values: d, overflow: !(n === void 0 || C.length < n) };
       }
-      const g = l ?? s;
-      g && (x = [{
+      const x = l ?? s;
+      x && (h = [{
         type: "bySingleColumnV2",
         column: {
           type: "axis",
@@ -745,14 +745,14 @@ var Q = class {
         },
         predicate: {
           operator: "StringIContains",
-          substring: g
+          substring: x
         }
       }]);
-      const w = await t.pFrameProvider.getAxisUniqueValues(p, [m[0]], n, x), C = w.values.map((D) => ({ value: String(D), label: String(D) }));
-      return r(C), { values: C, overflow: w.overflow };
+      const w = await t.pFrameProvider.getAxisUniqueValues(p, [m[0]], n, h), v = w.values.map((D) => ({ value: String(D), label: String(D) }));
+      return r(v), { values: v, overflow: w.overflow };
     }
     if (a.kind === "column") {
-      const p = l ?? s, m = A(o), y = p ? [{
+      const p = l ?? s, m = b(o), S = p ? [{
         type: "bySingleColumnV2",
         column: {
           type: "column",
@@ -762,8 +762,8 @@ var Q = class {
           operator: "StringIContains",
           substring: p
         }
-      }] : [], x = await t.pFrameProvider.getColumnUniqueValues(m, n, y), g = x.values.map((w) => ({ value: String(w), label: String(w) }));
-      return r(g), { values: g, overflow: x.overflow };
+      }] : [], h = await t.pFrameProvider.getColumnUniqueValues(m, n, S), x = h.values.map((w) => ({ value: String(w), label: String(w) }));
+      return r(x), { values: x, overflow: h.overflow };
     }
     return { values: [], overflow: !1 };
   }
@@ -808,8 +808,8 @@ var Q = class {
         const p = l(a);
         if (p && p.kind === "column" && p.axesToBeFixed.some(
           (m) => {
-            var y;
-            return ((y = (u ?? []).find((x) => x.axisSource === m)) == null ? void 0 : y.axisValue) === void 0;
+            var S;
+            return ((S = (u ?? []).find((h) => h.axisSource === m)) == null ? void 0 : S.axisValue) === void 0;
           }
         )) {
           c = !0;
@@ -829,7 +829,7 @@ var Q = class {
   }
 }, Ze = (t) => {
   var e;
-  return ((e = t == null ? void 0 : t.annotations) == null ? void 0 : e[Ce]) === "true";
+  return ((e = t == null ? void 0 : t.annotations) == null ? void 0 : e[ve]) === "true";
 }, Pe = class Oe {
   constructor({
     componentName: e,
@@ -860,50 +860,50 @@ var Q = class {
   async checkStateConsistency(e, o, n, l) {
     const s = o.components[this.componentName], { parentAxes: c, linkerAxes: r } = await this.getAllowedAxes(e, o, n);
     function a(p) {
-      const m = _.fromAxisSpec(p).toCanonicalString();
+      const m = F.fromAxisSpec(p).toCanonicalString();
       return c.has(m) || r.has(m);
     }
     const u = await Promise.all(
       s.selectorStates.map(async ({ selectedSource: p }) => {
-        const m = A(p);
-        if (P(m)) {
-          const y = await e.pFrameProvider.getColumnSpecById(m);
-          if (!y)
+        const m = b(p);
+        if (O(m)) {
+          const S = await e.pFrameProvider.getColumnSpecById(m);
+          if (!S)
             return !1;
           if (this.parentComponents.length === 0)
             return !0;
           if (this.strictlyDependsOnParents && !this.settings.columnsWithExtraAxesAllowed && !this.settings.isDataComponent)
-            return y.axesSpec.every((g) => a(g));
+            return S.axesSpec.every((x) => a(x));
           if (this.settings.columnsWithExtraAxesAllowed && !this.settings.isDataComponent) {
-            if (y.axesSpec.some((w) => a(w)))
+            if (S.axesSpec.some((w) => a(w)))
               return !0;
-            const g = te(y.axesSpec);
-            return g ? g.some((w) => l.has(j(w))) : !1;
+            const x = oe(S.axesSpec);
+            return x ? x.some((w) => l.has(j(w))) : !1;
           } else
-            return c.size === 0 || y.axesSpec.some((g) => a(g));
+            return c.size === 0 || S.axesSpec.some((x) => a(x));
         }
         return c.has(p);
       })
     );
     return s.selectorStates.reduce(
-      (p, m, y) => (p[m.selectedSource] = u[y], p),
+      (p, m, S) => (p[m.selectedSource] = u[S], p),
       {}
     );
   }
   async getProducingAxes(e, o) {
-    const s = o.components[this.componentName].selectorStates.map((a) => A(a.selectedSource)).filter((a) => P(a)), c = /* @__PURE__ */ new Set();
+    const s = o.components[this.componentName].selectorStates.map((a) => b(a.selectedSource)).filter((a) => O(a)), c = /* @__PURE__ */ new Set();
     return (await Promise.all(
       s.map((a) => e.pFrameProvider.getColumnSpecById(a))
     )).forEach((a) => {
       a && a.axesSpec.forEach((u) => {
-        c.add(_.fromAxisSpec(u).toCanonicalString());
+        c.add(F.fromAxisSpec(u).toCanonicalString());
       });
     }), c;
   }
   getParentSelectedSources(e, o) {
     return this.parentComponents.reduce((l, s) => {
       const c = o.components[s].selectorStates.map(
-        (r) => A(r.selectedSource)
+        (r) => b(r.selectedSource)
       );
       return l.push(...c), l;
     }, []);
@@ -912,10 +912,10 @@ var Q = class {
     var n;
     const l = this.getParentSelectedSources(e, o), s = /* @__PURE__ */ new Set();
     for (const c of l)
-      if (P(c)) {
+      if (O(c)) {
         const r = await e.pFrameProvider.getColumnSpecById(c);
         (n = r == null ? void 0 : r.axesSpec) == null || n.forEach((a) => {
-          const u = _.fromAxisSpec(a);
+          const u = F.fromAxisSpec(a);
           s.add(u.toCanonicalString());
         });
       }
@@ -923,46 +923,46 @@ var Q = class {
   }
   async getAllowedAxes(e, o, n) {
     var l, s, c, r, a, u, p;
-    const m = this.getParentSelectedSources(e, o), y = /* @__PURE__ */ new Set(), x = [], g = /* @__PURE__ */ new Set(), w = /* @__PURE__ */ new Map();
+    const m = this.getParentSelectedSources(e, o), S = /* @__PURE__ */ new Set(), h = [], x = /* @__PURE__ */ new Set(), w = /* @__PURE__ */ new Map();
     for (const D of m)
-      if (P(D)) {
+      if (O(D)) {
         const B = await e.pFrameProvider.getColumnSpecById(D);
-        for (const v of (l = B == null ? void 0 : B.axesSpec) != null ? l : []) {
-          const i = _.fromAxisSpec(v).toCanonicalString();
-          if (y.has(i))
+        for (const C of (l = B == null ? void 0 : B.axesSpec) != null ? l : []) {
+          const i = F.fromAxisSpec(C).toCanonicalString();
+          if (S.has(i))
             continue;
-          y.add(i), x.push(v);
-          const S = Ie(v);
+          S.add(i), h.push(C);
+          const y = Ie(C);
           w.set(i, {
             kind: "axis",
-            name: v.name,
+            name: C.name,
             label: await T(e, i, [
               D.toCanonicalString()
             ]),
-            type: v.type,
-            mustBeConsumed: S,
+            type: C.type,
+            mustBeConsumed: y,
             dividable: !1,
-            spec: v,
-            annotations: v.annotations,
-            isSubsetFilter: ((s = v.annotations) == null ? void 0 : s[$]) === "true",
-            isDiscreteFilter: v.type === "String" || ((c = v.annotations) == null ? void 0 : c[ee]) === "true",
+            spec: C,
+            annotations: C.annotations,
+            isSubsetFilter: ((s = C.annotations) == null ? void 0 : s[$]) === "true",
+            isDiscreteFilter: C.type === "String" || ((c = C.annotations) == null ? void 0 : c[te]) === "true",
             parentSources: [D.toCanonicalString()]
           });
         }
       }
-    let C = [...y];
-    for (; C.length; ) {
+    let v = [...S];
+    for (; v.length; ) {
       const D = [];
-      for (const B of C)
+      for (const B of v)
         if (n[B]) {
-          const v = Object.keys(n[B]);
-          for (const d of v)
-            if (!g.has(d)) {
-              D.push(d), g.add(d);
-              const { spec: i, id: S } = n[B][d];
+          const C = Object.keys(n[B]);
+          for (const d of C)
+            if (!x.has(d)) {
+              D.push(d), x.add(d);
+              const { spec: i, id: y } = n[B][d];
               for (const f of i.axesSpec) {
-                const h = _.fromAxisSpec(f).toCanonicalString();
-                w.has(h) || w.set(h, {
+                const g = F.fromAxisSpec(f).toCanonicalString();
+                w.has(g) || w.set(g, {
                   kind: "axis",
                   name: f.name,
                   label: (a = (r = f.annotations) == null ? void 0 : r[we]) != null ? a : "",
@@ -972,80 +972,80 @@ var Q = class {
                   spec: f,
                   annotations: f.annotations,
                   isSubsetFilter: ((u = f.annotations) == null ? void 0 : u[$]) === "true",
-                  isDiscreteFilter: f.type === "String" || ((p = f.annotations) == null ? void 0 : p[ee]) === "true",
-                  parentSources: [S.toCanonicalString()]
+                  isDiscreteFilter: f.type === "String" || ((p = f.annotations) == null ? void 0 : p[te]) === "true",
+                  parentSources: [y.toCanonicalString()]
                 });
               }
             }
         }
-      C = D;
+      v = D;
     }
-    return { parentAxes: y, parentAxesList: x, linkerAxes: g, optionsInfo: w };
+    return { parentAxes: S, parentAxesList: h, linkerAxes: x, optionsInfo: w };
   }
   async getOptions(e, o, n, l, s, c, r, a = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Set()) {
-    var p, m, y, x, g;
-    const w = this.settings.multipleSelectors, C = this.settings.required, D = await this.checkStateConsistency(e, o, s, c);
-    if (this.dependsOn.length && this.dependsOn.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: w, required: C, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
-    if (this.strictlyDependsOnParents && !this.settings.isDataComponent && this.parentComponents.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: w, required: C, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
-    const B = this.getParentSelectedSources(e, o), v = (await e.pFrameProvider.getColumns([], !1, this.allowedTypes, void 0, this.annotations)).filter((O) => !l.has(O.toCanonicalString())), { parentAxes: d, linkerAxes: i, parentAxesList: S, optionsInfo: f } = await this.getAllowedAxes(e, o, s), h = o.components[this.componentName], b = [];
+    var p, m, S, h, x;
+    const w = this.settings.multipleSelectors, v = this.settings.required, D = await this.checkStateConsistency(e, o, s, c);
+    if (this.dependsOn.length && this.dependsOn.some((P) => o.components[P].selectorStates.length === 0))
+      return { multipleSelectors: w, required: v, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
+    if (this.strictlyDependsOnParents && !this.settings.isDataComponent && this.parentComponents.some((P) => o.components[P].selectorStates.length === 0))
+      return { multipleSelectors: w, required: v, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
+    const B = this.getParentSelectedSources(e, o), C = (await e.pFrameProvider.getColumns([], !1, this.allowedTypes, void 0, this.annotations)).filter((P) => !l.has(P.toCanonicalString())), { parentAxes: d, linkerAxes: i, parentAxesList: y, optionsInfo: f } = await this.getAllowedAxes(e, o, s), g = o.components[this.componentName], A = [];
     if (this.settings.axesAllowed)
-      for (const O of d) {
-        const E = A(O), L = f.get(E.toCanonicalString()), N = this.allowedTypes.includes(L.spec.type), F = Object.entries(this.annotations).every(
-          ([oe, q]) => {
+      for (const P of d) {
+        const E = b(P), L = f.get(E.toCanonicalString()), N = this.allowedTypes.includes(L.spec.type), _ = Object.entries(this.annotations).every(
+          ([le, q]) => {
             var U;
-            return ((U = L.spec.annotations) == null ? void 0 : U[oe]) === q;
+            return ((U = L.spec.annotations) == null ? void 0 : U[le]) === q;
           }
-        ), G = this.checkSourceBySpec ? this.checkSourceBySpec(L.spec, o) : !0, M = !this.settings.homogeneous || !(L != null && L.mustBeConsumed), K = !l.has(O), Z = a.has(E.name) || u.has(E.toCanonicalString()), ne = h.selectorStates.some((oe) => oe.selectedSource === O);
-        N && F && G && M && K && !Z && !ne && b.push({ value: O });
+        ), G = this.checkSourceBySpec ? this.checkSourceBySpec(L.spec, o) : !0, M = !this.settings.homogeneous || !(L != null && L.mustBeConsumed), K = !l.has(P), ee = a.has(E.name) || u.has(E.toCanonicalString()), se = g.selectorStates.some((le) => le.selectedSource === P);
+        N && _ && G && M && K && !ee && !se && A.push({ value: P });
       }
     if (this.settings.columnsAllowed) {
-      const O = !this.settings.columnsWithExtraAxesAllowed && this.strictlyDependsOnParents;
-      for (const E of v) {
-        const L = E.toCanonicalString(), N = A(L), F = await e.pFrameProvider.getColumnSpecById(N);
-        if (!F)
+      const P = !this.settings.columnsWithExtraAxesAllowed && this.strictlyDependsOnParents;
+      for (const E of C) {
+        const L = E.toCanonicalString(), N = b(L), _ = await e.pFrameProvider.getColumnSpecById(N);
+        if (!_)
           continue;
         const G = De(
-          F,
-          S,
+          _,
+          y,
           d,
           i,
           c
-        ).map((q) => _.fromAxisSpec(q).toCanonicalString()), M = new Set(G);
+        ).map((q) => F.fromAxisSpec(q).toCanonicalString()), M = new Set(G);
         if (
           // do not add to available options label columns, or columns that are not fit by custom spec condition, or columns that are not fit by condition for data inputs
-          Le(F) || Ze(F) || this.checkSourceBySpec && !this.checkSourceBySpec(F, o) || this.settings.isDataComponent && !r(F) || O && G.length > 0 || B.length && G.length > 0 && !F.axesSpec.some((q) => {
-            const U = _.fromAxisSpec(q).toCanonicalString();
+          Le(_) || Ze(_) || this.checkSourceBySpec && !this.checkSourceBySpec(_, o) || this.settings.isDataComponent && !r(_) || P && G.length > 0 || B.length && G.length > 0 && !_.axesSpec.some((q) => {
+            const U = F.fromAxisSpec(q).toCanonicalString();
             return d.has(U) || i.has(U);
           })
         )
           continue;
-        const K = (m = (p = F == null ? void 0 : F.axesSpec) == null ? void 0 : p.map((q) => _.fromAxisSpec(q).toCanonicalString())) != null ? m : [], Z = {};
+        const K = (m = (p = _ == null ? void 0 : _.axesSpec) == null ? void 0 : p.map((q) => F.fromAxisSpec(q).toCanonicalString())) != null ? m : [], ee = {};
         if (this.settings.columnsWithExtraAxesAllowed && K.forEach((q, U) => {
-          M.has(q) && (Z[q] = U);
-        }), F) {
-          const q = (y = n[L]) != null ? y : await T(e, E.toCanonicalString(), []), U = {
+          M.has(q) && (ee[q] = U);
+        }), _) {
+          const q = (S = n[L]) != null ? S : await T(e, E.toCanonicalString(), []), U = {
             kind: "column",
-            name: F.name,
+            name: _.name,
             label: q,
-            type: F.valueType,
-            spec: F,
-            annotations: F.annotations,
-            isSubsetFilter: ((x = F.annotations) == null ? void 0 : x[$]) === "true",
-            isDiscreteFilter: F.valueType === "String" || ((g = F.annotations) == null ? void 0 : g[ee]) === "true",
+            type: _.valueType,
+            spec: _,
+            annotations: _.annotations,
+            isSubsetFilter: ((h = _.annotations) == null ? void 0 : h[$]) === "true",
+            isDiscreteFilter: _.valueType === "String" || ((x = _.annotations) == null ? void 0 : x[te]) === "true",
             axesToBeFixed: G,
-            axesToBeFixedIndexes: Z
+            axesToBeFixedIndexes: ee
           };
           f.set(N.toCanonicalString(), U);
         }
-        const ne = a.has(N.name) || u.has(N.toCanonicalString()), oe = o.components[this.componentName].selectorStates.some(
+        const se = a.has(N.name) || u.has(N.toCanonicalString()), le = o.components[this.componentName].selectorStates.some(
           (q) => q.selectedSource === L
         );
-        !ne && !oe && b.push({ value: L });
+        !se && !le && A.push({ value: L });
       }
     }
-    return { multipleSelectors: w, required: C, stateConsistency: D, options: b, optionsInfo: f };
+    return { multipleSelectors: w, required: v, stateConsistency: D, options: A, optionsInfo: f };
   }
 };
 Pe.DefaultSettings = {
@@ -1072,20 +1072,20 @@ var I = Pe, et = {
   },
   dividedAxes: {}
 };
-function re(t, e) {
+function ce(t, e) {
   if (!e.length)
     return [];
-  const o = e.map((s) => A(s)), n = Object.values(t.columnsData)[0].length, l = [];
+  const o = e.map((s) => b(s)), n = Object.values(t.columnsData)[0].length, l = [];
   for (let s = 0; s < n; s++) {
     const c = o.map((r) => {
       const a = r.toCanonicalString();
-      return P(r) ? t.columnsData[a][s] : t.axesData[a][s];
+      return O(r) ? t.columnsData[a][s] : t.axesData[a][s];
     }).join(", ");
     l.push(c);
   }
   return l;
 }
-var tt = class extends Q {
+var tt = class extends Z {
   constructor() {
     super({
       valueSize: new I({
@@ -1190,46 +1190,46 @@ var tt = class extends Q {
   async getMustBeConsumedAxes(t, e) {
     if (!e.components.valueColor.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const o = e.components.valueColor.selectorStates[0].selectedSource, n = await t.pFrameProvider.getColumnSpecById(A(o));
-    return n ? new Set(n.axesSpec.map((l) => _.fromAxisSpec(l).toCanonicalString())) : /* @__PURE__ */ new Set();
+    const o = e.components.valueColor.selectorStates[0].selectedSource, n = await t.pFrameProvider.getColumnSpecById(b(o));
+    return n ? new Set(n.axesSpec.map((l) => F.fromAxisSpec(l).toCanonicalString())) : /* @__PURE__ */ new Set();
   }
   async createDataByColumns(t, e) {
     var o, n, l;
     const s = (o = e.components.valueColor.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.valueSize.selectorStates[0]) == null ? void 0 : n.selectedSource;
     if (!s || !c)
       throw Error("Value column is not valid");
-    const r = A(s), a = A(c);
-    if (!r || !a || !P(r) && !P(a))
+    const r = b(s), a = b(c);
+    if (!r || !a || !O(r) && !O(a))
       throw Error("Value column is not valid");
     const u = {
       type: "columns",
       id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), y = [
+    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), S = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], x = Y(y), g = y.map((F) => A(F.selectedSource)).filter(P), w = [r, a].filter(P), C = w.map((F) => F.toCanonicalString()), D = await J(t, C), B = [
+    ], h = Y(S), x = S.map((_) => b(_.selectedSource)).filter(O), w = [r, a].filter(O), v = w.map((_) => _.toCanonicalString()), D = await Q(t, v), B = [
       e.components.facetBy,
       e.components.x,
       e.components.y,
       e.components.tooltipContent
-    ], v = [], d = w.map(() => []), i = [], S = [];
-    for (const { selectedSource: F, fixedAxes: G } of y)
-      S.push(...await V(
+    ], C = [], d = w.map(() => []), i = [], y = [];
+    for (const { selectedSource: _, fixedAxes: G } of S)
+      y.push(...await V(
         t,
         p,
         m,
         D,
-        F,
+        _,
         G
       )), d.push(
         (G ?? []).map(({ axisIdx: M, axisValue: K }) => ({ idx: M, value: K }))
       );
-    for (const F of B)
-      for (const { selectedSource: G, fixedAxes: M } of F.selectorStates) {
-        v.push(A(G)), i.push(
-          (M ?? []).map(({ axisIdx: Z, axisValue: ne }) => ({ idx: Z, value: ne }))
-        ), S.push(...await V(
+    for (const _ of B)
+      for (const { selectedSource: G, fixedAxes: M } of _.selectorStates) {
+        C.push(b(G)), i.push(
+          (M ?? []).map(({ axisIdx: ee, axisValue: se }) => ({ idx: ee, value: se }))
+        ), y.push(...await V(
           t,
           p,
           m,
@@ -1237,45 +1237,45 @@ var tt = class extends Q {
           G,
           M
         ));
-        const K = await k(t, G, C);
-        K && v.push(K);
+        const K = await k(t, G, v);
+        K && C.push(K);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [...w, ...S, ...g],
-      v,
-      x,
+      [...w, ...y, ...x],
+      C,
+      h,
       !0,
       d,
       i
     );
-    v.forEach((F) => {
-      const G = F.toCanonicalString();
-      u.values[G] = P(F) ? f.columnsData[G] : f.axesData[G];
-    }), u.values[s] = P(r) ? f.columnsData[s] : f.axesData[s], u.values[c] = P(a) ? f.columnsData[c] : f.axesData[c];
-    const h = e.components.x.selectorStates.map((F) => F.selectedSource), b = h.join(", "), O = await Promise.all(h.map(
-      async (F) => {
+    C.forEach((_) => {
+      const G = _.toCanonicalString();
+      u.values[G] = O(_) ? f.columnsData[G] : f.axesData[G];
+    }), u.values[s] = O(r) ? f.columnsData[s] : f.axesData[s], u.values[c] = O(a) ? f.columnsData[c] : f.axesData[c];
+    const g = e.components.x.selectorStates.map((_) => _.selectedSource), A = g.join(", "), P = await Promise.all(g.map(
+      async (_) => {
         var G, M;
-        return (M = (G = await k(t, F, C)) == null ? void 0 : G.toCanonicalString()) != null ? M : F;
+        return (M = (G = await k(t, _, v)) == null ? void 0 : G.toCanonicalString()) != null ? M : _;
       }
     ));
-    u.values[b] = re(f, h), u.values.xLabels = re(f, O);
-    const E = e.components.y.selectorStates.map((F) => F.selectedSource), L = E.join(", "), N = await Promise.all(E.map(
-      async (F) => {
+    u.values[A] = ce(f, g), u.values.xLabels = ce(f, P);
+    const E = e.components.y.selectorStates.map((_) => _.selectedSource), L = E.join(", "), N = await Promise.all(E.map(
+      async (_) => {
         var G, M;
-        return (M = (G = await k(t, F, C)) == null ? void 0 : G.toCanonicalString()) != null ? M : F;
+        return (M = (G = await k(t, _, v)) == null ? void 0 : G.toCanonicalString()) != null ? M : _;
       }
     ));
-    return u.values[L] = re(f, E), u.values.yLabels = re(f, N), { byColumns: u };
+    return u.values[L] = ce(f, E), u.values.yLabels = ce(f, N), { byColumns: u };
   }
   async createChartSettings(t, e) {
     var o, n;
     const l = (o = e.components.valueColor.selectorStates[0]) == null ? void 0 : o.selectedSource, s = (n = e.components.valueSize.selectorStates[0]) == null ? void 0 : n.selectedSource;
     if (!l || !s)
       throw Error("Value column is not valid");
-    const c = A(l), r = A(s);
-    if (!P(c) && !P(r))
+    const c = b(l), r = b(s);
+    if (!O(c) && !O(r))
       throw Error("Value column is not valid");
-    const a = [c, r].filter(P).map((v) => v.toCanonicalString()), u = {
+    const a = [c, r].filter(O).map((C) => C.toCanonicalString()), u = {
       type: "column",
       value: l,
       label: await T(t, l, [])
@@ -1283,21 +1283,22 @@ var tt = class extends Q {
       type: "column",
       value: s,
       label: await T(t, s, [])
-    }, y = e.components.x.selectorStates.map(({ selectedSource: v }) => v).join(", "), g = e.components.y.selectorStates.map(({ selectedSource: v }) => v).join(", "), w = await Promise.all(e.components.facetBy.selectorStates.map(async (v) => {
+    }, S = e.components.x.selectorStates.map(({ selectedSource: C }) => C).join(", "), x = e.components.y.selectorStates.map(({ selectedSource: C }) => C).join(", "), w = await Promise.all(e.components.facetBy.selectorStates.map(async (C) => {
       var d, i;
       return {
         type: "column",
-        value: (i = (d = await k(t, v.selectedSource, a)) == null ? void 0 : d.toCanonicalString()) != null ? i : v.selectedSource
+        value: (i = (d = await k(t, C.selectedSource, a)) == null ? void 0 : d.toCanonicalString()) != null ? i : C.selectedSource
       };
-    })), C = (await Promise.all(e.components.x.selectorStates.map((v) => T(t, v.selectedSource, a)))).join(", "), D = (await Promise.all(e.components.y.selectorStates.map((v) => T(t, v.selectedSource, a)))).join(", "), B = await Promise.all(
-      e.components.tooltipContent.selectorStates.map(async (v) => {
-        var d, i;
-        const S = v.selectedSource;
+    })), v = (await Promise.all(e.components.x.selectorStates.map((C) => T(t, C.selectedSource, a)))).join(", "), D = (await Promise.all(e.components.y.selectorStates.map((C) => T(t, C.selectedSource, a)))).join(", "), B = await Promise.all(
+      e.components.tooltipContent.selectorStates.map(async (C) => {
+        var d, i, y, f;
+        const g = C.selectedSource, A = await J(t, g, a);
         return {
           type: "column",
-          label: await T(t, S, a) || S,
-          value: S,
-          valueLabels: (i = (d = await k(t, S, a)) == null ? void 0 : d.toCanonicalString()) != null ? i : S
+          label: await T(t, g, a) || g,
+          value: g,
+          valueLabels: (i = (d = await k(t, g, a)) == null ? void 0 : d.toCanonicalString()) != null ? i : g,
+          format: (f = (y = A == null ? void 0 : A.annotations) == null ? void 0 : y[ne]) != null ? f : ".0%"
         };
       })
     );
@@ -1307,13 +1308,13 @@ var tt = class extends Q {
       valueSize: p,
       xColumn: {
         type: "column",
-        value: y,
-        label: C,
+        value: S,
+        label: v,
         valueLabels: "xLabels"
       },
       yColumn: {
         type: "column",
-        value: g,
+        value: x,
         label: D,
         valueLabels: "yLabels"
       },
@@ -1334,7 +1335,7 @@ var tt = class extends Q {
     facetBy: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, ot = class extends Q {
+}, ot = class extends Z {
   constructor() {
     super(
       {
@@ -1403,8 +1404,8 @@ var tt = class extends Q {
     const l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource;
     if (!l)
       throw Error("Value column is not valid");
-    const s = A(l);
-    if (!P(s))
+    const s = b(l);
+    if (!O(s))
       throw Error("Value column is not valid");
     const c = {
       type: "columns",
@@ -1413,43 +1414,43 @@ var tt = class extends Q {
     }, { linkerColumnsMap: r, compositeLinkerMap: a } = await X(t), u = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], p = Y(u), m = u.map((d) => A(d.selectedSource)).filter(P), y = [l], x = await J(t, y), g = [e.components.facetBy, e.components.grouping], w = [], C = [[]], D = [], B = [];
+    ], p = Y(u), m = u.map((d) => b(d.selectedSource)).filter(O), S = [l], h = await Q(t, S), x = [e.components.facetBy, e.components.grouping], w = [], v = [[]], D = [], B = [];
     for (const { selectedSource: d, fixedAxes: i } of u)
       B.push(
-        ...await V(t, r, a, x, d, i)
-      ), C.push(
-        (i ?? []).map(({ axisIdx: S, axisValue: f }) => ({ idx: S, value: f }))
+        ...await V(t, r, a, h, d, i)
+      ), v.push(
+        (i ?? []).map(({ axisIdx: y, axisValue: f }) => ({ idx: y, value: f }))
       );
-    for (const d of g)
-      for (const { selectedSource: i, fixedAxes: S } of d.selectorStates) {
-        w.push(A(i)), D.push(
-          (S ?? []).map(({ axisIdx: h, axisValue: b }) => ({ idx: h, value: b }))
+    for (const d of x)
+      for (const { selectedSource: i, fixedAxes: y } of d.selectorStates) {
+        w.push(b(i)), D.push(
+          (y ?? []).map(({ axisIdx: g, axisValue: A }) => ({ idx: g, value: A }))
         ), B.push(
-          ...await V(t, r, a, x, i, S)
+          ...await V(t, r, a, h, i, y)
         );
-        const f = await k(t, i, y);
+        const f = await k(t, i, S);
         f && w.push(f);
       }
-    const v = await t.pFrameProvider.getTableOuterJoin(
+    const C = await t.pFrameProvider.getTableOuterJoin(
       [s, ...B, ...m],
       w,
       p,
       !0,
-      C,
+      v,
       D
     );
     return w.forEach((d) => {
       const i = d.toCanonicalString();
-      c.values[i] = P(d) ? v.columnsData[i] : v.axesData[i];
-    }), c.values[s.toCanonicalString()] = v.columnsData[s.toCanonicalString()], { byColumns: c };
+      c.values[i] = O(d) ? C.columnsData[i] : C.axesData[i];
+    }), c.values[s.toCanonicalString()] = C.columnsData[s.toCanonicalString()], { byColumns: c };
   }
   async createChartSettings(t, e) {
     var o, n;
     const l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource;
     if (!l)
       throw Error("Value column is not valid");
-    const s = A(l);
-    if (!P(s))
+    const s = b(l);
+    if (!O(s))
       throw Error("Value column is not valid");
     const c = [l], r = {
       type: "column",
@@ -1457,10 +1458,10 @@ var tt = class extends Q {
       label: await T(t, l, [])
     }, a = await Promise.all(
       e.components.facetBy.selectorStates.map(async (p) => {
-        var m, y;
+        var m, S;
         return {
           type: "column",
-          value: (y = (m = await k(t, p.selectedSource, c)) == null ? void 0 : m.toCanonicalString()) != null ? y : p.selectedSource
+          value: (S = (m = await k(t, p.selectedSource, c)) == null ? void 0 : m.toCanonicalString()) != null ? S : p.selectedSource
         };
       })
     );
@@ -1492,7 +1493,7 @@ var tt = class extends Q {
     secondaryGrouping: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, lt = class extends Q {
+}, lt = class extends Z {
   constructor() {
     super(
       {
@@ -1566,8 +1567,8 @@ var tt = class extends Q {
   }
   async createDataByColumns(t, e) {
     var o;
-    const n = e.components.y.selectorStates[0].selectedSource, l = A(n);
-    if (!n || !P(l))
+    const n = e.components.y.selectorStates[0].selectedSource, l = b(n);
+    if (!n || !O(l))
       throw Error("Y column is not valid");
     const s = {
       type: "columns",
@@ -1576,50 +1577,50 @@ var tt = class extends Q {
     }, { linkerColumnsMap: c, compositeLinkerMap: r } = await X(t), a = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], u = Y(a), p = a.map((v) => A(v.selectedSource)).filter(P), m = [n], y = await J(t, m), x = [e.components.primaryGrouping, e.components.secondaryGrouping, e.components.facetBy], g = [], w = [[]], C = [], D = [];
-    for (const { selectedSource: v, fixedAxes: d } of a)
+    ], u = Y(a), p = a.map((C) => b(C.selectedSource)).filter(O), m = [n], S = await Q(t, m), h = [e.components.primaryGrouping, e.components.secondaryGrouping, e.components.facetBy], x = [], w = [[]], v = [], D = [];
+    for (const { selectedSource: C, fixedAxes: d } of a)
       D.push(...await V(
         t,
         c,
         r,
-        y,
-        v,
+        S,
+        C,
         d
       )), w.push(
-        (d ?? []).map(({ axisIdx: i, axisValue: S }) => ({ idx: i, value: S }))
+        (d ?? []).map(({ axisIdx: i, axisValue: y }) => ({ idx: i, value: y }))
       );
-    for (const v of x)
-      for (const { selectedSource: d, fixedAxes: i } of v.selectorStates) {
-        g.push(A(d)), C.push(
-          (i ?? []).map(({ axisIdx: f, axisValue: h }) => ({ idx: f, value: h }))
+    for (const C of h)
+      for (const { selectedSource: d, fixedAxes: i } of C.selectorStates) {
+        x.push(b(d)), v.push(
+          (i ?? []).map(({ axisIdx: f, axisValue: g }) => ({ idx: f, value: g }))
         ), D.push(...await V(
           t,
           c,
           r,
-          y,
+          S,
           d,
           i
         ));
-        const S = await k(t, d, m);
-        S && g.push(S);
+        const y = await k(t, d, m);
+        y && x.push(y);
       }
     const B = await t.pFrameProvider.getTableOuterJoin(
       [l, ...D, ...p],
-      g,
+      x,
       u,
       !0,
       w,
-      C
+      v
     );
-    return g.forEach((v) => {
-      const d = v.toCanonicalString();
-      s.values[d] = P(v) ? B.columnsData[d] : B.axesData[d];
+    return x.forEach((C) => {
+      const d = C.toCanonicalString();
+      s.values[d] = O(C) ? B.columnsData[d] : B.axesData[d];
     }), s.values[l.toCanonicalString()] = B.columnsData[l.toCanonicalString()], { byColumns: s };
   }
   async createChartSettings(t, e) {
     var o, n;
-    const l = e.components.y.selectorStates[0].selectedSource, s = A(l);
-    if (!l || !P(s))
+    const l = e.components.y.selectorStates[0].selectedSource, s = b(l);
+    if (!l || !O(s))
       throw Error("Y column is not valid");
     const c = {
       type: "column",
@@ -1659,10 +1660,10 @@ var tt = class extends Q {
       };
     }
     const p = await Promise.all(e.components.facetBy.selectorStates.map(async (m) => {
-      var y, x;
+      var S, h;
       return {
         type: "column",
-        value: (x = (y = await k(t, m.selectedSource, r)) == null ? void 0 : y.toCanonicalString()) != null ? x : m.selectedSource,
+        value: (h = (S = await k(t, m.selectedSource, r)) == null ? void 0 : S.toCanonicalString()) != null ? h : m.selectedSource,
         label: await T(t, m.selectedSource, r)
       };
     }));
@@ -1694,20 +1695,20 @@ var tt = class extends Q {
 function de(t) {
   return t ? "kind" in t && t.kind === "PColumn" ? t.valueType === "String" : t.type === "String" : !0;
 }
-function ce(t, e) {
+function ie(t, e) {
   if (!e.length)
     return [];
-  const o = e.map((s) => A(s)), n = Object.values(t.columnsData)[0].length, l = [];
+  const o = e.map((s) => b(s)), n = Object.values(t.columnsData)[0].length, l = [];
   for (let s = 0; s < n; s++) {
     const c = o.map((r) => {
       const a = r.toCanonicalString();
-      return P(r) ? t.columnsData[a][s] : t.axesData[a][s];
+      return O(r) ? t.columnsData[a][s] : t.axesData[a][s];
     }).join(", ");
     l.push(c);
   }
   return l;
 }
-var rt = class extends Q {
+var rt = class extends Z {
   constructor() {
     super(
       {
@@ -1751,7 +1752,7 @@ var rt = class extends Q {
               ...e.components.x.selectorStates.map((n) => n.selectedSource),
               ...e.components.xGroupBy.selectorStates.map((n) => n.selectedSource)
             ]);
-            return "kind" in t && t.kind === "PColumn" ? _.fromAxesSpec(t.axesSpec).every(
+            return "kind" in t && t.kind === "PColumn" ? F.fromAxesSpec(t.axesSpec).every(
               (n) => o.has(n.toCanonicalString())
             ) : !0;
           }
@@ -1786,7 +1787,7 @@ var rt = class extends Q {
               ...e.components.y.selectorStates.map((n) => n.selectedSource),
               ...e.components.yGroupBy.selectorStates.map((n) => n.selectedSource)
             ]);
-            return "kind" in t && t.kind === "PColumn" ? _.fromAxesSpec(t.axesSpec).every(
+            return "kind" in t && t.kind === "PColumn" ? F.fromAxesSpec(t.axesSpec).every(
               (n) => o.has(n.toCanonicalString())
             ) : !0;
           }
@@ -1829,9 +1830,9 @@ var rt = class extends Q {
               ...e.components.x.selectorStates.map((n) => n.selectedSource),
               ...e.components.xGroupBy.selectorStates.map((n) => n.selectedSource)
             ]);
-            return "kind" in t && t.kind === "PColumn" ? _.fromAxesSpec(t.axesSpec).every(
+            return "kind" in t && t.kind === "PColumn" ? F.fromAxesSpec(t.axesSpec).every(
               (n) => o.has(n.toCanonicalString())
-            ) : o.has(_.fromAxisSpec(t).toCanonicalString());
+            ) : o.has(F.fromAxisSpec(t).toCanonicalString());
           }
         }),
         annotationsY: new I({
@@ -1848,9 +1849,9 @@ var rt = class extends Q {
               ...e.components.y.selectorStates.map((n) => n.selectedSource),
               ...e.components.yGroupBy.selectorStates.map((n) => n.selectedSource)
             ]);
-            return "kind" in t && t.kind === "PColumn" ? _.fromAxesSpec(t.axesSpec).every(
+            return "kind" in t && t.kind === "PColumn" ? F.fromAxesSpec(t.axesSpec).every(
               (n) => o.has(n.toCanonicalString())
-            ) : o.has(_.fromAxisSpec(t).toCanonicalString());
+            ) : o.has(F.fromAxisSpec(t).toCanonicalString());
           }
         })
       },
@@ -1887,16 +1888,16 @@ var rt = class extends Q {
   async getMustBeConsumedAxes(t, e) {
     if (!e.components.value.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const o = e.components.value.selectorStates[0].selectedSource, n = await t.pFrameProvider.getColumnSpecById(A(o));
-    return n ? new Set(n.axesSpec.map((l) => _.fromAxisSpec(l).toCanonicalString())) : /* @__PURE__ */ new Set();
+    const o = e.components.value.selectorStates[0].selectedSource, n = await t.pFrameProvider.getColumnSpecById(b(o));
+    return n ? new Set(n.axesSpec.map((l) => F.fromAxisSpec(l).toCanonicalString())) : /* @__PURE__ */ new Set();
   }
   async createDataByColumns(t, e) {
     var o, n;
     const l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource;
     if (!l)
       throw Error("Value column is not valid");
-    const s = A(l);
-    if (!P(s))
+    const s = b(l);
+    if (!O(s))
       throw Error("Value column is not valid");
     const c = {
       type: "columns",
@@ -1905,7 +1906,7 @@ var rt = class extends Q {
     }, { linkerColumnsMap: r, compositeLinkerMap: a } = await X(t), u = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], p = Y(u), m = u.map((L) => A(L.selectedSource)).filter(P), y = [l], x = await J(t, y), g = [
+    ], p = Y(u), m = u.map((L) => b(L.selectedSource)).filter(O), S = [l], h = await Q(t, S), x = [
       e.components.facetBy,
       e.components.annotationsX,
       e.components.annotationsY,
@@ -1914,114 +1915,114 @@ var rt = class extends Q {
       e.components.xGroupBy,
       e.components.yGroupBy,
       e.components.tooltipContent
-    ], w = [], C = [[]], D = [], B = [];
+    ], w = [], v = [[]], D = [], B = [];
     for (const { selectedSource: L, fixedAxes: N } of u)
       B.push(...await V(
         t,
         r,
         a,
-        x,
+        h,
         L,
         N
-      )), C.push(
-        (N ?? []).map(({ axisIdx: F, axisValue: G }) => ({ idx: F, value: G }))
+      )), v.push(
+        (N ?? []).map(({ axisIdx: _, axisValue: G }) => ({ idx: _, value: G }))
       );
-    for (const L of g)
-      for (const { selectedSource: N, fixedAxes: F } of L.selectorStates) {
-        w.push(A(N)), D.push(
-          (F ?? []).map(({ axisIdx: M, axisValue: K }) => ({ idx: M, value: K }))
+    for (const L of x)
+      for (const { selectedSource: N, fixedAxes: _ } of L.selectorStates) {
+        w.push(b(N)), D.push(
+          (_ ?? []).map(({ axisIdx: M, axisValue: K }) => ({ idx: M, value: K }))
         ), B.push(...await V(
           t,
           r,
           a,
-          x,
+          h,
           N,
-          F
+          _
         ));
-        const G = await k(t, N, y);
+        const G = await k(t, N, S);
         G && w.push(G);
       }
-    const v = await t.pFrameProvider.getTableOuterJoin(
+    const C = await t.pFrameProvider.getTableOuterJoin(
       [s, ...B, ...m],
       w,
       p,
       !0,
-      C,
+      v,
       D
     );
     w.forEach((L) => {
       const N = L.toCanonicalString();
-      c.values[N] = P(L) ? v.columnsData[N] : v.axesData[N];
-    }), c.values[s.toCanonicalString()] = v.columnsData[s.toCanonicalString()];
+      c.values[N] = O(L) ? C.columnsData[N] : C.axesData[N];
+    }), c.values[s.toCanonicalString()] = C.columnsData[s.toCanonicalString()];
     const d = e.components.x.selectorStates.concat(e.components.xGroupBy.selectorStates).map((L) => L.selectedSource), i = d.join(", ");
-    c.values[i] = ce(v, d);
-    const S = e.components.x.selectorStates.map((L) => L.selectedSource), f = await Promise.all(
-      S.map(
+    c.values[i] = ie(C, d);
+    const y = e.components.x.selectorStates.map((L) => L.selectedSource), f = await Promise.all(
+      y.map(
         async (L) => {
-          var N, F;
-          return (F = (N = await k(t, L, y)) == null ? void 0 : N.toCanonicalString()) != null ? F : L;
+          var N, _;
+          return (_ = (N = await k(t, L, S)) == null ? void 0 : N.toCanonicalString()) != null ? _ : L;
         }
       )
     );
-    c.values.xLabelsKey = ce(v, f);
-    const h = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map((L) => L.selectedSource), b = h.join(", ");
-    c.values[b] = ce(v, h);
-    const O = e.components.y.selectorStates.map((L) => L.selectedSource), E = await Promise.all(
-      O.map(
+    c.values.xLabelsKey = ie(C, f);
+    const g = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map((L) => L.selectedSource), A = g.join(", ");
+    c.values[A] = ie(C, g);
+    const P = e.components.y.selectorStates.map((L) => L.selectedSource), E = await Promise.all(
+      P.map(
         async (L) => {
-          var N, F;
-          return (F = (N = await k(t, L, y)) == null ? void 0 : N.toCanonicalString()) != null ? F : L;
+          var N, _;
+          return (_ = (N = await k(t, L, S)) == null ? void 0 : N.toCanonicalString()) != null ? _ : L;
         }
       )
     );
-    return c.values.yLabelsKey = ce(v, E), { byColumns: c };
+    return c.values.yLabelsKey = ie(C, E), { byColumns: c };
   }
   async createChartSettings(t, e) {
     var o;
     const n = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource;
     if (!n)
       throw Error("Value column is not valid");
-    const l = A(n);
-    if (!P(l))
+    const l = b(n);
+    if (!O(l))
       throw Error("Value column is not valid");
     const s = [n], c = {
       type: "column",
       value: n,
       label: await T(t, n, [])
-    }, a = e.components.x.selectorStates.concat(e.components.xGroupBy.selectorStates).map(({ selectedSource: d }) => A(d)).map((d) => d.toCanonicalString()).join(", "), p = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map(({ selectedSource: d }) => A(d)).map((d) => d.toCanonicalString()).join(", "), m = await Promise.all(
+    }, a = e.components.x.selectorStates.concat(e.components.xGroupBy.selectorStates).map(({ selectedSource: d }) => b(d)).map((d) => d.toCanonicalString()).join(", "), p = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map(({ selectedSource: d }) => b(d)).map((d) => d.toCanonicalString()).join(", "), m = await Promise.all(
       e.components.facetBy.selectorStates.map(async (d) => {
-        var i, S;
+        var i, y;
         return {
           type: "column",
-          value: (S = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? S : d.selectedSource
+          value: (y = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? y : d.selectedSource
         };
       })
-    ), y = await Promise.all(
+    ), S = await Promise.all(
       e.components.xGroupBy.selectorStates.map(async (d) => {
-        var i, S;
+        var i, y;
         return {
           type: "column",
           label: await T(t, d.selectedSource, s),
           value: d.selectedSource,
-          valueLabels: (S = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? S : d.selectedSource
+          valueLabels: (y = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? y : d.selectedSource
         };
       })
-    ), x = await Promise.all(
+    ), h = await Promise.all(
       e.components.yGroupBy.selectorStates.map(async (d) => {
-        var i, S;
+        var i, y;
         return {
           type: "column",
           label: await T(t, d.selectedSource, s),
           value: d.selectedSource,
-          valueLabels: (S = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? S : d.selectedSource
+          valueLabels: (y = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? y : d.selectedSource
         };
       })
-    ), g = await t.pFrameProvider.getColumnSpecById(l), w = await Promise.all(
+    ), x = await t.pFrameProvider.getColumnSpecById(l), w = await Promise.all(
       e.components.annotationsX.selectorStates.map(async (d) => {
-        var i, S;
-        const f = d.selectedSource, h = A(f), b = P(h) ? await t.pFrameProvider.getColumnSpecById(h) : (S = (i = g == null ? void 0 : g.axesSpec) == null ? void 0 : i.find(
-          (O) => _.fromAxisSpec(O).toCanonicalString() === f
-        )) != null ? S : null;
+        var i, y;
+        const f = d.selectedSource, g = b(f), A = O(g) ? await t.pFrameProvider.getColumnSpecById(g) : (y = (i = x == null ? void 0 : x.axesSpec) == null ? void 0 : i.find(
+          (P) => F.fromAxisSpec(P).toCanonicalString() === f
+        )) != null ? y : null;
         return {
           axis: "x",
           valueColumn: {
@@ -2029,15 +2030,15 @@ var rt = class extends Q {
             value: f,
             label: await T(t, f, s)
           },
-          type: de(b) ? "discrete" : "continuous"
+          type: de(A) ? "discrete" : "continuous"
         };
       })
-    ), C = await Promise.all(
+    ), v = await Promise.all(
       e.components.annotationsY.selectorStates.map(async (d) => {
-        var i, S;
-        const f = d.selectedSource, h = A(f), b = P(h) ? await t.pFrameProvider.getColumnSpecById(h) : (S = (i = g == null ? void 0 : g.axesSpec) == null ? void 0 : i.find(
-          (O) => _.fromAxisSpec(O).toCanonicalString() === f
-        )) != null ? S : null;
+        var i, y;
+        const f = d.selectedSource, g = b(f), A = O(g) ? await t.pFrameProvider.getColumnSpecById(g) : (y = (i = x == null ? void 0 : x.axesSpec) == null ? void 0 : i.find(
+          (P) => F.fromAxisSpec(P).toCanonicalString() === f
+        )) != null ? y : null;
         return {
           axis: "y",
           valueColumn: {
@@ -2045,7 +2046,7 @@ var rt = class extends Q {
             value: f,
             label: await T(t, f, s)
           },
-          type: de(b) ? "discrete" : "continuous"
+          type: de(A) ? "discrete" : "continuous"
         };
       })
     ), D = (await Promise.all(
@@ -2056,22 +2057,23 @@ var rt = class extends Q {
       e.components.y.selectorStates.map(
         (d) => T(t, d.selectedSource, s)
       )
-    )).join(", "), v = await Promise.all(
+    )).join(", "), C = await Promise.all(
       e.components.tooltipContent.selectorStates.map(async (d) => {
-        var i, S;
-        const f = d.selectedSource;
+        var i, y, f, g;
+        const A = d.selectedSource, P = await J(t, A, s);
         return {
           type: "column",
-          label: await T(t, f, s) || f,
-          value: f,
-          valueLabels: (S = (i = await k(t, f, s)) == null ? void 0 : i.toCanonicalString()) != null ? S : f
+          label: await T(t, A, s) || A,
+          value: A,
+          valueLabels: (y = (i = await k(t, A, s)) == null ? void 0 : i.toCanonicalString()) != null ? y : A,
+          format: (g = (f = P == null ? void 0 : P.annotations) == null ? void 0 : f[ne]) != null ? g : ".0%"
         };
       })
     );
     return {
       type: "heatmap",
       valueColumn: c,
-      valueType: de(g) ? "discrete" : "continuous",
+      valueType: de(x) ? "discrete" : "continuous",
       xColumn: {
         type: "column",
         value: a,
@@ -2085,12 +2087,12 @@ var rt = class extends Q {
         valueLabels: "yLabelsKey"
       },
       facetBy: m,
-      xGroupBy: y,
-      yGroupBy: x,
-      annotations: [...w, ...C],
+      xGroupBy: S,
+      yGroupBy: h,
+      annotations: [...w, ...v],
       tooltips: {
         show: !0,
-        content: v
+        content: C
       }
     };
   }
@@ -2110,7 +2112,7 @@ var rt = class extends Q {
     tooltipContent: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, it = class extends Q {
+}, it = class extends Z {
   constructor() {
     super(
       {
@@ -2251,10 +2253,10 @@ var rt = class extends Q {
   async getMustBeConsumedAxes(t, e) {
     if (!e.components.x.selectorStates.length || !e.components.y.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const o = e.components.x.selectorStates[0].selectedSource, n = e.components.y.selectorStates[0].selectedSource, l = await t.pFrameProvider.getColumnSpecById(A(o)), s = await t.pFrameProvider.getColumnSpecById(A(n));
+    const o = e.components.x.selectorStates[0].selectedSource, n = e.components.y.selectorStates[0].selectedSource, l = await t.pFrameProvider.getColumnSpecById(b(o)), s = await t.pFrameProvider.getColumnSpecById(b(n));
     if (!l || !s)
       return /* @__PURE__ */ new Set();
-    const c = l.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), r = s.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), a = c.filter((p) => !r.some((m) => m === p)), u = r.filter((p) => !c.some((m) => m === p));
+    const c = l.axesSpec.map((p) => F.fromAxisSpec(p).toCanonicalString()), r = s.axesSpec.map((p) => F.fromAxisSpec(p).toCanonicalString()), a = c.filter((p) => !r.some((m) => m === p)), u = r.filter((p) => !c.some((m) => m === p));
     return /* @__PURE__ */ new Set([...a, ...u]);
   }
   async createDataByColumns(t, e) {
@@ -2262,29 +2264,29 @@ var rt = class extends Q {
     const s = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource;
     if (!s || !c)
       throw Error("X or Y column is not valid");
-    const r = A(s), a = A(c), u = {
+    const r = b(s), a = b(c), u = {
       type: "columns",
       id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), y = [
+    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), S = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], x = Y(y), g = y.map((h) => A(h.selectedSource)).filter(P), w = [r, a].filter(P).map((h) => h.toCanonicalString());
+    ], h = Y(S), x = S.map((g) => b(g.selectedSource)).filter(O), w = [r, a].filter(O).map((g) => g.toCanonicalString());
     if (w.length === 0)
       throw Error("One of X and Y should be a column");
-    const C = await J(t, w), D = [r, a, ...g], B = [], v = [[], []], d = [], i = [];
-    for (const { selectedSource: h, fixedAxes: b } of y)
+    const v = await Q(t, w), D = [r, a, ...x], B = [], C = [[], []], d = [], i = [];
+    for (const { selectedSource: g, fixedAxes: A } of S)
       i.push(...await V(
         t,
         p,
         m,
-        C,
-        h,
-        b
-      )), v.push(
-        (b ?? []).map(({ axisIdx: O, axisValue: E }) => ({ idx: O, value: E }))
+        v,
+        g,
+        A
+      )), C.push(
+        (A ?? []).map(({ axisIdx: P, axisValue: E }) => ({ idx: P, value: E }))
       );
-    const S = [
+    const y = [
       e.components.grouping,
       e.components.size,
       e.components.shape,
@@ -2293,94 +2295,96 @@ var rt = class extends Q {
       e.components.label,
       e.components.highlight
     ];
-    for (const h of S)
-      for (const { selectedSource: b, fixedAxes: O } of h.selectorStates) {
-        B.push(A(b)), d.push(
-          (O ?? []).map(({ axisIdx: L, axisValue: N }) => ({ idx: L, value: N }))
+    for (const g of y)
+      for (const { selectedSource: A, fixedAxes: P } of g.selectorStates) {
+        B.push(b(A)), d.push(
+          (P ?? []).map(({ axisIdx: L, axisValue: N }) => ({ idx: L, value: N }))
         ), i.push(...await V(
           t,
           p,
           m,
-          C,
-          b,
-          O
+          v,
+          A,
+          P
         ));
-        const E = await k(t, b, w);
+        const E = await k(t, A, w);
         E && B.push(E);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [r, a, ...i, ...g],
+      [r, a, ...i, ...x],
       B,
-      x,
+      h,
       !1,
-      v,
+      C,
       d
     );
-    return [...D, ...B].forEach((h) => {
-      const b = h.toCanonicalString();
-      u.values[b] = P(h) ? f.columnsData[b] : f.axesData[b];
-    }), u.values.key = new Array(u.values[Object.keys(u.values)[0]].length).fill(0).map((h, b) => b), e.components.highlight.selectorStates.length && (u.values.highlight = Be(e.components.highlight.selectorStates, f)), { byColumns: u };
+    return [...D, ...B].forEach((g) => {
+      const A = g.toCanonicalString();
+      u.values[A] = O(g) ? f.columnsData[A] : f.axesData[A];
+    }), u.values.key = new Array(u.values[Object.keys(u.values)[0]].length).fill(0).map((g, A) => A), e.components.highlight.selectorStates.length && (u.values.highlight = Be(e.components.highlight.selectorStates, f)), { byColumns: u };
   }
   async createChartSettings(t, e) {
     var o, n, l, s, c;
-    const r = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, a = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource, u = r ? A(r) : null, p = a ? A(a) : null;
-    if (!r || !a || !u || !p || !P(u) && !P(p))
+    const r = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, a = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource, u = r ? b(r) : null, p = a ? b(a) : null;
+    if (!r || !a || !u || !p || !O(u) && !O(p))
       throw Error("Empty or invalid required data");
-    const m = [u, p].filter(P).map((i) => i.toCanonicalString()), y = {
+    const m = [u, p].filter(O).map((i) => i.toCanonicalString()), S = {
       type: "column",
       value: r,
       label: await T(t, r, m)
-    }, x = {
+    }, h = {
       type: "column",
       value: a,
       label: await T(t, a, m)
-    }, g = {
+    }, x = {
       type: "column",
       value: "key"
     }, w = await Promise.all(
       e.components.facetBy.selectorStates.map(async (i) => {
-        var S, f;
+        var y, f;
         return {
           type: "column",
-          value: (f = (S = await k(t, i.selectedSource, m)) == null ? void 0 : S.toCanonicalString()) != null ? f : i.selectedSource
+          value: (f = (y = await k(t, i.selectedSource, m)) == null ? void 0 : y.toCanonicalString()) != null ? f : i.selectedSource
         };
       })
-    ), C = ue.uniq([
+    ), v = pe.uniq([
       ...e.components.grouping.selectorStates.map((i) => i.selectedSource),
       ...e.components.size.selectorStates.map((i) => i.selectedSource),
       ...e.components.shape.selectorStates.map((i) => i.selectedSource)
     ]), D = await Promise.all(
-      C.map(async (i) => {
-        var S, f;
+      v.map(async (i) => {
+        var y, f;
         return {
-          type: "column",
-          label: await T(t, i, m) || i,
-          value: i,
-          valueLabels: (f = (S = await k(t, i, m)) == null ? void 0 : S.toCanonicalString()) != null ? f : i
+          columnName: {
+            type: "column",
+            label: await T(t, i, m) || i,
+            value: i,
+            valueLabels: (f = (y = await k(t, i, m)) == null ? void 0 : y.toCanonicalString()) != null ? f : i
+          }
         };
       })
     ), B = await Promise.all(
       e.components.tooltipContent.selectorStates.map(async (i) => {
-        var S, f;
-        const h = i.selectedSource, b = A(h), O = (S = await k(t, h, m)) != null ? S : b, E = await le(t, h, m);
+        var y, f;
+        const g = i.selectedSource, A = b(g), P = (y = await k(t, g, m)) != null ? y : A, E = await J(t, g, m);
         return {
           type: "column",
-          label: await T(t, h, m) || h,
-          value: h,
-          valueLabels: O.toCanonicalString(),
-          format: (f = E == null ? void 0 : E.annotations) == null ? void 0 : f[pe]
+          label: await T(t, g, m) || g,
+          value: g,
+          valueLabels: P.toCanonicalString(),
+          format: (f = E == null ? void 0 : E.annotations) == null ? void 0 : f[ne]
         };
       })
     );
-    let v;
+    let C;
     if (e.components.label.selectorStates.length) {
-      const i = e.components.label.selectorStates[0].selectedSource, S = await le(t, i, m);
-      v = {
+      const i = e.components.label.selectorStates[0].selectedSource, y = await J(t, i, m);
+      C = {
         type: "column",
         value: i,
         label: await T(t, i, m),
         valueLabels: (s = (l = await k(t, i, m)) == null ? void 0 : l.toCanonicalString()) != null ? s : i,
-        format: (c = S == null ? void 0 : S.annotations) == null ? void 0 : c[pe]
+        format: (c = y == null ? void 0 : y.annotations) == null ? void 0 : c[ne]
       };
     }
     let d;
@@ -2389,12 +2393,12 @@ var rt = class extends Q {
       value: "highlight"
     }), {
       type: "scatterplot",
-      x: y,
-      y: x,
-      keyColumn: g,
+      x: S,
+      y: h,
+      keyColumn: x,
       facetBy: w,
       grouping: D,
-      label: v,
+      label: C,
       highlight: d,
       tooltips: {
         show: !0,
@@ -2417,7 +2421,7 @@ var rt = class extends Q {
     size: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, pt = class extends Q {
+}, pt = class extends Z {
   constructor() {
     super(
       {
@@ -2547,10 +2551,10 @@ var rt = class extends Q {
   async getMustBeConsumedAxes(t, e) {
     if (!e.components.x.selectorStates.length || !e.components.y.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const o = e.components.x.selectorStates[0].selectedSource, n = e.components.y.selectorStates[0].selectedSource, l = await t.pFrameProvider.getColumnSpecById(A(o)), s = await t.pFrameProvider.getColumnSpecById(A(n));
+    const o = e.components.x.selectorStates[0].selectedSource, n = e.components.y.selectorStates[0].selectedSource, l = await t.pFrameProvider.getColumnSpecById(b(o)), s = await t.pFrameProvider.getColumnSpecById(b(n));
     if (!l || !s)
       return /* @__PURE__ */ new Set();
-    const c = l.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), r = s.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), a = c.filter((p) => !r.some((m) => m === p)), u = r.filter((p) => !c.some((m) => m === p));
+    const c = l.axesSpec.map((p) => F.fromAxisSpec(p).toCanonicalString()), r = s.axesSpec.map((p) => F.fromAxisSpec(p).toCanonicalString()), a = c.filter((p) => !r.some((m) => m === p)), u = r.filter((p) => !c.some((m) => m === p));
     return /* @__PURE__ */ new Set([...a, ...u]);
   }
   async createDataByColumns(t, e) {
@@ -2558,32 +2562,32 @@ var rt = class extends Q {
     const s = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource;
     if (!s || !c)
       throw Error("X or Y column is not valid");
-    const r = A(s), a = A(c);
+    const r = b(s), a = b(c);
     if (!r || !a)
       throw Error("X or Y column is not valid");
     const u = {
       type: "columns",
       id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), y = [
+    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), S = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], x = Y(y), g = y.map((h) => A(h.selectedSource)).filter(P), w = [r, a].filter(P).map((h) => h.toCanonicalString());
+    ], h = Y(S), x = S.map((g) => b(g.selectedSource)).filter(O), w = [r, a].filter(O).map((g) => g.toCanonicalString());
     if (w.length === 0)
       throw Error("One of X and Y should be a column");
-    const C = await J(t, w), D = [r, a, ...g], B = [], v = [[], []], d = [], i = [];
-    for (const { selectedSource: h, fixedAxes: b } of y)
+    const v = await Q(t, w), D = [r, a, ...x], B = [], C = [[], []], d = [], i = [];
+    for (const { selectedSource: g, fixedAxes: A } of S)
       i.push(...await V(
         t,
         p,
         m,
-        C,
-        h,
-        b
-      )), v.push(
-        (b ?? []).map(({ axisIdx: O, axisValue: E }) => ({ idx: O, value: E }))
+        v,
+        g,
+        A
+      )), C.push(
+        (A ?? []).map(({ axisIdx: P, axisValue: E }) => ({ idx: P, value: E }))
       );
-    const S = [
+    const y = [
       e.components.grouping,
       e.components.facetBy,
       e.components.tooltipContent,
@@ -2591,32 +2595,32 @@ var rt = class extends Q {
       e.components.highlight,
       e.components.size
     ];
-    for (const h of S)
-      for (const { selectedSource: b, fixedAxes: O } of h.selectorStates) {
-        B.push(A(b)), d.push(
-          (O ?? []).map(({ axisIdx: L, axisValue: N }) => ({ idx: L, value: N }))
+    for (const g of y)
+      for (const { selectedSource: A, fixedAxes: P } of g.selectorStates) {
+        B.push(b(A)), d.push(
+          (P ?? []).map(({ axisIdx: L, axisValue: N }) => ({ idx: L, value: N }))
         ), i.push(...await V(
           t,
           p,
           m,
-          C,
-          b,
-          O
+          v,
+          A,
+          P
         ));
-        const E = await k(t, b, w);
+        const E = await k(t, A, w);
         E && B.push(E);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [r, a, ...i, ...g],
+      [r, a, ...i, ...x],
       B,
-      x,
+      h,
       !1,
-      v,
+      C,
       d
     );
-    return [...D, ...B].forEach((h) => {
-      const b = h.toCanonicalString();
-      u.values[b] = P(h) ? f.columnsData[b] : f.axesData[b];
+    return [...D, ...B].forEach((g) => {
+      const A = g.toCanonicalString();
+      u.values[A] = O(g) ? f.columnsData[A] : f.axesData[A];
     }), e.components.highlight.selectorStates.length && (u.values.highlight = Be(e.components.highlight.selectorStates, f)), {
       byColumns: u,
       axesData: f.axesData
@@ -2624,63 +2628,65 @@ var rt = class extends Q {
   }
   async createChartSettings(t, e) {
     var o, n, l, s, c;
-    const r = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, a = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource, u = r ? A(r) : null, p = a ? A(a) : null;
-    if (!r || !a || !u || !p || !P(u) && !P(p))
+    const r = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, a = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource, u = r ? b(r) : null, p = a ? b(a) : null;
+    if (!r || !a || !u || !p || !O(u) && !O(p))
       throw Error("Empty or invalid required data");
-    const m = [u, p].filter(P).map((i) => i.toCanonicalString()), y = {
+    const m = [u, p].filter(O).map((i) => i.toCanonicalString()), S = {
       type: "column",
       value: r,
       label: await T(t, r, m)
-    }, x = {
+    }, h = {
       type: "column",
       value: a,
       label: await T(t, a, m)
-    }, g = {
+    }, x = {
       type: "column",
       value: "key"
     }, w = await Promise.all(
       e.components.facetBy.selectorStates.map(async (i) => {
-        var S, f;
+        var y, f;
         return {
           type: "column",
-          value: (f = (S = await k(t, i.selectedSource, m)) == null ? void 0 : S.toCanonicalString()) != null ? f : i.selectedSource
+          value: (f = (y = await k(t, i.selectedSource, m)) == null ? void 0 : y.toCanonicalString()) != null ? f : i.selectedSource
         };
       })
-    ), C = ue.uniq([
+    ), v = pe.uniq([
       ...e.components.grouping.selectorStates.map((i) => i.selectedSource),
       ...e.components.size.selectorStates.map((i) => i.selectedSource)
     ]), D = await Promise.all(
-      C.map(async (i) => {
-        var S, f;
+      v.map(async (i) => {
+        var y, f;
         return {
-          type: "column",
-          label: await T(t, i, m) || i,
-          value: i,
-          valueLabels: (f = (S = await k(t, i, m)) == null ? void 0 : S.toCanonicalString()) != null ? f : i
+          columnName: {
+            type: "column",
+            label: await T(t, i, m) || i,
+            value: i,
+            valueLabels: (f = (y = await k(t, i, m)) == null ? void 0 : y.toCanonicalString()) != null ? f : i
+          }
         };
       })
     ), B = await Promise.all(
       e.components.tooltipContent.selectorStates.map(async (i) => {
-        var S, f, h;
-        const b = i.selectedSource, O = await le(t, b, m);
+        var y, f, g;
+        const A = i.selectedSource, P = await J(t, A, m);
         return {
           type: "column",
-          label: await T(t, b, m) || b,
-          value: b,
-          valueLabels: (f = (S = await k(t, b, m)) == null ? void 0 : S.toCanonicalString()) != null ? f : b,
-          format: (h = O == null ? void 0 : O.annotations) == null ? void 0 : h[pe]
+          label: await T(t, A, m) || A,
+          value: A,
+          valueLabels: (f = (y = await k(t, A, m)) == null ? void 0 : y.toCanonicalString()) != null ? f : A,
+          format: (g = P == null ? void 0 : P.annotations) == null ? void 0 : g[ne]
         };
       })
     );
-    let v;
+    let C;
     if (e.components.label.selectorStates.length) {
-      const i = e.components.label.selectorStates[0].selectedSource, S = await le(t, i, m);
-      v = {
+      const i = e.components.label.selectorStates[0].selectedSource, y = await J(t, i, m);
+      C = {
         type: "column",
         value: i,
         label: await T(t, i, m),
         valueLabels: (s = (l = await k(t, i, m)) == null ? void 0 : l.toCanonicalString()) != null ? s : i,
-        format: (c = S == null ? void 0 : S.annotations) == null ? void 0 : c[pe]
+        format: (c = y == null ? void 0 : y.annotations) == null ? void 0 : c[ne]
       };
     }
     let d;
@@ -2689,12 +2695,12 @@ var rt = class extends Q {
       value: "highlight"
     }), {
       type: "scatterplot-umap",
-      x: y,
-      y: x,
-      keyColumn: g,
+      x: S,
+      y: h,
+      keyColumn: x,
       facetBy: w,
       grouping: D,
-      label: v,
+      label: C,
       highlight: d,
       tooltips: {
         show: !0,
@@ -2722,7 +2728,7 @@ var rt = class extends Q {
     heatmapGroup: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, dt = class extends Q {
+}, dt = class extends Z {
   constructor() {
     super(
       {
@@ -2913,16 +2919,16 @@ var rt = class extends Q {
   }
   async createTableData(t, e) {
     var o;
-    const n = {}, l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, s = A(l);
-    if (!l || !P(s))
+    const n = {}, l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, s = b(l);
+    if (!l || !O(s))
       throw Error("Value column is not valid");
     const { linkerColumnsMap: c, compositeLinkerMap: r } = await X(t), a = Y([
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
     ]), u = [
-      ...e.components.filters.selectorStates.map((d) => A(d.selectedSource)),
-      ...e.components.tabBy.selectorStates.map((d) => A(d.selectedSource))
-    ].filter(P), p = [l], m = await J(t, p), y = [], x = [], g = [], w = [e.components.value], C = [
+      ...e.components.filters.selectorStates.map((d) => b(d.selectedSource)),
+      ...e.components.tabBy.selectorStates.map((d) => b(d.selectedSource))
+    ].filter(O), p = [l], m = await Q(t, p), S = [], h = [], x = [], w = [e.components.value], v = [
       e.components.tableContent,
       // next components can content data mapped on tree
       e.components.labels,
@@ -2932,61 +2938,61 @@ var rt = class extends Q {
       e.components.lineColor
     ], D = {};
     for (const d of w)
-      for (const { selectedSource: i, fixedAxes: S } of d.selectorStates) {
-        g.push(...await V(
+      for (const { selectedSource: i, fixedAxes: y } of d.selectorStates) {
+        x.push(...await V(
           t,
           c,
           r,
           m,
           i,
-          S
+          y
         ));
-        const f = await k(t, i, p), h = f ?? A(i);
-        D[h.toCanonicalString()] = i, y.push(h);
+        const f = await k(t, i, p), g = f ?? b(i);
+        D[g.toCanonicalString()] = i, S.push(g);
       }
-    for (const d of C)
-      for (const { selectedSource: i, fixedAxes: S } of d.selectorStates) {
-        g.push(...await V(
+    for (const d of v)
+      for (const { selectedSource: i, fixedAxes: y } of d.selectorStates) {
+        x.push(...await V(
           t,
           c,
           r,
           m,
           i,
-          S
+          y
         ));
-        const f = await k(t, i, p), h = f ?? A(i);
-        D[i] = h.toCanonicalString(), x.push(h);
+        const f = await k(t, i, p), g = f ?? b(i);
+        D[i] = g.toCanonicalString(), h.push(g);
       }
     const B = await t.pFrameProvider.getTableOuterJoin(
-      [...y, ...u, ...g],
-      x,
+      [...S, ...u, ...x],
+      h,
       a,
       !1
     );
-    for (const d of [...y, ...x]) {
-      const i = d.toCanonicalString(), S = D[d.toCanonicalString()];
-      n[S] = {
-        data: P(d) ? B.columnsData[i] : B.axesData[i],
-        spec: P(d) ? B.columnSpecs[i] : B.axesSpecs[i],
-        label: await T(t, S, p)
+    for (const d of [...S, ...h]) {
+      const i = d.toCanonicalString(), y = D[d.toCanonicalString()];
+      n[y] = {
+        data: O(d) ? B.columnsData[i] : B.axesData[i],
+        spec: O(d) ? B.columnSpecs[i] : B.axesSpecs[i],
+        label: await T(t, y, p)
       };
     }
-    const v = Object.keys(B.axesData).find(
+    const C = Object.keys(B.axesData).find(
       (d) => {
         var i;
-        return ((i = A(d)) == null ? void 0 : i.name) === Se;
+        return ((i = b(d)) == null ? void 0 : i.name) === Se;
       }
     );
-    return v ? n[ye] = {
-      data: B.axesData[v],
+    return C ? n[ye] = {
+      data: B.axesData[C],
       spec: { kind: "PColumn", valueType: "Int", name: "Node id" },
       label: "Node id"
     } : console.warn("Missed node id axis in data column"), n;
   }
   async createDataByColumns(t, e) {
     var o, n, l;
-    const s = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.heatmapAnnotation.selectorStates[0]) == null ? void 0 : n.selectedSource, r = A(s), a = c ? A(c) : null;
-    if (!s || !P(r))
+    const s = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.heatmapAnnotation.selectorStates[0]) == null ? void 0 : n.selectedSource, r = b(s), a = c ? b(c) : null;
+    if (!s || !O(r))
       throw Error("Value column is not valid");
     const u = {
       type: "columns",
@@ -2995,7 +3001,7 @@ var rt = class extends Q {
     }, p = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], m = Y(p), y = p.map((S) => A(S.selectedSource)).filter(P), x = [r, a].filter(P).map((S) => S.toCanonicalString()), g = [], w = [], C = [], D = [], B = [
+    ], m = Y(p), S = p.map((y) => b(y.selectedSource)).filter(O), h = [r, a].filter(O).map((y) => y.toCanonicalString()), x = [], w = [], v = [], D = [], B = [
       e.components.value,
       e.components.height,
       e.components.labels,
@@ -3005,131 +3011,131 @@ var rt = class extends Q {
       e.components.lineColor,
       e.components.heatmapAnnotation,
       e.components.heatmapForSequence
-    ], v = [
+    ], C = [
       e.components.facetBy,
       e.components.heatmapAxis,
       e.components.heatmapGroup,
       e.components.tableContent
     ];
-    for (const S of B)
-      for (const { selectedSource: f, fixedAxes: h } of S.selectorStates) {
-        g.push(A(f)), C.push(
-          (h ?? []).map(({ axisIdx: O, axisValue: E }) => ({ idx: O, value: E }))
+    for (const y of B)
+      for (const { selectedSource: f, fixedAxes: g } of y.selectorStates) {
+        x.push(b(f)), v.push(
+          (g ?? []).map(({ axisIdx: P, axisValue: E }) => ({ idx: P, value: E }))
         );
-        const b = await k(t, f, x);
-        b && g.push(b);
+        const A = await k(t, f, h);
+        A && x.push(A);
       }
-    p.forEach(({ fixedAxes: S }) => {
-      C.push(
-        (S ?? []).map(({ axisIdx: f, axisValue: h }) => ({ idx: f, value: h }))
+    p.forEach(({ fixedAxes: y }) => {
+      v.push(
+        (y ?? []).map(({ axisIdx: f, axisValue: g }) => ({ idx: f, value: g }))
       );
     });
-    for (const S of v)
-      for (const { selectedSource: f, fixedAxes: h } of S.selectorStates) {
-        w.push(A(f)), D.push(
-          (h ?? []).map(({ axisIdx: O, axisValue: E }) => ({ idx: O, value: E }))
+    for (const y of C)
+      for (const { selectedSource: f, fixedAxes: g } of y.selectorStates) {
+        w.push(b(f)), D.push(
+          (g ?? []).map(({ axisIdx: P, axisValue: E }) => ({ idx: P, value: E }))
         );
-        const b = await k(t, f, x);
-        b && w.push(b);
+        const A = await k(t, f, h);
+        A && w.push(A);
       }
     const d = await t.pFrameProvider.getTableOuterJoin(
-      [...g, ...y],
+      [...x, ...S],
       w,
       m,
       !1,
-      C,
+      v,
       D
     );
-    [...g, ...w].forEach((S) => {
-      const f = S.toCanonicalString(), h = P(S) ? d.columnsData[f] : d.axesData[f];
-      u.values[f] = [], u.values[f] = h;
+    [...x, ...w].forEach((y) => {
+      const f = y.toCanonicalString(), g = O(y) ? d.columnsData[f] : d.axesData[f];
+      u.values[f] = [], u.values[f] = g;
     });
     const i = Object.keys(d.axesData).find(
-      (S) => {
+      (y) => {
         var f;
-        return ((f = A(S)) == null ? void 0 : f.name) === Se;
+        return ((f = b(y)) == null ? void 0 : f.name) === Se;
       }
     );
     return i ? u.values[ye] = d.axesData[i] : console.warn("Missed node id axis in data column"), { byColumns: u };
   }
   async createChartSettings(t, e) {
     var o, n, l;
-    const s = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, c = A(s);
-    if (!s || !P(c))
+    const s = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, c = b(s);
+    if (!s || !O(c))
       throw Error("Data column is not valid");
-    const r = [s], a = { type: "column", value: ye }, u = { type: "column", value: s }, p = e.components.height.selectorStates.length ? { type: "column", value: e.components.height.selectorStates[0].selectedSource } : void 0, m = e.components.labels.selectorStates.length ? { type: "column", value: e.components.labels.selectorStates[0].selectedSource } : void 0, y = {};
+    const r = [s], a = { type: "column", value: ye }, u = { type: "column", value: s }, p = e.components.height.selectorStates.length ? { type: "column", value: e.components.height.selectorStates[0].selectedSource } : void 0, m = e.components.labels.selectorStates.length ? { type: "column", value: e.components.labels.selectorStates[0].selectedSource } : void 0, S = {};
     if (e.components.nodeColor.selectorStates.length) {
-      const C = e.components.nodeColor.selectorStates[0].selectedSource;
-      y.nodeColor = {
+      const v = e.components.nodeColor.selectorStates[0].selectedSource;
+      S.nodeColor = {
         columnName: {
           type: "column",
-          value: C,
-          label: await T(t, C, r)
+          value: v,
+          label: await T(t, v, r)
         }
       };
     }
     if (e.components.nodeShape.selectorStates.length) {
-      const C = e.components.nodeShape.selectorStates[0].selectedSource;
-      y.nodeShape = {
+      const v = e.components.nodeShape.selectorStates[0].selectedSource;
+      S.nodeShape = {
         columnName: {
           type: "column",
-          value: C,
-          label: await T(t, C, r)
+          value: v,
+          label: await T(t, v, r)
         }
       };
     }
     if (e.components.nodeSize.selectorStates.length) {
-      const C = e.components.nodeSize.selectorStates[0].selectedSource;
-      y.nodeSize = {
+      const v = e.components.nodeSize.selectorStates[0].selectedSource;
+      S.nodeSize = {
         columnName: {
           type: "column",
-          value: C,
-          label: await T(t, C, r)
+          value: v,
+          label: await T(t, v, r)
         }
       };
     }
     if (e.components.lineColor.selectorStates.length) {
-      const C = e.components.lineColor.selectorStates[0].selectedSource;
-      y.lineColor = {
+      const v = e.components.lineColor.selectorStates[0].selectedSource;
+      S.lineColor = {
         columnName: {
           type: "column",
-          value: C,
-          label: await T(t, C, r)
+          value: v,
+          label: await T(t, v, r)
         }
       };
     }
-    let x, g, w;
+    let h, x, w;
     if (e.components.heatmapAnnotation.selectorStates.length && e.components.heatmapAxis.selectorStates.length) {
-      const C = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
-      x = {
+      const v = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
+      h = {
         type: "column",
-        value: C,
-        label: await T(t, C, []),
-        valueLabels: (n = await k(t, C, [])) == null ? void 0 : n.toCanonicalString()
+        value: v,
+        label: await T(t, v, []),
+        valueLabels: (n = await k(t, v, [])) == null ? void 0 : n.toCanonicalString()
       };
       const D = e.components.heatmapAxis.selectorStates[0].selectedSource;
-      g = {
+      x = {
         type: "column",
         value: D,
-        label: await T(t, D, [C]),
-        valueLabels: (l = await k(t, D, [C])) == null ? void 0 : l.toCanonicalString()
+        label: await T(t, D, [v]),
+        valueLabels: (l = await k(t, D, [v])) == null ? void 0 : l.toCanonicalString()
       }, w = await Promise.all(
         e.components.heatmapGroup.selectorStates.map(async (B) => {
-          var v;
+          var C;
           return {
             type: "column",
             value: B.selectedSource,
-            label: await T(t, B.selectedSource, [C]),
-            valueLabels: (v = await k(t, B.selectedSource, [C])) == null ? void 0 : v.toCanonicalString()
+            label: await T(t, B.selectedSource, [v]),
+            valueLabels: (C = await k(t, B.selectedSource, [v])) == null ? void 0 : C.toCanonicalString()
           };
         })
       );
     } else if (e.components.heatmapForSequence.selectorStates.length) {
-      const C = e.components.heatmapForSequence.selectorStates[0].selectedSource;
-      x = {
+      const v = e.components.heatmapForSequence.selectorStates[0].selectedSource;
+      h = {
         type: "column",
-        value: C,
-        label: await T(t, C, [])
+        value: v,
+        label: await T(t, v, [])
       };
     }
     return {
@@ -3138,14 +3144,14 @@ var rt = class extends Q {
       parentId: u,
       height: p,
       labels: m,
-      aes: y,
-      heatmapAnnotation: x,
-      heatmapAxis: g,
+      aes: S,
+      heatmapAnnotation: h,
+      heatmapAxis: x,
       heatmapGroup: w
     };
   }
 }, he = 1e6;
-function ie(t, e) {
+function ue(t, e) {
   if (t === "String")
     return e.data;
   const o = new Array(e.data.length);
@@ -3178,10 +3184,10 @@ var St = class {
       }), l = n.filter((c) => c.spec.type === "axis"), s = n.filter((c) => c.spec.type === "column");
       return {
         axesData: l.reduce((c, r) => {
-          const a = _.fromAxisSpec(r.spec.spec);
-          return c[a.toCanonicalString()] = ie(a.type, r.data), c;
+          const a = F.fromAxisSpec(r.spec.spec);
+          return c[a.toCanonicalString()] = ue(a.type, r.data), c;
         }, {}),
-        data: s.length ? ie(t.type, s[0].data) : []
+        data: s.length ? ue(t.type, s[0].data) : []
       };
     } catch (o) {
       throw console.error("PFrame: calculateTableData error"), o;
@@ -3207,9 +3213,9 @@ var St = class {
     }
   }
   async getAxisUniqueValues(t, e, o = he, n = []) {
-    const l = e.filter(P), s = await Promise.all(l.map((a) => this.getColumnSpecById(a))), c = t.toCanonicalString(), r = l.filter((a, u) => {
+    const l = e.filter(O), s = await Promise.all(l.map((a) => this.getColumnSpecById(a))), c = t.toCanonicalString(), r = l.filter((a, u) => {
       const p = s[u];
-      return p !== null && p.axesSpec.some((m) => _.fromAxisSpec(m).toCanonicalString() === c);
+      return p !== null && p.axesSpec.some((m) => F.fromAxisSpec(m).toCanonicalString() === c);
     });
     if (r.length === 0)
       return { values: [], overflow: !1 };
@@ -3225,11 +3231,11 @@ var St = class {
         )
       );
       let p = !1;
-      return u.forEach((m, y) => {
-        m.overflow && (p = !0, console.warn(`More than ${o} values for ${r[y].name} column`));
+      return u.forEach((m, S) => {
+        m.overflow && (p = !0, console.warn(`More than ${o} values for ${r[S].name} column`));
       }), {
-        values: ue.uniq(
-          ue.flatten(u.map((m) => Array.from(m.values.data).map(String)))
+        values: pe.uniq(
+          pe.flatten(u.map((m) => Array.from(m.values.data).map(String)))
         ),
         overflow: p
       };
@@ -3238,23 +3244,23 @@ var St = class {
     }
   }
   async getTableOuterJoin(t, e, o = [], n = !0, l = [], s = []) {
-    const c = t.filter(P), r = e.filter(P), a = {
+    const c = t.filter(O), r = e.filter(O), a = {
       src: {
         type: "outer",
         primary: {
           type: n ? "inner" : "full",
           entries: c.map((u, p) => {
             var m;
-            const y = (m = l[p]) == null ? void 0 : m.map((x) => ({
+            const S = (m = l[p]) == null ? void 0 : m.map((h) => ({
               type: "constant",
-              axisIndex: x.idx,
-              constant: x.value
-            })).filter((x) => x.constant !== void 0);
-            return y != null && y.length ? {
+              axisIndex: h.idx,
+              constant: h.value
+            })).filter((h) => h.constant !== void 0);
+            return S != null && S.length ? {
               type: "slicedColumn",
               newId: u.name,
               column: u.name,
-              axisFilters: y
+              axisFilters: S
             } : {
               type: "column",
               column: u.name
@@ -3263,16 +3269,16 @@ var St = class {
         },
         secondary: r.map((u, p) => {
           var m;
-          const y = (m = s[p]) == null ? void 0 : m.map((x) => ({
+          const S = (m = s[p]) == null ? void 0 : m.map((h) => ({
             type: "constant",
-            axisIndex: x.idx,
-            constant: x.value
-          })).filter((x) => x.constant !== void 0);
-          return y != null && y.length ? {
+            axisIndex: h.idx,
+            constant: h.value
+          })).filter((h) => h.constant !== void 0);
+          return S != null && S.length ? {
             type: "slicedColumn",
             newId: u.name,
             column: u.name,
-            axisFilters: y
+            axisFilters: S
           } : {
             type: "column",
             column: u.name
@@ -3283,29 +3289,29 @@ var St = class {
       sorting: []
     };
     try {
-      const u = Date.now(), p = await this.pframeDriver.calculateTableData(this.pframeHandle, a), m = p.filter((x) => x.spec.type === "axis"), y = p.filter((x) => x.spec.type === "column");
+      const u = Date.now(), p = await this.pframeDriver.calculateTableData(this.pframeHandle, a), m = p.filter((h) => h.spec.type === "axis"), S = p.filter((h) => h.spec.type === "column");
       return {
-        axesData: m.reduce((x, g) => {
-          const w = _.fromAxisSpec(g.spec.spec);
-          return x[w.toCanonicalString()] = ie(w.type, g.data), x;
+        axesData: m.reduce((h, x) => {
+          const w = F.fromAxisSpec(x.spec.spec);
+          return h[w.toCanonicalString()] = ue(w.type, x.data), h;
         }, {}),
-        columnsData: y.reduce((x, g) => {
-          const w = g.spec.spec, C = new W({
-            name: g.spec.id,
+        columnsData: S.reduce((h, x) => {
+          const w = x.spec.spec, v = new W({
+            name: x.spec.id,
             type: w.valueType
           });
-          return x[C.toCanonicalString()] = ie(C.type, g.data), x;
+          return h[v.toCanonicalString()] = ue(v.type, x.data), h;
         }, {}),
-        columnSpecs: y.reduce((x, g) => {
-          const w = g.spec.spec, C = new W({
-            name: g.spec.id,
+        columnSpecs: S.reduce((h, x) => {
+          const w = x.spec.spec, v = new W({
+            name: x.spec.id,
             type: w.valueType
           });
-          return x[C.toCanonicalString()] = w, x;
+          return h[v.toCanonicalString()] = w, h;
         }, {}),
-        axesSpecs: m.reduce((x, g) => {
-          const w = g.spec.spec, C = _.fromAxisSpec(w);
-          return x[C.toCanonicalString()] = w, x;
+        axesSpecs: m.reduce((h, x) => {
+          const w = x.spec.spec, v = F.fromAxisSpec(w);
+          return h[v.toCanonicalString()] = w, h;
         }, {})
       };
     } catch (u) {
@@ -3322,15 +3328,15 @@ var St = class {
   }
   async getColumnAxesIds(t) {
     var e, o;
-    return (o = (e = await this.getColumnSpecById(t)) == null ? void 0 : e.axesSpec.map((n) => _.fromAxisSpec(n))) != null ? o : [];
+    return (o = (e = await this.getColumnSpecById(t)) == null ? void 0 : e.axesSpec.map((n) => F.fromAxisSpec(n))) != null ? o : [];
   }
   async getRequestColumnsFromSelectedSources(t) {
     var e, o;
     const n = [];
     for (const l of t)
-      if (P(l)) {
+      if (O(l)) {
         const s = (o = (e = await this.getColumnSpecById(l)) == null ? void 0 : e.axesSpec) != null ? o : [];
-        n.push(...s.map((c) => _.fromAxisSpec(c).toPFrameId()));
+        n.push(...s.map((c) => F.fromAxisSpec(c).toPFrameId()));
       }
     return n;
   }
@@ -3387,7 +3393,7 @@ var St = class {
   constructor(t, e, o = (n, l) => l ?? n) {
     this.labelsModifier = o, this.pFrameProvider = new St(t, e);
   }
-}, Fe = {
+}, _e = {
   controllers: {
     discrete: new lt(),
     scatterplot: new it(),
@@ -3408,13 +3414,13 @@ var St = class {
   }
 };
 function wt(t) {
-  return Fe.controllers[t];
+  return _e.controllers[t];
 }
-function Ct(t) {
-  return Fe.initialStates[t];
+function vt(t) {
+  return _e.initialStates[t];
 }
 export {
-  _ as AxisId,
+  F as AxisId,
   tt as BubbleStateController,
   W as ColumnId,
   ht as DemoDataStore,
@@ -3422,9 +3428,9 @@ export {
   lt as DiscreteStateController,
   rt as HeatmapStateController,
   it as ScatterplotStateController,
-  A as columnOrAxisIdFromString,
+  b as columnOrAxisIdFromString,
   wt as getControllerByType,
-  Ct as getInitialStateByType,
-  P as isColumnId
+  vt as getInitialStateByType,
+  O as isColumnId
 };
 //# sourceMappingURL=index.js.map