@milaboratories/graph-maker 1.1.134 → 1.1.135

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

@@ -1,21 +1,22 @@
-import j from "../../../canonicalize/lib/canonicalize.js";
-import { deriveLabels as De, isLabelColumn as Be } from "../../../@platforma-sdk/model/dist/index.js";
-import ce from "../../../lodash/lodash.js";
-var Pe = "pl7.app/axisNature", ge = "pl7.app/label", Oe = "pl7.app/columnAsAxis/name", Fe = "pl7.app/columnAsAxis/domain", K = "pl7.app/isSubset", $ = "pl7.app/isDiscreteFilter", _e = "pl7.app/discreteValues", Le = "pl7.app/graph/axis/highCardinality", Te = "pl7.app/graph/isVirtual", we = "pl7.app/isLinkerColumn", _ = class te {
+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 } from "../../pl-model-common/dist/index.js";
+import ie from "../../../lodash/lodash.js";
+var _e = "pl7.app/axisNature", he = "pl7.app/label", Le = "pl7.app/columnAsAxis/name", Te = "pl7.app/columnAsAxis/domain", J = "pl7.app/isSubset", ee = "pl7.app/isDiscreteFilter", ke = "pl7.app/discreteValues", Ee = "pl7.app/graph/axis/highCardinality", Ne = "pl7.app/graph/isVirtual", xe = "pl7.app/isLinkerColumn", _ = class se {
   constructor({ type: e, name: o, domain: n }) {
     this.kind = "axis", this.type = e, this.name = o, this.domain = { ...n };
   }
   toCanonicalString() {
-    return j(this);
+    return z(this);
   }
   static fromAxisSpec(e) {
-    return new te({ name: e.name, type: e.type, domain: e.domain });
+    return new se({ name: e.name, type: e.type, domain: e.domain });
   }
   static fromAxesSpec(e) {
-    return e.map((o) => te.fromAxisSpec(o));
+    return e.map((o) => se.fromAxisSpec(o));
   }
   copy() {
-    return new te({ type: this.type, name: this.name, domain: this.domain });
+    return new se({ type: this.type, name: this.name, domain: this.domain });
   }
   toPFrameId() {
     return {
@@ -25,80 +26,173 @@ var Pe = "pl7.app/axisNature", ge = "pl7.app/label", Oe = "pl7.app/columnAsAxis/
     };
   }
   static fromPojo(e) {
-    return new te(e);
+    return new se(e);
   }
-}, Y = class xe {
+}, W = class we {
   constructor({ name: e, type: o }) {
     this.kind = "column", this.name = e, this.type = o;
   }
   toCanonicalString() {
-    return j(this);
+    return z(this);
   }
   static fromPojo(e) {
-    return new xe(e);
+    return new we(e);
   }
 };
 function B(t) {
   return t !== null && t.kind === "column";
 }
