@milaboratories/graph-maker 1.1.138 → 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 Oe, isLabelColumn as Fe } from "../../../@platforma-sdk/model/dist/index.js";
-import { canonicalizeJson as j, pTableValue as _e } from "../../pl-model-common/dist/index.js";
-import ie from "../../../lodash/lodash.js";
-var Le = "pl7.app/axisNature", xe = "pl7.app/label", Te = "pl7.app/columnAsAxis/name", ke = "pl7.app/columnAsAxis/domain", $ = "pl7.app/isSubset", ee = "pl7.app/isDiscreteFilter", Ee = "pl7.app/discreteValues", Ne = "pl7.app/graph/axis/highCardinality", Ge = "pl7.app/graph/isVirtual", he = "pl7.app/isLinkerColumn", _ = class se {
+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 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 Le = "pl7.app/axisNature", xe = "pl7.app/label", Te = "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 Le = "pl7.app/axisNature", xe = "pl7.app/label", Te = "pl7.app/columnAsAxis/
     };
   }
   static fromPojo(e) {
-    return new se(e);
+    return new ae(e);
   }
-}, W = class we {
+}, W = class Ce {
   constructor({ name: e, type: o }) {
     this.kind = "column", this.name = e, this.type = o;
   }
@@ -36,58 +36,58 @@ var Le = "pl7.app/axisNature", xe = "pl7.app/label", Te = "pl7.app/columnAsAxis/
     return z(this);
   }
   static fromPojo(e) {
-    return new we(e);
+    return new Ce(e);
   }
 };
