@milaboratories/graph-maker 1.1.138 → 1.1.139

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 _e, isLabelColumn as Le } from "../../../@platforma-sdk/model/dist/index.js";
+import { canonicalizeJson as j, pTableValue as Te } from "../../pl-model-common/dist/index.js";
+import ue from "../../../lodash/lodash.js";
+var ke = "pl7.app/axisNature", we = "pl7.app/label", Ee = "pl7.app/columnAsAxis/name", Ne = "pl7.app/columnAsAxis/domain", $ = "pl7.app/isSubset", ee = "pl7.app/isDiscreteFilter", Ge = "pl7.app/discreteValues", Me = "pl7.app/graph/axis/highCardinality", qe = "pl7.app/graph/isVirtual", Ce = "pl7.app/isLinkerColumn", pe = "pl7.app/format", _ = class se {
   constructor({ type: e, name: o, domain: n }) {
     this.kind = "axis", this.type = e, this.name = o, this.domain = { ...n };
   }
@@ -28,7 +28,7 @@ var Le = "pl7.app/axisNature", xe = "pl7.app/label", Te = "pl7.app/columnAsAxis/
   static fromPojo(e) {
     return new se(e);
   }
-}, W = class we {
+}, W = class ve {
   constructor({ name: e, type: o }) {
     this.kind = "column", this.name = e, this.type = o;
   }
@@ -36,13 +36,13 @@ 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 ve(e);
   }
 };