-function se(t) {
+function le(t) {
   return t !== null && t.kind === "axis";
 }
-function C(t) {
+function A(t) {
   const e = JSON.parse(t);
   if (e.kind === "column")
-    return Y.fromPojo(e);
+    return W.fromPojo(e);
   if (e.kind === "axis")
     return _.fromPojo(e);
   throw Error("wrong column or axis object");
 }
-async function Ee(t, e, o, n, l, s, c = !0) {
-  var a, r, u, p;
-  const m = C(e);
-  if (B(m)) {
-    const d = await t.pFrameProvider.getColumnSpecById(m);
-    if (!d)
+var Se = "pl7.app/parents";
+function Ce(t) {
+  return !t.annotations || !t.annotations[Se] ? [] : JSON.parse(t.annotations[Se]);
+}
+function Ge(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))
+      return !1;
+  }
+  return !0;
+}
+function Me(t) {
+  for (let e = 0; e < t.length; e++)
+    if (Ge(t, e))
+      return t[e];
+  return null;
+}
+function qe(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);
+    }
+    o = n;
+  }
+  return e;
+}
+function Ve(t) {
+  const e = /* @__PURE__ */ new Set([j(t.axis)]);
+  let o = [t];
+  for (; o.length; ) {
+    const n = [];
+    for (const l of o)
+      for (const s of l.parents)
+        e.add(j(s.axis)), n.push(s);
+    o = n;
+  }
+  return e;
+}
+function je(t) {
+  const e = [t.axis];
+  let o = [t];
+  for (; o.length; ) {
+    const n = [];
+    for (const l of o)
+      for (const s of l.parents)
+        e.push(s.axis), n.push(s);
+    o = n;
+  }
+  return e;
+}
+function te(t) {
+  if (!t.length)
+    return [];
+  let e = t;
+  const o = [];
+  for (; e.length; ) {
+    const n = Me(e);
+    if (n === null)
+      return null;
+    const l = qe(n);
+    if (l === null)
+      return null;
+    const s = Ve(l), r = je(l);
+    o.push(r), e = e.filter((c) => !s.has(j(c)));
+  }
+  return o;
+}
+function ze(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)
+      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);
+  }
+  return n;
+}
+async function Ke(t, e, o, n, l, s, r, c = !0, i) {
+  var p, u, m, d;
+  const h = A(e);
+  if (B(h)) {
+    const g = await t.pFrameProvider.getColumnSpecById(h);
+    if (!g)
       return;
-    const w = d.axesSpec.map((x) => _.fromAxisSpec(x).toCanonicalString()), h = [], A = {};
-    c && w.forEach((x, b) => {
-      !l.has(x) && !s.has(x) && (h.push(x), A[x] = b);
+    const x = be(
+      g,
+      l,
+      s,
+      r,
+      i
+    ).map((a) => _.fromAxisSpec(a).toCanonicalString()), w = new Set(x), D = g.axesSpec.map((a) => _.fromAxisSpec(a).toCanonicalString()), b = {};
+    c && D.forEach((a, S) => {
+      w.has(a) && (b[a] = S);
     });
-    const v = {
+    const C = {
       kind: "column",
-      name: d.name,
-      label: o ?? await F(t, e, []),
-      type: d.valueType,
-      spec: d,
-      annotations: d.annotations,
-      isSubsetFilter: ((a = d.annotations) == null ? void 0 : a[K]) === "true",
-      isDiscreteFilter: d.valueType === "String" || ((r = d.annotations) == null ? void 0 : r[$]) === "true",
-      axesToBeFixed: h,
-      axesToBeFixedIndexes: A
+      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[J]) === "true",
+      isDiscreteFilter: g.valueType === "String" || ((u = g.annotations) == null ? void 0 : u[ee]) === "true",
+      axesToBeFixed: x,
+      axesToBeFixedIndexes: b
     };
-    n.set(m.toCanonicalString(), v);
-    for (const x of d.axesSpec) {
-      const g = _.fromAxisSpec(x).toCanonicalString();
-      if (n.has(g))
+    n.set(h.toCanonicalString(), C);
+    for (const a of g.axesSpec) {
+      const y = _.fromAxisSpec(a).toCanonicalString();
+      if (n.has(y))
         continue;
-      const i = Ce(x), f = {
+      const f = Ae(a), v = {
         kind: "axis",
-        name: x.name,
-        label: await F(t, g, [e]),
-        type: x.type,
-        mustBeConsumed: i,
+        name: a.name,
+        label: await T(t, y, [e]),
+        type: a.type,
+        mustBeConsumed: f,
         dividable: !1,
-        spec: x,
-        annotations: x.annotations,
-        isSubsetFilter: ((u = x.annotations) == null ? void 0 : u[K]) === "true",
-        isDiscreteFilter: x.type === "String" || ((p = x.annotations) == null ? void 0 : p[$]) === "true",
+        spec: a,
+        annotations: a.annotations,
+        isSubsetFilter: ((m = a.annotations) == null ? void 0 : m[J]) === "true",
+        isDiscreteFilter: a.type === "String" || ((d = a.annotations) == null ? void 0 : d[ee]) === "true",
         parentSources: [e]
       };
-      n.set(g, f);
+      n.set(y, v);
     }
   }
 }
-function Se(t) {
-  const e = C(t), { name: o, type: n } = e;
+function ye(t) {
+  const e = A(t), { name: o, type: n } = e;
   return B(e) ? {
     kind: "column",
     name: "",
@@ -124,39 +218,39 @@ function Se(t) {
     parentSources: []
   };
 }
-function ie(t) {
+function ue(t) {
   return {
     type: t.type,
     components: { ...t.components },
     dividedAxes: { ...t.dividedAxes }
   };
 }
-function ke(t) {
-  const { selectedSource: e, type: o, selectedFilterRange: n, selectedFilterValue: l } = t, s = C(e);
+function Ue(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 c = [];
-    return (n == null ? void 0 : n.max) !== void 0 && c.push({
+    const r = [];
+    return (n == null ? void 0 : n.max) !== void 0 && r.push({
       type: "bySingleColumnV2",
-      column: se(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
+      column: le(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
       predicate: {
         operator: "LessOrEqual",
         reference: n.max
       }
-    }), (n == null ? void 0 : n.min) !== void 0 && c.push({
+    }), (n == null ? void 0 : n.min) !== void 0 && r.push({
       type: "bySingleColumnV2",
-      column: se(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
+      column: le(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
       predicate: {
         operator: "GreaterOrEqual",
         reference: n == null ? void 0 : n.min
       }
-    }), c;
+    }), r;
   } else if (o === "subset")
     return [
       {
         type: "bySingleColumnV2",
-        column: se(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
+        column: le(s) ? { type: "axis", id: s.toPFrameId() } : { type: "column", id: s.name },
         predicate: {
           operator: "Not",
           operand: { operator: "IsNA" }
@@ -166,7 +260,7 @@ function ke(t) {
   return typeof l > "u" ? [] : [
     {
       type: "bySingleColumnV2",
-      column: se(s) ? { type: "axis", id: s.toPFrameId() } : {
+      column: le(s) ? { type: "axis", id: s.toPFrameId() } : {
         type: "column",
         id: s.name
       },
@@ -177,125 +271,120 @@ function ke(t) {
     }
   ];
 }
-function U(t) {
+function Y(t) {
   const e = [];
   for (const o of t)
-    e.push(...ke(o));
+    e.push(...Ue(o));
   return e;
 }
-function ye(t) {
+function fe(t) {
   var e, o, n, l;
   if ("kind" in t && t.kind === "PColumn") {
-    const a = (o = t.name) != null ? o : (e = t.annotations) == null ? void 0 : e[Oe], r = (l = t.domain) != null ? l : (n = t.annotations) == null ? void 0 : n[Fe];
-    return j({ name: a, domain: r });
+    const c = (o = t.name) != null ? o : (e = t.annotations) == null ? void 0 : e[Le], i = (l = t.domain) != null ? l : (n = t.annotations) == null ? void 0 : n[Te];
+    return z({ name: c, domain: i });
   }
-  const s = t.name, c = t.domain;
-  return j({ name: s, domain: c });
+  const s = t.name, r = t.domain;
+  return z({ name: s, domain: r });
 }
 async function ve(t, e, o) {
   var n;
   for (const l of o) {
-    const s = C(l);
+    const s = A(l);
     if (B(s)) {
-      const c = await t.pFrameProvider.getColumnSpecById(s), a = ((n = c == null ? void 0 : c.axesSpec) != null ? n : []).find(
-        (r) => _.fromAxisSpec(r).toCanonicalString() === e.toCanonicalString()
+      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 (a)
-        return a;
+      if (c)
+        return c;
     }
   }
   return null;
 }
-var Ne = "pl7.app/label";
-async function E(t, e, o) {
-  const n = C(e);
+var We = "pl7.app/label";
+async function k(t, e, o) {
+  const n = A(e);
   if (B(n))
     return;
-  async function l(r) {
-    const u = await ve(t, r, o);
-    return u ? ye(u) : null;
+  async function l(i) {
+    const p = await ve(t, i, o);
+    return p ? fe(p) : null;
   }
-  const s = await t.pFrameProvider.getColumnsFull([], !1, void 0, [Ne]), c = await l(n), a = s.find(({ spec: r }) => r && r.axesSpec.length === 1 && ye(r.axesSpec[0]) === c);
-  return a ? new Y({ name: a.columnId, type: a.spec.valueType }) : void 0;
+  const s = await t.pFrameProvider.getColumnsFull([], !1, void 0, [We]), 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;
 }
-async function F(t, e, o) {
+async function T(t, e, o) {
   var n, l;
-  const s = C(e), c = await E(t, e, o);
-  let a;
-  if (B(s) ? a = await t.pFrameProvider.getColumnSpecById(c ?? s) : a = c ? await t.pFrameProvider.getColumnSpecById(c) : await ve(t, s, o), !a)
+  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)
     return "";
-  const r = (l = (n = a.annotations) == null ? void 0 : n[ge]) != null ? l : a.name;
-  return t.labelsModifier(a.name, r);
+  const i = (l = (n = c.annotations) == null ? void 0 : n[he]) != null ? l : c.name;
+  return t.labelsModifier(c.name, i);
 }
-function Ce(t) {
+function Ae(t) {
   var e, o;
-  const n = (o = (e = t.annotations) == null ? void 0 : e[Pe]) == null ? void 0 : o.toLowerCase();
+  const n = (o = (e = t.annotations) == null ? void 0 : e[_e]) == null ? void 0 : o.toLowerCase();
   return !!n && n !== "homogenous" && n !== "homogeneous";
 }
-function H(t) {
+function R(t) {
   var e, o;
-  return ((e = t.annotations) == null ? void 0 : e[K]) === "true" || ((o = t.annotations) == null ? void 0 : o[$]) === "true", !0;
+  return ((e = t.annotations) == null ? void 0 : e[J]) === "true" || ((o = t.annotations) == null ? void 0 : o[ee]) === "true", !0;
 }
-function Ge(t) {
+function He(t) {
   var e, o;
-  return !t.name.includes("metadata") && ((e = t.annotations) == null ? void 0 : e[Te]) !== "true" && ((o = t.annotations) == null ? void 0 : o[K]) !== "true";
+  return !t.name.includes("metadata") && ((e = t.annotations) == null ? void 0 : e[Ne]) !== "true" && ((o = t.annotations) == null ? void 0 : o[J]) !== "true";
 }
-async function W(t) {
+function Ye(t) {
   var e;
-  const o = await t.pFrameProvider.getColumns(
-    [],
-    !1,
-    void 0,
-    void 0,
-    { [we]: "true" }
-  ), n = {};
-  for (const l of o) {
-    const s = await t.pFrameProvider.getColumnSpecById(l), c = (e = s == null ? void 0 : s.axesSpec) != null ? e : [];
-    if (s && c.length) {
-      const [a, r] = c, u = _.fromAxisSpec(a).toCanonicalString(), p = _.fromAxisSpec(r).toCanonicalString();
-      n[u] || (n[u] = {}), n[p] || (n[p] = {}), n[u][p] = { id: l, spec: s }, n[p][u] = { id: l, spec: s };
+  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 };
     }
   }
-  return n;
+  return o;
 }
-async function X(t, e) {
-  const o = /* @__PURE__ */ new Set();
-  for (const n of e) {
-    const l = C(n);
-    if (B(l)) {
-      const s = await t.pFrameProvider.getColumnSpecById(l);
-      if (!s)
+async function $(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)
         continue;
-      s.axesSpec.forEach((c) => {
-        o.add(_.fromAxisSpec(c).toCanonicalString());
+      r.axesSpec.forEach((c) => {
+        const i = _.fromAxisSpec(c).toCanonicalString();
+        o.has(i) || (o.add(i), n.push(c));
       });
     }
   }
-  return o;
+  return n;
 }
-function qe(t, e, o) {
+function Re(t, e, o) {
   const n = {}, l = /* @__PURE__ */ new Set([e]);
   let s = [e];
   for (; s.length; ) {
-    const c = /* @__PURE__ */ new Set();
-    for (const a of s)
-      if (t[a]) {
-        const r = Object.keys(t[a]);
-        for (const u of r)
-          if (n[u] = a, u === o) {
-            const p = [];
+    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 = [];
             let m = o;
             for (; n[m] !== e; )
-              p.push(m), m = n[m];
-            return p.push(m), p.map((d) => t[d][n[d]].id);
-          } else l.has(u) || (c.add(u), l.add(u));
+              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));
       }
-    s = [...c];
+    s = [...r];
   }
   return null;
 }
-function Me(t, e, o) {
-  const n = [...e].map((s) => qe(t, s, o)).filter((s) => s !== null);
+function Xe(t, e, o) {
+  const n = [...e].map((s) => Re(t, s, o)).filter((s) => s !== null);
   if (n.length === 0)
     return [];
   let l = n[0];
@@ -303,37 +392,90 @@ function Me(t, e, o) {
     s.length < l.length && (l = s);
   return l;
 }
-async function M(t, e, o, n, l) {
-  const s = C(n);
-  if (!B(s))
+async function X(t) {
+  const e = await t.pFrameProvider.getColumnsFull(
+    [],
+    !1,
+    void 0,
+    void 0,
+    { [xe]: "true" }
+  ), o = Ye(e.filter((l) => l.spec.axesSpec.length === 2)), n = ze(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))
     return [];
-  const c = await t.pFrameProvider.getColumnSpecById(s);
+  const c = await t.pFrameProvider.getColumnSpecById(r);
   if (!c)
     return [];
-  const a = c.axesSpec.map((u) => _.fromAxisSpec(u).toCanonicalString()).filter((u) => !o.has(u) && !(l != null && l.some((p) => p.axisSource === u))), r = /* @__PURE__ */ new Set();
-  return a.forEach((u) => {
-    Me(e, o, u).forEach((m) => {
-      r.add(m.toCanonicalString());
-    });
-  }), [...r].map((u) => C(u));
+  const i = c.axesSpec.filter(
+    (x) => {
+      const w = _.fromAxisSpec(x).toCanonicalString();
+      return !(s != null && s.some((D) => D.axisSource === w));
+    }
+  ), p = new Set(n.map((x) => _.fromAxisSpec(x).toCanonicalString())), u = i.filter((x) => {
+    const w = _.fromAxisSpec(x).toCanonicalString();
+    return !p.has(w);
+  });
+  if (!u.length)
+    return [];
+  const m = te(n), d = te(u);
+  if (!m || !d)
+    throw Error(`Can't create axes tree for ${c.name}`);
+  const h = new Set(m.map(j)), g = /* @__PURE__ */ new Set();
+  return d.forEach((x) => {
+    var w;
+    const D = j(x);
+    if (o.has(D)) {
+      const b = o.get(D), a = (b ? [...b.keys()] : []).find((y) => h.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 (x.length === 1) {
+      const b = _.fromAxisSpec(x[0]).toCanonicalString();
+      Xe(e, p, b).forEach((a) => {
+        g.add(a.toCanonicalString());
+      });
+    }
+  }), [...g].map((x) => A(x));
+}
+function be(t, e, o, n, l) {
+  const r = t.axesSpec.filter(
+    (u) => !o.has(_.fromAxisSpec(u).toCanonicalString())
+  );
+  if (!r.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));
+    }
+  ), i.some((u) => u.length > 1) ? i.flatMap((u) => u) : (i = i.filter(([u]) => !n.has(_.fromAxisSpec(u).toCanonicalString())), i.flatMap((u) => u));
 }
-function he(t, e) {
+function Ie(t, e) {
   const o = e.columnsData[Object.keys(e.columnsData)[0]].length, n = new Int32Array(o).fill(0);
   for (let l = 0; l < o; l++) {
     let s = !1;
-    for (let c = 0; c < t.length; c++) {
-      const { selectedSource: a, selectedFilterValue: r, selectedFilterRange: u, type: p } = t[c], m = C(a), d = (B(m) ? e.columnsData[a] : e.axesData[a])[l];
-      if (r !== void 0 && (s = s || d === r), u !== void 0 && (u.min !== void 0 || u.max !== void 0) && typeof d == "number") {
-        let w = !0;
-        u.min !== void 0 && (w = w && d >= u.min), u.max !== void 0 && (w = w && d <= u.max), s = s || w;
+    for (let r = 0; r < t.length; r++) {
+      const { selectedSource: c, selectedFilterValue: i, selectedFilterRange: p, type: u } = t[r], m = A(c), d = (B(m) ? e.columnsData[c] : e.axesData[c])[l];
+      if (i !== void 0 && (s = s || d === i), p !== void 0 && (p.min !== void 0 || p.max !== void 0) && typeof d == "number") {
+        let h = !0;
+        p.min !== void 0 && (h = h && d >= p.min), p.max !== void 0 && (h = h && d <= p.max), s = s || h;
       }
-      p === "subset" && (s = s || d != null);
+      u === "subset" && (s = s || d != null);
     }
     s && (n[l] = 1);
   }
   return n;
 }
-var R = class {
+var Q = class {
   constructor(t, e) {
     this.simpleComponentControllers = t, this.filterComponentControllers = e, this.ignoredOptionIdNames = [], this.dataInputs = [], this.dontAllowUnfilteredHighCardinality = !1;
   }
@@ -366,20 +508,20 @@ var R = class {
     throw Error(`Unknown input name: ${String(t)}`);
   }
   changeSelected(t, e, o, n) {
-    const l = o.components[t].selectorStates, s = l.filter((r) => !n.find((u) => u.selectedSource === r.selectedSource)), c = n.filter((r) => !l.find((u) => u.selectedSource === r.selectedSource));
-    let a = ie(o);
-    return s.forEach((r) => {
-      a = this.deleteSelected(t, e, a, r);
-    }), c.forEach((r) => {
-      a = this.addSelected(t, a, r);
+    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);
     }), o.components[t].selectorStates = n.map(
-      (r) => o.components[t].selectorStates.find(
-        (u) => u.selectedSource === r.selectedSource
+      (i) => o.components[t].selectorStates.find(
+        (p) => p.selectedSource === i.selectedSource
       )
-    ).filter(Boolean), a;
+    ).filter(Boolean), c;
   }
   switchDividableAxis(t, e) {
-    return ie(t);
+    return ue(t);
   }
   async getMustBeConsumedAxes(t, e) {
     return Promise.resolve(/* @__PURE__ */ new Set());
@@ -400,42 +542,53 @@ var R = class {
       )
     );
   }
-  async getSelectedSourcesInfo(t, e, o, n) {
-    var l;
-    const s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set();
-    for (const u of this.dataInputs)
-      for (const p of e.components[u].selectorStates) {
-        const m = C(p.selectedSource);
-        if (B(m)) {
-          const d = await t.pFrameProvider.getColumnSpecById(m);
-          d && d.axesSpec.forEach(
-            (w) => c.add(_.fromAxisSpec(w).toCanonicalString())
-          );
+  async getSelectedSourcesInfo(t, e, o, n, l) {
+    var s;
+    const r = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Set(), i = [];
+    for (const m of this.dataInputs)
+      for (const d of e.components[m].selectorStates) {
+        const h = A(d.selectedSource);
+        if (B(h)) {
+          const g = await t.pFrameProvider.getColumnSpecById(h);
+          g && g.axesSpec.forEach((x) => {
+            const w = _.fromAxisSpec(x).toCanonicalString();
+            c.has(w) || (c.add(w), i.push(x));
+          });
         }
       }
-    const a = /* @__PURE__ */ new Set();
-    let r = [...c];
-    for (; r.length; ) {
-      const u = [];
-      for (const p of r)
-        if (n[p]) {
-          const m = Object.keys(n[p]);
-          for (const d of m)
-            !a.has(d) && !c.has(d) && (u.push(d), a.add(d));
+    const p = /* @__PURE__ */ new Set();
+    let u = [...c];
+    for (; u.length; ) {
+      const m = [];
+      for (const d of u)
+        if (n[d]) {
+          const h = Object.keys(n[d]);
+          for (const g of h)
+            !p.has(g) && !c.has(g) && (m.push(g), p.add(g));
         }
-      r = u;
+      u = m;
     }
-    for (const [u, { selectorStates: p }] of Object.entries(e.components)) {
-      const d = ((l = this.simpleComponentControllers[u]) != null ? l : this.filterComponentControllers[u]).settings.columnsWithExtraAxesAllowed;
-      for (const { selectedSource: w } of p)
-        await Ee(t, w, o[w], s, c, a, d);
+    for (const [m, { selectorStates: d }] of Object.entries(e.components)) {
+      const g = ((s = this.simpleComponentControllers[m]) != null ? s : this.filterComponentControllers[m]).settings.columnsWithExtraAxesAllowed;
+      for (const { selectedSource: x } of d)
+        await Ke(
+          t,
+          x,
+          o[x],
+          r,
+          i,
+          c,
+          p,
+          g,
+          l
+        );
     }
-    return s;
+    return r;
   }
   getEmptyInputGuide(t) {
     return {
       components: this.createEmptyComponentsGuide(t),
-      getSourceInfo: (e) => Se(e),
+      getSourceInfo: (e) => ye(e),
       freeOptionsSet: /* @__PURE__ */ new Set(),
       axesToBeFixedSet: /* @__PURE__ */ new Set(),
       readyData: !1,
@@ -453,106 +606,107 @@ var R = class {
   async getLabelsMap(t, e) {
     const o = await t.pFrameProvider.getColumnsFull(
       this.dataInputs.reduce((n, l) => {
-        const c = e.components[l].selectorStates.map((a) => C(a.selectedSource));
-        return n.concat(c);
+        const r = e.components[l].selectorStates.map((c) => A(c.selectedSource));
+        return n.concat(r);
       }, []),
       !1
     );
-    return De(o, (n) => n.spec).reduce((n, l) => {
-      const s = new Y({ name: l.value.columnId, type: l.value.spec.valueType }).toCanonicalString();
+    return Oe(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 = Ge) {
+  async calculateOptions(t, e, o = [], n = He) {
     var l, s;
-    const c = this.createEmptyComponentsGuide(e), a = this.getConsumedOptionsSet(e), r = new Set(this.ignoredOptionIdNames), u = new Set(o), p = await W(t), m = await this.getLabelsMap(t, e), d = await this.getSelectedSourcesInfo(t, e, m, p), w = /* @__PURE__ */ new Map(), h = { ...this.simpleComponentControllers, ...this.filterComponentControllers }, A = /* @__PURE__ */ new Set();
-    for (const [f, y] of Object.entries(h)) {
-      const S = await y.getOptions(
+    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), h = await this.getSelectedSourcesInfo(t, e, d, u, m), g = /* @__PURE__ */ new Map(), x = { ...this.simpleComponentControllers, ...this.filterComponentControllers }, w = /* @__PURE__ */ new Set();
+    for (const [y, f] of Object.entries(x)) {
+      const v = await f.getOptions(
         t,
         e,
+        d,
+        c,
+        u,
         m,
-        a,
-        p,
         n,
-        r,
-        u
+        i,
+        p
       );
-      this.dataInputs.includes(f) || S.options.forEach((I) => {
-        A.add(I.value);
+      this.dataInputs.includes(y) || v.options.forEach((P) => {
+        w.add(P.value);
       });
-      for (const [I, P] of S.optionsInfo)
-        w.set(I, P);
-      c[f] = S;
+      for (const [P, O] of v.optionsInfo)
+        g.set(P, O);
+      r[y] = v;
     }
-    const v = (f) => {
-      const y = w.get(f);
-      y && y.kind === "axis" && (y.mustBeConsumed = !0);
-      const S = d.get(f);
-      S && S.kind === "axis" && (S.mustBeConsumed = !0);
-    }, x = await this.getMustBeConsumedAxes(t, e);
-    for (const f of x)
-      v(f);
+    const D = (y) => {
+      const f = g.get(y);
+      f && f.kind === "axis" && (f.mustBeConsumed = !0);
+      const v = h.get(y);
+      v && v.kind === "axis" && (v.mustBeConsumed = !0);
+    }, b = await this.getMustBeConsumedAxes(t, e);
+    for (const y of b)
+      D(y);
     if (this.dontAllowUnfilteredHighCardinality) {
-      const f = (S) => {
-        var I;
-        return ((I = S == null ? void 0 : S.annotations) == null ? void 0 : I[Le]) === "true";
-      }, y = (s = (l = e.components.filters) == null ? void 0 : l.selectorStates.reduce((S, I) => {
-        const P = d.get(I.selectedSource);
-        return (P == null ? void 0 : P.kind) === "column" && P.spec.axesSpec.filter(f).forEach((L) => S.add(_.fromAxisSpec(L).toCanonicalString())), (P == null ? void 0 : P.kind) === "axis" && f(P.spec) && S.add(_.fromAxisSpec(P.spec).toCanonicalString()), S;
+      const y = (v) => {
+        var P;
+        return ((P = v == null ? void 0 : v.annotations) == null ? void 0 : P[Ee]) === "true";
+      }, f = (s = (l = e.components.filters) == null ? void 0 : l.selectorStates.reduce((v, P) => {
+        const O = h.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;
       }, /* @__PURE__ */ new Set())) != null ? s : /* @__PURE__ */ new Set();
-      this.dataInputs.forEach((S) => {
-        for (const { selectedSource: I } of e.components[S].selectorStates) {
-          const P = d.get(I);
-          if ((P == null ? void 0 : P.kind) === "column" && P.spec.axesSpec.filter(f).forEach((L) => {
-            const O = _.fromAxisSpec(L).toCanonicalString();
-            !A.has(O) && !y.has(O) && A.add(O), y.has(O) || v(O);
-          }), (P == null ? void 0 : P.kind) === "axis" && f(P.spec)) {
-            const N = _.fromAxisSpec(P.spec).toCanonicalString();
-            A.has(N) || A.add(N), y.has(N) || v(N);
+      this.dataInputs.forEach((v) => {
+        for (const { selectedSource: P } of e.components[v].selectorStates) {
+          const O = h.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);
           }
         }
       });
     }
-    const b = /* @__PURE__ */ new Set();
-    for (const { selectorStates: f } of Object.values(e.components))
-      for (const { selectedSource: y } of f) {
-        const S = d.get(y);
-        S && S.kind === "column" && S.axesToBeFixed.forEach((I) => {
-          b.add(I);
+    const C = /* @__PURE__ */ new Set();
+    for (const { selectorStates: y } of Object.values(e.components))
+      for (const { selectedSource: f } of y) {
+        const v = h.get(f);
+        v && v.kind === "column" && v.axesToBeFixed.forEach((P) => {
+          C.add(P);
         });
       }
-    const g = await this.isConsistent(t, e, p), i = (f) => {
-      var y, S, I;
-      const P = (y = C(f).toCanonicalString()) != null ? y : f;
-      return (I = (S = w.get(P)) != null ? S : d.get(P)) != null ? I : Se(f);
+    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 : h.get(O)) != null ? P : ye(y);
     };
     return {
-      components: c,
-      getSourceInfo: i,
-      freeOptionsSet: A,
-      axesToBeFixedSet: b,
+      components: r,
+      getSourceInfo: S,
+      freeOptionsSet: w,
+      axesToBeFixedSet: C,
       readyData: this.readyDataInputs(e),
-      ready: this.readyForPlotBuilding(t, e, g, A, i),
-      consistent: g
+      ready: this.readyForPlotBuilding(t, e, a, w, S),
+      consistent: a
     };
   }
   async getUniqueSourceValuesWithLabels(t, e, o, n, l, s) {
-    var c;
-    const a = (p) => p.sort((m, d) => m.label.localeCompare(d.label, "en", { numeric: !0 })), r = e.getSourceInfo(o), u = (c = r.annotations) == null ? void 0 : c[_e];
+    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[ke];
     try {
-      const p = u ? JSON.parse(u).map((m) => String(m)) : null;
-      if (p) {
-        const m = p.map((d) => ({ value: d, label: d }));
-        return a(m), { values: m, overflow: !1 };
+      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 };
       }
     } catch {
-      console.error(`Parsing error: discrete values annotation ${u} in ${o}`);
+      console.error(`Parsing error: discrete values annotation ${p} in ${o}`);
     }
-    if (r.kind === "axis") {
-      const p = C(o), m = r.parentSources.map(C), d = await E(t, o, r.parentSources);
-      let w = [];
+    if (i.kind === "axis") {
+      const u = A(o), m = i.parentSources.map(A), d = await k(t, o, i.parentSources);
+      let h = [];
       if (d) {
-        l && (w = [{
+        l && (h = [{
           type: "bySingleColumnV2",
           column: {
             type: "column",
@@ -562,39 +716,39 @@ var R = class {
             operator: "StringIContains",
             substring: l
           }
-        }]), s && (w = [{
+        }]), s && (h = [{
           type: "bySingleColumnV2",
           column: {
             type: "axis",
-            id: p.toPFrameId()
+            id: u.toPFrameId()
           },
           predicate: {
             operator: "StringIContains",
             substring: s
           }
         }]);
-        const { data: x, axesData: b } = await t.pFrameProvider.getSingleColumnData(d, w), g = b[p.toCanonicalString()], i = [];
-        for (let f = 0; f < Math.min(g.length, n ?? g.length); f++)
-          i.push({ value: String(g[f]), label: String(x[f]) });
-        return a(i), { values: i, overflow: !(n === void 0 || g.length < n) };
+        const { data: D, axesData: b } = await t.pFrameProvider.getSingleColumnData(d, h), 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 h = l ?? s;
-      h && (w = [{
+      const g = l ?? s;
+      g && (h = [{
         type: "bySingleColumnV2",
         column: {
           type: "axis",
-          id: p.toPFrameId()
+          id: u.toPFrameId()
         },
         predicate: {
           operator: "StringIContains",
-          substring: h
+          substring: g
         }
       }]);
-      const A = await t.pFrameProvider.getAxisUniqueValues(p, [m[0]], n, w), v = A.values.map((x) => ({ value: String(x), label: String(x) }));
-      return a(v), { values: v, overflow: A.overflow };
+      const x = await t.pFrameProvider.getAxisUniqueValues(u, [m[0]], n, h), w = x.values.map((D) => ({ value: String(D), label: String(D) }));
+      return c(w), { values: w, overflow: x.overflow };
     }
-    if (r.kind === "column") {
-      const p = l ?? s, m = C(o), d = p ? [{
+    if (i.kind === "column") {
+      const u = l ?? s, m = A(o), d = u ? [{
         type: "bySingleColumnV2",
         column: {
           type: "column",
@@ -602,31 +756,31 @@ var R = class {
         },
         predicate: {
           operator: "StringIContains",
-          substring: p
+          substring: u
         }
-      }] : [], w = await t.pFrameProvider.getColumnUniqueValues(m, n, d), h = w.values.map((A) => ({ value: String(A), label: String(A) }));
-      return a(h), { values: h, overflow: w.overflow };
+      }] : [], h = await t.pFrameProvider.getColumnUniqueValues(m, n, d), g = h.values.map((x) => ({ value: String(x), label: String(x) }));
+      return c(g), { values: g, overflow: h.overflow };
     }
     return { values: [], overflow: !1 };
   }
-  async checkStateConsistency(t, e, o) {
-    const n = /* @__PURE__ */ new Map();
-    for (const l of Object.keys(this.simpleComponentControllers))
-      n.set(
-        l,
-        await this.simpleComponentControllers[l].checkStateConsistency(t, e, o)
+  async checkStateConsistency(t, e, o, n) {
+    const l = /* @__PURE__ */ new Map();
+    for (const s of Object.keys(this.simpleComponentControllers))
+      l.set(
+        s,
+        await this.simpleComponentControllers[s].checkStateConsistency(t, e, o, n)
       );
-    for (const l of Object.keys(this.filterComponentControllers))
-      n.set(
-        l,
-        await this.filterComponentControllers[l].checkStateConsistency(t, e, o)
+    for (const s of Object.keys(this.filterComponentControllers))
+      l.set(
+        s,
+        await this.filterComponentControllers[s].checkStateConsistency(t, e, o, n)
       );
-    return n;
+    return l;
   }
-  async isConsistent(t, e, o) {
-    const n = await this.checkStateConsistency(t, e, o);
-    for (const l of n.values())
-      if (Object.values(l).some((s) => !s))
+  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))
         return !1;
     return !0;
   }
@@ -637,31 +791,31 @@ var R = class {
     if (!o || !this.readyDataInputs(e))
       return !1;
     let s = !1;
-    for (const a of n) {
-      const r = l(a);
-      if (r && r.kind === "axis" && r.mustBeConsumed) {
+    for (const c of n) {
+      const i = l(c);
+      if (i && i.kind === "axis" && i.mustBeConsumed) {
         s = !0;
         break;
       }
     }
-    let c = !1;
-    for (const { selectorStates: a } of Object.values(e.components)) {
-      for (const { selectedSource: r, fixedAxes: u } of a) {
-        const p = l(r);
-        if (p && p.kind === "column" && p.axesToBeFixed.some(
+    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(
           (m) => {
             var d;
-            return ((d = (u ?? []).find((w) => w.axisSource === m)) == null ? void 0 : d.axisValue) === void 0;
+            return ((d = (p ?? []).find((h) => h.axisSource === m)) == null ? void 0 : d.axisValue) === void 0;
           }
         )) {
-          c = !0;
+          r = !0;
           break;
         }
       }
-      if (c)
+      if (r)
         break;
     }
-    return this.requiredComponents.every((a) => e.components[a].selectorStates.length > 0) && !s && !c;
+    return this.requiredComponents.every((c) => e.components[c].selectorStates.length > 0) && !s && !r;
   }
   async createDataForPlot(t, e) {
     return {
@@ -669,18 +823,21 @@ var R = class {
       settings: await this.createChartSettings(t, e)
     };
   }
-}, Ae = class be {
+}, Je = (t) => {
+  var e;
+  return ((e = t == null ? void 0 : t.annotations) == null ? void 0 : e[xe]) === "true";
+}, De = class Be {
   constructor({
     componentName: e,
     allowedTypes: o,
     settings: n,
     strictlyDependsOnParents: l,
     dependsOn: s = [],
-    parentComponents: c = [],
-    annotations: a = {},
-    checkSourceBySpec: r
+    parentComponents: r = [],
+    annotations: c = {},
+    checkSourceBySpec: i
   }) {
-    this.componentName = e, this.allowedTypes = [...o], this.settings = { ...be.DefaultSettings, ...n }, this.dependsOn = [...s], this.parentComponents = [...c], this.strictlyDependsOnParents = l ?? !0, this.annotations = { ...a }, r && (this.checkSourceBySpec = r);
+    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);
   }
   get isRequired() {
     return this.settings.required;
@@ -689,181 +846,205 @@ var R = class {
     return this.settings.dimensionConsumer;
   }
   addSelected(e, o) {
-    const n = ie(e);
+    const n = ue(e);
     return n.components[this.componentName].selectorStates.push(o), n;
   }
   deleteSelected(e, o) {
-    const n = ie(e);
+    const n = ue(e);
     return n.components[this.componentName].selectorStates = n.components[this.componentName].selectorStates.filter((l) => l.selectedSource !== o), n;
   }
-  async checkStateConsistency(e, o, n) {
-    const l = o.components[this.componentName], { allowedAxes: s } = await this.getAllowedAxes(e, o, n);
-    function c(r) {
-      const u = _.fromAxisSpec(r);
-      return s.has(u.toCanonicalString());
+  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 a = await Promise.all(
-      l.selectorStates.map(async ({ selectedSource: r }) => {
-        const u = C(r);
-        if (B(u)) {
-          const p = await e.pFrameProvider.getColumnSpecById(u);
-          return p ? this.parentComponents.length === 0 ? !0 : this.strictlyDependsOnParents && !this.settings.columnsWithExtraAxesAllowed && !this.settings.isDataComponent ? p.axesSpec.every((d) => c(d)) : this.settings.columnsWithExtraAxesAllowed && !this.settings.isDataComponent ? p.axesSpec.some((d) => c(d)) : s.size === 0 || p.axesSpec.some((d) => c(d)) : !1;
+    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)
+            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));
+          if (this.settings.columnsWithExtraAxesAllowed && !this.settings.isDataComponent) {
+            if (d.axesSpec.some((x) => i(x)))
+              return !0;
+            const g = te(d.axesSpec);
+            return g ? g.some((x) => l.has(j(x))) : !1;
+          } else
+            return r.size === 0 || d.axesSpec.some((g) => i(g));
         }
-        return s.has(r);
+        return r.has(u);
       })
     );
-    return l.selectorStates.reduce(
-      (r, u, p) => (r[u.selectedSource] = a[p], r),
+    return s.selectorStates.reduce(
+      (u, m, d) => (u[m.selectedSource] = p[d], u),
       {}
     );
   }
   async getProducingAxes(e, o) {
-    const s = o.components[this.componentName].selectorStates.map((r) => C(r.selectedSource)).filter((r) => B(r)), c = /* @__PURE__ */ new Set();
+    const s = o.components[this.componentName].selectorStates.map((i) => A(i.selectedSource)).filter((i) => B(i)), r = /* @__PURE__ */ new Set();
     return (await Promise.all(
-      s.map((r) => e.pFrameProvider.getColumnSpecById(r))
-    )).forEach((r) => {
-      r && r.axesSpec.forEach((u) => {
-        c.add(_.fromAxisSpec(u).toCanonicalString());
+      s.map((i) => e.pFrameProvider.getColumnSpecById(i))
+    )).forEach((i) => {
+      i && i.axesSpec.forEach((p) => {
+        r.add(_.fromAxisSpec(p).toCanonicalString());
       });
-    }), c;
+    }), r;
   }
   getParentSelectedSources(e, o) {
     return this.parentComponents.reduce((l, s) => {
-      const c = o.components[s].selectorStates.map(
-        (a) => C(a.selectedSource)
+      const r = o.components[s].selectorStates.map(
+        (c) => A(c.selectedSource)
       );
-      return l.push(...c), l;
+      return l.push(...r), l;
     }, []);
   }
   async getParentAxes(e, o) {
     var n;
     const l = this.getParentSelectedSources(e, o), s = /* @__PURE__ */ new Set();
-    for (const c of l)
-      if (B(c)) {
-        const a = await e.pFrameProvider.getColumnSpecById(c);
-        (n = a == null ? void 0 : a.axesSpec) == null || n.forEach((r) => {
-          const u = _.fromAxisSpec(r);
-          s.add(u.toCanonicalString());
+    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());
         });
       }
     return s;
   }
   async getAllowedAxes(e, o, n) {
-    var l, s, c, a, r, u, p;
-    const m = this.getParentSelectedSources(e, o), d = /* @__PURE__ */ new Set(), w = /* @__PURE__ */ new Set(), h = /* @__PURE__ */ new Set(), A = /* @__PURE__ */ new Map();
-    for (const x of m)
-      if (B(x)) {
-        const b = await e.pFrameProvider.getColumnSpecById(x);
-        for (const g of (l = b == null ? void 0 : b.axesSpec) != null ? l : []) {
-          const f = _.fromAxisSpec(g).toCanonicalString();
-          if (d.has(f))
+    var l, s, r, c, i, p, u;
+    const m = this.getParentSelectedSources(e, o), d = /* @__PURE__ */ new Set(), h = [], g = /* @__PURE__ */ new Set(), x = /* @__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))
             continue;
-          d.add(f), w.add(f);
-          const y = Ce(g);
-          A.set(f, {
+          d.add(S), h.push(C);
+          const y = Ae(C);
+          x.set(S, {
             kind: "axis",
-            name: g.name,
-            label: await F(e, f, [
-              x.toCanonicalString()
+            name: C.name,
+            label: await T(e, S, [
+              D.toCanonicalString()
             ]),
-            type: g.type,
+            type: C.type,
             mustBeConsumed: y,
             dividable: !1,
-            spec: g,
-            annotations: g.annotations,
-            isSubsetFilter: ((s = g.annotations) == null ? void 0 : s[K]) === "true",
-            isDiscreteFilter: g.type === "String" || ((c = g.annotations) == null ? void 0 : c[$]) === "true",
-            parentSources: [x.toCanonicalString()]
+            spec: C,
+            annotations: C.annotations,
+            isSubsetFilter: ((s = C.annotations) == null ? void 0 : s[J]) === "true",
+            isDiscreteFilter: C.type === "String" || ((r = C.annotations) == null ? void 0 : r[ee]) === "true",
+            parentSources: [D.toCanonicalString()]
           });
         }
       }
-    let v = [...d];
-    for (; v.length; ) {
-      const x = [];
-      for (const b of v)
+    let w = [...d];
+    for (; w.length; ) {
+      const D = [];
+      for (const b of w)
         if (n[b]) {
-          const g = Object.keys(n[b]);
-          for (const i of g)
-            if (!d.has(i)) {
-              x.push(i), d.add(i), h.add(i);
-              const { spec: f, id: y } = n[b][i];
-              for (const S of f.axesSpec) {
-                const I = _.fromAxisSpec(S).toCanonicalString();
-                A.has(I) || A.set(I, {
+          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();
+                x.has(v) || x.set(v, {
                   kind: "axis",
-                  name: S.name,
-                  label: (r = (a = S.annotations) == null ? void 0 : a[ge]) != null ? r : "",
-                  type: S.type,
+                  name: f.name,
+                  label: (i = (c = f.annotations) == null ? void 0 : c[he]) != null ? i : "",
+                  type: f.type,
                   mustBeConsumed: !1,
                   dividable: !1,
-                  spec: S,
-                  annotations: S.annotations,
-                  isSubsetFilter: ((u = S.annotations) == null ? void 0 : u[K]) === "true",
-                  isDiscreteFilter: S.type === "String" || ((p = S.annotations) == null ? void 0 : p[$]) === "true",
+                  spec: f,
+                  annotations: f.annotations,
+                  isSubsetFilter: ((p = f.annotations) == null ? void 0 : p[J]) === "true",
+                  isDiscreteFilter: f.type === "String" || ((u = f.annotations) == null ? void 0 : u[ee]) === "true",
                   parentSources: [y.toCanonicalString()]
                 });
               }
             }
         }
-      v = x;
+      w = D;
     }
-    return { allowedAxes: d, parentAxes: w, linkerAxes: h, optionsInfo: A };
+    return { parentAxes: d, parentAxesList: h, linkerAxes: g, optionsInfo: x };
   }
-  async getOptions(e, o, n, l, s, c, a = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set()) {
-    var u, p, m, d, w, h, A, v;
-    const x = this.settings.multipleSelectors, b = this.settings.required, g = await this.checkStateConsistency(e, o, s);
+  async getOptions(e, o, n, l, s, r, c, i = /* @__PURE__ */ new Set(), p = /* @__PURE__ */ new Set()) {
+    var u, m, d, h, g;
+    const x = this.settings.multipleSelectors, w = this.settings.required, D = await this.checkStateConsistency(e, o, s, r);
     if (this.dependsOn.length && this.dependsOn.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: x, required: b, stateConsistency: g, options: [], optionsInfo: /* @__PURE__ */ new Map() };
+      return { multipleSelectors: x, required: w, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
     if (this.strictlyDependsOnParents && !this.settings.isDataComponent && this.parentComponents.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: x, required: b, stateConsistency: g, options: [], optionsInfo: /* @__PURE__ */ new Map() };
-    const i = this.getParentSelectedSources(e, o), f = (await e.pFrameProvider.getColumns([], !1, this.allowedTypes, void 0, this.annotations)).filter((O) => !l.has(O.toCanonicalString())), { allowedAxes: y, parentAxes: S, linkerAxes: I, optionsInfo: P } = await this.getAllowedAxes(e, o, s), N = o.components[this.componentName], L = [];
+      return { multipleSelectors: x, 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 = [];
     if (this.settings.axesAllowed)
-      for (const O of S) {
-        const T = C(O), k = P.get(T.toCanonicalString()), q = this.allowedTypes.includes(k.spec.type), G = Object.entries(this.annotations).every(
-          ([ee, V]) => {
-            var J;
-            return ((J = k.spec.annotations) == null ? void 0 : J[ee]) === V;
+      for (const O of a) {
+        const N = A(O), L = f.get(N.toCanonicalString()), E = this.allowedTypes.includes(L.spec.type), F = Object.entries(this.annotations).every(
+          ([oe, q]) => {
+            var U;
+            return ((U = L.spec.annotations) == null ? void 0 : U[oe]) === q;
           }
-        ), Z = this.checkSourceBySpec ? this.checkSourceBySpec(k.spec, o) : !0, Q = !this.settings.homogeneous || !(k != null && k.mustBeConsumed), ne = !l.has(O), oe = a.has(T.name) || r.has(T.toCanonicalString()), ue = N.selectorStates.some((ee) => ee.selectedSource === O);
-        q && G && Z && Q && ne && !oe && !ue && L.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 = 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 });
       }
     if (this.settings.columnsAllowed) {
       const O = !this.settings.columnsWithExtraAxesAllowed && this.strictlyDependsOnParents;
-      for (const T of f) {
-        const k = T.toCanonicalString(), q = C(k), G = await e.pFrameProvider.getColumnSpecById(q), Z = ((u = G == null ? void 0 : G.annotations) == null ? void 0 : u[we]) === "true";
+      for (const N of C) {
+        const L = N.toCanonicalString(), E = A(L), F = await e.pFrameProvider.getColumnSpecById(E);
+        if (!F)
+          continue;
+        const G = be(
+          F,
+          y,
+          a,
+          S,
+          r
+        ).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
-          !G || Be(G) || Z || this.checkSourceBySpec && !this.checkSourceBySpec(G, o) || this.settings.isDataComponent && !c(G) || O && ((p = G.axesSpec) != null && p.some((V) => !y.has(_.fromAxisSpec(V).toCanonicalString()))) || i.length && !((m = G.axesSpec) != null && m.some((V) => y.has(_.fromAxisSpec(V).toCanonicalString())))
+          Fe(F) || Je(F) || this.checkSourceBySpec && !this.checkSourceBySpec(F, o) || this.settings.isDataComponent && !c(F) || O && G.length > 0 || b.length && G.length > 0 && !F.axesSpec.some((q) => {
+            const U = _.fromAxisSpec(q).toCanonicalString();
+            return a.has(U) || S.has(U);
+          })
         )
           continue;
-        const Q = (w = (d = G == null ? void 0 : G.axesSpec) == null ? void 0 : d.map((V) => _.fromAxisSpec(V).toCanonicalString())) != null ? w : [], ne = [], oe = {};
-        if (this.settings.columnsWithExtraAxesAllowed && Q.forEach((V, J) => {
-          y.has(V) || (ne.push(V), oe[V] = J);
-        }), G) {
-          const V = (h = n[k]) != null ? h : await F(e, T.toCanonicalString(), []), J = {
+        const K = (m = (u = F == null ? void 0 : F.axesSpec) == null ? void 0 : u.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 = {
             kind: "column",
-            name: G.name,
-            label: V,
-            type: G.valueType,
-            spec: G,
-            annotations: G.annotations,
-            isSubsetFilter: ((A = G.annotations) == null ? void 0 : A[K]) === "true",
-            isDiscreteFilter: G.valueType === "String" || ((v = G.annotations) == null ? void 0 : v[$]) === "true",
-            axesToBeFixed: ne,
-            axesToBeFixedIndexes: oe
+            name: F.name,
+            label: q,
+            type: F.valueType,
+            spec: F,
+            annotations: F.annotations,
+            isSubsetFilter: ((h = F.annotations) == null ? void 0 : h[J]) === "true",
+            isDiscreteFilter: F.valueType === "String" || ((g = F.annotations) == null ? void 0 : g[ee]) === "true",
+            axesToBeFixed: G,
+            axesToBeFixedIndexes: Z
           };
-          P.set(q.toCanonicalString(), J);
+          f.set(E.toCanonicalString(), U);
         }
-        const ue = a.has(q.name) || r.has(q.toCanonicalString()), ee = o.components[this.componentName].selectorStates.some(
-          (V) => V.selectedSource === k
+        const ne = i.has(E.name) || p.has(E.toCanonicalString()), oe = o.components[this.componentName].selectorStates.some(
+          (q) => q.selectedSource === L
         );
-        !ue && !ee && L.push({ value: k });
+        !ne && !oe && P.push({ value: L });
       }
     }
-    return { multipleSelectors: x, required: b, stateConsistency: g, options: L, optionsInfo: P };
+    return { multipleSelectors: x, required: w, stateConsistency: D, options: P, optionsInfo: f };
   }
 };
-Ae.DefaultSettings = {
+De.DefaultSettings = {
   isDataComponent: !1,
   multipleSelectors: !1,
   required: !1,
@@ -873,7 +1054,7 @@ Ae.DefaultSettings = {
   columnsWithExtraAxesAllowed: !0,
   dimensionConsumer: !1
 };
-var D = Ae, Ve = {
+var I = De, $e = {
   type: "bubble",
   components: {
     valueSize: { type: "simple", selectorStates: [] },
@@ -887,23 +1068,23 @@ var D = Ae, Ve = {
   },
   dividedAxes: {}
 };
-function le(t, e) {
+function ae(t, e) {
   if (!e.length)
     return [];
-  const o = e.map((s) => C(s)), n = Object.values(t.columnsData)[0].length, l = [];
+  const o = e.map((s) => A(s)), n = Object.values(t.columnsData)[0].length, l = [];
   for (let s = 0; s < n; s++) {
-    const c = o.map((a) => {
-      const r = a.toCanonicalString();
-      return B(a) ? t.columnsData[r][s] : t.axesData[r][s];
+    const r = o.map((c) => {
+      const i = c.toCanonicalString();
+      return B(c) ? t.columnsData[i][s] : t.axesData[i][s];
     }).join(", ");
-    l.push(c);
+    l.push(r);
   }
   return l;
 }
-var je = class extends R {
+var Qe = class extends Q {
   constructor() {
     super({
-      valueSize: new D({
+      valueSize: new I({
         componentName: "valueSize",
         allowedTypes: ["Int", "Long", "Double", "Float"],
         strictlyDependsOnParents: !0,
@@ -915,7 +1096,7 @@ var je = class extends R {
           required: !0
         }
       }),
-      valueColor: new D({
+      valueColor: new I({
         componentName: "valueColor",
         allowedTypes: ["Int", "Long", "Double", "Float"],
         strictlyDependsOnParents: !0,
@@ -927,7 +1108,7 @@ var je = class extends R {
           required: !0
         }
       }),
-      x: new D({
+      x: new I({
         componentName: "x",
         allowedTypes: ["Int", "String", "Long"],
         strictlyDependsOnParents: !0,
@@ -940,7 +1121,7 @@ var je = class extends R {
           columnsAllowed: !1
         }
       }),
-      y: new D({
+      y: new I({
         componentName: "y",
         allowedTypes: ["Int", "String", "Long"],
         strictlyDependsOnParents: !0,
@@ -953,7 +1134,7 @@ var je = class extends R {
           columnsAllowed: !1
         }
       }),
-      tooltipContent: new D({
+      tooltipContent: new I({
         componentName: "tooltipContent",
         allowedTypes: ["String", "Int", "Long", "Float", "Double"],
         strictlyDependsOnParents: !0,
@@ -964,7 +1145,7 @@ var je = class extends R {
           multipleSelectors: !0
         }
       }),
-      facetBy: new D({
+      facetBy: new I({
         componentName: "facetBy",
         allowedTypes: ["String", "Int", "Long"],
         strictlyDependsOnParents: !0,
@@ -976,7 +1157,7 @@ var je = class extends R {
         }
       })
     }, {
-      filters: new D({
+      filters: new I({
         componentName: "filters",
         allowedTypes: ["String", "Int", "Long", "Double", "Long"],
         strictlyDependsOnParents: !0,
@@ -987,9 +1168,9 @@ var je = class extends R {
           dimensionConsumer: !0,
           multipleSelectors: !0
         },
-        checkSourceBySpec: H
+        checkSourceBySpec: R
       }),
-      tabBy: new D({
+      tabBy: new I({
         componentName: "tabBy",
         allowedTypes: ["String", "Int"],
         strictlyDependsOnParents: !0,
@@ -1005,139 +1186,141 @@ var je = class extends R {
   async getMustBeConsumedAxes(t, e) {
     if (!e.components.valueColor.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const o = e.components.valueColor.selectorStates[0].selectedSource, n = await t.pFrameProvider.getColumnSpecById(C(o));
+    const o = e.components.valueColor.selectorStates[0].selectedSource, n = await t.pFrameProvider.getColumnSpecById(A(o));
     return n ? new Set(n.axesSpec.map((l) => _.fromAxisSpec(l).toCanonicalString())) : /* @__PURE__ */ new Set();
   }
   async createDataByColumns(t, e) {
     var o, n, l;
-    const s = (o = e.components.valueColor.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.valueSize.selectorStates[0]) == null ? void 0 : n.selectedSource;
-    if (!s || !c)
+    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)
       throw Error("Value column is not valid");
-    const a = C(s), r = C(c);
-    if (!a || !r || !B(a) && !B(r))
+    const c = A(s), i = A(r);
+    if (!c || !i || !B(c) && !B(i))
       throw Error("Value column is not valid");
-    const u = {
+    const p = {
       type: "columns",
-      id: (l = j(e.components)) != null ? l : "",
+      id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, p = await W(t), m = [
+    }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], d = U(m), w = m.map((T) => C(T.selectedSource)).filter(B), h = [a, r].filter(B), A = h.map((T) => T.toCanonicalString()), v = await X(t, A), x = [
+    ], h = Y(d), g = d.map((F) => A(F.selectedSource)).filter(B), x = [c, i].filter(B), w = x.map((F) => F.toCanonicalString()), D = await $(t, w), b = [
       e.components.facetBy,
       e.components.x,
       e.components.y,
       e.components.tooltipContent
-    ], b = [], g = h.map(() => []), i = [], f = [];
-    for (const { selectedSource: T, fixedAxes: k } of m)
-      f.push(...await M(
+    ], C = [], a = x.map(() => []), S = [], y = [];
+    for (const { selectedSource: F, fixedAxes: G } of d)
+      y.push(...await V(
         t,
-        p,
-        v,
-        T,
-        k
-      )), g.push(
-        (k ?? []).map(({ axisIdx: q, axisValue: G }) => ({ idx: q, value: G }))
+        u,
+        m,
+        D,
+        F,
+        G
+      )), a.push(
+        (G ?? []).map(({ axisIdx: M, axisValue: K }) => ({ idx: M, value: K }))
       );
-    for (const T of x)
-      for (const { selectedSource: k, fixedAxes: q } of T.selectorStates) {
-        b.push(C(k)), i.push(
-          (q ?? []).map(({ axisIdx: Z, axisValue: Q }) => ({ idx: Z, value: Q }))
-        ), f.push(...await M(
+    for (const F of b)
+      for (const { selectedSource: G, fixedAxes: M } of F.selectorStates) {
+        C.push(A(G)), S.push(
+          (M ?? []).map(({ axisIdx: Z, axisValue: ne }) => ({ idx: Z, value: ne }))
+        ), y.push(...await V(
           t,
-          p,
-          v,
-          k,
-          q
+          u,
+          m,
+          D,
+          G,
+          M
         ));
-        const G = await E(t, k, A);
-        G && b.push(G);
+        const K = await k(t, G, w);
+        K && C.push(K);
       }
-    const y = await t.pFrameProvider.getTableOuterJoin(
-      [...h, ...f, ...w],
-      b,
-      d,
+    const f = await t.pFrameProvider.getTableOuterJoin(
+      [...x, ...y, ...g],
+      C,
+      h,
       !0,
-      g,
-      i
+      a,
+      S
     );
-    b.forEach((T) => {
-      const k = T.toCanonicalString();
-      u.values[k] = B(T) ? y.columnsData[k] : y.axesData[k];
-    }), u.values[s] = B(a) ? y.columnsData[s] : y.axesData[s], u.values[c] = B(r) ? y.columnsData[c] : y.axesData[c];
-    const S = e.components.x.selectorStates.map((T) => T.selectedSource), I = S.join(", "), P = await Promise.all(S.map(
-      async (T) => {
-        var k, q;
-        return (q = (k = await E(t, T, A)) == null ? void 0 : k.toCanonicalString()) != null ? q : T;
+    C.forEach((F) => {
+      const G = F.toCanonicalString();
+      p.values[G] = B(F) ? f.columnsData[G] : f.axesData[G];
+    }), p.values[s] = B(c) ? f.columnsData[s] : f.axesData[s], p.values[r] = B(i) ? f.columnsData[r] : f.axesData[r];
+    const v = e.components.x.selectorStates.map((F) => F.selectedSource), P = v.join(", "), O = await Promise.all(v.map(
+      async (F) => {
+        var G, M;
+        return (M = (G = await k(t, F, w)) == null ? void 0 : G.toCanonicalString()) != null ? M : F;
       }
     ));
-    u.values[I] = le(y, S), u.values.xLabels = le(y, P);
-    const N = e.components.y.selectorStates.map((T) => T.selectedSource), L = N.join(", "), O = await Promise.all(N.map(
-      async (T) => {
-        var k, q;
-        return (q = (k = await E(t, T, A)) == null ? void 0 : k.toCanonicalString()) != null ? q : T;
+    p.values[P] = ae(f, v), p.values.xLabels = ae(f, O);
+    const N = e.components.y.selectorStates.map((F) => F.selectedSource), L = N.join(", "), E = await Promise.all(N.map(
+      async (F) => {
+        var G, M;
+        return (M = (G = await k(t, F, w)) == null ? void 0 : G.toCanonicalString()) != null ? M : F;
       }
     ));
-    return u.values[L] = le(y, N), u.values.yLabels = le(y, O), { byColumns: u };
+    return p.values[L] = ae(f, N), p.values.yLabels = ae(f, E), { byColumns: p };
   }
   async createChartSettings(t, e) {
     var o, n;
     const l = (o = e.components.valueColor.selectorStates[0]) == null ? void 0 : o.selectedSource, s = (n = e.components.valueSize.selectorStates[0]) == null ? void 0 : n.selectedSource;
     if (!l || !s)
       throw Error("Value column is not valid");
-    const c = C(l), a = C(s);
-    if (!B(c) && !B(a))
+    const r = A(l), c = A(s);
+    if (!B(r) && !B(c))
       throw Error("Value column is not valid");
-    const r = [c, a].filter(B).map((g) => g.toCanonicalString()), u = {
+    const i = [r, c].filter(B).map((C) => C.toCanonicalString()), p = {
       type: "column",
       value: l,
-      label: await F(t, l, [])
-    }, p = {
+      label: await T(t, l, [])
+    }, u = {
       type: "column",
       value: s,
-      label: await F(t, s, [])
-    }, d = e.components.x.selectorStates.map(({ selectedSource: g }) => g).join(", "), h = e.components.y.selectorStates.map(({ selectedSource: g }) => g).join(", "), A = await Promise.all(e.components.facetBy.selectorStates.map(async (g) => {
-      var i, f;
+      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(", "), x = await Promise.all(e.components.facetBy.selectorStates.map(async (C) => {
+      var a, S;
       return {
         type: "column",
-        value: (f = (i = await E(t, g.selectedSource, r)) == null ? void 0 : i.toCanonicalString()) != null ? f : g.selectedSource
+        value: (S = (a = await k(t, C.selectedSource, i)) == null ? void 0 : a.toCanonicalString()) != null ? S : C.selectedSource
       };
-    })), v = (await Promise.all(e.components.x.selectorStates.map((g) => F(t, g.selectedSource, r)))).join(", "), x = (await Promise.all(e.components.y.selectorStates.map((g) => F(t, g.selectedSource, r)))).join(", "), b = await Promise.all(
-      e.components.tooltipContent.selectorStates.map(async (g) => {
-        var i, f;
-        const y = g.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;
         return {
           type: "column",
-          label: await F(t, y, r) || y,
+          label: await T(t, y, i) || y,
           value: y,
-          valueLabels: (f = (i = await E(t, y, r)) == null ? void 0 : i.toCanonicalString()) != null ? f : y
+          valueLabels: (S = (a = await k(t, y, i)) == null ? void 0 : a.toCanonicalString()) != null ? S : y
         };
       })
     );
     return {
       type: "bubble",
-      valueColor: u,
-      valueSize: p,
+      valueColor: p,
+      valueSize: u,
       xColumn: {
         type: "column",
         value: d,
-        label: v,
+        label: w,
         valueLabels: "xLabels"
       },
       yColumn: {
         type: "column",
-        value: h,
-        label: x,
+        value: g,
+        label: D,
         valueLabels: "yLabels"
       },
-      facetBy: A,
+      facetBy: x,
       tooltips: {
         show: !0,
         content: b
       }
     };
   }
-}, ze = {
+}, Ze = {
   type: "histogram",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -1147,11 +1330,11 @@ var je = class extends R {
     facetBy: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, Ue = class extends R {
+}, et = class extends Q {
   constructor() {
     super(
       {
-        value: new D({
+        value: new I({
           componentName: "value",
           allowedTypes: ["Int", "Long", "Double", "Float"],
           settings: {
@@ -1161,7 +1344,7 @@ var je = class extends R {
             required: !0
           }
         }),
-        grouping: new D({
+        grouping: new I({
           componentName: "grouping",
           allowedTypes: ["String", "Int", "Long"],
           parentComponents: ["value"],
@@ -1171,7 +1354,7 @@ var je = class extends R {
             multipleSelectors: !1
           }
         }),
-        facetBy: new D({
+        facetBy: new I({
           componentName: "facetBy",
           allowedTypes: ["String", "Int", "Long"],
           parentComponents: ["value"],
@@ -1184,7 +1367,7 @@ var je = class extends R {
         })
       },
       {
-        filters: new D({
+        filters: new I({
           componentName: "filters",
           allowedTypes: ["String", "Int", "Long", "Double", "Float"],
           parentComponents: ["value"],
@@ -1195,9 +1378,9 @@ var je = class extends R {
             dimensionConsumer: !0,
             multipleSelectors: !0
           },
-          checkSourceBySpec: H
+          checkSourceBySpec: R
         }),
-        tabBy: new D({
+        tabBy: new I({
           componentName: "tabBy",
           allowedTypes: ["String", "Int"],
           parentComponents: ["value"],
@@ -1216,87 +1399,85 @@ var je = class extends R {
     const l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource;
     if (!l)
       throw Error("Value column is not valid");
-    const s = C(l);
+    const s = A(l);
     if (!B(s))
       throw Error("Value column is not valid");
-    const c = {
+    const r = {
       type: "columns",
-      id: (n = j(e.components)) != null ? n : "",
+      id: (n = z(e.components)) != null ? n : "",
       values: {}
-    }, a = await W(t), r = [
+    }, { linkerColumnsMap: c, compositeLinkerMap: i } = await X(t), p = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], u = U(r), p = r.map((g) => C(g.selectedSource)).filter(B), m = [l], d = await X(t, m), w = [e.components.facetBy, e.components.grouping], h = [], A = [[]], v = [], x = [];
-    for (const { selectedSource: g, fixedAxes: i } of r)
-      x.push(
-        ...await M(t, a, d, g, i)
-      ), x.push(
-        ...await M(t, a, d, g, i)
-      ), A.push(
-        (i ?? []).map(({ axisIdx: f, axisValue: y }) => ({ idx: f, value: y }))
+    ], u = Y(p), m = p.map((a) => A(a.selectedSource)).filter(B), d = [l], h = await $(t, d), g = [e.components.facetBy, e.components.grouping], x = [], w = [[]], D = [], b = [];
+    for (const { selectedSource: a, fixedAxes: S } of p)
+      b.push(
+        ...await V(t, c, i, h, a, S)
+      ), w.push(
+        (S ?? []).map(({ axisIdx: y, axisValue: f }) => ({ idx: y, value: f }))
       );
-    for (const g of w)
-      for (const { selectedSource: i, fixedAxes: f } of g.selectorStates) {
-        h.push(C(i)), v.push(
-          (f ?? []).map(({ axisIdx: S, axisValue: I }) => ({ idx: S, value: I }))
-        ), x.push(
-          ...await M(t, a, d, i, f)
+    for (const a of g)
+      for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
+        x.push(A(S)), D.push(
+          (y ?? []).map(({ axisIdx: v, axisValue: P }) => ({ idx: v, value: P }))
+        ), b.push(
+          ...await V(t, c, i, h, S, y)
         );
-        const y = await E(t, i, m);
-        y && h.push(y);
+        const f = await k(t, S, d);
+        f && x.push(f);
       }
-    const b = await t.pFrameProvider.getTableOuterJoin(
-      [s, ...x, ...p],
-      h,
+    const C = await t.pFrameProvider.getTableOuterJoin(
+      [s, ...b, ...m],
+      x,
       u,
       !0,
-      A,
-      v
+      w,
+      D
     );
-    return h.forEach((g) => {
-      const i = g.toCanonicalString();
-      c.values[i] = B(g) ? b.columnsData[i] : b.axesData[i];
-    }), c.values[s.toCanonicalString()] = b.columnsData[s.toCanonicalString()], { byColumns: c };
+    return x.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 };
   }
   async createChartSettings(t, e) {
     var o, n;
     const l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource;
     if (!l)
       throw Error("Value column is not valid");
-    const s = C(l);
+    const s = A(l);
     if (!B(s))
       throw Error("Value column is not valid");
-    const c = [l], a = {
+    const r = [l], c = {
       type: "column",
       value: l,
-      label: await F(t, l, [])
-    }, r = await Promise.all(
-      e.components.facetBy.selectorStates.map(async (p) => {
+      label: await T(t, l, [])
+    }, i = await Promise.all(
+      e.components.facetBy.selectorStates.map(async (u) => {
         var m, d;
         return {
           type: "column",
-          value: (d = (m = await E(t, p.selectedSource, c)) == null ? void 0 : m.toCanonicalString()) != null ? d : p.selectedSource
+          value: (d = (m = await k(t, u.selectedSource, r)) == null ? void 0 : m.toCanonicalString()) != null ? d : u.selectedSource
         };
       })
     );
-    let u;
+    let p;
     if (e.components.grouping.selectorStates.length) {
-      const { selectedSource: p } = e.components.grouping.selectorStates[0];
-      u = {
+      const { selectedSource: u } = e.components.grouping.selectorStates[0];
+      p = {
         type: "column",
-        value: p,
-        label: await F(t, p, c),
-        valueLabels: (n = await E(t, p, c)) == null ? void 0 : n.toCanonicalString()
+        value: u,
+        label: await T(t, u, r),
+        valueLabels: (n = await k(t, u, r)) == null ? void 0 : n.toCanonicalString()
       };
     }
     return {
       type: "histogram",
-      valueColumn: a,
-      facetBy: r,
-      grouping: u
+      valueColumn: c,
+      facetBy: i,
+      grouping: p
     };
   }
-}, He = {
+}, tt = {
   type: "discrete",
   components: {
     y: { type: "simple", selectorStates: [] },
@@ -1307,16 +1488,16 @@ var je = class extends R {
     secondaryGrouping: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, We = class extends R {
+}, nt = class extends Q {
   constructor() {
     super(
       {
-        y: new D({
+        y: new I({
           componentName: "y",
           allowedTypes: ["Int", "Double", "Long", "Float"],
           settings: { isDataComponent: !0 }
         }),
-        primaryGrouping: new D({
+        primaryGrouping: new I({
           componentName: "primaryGrouping",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -1327,7 +1508,7 @@ var je = class extends R {
             homogeneous: !0
           }
         }),
-        secondaryGrouping: new D({
+        secondaryGrouping: new I({
           componentName: "secondaryGrouping",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -1338,7 +1519,7 @@ var je = class extends R {
             homogeneous: !0
           }
         }),
-        facetBy: new D({
+        facetBy: new I({
           componentName: "facetBy",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -1352,7 +1533,7 @@ var je = class extends R {
         })
       },
       {
-        filters: new D({
+        filters: new I({
           componentName: "filters",
           allowedTypes: ["String", "Int", "Long", "Double", "Float"],
           strictlyDependsOnParents: !0,
@@ -1363,9 +1544,9 @@ var je = class extends R {
             dimensionConsumer: !0,
             multipleSelectors: !0
           },
-          checkSourceBySpec: H
+          checkSourceBySpec: R
         }),
-        tabBy: new D({
+        tabBy: new I({
           componentName: "tabBy",
           allowedTypes: ["String", "Int"],
           strictlyDependsOnParents: !0,
@@ -1381,113 +1562,115 @@ var je = class extends R {
   }
   async createDataByColumns(t, e) {
     var o;
-    const n = e.components.y.selectorStates[0].selectedSource, l = C(n);
+    const n = e.components.y.selectorStates[0].selectedSource, l = A(n);
     if (!n || !B(l))
       throw Error("Y column is not valid");
     const s = {
       type: "columns",
-      id: (o = j(e.components)) != null ? o : "",
+      id: (o = z(e.components)) != null ? o : "",
       values: {}
-    }, c = await W(t), a = [
+    }, { linkerColumnsMap: r, compositeLinkerMap: c } = await X(t), i = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], r = U(a), u = a.map((b) => C(b.selectedSource)).filter(B), p = [n], m = await X(t, p), d = [e.components.primaryGrouping, e.components.secondaryGrouping, e.components.facetBy], w = [], h = [[]], A = [], v = [];
-    for (const { selectedSource: b, fixedAxes: g } of a)
-      v.push(...await M(
+    ], p = Y(i), u = i.map((C) => A(C.selectedSource)).filter(B), m = [n], d = await $(t, m), h = [e.components.primaryGrouping, e.components.secondaryGrouping, e.components.facetBy], g = [], x = [[]], w = [], D = [];
+    for (const { selectedSource: C, fixedAxes: a } of i)
+      D.push(...await V(
         t,
+        r,
         c,
-        m,
-        b,
-        g
-      )), h.push(
-        (g ?? []).map(({ axisIdx: i, axisValue: f }) => ({ idx: i, value: f }))
+        d,
+        C,
+        a
+      )), x.push(
+        (a ?? []).map(({ axisIdx: S, axisValue: y }) => ({ idx: S, value: y }))
       );
-    for (const b of d)
-      for (const { selectedSource: g, fixedAxes: i } of b.selectorStates) {
-        w.push(C(g)), A.push(
-          (i ?? []).map(({ axisIdx: y, axisValue: S }) => ({ idx: y, value: S }))
-        ), v.push(...await M(
+    for (const C of h)
+      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 }))
+        ), D.push(...await V(
           t,
+          r,
           c,
-          m,
-          g,
-          i
+          d,
+          a,
+          S
         ));
-        const f = await E(t, g, p);
-        f && w.push(f);
+        const y = await k(t, a, m);
+        y && g.push(y);
       }
-    const x = await t.pFrameProvider.getTableOuterJoin(
-      [l, ...v, ...u],
-      w,
-      r,
+    const b = await t.pFrameProvider.getTableOuterJoin(
+      [l, ...D, ...u],
+      g,
+      p,
       !0,
-      h,
-      A
+      x,
+      w
     );
-    return w.forEach((b) => {
-      const g = b.toCanonicalString();
-      s.values[g] = B(b) ? x.columnsData[g] : x.axesData[g];
-    }), s.values[l.toCanonicalString()] = x.columnsData[l.toCanonicalString()], { byColumns: s };
+    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 };
   }
   async createChartSettings(t, e) {
     var o, n;
-    const l = e.components.y.selectorStates[0].selectedSource, s = C(l);
+    const l = e.components.y.selectorStates[0].selectedSource, s = A(l);
     if (!l || !B(s))
       throw Error("Y column is not valid");
-    const c = {
+    const r = {
       type: "column",
       value: l,
-      label: await F(t, l, [])
-    }, a = [l];
-    let r;
+      label: await T(t, l, [])
+    }, c = [l];
+    let i;
     if (e.components.primaryGrouping.selectorStates.length) {
       const { selectedSource: m } = e.components.primaryGrouping.selectorStates[0];
-      r = {
+      i = {
         columnName: {
           type: "column",
           value: m,
-          label: await F(t, m, a),
-          valueLabels: (o = await E(
+          label: await T(t, m, c),
+          valueLabels: (o = await k(
             t,
             m,
-            a
+            c
           )) == null ? void 0 : o.toCanonicalString()
         }
       };
     }
-    let u;
+    let p;
     if (e.components.secondaryGrouping.selectorStates.length) {
       const { selectedSource: m } = e.components.secondaryGrouping.selectorStates[0];
-      u = {
+      p = {
         columnName: {
           type: "column",
           value: m,
-          label: await F(t, m, a),
-          valueLabels: (n = await E(
+          label: await T(t, m, c),
+          valueLabels: (n = await k(
             t,
             m,
-            a
+            c
           )) == null ? void 0 : n.toCanonicalString()
         }
       };
     }
-    const p = await Promise.all(e.components.facetBy.selectorStates.map(async (m) => {
-      var d, w;
+    const u = await Promise.all(e.components.facetBy.selectorStates.map(async (m) => {
+      var d, h;
       return {
         type: "column",
-        value: (w = (d = await E(t, m.selectedSource, a)) == null ? void 0 : d.toCanonicalString()) != null ? w : m.selectedSource,
-        label: await F(t, m.selectedSource, a)
+        value: (h = (d = await k(t, m.selectedSource, c)) == null ? void 0 : d.toCanonicalString()) != null ? h : m.selectedSource,
+        label: await T(t, m.selectedSource, c)
       };
     }));
     return {
       type: "discrete",
-      y: c,
-      primaryGrouping: r,
-      secondaryGrouping: u,
-      facetBy: p
+      y: r,
+      primaryGrouping: i,
+      secondaryGrouping: p,
+      facetBy: u
     };
   }
-}, Ye = {
+}, ot = {
   type: "heatmap",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -1507,24 +1690,24 @@ var je = class extends R {
 function pe(t) {
   return t ? "kind" in t && t.kind === "PColumn" ? t.valueType === "String" : t.type === "String" : !0;
 }
-function ae(t, e) {
+function re(t, e) {
   if (!e.length)
     return [];
-  const o = e.map((s) => C(s)), n = Object.values(t.columnsData)[0].length, l = [];
+  const o = e.map((s) => A(s)), n = Object.values(t.columnsData)[0].length, l = [];
   for (let s = 0; s < n; s++) {
-    const c = o.map((a) => {
-      const r = a.toCanonicalString();
-      return B(a) ? t.columnsData[r][s] : t.axesData[r][s];
+    const r = o.map((c) => {
+      const i = c.toCanonicalString();
+      return B(c) ? t.columnsData[i][s] : t.axesData[i][s];
     }).join(", ");
-    l.push(c);
+    l.push(r);
   }
   return l;
 }
-var Ke = class extends R {
+var st = class extends Q {
   constructor() {
     super(
       {
-        value: new D({
+        value: new I({
           componentName: "value",
           allowedTypes: ["Int", "Long", "Double", "Float", "String"],
           settings: {
@@ -1534,7 +1717,7 @@ var Ke = class extends R {
             required: !0
           }
         }),
-        x: new D({
+        x: new I({
           componentName: "x",
           allowedTypes: ["Int", "String", "Long"],
           strictlyDependsOnParents: !0,
@@ -1547,7 +1730,7 @@ var Ke = class extends R {
             columnsAllowed: !1
           }
         }),
-        xGroupBy: new D({
+        xGroupBy: new I({
           componentName: "xGroupBy",
           allowedTypes: ["Int", "String", "Long"],
           strictlyDependsOnParents: !0,
@@ -1569,7 +1752,7 @@ var Ke = class extends R {
             ) : !0;
           }
         }),
-        y: new D({
+        y: new I({
           componentName: "y",
           allowedTypes: ["Int", "String", "Long"],
           strictlyDependsOnParents: !0,
@@ -1582,7 +1765,7 @@ var Ke = class extends R {
             columnsAllowed: !0
           }
         }),
-        yGroupBy: new D({
+        yGroupBy: new I({
           componentName: "yGroupBy",
           allowedTypes: ["Int", "String", "Long"],
           strictlyDependsOnParents: !0,
@@ -1604,7 +1787,7 @@ var Ke = class extends R {
             ) : !0;
           }
         }),
-        tooltipContent: new D({
+        tooltipContent: new I({
           componentName: "tooltipContent",
           allowedTypes: ["String", "Int", "Long", "Float", "Double"],
           strictlyDependsOnParents: !0,
@@ -1616,7 +1799,7 @@ var Ke = class extends R {
             multipleSelectors: !0
           }
         }),
-        facetBy: new D({
+        facetBy: new I({
           componentName: "facetBy",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -1628,7 +1811,7 @@ var Ke = class extends R {
             multipleSelectors: !0
           }
         }),
-        annotationsX: new D({
+        annotationsX: new I({
           componentName: "annotationsX",
           allowedTypes: ["Int", "Long", "Double", "Float", "String"],
           parentComponents: ["value"],
@@ -1647,7 +1830,7 @@ var Ke = class extends R {
             ) : o.has(_.fromAxisSpec(t).toCanonicalString());
           }
         }),
-        annotationsY: new D({
+        annotationsY: new I({
           componentName: "annotationsY",
           allowedTypes: ["Int", "Long", "Double", "Float", "String"],
           parentComponents: ["value"],
@@ -1668,7 +1851,7 @@ var Ke = class extends R {
         })
       },
       {
-        filters: new D({
+        filters: new I({
           componentName: "filters",
           allowedTypes: ["String", "Int", "Long", "Double", "Long"],
           strictlyDependsOnParents: !0,
@@ -1680,9 +1863,9 @@ var Ke = class extends R {
             dimensionConsumer: !0,
             multipleSelectors: !0
           },
-          checkSourceBySpec: H
+          checkSourceBySpec: R
         }),
-        tabBy: new D({
+        tabBy: new I({
           componentName: "tabBy",
           allowedTypes: ["String", "Int"],
           strictlyDependsOnParents: !0,
@@ -1700,7 +1883,7 @@ var Ke = class extends R {
   async getMustBeConsumedAxes(t, e) {
     if (!e.components.value.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const o = e.components.value.selectorStates[0].selectedSource, n = await t.pFrameProvider.getColumnSpecById(C(o));
+    const o = e.components.value.selectorStates[0].selectedSource, n = await t.pFrameProvider.getColumnSpecById(A(o));
     return n ? new Set(n.axesSpec.map((l) => _.fromAxisSpec(l).toCanonicalString())) : /* @__PURE__ */ new Set();
   }
   async createDataByColumns(t, e) {
@@ -1708,17 +1891,17 @@ var Ke = class extends R {
     const l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource;
     if (!l)
       throw Error("Value column is not valid");
-    const s = C(l);
+    const s = A(l);
     if (!B(s))
       throw Error("Value column is not valid");
-    const c = {
+    const r = {
       type: "columns",
-      id: (n = j(e.components)) != null ? n : "",
+      id: (n = z(e.components)) != null ? n : "",
       values: {}
-    }, a = await W(t), r = [
+    }, { linkerColumnsMap: c, compositeLinkerMap: i } = await X(t), p = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], u = U(r), p = r.map((L) => C(L.selectedSource)).filter(B), m = [l], d = await X(t, m), w = [
+    ], u = Y(p), m = p.map((L) => A(L.selectedSource)).filter(B), d = [l], h = await $(t, d), g = [
       e.components.facetBy,
       e.components.annotationsX,
       e.components.annotationsY,
@@ -1727,185 +1910,187 @@ var Ke = class extends R {
       e.components.xGroupBy,
       e.components.yGroupBy,
       e.components.tooltipContent
-    ], h = [], A = [[]], v = [], x = [];
-    for (const { selectedSource: L, fixedAxes: O } of r)
-      x.push(...await M(
+    ], x = [], w = [[]], D = [], b = [];
+    for (const { selectedSource: L, fixedAxes: E } of p)
+      b.push(...await V(
         t,
-        a,
-        d,
+        c,
+        i,
+        h,
         L,
-        O
-      )), A.push(
-        (O ?? []).map(({ axisIdx: T, axisValue: k }) => ({ idx: T, value: k }))
+        E
+      )), w.push(
+        (E ?? []).map(({ axisIdx: F, axisValue: G }) => ({ idx: F, value: G }))
       );
-    for (const L of w)
-      for (const { selectedSource: O, fixedAxes: T } of L.selectorStates) {
-        h.push(C(O)), v.push(
-          (T ?? []).map(({ axisIdx: q, axisValue: G }) => ({ idx: q, value: G }))
-        ), x.push(...await M(
+    for (const L of g)
+      for (const { selectedSource: E, fixedAxes: F } of L.selectorStates) {
+        x.push(A(E)), D.push(
+          (F ?? []).map(({ axisIdx: M, axisValue: K }) => ({ idx: M, value: K }))
+        ), b.push(...await V(
           t,
-          a,
-          d,
-          O,
-          T
+          c,
+          i,
+          h,
+          E,
+          F
         ));
-        const k = await E(t, O, m);
-        k && h.push(k);
+        const G = await k(t, E, d);
+        G && x.push(G);
       }
-    const b = await t.pFrameProvider.getTableOuterJoin(
-      [s, ...x, ...p],
-      h,
+    const C = await t.pFrameProvider.getTableOuterJoin(
+      [s, ...b, ...m],
+      x,
       u,
       !0,
-      A,
-      v
+      w,
+      D
     );
-    h.forEach((L) => {
-      const O = L.toCanonicalString();
-      c.values[O] = B(L) ? b.columnsData[O] : b.axesData[O];
-    }), c.values[s.toCanonicalString()] = b.columnsData[s.toCanonicalString()];
-    const g = e.components.x.selectorStates.concat(e.components.xGroupBy.selectorStates).map((L) => L.selectedSource), i = g.join(", ");
-    c.values[i] = ae(b, g);
-    const f = e.components.x.selectorStates.map((L) => L.selectedSource), y = await Promise.all(
-      f.map(
+    x.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(
         async (L) => {
-          var O, T;
-          return (T = (O = await E(t, L, m)) == null ? void 0 : O.toCanonicalString()) != null ? T : L;
+          var E, F;
+          return (F = (E = await k(t, L, d)) == null ? void 0 : E.toCanonicalString()) != null ? F : L;
         }
       )
     );
-    c.values.xLabelsKey = ae(b, y);
-    const S = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map((L) => L.selectedSource), I = S.join(", ");
-    c.values[I] = ae(b, S);
-    const P = e.components.y.selectorStates.map((L) => L.selectedSource), N = await Promise.all(
-      P.map(
+    r.values.xLabelsKey = re(C, f);
+    const v = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map((L) => L.selectedSource), P = v.join(", ");
+    r.values[P] = re(C, v);
+    const O = e.components.y.selectorStates.map((L) => L.selectedSource), N = await Promise.all(
+      O.map(
         async (L) => {
-          var O, T;
-          return (T = (O = await E(t, L, m)) == null ? void 0 : O.toCanonicalString()) != null ? T : L;
+          var E, F;
+          return (F = (E = await k(t, L, d)) == null ? void 0 : E.toCanonicalString()) != null ? F : L;
         }
       )
     );
-    return c.values.yLabelsKey = ae(b, N), { byColumns: c };
+    return r.values.yLabelsKey = re(C, N), { byColumns: r };
   }
   async createChartSettings(t, e) {
     var o;
     const n = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource;
     if (!n)
       throw Error("Value column is not valid");
-    const l = C(n);
+    const l = A(n);
     if (!B(l))
       throw Error("Value column is not valid");
-    const s = [n], c = {
+    const s = [n], r = {
       type: "column",
       value: n,
-      label: await F(t, n, [])
-    }, r = e.components.x.selectorStates.concat(e.components.xGroupBy.selectorStates).map(({ selectedSource: i }) => C(i)).map((i) => i.toCanonicalString()).join(", "), p = e.components.y.selectorStates.concat(e.components.yGroupBy.selectorStates).map(({ selectedSource: i }) => C(i)).map((i) => i.toCanonicalString()).join(", "), m = await Promise.all(
-      e.components.facetBy.selectorStates.map(async (i) => {
-        var f, y;
+      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;
         return {
           type: "column",
-          value: (y = (f = await E(t, i.selectedSource, s)) == null ? void 0 : f.toCanonicalString()) != null ? y : i.selectedSource
+          value: (y = (S = await k(t, a.selectedSource, s)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
         };
       })
     ), d = await Promise.all(
-      e.components.xGroupBy.selectorStates.map(async (i) => {
-        var f, y;
+      e.components.xGroupBy.selectorStates.map(async (a) => {
+        var S, y;
         return {
           type: "column",
-          label: await F(t, i.selectedSource, s),
-          value: i.selectedSource,
-          valueLabels: (y = (f = await E(t, i.selectedSource, s)) == null ? void 0 : f.toCanonicalString()) != null ? y : i.selectedSource
+          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
         };
       })
-    ), w = await Promise.all(
-      e.components.yGroupBy.selectorStates.map(async (i) => {
-        var f, y;
+    ), h = await Promise.all(
+      e.components.yGroupBy.selectorStates.map(async (a) => {
+        var S, y;
         return {
           type: "column",
-          label: await F(t, i.selectedSource, s),
-          value: i.selectedSource,
-          valueLabels: (y = (f = await E(t, i.selectedSource, s)) == null ? void 0 : f.toCanonicalString()) != null ? y : i.selectedSource
+          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
         };
       })
-    ), h = await t.pFrameProvider.getColumnSpecById(l), A = await Promise.all(
-      e.components.annotationsX.selectorStates.map(async (i) => {
-        var f, y;
-        const S = i.selectedSource, I = C(S), P = B(I) ? await t.pFrameProvider.getColumnSpecById(I) : (y = (f = h == null ? void 0 : h.axesSpec) == null ? void 0 : f.find(
-          (N) => _.fromAxisSpec(N).toCanonicalString() === S
+    ), g = await t.pFrameProvider.getColumnSpecById(l), x = await Promise.all(
+      e.components.annotationsX.selectorStates.map(async (a) => {
+        var S, y;
+        const f = a.selectedSource, v = A(f), P = B(v) ? await t.pFrameProvider.getColumnSpecById(v) : (y = (S = g == null ? void 0 : g.axesSpec) == null ? void 0 : S.find(
+          (O) => _.fromAxisSpec(O).toCanonicalString() === f
         )) != null ? y : null;
         return {
           axis: "x",
           valueColumn: {
             type: "column",
-            value: S,
-            label: await F(t, S, s)
+            value: f,
+            label: await T(t, f, s)
           },
           type: pe(P) ? "discrete" : "continuous"
         };
       })
-    ), v = await Promise.all(
-      e.components.annotationsY.selectorStates.map(async (i) => {
-        var f, y;
-        const S = i.selectedSource, I = C(S), P = B(I) ? await t.pFrameProvider.getColumnSpecById(I) : (y = (f = h == null ? void 0 : h.axesSpec) == null ? void 0 : f.find(
-          (N) => _.fromAxisSpec(N).toCanonicalString() === S
+    ), w = await Promise.all(
+      e.components.annotationsY.selectorStates.map(async (a) => {
+        var S, y;
+        const f = a.selectedSource, v = A(f), P = B(v) ? await t.pFrameProvider.getColumnSpecById(v) : (y = (S = g == null ? void 0 : g.axesSpec) == null ? void 0 : S.find(
+          (O) => _.fromAxisSpec(O).toCanonicalString() === f
         )) != null ? y : null;
         return {
           axis: "y",
           valueColumn: {
             type: "column",
-            value: S,
-            label: await F(t, S, s)
+            value: f,
+            label: await T(t, f, s)
           },
           type: pe(P) ? "discrete" : "continuous"
         };
       })
-    ), x = (await Promise.all(
+    ), D = (await Promise.all(
       e.components.x.selectorStates.map(
-        (i) => F(t, i.selectedSource, s)
+        (a) => T(t, a.selectedSource, s)
       )
     )).join(", "), b = (await Promise.all(
       e.components.y.selectorStates.map(
-        (i) => F(t, i.selectedSource, s)
+        (a) => T(t, a.selectedSource, s)
       )
-    )).join(", "), g = await Promise.all(
-      e.components.tooltipContent.selectorStates.map(async (i) => {
-        var f, y;
-        const S = i.selectedSource;
+    )).join(", "), C = await Promise.all(
+      e.components.tooltipContent.selectorStates.map(async (a) => {
+        var S, y;
+        const f = a.selectedSource;
         return {
           type: "column",
-          label: await F(t, S, s) || S,
-          value: S,
-          valueLabels: (y = (f = await E(t, S, s)) == null ? void 0 : f.toCanonicalString()) != null ? y : S
+          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
         };
       })
     );
     return {
       type: "heatmap",
-      valueColumn: c,
-      valueType: pe(h) ? "discrete" : "continuous",
+      valueColumn: r,
+      valueType: pe(g) ? "discrete" : "continuous",
       xColumn: {
         type: "column",
-        value: r,
-        label: x,
+        value: i,
+        label: D,
         valueLabels: "xLabelsKey"
       },
       yColumn: {
         type: "column",
-        value: p,
+        value: u,
         label: b,
         valueLabels: "yLabelsKey"
       },
       facetBy: m,
       xGroupBy: d,
-      yGroupBy: w,
-      annotations: [...A, ...v],
+      yGroupBy: h,
+      annotations: [...x, ...w],
       tooltips: {
         show: !0,
-        content: g
+        content: C
       }
     };
   }
-}, Xe = {
+}, lt = {
   type: "scatterplot",
   components: {
     x: { type: "simple", selectorStates: [] },
@@ -1921,11 +2106,11 @@ var Ke = class extends R {
     tooltipContent: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, Re = class extends R {
+}, at = class extends Q {
   constructor() {
     super(
       {
-        x: new D({
+        x: new I({
           componentName: "x",
           allowedTypes: ["Int", "Long", "Double", "Float"],
           parentComponents: ["y"],
@@ -1937,7 +2122,7 @@ var Ke = class extends R {
             columnsAllowed: !0
           }
         }),
-        y: new D({
+        y: new I({
           componentName: "y",
           allowedTypes: ["Int", "Long", "Double", "Float"],
           parentComponents: ["x"],
@@ -1949,7 +2134,7 @@ var Ke = class extends R {
             columnsAllowed: !0
           }
         }),
-        facetBy: new D({
+        facetBy: new I({
           componentName: "facetBy",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -1961,7 +2146,7 @@ var Ke = class extends R {
             multipleSelectors: !0
           }
         }),
-        grouping: new D({
+        grouping: new I({
           componentName: "grouping",
           allowedTypes: ["String", "Int", "Long", "Double", "Float"],
           strictlyDependsOnParents: !0,
@@ -1972,7 +2157,7 @@ var Ke = class extends R {
             multipleSelectors: !0
           }
         }),
-        shape: new D({
+        shape: new I({
           componentName: "shape",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -1982,7 +2167,7 @@ var Ke = class extends R {
             axesAllowed: !0
           }
         }),
-        size: new D({
+        size: new I({
           componentName: "size",
           allowedTypes: ["Int", "Long", "Double", "Float"],
           strictlyDependsOnParents: !0,
@@ -1992,7 +2177,7 @@ var Ke = class extends R {
             axesAllowed: !0
           }
         }),
-        tooltipContent: new D({
+        tooltipContent: new I({
           componentName: "tooltipContent",
           allowedTypes: ["String", "Int", "Long", "Float", "Double"],
           strictlyDependsOnParents: !0,
@@ -2004,7 +2189,7 @@ var Ke = class extends R {
             multipleSelectors: !0
           }
         }),
-        label: new D({
+        label: new I({
           componentName: "label",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -2018,7 +2203,7 @@ var Ke = class extends R {
         })
       },
       {
-        filters: new D({
+        filters: new I({
           componentName: "filters",
           allowedTypes: ["String", "Int", "Long", "Double", "Float"],
           strictlyDependsOnParents: !0,
@@ -2030,9 +2215,9 @@ var Ke = class extends R {
             dimensionConsumer: !0,
             multipleSelectors: !0
           },
-          checkSourceBySpec: H
+          checkSourceBySpec: R
         }),
-        tabBy: new D({
+        tabBy: new I({
           componentName: "tabBy",
           allowedTypes: ["String", "Int"],
           strictlyDependsOnParents: !0,
@@ -2043,7 +2228,7 @@ var Ke = class extends R {
             dimensionConsumer: !0
           }
         }),
-        highlight: new D({
+        highlight: new I({
           componentName: "highlight",
           allowedTypes: ["String", "Int", "Long", "Double", "Float"],
           strictlyDependsOnParents: !0,
@@ -2054,7 +2239,7 @@ var Ke = class extends R {
             columnsAllowed: !0,
             multipleSelectors: !0
           },
-          checkSourceBySpec: H
+          checkSourceBySpec: R
         })
       }
     ), this.dataInputs = ["x", "y"];
@@ -2062,39 +2247,40 @@ var Ke = class extends R {
   async getMustBeConsumedAxes(t, e) {
     if (!e.components.x.selectorStates.length || !e.components.y.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const o = e.components.x.selectorStates[0].selectedSource, n = e.components.y.selectorStates[0].selectedSource, l = await t.pFrameProvider.getColumnSpecById(C(o)), s = await t.pFrameProvider.getColumnSpecById(C(n));
+    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 c = l.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), a = s.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), r = c.filter((p) => !a.some((m) => m === p)), u = a.filter((p) => !c.some((m) => m === p));
-    return /* @__PURE__ */ new Set([...r, ...u]);
+    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]);
   }
   async createDataByColumns(t, e) {
     var o, n, l;
-    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)
+    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)
       throw Error("X or Y column is not valid");
-    const a = C(s), r = C(c), u = {
+    const c = A(s), i = A(r), p = {
       type: "columns",
-      id: (l = j(e.components)) != null ? l : "",
+      id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, p = await W(t), m = [
+    }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], d = U(m), w = m.map((S) => C(S.selectedSource)).filter(B), h = [a, r].filter(B).map((S) => S.toCanonicalString());
-    if (h.length === 0)
+    ], h = Y(d), g = d.map((v) => A(v.selectedSource)).filter(B), x = [c, i].filter(B).map((v) => v.toCanonicalString());
+    if (x.length === 0)
       throw Error("One of X and Y should be a column");
-    const A = await X(t, h), v = [a, r, ...w], x = [], b = [[], []], g = [], i = [];
-    for (const { selectedSource: S, fixedAxes: I } of m)
-      i.push(...await M(
+    const w = await $(t, x), D = [c, i, ...g], b = [], C = [[], []], a = [], S = [];
+    for (const { selectedSource: v, fixedAxes: P } of d)
+      S.push(...await V(
         t,
-        p,
-        A,
-        S,
-        I
-      )), b.push(
-        (I ?? []).map(({ axisIdx: P, axisValue: N }) => ({ idx: P, value: N }))
+        u,
+        m,
+        w,
+        v,
+        P
+      )), C.push(
+        (P ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
       );
-    const f = [
+    const y = [
       e.components.grouping,
       e.components.size,
       e.components.shape,
@@ -2103,113 +2289,114 @@ var Ke = class extends R {
       e.components.label,
       e.components.highlight
     ];
-    for (const S of f)
-      for (const { selectedSource: I, fixedAxes: P } of S.selectorStates) {
-        x.push(C(I)), g.push(
-          (P ?? []).map(({ axisIdx: L, axisValue: O }) => ({ idx: L, value: O }))
-        ), i.push(...await M(
+    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(
           t,
-          p,
-          A,
-          I,
-          P
+          u,
+          m,
+          w,
+          P,
+          O
         ));
-        const N = await E(t, I, h);
-        N && x.push(N);
+        const N = await k(t, P, x);
+        N && b.push(N);
       }
-    const y = await t.pFrameProvider.getTableOuterJoin(
-      [a, r, ...i, ...w],
-      x,
-      d,
-      !1,
+    const f = await t.pFrameProvider.getTableOuterJoin(
+      [c, i, ...S, ...g],
       b,
-      g
+      h,
+      !1,
+      C,
+      a
     );
-    return [...v, ...x].forEach((S) => {
-      const I = S.toCanonicalString();
-      u.values[I] = B(S) ? y.columnsData[I] : y.axesData[I];
-    }), u.values.key = new Array(u.values[Object.keys(u.values)[0]].length).fill(0).map((S, I) => I), e.components.highlight.selectorStates.length && (u.values.highlight = he(e.components.highlight.selectorStates, y)), { byColumns: u };
+    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 };
   }
   async createChartSettings(t, e) {
     var o, n, l, s;
-    const c = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, a = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource, r = c ? C(c) : null, u = a ? C(a) : null;
-    if (!c || !a || !r || !u || !B(r) && !B(u))
+    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))
       throw Error("Empty or invalid required data");
-    const p = [r, u].filter(B).map((i) => i.toCanonicalString()), m = {
+    const u = [i, p].filter(B).map((a) => a.toCanonicalString()), m = {
       type: "column",
-      value: c,
-      label: await F(t, c, p)
+      value: r,
+      label: await T(t, r, u)
     }, d = {
       type: "column",
-      value: a,
-      label: await F(t, a, p)
-    }, w = {
+      value: c,
+      label: await T(t, c, u)
+    }, h = {
       type: "column",
       value: "key"
-    }, h = await Promise.all(
-      e.components.facetBy.selectorStates.map(async (i) => {
-        var f, y;
+    }, g = await Promise.all(
+      e.components.facetBy.selectorStates.map(async (a) => {
+        var S, y;
         return {
           type: "column",
-          value: (y = (f = await E(t, i.selectedSource, p)) == null ? void 0 : f.toCanonicalString()) != null ? y : i.selectedSource
+          value: (y = (S = await k(t, a.selectedSource, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
         };
       })
-    ), A = ce.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)
-    ]), v = await Promise.all(
-      A.map(async (i) => {
-        var f, y;
+    ), x = 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(
+      x.map(async (a) => {
+        var S, y;
         return {
           type: "column",
-          label: await F(t, i, p) || i,
-          value: i,
-          valueLabels: (y = (f = await E(t, i, p)) == null ? void 0 : f.toCanonicalString()) != null ? y : i
+          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
         };
       })
-    ), x = await Promise.all(
-      e.components.tooltipContent.selectorStates.map(async (i) => {
-        var f, y;
-        const S = i.selectedSource;
+    ), D = await Promise.all(
+      e.components.tooltipContent.selectorStates.map(async (a) => {
+        var S, y;
+        const f = a.selectedSource;
         return {
           type: "column",
-          label: await F(t, S, p) || S,
-          value: S,
-          valueLabels: (y = (f = await E(t, S, p)) == null ? void 0 : f.toCanonicalString()) != null ? y : S
+          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
         };
       })
     );
     let b;
     if (e.components.label.selectorStates.length) {
-      const i = e.components.label.selectorStates[0].selectedSource;
+      const a = e.components.label.selectorStates[0].selectedSource;
       b = {
         type: "column",
-        value: i,
-        label: await F(t, i, p),
-        valueLabels: (s = (l = await E(t, i, p)) == null ? void 0 : l.toCanonicalString()) != null ? s : i
+        value: a,
+        label: await T(t, a, u),
+        valueLabels: (s = (l = await k(t, a, u)) == null ? void 0 : l.toCanonicalString()) != null ? s : a
       };
     }
-    let g;
-    return e.components.highlight.selectorStates.length && (g = {
+    let C;
+    return e.components.highlight.selectorStates.length && (C = {
       type: "column",
       value: "highlight"
     }), {
       type: "scatterplot",
       x: m,
       y: d,
-      keyColumn: w,
-      facetBy: h,
-      grouping: v,
+      keyColumn: h,
+      facetBy: g,
+      grouping: w,
       label: b,
-      highlight: g,
+      highlight: C,
       tooltips: {
         show: !0,
-        content: x
+        content: D
       }
     };
   }
-}, Je = {
+}, rt = {
   type: "scatterplot-umap",
   components: {
     x: { type: "simple", selectorStates: [] },
@@ -2224,11 +2411,11 @@ var Ke = class extends R {
     size: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, $e = class extends R {
+}, ct = class extends Q {
   constructor() {
     super(
       {
-        x: new D({
+        x: new I({
           componentName: "x",
           allowedTypes: ["Int", "Long", "Double", "Float"],
           parentComponents: ["y"],
@@ -2240,7 +2427,7 @@ var Ke = class extends R {
             columnsAllowed: !0
           }
         }),
-        y: new D({
+        y: new I({
           componentName: "y",
           allowedTypes: ["Int", "Long", "Double", "Float"],
           parentComponents: ["x"],
@@ -2252,7 +2439,7 @@ var Ke = class extends R {
             columnsAllowed: !0
           }
         }),
-        facetBy: new D({
+        facetBy: new I({
           componentName: "facetBy",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -2264,7 +2451,7 @@ var Ke = class extends R {
             multipleSelectors: !0
           }
         }),
-        grouping: new D({
+        grouping: new I({
           componentName: "grouping",
           allowedTypes: ["String", "Int", "Long", "Float", "Double"],
           strictlyDependsOnParents: !0,
@@ -2275,7 +2462,7 @@ var Ke = class extends R {
             multipleSelectors: !0
           }
         }),
-        tooltipContent: new D({
+        tooltipContent: new I({
           componentName: "tooltipContent",
           allowedTypes: ["String", "Int", "Long", "Float", "Double"],
           strictlyDependsOnParents: !0,
@@ -2287,7 +2474,7 @@ var Ke = class extends R {
             multipleSelectors: !0
           }
         }),
-        label: new D({
+        label: new I({
           componentName: "label",
           allowedTypes: ["String", "Int", "Long"],
           strictlyDependsOnParents: !0,
@@ -2299,7 +2486,7 @@ var Ke = class extends R {
             multipleSelectors: !1
           }
         }),
-        size: new D({
+        size: new I({
           componentName: "size",
           allowedTypes: ["Int", "Long", "Double", "Float"],
           strictlyDependsOnParents: !0,
@@ -2311,7 +2498,7 @@ var Ke = class extends R {
         })
       },
       {
-        filters: new D({
+        filters: new I({
           componentName: "filters",
           allowedTypes: ["String", "Int", "Long", "Double", "Float"],
           strictlyDependsOnParents: !0,
@@ -2322,9 +2509,9 @@ var Ke = class extends R {
             dimensionConsumer: !0,
             multipleSelectors: !0
           },
-          checkSourceBySpec: H
+          checkSourceBySpec: R
         }),
-        tabBy: new D({
+        tabBy: new I({
           componentName: "tabBy",
           allowedTypes: ["String", "Int"],
           strictlyDependsOnParents: !0,
@@ -2335,7 +2522,7 @@ var Ke = class extends R {
             dimensionConsumer: !0
           }
         }),
-        highlight: new D({
+        highlight: new I({
           componentName: "highlight",
           allowedTypes: ["String", "Int", "Long", "Double", "Float"],
           strictlyDependsOnParents: !0,
@@ -2346,7 +2533,7 @@ var Ke = class extends R {
             columnsAllowed: !0,
             multipleSelectors: !0
           },
-          checkSourceBySpec: H
+          checkSourceBySpec: R
         })
       }
     ), this.dataInputs = ["x", "y"];
@@ -2354,48 +2541,43 @@ var Ke = class extends R {
   async getMustBeConsumedAxes(t, e) {
     if (!e.components.x.selectorStates.length || !e.components.y.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const o = e.components.x.selectorStates[0].selectedSource, n = e.components.y.selectorStates[0].selectedSource, l = await t.pFrameProvider.getColumnSpecById(C(o)), s = await t.pFrameProvider.getColumnSpecById(C(n));
+    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 c = l.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), a = s.axesSpec.map((p) => _.fromAxisSpec(p).toCanonicalString()), r = c.filter((p) => !a.some((m) => m === p)), u = a.filter((p) => !c.some((m) => m === p));
-    return /* @__PURE__ */ new Set([...r, ...u]);
+    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]);
   }
   async createDataByColumns(t, e) {
     var o, n, l;
-    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)
+    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)
       throw Error("X or Y column is not valid");
-    const a = C(s), r = C(c);
-    if (!a || !r)
+    const c = A(s), i = A(r);
+    if (!c || !i)
       throw Error("X or Y column is not valid");
-    const u = {
+    const p = {
       type: "columns",
-      id: (l = j(e.components)) != null ? l : "",
+      id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, p = await W(t), m = [
+    }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], d = U(m), w = m.map((S) => C(S.selectedSource)).filter(B), h = [a, r].filter(B).map((S) => S.toCanonicalString());
-    if (h.length === 0)
+    ], h = Y(d), g = d.map((v) => A(v.selectedSource)).filter(B), x = [c, i].filter(B).map((v) => v.toCanonicalString());
+    if (x.length === 0)
       throw Error("One of X and Y should be a column");
-    const A = await X(t, h), v = [a, r, ...w], x = [], b = [[], []], g = [], i = [];
-    for (const { selectedSource: S, fixedAxes: I } of m)
-      i.push(...await M(
-        t,
-        p,
-        A,
-        S,
-        I
-      )), i.push(...await M(
+    const w = await $(t, x), D = [c, i, ...g], b = [], C = [[], []], a = [], S = [];
+    for (const { selectedSource: v, fixedAxes: P } of d)
+      S.push(...await V(
         t,
-        p,
-        A,
-        S,
-        I
-      )), b.push(
-        (I ?? []).map(({ axisIdx: P, axisValue: N }) => ({ idx: P, value: N }))
+        u,
+        m,
+        w,
+        v,
+        P
+      )), C.push(
+        (P ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
       );
-    const f = [
+    const y = [
       e.components.grouping,
       e.components.facetBy,
       e.components.tooltipContent,
@@ -2403,115 +2585,116 @@ var Ke = class extends R {
       e.components.highlight,
       e.components.size
     ];
-    for (const S of f)
-      for (const { selectedSource: I, fixedAxes: P } of S.selectorStates) {
-        x.push(C(I)), g.push(
-          (P ?? []).map(({ axisIdx: L, axisValue: O }) => ({ idx: L, value: O }))
-        ), i.push(...await M(
+    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(
           t,
-          p,
-          A,
-          I,
-          P
+          u,
+          m,
+          w,
+          P,
+          O
         ));
-        const N = await E(t, I, h);
-        N && x.push(N);
+        const N = await k(t, P, x);
+        N && b.push(N);
       }
-    const y = await t.pFrameProvider.getTableOuterJoin(
-      [a, r, ...i, ...w],
-      x,
-      d,
-      !1,
+    const f = await t.pFrameProvider.getTableOuterJoin(
+      [c, i, ...S, ...g],
       b,
-      g
+      h,
+      !1,
+      C,
+      a
     );
-    return [...v, ...x].forEach((S) => {
-      const I = S.toCanonicalString();
-      u.values[I] = B(S) ? y.columnsData[I] : y.axesData[I];
-    }), e.components.highlight.selectorStates.length && (u.values.highlight = he(e.components.highlight.selectorStates, y)), {
-      byColumns: u,
-      axesData: y.axesData
+    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,
+      axesData: f.axesData
     };
   }
   async createChartSettings(t, e) {
     var o, n, l, s;
-    const c = (o = e.components.x.selectorStates[0]) == null ? void 0 : o.selectedSource, a = (n = e.components.y.selectorStates[0]) == null ? void 0 : n.selectedSource, r = c ? C(c) : null, u = a ? C(a) : null;
-    if (!c || !a || !r || !u || !B(r) && !B(u))
+    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))
       throw Error("Empty or invalid required data");
-    const p = [r, u].filter(B).map((i) => i.toCanonicalString()), m = {
+    const u = [i, p].filter(B).map((a) => a.toCanonicalString()), m = {
       type: "column",
-      value: c,
-      label: await F(t, c, p)
+      value: r,
+      label: await T(t, r, u)
     }, d = {
       type: "column",
-      value: a,
-      label: await F(t, a, p)
-    }, w = {
+      value: c,
+      label: await T(t, c, u)
+    }, h = {
       type: "column",
       value: "key"
-    }, h = await Promise.all(
-      e.components.facetBy.selectorStates.map(async (i) => {
-        var f, y;
+    }, g = await Promise.all(
+      e.components.facetBy.selectorStates.map(async (a) => {
+        var S, y;
         return {
           type: "column",
-          value: (y = (f = await E(t, i.selectedSource, p)) == null ? void 0 : f.toCanonicalString()) != null ? y : i.selectedSource
+          value: (y = (S = await k(t, a.selectedSource, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
         };
       })
-    ), A = ce.uniq([
-      ...e.components.grouping.selectorStates.map((i) => i.selectedSource),
-      ...e.components.size.selectorStates.map((i) => i.selectedSource)
-    ]), v = await Promise.all(
-      A.map(async (i) => {
-        var f, y;
+    ), x = ie.uniq([
+      ...e.components.grouping.selectorStates.map((a) => a.selectedSource),
+      ...e.components.size.selectorStates.map((a) => a.selectedSource)
+    ]), w = await Promise.all(
+      x.map(async (a) => {
+        var S, y;
         return {
           type: "column",
-          label: await F(t, i, p) || i,
-          value: i,
-          valueLabels: (y = (f = await E(t, i, p)) == null ? void 0 : f.toCanonicalString()) != null ? y : i
+          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
         };
       })
-    ), x = await Promise.all(
-      e.components.tooltipContent.selectorStates.map(async (i) => {
-        var f, y;
-        const S = i.selectedSource;
+    ), D = await Promise.all(
+      e.components.tooltipContent.selectorStates.map(async (a) => {
+        var S, y;
+        const f = a.selectedSource;
         return {
           type: "column",
-          label: await F(t, S, p) || S,
-          value: S,
-          valueLabels: (y = (f = await E(t, S, p)) == null ? void 0 : f.toCanonicalString()) != null ? y : S
+          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
         };
       })
     );
     let b;
     if (e.components.label.selectorStates.length) {
-      const i = e.components.label.selectorStates[0].selectedSource;
+      const a = e.components.label.selectorStates[0].selectedSource;
       b = {
         type: "column",
-        value: i,
-        label: await F(t, i, p),
-        valueLabels: (s = (l = await E(t, i, p)) == null ? void 0 : l.toCanonicalString()) != null ? s : i
+        value: a,
+        label: await T(t, a, u),
+        valueLabels: (s = (l = await k(t, a, u)) == null ? void 0 : l.toCanonicalString()) != null ? s : a
       };
     }
-    let g;
-    return e.components.highlight.selectorStates.length && (g = {
+    let C;
+    return e.components.highlight.selectorStates.length && (C = {
       type: "column",
       value: "highlight"
     }), {
       type: "scatterplot-umap",
       x: m,
       y: d,
-      keyColumn: w,
-      facetBy: h,
-      grouping: v,
+      keyColumn: h,
+      facetBy: g,
+      grouping: w,
       label: b,
-      highlight: g,
+      highlight: C,
       tooltips: {
         show: !0,
-        content: x
+        content: D
       }
     };
   }
-}, me = "pl7.app/dendrogram/nodeId", de = "id", Ze = {
+}, me = "pl7.app/dendrogram/nodeId", de = "id", it = {
   type: "dendro",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -2531,11 +2714,11 @@ var Ke = class extends R {
     heatmapGroup: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, Qe = class extends R {
+}, ut = class extends Q {
   constructor() {
     super(
       {
-        value: new D({
+        value: new I({
           componentName: "value",
           allowedTypes: ["Int", "Long"],
           annotations: { "pl7.app/dendrogram/isTopology": "true" },
@@ -2547,7 +2730,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        height: new D({
+        height: new I({
           componentName: "height",
           allowedTypes: ["Int", "Long", "Double", "Float"],
           annotations: { "pl7.app/dendrogram/isDistance": "true" },
@@ -2560,7 +2743,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        labels: new D({
+        labels: new I({
           componentName: "labels",
           allowedTypes: ["Int", "String", "Long"],
           parentComponents: ["value"],
@@ -2571,7 +2754,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        tableContent: new D({
+        tableContent: new I({
           componentName: "tableContent",
           allowedTypes: ["Int", "String", "Long", "Double", "Float"],
           parentComponents: ["value"],
@@ -2583,7 +2766,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        nodeShape: new D({
+        nodeShape: new I({
           componentName: "nodeShape",
           allowedTypes: ["Int", "String", "Long"],
           parentComponents: ["value"],
@@ -2594,7 +2777,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        nodeSize: new D({
+        nodeSize: new I({
           componentName: "nodeSize",
           allowedTypes: ["Double", "Int", "String", "Long"],
           parentComponents: ["value"],
@@ -2605,7 +2788,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        nodeColor: new D({
+        nodeColor: new I({
           componentName: "nodeColor",
           allowedTypes: ["Double", "Int", "String", "Long"],
           parentComponents: ["value"],
@@ -2616,7 +2799,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        lineColor: new D({
+        lineColor: new I({
           componentName: "lineColor",
           allowedTypes: ["Double", "Int", "String", "Long"],
           parentComponents: ["value"],
@@ -2627,7 +2810,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        heatmapForSequence: new D({
+        heatmapForSequence: new I({
           componentName: "heatmapForSequence",
           allowedTypes: ["String"],
           annotations: { "pl7.app/type": "sequence" },
@@ -2639,7 +2822,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        heatmapAnnotation: new D({
+        heatmapAnnotation: new I({
           componentName: "heatmapAnnotation",
           allowedTypes: ["Double", "Int", "Long", "Float", "String"],
           parentComponents: ["value"],
@@ -2651,7 +2834,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        facetBy: new D({
+        facetBy: new I({
           componentName: "facetBy",
           allowedTypes: ["String", "Int", "Long"],
           parentComponents: ["value"],
@@ -2664,7 +2847,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        heatmapAxis: new D({
+        heatmapAxis: new I({
           componentName: "heatmapAxis",
           allowedTypes: ["String", "Int", "Long"],
           parentComponents: ["heatmapAnnotation"],
@@ -2675,7 +2858,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        heatmapGroup: new D({
+        heatmapGroup: new I({
           componentName: "heatmapGroup",
           allowedTypes: ["String", "Int", "Long"],
           parentComponents: ["heatmapAnnotation"],
@@ -2689,7 +2872,7 @@ var Ke = class extends R {
         })
       },
       {
-        filters: new D({
+        filters: new I({
           componentName: "filters",
           allowedTypes: ["String", "Int", "Long"],
           parentComponents: ["value", "heatmapAnnotation"],
@@ -2702,7 +2885,7 @@ var Ke = class extends R {
             columnsWithExtraAxesAllowed: !1
           }
         }),
-        tabBy: new D({
+        tabBy: new I({
           componentName: "tabBy",
           allowedTypes: ["String", "Int", "Long"],
           parentComponents: ["value", "heatmapAnnotation"],
@@ -2722,16 +2905,16 @@ var Ke = class extends R {
   }
   async createTableData(t, e) {
     var o;
-    const n = {}, l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, s = C(l);
+    const n = {}, l = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, s = A(l);
     if (!l || !B(s))
       throw Error("Value column is not valid");
-    const c = await W(t), a = U([
+    const { linkerColumnsMap: r, compositeLinkerMap: c } = await X(t), i = Y([
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ]), r = [
-      ...e.components.filters.selectorStates.map((g) => C(g.selectedSource)),
-      ...e.components.tabBy.selectorStates.map((g) => C(g.selectedSource))
-    ].filter(B), u = [l], p = await X(t, u), m = [], d = [], w = [], h = [e.components.value], A = [
+    ]), 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 $(t, u), d = [], h = [], g = [], x = [e.components.value], w = [
       e.components.tableContent,
       // next components can content data mapped on tree
       e.components.labels,
@@ -2739,70 +2922,72 @@ var Ke = class extends R {
       e.components.nodeSize,
       e.components.nodeShape,
       e.components.lineColor
-    ], v = {};
-    for (const g of h)
-      for (const { selectedSource: i, fixedAxes: f } of g.selectorStates) {
-        w.push(...await M(
+    ], D = {};
+    for (const a of x)
+      for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
+        g.push(...await V(
           t,
+          r,
           c,
-          p,
-          i,
-          f
+          m,
+          S,
+          y
         ));
-        const y = await E(t, i, u), S = y ?? C(i);
-        v[S.toCanonicalString()] = i, m.push(S);
+        const f = await k(t, S, u), v = f ?? A(S);
+        D[v.toCanonicalString()] = S, d.push(v);
       }
-    for (const g of A)
-      for (const { selectedSource: i, fixedAxes: f } of g.selectorStates) {
-        w.push(...await M(
+    for (const a of w)
+      for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
+        g.push(...await V(
           t,
+          r,
           c,
-          p,
-          i,
-          f
+          m,
+          S,
+          y
         ));
-        const y = await E(t, i, u), S = y ?? C(i);
-        v[i] = S.toCanonicalString(), d.push(S);
+        const f = await k(t, S, u), v = f ?? A(S);
+        D[S] = v.toCanonicalString(), h.push(v);
       }
-    const x = await t.pFrameProvider.getTableOuterJoin(
-      [...m, ...r, ...w],
-      d,
-      a,
+    const b = await t.pFrameProvider.getTableOuterJoin(
+      [...d, ...p, ...g],
+      h,
+      i,
       !1
     );
-    for (const g of [...m, ...d]) {
-      const i = g.toCanonicalString(), f = v[g.toCanonicalString()];
-      n[f] = {
-        data: B(g) ? x.columnsData[i] : x.axesData[i],
-        spec: B(g) ? x.columnSpecs[i] : x.axesSpecs[i],
-        label: await F(t, f, u)
+    for (const a of [...d, ...h]) {
+      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)
       };
     }
-    const b = Object.keys(x.axesData).find(
-      (g) => {
-        var i;
-        return ((i = C(g)) == null ? void 0 : i.name) === me;
+    const C = Object.keys(b.axesData).find(
+      (a) => {
+        var S;
+        return ((S = A(a)) == null ? void 0 : S.name) === me;
       }
     );
-    return b ? n[de] = {
-      data: x.axesData[b],
+    return C ? n[de] = {
+      data: b.axesData[C],
       spec: { kind: "PColumn", valueType: "Int", name: "Node id" },
       label: "Node id"
     } : console.warn("Missed node id axis in data column"), n;
   }
   async createDataByColumns(t, e) {
     var o, n, l;
-    const s = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, c = (n = e.components.heatmapAnnotation.selectorStates[0]) == null ? void 0 : n.selectedSource, a = C(s), r = c ? C(c) : null;
-    if (!s || !B(a))
+    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))
       throw Error("Value column is not valid");
-    const u = {
+    const p = {
       type: "columns",
-      id: (l = j(e.components)) != null ? l : "",
+      id: (l = z(e.components)) != null ? l : "",
       values: {}
-    }, p = [
+    }, u = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], m = U(p), d = p.map((y) => C(y.selectedSource)).filter(B), w = [a, r].filter(B).map((y) => y.toCanonicalString()), h = [], A = [], v = [], x = [], b = [
+    ], m = Y(u), d = u.map((y) => A(y.selectedSource)).filter(B), h = [c, i].filter(B).map((y) => y.toCanonicalString()), g = [], x = [], w = [], D = [], b = [
       e.components.value,
       e.components.height,
       e.components.labels,
@@ -2812,147 +2997,147 @@ var Ke = class extends R {
       e.components.lineColor,
       e.components.heatmapAnnotation,
       e.components.heatmapForSequence
-    ], g = [
+    ], C = [
       e.components.facetBy,
       e.components.heatmapAxis,
       e.components.heatmapGroup,
       e.components.tableContent
     ];
     for (const y of b)
-      for (const { selectedSource: S, fixedAxes: I } of y.selectorStates) {
-        h.push(C(S)), v.push(
-          (I ?? []).map(({ axisIdx: N, axisValue: L }) => ({ idx: N, value: L }))
+      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 }))
         );
-        const P = await E(t, S, w);
-        P && h.push(P);
+        const P = await k(t, f, h);
+        P && g.push(P);
       }
-    p.forEach(({ fixedAxes: y }) => {
-      v.push(
-        (y ?? []).map(({ axisIdx: S, axisValue: I }) => ({ idx: S, value: I }))
+    u.forEach(({ fixedAxes: y }) => {
+      w.push(
+        (y ?? []).map(({ axisIdx: f, axisValue: v }) => ({ idx: f, value: v }))
       );
     });
-    for (const y of g)
-      for (const { selectedSource: S, fixedAxes: I } of y.selectorStates) {
-        A.push(C(S)), x.push(
-          (I ?? []).map(({ axisIdx: N, axisValue: L }) => ({ idx: N, value: L }))
+    for (const y of C)
+      for (const { selectedSource: f, fixedAxes: v } of y.selectorStates) {
+        x.push(A(f)), D.push(
+          (v ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
         );
-        const P = await E(t, S, w);
-        P && A.push(P);
+        const P = await k(t, f, h);
+        P && x.push(P);
       }
-    const i = await t.pFrameProvider.getTableOuterJoin(
-      [...h, ...d],
-      A,
+    const a = await t.pFrameProvider.getTableOuterJoin(
+      [...g, ...d],
+      x,
       m,
       !1,
-      v,
-      x
+      w,
+      D
     );
-    [...h, ...A].forEach((y) => {
-      const S = y.toCanonicalString(), I = B(y) ? i.columnsData[S] : i.axesData[S];
-      u.values[S] = [], u.values[S] = I;
+    [...g, ...x].forEach((y) => {
+      const f = y.toCanonicalString(), v = B(y) ? a.columnsData[f] : a.axesData[f];
+      p.values[f] = [], p.values[f] = v;
     });
-    const f = Object.keys(i.axesData).find(
+    const S = Object.keys(a.axesData).find(
       (y) => {
-        var S;
-        return ((S = C(y)) == null ? void 0 : S.name) === me;
+        var f;
+        return ((f = A(y)) == null ? void 0 : f.name) === me;
       }
     );
-    return f ? u.values[de] = i.axesData[f] : console.warn("Missed node id axis in data column"), { byColumns: u };
+    return S ? p.values[de] = a.axesData[S] : console.warn("Missed node id axis in data column"), { byColumns: p };
   }
   async createChartSettings(t, e) {
     var o, n, l;
-    const s = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, c = C(s);
-    if (!s || !B(c))
+    const s = (o = e.components.value.selectorStates[0]) == null ? void 0 : o.selectedSource, r = A(s);
+    if (!s || !B(r))
       throw Error("Data column is not valid");
-    const a = [s], r = { type: "column", value: de }, 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, d = {};
+    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 = {};
     if (e.components.nodeColor.selectorStates.length) {
-      const v = e.components.nodeColor.selectorStates[0].selectedSource;
+      const w = e.components.nodeColor.selectorStates[0].selectedSource;
       d.nodeColor = {
         columnName: {
           type: "column",
-          value: v,
-          label: await F(t, v, a)
+          value: w,
+          label: await T(t, w, c)
         }
       };
     }
     if (e.components.nodeShape.selectorStates.length) {
-      const v = e.components.nodeShape.selectorStates[0].selectedSource;
+      const w = e.components.nodeShape.selectorStates[0].selectedSource;
       d.nodeShape = {
         columnName: {
           type: "column",
-          value: v,
-          label: await F(t, v, a)
+          value: w,
+          label: await T(t, w, c)
         }
       };
     }
     if (e.components.nodeSize.selectorStates.length) {
-      const v = e.components.nodeSize.selectorStates[0].selectedSource;
+      const w = e.components.nodeSize.selectorStates[0].selectedSource;
       d.nodeSize = {
         columnName: {
           type: "column",
-          value: v,
-          label: await F(t, v, a)
+          value: w,
+          label: await T(t, w, c)
         }
       };
     }
     if (e.components.lineColor.selectorStates.length) {
-      const v = e.components.lineColor.selectorStates[0].selectedSource;
+      const w = e.components.lineColor.selectorStates[0].selectedSource;
       d.lineColor = {
         columnName: {
           type: "column",
-          value: v,
-          label: await F(t, v, a)
+          value: w,
+          label: await T(t, w, c)
         }
       };
     }
-    let w, h, A;
+    let h, g, x;
     if (e.components.heatmapAnnotation.selectorStates.length && e.components.heatmapAxis.selectorStates.length) {
-      const v = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
-      w = {
+      const w = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
+      h = {
         type: "column",
-        value: v,
-        label: await F(t, v, []),
-        valueLabels: (n = await E(t, v, [])) == null ? void 0 : n.toCanonicalString()
+        value: w,
+        label: await T(t, w, []),
+        valueLabels: (n = await k(t, w, [])) == null ? void 0 : n.toCanonicalString()
       };
-      const x = e.components.heatmapAxis.selectorStates[0].selectedSource;
-      h = {
+      const D = e.components.heatmapAxis.selectorStates[0].selectedSource;
+      g = {
         type: "column",
-        value: x,
-        label: await F(t, x, [v]),
-        valueLabels: (l = await E(t, x, [v])) == null ? void 0 : l.toCanonicalString()
-      }, A = await Promise.all(
+        value: D,
+        label: await T(t, D, [w]),
+        valueLabels: (l = await k(t, D, [w])) == null ? void 0 : l.toCanonicalString()
+      }, x = await Promise.all(
         e.components.heatmapGroup.selectorStates.map(async (b) => {
-          var g;
+          var C;
           return {
             type: "column",
             value: b.selectedSource,
-            label: await F(t, b.selectedSource, [v]),
-            valueLabels: (g = await E(t, b.selectedSource, [v])) == null ? void 0 : g.toCanonicalString()
+            label: await T(t, b.selectedSource, [w]),
+            valueLabels: (C = await k(t, b.selectedSource, [w])) == null ? void 0 : C.toCanonicalString()
           };
         })
       );
     } else if (e.components.heatmapForSequence.selectorStates.length) {
-      const v = e.components.heatmapForSequence.selectorStates[0].selectedSource;
-      w = {
+      const w = e.components.heatmapForSequence.selectorStates[0].selectedSource;
+      h = {
         type: "column",
-        value: v,
-        label: await F(t, v, [])
+        value: w,
+        label: await T(t, w, [])
       };
     }
     return {
       type: "dendro",
-      id: r,
-      parentId: u,
-      height: p,
+      id: i,
+      parentId: p,
+      height: u,
       labels: m,
       aes: d,
-      heatmapAnnotation: w,
-      heatmapAxis: h,
-      heatmapGroup: A
+      heatmapAnnotation: h,
+      heatmapAxis: g,
+      heatmapGroup: x
     };
   }
-}, fe = 1e6;
-function re(t, e) {
+}, ge = 1e6;
+function ce(t, e) {
   if (t === "String")
     return e.data;
   if (typeof e.data[0] == "bigint") {
@@ -2967,8 +3152,8 @@ function re(t, e) {
   }
   return e.data;
 }
-var z = !1;
-var et = class {
+var H = !1;
+var pt = class {
   constructor(t, e) {
     this.pframeHandle = t, this.pframeDriver = e;
   }
@@ -2989,19 +3174,19 @@ var et = class {
         },
         filters: e,
         sorting: []
-      }), l = n.filter((c) => c.spec.type === "axis"), s = n.filter((c) => c.spec.type === "column");
+      }), l = n.filter((r) => r.spec.type === "axis"), s = n.filter((r) => r.spec.type === "column");
       return {
-        axesData: l.reduce((c, a) => {
-          const r = _.fromAxisSpec(a.spec.spec);
-          return c[r.toCanonicalString()] = re(r.type, a.data), c;
+        axesData: l.reduce((r, c) => {
+          const i = _.fromAxisSpec(c.spec.spec);
+          return r[i.toCanonicalString()] = ce(i.type, c.data), r;
         }, {}),
-        data: s.length ? re(t.type, s[0].data) : []
+        data: s.length ? ce(t.type, s[0].data) : []
       };
     } catch (o) {
       throw console.error("PFrame: calculateTableData error"), o;
     }
   }
-  async getColumnUniqueValues(t, e = fe, o = []) {
+  async getColumnUniqueValues(t, e = ge, o = []) {
     if (!await this.isColumnExisted(t))
       return { values: [], overflow: !1 };
     const n = {
@@ -3011,25 +3196,25 @@ var et = class {
     };
     try {
       const l = Date.now(), s = await this.pframeDriver.getUniqueValues(this.pframeHandle, n);
-      let c = !1;
-      return s.overflow && (c = !0, console.warn(`More than ${e} values for ${t.name} column`)), {
+      let r = !1;
+      return s.overflow && (r = !0, console.warn(`More than ${e} values for ${t.name} column`)), {
         values: Array.from(s.values.data).map(String),
-        overflow: c
+        overflow: r
       };
     } catch (l) {
       throw console.error("PFrame: getUniqueValues for column error"), l;
     }
   }
-  async getAxisUniqueValues(t, e, o = fe, n = []) {
-    const l = e.filter(B), s = await Promise.all(l.map((r) => this.getColumnSpecById(r))), c = t.toCanonicalString(), a = l.filter((r, u) => {
-      const p = s[u];
-      return p !== null && p.axesSpec.some((m) => _.fromAxisSpec(m).toCanonicalString() === c);
+  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);
     });
-    if (a.length === 0)
+    if (c.length === 0)
       return { values: [], overflow: !1 };
     try {
-      const r = Date.now(), u = await Promise.all(
-        a.map(
+      const i = Date.now(), p = await Promise.all(
+        c.map(
           (m) => this.pframeDriver.getUniqueValues(this.pframeHandle, {
             columnId: m.name,
             axis: t.toPFrameId(),
@@ -3038,58 +3223,58 @@ var et = class {
           })
         )
       );
-      let p = !1;
-      return u.forEach((m, d) => {
-        m.overflow && (p = !0, console.warn(`More than ${o} values for ${a[d].name} column`));
+      let u = !1;
+      return p.forEach((m, d) => {
+        m.overflow && (u = !0, console.warn(`More than ${o} values for ${c[d].name} column`));
       }), {
-        values: ce.uniq(
-          ce.flatten(u.map((m) => Array.from(m.values.data).map(String)))
+        values: ie.uniq(
+          ie.flatten(p.map((m) => Array.from(m.values.data).map(String)))
         ),
-        overflow: p
+        overflow: u
       };
-    } catch (r) {
-      throw console.error("PFrame: getUniqueValues for axis error", r), r;
+    } catch (i) {
+      throw console.error("PFrame: getUniqueValues for axis error", i), i;
     }
   }
   async getTableOuterJoin(t, e, o = [], n = !0, l = [], s = []) {
-    const c = t.filter(B), a = e.filter(B), r = {
+    const r = t.filter(B), c = e.filter(B), i = {
       src: {
         type: "outer",
         primary: {
           type: n ? "inner" : "full",
-          entries: c.map((u, p) => {
+          entries: r.map((p, u) => {
             var m;
-            const d = (m = l[p]) == null ? void 0 : m.map((w) => ({
+            const d = (m = l[u]) == null ? void 0 : m.map((h) => ({
               type: "constant",
-              axisIndex: w.idx,
-              constant: w.value
-            })).filter((w) => w.constant !== void 0);
+              axisIndex: h.idx,
+              constant: h.value
+            })).filter((h) => h.constant !== void 0);
             return d != null && d.length ? {
               type: "slicedColumn",
-              newId: u.name,
-              column: u.name,
+              newId: p.name,
+              column: p.name,
               axisFilters: d
             } : {
               type: "column",
-              column: u.name
+              column: p.name
             };
           })
         },
-        secondary: a.map((u, p) => {
+        secondary: c.map((p, u) => {
           var m;
-          const d = (m = s[p]) == null ? void 0 : m.map((w) => ({
+          const d = (m = s[u]) == null ? void 0 : m.map((h) => ({
             type: "constant",
-            axisIndex: w.idx,
-            constant: w.value
-          })).filter((w) => w.constant !== void 0);
+            axisIndex: h.idx,
+            constant: h.value
+          })).filter((h) => h.constant !== void 0);
           return d != null && d.length ? {
             type: "slicedColumn",
-            newId: u.name,
-            column: u.name,
+            newId: p.name,
+            column: p.name,
             axisFilters: d
           } : {
             type: "column",
-            column: u.name
+            column: p.name
           };
         })
       },
@@ -3097,33 +3282,33 @@ var et = class {
       sorting: []
     };
     try {
-      const u = Date.now(), p = await this.pframeDriver.calculateTableData(this.pframeHandle, r), m = p.filter((w) => w.spec.type === "axis"), d = p.filter((w) => w.spec.type === "column");
+      const p = Date.now(), u = await this.pframeDriver.calculateTableData(this.pframeHandle, i), m = u.filter((h) => h.spec.type === "axis"), d = u.filter((h) => h.spec.type === "column");
       return {
-        axesData: m.reduce((w, h) => {
-          const A = _.fromAxisSpec(h.spec.spec);
-          return w[A.toCanonicalString()] = re(A.type, h.data), w;
+        axesData: m.reduce((h, g) => {
+          const x = _.fromAxisSpec(g.spec.spec);
+          return h[x.toCanonicalString()] = ce(x.type, g.data), h;
         }, {}),
-        columnsData: d.reduce((w, h) => {
-          const A = h.spec.spec, v = new Y({
-            name: h.spec.id,
-            type: A.valueType
+        columnsData: d.reduce((h, g) => {
+          const x = g.spec.spec, w = new W({
+            name: g.spec.id,
+            type: x.valueType
           });
-          return w[v.toCanonicalString()] = re(v.type, h.data), w;
+          return h[w.toCanonicalString()] = ce(w.type, g.data), h;
         }, {}),
-        columnSpecs: d.reduce((w, h) => {
-          const A = h.spec.spec, v = new Y({
-            name: h.spec.id,
-            type: A.valueType
+        columnSpecs: d.reduce((h, g) => {
+          const x = g.spec.spec, w = new W({
+            name: g.spec.id,
+            type: x.valueType
           });
-          return w[v.toCanonicalString()] = A, w;
+          return h[w.toCanonicalString()] = x, h;
         }, {}),
-        axesSpecs: m.reduce((w, h) => {
-          const A = h.spec.spec, v = _.fromAxisSpec(A);
-          return w[v.toCanonicalString()] = A, w;
+        axesSpecs: m.reduce((h, g) => {
+          const x = g.spec.spec, w = _.fromAxisSpec(x);
+          return h[w.toCanonicalString()] = x, h;
         }, {})
       };
-    } catch (u) {
-      throw console.error("PFrame: table outer join error"), console.info("error with request: ", r), u;
+    } catch (p) {
+      throw console.error("PFrame: table outer join error"), console.info("error with request: ", i), p;
     }
   }
   async getColumnSpecById(t) {
@@ -3144,7 +3329,7 @@ var et = class {
     for (const l of t)
       if (B(l)) {
         const s = (o = (e = await this.getColumnSpecById(l)) == null ? void 0 : e.axesSpec) != null ? o : [];
-        n.push(...s.map((c) => _.fromAxisSpec(c).toPFrameId()));
+        n.push(...s.map((r) => _.fromAxisSpec(r).toPFrameId()));
       }
     return n;
   }
@@ -3162,17 +3347,17 @@ var et = class {
         compatibleWith: await this.getRequestColumnsFromSelectedSources(t),
         strictlyCompatible: e
         // should be true if we want to get meta and false if X/Y
-      }, c = Date.now(), a = await this.pframeDriver.findColumns(this.pframeHandle, s), r = [];
-      return a.hits.forEach((u) => {
-        r.push(u);
-      }), r;
+      }, r = Date.now(), c = await this.pframeDriver.findColumns(this.pframeHandle, s), i = [];
+      return c.hits.forEach((p) => {
+        i.push(p);
+      }), i;
     } catch (s) {
       throw console.error("PFrame: findColumns error"), s;
     }
   }
   async getColumns(t, e, o, n, l) {
     return (await this.getColumnsFull(t, e, o, n, l)).map(
-      (s) => new Y({
+      (s) => new W({
         name: s.columnId,
         type: s.spec.valueType
       })
@@ -3189,56 +3374,56 @@ var et = class {
         },
         compatibleWith: [],
         strictlyCompatible: !1
-      }, s = Date.now(), c = await this.pframeDriver.findColumns(this.pframeHandle, l), a = [];
-      return c.hits.forEach(({ columnId: r, spec: u }) => {
-        a.push(new Y({ name: r, type: u.valueType }));
-      }), a.length > 1 && console.warn(`More than 1 column found for ${t}}`), a.length === 0 ? (console.warn(`No columns found for ${t}}`), null) : a[0];
+      }, 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];
     } catch (l) {
       throw console.error("PFrame: findColumns error"), l;
     }
   }
-}, st = class {
+}, ft = class {
   constructor(t, e, o = (n, l) => l ?? n) {
-    this.labelsModifier = o, this.pFrameProvider = new et(t, e);
+    this.labelsModifier = o, this.pFrameProvider = new pt(t, e);
   }
-}, Ie = {
+}, Pe = {
   controllers: {
-    discrete: new We(),
-    scatterplot: new Re(),
-    "scatterplot-umap": new $e(),
-    heatmap: new Ke(),
-    dendro: new Qe(),
-    histogram: new Ue(),
-    bubble: new je()
+    discrete: new nt(),
+    scatterplot: new at(),
+    "scatterplot-umap": new ct(),
+    heatmap: new st(),
+    dendro: new ut(),
+    histogram: new et(),
+    bubble: new Qe()
   },
   initialStates: {
-    discrete: He,
-    scatterplot: Xe,
-    "scatterplot-umap": Je,
-    heatmap: Ye,
-    dendro: Ze,
-    histogram: ze,
-    bubble: Ve
+    discrete: tt,
+    scatterplot: lt,
+    "scatterplot-umap": rt,
+    heatmap: ot,
+    dendro: it,
+    histogram: Ze,
+    bubble: $e
   }
 };
-function lt(t) {
-  return Ie.controllers[t];
+function gt(t) {
+  return Pe.controllers[t];
 }
-function at(t) {
-  return Ie.initialStates[t];
+function ht(t) {
+  return Pe.initialStates[t];
 }
 export {
   _ as AxisId,
-  je as BubbleStateController,
-  Y as ColumnId,
-  st as DemoDataStore,
-  Qe as DendroStateController,
-  We as DiscreteStateController,
-  Ke as HeatmapStateController,
-  Re as ScatterplotStateController,
-  C as columnOrAxisIdFromString,
-  lt as getControllerByType,
-  at as getInitialStateByType,
+  Qe as BubbleStateController,
+  W as ColumnId,
+  ft as DemoDataStore,
+  ut as DendroStateController,
+  nt as DiscreteStateController,
+  st as HeatmapStateController,
+  at as ScatterplotStateController,
+  A as columnOrAxisIdFromString,
+  gt as getControllerByType,
+  ht as getInitialStateByType,
   B as isColumnId
 };
 //# sourceMappingURL=index.js.map