-function B(t) {
+function O(t) {
   return t !== null && t.kind === "column";
 }
-function le(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 Se = "pl7.app/parents";
-function Ce(t) {
-  return !t.annotations || !t.annotations[Se] ? [] : JSON.parse(t.annotations[Se]);
+var fe = "pl7.app/parents";
+function Ae(t) {
+  return !t.annotations || !t.annotations[fe] ? [] : JSON.parse(t.annotations[fe]);
 }
-function Me(t, e) {
+function Ve(t, e) {
   const o = j(t[e]);
   for (let n = 0; n < t.length; n++) {
     const l = t[n];
     if (e === n)
       continue;
-    if (Ce(l).some((r) => j(r) === o))
+    if (Ae(l).some((c) => j(c) === o))
       return !1;
   }
   return !0;
 }
-function qe(t) {
+function je(t) {
   for (let e = 0; e < t.length; e++)
-    if (Me(t, e))
+    if (Ve(t, e))
       return t[e];
   return null;
 }
-function Ve(t) {
+function ze(t) {
   const e = { axis: t, parents: [] };
   let o = [e];
   for (; o.length; ) {
     const n = [];
     for (const l of o) {
-      const s = Ce(l.axis);
-      l.parents = s.map((r) => ({ axis: r, parents: [] })), n.push(...l.parents);
+      const s = Ae(l.axis);
+      l.parents = s.map((c) => ({ axis: c, parents: [] })), n.push(...l.parents);
     }
     o = n;
   }
   return e;
 }
-function je(t) {
+function Ke(t) {
   const e = /* @__PURE__ */ new Set([j(t.axis)]);
   let o = [t];
   for (; o.length; ) {
@@ -99,7 +99,7 @@ function je(t) {
   }
   return e;
 }
-function ze(t) {
+function Ue(t) {
   const e = [t.axis];
   let o = [t];
   for (; o.length; ) {
@@ -111,89 +111,89 @@ function ze(t) {
   }
   return e;
 }
-function te(t) {
+function oe(t) {
   if (!t.length)
     return [];
   let e = t;
   const o = [];
   for (; e.length; ) {
-    const n = qe(e);
+    const n = je(e);
     if (n === null)
       return null;
-    const l = Ve(n);
+    const l = ze(n);
     if (l === null)
       return null;
-    const s = je(l), r = ze(l);
-    o.push(r), e = e.filter((c) => !s.has(j(c)));
+    const s = Ke(l), c = Ue(l);
+    o.push(c), e = e.filter((r) => !s.has(j(r)));
   }
   return o;
 }
-function Ke(t) {
+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 }), r = te(l.spec.axesSpec);
-    if (!r || r.length !== 2)
+    const s = new W({ name: l.columnId, type: l.spec.valueType }), c = oe(l.spec.axesSpec);
+    if (!c || c.length !== 2)
       continue;
-    const [c, i] = r, p = j(c), u = j(i);
-    n.has(p) || n.set(p, /* @__PURE__ */ new Map()), n.has(u) || n.set(u, /* @__PURE__ */ new Map()), (e = n.get(p)) == null || e.set(u, s), (o = n.get(u)) == null || o.set(p, s);
+    const [r, a] = c, u = j(r), p = j(a);
+    n.has(u) || n.set(u, /* @__PURE__ */ new Map()), n.has(p) || n.set(p, /* @__PURE__ */ new Map()), (e = n.get(u)) == null || e.set(p, s), (o = n.get(p)) == null || o.set(u, s);
   }
   return n;
 }
-async function Ue(t, e, o, n, l, s, r, c = !0, i) {
-  var p, u, m, d;
-  const x = A(e);
-  if (B(x)) {
-    const g = await t.pFrameProvider.getColumnSpecById(x);
-    if (!g)
+async function He(t, e, o, n, l, s, c, r = !0, a) {
+  var u, p, m, S;
+  const h = b(e);
+  if (O(h)) {
+    const x = await t.pFrameProvider.getColumnSpecById(h);
+    if (!x)
       return;
-    const h = be(
-      g,
+    const w = De(
+      x,
       l,
       s,
-      r,
-      i
-    ).map((a) => _.fromAxisSpec(a).toCanonicalString()), w = new Set(h), D = g.axesSpec.map((a) => _.fromAxisSpec(a).toCanonicalString()), b = {};
-    c && D.forEach((a, S) => {
-      w.has(a) && (b[a] = S);
+      c,
+      a
+    ).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) => {
+      v.has(d) && (B[d] = i);
     });
     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: ((p = g.annotations) == null ? void 0 : p[$]) === "true",
-      isDiscreteFilter: g.valueType === "String" || ((u = g.annotations) == null ? void 0 : u[ee]) === "true",
-      axesToBeFixed: h,
-      axesToBeFixedIndexes: b
+      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(), C);
-    for (const a of g.axesSpec) {
-      const y = _.fromAxisSpec(a).toCanonicalString();
+    n.set(h.toCanonicalString(), C);
+    for (const d of x.axesSpec) {
+      const y = F.fromAxisSpec(d).toCanonicalString();
       if (n.has(y))
         continue;
-      const f = Ae(a), v = {
+      const f = Ie(d), g = {
         kind: "axis",
-        name: a.name,
+        name: d.name,
         label: await T(t, y, [e]),
-        type: a.type,
+        type: d.type,
         mustBeConsumed: f,
         dividable: !1,
-        spec: a,
-        annotations: a.annotations,
-        isSubsetFilter: ((m = a.annotations) == null ? void 0 : m[$]) === "true",
-        isDiscreteFilter: a.type === "String" || ((d = a.annotations) == null ? void 0 : d[ee]) === "true",
+        spec: d,
+        annotations: d.annotations,
+        isSubsetFilter: ((m = d.annotations) == null ? void 0 : m[$]) === "true",
+        isDiscreteFilter: d.type === "String" || ((S = d.annotations) == null ? void 0 : S[te]) === "true",
         parentSources: [e]
       };
-      n.set(y, v);
+      n.set(y, g);
     }
   }
 }
-function ye(t) {
-  const e = A(t), { name: o, type: n } = e;
-  return B(e) ? {
+function ge(t) {
+  const e = b(t), { name: o, type: n } = e;
+  return O(e) ? {
     kind: "column",
     name: "",
     label: " ",
@@ -218,39 +218,39 @@ function ye(t) {
     parentSources: []
   };
 }
-function ue(t) {
+function me(t) {
   return {
     type: t.type,
     components: { ...t.components },
     dividedAxes: { ...t.dividedAxes }
   };
 }
-function We(t) {
-  const { selectedSource: e, type: o, selectedFilterRange: n, selectedFilterValue: l } = t, s = A(e);
+function Ye(t) {
+  const { selectedSource: e, type: o, selectedFilterRange: n, selectedFilterValue: l } = t, s = b(e);
   if (!s)
     throw Error("Empty source selected");
   if (o === "range") {
-    const r = [];
-    return (n == null ? void 0 : n.max) !== void 0 && r.push({
+    const c = [];
+    return (n == null ? void 0 : n.max) !== void 0 && c.push({
       type: "bySingleColumnV2",
-      column: le(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 && r.push({
+    }), (n == null ? void 0 : n.min) !== void 0 && c.push({
       type: "bySingleColumnV2",
-      column: le(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
       }
-    }), r;
+    }), c;
   } else if (o === "subset")
     return [
       {
         type: "bySingleColumnV2",
-        column: le(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 We(t) {
   return typeof l > "u" ? [] : [
     {
       type: "bySingleColumnV2",
-      column: le(s) ? { type: "axis", id: s.toPFrameId() } : {
+      column: re(s) ? { type: "axis", id: s.toPFrameId() } : {
         type: "column",
         id: s.name
       },
@@ -274,117 +274,121 @@ function We(t) {
 function Y(t) {
   const e = [];
   for (const o of t)
-    e.push(...We(o));
+    e.push(...Ye(o));
   return e;
 }
-function fe(t) {
+function xe(t) {
   var e, o, n, l;
   if ("kind" in t && t.kind === "PColumn") {
-    const c = (o = t.name) != null ? o : (e = t.annotations) == null ? void 0 : e[Te], i = (l = t.domain) != null ? l : (n = t.annotations) == null ? void 0 : n[ke];
-    return z({ name: c, domain: i });
+    const r = (o = t.name) != null ? o : (e = t.annotations) == null ? void 0 : e[Ee], a = (l = t.domain) != null ? l : (n = t.annotations) == null ? void 0 : n[Ne];
+    return z({ name: r, domain: a });
   }
-  const s = t.name, r = t.domain;
-  return z({ name: s, domain: r });
+  const s = t.name, c = t.domain;
+  return z({ name: s, domain: c });
 }
-async function ve(t, e, o) {
+async function be(t, e, o) {
   var n;
   for (const l of o) {
-    const s = A(l);
-    if (B(s)) {
-      const r = await t.pFrameProvider.getColumnSpecById(s), c = ((n = r == null ? void 0 : r.axesSpec) != null ? n : []).find(
-        (i) => _.fromAxisSpec(i).toCanonicalString() === e.toCanonicalString()
+    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) => F.fromAxisSpec(a).toCanonicalString() === e.toCanonicalString()
       );
-      if (c)
-        return c;
+      if (r)
+        return r;
     }
   }
   return null;
 }
-var He = "pl7.app/label";
+var Re = "pl7.app/label";
 async function k(t, e, o) {
-  const n = A(e);
-  if (B(n))
+  const n = b(e);
+  if (O(n))
     return;
-  async function l(i) {
-    const p = await ve(t, i, o);
-    return p ? fe(p) : null;
+  async function l(a) {
+    const u = await be(t, a, o);
+    return u ? xe(u) : null;
   }
-  const s = await t.pFrameProvider.getColumnsFull([], !1, void 0, [He]), r = await l(n), c = s.find(({ spec: i }) => i && i.axesSpec.length === 1 && fe(i.axesSpec[0]) === r);
-  return c ? new W({ name: c.columnId, type: c.spec.valueType }) : void 0;
+  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 J(t, e, o) {
+  const n = b(e), l = await k(t, e, o);
+  let 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 = A(e), r = await k(t, e, o);
-  let c;
-  if (B(s) ? c = await t.pFrameProvider.getColumnSpecById(r ?? s) : c = r ? await t.pFrameProvider.getColumnSpecById(r) : await ve(t, s, o), !c)
+  const s = await J(t, e, o);
+  if (!s)
     return "";
-  const i = (l = (n = c.annotations) == null ? void 0 : n[xe]) != null ? l : c.name;
-  return t.labelsModifier(c.name, i);
+  const c = (l = (n = s.annotations) == null ? void 0 : n[we]) != null ? l : s.name;
+  return t.labelsModifier(s.name, c);
 }
-function Ae(t) {
+function Ie(t) {
   var e, o;
-  const n = (o = (e = t.annotations) == null ? void 0 : e[Le]) == null ? void 0 : o.toLowerCase();
+  const n = (o = (e = t.annotations) == null ? void 0 : e[ke]) == null ? void 0 : o.toLowerCase();
   return !!n && n !== "homogenous" && n !== "homogeneous";
 }
 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 Ye(t) {
+function Xe(t) {
   var e, o;
-  return !t.name.includes("metadata") && ((e = t.annotations) == null ? void 0 : e[Ge]) !== "true" && ((o = t.annotations) == null ? void 0 : o[$]) !== "true";
+  return !t.name.includes("metadata") && ((e = t.annotations) == null ? void 0 : e[qe]) !== "true" && ((o = t.annotations) == null ? void 0 : o[$]) !== "true";
 }
-function Re(t) {
+function $e(t) {
   var e;
   const o = {};
   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 [r, c] = s, i = _.fromAxisSpec(r).toCanonicalString(), p = _.fromAxisSpec(c).toCanonicalString();
-      o[i] || (o[i] = {}), o[p] || (o[p] = {}), o[i][p] = { id: l, spec: n.spec }, o[p][i] = { id: l, spec: n.spec };
+      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 (B(s)) {
-      const r = await t.pFrameProvider.getColumnSpecById(s);
-      if (!r)
+    const s = b(l);
+    if (O(s)) {
+      const c = await t.pFrameProvider.getColumnSpecById(s);
+      if (!c)
         continue;
-      r.axesSpec.forEach((c) => {
-        const i = _.fromAxisSpec(c).toCanonicalString();
-        o.has(i) || (o.add(i), n.push(c));
+      c.axesSpec.forEach((r) => {
+        const a = F.fromAxisSpec(r).toCanonicalString();
+        o.has(a) || (o.add(a), n.push(r));
       });
     }
   }
   return n;
 }
-function Xe(t, e, o) {
+function Je(t, e, o) {
   const n = {}, l = /* @__PURE__ */ new Set([e]);
   let s = [e];
   for (; s.length; ) {
-    const r = /* @__PURE__ */ new Set();
-    for (const c of s)
-      if (t[c]) {
-        const i = Object.keys(t[c]);
-        for (const p of i)
-          if (n[p] = c, p === o) {
-            const u = [];
+    const c = /* @__PURE__ */ new Set();
+    for (const r of s)
+      if (t[r]) {
+        const a = Object.keys(t[r]);
+        for (const u of a)
+          if (n[u] = r, u === o) {
+            const p = [];
             let m = o;
             for (; n[m] !== e; )
-              u.push(m), m = n[m];
-            return u.push(m), u.map((d) => t[d][n[d]].id);
-          } else l.has(p) || (r.add(p), l.add(p));
+              p.push(m), m = n[m];
+            return p.push(m), p.map((S) => t[S][n[S]].id);
+          } else l.has(u) || (c.add(u), l.add(u));
       }
-    s = [...r];
+    s = [...c];
   }
   return null;
 }
-function $e(t, e, o) {
-  const n = [...e].map((s) => Xe(t, s, o)).filter((s) => s !== null);
+function Qe(t, e, o) {
+  const n = [...e].map((s) => Je(t, s, o)).filter((s) => s !== null);
   if (n.length === 0)
     return [];
   let l = n[0];
@@ -398,84 +402,84 @@ async function X(t) {
     !1,
     void 0,
     void 0,
-    { [he]: "true" }
-  ), o = Re(e.filter((l) => l.spec.axesSpec.length === 2)), n = Ke(e.filter((l) => l.spec.axesSpec.length > 2));
+    { [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 r = A(l);
-  if (!B(r))
+  const c = b(l);
+  if (!O(c))
     return [];
-  const c = await t.pFrameProvider.getColumnSpecById(r);
-  if (!c)
+  const r = await t.pFrameProvider.getColumnSpecById(c);
+  if (!r)
     return [];
-  const i = c.axesSpec.filter(
-    (h) => {
-      const w = _.fromAxisSpec(h).toCanonicalString();
-      return !(s != null && s.some((D) => D.axisSource === w));
+  const a = r.axesSpec.filter(
+    (w) => {
+      const v = F.fromAxisSpec(w).toCanonicalString();
+      return !(s != null && s.some((D) => D.axisSource === v));
     }
-  ), p = new Set(n.map((h) => _.fromAxisSpec(h).toCanonicalString())), u = i.filter((h) => {
-    const w = _.fromAxisSpec(h).toCanonicalString();
-    return !p.has(w);
+  ), 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 (!u.length)
+  if (!p.length)
     return [];
-  const m = te(n), d = te(u);
-  if (!m || !d)
-    throw Error(`Can't create axes tree for ${c.name}`);
-  const x = new Set(m.map(j)), g = /* @__PURE__ */ new Set();
-  return d.forEach((h) => {
-    var w;
-    const D = j(h);
+  const m = oe(n), S = oe(p);
+  if (!m || !S)
+    throw Error(`Can't create axes tree for ${r.name}`);
+  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), a = (b ? [...b.keys()] : []).find((y) => x.has(y));
-      if (!a)
-        throw Error(`Can't find composite linker column for ${c.name}, ${D}`);
-      const S = (w = o.get(D)) == null ? void 0 : w.get(a);
-      g.add(S.toCanonicalString());
-    } else if (h.length === 1) {
-      const b = _.fromAxisSpec(h[0]).toCanonicalString();
-      $e(e, p, b).forEach((a) => {
-        g.add(a.toCanonicalString());
+      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 = (v = o.get(D)) == null ? void 0 : v.get(d);
+      x.add(i.toCanonicalString());
+    } else if (w.length === 1) {
+      const B = F.fromAxisSpec(w[0]).toCanonicalString();
+      Qe(e, u, B).forEach((d) => {
+        x.add(d.toCanonicalString());
       });
     }
-  }), [...g].map((h) => A(h));
+  }), [...x].map((w) => b(w));
 }
-function be(t, e, o, n, l) {
-  const r = t.axesSpec.filter(
-    (u) => !o.has(_.fromAxisSpec(u).toCanonicalString())
+function De(t, e, o, n, l) {
+  const c = t.axesSpec.filter(
+    (p) => !o.has(F.fromAxisSpec(p).toCanonicalString())
   );
-  if (!r.length)
+  if (!c.length)
     return [];
-  const c = te(e);
-  let i = te(r);
-  if (!c || !i)
-    return r;
-  const p = new Set(c.map(j));
-  return i = i.filter(
-    (u) => {
-      const m = j(u), d = l.get(m);
-      return !(d ? [...d.keys()] : []).some((g) => p.has(g));
+  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), S = l.get(m);
+      return !(S ? [...S.keys()] : []).some((x) => u.has(x));
     }
-  ), i.some((u) => u.length > 1) ? i.flatMap((u) => u) : (i = i.filter(([u]) => !n.has(_.fromAxisSpec(u).toCanonicalString())), i.flatMap((u) => u));
+  ), 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 Ie(t, e) {
+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 r = 0; r < t.length; r++) {
-      const { selectedSource: c, selectedFilterValue: i, selectedFilterRange: p, type: u } = t[r], m = A(c), d = (B(m) ? e.columnsData[c] : e.axesData[c])[l];
-      if (i !== void 0 && (s = s || d === i), p !== void 0 && (p.min !== void 0 || p.max !== void 0) && typeof d == "number") {
-        let x = !0;
-        p.min !== void 0 && (x = x && d >= p.min), p.max !== void 0 && (x = x && d <= p.max), s = s || x;
+    for (let c = 0; c < t.length; c++) {
+      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;
       }
-      u === "subset" && (s = s || d != 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;
   }
@@ -508,20 +512,20 @@ var Q = class {
     throw Error(`Unknown input name: ${String(t)}`);
   }
   changeSelected(t, e, o, n) {
-    const l = o.components[t].selectorStates, s = l.filter((i) => !n.find((p) => p.selectedSource === i.selectedSource)), r = n.filter((i) => !l.find((p) => p.selectedSource === i.selectedSource));
-    let c = ue(o);
-    return s.forEach((i) => {
-      c = this.deleteSelected(t, e, c, i);
-    }), r.forEach((i) => {
-      c = this.addSelected(t, c, i);
+    const l = o.components[t].selectorStates, s = l.filter((a) => !n.find((u) => u.selectedSource === a.selectedSource)), c = n.filter((a) => !l.find((u) => u.selectedSource === a.selectedSource));
+    let r = me(o);
+    return s.forEach((a) => {
+      r = this.deleteSelected(t, e, r, a);
+    }), c.forEach((a) => {
+      r = this.addSelected(t, r, a);
     }), o.components[t].selectorStates = n.map(
-      (i) => o.components[t].selectorStates.find(
-        (p) => p.selectedSource === i.selectedSource
+      (a) => o.components[t].selectorStates.find(
+        (u) => u.selectedSource === a.selectedSource
       )
-    ).filter(Boolean), c;
+    ).filter(Boolean), r;
   }
   switchDividableAxis(t, e) {
-    return ue(t);
+    return me(t);
   }
   async getMustBeConsumedAxes(t, e) {
     return Promise.resolve(/* @__PURE__ */ new Set());
@@ -544,51 +548,51 @@ var Q = class {
   }
   async getSelectedSourcesInfo(t, e, o, n, l) {
     var s;
-    const r = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set(), i = [];
+    const c = /* @__PURE__ */ new Map(), r = /* @__PURE__ */ new Set(), a = [];
     for (const m of this.dataInputs)
-      for (const d of e.components[m].selectorStates) {
-        const x = A(d.selectedSource);
-        if (B(x)) {
-          const g = await t.pFrameProvider.getColumnSpecById(x);
-          g && g.axesSpec.forEach((h) => {
-            const w = _.fromAxisSpec(h).toCanonicalString();
-            c.has(w) || (c.add(w), i.push(h));
+      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));
           });
         }
       }
-    const p = /* @__PURE__ */ new Set();
-    let u = [...c];
-    for (; u.length; ) {
+    const u = /* @__PURE__ */ new Set();
+    let p = [...r];
+    for (; p.length; ) {
       const m = [];
-      for (const d of u)
-        if (n[d]) {
-          const x = Object.keys(n[d]);
-          for (const g of x)
-            !p.has(g) && !c.has(g) && (m.push(g), p.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));
         }
-      u = m;
+      p = m;
     }
-    for (const [m, { selectorStates: d }] of Object.entries(e.components)) {
-      const g = ((s = this.simpleComponentControllers[m]) != null ? s : this.filterComponentControllers[m]).settings.columnsWithExtraAxesAllowed;
-      for (const { selectedSource: h } of d)
-        await Ue(
+    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,
-          h,
-          o[h],
-          r,
-          i,
+          w,
+          o[w],
           c,
-          p,
-          g,
+          a,
+          r,
+          u,
+          x,
           l
         );
     }
-    return r;
+    return c;
   }
   getEmptyInputGuide(t) {
     return {
       components: this.createEmptyComponentsGuide(t),
-      getSourceInfo: (e) => ye(e),
+      getSourceInfo: (e) => ge(e),
       freeOptionsSet: /* @__PURE__ */ new Set(),
       axesToBeFixedSet: /* @__PURE__ */ new Set(),
       readyData: !1,
@@ -606,63 +610,63 @@ var Q = class {
   async getLabelsMap(t, e) {
     const o = await t.pFrameProvider.getColumnsFull(
       this.dataInputs.reduce((n, l) => {
-        const r = e.components[l].selectorStates.map((c) => A(c.selectedSource));
-        return n.concat(r);
+        const c = e.components[l].selectorStates.map((r) => b(r.selectedSource));
+        return n.concat(c);
       }, []),
       !1
     );
-    return Oe(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 = Ye) {
+  async calculateOptions(t, e, o = [], n = Xe) {
     var l, s;
-    const r = this.createEmptyComponentsGuide(e), c = this.getConsumedOptionsSet(e), i = new Set(this.ignoredOptionIdNames), p = new Set(o), { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = await this.getLabelsMap(t, e), x = await this.getSelectedSourcesInfo(t, e, d, u, m), g = /* @__PURE__ */ new Map(), h = { ...this.simpleComponentControllers, ...this.filterComponentControllers }, w = /* @__PURE__ */ new Set();
-    for (const [y, f] of Object.entries(h)) {
-      const v = 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,
-        d,
-        c,
-        u,
+        S,
+        r,
+        p,
         m,
         n,
-        i,
-        p
+        a,
+        u
       );
-      this.dataInputs.includes(y) || v.options.forEach((P) => {
-        w.add(P.value);
+      this.dataInputs.includes(y) || g.options.forEach((A) => {
+        v.add(A.value);
       });
-      for (const [P, O] of v.optionsInfo)
-        g.set(P, O);
-      r[y] = v;
+      for (const [A, P] of g.optionsInfo)
+        x.set(A, P);
+      c[y] = g;
     }
     const D = (y) => {
-      const f = g.get(y);
+      const f = x.get(y);
       f && f.kind === "axis" && (f.mustBeConsumed = !0);
-      const v = x.get(y);
-      v && v.kind === "axis" && (v.mustBeConsumed = !0);
-    }, b = await this.getMustBeConsumedAxes(t, e);
-    for (const y of b)
+      const g = h.get(y);
+      g && g.kind === "axis" && (g.mustBeConsumed = !0);
+    }, B = await this.getMustBeConsumedAxes(t, e);
+    for (const y of B)
       D(y);
     if (this.dontAllowUnfilteredHighCardinality) {
-      const y = (v) => {
-        var P;
-        return ((P = v == null ? void 0 : v.annotations) == null ? void 0 : P[Ne]) === "true";
-      }, f = (s = (l = e.components.filters) == null ? void 0 : l.selectorStates.reduce((v, P) => {
-        const O = x.get(P.selectedSource);
-        return (O == null ? void 0 : O.kind) === "column" && O.spec.axesSpec.filter(y).forEach((L) => v.add(_.fromAxisSpec(L).toCanonicalString())), (O == null ? void 0 : O.kind) === "axis" && y(O.spec) && v.add(_.fromAxisSpec(O.spec).toCanonicalString()), v;
+      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((v) => {
-        for (const { selectedSource: P } of e.components[v].selectorStates) {
-          const O = x.get(P);
-          if ((O == null ? void 0 : O.kind) === "column" && O.spec.axesSpec.filter(y).forEach((L) => {
-            const E = _.fromAxisSpec(L).toCanonicalString();
-            !w.has(E) && !f.has(E) && w.add(E), f.has(E) || D(E);
-          }), (O == null ? void 0 : O.kind) === "axis" && y(O.spec)) {
-            const N = _.fromAxisSpec(O.spec).toCanonicalString();
-            w.has(N) || w.add(N), f.has(N) || D(N);
+      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);
           }
         }
       });
@@ -670,85 +674,85 @@ var Q = class {
     const C = /* @__PURE__ */ new Set();
     for (const { selectorStates: y } of Object.values(e.components))
       for (const { selectedSource: f } of y) {
-        const v = x.get(f);
-        v && v.kind === "column" && v.axesToBeFixed.forEach((P) => {
-          C.add(P);
+        const g = h.get(f);
+        g && g.kind === "column" && g.axesToBeFixed.forEach((A) => {
+          C.add(A);
         });
       }
-    const a = await this.isConsistent(t, e, u, m), S = (y) => {
-      var f, v, P;
-      const O = (f = A(y).toCanonicalString()) != null ? f : y;
-      return (P = (v = g.get(O)) != null ? v : x.get(O)) != null ? P : ye(y);
+    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: r,
-      getSourceInfo: S,
-      freeOptionsSet: w,
+      components: c,
+      getSourceInfo: i,
+      freeOptionsSet: v,
       axesToBeFixedSet: C,
       readyData: this.readyDataInputs(e),
-      ready: this.readyForPlotBuilding(t, e, a, w, S),
-      consistent: a
+      ready: this.readyForPlotBuilding(t, e, d, v, i),
+      consistent: d
     };
   }
   async getUniqueSourceValuesWithLabels(t, e, o, n, l, s) {
-    var r;
-    const c = (u) => u.sort((m, d) => m.label.localeCompare(d.label, "en", { numeric: !0 })), i = e.getSourceInfo(o), p = (r = i.annotations) == null ? void 0 : r[Ee];
+    var c;
+    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 u = p ? JSON.parse(p).map((m) => String(m)) : null;
-      if (u) {
-        const m = u.map((d) => ({ value: d, label: d }));
-        return c(m), { values: m, overflow: !1 };
+      const p = u ? JSON.parse(u).map((m) => String(m)) : null;
+      if (p) {
+        const m = p.map((S) => ({ value: S, label: S }));
+        return r(m), { values: m, overflow: !1 };
       }
     } catch {
-      console.error(`Parsing error: discrete values annotation ${p} in ${o}`);
+      console.error(`Parsing error: discrete values annotation ${u} in ${o}`);
     }
-    if (i.kind === "axis") {
-      const u = A(o), m = i.parentSources.map(A), d = await k(t, o, i.parentSources);
-      let x = [];
-      if (d) {
-        l && (x = [{
+    if (a.kind === "axis") {
+      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: d.name
+            id: S.name
           },
           predicate: {
             operator: "StringIContains",
             substring: l
           }
-        }]), s && (x = [{
+        }]), s && (h = [{
           type: "bySingleColumnV2",
           column: {
             type: "axis",
-            id: u.toPFrameId()
+            id: p.toPFrameId()
           },
           predicate: {
             operator: "StringIContains",
             substring: s
           }
         }]);
-        const { data: D, axesData: b } = await t.pFrameProvider.getSingleColumnData(d, x), C = b[u.toCanonicalString()], a = [];
-        for (let S = 0; S < Math.min(C.length, n ?? C.length); S++)
-          a.push({ value: String(C[S]), label: String(D[S]) });
-        return c(a), { values: a, overflow: !(n === void 0 || C.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",
-          id: u.toPFrameId()
+          id: p.toPFrameId()
         },
         predicate: {
           operator: "StringIContains",
-          substring: g
+          substring: x
         }
       }]);
-      const h = await t.pFrameProvider.getAxisUniqueValues(u, [m[0]], n, x), w = h.values.map((D) => ({ value: String(D), label: String(D) }));
-      return c(w), { values: w, overflow: h.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 (i.kind === "column") {
-      const u = l ?? s, m = A(o), d = u ? [{
+    if (a.kind === "column") {
+      const p = l ?? s, m = b(o), S = p ? [{
         type: "bySingleColumnV2",
         column: {
           type: "column",
@@ -756,10 +760,10 @@ var Q = class {
         },
         predicate: {
           operator: "StringIContains",
-          substring: u
+          substring: p
         }
-      }] : [], x = await t.pFrameProvider.getColumnUniqueValues(m, n, d), g = x.values.map((h) => ({ value: String(h), label: String(h) }));
-      return c(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 };
   }
@@ -780,7 +784,7 @@ var Q = class {
   async isConsistent(t, e, o, n) {
     const l = await this.checkStateConsistency(t, e, o, n);
     for (const s of l.values())
-      if (Object.values(s).some((r) => !r))
+      if (Object.values(s).some((c) => !c))
         return !1;
     return !0;
   }
@@ -791,31 +795,31 @@ var Q = class {
     if (!o || !this.readyDataInputs(e))
       return !1;
     let s = !1;
-    for (const c of n) {
-      const i = l(c);
-      if (i && i.kind === "axis" && i.mustBeConsumed) {
+    for (const r of n) {
+      const a = l(r);
+      if (a && a.kind === "axis" && a.mustBeConsumed) {
         s = !0;
         break;
       }
     }
-    let r = !1;
-    for (const { selectorStates: c } of Object.values(e.components)) {
-      for (const { selectedSource: i, fixedAxes: p } of c) {
-        const u = l(i);
-        if (u && u.kind === "column" && u.axesToBeFixed.some(
+    let c = !1;
+    for (const { selectorStates: r } of Object.values(e.components)) {
+      for (const { selectedSource: a, fixedAxes: u } of r) {
+        const p = l(a);
+        if (p && p.kind === "column" && p.axesToBeFixed.some(
           (m) => {
-            var d;
-            return ((d = (p ?? []).find((x) => x.axisSource === m)) == null ? void 0 : d.axisValue) === void 0;
+            var S;
+            return ((S = (u ?? []).find((h) => h.axisSource === m)) == null ? void 0 : S.axisValue) === void 0;
           }
         )) {
-          r = !0;
+          c = !0;
           break;
         }
       }
-      if (r)
+      if (c)
         break;
     }
-    return this.requiredComponents.every((c) => e.components[c].selectorStates.length > 0) && !s && !r;
+    return this.requiredComponents.every((r) => e.components[r].selectorStates.length > 0) && !s && !c;
   }
   async createDataForPlot(t, e) {
     return {
@@ -823,21 +827,21 @@ var Q = class {
       settings: await this.createChartSettings(t, e)
     };
   }
-}, Je = (t) => {
+}, Ze = (t) => {
   var e;
-  return ((e = t == null ? void 0 : t.annotations) == null ? void 0 : e[he]) === "true";
-}, De = class Be {
+  return ((e = t == null ? void 0 : t.annotations) == null ? void 0 : e[ve]) === "true";
+}, Pe = class Oe {
   constructor({
     componentName: e,
     allowedTypes: o,
     settings: n,
     strictlyDependsOnParents: l,
     dependsOn: s = [],
-    parentComponents: r = [],
-    annotations: c = {},
-    checkSourceBySpec: i
+    parentComponents: c = [],
+    annotations: r = {},
+    checkSourceBySpec: a
   }) {
-    this.componentName = e, this.allowedTypes = [...o], this.settings = { ...Be.DefaultSettings, ...n }, this.dependsOn = [...s], this.parentComponents = [...r], this.strictlyDependsOnParents = l ?? !0, this.annotations = { ...c }, i && (this.checkSourceBySpec = i);
+    this.componentName = e, this.allowedTypes = [...o], this.settings = { ...Oe.DefaultSettings, ...n }, this.dependsOn = [...s], this.parentComponents = [...c], this.strictlyDependsOnParents = l ?? !0, this.annotations = { ...r }, a && (this.checkSourceBySpec = a);
   }
   get isRequired() {
     return this.settings.required;
@@ -846,93 +850,93 @@ var Q = class {
     return this.settings.dimensionConsumer;
   }
   addSelected(e, o) {
-    const n = ue(e);
+    const n = me(e);
     return n.components[this.componentName].selectorStates.push(o), n;
   }
   deleteSelected(e, o) {
-    const n = ue(e);
+    const n = me(e);
     return n.components[this.componentName].selectorStates = n.components[this.componentName].selectorStates.filter((l) => l.selectedSource !== o), n;
   }
   async checkStateConsistency(e, o, n, l) {
-    const s = o.components[this.componentName], { parentAxes: r, linkerAxes: c } = await this.getAllowedAxes(e, o, n);
-    function i(u) {
-      const m = _.fromAxisSpec(u).toCanonicalString();
-      return r.has(m) || c.has(m);
+    const s = o.components[this.componentName], { parentAxes: c, linkerAxes: r } = await this.getAllowedAxes(e, o, n);
+    function a(p) {
+      const m = F.fromAxisSpec(p).toCanonicalString();
+      return c.has(m) || r.has(m);
     }
-    const p = await Promise.all(
-      s.selectorStates.map(async ({ selectedSource: u }) => {
-        const m = A(u);
-        if (B(m)) {
-          const d = await e.pFrameProvider.getColumnSpecById(m);
-          if (!d)
+    const u = await Promise.all(
+      s.selectorStates.map(async ({ selectedSource: p }) => {
+        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 d.axesSpec.every((g) => i(g));
+            return S.axesSpec.every((x) => a(x));
           if (this.settings.columnsWithExtraAxesAllowed && !this.settings.isDataComponent) {
-            if (d.axesSpec.some((h) => i(h)))
+            if (S.axesSpec.some((w) => a(w)))
               return !0;
-            const g = te(d.axesSpec);
-            return g ? g.some((h) => l.has(j(h))) : !1;
+            const x = oe(S.axesSpec);
+            return x ? x.some((w) => l.has(j(w))) : !1;
           } else
-            return r.size === 0 || d.axesSpec.some((g) => i(g));
+            return c.size === 0 || S.axesSpec.some((x) => a(x));
         }
-        return r.has(u);
+        return c.has(p);
       })
     );
     return s.selectorStates.reduce(
-      (u, m, d) => (u[m.selectedSource] = p[d], u),
+      (p, m, S) => (p[m.selectedSource] = u[S], p),
       {}
     );
   }
   async getProducingAxes(e, o) {
-    const s = o.components[this.componentName].selectorStates.map((i) => A(i.selectedSource)).filter((i) => B(i)), r = /* @__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((i) => e.pFrameProvider.getColumnSpecById(i))
-    )).forEach((i) => {
-      i && i.axesSpec.forEach((p) => {
-        r.add(_.fromAxisSpec(p).toCanonicalString());
+      s.map((a) => e.pFrameProvider.getColumnSpecById(a))
+    )).forEach((a) => {
+      a && a.axesSpec.forEach((u) => {
+        c.add(F.fromAxisSpec(u).toCanonicalString());
       });
-    }), r;
+    }), c;
   }
   getParentSelectedSources(e, o) {
     return this.parentComponents.reduce((l, s) => {
-      const r = o.components[s].selectorStates.map(
-        (c) => A(c.selectedSource)
+      const c = o.components[s].selectorStates.map(
+        (r) => b(r.selectedSource)
       );
-      return l.push(...r), l;
+      return l.push(...c), l;
     }, []);
   }
   async getParentAxes(e, o) {
     var n;
     const l = this.getParentSelectedSources(e, o), s = /* @__PURE__ */ new Set();
-    for (const r of l)
-      if (B(r)) {
-        const c = await e.pFrameProvider.getColumnSpecById(r);
-        (n = c == null ? void 0 : c.axesSpec) == null || n.forEach((i) => {
-          const p = _.fromAxisSpec(i);
-          s.add(p.toCanonicalString());
+    for (const c of l)
+      if (O(c)) {
+        const r = await e.pFrameProvider.getColumnSpecById(c);
+        (n = r == null ? void 0 : r.axesSpec) == null || n.forEach((a) => {
+          const u = F.fromAxisSpec(a);
+          s.add(u.toCanonicalString());
         });
       }
     return s;
   }
   async getAllowedAxes(e, o, n) {
-    var l, s, r, c, i, p, u;
-    const m = this.getParentSelectedSources(e, o), d = /* @__PURE__ */ new Set(), x = [], g = /* @__PURE__ */ new Set(), h = /* @__PURE__ */ new Map();
+    var l, s, c, r, a, u, p;
+    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 (B(D)) {
-        const b = await e.pFrameProvider.getColumnSpecById(D);
-        for (const C of (l = b == null ? void 0 : b.axesSpec) != null ? l : []) {
-          const S = _.fromAxisSpec(C).toCanonicalString();
-          if (d.has(S))
+      if (O(D)) {
+        const B = await e.pFrameProvider.getColumnSpecById(D);
+        for (const C of (l = B == null ? void 0 : B.axesSpec) != null ? l : []) {
+          const i = F.fromAxisSpec(C).toCanonicalString();
+          if (S.has(i))
             continue;
-          d.add(S), x.push(C);
-          const y = Ae(C);
-          h.set(S, {
+          S.add(i), h.push(C);
+          const y = Ie(C);
+          w.set(i, {
             kind: "axis",
             name: C.name,
-            label: await T(e, S, [
+            label: await T(e, i, [
               D.toCanonicalString()
             ]),
             type: C.type,
@@ -941,110 +945,110 @@ var Q = class {
             spec: C,
             annotations: C.annotations,
             isSubsetFilter: ((s = C.annotations) == null ? void 0 : s[$]) === "true",
-            isDiscreteFilter: C.type === "String" || ((r = C.annotations) == null ? void 0 : r[ee]) === "true",
+            isDiscreteFilter: C.type === "String" || ((c = C.annotations) == null ? void 0 : c[te]) === "true",
             parentSources: [D.toCanonicalString()]
           });
         }
       }
-    let w = [...d];
-    for (; w.length; ) {
+    let v = [...S];
+    for (; v.length; ) {
       const D = [];
-      for (const b of w)
-        if (n[b]) {
-          const C = Object.keys(n[b]);
-          for (const a of C)
-            if (!g.has(a)) {
-              D.push(a), g.add(a);
-              const { spec: S, id: y } = n[b][a];
-              for (const f of S.axesSpec) {
-                const v = _.fromAxisSpec(f).toCanonicalString();
-                h.has(v) || h.set(v, {
+      for (const B of v)
+        if (n[B]) {
+          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 g = F.fromAxisSpec(f).toCanonicalString();
+                w.has(g) || w.set(g, {
                   kind: "axis",
                   name: f.name,
-                  label: (i = (c = f.annotations) == null ? void 0 : c[xe]) != null ? i : "",
+                  label: (a = (r = f.annotations) == null ? void 0 : r[we]) != null ? a : "",
                   type: f.type,
                   mustBeConsumed: !1,
                   dividable: !1,
                   spec: f,
                   annotations: f.annotations,
-                  isSubsetFilter: ((p = f.annotations) == null ? void 0 : p[$]) === "true",
-                  isDiscreteFilter: f.type === "String" || ((u = f.annotations) == null ? void 0 : u[ee]) === "true",
+                  isSubsetFilter: ((u = f.annotations) == null ? void 0 : u[$]) === "true",
+                  isDiscreteFilter: f.type === "String" || ((p = f.annotations) == null ? void 0 : p[te]) === "true",
                   parentSources: [y.toCanonicalString()]
                 });
               }
             }
         }
-      w = D;
+      v = D;
     }
-    return { parentAxes: d, parentAxesList: x, linkerAxes: g, optionsInfo: h };
-  }
-  async getOptions(e, o, n, l, s, r, c, i = /* @__PURE__ */ new Set(), p = /* @__PURE__ */ new Set()) {
-    var u, m, d, x, g;
-    const h = this.settings.multipleSelectors, w = this.settings.required, D = await this.checkStateConsistency(e, o, s, r);
-    if (this.dependsOn.length && this.dependsOn.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: h, required: w, 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: h, required: w, 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((O) => !l.has(O.toCanonicalString())), { parentAxes: a, linkerAxes: S, parentAxesList: y, optionsInfo: f } = await this.getAllowedAxes(e, o, s), v = o.components[this.componentName], P = [];
+    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, 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 a) {
-        const N = A(O), L = f.get(N.toCanonicalString()), E = 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 = i.has(N.name) || p.has(N.toCanonicalString()), ne = v.selectorStates.some((oe) => oe.selectedSource === O);
-        E && F && G && M && K && !Z && !ne && P.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 N of C) {
-        const L = N.toCanonicalString(), E = A(L), F = await e.pFrameProvider.getColumnSpecById(E);
-        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 = be(
-          F,
+        const G = De(
+          _,
           y,
-          a,
-          S,
-          r
-        ).map((q) => _.fromAxisSpec(q).toCanonicalString()), M = new Set(G);
+          d,
+          i,
+          c
+        ).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
-          Fe(F) || Je(F) || this.checkSourceBySpec && !this.checkSourceBySpec(F, o) || this.settings.isDataComponent && !c(F) || O && G.length > 0 || b.length && G.length > 0 && !F.axesSpec.some((q) => {
-            const U = _.fromAxisSpec(q).toCanonicalString();
-            return a.has(U) || S.has(U);
+          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 = (u = F == null ? void 0 : F.axesSpec) == null ? void 0 : u.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 = (d = n[L]) != null ? d : await T(e, N.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(E.toCanonicalString(), U);
+          f.set(N.toCanonicalString(), U);
         }
-        const ne = i.has(E.name) || p.has(E.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 && P.push({ value: L });
+        !se && !le && A.push({ value: L });
       }
     }
-    return { multipleSelectors: h, required: w, stateConsistency: D, options: P, optionsInfo: f };
+    return { multipleSelectors: w, required: v, stateConsistency: D, options: A, optionsInfo: f };
   }
 };
-De.DefaultSettings = {
+Pe.DefaultSettings = {
   isDataComponent: !1,
   multipleSelectors: !1,
   required: !1,
@@ -1054,7 +1058,7 @@ De.DefaultSettings = {
   columnsWithExtraAxesAllowed: !0,
   dimensionConsumer: !1
 };
-var I = De, Qe = {
+var I = Pe, et = {
   type: "bubble",
   components: {
     valueSize: { type: "simple", selectorStates: [] },
@@ -1068,20 +1072,20 @@ var I = De, Qe = {
   },
   dividedAxes: {}
 };
-function ae(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 r = o.map((c) => {
-      const i = c.toCanonicalString();
-      return B(c) ? t.columnsData[i][s] : t.axesData[i][s];
+    const c = o.map((r) => {
+      const a = r.toCanonicalString();
+      return O(r) ? t.columnsData[a][s] : t.axesData[a][s];
     }).join(", ");
-    l.push(r);
+    l.push(c);
   }
   return l;
 }
-var Ze = class extends Q {
+var tt = class extends Z {
   constructor() {
     super({
       valueSize: new I({
@@ -1186,141 +1190,142 @@ var Ze = 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, r = (n = e.components.valueSize.selectorStates[0]) == null ? void 0 : n.selectedSource;
-    if (!s || !r)
+    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 c = A(s), i = A(r);
-    if (!c || !i || !B(c) && !B(i))
+    const r = b(s), a = b(c);
+    if (!r || !a || !O(r) && !O(a))
       throw Error("Value column is not valid");
-    const p = {
+    const u = {
       type: "columns",
       id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
+    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), S = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], x = Y(d), g = d.map((F) => A(F.selectedSource)).filter(B), h = [c, i].filter(B), w = h.map((F) => F.toCanonicalString()), D = await J(t, w), 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
-    ], C = [], a = h.map(() => []), S = [], y = [];
-    for (const { selectedSource: F, fixedAxes: G } of d)
+    ], C = [], d = w.map(() => []), i = [], y = [];
+    for (const { selectedSource: _, fixedAxes: G } of S)
       y.push(...await V(
         t,
-        u,
+        p,
         m,
         D,
-        F,
+        _,
         G
-      )), a.push(
+      )), 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) {
-        C.push(A(G)), S.push(
-          (M ?? []).map(({ axisIdx: Z, axisValue: ne }) => ({ idx: Z, value: ne }))
+    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,
-          u,
+          p,
           m,
           D,
           G,
           M
         ));
-        const K = await k(t, G, w);
+        const K = await k(t, G, v);
         K && C.push(K);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [...h, ...y, ...g],
+      [...w, ...y, ...x],
       C,
-      x,
+      h,
       !0,
-      a,
-      S
+      d,
+      i
     );
-    C.forEach((F) => {
-      const G = F.toCanonicalString();
-      p.values[G] = B(F) ? f.columnsData[G] : f.axesData[G];
-    }), p.values[s] = B(c) ? f.columnsData[s] : f.axesData[s], p.values[r] = B(i) ? f.columnsData[r] : f.axesData[r];
-    const v = e.components.x.selectorStates.map((F) => F.selectedSource), P = v.join(", "), O = await Promise.all(v.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, w)) == null ? void 0 : G.toCanonicalString()) != null ? M : F;
+        return (M = (G = await k(t, _, v)) == null ? void 0 : G.toCanonicalString()) != null ? M : _;
       }
     ));
-    p.values[P] = ae(f, v), p.values.xLabels = ae(f, O);
-    const N = e.components.y.selectorStates.map((F) => F.selectedSource), L = N.join(", "), E = await Promise.all(N.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, w)) == null ? void 0 : G.toCanonicalString()) != null ? M : F;
+        return (M = (G = await k(t, _, v)) == null ? void 0 : G.toCanonicalString()) != null ? M : _;
       }
     ));
-    return p.values[L] = ae(f, N), p.values.yLabels = ae(f, E), { byColumns: p };
+    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 r = A(l), c = A(s);
-    if (!B(r) && !B(c))
+    const c = b(l), r = b(s);
+    if (!O(c) && !O(r))
       throw Error("Value column is not valid");
-    const i = [r, c].filter(B).map((C) => C.toCanonicalString()), p = {
+    const a = [c, r].filter(O).map((C) => C.toCanonicalString()), u = {
       type: "column",
       value: l,
       label: await T(t, l, [])
-    }, u = {
+    }, p = {
       type: "column",
       value: s,
       label: await T(t, s, [])
-    }, d = e.components.x.selectorStates.map(({ selectedSource: C }) => C).join(", "), g = e.components.y.selectorStates.map(({ selectedSource: C }) => C).join(", "), h = await Promise.all(e.components.facetBy.selectorStates.map(async (C) => {
-      var a, S;
+    }, 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: (S = (a = await k(t, C.selectedSource, i)) == null ? void 0 : a.toCanonicalString()) != null ? S : C.selectedSource
+        value: (i = (d = await k(t, C.selectedSource, a)) == null ? void 0 : d.toCanonicalString()) != null ? i : C.selectedSource
       };
-    })), w = (await Promise.all(e.components.x.selectorStates.map((C) => T(t, C.selectedSource, i)))).join(", "), D = (await Promise.all(e.components.y.selectorStates.map((C) => T(t, C.selectedSource, i)))).join(", "), b = await Promise.all(
+    })), 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 a, S;
-        const y = C.selectedSource;
+        var d, i, y, f;
+        const g = C.selectedSource, A = await J(t, g, a);
         return {
           type: "column",
-          label: await T(t, y, i) || y,
-          value: y,
-          valueLabels: (S = (a = await k(t, y, i)) == null ? void 0 : a.toCanonicalString()) != null ? S : y
+          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%"
         };
       })
     );
     return {
       type: "bubble",
-      valueColor: p,
-      valueSize: u,
+      valueColor: u,
+      valueSize: p,
       xColumn: {
         type: "column",
-        value: d,
-        label: w,
+        value: S,
+        label: v,
         valueLabels: "xLabels"
       },
       yColumn: {
         type: "column",
-        value: g,
+        value: x,
         label: D,
         valueLabels: "yLabels"
       },
-      facetBy: h,
+      facetBy: w,
       tooltips: {
         show: !0,
-        content: b
+        content: B
       }
     };
   }
-}, et = {
+}, nt = {
   type: "histogram",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -1330,7 +1335,7 @@ var Ze = class extends Q {
     facetBy: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, tt = class extends Q {
+}, ot = class extends Z {
   constructor() {
     super(
       {
@@ -1399,85 +1404,85 @@ var Ze = 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 (!B(s))
+    const s = b(l);
+    if (!O(s))
       throw Error("Value column is not valid");
-    const r = {
+    const c = {
       type: "columns",
       id: (n = z(e.components)) != null ? n : "",
       values: {}
-    }, { linkerColumnsMap: c, compositeLinkerMap: i } = await X(t), p = [
+    }, { linkerColumnsMap: r, compositeLinkerMap: a } = await X(t), u = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], u = Y(p), m = p.map((a) => A(a.selectedSource)).filter(B), d = [l], x = await J(t, d), g = [e.components.facetBy, e.components.grouping], h = [], w = [[]], D = [], b = [];
-    for (const { selectedSource: a, fixedAxes: S } of p)
-      b.push(
-        ...await V(t, c, i, x, a, S)
-      ), w.push(
-        (S ?? []).map(({ axisIdx: y, axisValue: f }) => ({ idx: y, value: f }))
+    ], 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, h, d, i)
+      ), v.push(
+        (i ?? []).map(({ axisIdx: y, axisValue: f }) => ({ idx: y, value: f }))
       );
-    for (const a of g)
-      for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
-        h.push(A(S)), D.push(
-          (y ?? []).map(({ axisIdx: v, axisValue: P }) => ({ idx: v, value: P }))
-        ), b.push(
-          ...await V(t, c, i, x, S, y)
+    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, h, i, y)
         );
-        const f = await k(t, S, d);
-        f && h.push(f);
+        const f = await k(t, i, S);
+        f && w.push(f);
       }
     const C = await t.pFrameProvider.getTableOuterJoin(
-      [s, ...b, ...m],
-      h,
-      u,
-      !0,
+      [s, ...B, ...m],
       w,
+      p,
+      !0,
+      v,
       D
     );
-    return h.forEach((a) => {
-      const S = a.toCanonicalString();
-      r.values[S] = B(a) ? C.columnsData[S] : C.axesData[S];
-    }), r.values[s.toCanonicalString()] = C.columnsData[s.toCanonicalString()], { byColumns: r };
+    return w.forEach((d) => {
+      const i = d.toCanonicalString();
+      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 (!B(s))
+    const s = b(l);
+    if (!O(s))
       throw Error("Value column is not valid");
-    const r = [l], c = {
+    const c = [l], r = {
       type: "column",
       value: l,
       label: await T(t, l, [])
-    }, i = await Promise.all(
-      e.components.facetBy.selectorStates.map(async (u) => {
-        var m, d;
+    }, a = await Promise.all(
+      e.components.facetBy.selectorStates.map(async (p) => {
+        var m, S;
         return {
           type: "column",
-          value: (d = (m = await k(t, u.selectedSource, r)) == null ? void 0 : m.toCanonicalString()) != null ? d : u.selectedSource
+          value: (S = (m = await k(t, p.selectedSource, c)) == null ? void 0 : m.toCanonicalString()) != null ? S : p.selectedSource
         };
       })
     );
-    let p;
+    let u;
     if (e.components.grouping.selectorStates.length) {
-      const { selectedSource: u } = e.components.grouping.selectorStates[0];
-      p = {
+      const { selectedSource: p } = e.components.grouping.selectorStates[0];
+      u = {
         type: "column",
-        value: u,
-        label: await T(t, u, r),
-        valueLabels: (n = await k(t, u, r)) == null ? void 0 : n.toCanonicalString()
+        value: p,
+        label: await T(t, p, c),
+        valueLabels: (n = await k(t, p, c)) == null ? void 0 : n.toCanonicalString()
       };
     }
     return {
       type: "histogram",
-      valueColumn: c,
-      facetBy: i,
-      grouping: p
+      valueColumn: r,
+      facetBy: a,
+      grouping: u
     };
   }
-}, nt = {
+}, st = {
   type: "discrete",
   components: {
     y: { type: "simple", selectorStates: [] },
@@ -1488,7 +1493,7 @@ var Ze = class extends Q {
     secondaryGrouping: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, ot = class extends Q {
+}, lt = class extends Z {
   constructor() {
     super(
       {
@@ -1562,115 +1567,115 @@ var Ze = class extends Q {
   }
   async createDataByColumns(t, e) {
     var o;
-    const n = e.components.y.selectorStates[0].selectedSource, l = A(n);
-    if (!n || !B(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",
       id: (o = z(e.components)) != null ? o : "",
       values: {}
-    }, { linkerColumnsMap: r, compositeLinkerMap: c } = await X(t), i = [
+    }, { linkerColumnsMap: c, compositeLinkerMap: r } = await X(t), a = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], p = Y(i), u = i.map((C) => A(C.selectedSource)).filter(B), m = [n], d = await J(t, m), x = [e.components.primaryGrouping, e.components.secondaryGrouping, e.components.facetBy], g = [], h = [[]], w = [], D = [];
-    for (const { selectedSource: C, fixedAxes: a } of i)
+    ], 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,
-        r,
         c,
-        d,
+        r,
+        S,
         C,
-        a
-      )), h.push(
-        (a ?? []).map(({ axisIdx: S, axisValue: y }) => ({ idx: S, value: y }))
+        d
+      )), w.push(
+        (d ?? []).map(({ axisIdx: i, axisValue: y }) => ({ idx: i, value: y }))
       );
-    for (const C of x)
-      for (const { selectedSource: a, fixedAxes: S } of C.selectorStates) {
-        g.push(A(a)), w.push(
-          (S ?? []).map(({ axisIdx: f, axisValue: v }) => ({ idx: f, value: v }))
+    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,
-          r,
           c,
+          r,
+          S,
           d,
-          a,
-          S
+          i
         ));
-        const y = await k(t, a, m);
-        y && g.push(y);
+        const y = await k(t, d, m);
+        y && x.push(y);
       }
-    const b = await t.pFrameProvider.getTableOuterJoin(
-      [l, ...D, ...u],
-      g,
-      p,
+    const B = await t.pFrameProvider.getTableOuterJoin(
+      [l, ...D, ...p],
+      x,
+      u,
       !0,
-      h,
-      w
+      w,
+      v
     );
-    return g.forEach((C) => {
-      const a = C.toCanonicalString();
-      s.values[a] = B(C) ? b.columnsData[a] : b.axesData[a];
-    }), s.values[l.toCanonicalString()] = b.columnsData[l.toCanonicalString()], { byColumns: s };
+    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 || !B(s))
+    const l = e.components.y.selectorStates[0].selectedSource, s = b(l);
+    if (!l || !O(s))
       throw Error("Y column is not valid");
-    const r = {
+    const c = {
       type: "column",
       value: l,
       label: await T(t, l, [])
-    }, c = [l];
-    let i;
+    }, r = [l];
+    let a;
     if (e.components.primaryGrouping.selectorStates.length) {
       const { selectedSource: m } = e.components.primaryGrouping.selectorStates[0];
-      i = {
+      a = {
         columnName: {
           type: "column",
           value: m,
-          label: await T(t, m, c),
+          label: await T(t, m, r),
           valueLabels: (o = await k(
             t,
             m,
-            c
+            r
           )) == null ? void 0 : o.toCanonicalString()
         }
       };
     }
-    let p;
+    let u;
     if (e.components.secondaryGrouping.selectorStates.length) {
       const { selectedSource: m } = e.components.secondaryGrouping.selectorStates[0];
-      p = {
+      u = {
         columnName: {
           type: "column",
           value: m,
-          label: await T(t, m, c),
+          label: await T(t, m, r),
           valueLabels: (n = await k(
             t,
             m,
-            c
+            r
           )) == null ? void 0 : n.toCanonicalString()
         }
       };
     }
-    const u = await Promise.all(e.components.facetBy.selectorStates.map(async (m) => {
-      var d, x;
+    const p = await Promise.all(e.components.facetBy.selectorStates.map(async (m) => {
+      var S, h;
       return {
         type: "column",
-        value: (x = (d = await k(t, m.selectedSource, c)) == null ? void 0 : d.toCanonicalString()) != null ? x : m.selectedSource,
-        label: await T(t, m.selectedSource, c)
+        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)
       };
     }));
     return {
       type: "discrete",
-      y: r,
-      primaryGrouping: i,
-      secondaryGrouping: p,
-      facetBy: u
+      y: c,
+      primaryGrouping: a,
+      secondaryGrouping: u,
+      facetBy: p
     };
   }
-}, st = {
+}, at = {
   type: "heatmap",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -1687,23 +1692,23 @@ var Ze = class extends Q {
   },
   dividedAxes: {}
 };
-function pe(t) {
+function de(t) {
   return t ? "kind" in t && t.kind === "PColumn" ? t.valueType === "String" : t.type === "String" : !0;
 }
-function re(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 r = o.map((c) => {
-      const i = c.toCanonicalString();
-      return B(c) ? t.columnsData[i][s] : t.axesData[i][s];
+    const c = o.map((r) => {
+      const a = r.toCanonicalString();
+      return O(r) ? t.columnsData[a][s] : t.axesData[a][s];
     }).join(", ");
-    l.push(r);
+    l.push(c);
   }
   return l;
 }
-var lt = class extends Q {
+var rt = class extends Z {
   constructor() {
     super(
       {
@@ -1747,7 +1752,7 @@ var lt = 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;
           }
@@ -1774,7 +1779,7 @@ var lt = class extends Q {
             dimensionConsumer: !0,
             multipleSelectors: !0,
             axesAllowed: !0,
-            columnsAllowed: !1
+            columnsAllowed: !0
           },
           dependsOn: ["y"],
           checkSourceBySpec: (t, e) => {
@@ -1782,7 +1787,7 @@ var lt = 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;
           }
@@ -1825,9 +1830,9 @@ var lt = 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({
@@ -1844,9 +1849,9 @@ var lt = 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());
           }
         })
       },
@@ -1883,25 +1888,25 @@ var lt = 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 (!B(s))
+    const s = b(l);
+    if (!O(s))
       throw Error("Value column is not valid");
-    const r = {
+    const c = {
       type: "columns",
       id: (n = z(e.components)) != null ? n : "",
       values: {}
-    }, { linkerColumnsMap: c, compositeLinkerMap: i } = await X(t), p = [
+    }, { linkerColumnsMap: r, compositeLinkerMap: a } = await X(t), u = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], u = Y(p), m = p.map((L) => A(L.selectedSource)).filter(B), d = [l], x = await J(t, d), 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,
@@ -1910,113 +1915,113 @@ var lt = class extends Q {
       e.components.xGroupBy,
       e.components.yGroupBy,
       e.components.tooltipContent
-    ], h = [], w = [[]], D = [], b = [];
-    for (const { selectedSource: L, fixedAxes: E } of p)
-      b.push(...await V(
+    ], w = [], v = [[]], D = [], B = [];
+    for (const { selectedSource: L, fixedAxes: N } of u)
+      B.push(...await V(
         t,
-        c,
-        i,
-        x,
+        r,
+        a,
+        h,
         L,
-        E
-      )), w.push(
-        (E ?? []).map(({ axisIdx: F, axisValue: G }) => ({ idx: F, value: G }))
+        N
+      )), v.push(
+        (N ?? []).map(({ axisIdx: _, axisValue: G }) => ({ idx: _, value: G }))
       );
-    for (const L of g)
-      for (const { selectedSource: E, fixedAxes: F } of L.selectorStates) {
-        h.push(A(E)), D.push(
-          (F ?? []).map(({ axisIdx: M, axisValue: K }) => ({ idx: M, value: K }))
-        ), b.push(...await V(
+    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,
-          c,
-          i,
-          x,
-          E,
-          F
+          r,
+          a,
+          h,
+          N,
+          _
         ));
-        const G = await k(t, E, d);
-        G && h.push(G);
+        const G = await k(t, N, S);
+        G && w.push(G);
       }
     const C = await t.pFrameProvider.getTableOuterJoin(
-      [s, ...b, ...m],
-      h,
-      u,
-      !0,
+      [s, ...B, ...m],
       w,
+      p,
+      !0,
+      v,
       D
     );
-    h.forEach((L) => {
-      const E = L.toCanonicalString();
-      r.values[E] = B(L) ? C.columnsData[E] : C.axesData[E];
-    }), r.values[s.toCanonicalString()] = C.columnsData[s.toCanonicalString()];
-    const a = e.components.x.selectorStates.concat(e.components.xGroupBy.selectorStates).map((L) => L.selectedSource), S = a.join(", ");
-    r.values[S] = re(C, a);
+    w.forEach((L) => {
+      const N = L.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] = ie(C, d);
     const y = e.components.x.selectorStates.map((L) => L.selectedSource), f = await Promise.all(
       y.map(
         async (L) => {
-          var E, F;
-          return (F = (E = await k(t, L, d)) == null ? void 0 : E.toCanonicalString()) != null ? F : L;
+          var N, _;
+          return (_ = (N = await k(t, L, S)) == null ? void 0 : N.toCanonicalString()) != null ? _ : L;
         }
       )
     );
-    r.values.xLabelsKey = re(C, f);
-    const v = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map((L) => L.selectedSource), P = v.join(", ");
-    r.values[P] = re(C, v);
-    const O = e.components.y.selectorStates.map((L) => L.selectedSource), N = 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 E, F;
-          return (F = (E = await k(t, L, d)) == null ? void 0 : E.toCanonicalString()) != null ? F : L;
+          var N, _;
+          return (_ = (N = await k(t, L, S)) == null ? void 0 : N.toCanonicalString()) != null ? _ : L;
         }
       )
     );
-    return r.values.yLabelsKey = re(C, N), { byColumns: r };
+    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 (!B(l))
+    const l = b(n);
+    if (!O(l))
       throw Error("Value column is not valid");
-    const s = [n], r = {
+    const s = [n], c = {
       type: "column",
       value: n,
       label: await T(t, n, [])
-    }, i = e.components.x.selectorStates.concat(e.components.xGroupBy.selectorStates).map(({ selectedSource: a }) => A(a)).map((a) => a.toCanonicalString()).join(", "), u = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map(({ selectedSource: a }) => A(a)).map((a) => a.toCanonicalString()).join(", "), m = await Promise.all(
-      e.components.facetBy.selectorStates.map(async (a) => {
-        var S, y;
+    }, 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, y;
         return {
           type: "column",
-          value: (y = (S = await k(t, a.selectedSource, s)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
+          value: (y = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? y : d.selectedSource
         };
       })
-    ), d = await Promise.all(
-      e.components.xGroupBy.selectorStates.map(async (a) => {
-        var S, y;
+    ), S = await Promise.all(
+      e.components.xGroupBy.selectorStates.map(async (d) => {
+        var i, y;
         return {
           type: "column",
-          label: await T(t, a.selectedSource, s),
-          value: a.selectedSource,
-          valueLabels: (y = (S = await k(t, a.selectedSource, s)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
+          label: await T(t, d.selectedSource, s),
+          value: d.selectedSource,
+          valueLabels: (y = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? y : d.selectedSource
         };
       })
-    ), x = await Promise.all(
-      e.components.yGroupBy.selectorStates.map(async (a) => {
-        var S, y;
+    ), h = await Promise.all(
+      e.components.yGroupBy.selectorStates.map(async (d) => {
+        var i, y;
         return {
           type: "column",
-          label: await T(t, a.selectedSource, s),
-          value: a.selectedSource,
-          valueLabels: (y = (S = await k(t, a.selectedSource, s)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
+          label: await T(t, d.selectedSource, s),
+          value: 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), h = await Promise.all(
-      e.components.annotationsX.selectorStates.map(async (a) => {
-        var S, y;
-        const f = a.selectedSource, v = A(f), P = B(v) ? await t.pFrameProvider.getColumnSpecById(v) : (y = (S = g == null ? void 0 : g.axesSpec) == null ? void 0 : S.find(
-          (O) => _.fromAxisSpec(O).toCanonicalString() === f
+    ), x = await t.pFrameProvider.getColumnSpecById(l), w = await Promise.all(
+      e.components.annotationsX.selectorStates.map(async (d) => {
+        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",
@@ -2025,14 +2030,14 @@ var lt = class extends Q {
             value: f,
             label: await T(t, f, s)
           },
-          type: pe(P) ? "discrete" : "continuous"
+          type: de(A) ? "discrete" : "continuous"
         };
       })
-    ), w = await Promise.all(
-      e.components.annotationsY.selectorStates.map(async (a) => {
-        var S, y;
-        const f = a.selectedSource, v = A(f), P = B(v) ? await t.pFrameProvider.getColumnSpecById(v) : (y = (S = g == null ? void 0 : g.axesSpec) == null ? void 0 : S.find(
-          (O) => _.fromAxisSpec(O).toCanonicalString() === f
+    ), v = await Promise.all(
+      e.components.annotationsY.selectorStates.map(async (d) => {
+        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",
@@ -2041,56 +2046,57 @@ var lt = class extends Q {
             value: f,
             label: await T(t, f, s)
           },
-          type: pe(P) ? "discrete" : "continuous"
+          type: de(A) ? "discrete" : "continuous"
         };
       })
     ), D = (await Promise.all(
       e.components.x.selectorStates.map(
-        (a) => T(t, a.selectedSource, s)
+        (d) => T(t, d.selectedSource, s)
       )
-    )).join(", "), b = (await Promise.all(
+    )).join(", "), B = (await Promise.all(
       e.components.y.selectorStates.map(
-        (a) => T(t, a.selectedSource, s)
+        (d) => T(t, d.selectedSource, s)
       )
     )).join(", "), C = await Promise.all(
-      e.components.tooltipContent.selectorStates.map(async (a) => {
-        var S, y;
-        const f = a.selectedSource;
+      e.components.tooltipContent.selectorStates.map(async (d) => {
+        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: (y = (S = await k(t, f, s)) == null ? void 0 : S.toCanonicalString()) != null ? y : 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: r,
-      valueType: pe(g) ? "discrete" : "continuous",
+      valueColumn: c,
+      valueType: de(x) ? "discrete" : "continuous",
       xColumn: {
         type: "column",
-        value: i,
+        value: a,
         label: D,
         valueLabels: "xLabelsKey"
       },
       yColumn: {
         type: "column",
-        value: u,
-        label: b,
+        value: p,
+        label: B,
         valueLabels: "yLabelsKey"
       },
       facetBy: m,
-      xGroupBy: d,
-      yGroupBy: x,
-      annotations: [...h, ...w],
+      xGroupBy: S,
+      yGroupBy: h,
+      annotations: [...w, ...v],
       tooltips: {
         show: !0,
         content: C
       }
     };
   }
-}, at = {
+}, ct = {
   type: "scatterplot",
   components: {
     x: { type: "simple", selectorStates: [] },
@@ -2106,7 +2112,7 @@ var lt = class extends Q {
     tooltipContent: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, rt = class extends Q {
+}, it = class extends Z {
   constructor() {
     super(
       {
@@ -2247,38 +2253,38 @@ var lt = 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 r = l.axesSpec.map((u) => _.fromAxisSpec(u).toCanonicalString()), c = s.axesSpec.map((u) => _.fromAxisSpec(u).toCanonicalString()), i = r.filter((u) => !c.some((m) => m === u)), p = c.filter((u) => !r.some((m) => m === u));
-    return /* @__PURE__ */ new Set([...i, ...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) {
     var o, n, l;
-    const s = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, r = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource;
-    if (!s || !r)
+    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 c = A(s), i = A(r), p = {
+    const r = b(s), a = b(c), u = {
       type: "columns",
       id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
+    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), S = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], x = Y(d), g = d.map((v) => A(v.selectedSource)).filter(B), h = [c, i].filter(B).map((v) => v.toCanonicalString());
-    if (h.length === 0)
+    ], 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 w = await J(t, h), D = [c, i, ...g], b = [], C = [[], []], a = [], S = [];
-    for (const { selectedSource: v, fixedAxes: P } of d)
-      S.push(...await V(
+    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,
-        u,
+        p,
         m,
-        w,
         v,
-        P
+        g,
+        A
       )), C.push(
-        (P ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
+        (A ?? []).map(({ axisIdx: P, axisValue: E }) => ({ idx: P, value: E }))
       );
     const y = [
       e.components.grouping,
@@ -2289,114 +2295,118 @@ var lt = class extends Q {
       e.components.label,
       e.components.highlight
     ];
-    for (const v of y)
-      for (const { selectedSource: P, fixedAxes: O } of v.selectorStates) {
-        b.push(A(P)), a.push(
-          (O ?? []).map(({ axisIdx: L, axisValue: E }) => ({ idx: L, value: E }))
-        ), S.push(...await V(
+    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,
-          u,
+          p,
           m,
-          w,
-          P,
-          O
+          v,
+          A,
+          P
         ));
-        const N = await k(t, P, h);
-        N && b.push(N);
+        const E = await k(t, A, w);
+        E && B.push(E);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [c, i, ...S, ...g],
-      b,
-      x,
+      [r, a, ...i, ...x],
+      B,
+      h,
       !1,
       C,
-      a
+      d
     );
-    return [...D, ...b].forEach((v) => {
-      const P = v.toCanonicalString();
-      p.values[P] = B(v) ? f.columnsData[P] : f.axesData[P];
-    }), p.values.key = new Array(p.values[Object.keys(p.values)[0]].length).fill(0).map((v, P) => P), e.components.highlight.selectorStates.length && (p.values.highlight = Ie(e.components.highlight.selectorStates, f)), { byColumns: p };
+    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;
-    const r = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource, i = r ? A(r) : null, p = c ? A(c) : null;
-    if (!r || !c || !i || !p || !B(i) && !B(p))
+    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 ? 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 u = [i, p].filter(B).map((a) => a.toCanonicalString()), m = {
+    const m = [u, p].filter(O).map((i) => i.toCanonicalString()), S = {
       type: "column",
       value: r,
-      label: await T(t, r, u)
-    }, d = {
+      label: await T(t, r, m)
+    }, h = {
       type: "column",
-      value: c,
-      label: await T(t, c, u)
+      value: a,
+      label: await T(t, a, m)
     }, x = {
       type: "column",
       value: "key"
-    }, g = await Promise.all(
-      e.components.facetBy.selectorStates.map(async (a) => {
-        var S, y;
+    }, w = await Promise.all(
+      e.components.facetBy.selectorStates.map(async (i) => {
+        var y, f;
         return {
           type: "column",
-          value: (y = (S = await k(t, a.selectedSource, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
+          value: (f = (y = await k(t, i.selectedSource, m)) == null ? void 0 : y.toCanonicalString()) != null ? f : i.selectedSource
         };
       })
-    ), h = ie.uniq([
-      ...e.components.grouping.selectorStates.map((a) => a.selectedSource),
-      ...e.components.size.selectorStates.map((a) => a.selectedSource),
-      ...e.components.shape.selectorStates.map((a) => a.selectedSource)
-    ]), w = await Promise.all(
-      h.map(async (a) => {
-        var S, y;
+    ), 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(
+      v.map(async (i) => {
+        var y, f;
         return {
-          type: "column",
-          label: await T(t, a, u) || a,
-          value: a,
-          valueLabels: (y = (S = await k(t, a, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a
+          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
+          }
         };
       })
-    ), D = await Promise.all(
-      e.components.tooltipContent.selectorStates.map(async (a) => {
-        var S, y;
-        const f = a.selectedSource;
+    ), B = await Promise.all(
+      e.components.tooltipContent.selectorStates.map(async (i) => {
+        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, f, u) || f,
-          value: f,
-          valueLabels: (y = (S = await k(t, f, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : f
+          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 b;
+    let C;
     if (e.components.label.selectorStates.length) {
-      const a = e.components.label.selectorStates[0].selectedSource;
-      b = {
+      const i = e.components.label.selectorStates[0].selectedSource, y = await J(t, i, m);
+      C = {
         type: "column",
-        value: a,
-        label: await T(t, a, u),
-        valueLabels: (s = (l = await k(t, a, u)) == null ? void 0 : l.toCanonicalString()) != null ? s : a
+        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 = y == null ? void 0 : y.annotations) == null ? void 0 : c[ne]
       };
     }
-    let C;
-    return e.components.highlight.selectorStates.length && (C = {
+    let d;
+    return e.components.highlight.selectorStates.length && (d = {
       type: "column",
       value: "highlight"
     }), {
       type: "scatterplot",
-      x: m,
-      y: d,
+      x: S,
+      y: h,
       keyColumn: x,
-      facetBy: g,
-      grouping: w,
-      label: b,
-      highlight: C,
+      facetBy: w,
+      grouping: D,
+      label: C,
+      highlight: d,
       tooltips: {
         show: !0,
-        content: D
+        content: B
       }
     };
   }
-}, ct = {
+}, ut = {
   type: "scatterplot-umap",
   components: {
     x: { type: "simple", selectorStates: [] },
@@ -2411,7 +2421,7 @@ var lt = class extends Q {
     size: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, it = class extends Q {
+}, pt = class extends Z {
   constructor() {
     super(
       {
@@ -2541,41 +2551,41 @@ var lt = 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 r = l.axesSpec.map((u) => _.fromAxisSpec(u).toCanonicalString()), c = s.axesSpec.map((u) => _.fromAxisSpec(u).toCanonicalString()), i = r.filter((u) => !c.some((m) => m === u)), p = c.filter((u) => !r.some((m) => m === u));
-    return /* @__PURE__ */ new Set([...i, ...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) {
     var o, n, l;
-    const s = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, r = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource;
-    if (!s || !r)
+    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 c = A(s), i = A(r);
-    if (!c || !i)
+    const r = b(s), a = b(c);
+    if (!r || !a)
       throw Error("X or Y column is not valid");
-    const p = {
+    const u = {
       type: "columns",
       id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
+    }, { linkerColumnsMap: p, compositeLinkerMap: m } = await X(t), S = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], x = Y(d), g = d.map((v) => A(v.selectedSource)).filter(B), h = [c, i].filter(B).map((v) => v.toCanonicalString());
-    if (h.length === 0)
+    ], 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 w = await J(t, h), D = [c, i, ...g], b = [], C = [[], []], a = [], S = [];
-    for (const { selectedSource: v, fixedAxes: P } of d)
-      S.push(...await V(
+    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,
-        u,
+        p,
         m,
-        w,
         v,
-        P
+        g,
+        A
       )), C.push(
-        (P ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
+        (A ?? []).map(({ axisIdx: P, axisValue: E }) => ({ idx: P, value: E }))
       );
     const y = [
       e.components.grouping,
@@ -2585,116 +2595,120 @@ var lt = class extends Q {
       e.components.highlight,
       e.components.size
     ];
-    for (const v of y)
-      for (const { selectedSource: P, fixedAxes: O } of v.selectorStates) {
-        b.push(A(P)), a.push(
-          (O ?? []).map(({ axisIdx: L, axisValue: E }) => ({ idx: L, value: E }))
-        ), S.push(...await V(
+    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,
-          u,
+          p,
           m,
-          w,
-          P,
-          O
+          v,
+          A,
+          P
         ));
-        const N = await k(t, P, h);
-        N && b.push(N);
+        const E = await k(t, A, w);
+        E && B.push(E);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [c, i, ...S, ...g],
-      b,
-      x,
+      [r, a, ...i, ...x],
+      B,
+      h,
       !1,
       C,
-      a
+      d
     );
-    return [...D, ...b].forEach((v) => {
-      const P = v.toCanonicalString();
-      p.values[P] = B(v) ? f.columnsData[P] : f.axesData[P];
-    }), e.components.highlight.selectorStates.length && (p.values.highlight = Ie(e.components.highlight.selectorStates, f)), {
-      byColumns: p,
+    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
     };
   }
   async createChartSettings(t, e) {
-    var o, n, l, s;
-    const r = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource, i = r ? A(r) : null, p = c ? A(c) : null;
-    if (!r || !c || !i || !p || !B(i) && !B(p))
+    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 ? 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 u = [i, p].filter(B).map((a) => a.toCanonicalString()), m = {
+    const m = [u, p].filter(O).map((i) => i.toCanonicalString()), S = {
       type: "column",
       value: r,
-      label: await T(t, r, u)
-    }, d = {
+      label: await T(t, r, m)
+    }, h = {
       type: "column",
-      value: c,
-      label: await T(t, c, u)
+      value: a,
+      label: await T(t, a, m)
     }, x = {
       type: "column",
       value: "key"
-    }, g = await Promise.all(
-      e.components.facetBy.selectorStates.map(async (a) => {
-        var S, y;
+    }, w = await Promise.all(
+      e.components.facetBy.selectorStates.map(async (i) => {
+        var y, f;
         return {
           type: "column",
-          value: (y = (S = await k(t, a.selectedSource, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
+          value: (f = (y = await k(t, i.selectedSource, m)) == null ? void 0 : y.toCanonicalString()) != null ? f : i.selectedSource
         };
       })
-    ), h = ie.uniq([
-      ...e.components.grouping.selectorStates.map((a) => a.selectedSource),
-      ...e.components.size.selectorStates.map((a) => a.selectedSource)
-    ]), w = await Promise.all(
-      h.map(async (a) => {
-        var S, y;
+    ), v = pe.uniq([
+      ...e.components.grouping.selectorStates.map((i) => i.selectedSource),
+      ...e.components.size.selectorStates.map((i) => i.selectedSource)
+    ]), D = await Promise.all(
+      v.map(async (i) => {
+        var y, f;
         return {
-          type: "column",
-          label: await T(t, a, u) || a,
-          value: a,
-          valueLabels: (y = (S = await k(t, a, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a
+          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
+          }
         };
       })
-    ), D = await Promise.all(
-      e.components.tooltipContent.selectorStates.map(async (a) => {
-        var S, y;
-        const f = a.selectedSource;
+    ), B = await Promise.all(
+      e.components.tooltipContent.selectorStates.map(async (i) => {
+        var y, f, g;
+        const A = i.selectedSource, P = await J(t, A, m);
         return {
           type: "column",
-          label: await T(t, f, u) || f,
-          value: f,
-          valueLabels: (y = (S = await k(t, f, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : f
+          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 b;
+    let C;
     if (e.components.label.selectorStates.length) {
-      const a = e.components.label.selectorStates[0].selectedSource;
-      b = {
+      const i = e.components.label.selectorStates[0].selectedSource, y = await J(t, i, m);
+      C = {
         type: "column",
-        value: a,
-        label: await T(t, a, u),
-        valueLabels: (s = (l = await k(t, a, u)) == null ? void 0 : l.toCanonicalString()) != null ? s : a
+        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 = y == null ? void 0 : y.annotations) == null ? void 0 : c[ne]
       };
     }
-    let C;
-    return e.components.highlight.selectorStates.length && (C = {
+    let d;
+    return e.components.highlight.selectorStates.length && (d = {
       type: "column",
       value: "highlight"
     }), {
       type: "scatterplot-umap",
-      x: m,
-      y: d,
+      x: S,
+      y: h,
       keyColumn: x,
-      facetBy: g,
-      grouping: w,
-      label: b,
-      highlight: C,
+      facetBy: w,
+      grouping: D,
+      label: C,
+      highlight: d,
       tooltips: {
         show: !0,
-        content: D
+        content: B
       }
     };
   }
-}, me = "pl7.app/dendrogram/nodeId", de = "id", ut = {
+}, Se = "pl7.app/dendrogram/nodeId", ye = "id", mt = {
   type: "dendro",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -2714,7 +2728,7 @@ var lt = class extends Q {
     heatmapGroup: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, pt = class extends Q {
+}, dt = class extends Z {
   constructor() {
     super(
       {
@@ -2898,23 +2912,23 @@ var lt = class extends Q {
           }
         })
       }
-    ), this.ignoredOptionIdNames = [me];
+    ), this.ignoredOptionIdNames = [Se];
   }
   readyDataInputs(t) {
     return t.components.value.selectorStates.length > 0;
   }
   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 || !B(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: r, compositeLinkerMap: c } = await X(t), i = Y([
+    const { linkerColumnsMap: c, compositeLinkerMap: r } = await X(t), a = Y([
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ]), p = [
-      ...e.components.filters.selectorStates.map((a) => A(a.selectedSource)),
-      ...e.components.tabBy.selectorStates.map((a) => A(a.selectedSource))
-    ].filter(B), u = [l], m = await J(t, u), d = [], x = [], g = [], h = [e.components.value], w = [
+    ]), u = [
+      ...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,
@@ -2923,71 +2937,71 @@ var lt = class extends Q {
       e.components.nodeShape,
       e.components.lineColor
     ], D = {};
-    for (const a of h)
-      for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
-        g.push(...await V(
+    for (const d of w)
+      for (const { selectedSource: i, fixedAxes: y } of d.selectorStates) {
+        x.push(...await V(
           t,
-          r,
           c,
+          r,
           m,
-          S,
+          i,
           y
         ));
-        const f = await k(t, S, u), v = f ?? A(S);
-        D[v.toCanonicalString()] = S, d.push(v);
+        const f = await k(t, i, p), g = f ?? b(i);
+        D[g.toCanonicalString()] = i, S.push(g);
       }
-    for (const a of w)
-      for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
-        g.push(...await V(
+    for (const d of v)
+      for (const { selectedSource: i, fixedAxes: y } of d.selectorStates) {
+        x.push(...await V(
           t,
-          r,
           c,
+          r,
           m,
-          S,
+          i,
           y
         ));
-        const f = await k(t, S, u), v = f ?? A(S);
-        D[S] = v.toCanonicalString(), x.push(v);
+        const f = await k(t, i, p), g = f ?? b(i);
+        D[i] = g.toCanonicalString(), h.push(g);
       }
-    const b = await t.pFrameProvider.getTableOuterJoin(
-      [...d, ...p, ...g],
-      x,
-      i,
+    const B = await t.pFrameProvider.getTableOuterJoin(
+      [...S, ...u, ...x],
+      h,
+      a,
       !1
     );
-    for (const a of [...d, ...x]) {
-      const S = a.toCanonicalString(), y = D[a.toCanonicalString()];
+    for (const d of [...S, ...h]) {
+      const i = d.toCanonicalString(), y = D[d.toCanonicalString()];
       n[y] = {
-        data: B(a) ? b.columnsData[S] : b.axesData[S],
-        spec: B(a) ? b.columnSpecs[S] : b.axesSpecs[S],
-        label: await T(t, y, u)
+        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 C = Object.keys(b.axesData).find(
-      (a) => {
-        var S;
-        return ((S = A(a)) == null ? void 0 : S.name) === me;
+    const C = Object.keys(B.axesData).find(
+      (d) => {
+        var i;
+        return ((i = b(d)) == null ? void 0 : i.name) === Se;
       }
     );
-    return C ? n[de] = {
-      data: b.axesData[C],
+    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, r = (n = e.components.heatmapAnnotation.selectorStates[0]) == null ? void 0 : n.selectedSource, c = A(s), i = r ? A(r) : null;
-    if (!s || !B(c))
+    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 p = {
+    const u = {
       type: "columns",
       id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, u = [
+    }, p = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], m = Y(u), d = u.map((y) => A(y.selectedSource)).filter(B), x = [c, i].filter(B).map((y) => y.toCanonicalString()), g = [], h = [], w = [], 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,
@@ -3003,150 +3017,150 @@ var lt = class extends Q {
       e.components.heatmapGroup,
       e.components.tableContent
     ];
-    for (const y of b)
-      for (const { selectedSource: f, fixedAxes: v } of y.selectorStates) {
-        g.push(A(f)), w.push(
-          (v ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
+    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 P = await k(t, f, x);
-        P && g.push(P);
+        const A = await k(t, f, h);
+        A && x.push(A);
       }
-    u.forEach(({ fixedAxes: y }) => {
-      w.push(
-        (y ?? []).map(({ axisIdx: f, axisValue: v }) => ({ idx: f, value: v }))
+    p.forEach(({ fixedAxes: y }) => {
+      v.push(
+        (y ?? []).map(({ axisIdx: f, axisValue: g }) => ({ idx: f, value: g }))
       );
     });
     for (const y of C)
-      for (const { selectedSource: f, fixedAxes: v } of y.selectorStates) {
-        h.push(A(f)), D.push(
-          (v ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
+      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 P = await k(t, f, x);
-        P && h.push(P);
+        const A = await k(t, f, h);
+        A && w.push(A);
       }
-    const a = await t.pFrameProvider.getTableOuterJoin(
-      [...g, ...d],
-      h,
+    const d = await t.pFrameProvider.getTableOuterJoin(
+      [...x, ...S],
+      w,
       m,
       !1,
-      w,
+      v,
       D
     );
-    [...g, ...h].forEach((y) => {
-      const f = y.toCanonicalString(), v = B(y) ? a.columnsData[f] : a.axesData[f];
-      p.values[f] = [], p.values[f] = v;
+    [...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 S = Object.keys(a.axesData).find(
+    const i = Object.keys(d.axesData).find(
       (y) => {
         var f;
-        return ((f = A(y)) == null ? void 0 : f.name) === me;
+        return ((f = b(y)) == null ? void 0 : f.name) === Se;
       }
     );
-    return S ? p.values[de] = a.axesData[S] : console.warn("Missed node id axis in data column"), { byColumns: p };
+    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, r = A(s);
-    if (!s || !B(r))
+    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 c = [s], i = { type: "column", value: de }, p = { type: "column", value: s }, u = 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, d = {};
+    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 w = e.components.nodeColor.selectorStates[0].selectedSource;
-      d.nodeColor = {
+      const v = e.components.nodeColor.selectorStates[0].selectedSource;
+      S.nodeColor = {
         columnName: {
           type: "column",
-          value: w,
-          label: await T(t, w, c)
+          value: v,
+          label: await T(t, v, r)
         }
       };
     }
     if (e.components.nodeShape.selectorStates.length) {
-      const w = e.components.nodeShape.selectorStates[0].selectedSource;
-      d.nodeShape = {
+      const v = e.components.nodeShape.selectorStates[0].selectedSource;
+      S.nodeShape = {
         columnName: {
           type: "column",
-          value: w,
-          label: await T(t, w, c)
+          value: v,
+          label: await T(t, v, r)
         }
       };
     }
     if (e.components.nodeSize.selectorStates.length) {
-      const w = e.components.nodeSize.selectorStates[0].selectedSource;
-      d.nodeSize = {
+      const v = e.components.nodeSize.selectorStates[0].selectedSource;
+      S.nodeSize = {
         columnName: {
           type: "column",
-          value: w,
-          label: await T(t, w, c)
+          value: v,
+          label: await T(t, v, r)
         }
       };
     }
     if (e.components.lineColor.selectorStates.length) {
-      const w = e.components.lineColor.selectorStates[0].selectedSource;
-      d.lineColor = {
+      const v = e.components.lineColor.selectorStates[0].selectedSource;
+      S.lineColor = {
         columnName: {
           type: "column",
-          value: w,
-          label: await T(t, w, c)
+          value: v,
+          label: await T(t, v, r)
         }
       };
     }
-    let x, g, h;
+    let h, x, w;
     if (e.components.heatmapAnnotation.selectorStates.length && e.components.heatmapAxis.selectorStates.length) {
-      const w = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
-      x = {
+      const v = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
+      h = {
         type: "column",
-        value: w,
-        label: await T(t, w, []),
-        valueLabels: (n = await k(t, w, [])) == 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, [w]),
-        valueLabels: (l = await k(t, D, [w])) == null ? void 0 : l.toCanonicalString()
-      }, h = await Promise.all(
-        e.components.heatmapGroup.selectorStates.map(async (b) => {
+        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 C;
           return {
             type: "column",
-            value: b.selectedSource,
-            label: await T(t, b.selectedSource, [w]),
-            valueLabels: (C = await k(t, b.selectedSource, [w])) == null ? void 0 : C.toCanonicalString()
+            value: B.selectedSource,
+            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 w = e.components.heatmapForSequence.selectorStates[0].selectedSource;
-      x = {
+      const v = e.components.heatmapForSequence.selectorStates[0].selectedSource;
+      h = {
         type: "column",
-        value: w,
-        label: await T(t, w, [])
+        value: v,
+        label: await T(t, v, [])
       };
     }
     return {
       type: "dendro",
-      id: i,
-      parentId: p,
-      height: u,
+      id: a,
+      parentId: u,
+      height: p,
       labels: m,
-      aes: d,
-      heatmapAnnotation: x,
-      heatmapAxis: g,
-      heatmapGroup: h
+      aes: S,
+      heatmapAnnotation: h,
+      heatmapAxis: x,
+      heatmapGroup: w
     };
   }
-}, ge = 1e6;
-function ce(t, e) {
+}, he = 1e6;
+function ue(t, e) {
   if (t === "String")
     return e.data;
   const o = new Array(e.data.length);
   for (let n = 0; n < e.data.length; n++)
-    o[n] = _e(e, n, { absent: null, na: null });
+    o[n] = Te(e, n, { absent: null, na: null });
   return o;
 }
 var H = !1;
-var mt = class {
+var St = class {
   constructor(t, e) {
     this.pframeHandle = t, this.pframeDriver = e;
   }
@@ -3167,19 +3181,19 @@ var mt = class {
         },
         filters: e,
         sorting: []
-      }), l = n.filter((r) => r.spec.type === "axis"), s = n.filter((r) => r.spec.type === "column");
+      }), l = n.filter((c) => c.spec.type === "axis"), s = n.filter((c) => c.spec.type === "column");
       return {
-        axesData: l.reduce((r, c) => {
-          const i = _.fromAxisSpec(c.spec.spec);
-          return r[i.toCanonicalString()] = ce(i.type, c.data), r;
+        axesData: l.reduce((c, r) => {
+          const a = F.fromAxisSpec(r.spec.spec);
+          return c[a.toCanonicalString()] = ue(a.type, r.data), c;
         }, {}),
-        data: s.length ? ce(t.type, s[0].data) : []
+        data: s.length ? ue(t.type, s[0].data) : []
       };
     } catch (o) {
       throw console.error("PFrame: calculateTableData error"), o;
     }
   }
-  async getColumnUniqueValues(t, e = ge, o = []) {
+  async getColumnUniqueValues(t, e = he, o = []) {
     if (!await this.isColumnExisted(t))
       return { values: [], overflow: !1 };
     const n = {
@@ -3189,25 +3203,25 @@ var mt = class {
     };
     try {
       const l = Date.now(), s = await this.pframeDriver.getUniqueValues(this.pframeHandle, n);
-      let r = !1;
-      return s.overflow && (r = !0, console.warn(`More than ${e} values for ${t.name} column`)), {
+      let c = !1;
+      return s.overflow && (c = !0, console.warn(`More than ${e} values for ${t.name} column`)), {
         values: Array.from(s.values.data).map(String),
-        overflow: r
+        overflow: c
       };
     } catch (l) {
       throw console.error("PFrame: getUniqueValues for column error"), l;
     }
   }
-  async getAxisUniqueValues(t, e, o = ge, n = []) {
-    const l = e.filter(B), s = await Promise.all(l.map((i) => this.getColumnSpecById(i))), r = t.toCanonicalString(), c = l.filter((i, p) => {
-      const u = s[p];
-      return u !== null && u.axesSpec.some((m) => _.fromAxisSpec(m).toCanonicalString() === r);
+  async getAxisUniqueValues(t, e, o = he, n = []) {
+    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) => F.fromAxisSpec(m).toCanonicalString() === c);
     });
-    if (c.length === 0)
+    if (r.length === 0)
       return { values: [], overflow: !1 };
     try {
-      const i = Date.now(), p = await Promise.all(
-        c.map(
+      const a = Date.now(), u = await Promise.all(
+        r.map(
           (m) => this.pframeDriver.getUniqueValues(this.pframeHandle, {
             columnId: m.name,
             axis: t.toPFrameId(),
@@ -3216,58 +3230,58 @@ var mt = class {
           })
         )
       );
-      let u = !1;
-      return p.forEach((m, d) => {
-        m.overflow && (u = !0, console.warn(`More than ${o} values for ${c[d].name} column`));
+      let p = !1;
+      return u.forEach((m, S) => {
+        m.overflow && (p = !0, console.warn(`More than ${o} values for ${r[S].name} column`));
       }), {
-        values: ie.uniq(
-          ie.flatten(p.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: u
+        overflow: p
       };
-    } catch (i) {
-      throw console.error("PFrame: getUniqueValues for axis error", i), i;
+    } catch (a) {
+      throw console.error("PFrame: getUniqueValues for axis error", a), a;
     }
   }
   async getTableOuterJoin(t, e, o = [], n = !0, l = [], s = []) {
-    const r = t.filter(B), c = e.filter(B), i = {
+    const c = t.filter(O), r = e.filter(O), a = {
       src: {
         type: "outer",
         primary: {
           type: n ? "inner" : "full",
-          entries: r.map((p, u) => {
+          entries: c.map((u, p) => {
             var m;
-            const d = (m = l[u]) == 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 d != null && d.length ? {
+              axisIndex: h.idx,
+              constant: h.value
+            })).filter((h) => h.constant !== void 0);
+            return S != null && S.length ? {
               type: "slicedColumn",
-              newId: p.name,
-              column: p.name,
-              axisFilters: d
+              newId: u.name,
+              column: u.name,
+              axisFilters: S
             } : {
               type: "column",
-              column: p.name
+              column: u.name
             };
           })
         },
-        secondary: c.map((p, u) => {
+        secondary: r.map((u, p) => {
           var m;
-          const d = (m = s[u]) == 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 d != null && d.length ? {
+            axisIndex: h.idx,
+            constant: h.value
+          })).filter((h) => h.constant !== void 0);
+          return S != null && S.length ? {
             type: "slicedColumn",
-            newId: p.name,
-            column: p.name,
-            axisFilters: d
+            newId: u.name,
+            column: u.name,
+            axisFilters: S
           } : {
             type: "column",
-            column: p.name
+            column: u.name
           };
         })
       },
@@ -3275,33 +3289,33 @@ var mt = class {
       sorting: []
     };
     try {
-      const p = Date.now(), u = await this.pframeDriver.calculateTableData(this.pframeHandle, i), m = u.filter((x) => x.spec.type === "axis"), d = u.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 h = _.fromAxisSpec(g.spec.spec);
-          return x[h.toCanonicalString()] = ce(h.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: d.reduce((x, g) => {
-          const h = g.spec.spec, w = new W({
-            name: g.spec.id,
-            type: h.valueType
+        columnsData: S.reduce((h, x) => {
+          const w = x.spec.spec, v = new W({
+            name: x.spec.id,
+            type: w.valueType
           });
-          return x[w.toCanonicalString()] = ce(w.type, g.data), x;
+          return h[v.toCanonicalString()] = ue(v.type, x.data), h;
         }, {}),
-        columnSpecs: d.reduce((x, g) => {
-          const h = g.spec.spec, w = new W({
-            name: g.spec.id,
-            type: h.valueType
+        columnSpecs: S.reduce((h, x) => {
+          const w = x.spec.spec, v = new W({
+            name: x.spec.id,
+            type: w.valueType
           });
-          return x[w.toCanonicalString()] = h, x;
+          return h[v.toCanonicalString()] = w, h;
         }, {}),
-        axesSpecs: m.reduce((x, g) => {
-          const h = g.spec.spec, w = _.fromAxisSpec(h);
-          return x[w.toCanonicalString()] = h, x;
+        axesSpecs: m.reduce((h, x) => {
+          const w = x.spec.spec, v = F.fromAxisSpec(w);
+          return h[v.toCanonicalString()] = w, h;
         }, {})
       };
-    } catch (p) {
-      throw console.error("PFrame: table outer join error"), console.info("error with request: ", i), p;
+    } catch (u) {
+      throw console.error("PFrame: table outer join error"), console.info("error with request: ", a), u;
     }
   }
   async getColumnSpecById(t) {
@@ -3314,15 +3328,15 @@ var mt = 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 (B(l)) {
+      if (O(l)) {
         const s = (o = (e = await this.getColumnSpecById(l)) == null ? void 0 : e.axesSpec) != null ? o : [];
-        n.push(...s.map((r) => _.fromAxisSpec(r).toPFrameId()));
+        n.push(...s.map((c) => F.fromAxisSpec(c).toPFrameId()));
       }
     return n;
   }
@@ -3340,10 +3354,10 @@ var mt = class {
         compatibleWith: await this.getRequestColumnsFromSelectedSources(t),
         strictlyCompatible: e
         // should be true if we want to get meta and false if X/Y
-      }, r = Date.now(), c = await this.pframeDriver.findColumns(this.pframeHandle, s), i = [];
-      return c.hits.forEach((p) => {
-        i.push(p);
-      }), i;
+      }, c = Date.now(), r = await this.pframeDriver.findColumns(this.pframeHandle, s), a = [];
+      return r.hits.forEach((u) => {
+        a.push(u);
+      }), a;
     } catch (s) {
       throw console.error("PFrame: findColumns error"), s;
     }
@@ -3367,56 +3381,56 @@ var mt = class {
         },
         compatibleWith: [],
         strictlyCompatible: !1
-      }, s = Date.now(), r = await this.pframeDriver.findColumns(this.pframeHandle, l), c = [];
-      return r.hits.forEach(({ columnId: i, spec: p }) => {
-        c.push(new W({ name: i, type: p.valueType }));
-      }), c.length > 1 && console.warn(`More than 1 column found for ${t}}`), c.length === 0 ? (console.warn(`No columns found for ${t}}`), null) : c[0];
+      }, s = Date.now(), c = await this.pframeDriver.findColumns(this.pframeHandle, l), r = [];
+      return c.hits.forEach(({ columnId: a, spec: u }) => {
+        r.push(new W({ name: a, type: u.valueType }));
+      }), r.length > 1 && console.warn(`More than 1 column found for ${t}}`), r.length === 0 ? (console.warn(`No columns found for ${t}}`), null) : r[0];
     } catch (l) {
       throw console.error("PFrame: findColumns error"), l;
     }
   }
-}, gt = class {
+}, ht = class {
   constructor(t, e, o = (n, l) => l ?? n) {
-    this.labelsModifier = o, this.pFrameProvider = new mt(t, e);
+    this.labelsModifier = o, this.pFrameProvider = new St(t, e);
   }
-}, Pe = {
+}, _e = {
   controllers: {
-    discrete: new ot(),
-    scatterplot: new rt(),
-    "scatterplot-umap": new it(),
-    heatmap: new lt(),
-    dendro: new pt(),
-    histogram: new tt(),
-    bubble: new Ze()
+    discrete: new lt(),
+    scatterplot: new it(),
+    "scatterplot-umap": new pt(),
+    heatmap: new rt(),
+    dendro: new dt(),
+    histogram: new ot(),
+    bubble: new tt()
   },
   initialStates: {
-    discrete: nt,
-    scatterplot: at,
-    "scatterplot-umap": ct,
-    heatmap: st,
-    dendro: ut,
-    histogram: et,
-    bubble: Qe
+    discrete: st,
+    scatterplot: ct,
+    "scatterplot-umap": ut,
+    heatmap: at,
+    dendro: mt,
+    histogram: nt,
+    bubble: et
   }
 };
-function xt(t) {
-  return Pe.controllers[t];
+function wt(t) {
+  return _e.controllers[t];
 }
-function ht(t) {
-  return Pe.initialStates[t];
+function vt(t) {
+  return _e.initialStates[t];
 }
 export {
-  _ as AxisId,
-  Ze as BubbleStateController,
+  F as AxisId,
+  tt as BubbleStateController,
   W as ColumnId,
-  gt as DemoDataStore,
-  pt as DendroStateController,
-  ot as DiscreteStateController,
-  lt as HeatmapStateController,
-  rt as ScatterplotStateController,
-  A as columnOrAxisIdFromString,
-  xt as getControllerByType,
-  ht as getInitialStateByType,
-  B as isColumnId
+  ht as DemoDataStore,
+  dt as DendroStateController,
+  lt as DiscreteStateController,
+  rt as HeatmapStateController,
+  it as ScatterplotStateController,
+  b as columnOrAxisIdFromString,
+  wt as getControllerByType,
+  vt as getInitialStateByType,
+  O as isColumnId
 };
 //# sourceMappingURL=index.js.map