-function B(t) {
+function P(t) {
   return t !== null && t.kind === "column";
 }
-function le(t) {
+function ae(t) {
   return t !== null && t.kind === "axis";
 }
 function A(t) {
@@ -53,41 +53,41 @@ function A(t) {
     return _.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; ) {
@@ -117,83 +117,83 @@ function te(t) {
   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 = te(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;
+async function He(t, e, o, n, l, s, c, r = !0, a) {
+  var u, p, m, y;
   const x = A(e);
-  if (B(x)) {
+  if (P(x)) {
     const g = await t.pFrameProvider.getColumnSpecById(x);
     if (!g)
       return;
-    const h = be(
+    const w = De(
       g,
       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) => _.fromAxisSpec(d).toCanonicalString()), C = new Set(w), D = g.axesSpec.map((d) => _.fromAxisSpec(d).toCanonicalString()), B = {};
+    r && D.forEach((d, i) => {
+      C.has(d) && (B[d] = i);
     });
-    const C = {
+    const v = {
       kind: "column",
       name: g.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
+      isSubsetFilter: ((u = g.annotations) == null ? void 0 : u[$]) === "true",
+      isDiscreteFilter: g.valueType === "String" || ((p = g.annotations) == null ? void 0 : p[ee]) === "true",
+      axesToBeFixed: w,
+      axesToBeFixedIndexes: B
     };
-    n.set(x.toCanonicalString(), C);
-    for (const a of g.axesSpec) {
-      const y = _.fromAxisSpec(a).toCanonicalString();
-      if (n.has(y))
+    n.set(x.toCanonicalString(), v);
+    for (const d of g.axesSpec) {
+      const S = _.fromAxisSpec(d).toCanonicalString();
+      if (n.has(S))
         continue;
-      const f = Ae(a), v = {
+      const f = Ie(d), h = {
         kind: "axis",
-        name: a.name,
-        label: await T(t, y, [e]),
-        type: a.type,
+        name: d.name,
+        label: await T(t, S, [e]),
+        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" || ((y = d.annotations) == null ? void 0 : y[ee]) === "true",
         parentSources: [e]
       };
-      n.set(y, v);
+      n.set(S, h);
     }
   }
 }
-function ye(t) {
+function ge(t) {
   const e = A(t), { name: o, type: n } = e;
-  return B(e) ? {
+  return P(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) {
+function Ye(t) {
   const { selectedSource: e, type: o, selectedFilterRange: n, selectedFilterValue: l } = t, s = A(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: ae(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: ae(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: ae(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: ae(s) ? { type: "axis", id: s.toPFrameId() } : {
         type: "column",
         id: s.name
       },
@@ -274,74 +274,78 @@ 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()
+    if (P(s)) {
+      const c = await t.pFrameProvider.getColumnSpecById(s), r = ((n = c == null ? void 0 : c.axesSpec) != null ? n : []).find(
+        (a) => _.fromAxisSpec(a).toCanonicalString() === e.toCanonicalString()
       );
-      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))
+  if (P(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 le(t, e, o) {
+  const n = A(e), l = await k(t, e, o);
+  let s;
+  return P(n) ? s = await t.pFrameProvider.getColumnSpecById(l ?? n) : s = l ? await t.pFrameProvider.getColumnSpecById(l) : await be(t, n, o), s;
 }
 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 le(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;
 }
-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 = _.fromAxisSpec(c).toCanonicalString(), u = _.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;
@@ -350,41 +354,41 @@ async function J(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)
+    if (P(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 = _.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((y) => t[y][n[y]].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,78 +402,78 @@ 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));
+    { [Ce]: "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 = A(l);
+  if (!P(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 C = _.fromAxisSpec(w).toCanonicalString();
+      return !(s != null && s.some((D) => D.axisSource === C));
     }
-  ), 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) => _.fromAxisSpec(w).toCanonicalString())), p = a.filter((w) => {
+    const C = _.fromAxisSpec(w).toCanonicalString();
+    return !u.has(C);
   });
-  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 m = te(n), y = te(p);
+  if (!m || !y)
+    throw Error(`Can't create axes tree for ${r.name}`);
   const x = new Set(m.map(j)), g = /* @__PURE__ */ new Set();
-  return d.forEach((h) => {
-    var w;
-    const D = j(h);
+  return y.forEach((w) => {
+    var C;
+    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((S) => x.has(S));
+      if (!d)
+        throw Error(`Can't find composite linker column for ${r.name}, ${D}`);
+      const i = (C = o.get(D)) == null ? void 0 : C.get(d);
+      g.add(i.toCanonicalString());
+    } else if (w.length === 1) {
+      const B = _.fromAxisSpec(w[0]).toCanonicalString();
+      Qe(e, u, B).forEach((d) => {
+        g.add(d.toCanonicalString());
       });
     }
-  }), [...g].map((h) => A(h));
+  }), [...g].map((w) => A(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(_.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 = te(e);
+  let a = te(c);
+  if (!r || !a)
+    return c;
+  const u = new Set(r.map(j));
+  return a = a.filter(
+    (p) => {
+      const m = j(p), y = l.get(m);
+      return !(y ? [...y.keys()] : []).some((g) => u.has(g));
     }
-  ), 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(_.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") {
+    for (let c = 0; c < t.length; c++) {
+      const { selectedSource: r, selectedFilterValue: a, selectedFilterRange: u, type: p } = t[c], m = A(r), y = (P(m) ? e.columnsData[r] : e.axesData[r])[l];
+      if (a !== void 0 && (s = s || y === a), u !== void 0 && (u.min !== void 0 || u.max !== void 0) && typeof y == "number") {
         let x = !0;
-        p.min !== void 0 && (x = x && d >= p.min), p.max !== void 0 && (x = x && d <= p.max), s = s || x;
+        u.min !== void 0 && (x = x && y >= u.min), u.max !== void 0 && (x = x && y <= u.max), s = s || x;
       }
-      u === "subset" && (s = s || d != null);
+      p === "subset" && (s = s || y != null);
     }
     s && (n[l] = 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)) {
+      for (const y of e.components[m].selectorStates) {
+        const x = A(y.selectedSource);
+        if (P(x)) {
           const g = await t.pFrameProvider.getColumnSpecById(x);
-          g && g.axesSpec.forEach((h) => {
-            const w = _.fromAxisSpec(h).toCanonicalString();
-            c.has(w) || (c.add(w), i.push(h));
+          g && g.axesSpec.forEach((w) => {
+            const C = _.fromAxisSpec(w).toCanonicalString();
+            r.has(C) || (r.add(C), 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 y of p)
+        if (n[y]) {
+          const x = Object.keys(n[y]);
           for (const g of x)
-            !p.has(g) && !c.has(g) && (m.push(g), p.add(g));
+            !u.has(g) && !r.has(g) && (m.push(g), u.add(g));
         }
-      u = m;
+      p = m;
     }
-    for (const [m, { selectorStates: d }] of Object.entries(e.components)) {
+    for (const [m, { selectorStates: y }] of Object.entries(e.components)) {
       const g = ((s = this.simpleComponentControllers[m]) != null ? s : this.filterComponentControllers[m]).settings.columnsWithExtraAxesAllowed;
-      for (const { selectedSource: h } of d)
-        await Ue(
+      for (const { selectedSource: w } of y)
+        await He(
           t,
-          h,
-          o[h],
-          r,
-          i,
+          w,
+          o[w],
           c,
-          p,
+          a,
+          r,
+          u,
           g,
           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,111 +610,111 @@ 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) => A(r.selectedSource));
+        return n.concat(c);
       }, []),
       !1
     );
-    return Oe(o, (n) => n.spec).reduce((n, l) => {
+    return _e(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), y = await this.getLabelsMap(t, e), x = await this.getSelectedSourcesInfo(t, e, y, p, m), g = /* @__PURE__ */ new Map(), w = { ...this.simpleComponentControllers, ...this.filterComponentControllers }, C = /* @__PURE__ */ new Set();
+    for (const [S, f] of Object.entries(w)) {
+      const h = await f.getOptions(
         t,
         e,
-        d,
-        c,
-        u,
+        y,
+        r,
+        p,
         m,
         n,
-        i,
-        p
+        a,
+        u
       );
-      this.dataInputs.includes(y) || v.options.forEach((P) => {
-        w.add(P.value);
+      this.dataInputs.includes(S) || h.options.forEach((b) => {
+        C.add(b.value);
       });
-      for (const [P, O] of v.optionsInfo)
-        g.set(P, O);
-      r[y] = v;
+      for (const [b, O] of h.optionsInfo)
+        g.set(b, O);
+      c[S] = h;
     }
-    const D = (y) => {
-      const f = g.get(y);
+    const D = (S) => {
+      const f = g.get(S);
       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)
-      D(y);
+      const h = x.get(S);
+      h && h.kind === "axis" && (h.mustBeConsumed = !0);
+    }, B = await this.getMustBeConsumedAxes(t, e);
+    for (const S of B)
+      D(S);
     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 S = (h) => {
+        var b;
+        return ((b = h == null ? void 0 : h.annotations) == null ? void 0 : b[Me]) === "true";
+      }, f = (s = (l = e.components.filters) == null ? void 0 : l.selectorStates.reduce((h, b) => {
+        const O = x.get(b.selectedSource);
+        return (O == null ? void 0 : O.kind) === "column" && O.spec.axesSpec.filter(S).forEach((L) => h.add(_.fromAxisSpec(L).toCanonicalString())), (O == null ? void 0 : O.kind) === "axis" && S(O.spec) && h.add(_.fromAxisSpec(O.spec).toCanonicalString()), h;
       }, /* @__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((h) => {
+        for (const { selectedSource: b } of e.components[h].selectorStates) {
+          const O = x.get(b);
+          if ((O == null ? void 0 : O.kind) === "column" && O.spec.axesSpec.filter(S).forEach((L) => {
+            const N = _.fromAxisSpec(L).toCanonicalString();
+            !C.has(N) && !f.has(N) && C.add(N), f.has(N) || D(N);
+          }), (O == null ? void 0 : O.kind) === "axis" && S(O.spec)) {
+            const E = _.fromAxisSpec(O.spec).toCanonicalString();
+            C.has(E) || C.add(E), f.has(E) || D(E);
           }
         }
       });
     }
-    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 v = /* @__PURE__ */ new Set();
+    for (const { selectorStates: S } of Object.values(e.components))
+      for (const { selectedSource: f } of S) {
+        const h = x.get(f);
+        h && h.kind === "column" && h.axesToBeFixed.forEach((b) => {
+          v.add(b);
         });
       }
-    const 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 = (S) => {
+      var f, h, b;
+      const O = (f = A(S).toCanonicalString()) != null ? f : S;
+      return (b = (h = g.get(O)) != null ? h : x.get(O)) != null ? b : ge(S);
     };
     return {
-      components: r,
-      getSourceInfo: S,
-      freeOptionsSet: w,
-      axesToBeFixedSet: C,
+      components: c,
+      getSourceInfo: i,
+      freeOptionsSet: C,
+      axesToBeFixedSet: v,
       readyData: this.readyDataInputs(e),
-      ready: this.readyForPlotBuilding(t, e, a, w, S),
-      consistent: a
+      ready: this.readyForPlotBuilding(t, e, d, C, 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, y) => m.label.localeCompare(y.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((y) => ({ value: y, label: y }));
+        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);
+    if (a.kind === "axis") {
+      const p = A(o), m = a.parentSources.map(A), y = await k(t, o, a.parentSources);
       let x = [];
-      if (d) {
+      if (y) {
         l && (x = [{
           type: "bySingleColumnV2",
           column: {
             type: "column",
-            id: d.name
+            id: y.name
           },
           predicate: {
             operator: "StringIContains",
@@ -720,35 +724,35 @@ var Q = class {
           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(y, x), v = B[p.toCanonicalString()], d = [];
+        for (let i = 0; i < Math.min(v.length, n ?? v.length); i++)
+          d.push({ value: String(v[i]), label: String(D[i]) });
+        return r(d), { values: d, overflow: !(n === void 0 || v.length < n) };
       }
       const g = l ?? s;
       g && (x = [{
         type: "bySingleColumnV2",
         column: {
           type: "axis",
-          id: u.toPFrameId()
+          id: p.toPFrameId()
         },
         predicate: {
           operator: "StringIContains",
           substring: g
         }
       }]);
-      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, x), C = w.values.map((D) => ({ value: String(D), label: String(D) }));
+      return r(C), { values: C, 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 = A(o), y = 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 };
+      }] : [], x = await t.pFrameProvider.getColumnUniqueValues(m, n, y), g = x.values.map((w) => ({ value: String(w), label: String(w) }));
+      return r(g), { values: g, overflow: x.overflow };
     }
     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 y;
+            return ((y = (u ?? []).find((x) => x.axisSource === m)) == null ? void 0 : y.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[Ce]) === "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,182 +850,182 @@ 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 = _.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 = A(p);
+        if (P(m)) {
+          const y = await e.pFrameProvider.getColumnSpecById(m);
+          if (!y)
             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 y.axesSpec.every((g) => a(g));
           if (this.settings.columnsWithExtraAxesAllowed && !this.settings.isDataComponent) {
-            if (d.axesSpec.some((h) => i(h)))
+            if (y.axesSpec.some((w) => a(w)))
               return !0;
-            const g = te(d.axesSpec);
-            return g ? g.some((h) => l.has(j(h))) : !1;
+            const g = te(y.axesSpec);
+            return g ? g.some((w) => l.has(j(w))) : !1;
           } else
-            return r.size === 0 || d.axesSpec.some((g) => i(g));
+            return c.size === 0 || y.axesSpec.some((g) => a(g));
         }
-        return r.has(u);
+        return c.has(p);
       })
     );
     return s.selectorStates.reduce(
-      (u, m, d) => (u[m.selectedSource] = p[d], u),
+      (p, m, y) => (p[m.selectedSource] = u[y], 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) => A(a.selectedSource)).filter((a) => P(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(_.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) => A(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 (P(c)) {
+        const r = await e.pFrameProvider.getColumnSpecById(c);
+        (n = r == null ? void 0 : r.axesSpec) == null || n.forEach((a) => {
+          const u = _.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), y = /* @__PURE__ */ new Set(), x = [], g = /* @__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 (P(D)) {
+        const B = await e.pFrameProvider.getColumnSpecById(D);
+        for (const v of (l = B == null ? void 0 : B.axesSpec) != null ? l : []) {
+          const i = _.fromAxisSpec(v).toCanonicalString();
+          if (y.has(i))
             continue;
-          d.add(S), x.push(C);
-          const y = Ae(C);
-          h.set(S, {
+          y.add(i), x.push(v);
+          const S = Ie(v);
+          w.set(i, {
             kind: "axis",
-            name: C.name,
-            label: await T(e, S, [
+            name: v.name,
+            label: await T(e, i, [
               D.toCanonicalString()
             ]),
-            type: C.type,
-            mustBeConsumed: y,
+            type: v.type,
+            mustBeConsumed: S,
             dividable: !1,
-            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",
+            spec: v,
+            annotations: v.annotations,
+            isSubsetFilter: ((s = v.annotations) == null ? void 0 : s[$]) === "true",
+            isDiscreteFilter: v.type === "String" || ((c = v.annotations) == null ? void 0 : c[ee]) === "true",
             parentSources: [D.toCanonicalString()]
           });
         }
       }
-    let w = [...d];
-    for (; w.length; ) {
+    let C = [...y];
+    for (; C.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 C)
+        if (n[B]) {
+          const v = Object.keys(n[B]);
+          for (const d of v)
+            if (!g.has(d)) {
+              D.push(d), g.add(d);
+              const { spec: i, id: S } = n[B][d];
+              for (const f of i.axesSpec) {
+                const h = _.fromAxisSpec(f).toCanonicalString();
+                w.has(h) || w.set(h, {
                   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",
-                  parentSources: [y.toCanonicalString()]
+                  isSubsetFilter: ((u = f.annotations) == null ? void 0 : u[$]) === "true",
+                  isDiscreteFilter: f.type === "String" || ((p = f.annotations) == null ? void 0 : p[ee]) === "true",
+                  parentSources: [S.toCanonicalString()]
                 });
               }
             }
         }
-      w = D;
+      C = D;
     }
-    return { parentAxes: d, parentAxesList: x, linkerAxes: g, optionsInfo: h };
+    return { parentAxes: y, parentAxesList: x, linkerAxes: g, optionsInfo: w };
   }
-  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);
+  async getOptions(e, o, n, l, s, c, r, a = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Set()) {
+    var p, m, y, x, g;
+    const w = this.settings.multipleSelectors, C = this.settings.required, D = await this.checkStateConsistency(e, o, s, c);
     if (this.dependsOn.length && this.dependsOn.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: h, required: w, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
+      return { multipleSelectors: w, required: C, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
     if (this.strictlyDependsOnParents && !this.settings.isDataComponent && this.parentComponents.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: 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 { multipleSelectors: w, required: C, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
+    const B = this.getParentSelectedSources(e, o), v = (await e.pFrameProvider.getColumns([], !1, this.allowedTypes, void 0, this.annotations)).filter((O) => !l.has(O.toCanonicalString())), { parentAxes: d, linkerAxes: i, parentAxesList: S, optionsInfo: f } = await this.getAllowedAxes(e, o, s), h = o.components[this.componentName], b = [];
     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(
+      for (const O of d) {
+        const E = A(O), L = f.get(E.toCanonicalString()), N = this.allowedTypes.includes(L.spec.type), F = Object.entries(this.annotations).every(
           ([oe, q]) => {
             var U;
             return ((U = L.spec.annotations) == null ? void 0 : U[oe]) === 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(O), Z = a.has(E.name) || u.has(E.toCanonicalString()), ne = h.selectorStates.some((oe) => oe.selectedSource === O);
+        N && F && G && M && K && !Z && !ne && b.push({ value: O });
       }
     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);
+      for (const E of v) {
+        const L = E.toCanonicalString(), N = A(L), F = await e.pFrameProvider.getColumnSpecById(N);
         if (!F)
           continue;
-        const G = be(
+        const G = De(
           F,
-          y,
-          a,
           S,
-          r
+          d,
+          i,
+          c
         ).map((q) => _.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) => {
+          Le(F) || Ze(F) || this.checkSourceBySpec && !this.checkSourceBySpec(F, o) || this.settings.isDataComponent && !r(F) || O && G.length > 0 || B.length && G.length > 0 && !F.axesSpec.some((q) => {
             const U = _.fromAxisSpec(q).toCanonicalString();
-            return a.has(U) || S.has(U);
+            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 = F == null ? void 0 : F.axesSpec) == null ? void 0 : p.map((q) => _.fromAxisSpec(q).toCanonicalString())) != null ? m : [], Z = {};
         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 = {
+          const q = (y = n[L]) != null ? y : await T(e, E.toCanonicalString(), []), U = {
             kind: "column",
             name: F.name,
             label: q,
@@ -1033,18 +1037,18 @@ var Q = class {
             axesToBeFixed: G,
             axesToBeFixedIndexes: Z
           };
-          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 ne = a.has(N.name) || u.has(N.toCanonicalString()), oe = o.components[this.componentName].selectorStates.some(
           (q) => q.selectedSource === L
         );
-        !ne && !oe && P.push({ value: L });
+        !ne && !oe && b.push({ value: L });
       }
     }
-    return { multipleSelectors: h, required: w, stateConsistency: D, options: P, optionsInfo: f };
+    return { multipleSelectors: w, required: C, stateConsistency: D, options: b, 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 re(t, e) {
   if (!e.length)
     return [];
   const o = e.map((s) => A(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 P(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 Q {
   constructor() {
     super({
       valueSize: new I({
@@ -1191,120 +1195,120 @@ var Ze = class extends Q {
   }
   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 = A(s), a = A(c);
+    if (!r || !a || !P(r) && !P(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), y = [
       ...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 = [
+    ], x = Y(y), g = y.map((F) => A(F.selectedSource)).filter(P), w = [r, a].filter(P), C = w.map((F) => F.toCanonicalString()), D = await J(t, C), B = [
       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)
-      y.push(...await V(
+    ], v = [], d = w.map(() => []), i = [], S = [];
+    for (const { selectedSource: F, fixedAxes: G } of y)
+      S.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 F of B)
       for (const { selectedSource: G, fixedAxes: M } of F.selectorStates) {
-        C.push(A(G)), S.push(
+        v.push(A(G)), i.push(
           (M ?? []).map(({ axisIdx: Z, axisValue: ne }) => ({ idx: Z, value: ne }))
-        ), y.push(...await V(
+        ), S.push(...await V(
           t,
-          u,
+          p,
           m,
           D,
           G,
           M
         ));
-        const K = await k(t, G, w);
-        K && C.push(K);
+        const K = await k(t, G, C);
+        K && v.push(K);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [...h, ...y, ...g],
-      C,
+      [...w, ...S, ...g],
+      v,
       x,
       !0,
-      a,
-      S
+      d,
+      i
     );
-    C.forEach((F) => {
+    v.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(
+      u.values[G] = P(F) ? f.columnsData[G] : f.axesData[G];
+    }), u.values[s] = P(r) ? f.columnsData[s] : f.axesData[s], u.values[c] = P(a) ? f.columnsData[c] : f.axesData[c];
+    const h = e.components.x.selectorStates.map((F) => F.selectedSource), b = h.join(", "), O = await Promise.all(h.map(
       async (F) => {
         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, F, C)) == null ? void 0 : G.toCanonicalString()) != null ? M : F;
       }
     ));
-    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(
+    u.values[b] = re(f, h), u.values.xLabels = re(f, O);
+    const E = e.components.y.selectorStates.map((F) => F.selectedSource), L = E.join(", "), N = await Promise.all(E.map(
       async (F) => {
         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, F, C)) == null ? void 0 : G.toCanonicalString()) != null ? M : F;
       }
     ));
-    return p.values[L] = ae(f, N), p.values.yLabels = ae(f, E), { byColumns: p };
+    return u.values[L] = re(f, E), u.values.yLabels = re(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 = A(l), r = A(s);
+    if (!P(c) && !P(r))
       throw Error("Value column is not valid");
-    const i = [r, c].filter(B).map((C) => C.toCanonicalString()), p = {
+    const a = [c, r].filter(P).map((v) => v.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;
+    }, y = e.components.x.selectorStates.map(({ selectedSource: v }) => v).join(", "), g = e.components.y.selectorStates.map(({ selectedSource: v }) => v).join(", "), w = await Promise.all(e.components.facetBy.selectorStates.map(async (v) => {
+      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, v.selectedSource, a)) == null ? void 0 : d.toCanonicalString()) != null ? i : v.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(
-      e.components.tooltipContent.selectorStates.map(async (C) => {
-        var a, S;
-        const y = C.selectedSource;
+    })), C = (await Promise.all(e.components.x.selectorStates.map((v) => T(t, v.selectedSource, a)))).join(", "), D = (await Promise.all(e.components.y.selectorStates.map((v) => T(t, v.selectedSource, a)))).join(", "), B = await Promise.all(
+      e.components.tooltipContent.selectorStates.map(async (v) => {
+        var d, i;
+        const S = v.selectedSource;
         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, S, a) || S,
+          value: S,
+          valueLabels: (i = (d = await k(t, S, a)) == null ? void 0 : d.toCanonicalString()) != null ? i : S
         };
       })
     );
     return {
       type: "bubble",
-      valueColor: p,
-      valueSize: u,
+      valueColor: u,
+      valueSize: p,
       xColumn: {
         type: "column",
-        value: d,
-        label: w,
+        value: y,
+        label: C,
         valueLabels: "xLabels"
       },
       yColumn: {
@@ -1313,14 +1317,14 @@ var Ze = class extends Q {
         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 +1334,7 @@ var Ze = class extends Q {
     facetBy: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, tt = class extends Q {
+}, ot = class extends Q {
   constructor() {
     super(
       {
@@ -1400,44 +1404,44 @@ var Ze = class extends Q {
     if (!l)
       throw Error("Value column is not valid");
     const s = A(l);
-    if (!B(s))
+    if (!P(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) => A(d.selectedSource)).filter(P), y = [l], x = await J(t, y), g = [e.components.facetBy, e.components.grouping], w = [], C = [[]], D = [], B = [];
+    for (const { selectedSource: d, fixedAxes: i } of u)
+      B.push(
+        ...await V(t, r, a, x, d, i)
+      ), C.push(
+        (i ?? []).map(({ axisIdx: S, axisValue: f }) => ({ idx: S, value: f }))
       );
-    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 g)
+      for (const { selectedSource: i, fixedAxes: S } of d.selectorStates) {
+        w.push(A(i)), D.push(
+          (S ?? []).map(({ axisIdx: h, axisValue: b }) => ({ idx: h, value: b }))
+        ), B.push(
+          ...await V(t, r, a, x, i, S)
         );
-        const f = await k(t, S, d);
-        f && h.push(f);
+        const f = await k(t, i, y);
+        f && w.push(f);
       }
-    const C = await t.pFrameProvider.getTableOuterJoin(
-      [s, ...b, ...m],
-      h,
-      u,
-      !0,
+    const v = await t.pFrameProvider.getTableOuterJoin(
+      [s, ...B, ...m],
       w,
+      p,
+      !0,
+      C,
       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] = P(d) ? v.columnsData[i] : v.axesData[i];
+    }), c.values[s.toCanonicalString()] = v.columnsData[s.toCanonicalString()], { byColumns: c };
   }
   async createChartSettings(t, e) {
     var o, n;
@@ -1445,39 +1449,39 @@ var Ze = class extends Q {
     if (!l)
       throw Error("Value column is not valid");
     const s = A(l);
-    if (!B(s))
+    if (!P(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, y;
         return {
           type: "column",
-          value: (d = (m = await k(t, u.selectedSource, r)) == null ? void 0 : m.toCanonicalString()) != null ? d : u.selectedSource
+          value: (y = (m = await k(t, p.selectedSource, c)) == null ? void 0 : m.toCanonicalString()) != null ? y : 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 +1492,7 @@ var Ze = class extends Q {
     secondaryGrouping: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, ot = class extends Q {
+}, lt = class extends Q {
   constructor() {
     super(
       {
@@ -1563,114 +1567,114 @@ 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))
+    if (!n || !P(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((v) => A(v.selectedSource)).filter(P), m = [n], y = await J(t, m), x = [e.components.primaryGrouping, e.components.secondaryGrouping, e.components.facetBy], g = [], w = [[]], C = [], D = [];
+    for (const { selectedSource: v, fixedAxes: d } of a)
       D.push(...await V(
         t,
-        r,
         c,
-        d,
-        C,
-        a
-      )), h.push(
-        (a ?? []).map(({ axisIdx: S, axisValue: y }) => ({ idx: S, value: y }))
+        r,
+        y,
+        v,
+        d
+      )), w.push(
+        (d ?? []).map(({ axisIdx: i, axisValue: S }) => ({ idx: i, value: S }))
       );
-    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 v of x)
+      for (const { selectedSource: d, fixedAxes: i } of v.selectorStates) {
+        g.push(A(d)), C.push(
+          (i ?? []).map(({ axisIdx: f, axisValue: h }) => ({ idx: f, value: h }))
         ), D.push(...await V(
           t,
-          r,
           c,
+          r,
+          y,
           d,
-          a,
-          S
+          i
         ));
-        const y = await k(t, a, m);
-        y && g.push(y);
+        const S = await k(t, d, m);
+        S && g.push(S);
       }
-    const b = await t.pFrameProvider.getTableOuterJoin(
-      [l, ...D, ...u],
+    const B = await t.pFrameProvider.getTableOuterJoin(
+      [l, ...D, ...p],
       g,
-      p,
+      u,
       !0,
-      h,
-      w
+      w,
+      C
     );
-    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 g.forEach((v) => {
+      const d = v.toCanonicalString();
+      s.values[d] = P(v) ? 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))
+    if (!l || !P(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 y, x;
       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: (x = (y = await k(t, m.selectedSource, r)) == null ? void 0 : y.toCanonicalString()) != null ? x : 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 +1691,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 ce(t, e) {
   if (!e.length)
     return [];
   const o = e.map((s) => A(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 P(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 Q {
   constructor() {
     super(
       {
@@ -1774,7 +1778,7 @@ var lt = class extends Q {
             dimensionConsumer: !0,
             multipleSelectors: !0,
             axesAllowed: !0,
-            columnsAllowed: !1
+            columnsAllowed: !0
           },
           dependsOn: ["y"],
           checkSourceBySpec: (t, e) => {
@@ -1892,16 +1896,16 @@ var lt = class extends Q {
     if (!l)
       throw Error("Value column is not valid");
     const s = A(l);
-    if (!B(s))
+    if (!P(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) => A(L.selectedSource)).filter(P), y = [l], x = await J(t, y), g = [
       e.components.facetBy,
       e.components.annotationsX,
       e.components.annotationsY,
@@ -1910,67 +1914,67 @@ 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 = [], C = [[]], D = [], B = [];
+    for (const { selectedSource: L, fixedAxes: N } of u)
+      B.push(...await V(
         t,
-        c,
-        i,
+        r,
+        a,
         x,
         L,
-        E
-      )), w.push(
-        (E ?? []).map(({ axisIdx: F, axisValue: G }) => ({ idx: F, value: G }))
+        N
+      )), C.push(
+        (N ?? []).map(({ axisIdx: F, axisValue: G }) => ({ idx: F, value: G }))
       );
     for (const L of g)
-      for (const { selectedSource: E, fixedAxes: F } of L.selectorStates) {
-        h.push(A(E)), D.push(
+      for (const { selectedSource: N, fixedAxes: F } of L.selectorStates) {
+        w.push(A(N)), D.push(
           (F ?? []).map(({ axisIdx: M, axisValue: K }) => ({ idx: M, value: K }))
-        ), b.push(...await V(
+        ), B.push(...await V(
           t,
-          c,
-          i,
+          r,
+          a,
           x,
-          E,
+          N,
           F
         ));
-        const G = await k(t, E, d);
-        G && h.push(G);
+        const G = await k(t, N, y);
+        G && w.push(G);
       }
-    const C = await t.pFrameProvider.getTableOuterJoin(
-      [s, ...b, ...m],
-      h,
-      u,
-      !0,
+    const v = await t.pFrameProvider.getTableOuterJoin(
+      [s, ...B, ...m],
       w,
+      p,
+      !0,
+      C,
       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);
-    const y = e.components.x.selectorStates.map((L) => L.selectedSource), f = await Promise.all(
-      y.map(
+    w.forEach((L) => {
+      const N = L.toCanonicalString();
+      c.values[N] = P(L) ? v.columnsData[N] : v.axesData[N];
+    }), c.values[s.toCanonicalString()] = v.columnsData[s.toCanonicalString()];
+    const d = e.components.x.selectorStates.concat(e.components.xGroupBy.selectorStates).map((L) => L.selectedSource), i = d.join(", ");
+    c.values[i] = ce(v, d);
+    const S = e.components.x.selectorStates.map((L) => L.selectedSource), f = await Promise.all(
+      S.map(
         async (L) => {
-          var E, F;
-          return (F = (E = await k(t, L, d)) == null ? void 0 : E.toCanonicalString()) != null ? F : L;
+          var N, F;
+          return (F = (N = await k(t, L, y)) == null ? void 0 : N.toCanonicalString()) != null ? F : 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(
+    c.values.xLabelsKey = ce(v, f);
+    const h = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map((L) => L.selectedSource), b = h.join(", ");
+    c.values[b] = ce(v, h);
+    const O = e.components.y.selectorStates.map((L) => L.selectedSource), E = await Promise.all(
       O.map(
         async (L) => {
-          var E, F;
-          return (F = (E = await k(t, L, d)) == null ? void 0 : E.toCanonicalString()) != null ? F : L;
+          var N, F;
+          return (F = (N = await k(t, L, y)) == null ? void 0 : N.toCanonicalString()) != null ? F : L;
         }
       )
     );
-    return r.values.yLabelsKey = re(C, N), { byColumns: r };
+    return c.values.yLabelsKey = ce(v, E), { byColumns: c };
   }
   async createChartSettings(t, e) {
     var o;
@@ -1978,46 +1982,46 @@ var lt = class extends Q {
     if (!n)
       throw Error("Value column is not valid");
     const l = A(n);
-    if (!B(l))
+    if (!P(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 }) => A(d)).map((d) => d.toCanonicalString()).join(", "), p = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map(({ selectedSource: d }) => A(d)).map((d) => d.toCanonicalString()).join(", "), m = await Promise.all(
+      e.components.facetBy.selectorStates.map(async (d) => {
+        var i, S;
         return {
           type: "column",
-          value: (y = (S = await k(t, a.selectedSource, s)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
+          value: (S = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? S : d.selectedSource
         };
       })
-    ), d = await Promise.all(
-      e.components.xGroupBy.selectorStates.map(async (a) => {
-        var S, y;
+    ), y = await Promise.all(
+      e.components.xGroupBy.selectorStates.map(async (d) => {
+        var i, S;
         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: (S = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? S : d.selectedSource
         };
       })
     ), x = await Promise.all(
-      e.components.yGroupBy.selectorStates.map(async (a) => {
-        var S, y;
+      e.components.yGroupBy.selectorStates.map(async (d) => {
+        var i, S;
         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: (S = (i = await k(t, d.selectedSource, s)) == null ? void 0 : i.toCanonicalString()) != null ? S : 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(
+    ), g = await t.pFrameProvider.getColumnSpecById(l), w = await Promise.all(
+      e.components.annotationsX.selectorStates.map(async (d) => {
+        var i, S;
+        const f = d.selectedSource, h = A(f), b = P(h) ? await t.pFrameProvider.getColumnSpecById(h) : (S = (i = g == null ? void 0 : g.axesSpec) == null ? void 0 : i.find(
           (O) => _.fromAxisSpec(O).toCanonicalString() === f
-        )) != null ? y : null;
+        )) != null ? S : null;
         return {
           axis: "x",
           valueColumn: {
@@ -2025,15 +2029,15 @@ var lt = class extends Q {
             value: f,
             label: await T(t, f, s)
           },
-          type: pe(P) ? "discrete" : "continuous"
+          type: de(b) ? "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(
+    ), C = await Promise.all(
+      e.components.annotationsY.selectorStates.map(async (d) => {
+        var i, S;
+        const f = d.selectedSource, h = A(f), b = P(h) ? await t.pFrameProvider.getColumnSpecById(h) : (S = (i = g == null ? void 0 : g.axesSpec) == null ? void 0 : i.find(
           (O) => _.fromAxisSpec(O).toCanonicalString() === f
-        )) != null ? y : null;
+        )) != null ? S : null;
         return {
           axis: "y",
           valueColumn: {
@@ -2041,56 +2045,56 @@ var lt = class extends Q {
             value: f,
             label: await T(t, f, s)
           },
-          type: pe(P) ? "discrete" : "continuous"
+          type: de(b) ? "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;
+    )).join(", "), v = await Promise.all(
+      e.components.tooltipContent.selectorStates.map(async (d) => {
+        var i, S;
+        const f = d.selectedSource;
         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
+          valueLabels: (S = (i = await k(t, f, s)) == null ? void 0 : i.toCanonicalString()) != null ? S : f
         };
       })
     );
     return {
       type: "heatmap",
-      valueColumn: r,
-      valueType: pe(g) ? "discrete" : "continuous",
+      valueColumn: c,
+      valueType: de(g) ? "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,
+      xGroupBy: y,
       yGroupBy: x,
-      annotations: [...h, ...w],
+      annotations: [...w, ...C],
       tooltips: {
         show: !0,
-        content: C
+        content: v
       }
     };
   }
-}, at = {
+}, ct = {
   type: "scatterplot",
   components: {
     x: { type: "simple", selectorStates: [] },
@@ -2106,7 +2110,7 @@ var lt = class extends Q {
     tooltipContent: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, rt = class extends Q {
+}, it = class extends Q {
   constructor() {
     super(
       {
@@ -2250,37 +2254,37 @@ var lt = class extends Q {
     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));
     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) => _.fromAxisSpec(p).toCanonicalString()), r = s.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), a = c.filter((p) => !r.some((m) => m === p)), u = r.filter((p) => !c.some((m) => m === p));
+    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 = A(s), a = A(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), y = [
       ...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)
+    ], x = Y(y), g = y.map((h) => A(h.selectedSource)).filter(P), w = [r, a].filter(P).map((h) => h.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 C = await J(t, w), D = [r, a, ...g], B = [], v = [[], []], d = [], i = [];
+    for (const { selectedSource: h, fixedAxes: b } of y)
+      i.push(...await V(
         t,
-        u,
+        p,
         m,
-        w,
-        v,
-        P
-      )), C.push(
-        (P ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
+        C,
+        h,
+        b
+      )), v.push(
+        (b ?? []).map(({ axisIdx: O, axisValue: E }) => ({ idx: O, value: E }))
       );
-    const y = [
+    const S = [
       e.components.grouping,
       e.components.size,
       e.components.shape,
@@ -2289,114 +2293,116 @@ 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 h of S)
+      for (const { selectedSource: b, fixedAxes: O } of h.selectorStates) {
+        B.push(A(b)), d.push(
+          (O ?? []).map(({ axisIdx: L, axisValue: N }) => ({ idx: L, value: N }))
+        ), i.push(...await V(
           t,
-          u,
+          p,
           m,
-          w,
-          P,
+          C,
+          b,
           O
         ));
-        const N = await k(t, P, h);
-        N && b.push(N);
+        const E = await k(t, b, w);
+        E && B.push(E);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [c, i, ...S, ...g],
-      b,
+      [r, a, ...i, ...g],
+      B,
       x,
       !1,
-      C,
-      a
+      v,
+      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((h) => {
+      const b = h.toCanonicalString();
+      u.values[b] = P(h) ? f.columnsData[b] : f.axesData[b];
+    }), u.values.key = new Array(u.values[Object.keys(u.values)[0]].length).fill(0).map((h, b) => b), e.components.highlight.selectorStates.length && (u.values.highlight = Be(e.components.highlight.selectorStates, f)), { byColumns: u };
   }
   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 ? A(r) : null, p = a ? A(a) : null;
+    if (!r || !a || !u || !p || !P(u) && !P(p))
       throw Error("Empty or invalid required data");
-    const u = [i, p].filter(B).map((a) => a.toCanonicalString()), m = {
+    const m = [u, p].filter(P).map((i) => i.toCanonicalString()), y = {
       type: "column",
       value: r,
-      label: await T(t, r, u)
-    }, d = {
-      type: "column",
-      value: c,
-      label: await T(t, c, u)
+      label: await T(t, r, m)
     }, x = {
+      type: "column",
+      value: a,
+      label: await T(t, a, m)
+    }, g = {
       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 S, f;
         return {
           type: "column",
-          value: (y = (S = await k(t, a.selectedSource, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
+          value: (f = (S = await k(t, i.selectedSource, m)) == null ? void 0 : S.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;
+    ), C = ue.uniq([
+      ...e.components.grouping.selectorStates.map((i) => i.selectedSource),
+      ...e.components.size.selectorStates.map((i) => i.selectedSource),
+      ...e.components.shape.selectorStates.map((i) => i.selectedSource)
+    ]), D = await Promise.all(
+      C.map(async (i) => {
+        var S, f;
         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
+          label: await T(t, i, m) || i,
+          value: i,
+          valueLabels: (f = (S = await k(t, i, m)) == null ? void 0 : S.toCanonicalString()) != null ? f : i
         };
       })
-    ), 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 S, f;
+        const h = i.selectedSource, b = A(h), O = (S = await k(t, h, m)) != null ? S : b, E = await le(t, h, m);
         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, h, m) || h,
+          value: h,
+          valueLabels: O.toCanonicalString(),
+          format: (f = E == null ? void 0 : E.annotations) == null ? void 0 : f[pe]
         };
       })
     );
-    let b;
+    let v;
     if (e.components.label.selectorStates.length) {
-      const a = e.components.label.selectorStates[0].selectedSource;
-      b = {
+      const i = e.components.label.selectorStates[0].selectedSource, S = await le(t, i, m);
+      v = {
         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 = S == null ? void 0 : S.annotations) == null ? void 0 : c[pe]
       };
     }
-    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,
-      keyColumn: x,
-      facetBy: g,
-      grouping: w,
-      label: b,
-      highlight: C,
+      x: y,
+      y: x,
+      keyColumn: g,
+      facetBy: w,
+      grouping: D,
+      label: v,
+      highlight: d,
       tooltips: {
         show: !0,
-        content: D
+        content: B
       }
     };
   }
-}, ct = {
+}, ut = {
   type: "scatterplot-umap",
   components: {
     x: { type: "simple", selectorStates: [] },
@@ -2411,7 +2417,7 @@ var lt = class extends Q {
     size: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, it = class extends Q {
+}, pt = class extends Q {
   constructor() {
     super(
       {
@@ -2544,40 +2550,40 @@ var lt = class extends Q {
     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));
     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) => _.fromAxisSpec(p).toCanonicalString()), r = s.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), a = c.filter((p) => !r.some((m) => m === p)), u = r.filter((p) => !c.some((m) => m === p));
+    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 = A(s), a = A(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), y = [
       ...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)
+    ], x = Y(y), g = y.map((h) => A(h.selectedSource)).filter(P), w = [r, a].filter(P).map((h) => h.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 C = await J(t, w), D = [r, a, ...g], B = [], v = [[], []], d = [], i = [];
+    for (const { selectedSource: h, fixedAxes: b } of y)
+      i.push(...await V(
         t,
-        u,
+        p,
         m,
-        w,
-        v,
-        P
-      )), C.push(
-        (P ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
+        C,
+        h,
+        b
+      )), v.push(
+        (b ?? []).map(({ axisIdx: O, axisValue: E }) => ({ idx: O, value: E }))
       );
-    const y = [
+    const S = [
       e.components.grouping,
       e.components.facetBy,
       e.components.tooltipContent,
@@ -2585,116 +2591,118 @@ 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 h of S)
+      for (const { selectedSource: b, fixedAxes: O } of h.selectorStates) {
+        B.push(A(b)), d.push(
+          (O ?? []).map(({ axisIdx: L, axisValue: N }) => ({ idx: L, value: N }))
+        ), i.push(...await V(
           t,
-          u,
+          p,
           m,
-          w,
-          P,
+          C,
+          b,
           O
         ));
-        const N = await k(t, P, h);
-        N && b.push(N);
+        const E = await k(t, b, w);
+        E && B.push(E);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [c, i, ...S, ...g],
-      b,
+      [r, a, ...i, ...g],
+      B,
       x,
       !1,
-      C,
-      a
+      v,
+      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((h) => {
+      const b = h.toCanonicalString();
+      u.values[b] = P(h) ? f.columnsData[b] : f.axesData[b];
+    }), 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 ? A(r) : null, p = a ? A(a) : null;
+    if (!r || !a || !u || !p || !P(u) && !P(p))
       throw Error("Empty or invalid required data");
-    const u = [i, p].filter(B).map((a) => a.toCanonicalString()), m = {
+    const m = [u, p].filter(P).map((i) => i.toCanonicalString()), y = {
       type: "column",
       value: r,
-      label: await T(t, r, u)
-    }, d = {
-      type: "column",
-      value: c,
-      label: await T(t, c, u)
+      label: await T(t, r, m)
     }, x = {
+      type: "column",
+      value: a,
+      label: await T(t, a, m)
+    }, g = {
       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 S, f;
         return {
           type: "column",
-          value: (y = (S = await k(t, a.selectedSource, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
+          value: (f = (S = await k(t, i.selectedSource, m)) == null ? void 0 : S.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;
+    ), C = ue.uniq([
+      ...e.components.grouping.selectorStates.map((i) => i.selectedSource),
+      ...e.components.size.selectorStates.map((i) => i.selectedSource)
+    ]), D = await Promise.all(
+      C.map(async (i) => {
+        var S, f;
         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
+          label: await T(t, i, m) || i,
+          value: i,
+          valueLabels: (f = (S = await k(t, i, m)) == null ? void 0 : S.toCanonicalString()) != null ? f : i
         };
       })
-    ), 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 S, f, h;
+        const b = i.selectedSource, O = await le(t, b, 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, b, m) || b,
+          value: b,
+          valueLabels: (f = (S = await k(t, b, m)) == null ? void 0 : S.toCanonicalString()) != null ? f : b,
+          format: (h = O == null ? void 0 : O.annotations) == null ? void 0 : h[pe]
         };
       })
     );
-    let b;
+    let v;
     if (e.components.label.selectorStates.length) {
-      const a = e.components.label.selectorStates[0].selectedSource;
-      b = {
+      const i = e.components.label.selectorStates[0].selectedSource, S = await le(t, i, m);
+      v = {
         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 = S == null ? void 0 : S.annotations) == null ? void 0 : c[pe]
       };
     }
-    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,
-      keyColumn: x,
-      facetBy: g,
-      grouping: w,
-      label: b,
-      highlight: C,
+      x: y,
+      y: x,
+      keyColumn: g,
+      facetBy: w,
+      grouping: D,
+      label: v,
+      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 +2722,7 @@ var lt = class extends Q {
     heatmapGroup: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, pt = class extends Q {
+}, dt = class extends Q {
   constructor() {
     super(
       {
@@ -2898,7 +2906,7 @@ var lt = class extends Q {
           }
         })
       }
-    ), this.ignoredOptionIdNames = [me];
+    ), this.ignoredOptionIdNames = [Se];
   }
   readyDataInputs(t) {
     return t.components.value.selectorStates.length > 0;
@@ -2906,15 +2914,15 @@ var lt = class extends Q {
   async createTableData(t, e) {
     var o;
     const n = {}, l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, s = A(l);
-    if (!l || !B(s))
+    if (!l || !P(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) => A(d.selectedSource)),
+      ...e.components.tabBy.selectorStates.map((d) => A(d.selectedSource))
+    ].filter(P), p = [l], m = await J(t, p), y = [], x = [], g = [], w = [e.components.value], C = [
       e.components.tableContent,
       // next components can content data mapped on tree
       e.components.labels,
@@ -2923,71 +2931,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) {
+    for (const d of w)
+      for (const { selectedSource: i, fixedAxes: S } of d.selectorStates) {
         g.push(...await V(
           t,
-          r,
           c,
+          r,
           m,
-          S,
-          y
+          i,
+          S
         ));
-        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), h = f ?? A(i);
+        D[h.toCanonicalString()] = i, y.push(h);
       }
-    for (const a of w)
-      for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
+    for (const d of C)
+      for (const { selectedSource: i, fixedAxes: S } of d.selectorStates) {
         g.push(...await V(
           t,
-          r,
           c,
+          r,
           m,
-          S,
-          y
+          i,
+          S
         ));
-        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), h = f ?? A(i);
+        D[i] = h.toCanonicalString(), x.push(h);
       }
-    const b = await t.pFrameProvider.getTableOuterJoin(
-      [...d, ...p, ...g],
+    const B = await t.pFrameProvider.getTableOuterJoin(
+      [...y, ...u, ...g],
       x,
-      i,
+      a,
       !1
     );
-    for (const a of [...d, ...x]) {
-      const S = a.toCanonicalString(), y = D[a.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)
+    for (const d of [...y, ...x]) {
+      const i = d.toCanonicalString(), S = D[d.toCanonicalString()];
+      n[S] = {
+        data: P(d) ? B.columnsData[i] : B.axesData[i],
+        spec: P(d) ? B.columnSpecs[i] : B.axesSpecs[i],
+        label: await T(t, S, p)
       };
     }
-    const C = Object.keys(b.axesData).find(
-      (a) => {
-        var S;
-        return ((S = A(a)) == null ? void 0 : S.name) === me;
+    const v = Object.keys(B.axesData).find(
+      (d) => {
+        var i;
+        return ((i = A(d)) == null ? void 0 : i.name) === Se;
       }
     );
-    return C ? n[de] = {
-      data: b.axesData[C],
+    return v ? n[ye] = {
+      data: B.axesData[v],
       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 = A(s), a = c ? A(c) : null;
+    if (!s || !P(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), y = p.map((S) => A(S.selectedSource)).filter(P), x = [r, a].filter(P).map((S) => S.toCanonicalString()), g = [], w = [], C = [], D = [], B = [
       e.components.value,
       e.components.height,
       e.components.labels,
@@ -2997,156 +3005,156 @@ var lt = class extends Q {
       e.components.lineColor,
       e.components.heatmapAnnotation,
       e.components.heatmapForSequence
-    ], C = [
+    ], v = [
       e.components.facetBy,
       e.components.heatmapAxis,
       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 S of B)
+      for (const { selectedSource: f, fixedAxes: h } of S.selectorStates) {
+        g.push(A(f)), C.push(
+          (h ?? []).map(({ axisIdx: O, axisValue: E }) => ({ idx: O, value: E }))
         );
-        const P = await k(t, f, x);
-        P && g.push(P);
+        const b = await k(t, f, x);
+        b && g.push(b);
       }
-    u.forEach(({ fixedAxes: y }) => {
-      w.push(
-        (y ?? []).map(({ axisIdx: f, axisValue: v }) => ({ idx: f, value: v }))
+    p.forEach(({ fixedAxes: S }) => {
+      C.push(
+        (S ?? []).map(({ axisIdx: f, axisValue: h }) => ({ idx: f, value: h }))
       );
     });
-    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 S of v)
+      for (const { selectedSource: f, fixedAxes: h } of S.selectorStates) {
+        w.push(A(f)), D.push(
+          (h ?? []).map(({ axisIdx: O, axisValue: E }) => ({ idx: O, value: E }))
         );
-        const P = await k(t, f, x);
-        P && h.push(P);
+        const b = await k(t, f, x);
+        b && w.push(b);
       }
-    const a = await t.pFrameProvider.getTableOuterJoin(
-      [...g, ...d],
-      h,
+    const d = await t.pFrameProvider.getTableOuterJoin(
+      [...g, ...y],
+      w,
       m,
       !1,
-      w,
+      C,
       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;
+    [...g, ...w].forEach((S) => {
+      const f = S.toCanonicalString(), h = P(S) ? d.columnsData[f] : d.axesData[f];
+      u.values[f] = [], u.values[f] = h;
     });
-    const S = Object.keys(a.axesData).find(
-      (y) => {
+    const i = Object.keys(d.axesData).find(
+      (S) => {
         var f;
-        return ((f = A(y)) == null ? void 0 : f.name) === me;
+        return ((f = A(S)) == 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 = A(s);
+    if (!s || !P(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, y = {};
     if (e.components.nodeColor.selectorStates.length) {
-      const w = e.components.nodeColor.selectorStates[0].selectedSource;
-      d.nodeColor = {
+      const C = e.components.nodeColor.selectorStates[0].selectedSource;
+      y.nodeColor = {
         columnName: {
           type: "column",
-          value: w,
-          label: await T(t, w, c)
+          value: C,
+          label: await T(t, C, r)
         }
       };
     }
     if (e.components.nodeShape.selectorStates.length) {
-      const w = e.components.nodeShape.selectorStates[0].selectedSource;
-      d.nodeShape = {
+      const C = e.components.nodeShape.selectorStates[0].selectedSource;
+      y.nodeShape = {
         columnName: {
           type: "column",
-          value: w,
-          label: await T(t, w, c)
+          value: C,
+          label: await T(t, C, r)
         }
       };
     }
     if (e.components.nodeSize.selectorStates.length) {
-      const w = e.components.nodeSize.selectorStates[0].selectedSource;
-      d.nodeSize = {
+      const C = e.components.nodeSize.selectorStates[0].selectedSource;
+      y.nodeSize = {
         columnName: {
           type: "column",
-          value: w,
-          label: await T(t, w, c)
+          value: C,
+          label: await T(t, C, r)
         }
       };
     }
     if (e.components.lineColor.selectorStates.length) {
-      const w = e.components.lineColor.selectorStates[0].selectedSource;
-      d.lineColor = {
+      const C = e.components.lineColor.selectorStates[0].selectedSource;
+      y.lineColor = {
         columnName: {
           type: "column",
-          value: w,
-          label: await T(t, w, c)
+          value: C,
+          label: await T(t, C, r)
         }
       };
     }
-    let x, g, h;
+    let x, g, w;
     if (e.components.heatmapAnnotation.selectorStates.length && e.components.heatmapAxis.selectorStates.length) {
-      const w = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
+      const C = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
       x = {
         type: "column",
-        value: w,
-        label: await T(t, w, []),
-        valueLabels: (n = await k(t, w, [])) == null ? void 0 : n.toCanonicalString()
+        value: C,
+        label: await T(t, C, []),
+        valueLabels: (n = await k(t, C, [])) == null ? void 0 : n.toCanonicalString()
       };
       const D = e.components.heatmapAxis.selectorStates[0].selectedSource;
       g = {
         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) => {
-          var C;
+        label: await T(t, D, [C]),
+        valueLabels: (l = await k(t, D, [C])) == null ? void 0 : l.toCanonicalString()
+      }, w = await Promise.all(
+        e.components.heatmapGroup.selectorStates.map(async (B) => {
+          var v;
           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, [C]),
+            valueLabels: (v = await k(t, B.selectedSource, [C])) == null ? void 0 : v.toCanonicalString()
           };
         })
       );
     } else if (e.components.heatmapForSequence.selectorStates.length) {
-      const w = e.components.heatmapForSequence.selectorStates[0].selectedSource;
+      const C = e.components.heatmapForSequence.selectorStates[0].selectedSource;
       x = {
         type: "column",
-        value: w,
-        label: await T(t, w, [])
+        value: C,
+        label: await T(t, C, [])
       };
     }
     return {
       type: "dendro",
-      id: i,
-      parentId: p,
-      height: u,
+      id: a,
+      parentId: u,
+      height: p,
       labels: m,
-      aes: d,
+      aes: y,
       heatmapAnnotation: x,
       heatmapAxis: g,
-      heatmapGroup: h
+      heatmapGroup: w
     };
   }
-}, ge = 1e6;
-function ce(t, e) {
+}, he = 1e6;
+function ie(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 +3175,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 = _.fromAxisSpec(r.spec.spec);
+          return c[a.toCanonicalString()] = ie(a.type, r.data), c;
         }, {}),
-        data: s.length ? ce(t.type, s[0].data) : []
+        data: s.length ? ie(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 +3197,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(P), s = await Promise.all(l.map((a) => this.getColumnSpecById(a))), c = t.toCanonicalString(), r = l.filter((a, u) => {
+      const p = s[u];
+      return p !== null && p.axesSpec.some((m) => _.fromAxisSpec(m).toCanonicalString() === c);
     });
-    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 +3224,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, y) => {
+        m.overflow && (p = !0, console.warn(`More than ${o} values for ${r[y].name} column`));
       }), {
-        values: ie.uniq(
-          ie.flatten(p.map((m) => Array.from(m.values.data).map(String)))
+        values: ue.uniq(
+          ue.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(P), r = e.filter(P), 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 y = (m = l[p]) == null ? void 0 : m.map((x) => ({
               type: "constant",
               axisIndex: x.idx,
               constant: x.value
             })).filter((x) => x.constant !== void 0);
-            return d != null && d.length ? {
+            return y != null && y.length ? {
               type: "slicedColumn",
-              newId: p.name,
-              column: p.name,
-              axisFilters: d
+              newId: u.name,
+              column: u.name,
+              axisFilters: y
             } : {
               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 y = (m = s[p]) == null ? void 0 : m.map((x) => ({
             type: "constant",
             axisIndex: x.idx,
             constant: x.value
           })).filter((x) => x.constant !== void 0);
-          return d != null && d.length ? {
+          return y != null && y.length ? {
             type: "slicedColumn",
-            newId: p.name,
-            column: p.name,
-            axisFilters: d
+            newId: u.name,
+            column: u.name,
+            axisFilters: y
           } : {
             type: "column",
-            column: p.name
+            column: u.name
           };
         })
       },
@@ -3275,33 +3283,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((x) => x.spec.type === "axis"), y = p.filter((x) => x.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;
+          const w = _.fromAxisSpec(g.spec.spec);
+          return x[w.toCanonicalString()] = ie(w.type, g.data), x;
         }, {}),
-        columnsData: d.reduce((x, g) => {
-          const h = g.spec.spec, w = new W({
+        columnsData: y.reduce((x, g) => {
+          const w = g.spec.spec, C = new W({
             name: g.spec.id,
-            type: h.valueType
+            type: w.valueType
           });
-          return x[w.toCanonicalString()] = ce(w.type, g.data), x;
+          return x[C.toCanonicalString()] = ie(C.type, g.data), x;
         }, {}),
-        columnSpecs: d.reduce((x, g) => {
-          const h = g.spec.spec, w = new W({
+        columnSpecs: y.reduce((x, g) => {
+          const w = g.spec.spec, C = new W({
             name: g.spec.id,
-            type: h.valueType
+            type: w.valueType
           });
-          return x[w.toCanonicalString()] = h, x;
+          return x[C.toCanonicalString()] = w, x;
         }, {}),
         axesSpecs: m.reduce((x, g) => {
-          const h = g.spec.spec, w = _.fromAxisSpec(h);
-          return x[w.toCanonicalString()] = h, x;
+          const w = g.spec.spec, C = _.fromAxisSpec(w);
+          return x[C.toCanonicalString()] = w, x;
         }, {})
       };
-    } 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) {
@@ -3320,9 +3328,9 @@ var mt = class {
     var e, o;
     const n = [];
     for (const l of t)
-      if (B(l)) {
+      if (P(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) => _.fromAxisSpec(c).toPFrameId()));
       }
     return n;
   }
@@ -3340,10 +3348,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 +3375,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 = {
+}, Fe = {
   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 Fe.controllers[t];
 }
-function ht(t) {
-  return Pe.initialStates[t];
+function Ct(t) {
+  return Fe.initialStates[t];
 }
 export {
   _ as AxisId,
-  Ze as BubbleStateController,
+  tt as BubbleStateController,
   W as ColumnId,
-  gt as DemoDataStore,
-  pt as DendroStateController,
-  ot as DiscreteStateController,
-  lt as HeatmapStateController,
-  rt as ScatterplotStateController,
+  ht as DemoDataStore,
+  dt as DendroStateController,
+  lt as DiscreteStateController,
+  rt as HeatmapStateController,
+  it as ScatterplotStateController,
   A as columnOrAxisIdFromString,
-  xt as getControllerByType,
-  ht as getInitialStateByType,
-  B as isColumnId
+  wt as getControllerByType,
+  Ct as getInitialStateByType,
+  P as isColumnId
 };
 //# sourceMappingURL=index.js.map