@milaboratories/graph-maker 1.1.135 → 1.1.136

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

@@ -1,8 +1,8 @@
 import z from "../../../canonicalize/lib/canonicalize.js";
 import { deriveLabels as Oe, isLabelColumn as Fe } from "../../../@platforma-sdk/model/dist/index.js";
-import { canonicalizeJson as j } from "../../pl-model-common/dist/index.js";
+import { canonicalizeJson as j, pTableValue as _e } 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 {
+var Le = "pl7.app/axisNature", xe = "pl7.app/label", Te = "pl7.app/columnAsAxis/name", ke = "pl7.app/columnAsAxis/domain", $ = "pl7.app/isSubset", ee = "pl7.app/isDiscreteFilter", Ee = "pl7.app/discreteValues", Ne = "pl7.app/graph/axis/highCardinality", Ge = "pl7.app/graph/isVirtual", he = "pl7.app/isLinkerColumn", _ = class se {
   constructor({ type: e, name: o, domain: n }) {
     this.kind = "axis", this.type = e, this.name = o, this.domain = { ...n };
   }
@@ -57,7 +57,7 @@ var Se = "pl7.app/parents";
 function Ce(t) {
   return !t.annotations || !t.annotations[Se] ? [] : JSON.parse(t.annotations[Se]);
 }
-function Ge(t, e) {
+function Me(t, e) {
   const o = j(t[e]);
   for (let n = 0; n < t.length; n++) {
     const l = t[n];
@@ -68,13 +68,13 @@ function Ge(t, e) {
   }
   return !0;
 }
-function Me(t) {
+function qe(t) {
   for (let e = 0; e < t.length; e++)
-    if (Ge(t, e))
+    if (Me(t, e))
       return t[e];
   return null;
 }
-function qe(t) {
+function Ve(t) {
   const e = { axis: t, parents: [] };
   let o = [e];
   for (; o.length; ) {
@@ -87,7 +87,7 @@ function qe(t) {
   }
   return e;
 }
-function Ve(t) {
+function je(t) {
   const e = /* @__PURE__ */ new Set([j(t.axis)]);
   let o = [t];
   for (; o.length; ) {
@@ -99,7 +99,7 @@ function Ve(t) {
   }
   return e;
 }
-function je(t) {
+function ze(t) {
   const e = [t.axis];
   let o = [t];
   for (; o.length; ) {
@@ -117,18 +117,18 @@ function te(t) {
   let e = t;
   const o = [];
   for (; e.length; ) {
-    const n = Me(e);
+    const n = qe(e);
     if (n === null)
       return null;
-    const l = qe(n);
+    const l = Ve(n);
     if (l === null)
       return null;
-    const s = Ve(l), r = je(l);
+    const s = je(l), r = ze(l);
     o.push(r), e = e.filter((c) => !s.has(j(c)));
   }
   return o;
 }
-function ze(t) {
+function Ke(t) {
   var e, o;
   const n = /* @__PURE__ */ new Map();
   for (const l of t) {
@@ -140,20 +140,20 @@ function ze(t) {
   }
   return n;
 }
-async function Ke(t, e, o, n, l, s, r, c = !0, i) {
+async function Ue(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);
+  const x = A(e);
+  if (B(x)) {
+    const g = await t.pFrameProvider.getColumnSpecById(x);
     if (!g)
       return;
-    const x = be(
+    const h = be(
       g,
       l,
       s,
       r,
       i
-    ).map((a) => _.fromAxisSpec(a).toCanonicalString()), w = new Set(x), D = g.axesSpec.map((a) => _.fromAxisSpec(a).toCanonicalString()), b = {};
+    ).map((a) => _.fromAxisSpec(a).toCanonicalString()), w = new Set(h), D = g.axesSpec.map((a) => _.fromAxisSpec(a).toCanonicalString()), b = {};
     c && D.forEach((a, S) => {
       w.has(a) && (b[a] = S);
     });
@@ -164,12 +164,12 @@ async function Ke(t, e, o, n, l, s, r, c = !0, i) {
       type: g.valueType,
       spec: g,
       annotations: g.annotations,
-      isSubsetFilter: ((p = g.annotations) == null ? void 0 : p[J]) === "true",
+      isSubsetFilter: ((p = g.annotations) == null ? void 0 : p[$]) === "true",
       isDiscreteFilter: g.valueType === "String" || ((u = g.annotations) == null ? void 0 : u[ee]) === "true",
-      axesToBeFixed: x,
+      axesToBeFixed: h,
       axesToBeFixedIndexes: b
     };
-    n.set(h.toCanonicalString(), C);
+    n.set(x.toCanonicalString(), C);
     for (const a of g.axesSpec) {
       const y = _.fromAxisSpec(a).toCanonicalString();
       if (n.has(y))
@@ -183,7 +183,7 @@ async function Ke(t, e, o, n, l, s, r, c = !0, i) {
         dividable: !1,
         spec: a,
         annotations: a.annotations,
-        isSubsetFilter: ((m = a.annotations) == null ? void 0 : m[J]) === "true",
+        isSubsetFilter: ((m = a.annotations) == null ? void 0 : m[$]) === "true",
         isDiscreteFilter: a.type === "String" || ((d = a.annotations) == null ? void 0 : d[ee]) === "true",
         parentSources: [e]
       };
@@ -225,7 +225,7 @@ function ue(t) {
     dividedAxes: { ...t.dividedAxes }
   };
 }
-function Ue(t) {
+function We(t) {
   const { selectedSource: e, type: o, selectedFilterRange: n, selectedFilterValue: l } = t, s = A(e);
   if (!s)
     throw Error("Empty source selected");
@@ -274,13 +274,13 @@ function Ue(t) {
 function Y(t) {
   const e = [];
   for (const o of t)
-    e.push(...Ue(o));
+    e.push(...We(o));
   return e;
 }
 function fe(t) {
   var e, o, n, l;
   if ("kind" in t && t.kind === "PColumn") {
-    const c = (o = t.name) != null ? o : (e = t.annotations) == null ? void 0 : e[Le], i = (l = t.domain) != null ? l : (n = t.annotations) == null ? void 0 : n[Te];
+    const c = (o = t.name) != null ? o : (e = t.annotations) == null ? void 0 : e[Te], i = (l = t.domain) != null ? l : (n = t.annotations) == null ? void 0 : n[ke];
     return z({ name: c, domain: i });
   }
   const s = t.name, r = t.domain;
@@ -300,7 +300,7 @@ async function ve(t, e, o) {
   }
   return null;
 }
-var We = "pl7.app/label";
+var He = "pl7.app/label";
 async function k(t, e, o) {
   const n = A(e);
   if (B(n))
@@ -309,7 +309,7 @@ async function k(t, e, o) {
     const p = await ve(t, i, o);
     return p ? fe(p) : null;
   }
-  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);
+  const s = await t.pFrameProvider.getColumnsFull([], !1, void 0, [He]), r = await l(n), c = s.find(({ spec: i }) => i && i.axesSpec.length === 1 && fe(i.axesSpec[0]) === r);
   return c ? new W({ name: c.columnId, type: c.spec.valueType }) : void 0;
 }
 async function T(t, e, o) {
@@ -318,23 +318,23 @@ async function T(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 i = (l = (n = c.annotations) == null ? void 0 : n[he]) != null ? l : c.name;
+  const i = (l = (n = c.annotations) == null ? void 0 : n[xe]) != null ? l : c.name;
   return t.labelsModifier(c.name, i);
 }
 function Ae(t) {
   var e, o;
-  const n = (o = (e = t.annotations) == null ? void 0 : e[_e]) == null ? void 0 : o.toLowerCase();
+  const n = (o = (e = t.annotations) == null ? void 0 : e[Le]) == null ? void 0 : o.toLowerCase();
   return !!n && n !== "homogenous" && n !== "homogeneous";
 }
 function R(t) {
   var e, o;
-  return ((e = t.annotations) == null ? void 0 : e[J]) === "true" || ((o = t.annotations) == null ? void 0 : o[ee]) === "true", !0;
+  return ((e = t.annotations) == null ? void 0 : e[$]) === "true" || ((o = t.annotations) == null ? void 0 : o[ee]) === "true", !0;
 }
-function He(t) {
+function Ye(t) {
   var e, o;
-  return !t.name.includes("metadata") && ((e = t.annotations) == null ? void 0 : e[Ne]) !== "true" && ((o = t.annotations) == null ? void 0 : o[J]) !== "true";
+  return !t.name.includes("metadata") && ((e = t.annotations) == null ? void 0 : e[Ge]) !== "true" && ((o = t.annotations) == null ? void 0 : o[$]) !== "true";
 }
-function Ye(t) {
+function Re(t) {
   var e;
   const o = {};
   for (const n of t.filter((l) => l.spec.axesSpec.length === 2)) {
@@ -346,7 +346,7 @@ function Ye(t) {
   }
   return o;
 }
-async function $(t, e) {
+async function J(t, e) {
   const o = /* @__PURE__ */ new Set(), n = [];
   for (const l of e) {
     const s = A(l);
@@ -362,7 +362,7 @@ async function $(t, e) {
   }
   return n;
 }
-function Re(t, e, o) {
+function Xe(t, e, o) {
   const n = {}, l = /* @__PURE__ */ new Set([e]);
   let s = [e];
   for (; s.length; ) {
@@ -383,8 +383,8 @@ function Re(t, e, o) {
   }
   return null;
 }
-function Xe(t, e, o) {
-  const n = [...e].map((s) => Re(t, s, o)).filter((s) => s !== null);
+function $e(t, e, o) {
+  const n = [...e].map((s) => Xe(t, s, o)).filter((s) => s !== null);
   if (n.length === 0)
     return [];
   let l = n[0];
@@ -398,8 +398,8 @@ async function X(t) {
     !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));
+    { [he]: "true" }
+  ), o = Re(e.filter((l) => l.spec.axesSpec.length === 2)), n = Ke(e.filter((l) => l.spec.axesSpec.length > 2));
   return { linkerColumnsMap: o, compositeLinkerMap: n };
 }
 async function V(t, e, o, n, l, s) {
@@ -410,12 +410,12 @@ async function V(t, e, o, n, l, s) {
   if (!c)
     return [];
   const i = c.axesSpec.filter(
-    (x) => {
-      const w = _.fromAxisSpec(x).toCanonicalString();
+    (h) => {
+      const w = _.fromAxisSpec(h).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();
+  ), p = new Set(n.map((h) => _.fromAxisSpec(h).toCanonicalString())), u = i.filter((h) => {
+    const w = _.fromAxisSpec(h).toCanonicalString();
     return !p.has(w);
   });
   if (!u.length)
@@ -423,23 +423,23 @@ async function V(t, e, o, n, l, s) {
   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) => {
+  const x = new Set(m.map(j)), g = /* @__PURE__ */ new Set();
+  return d.forEach((h) => {
     var w;
-    const D = j(x);
+    const D = j(h);
     if (o.has(D)) {
-      const b = o.get(D), a = (b ? [...b.keys()] : []).find((y) => h.has(y));
+      const b = o.get(D), a = (b ? [...b.keys()] : []).find((y) => x.has(y));
       if (!a)
         throw Error(`Can't find composite linker column for ${c.name}, ${D}`);
       const S = (w = o.get(D)) == null ? void 0 : w.get(a);
       g.add(S.toCanonicalString());
-    } else if (x.length === 1) {
-      const b = _.fromAxisSpec(x[0]).toCanonicalString();
-      Xe(e, p, b).forEach((a) => {
+    } else if (h.length === 1) {
+      const b = _.fromAxisSpec(h[0]).toCanonicalString();
+      $e(e, p, b).forEach((a) => {
         g.add(a.toCanonicalString());
       });
     }
-  }), [...g].map((x) => A(x));
+  }), [...g].map((h) => A(h));
 }
 function be(t, e, o, n, l) {
   const r = t.axesSpec.filter(
@@ -466,8 +466,8 @@ function Ie(t, e) {
     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;
+        let x = !0;
+        p.min !== void 0 && (x = x && d >= p.min), p.max !== void 0 && (x = x && d <= p.max), s = s || x;
       }
       u === "subset" && (s = s || d != null);
     }
@@ -547,12 +547,12 @@ var Q = class {
     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 x = A(d.selectedSource);
+        if (B(x)) {
+          const g = await t.pFrameProvider.getColumnSpecById(x);
+          g && g.axesSpec.forEach((h) => {
+            const w = _.fromAxisSpec(h).toCanonicalString();
+            c.has(w) || (c.add(w), i.push(h));
           });
         }
       }
@@ -562,19 +562,19 @@ var Q = class {
       const m = [];
       for (const d of u)
         if (n[d]) {
-          const h = Object.keys(n[d]);
-          for (const g of h)
+          const x = Object.keys(n[d]);
+          for (const g of x)
             !p.has(g) && !c.has(g) && (m.push(g), p.add(g));
         }
       u = m;
     }
     for (const [m, { selectorStates: d }] of Object.entries(e.components)) {
       const g = ((s = this.simpleComponentControllers[m]) != null ? s : this.filterComponentControllers[m]).settings.columnsWithExtraAxesAllowed;
-      for (const { selectedSource: x } of d)
-        await Ke(
+      for (const { selectedSource: h } of d)
+        await Ue(
           t,
-          x,
-          o[x],
+          h,
+          o[h],
           r,
           i,
           c,
@@ -616,10 +616,10 @@ var Q = class {
       return n[s] = l.label, n;
     }, {});
   }
-  async calculateOptions(t, e, o = [], n = He) {
+  async calculateOptions(t, e, o = [], n = Ye) {
     var l, s;
-    const r = this.createEmptyComponentsGuide(e), c = this.getConsumedOptionsSet(e), i = new Set(this.ignoredOptionIdNames), p = new Set(o), { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = await this.getLabelsMap(t, e), 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 r = this.createEmptyComponentsGuide(e), c = this.getConsumedOptionsSet(e), i = new Set(this.ignoredOptionIdNames), p = new Set(o), { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = await this.getLabelsMap(t, e), x = await this.getSelectedSourcesInfo(t, e, d, u, m), g = /* @__PURE__ */ new Map(), h = { ...this.simpleComponentControllers, ...this.filterComponentControllers }, w = /* @__PURE__ */ new Set();
+    for (const [y, f] of Object.entries(h)) {
       const v = await f.getOptions(
         t,
         e,
@@ -641,7 +641,7 @@ var Q = class {
     const D = (y) => {
       const f = g.get(y);
       f && f.kind === "axis" && (f.mustBeConsumed = !0);
-      const v = h.get(y);
+      const v = x.get(y);
       v && v.kind === "axis" && (v.mustBeConsumed = !0);
     }, b = await this.getMustBeConsumedAxes(t, e);
     for (const y of b)
@@ -649,14 +649,14 @@ var Q = class {
     if (this.dontAllowUnfilteredHighCardinality) {
       const y = (v) => {
         var P;
-        return ((P = v == null ? void 0 : v.annotations) == null ? void 0 : P[Ee]) === "true";
+        return ((P = v == null ? void 0 : v.annotations) == null ? void 0 : P[Ne]) === "true";
       }, f = (s = (l = e.components.filters) == null ? void 0 : l.selectorStates.reduce((v, P) => {
-        const O = h.get(P.selectedSource);
+        const O = x.get(P.selectedSource);
         return (O == null ? void 0 : O.kind) === "column" && O.spec.axesSpec.filter(y).forEach((L) => v.add(_.fromAxisSpec(L).toCanonicalString())), (O == null ? void 0 : O.kind) === "axis" && y(O.spec) && v.add(_.fromAxisSpec(O.spec).toCanonicalString()), v;
       }, /* @__PURE__ */ new Set())) != null ? s : /* @__PURE__ */ new Set();
       this.dataInputs.forEach((v) => {
         for (const { selectedSource: P } of e.components[v].selectorStates) {
-          const O = h.get(P);
+          const O = x.get(P);
           if ((O == null ? void 0 : O.kind) === "column" && O.spec.axesSpec.filter(y).forEach((L) => {
             const E = _.fromAxisSpec(L).toCanonicalString();
             !w.has(E) && !f.has(E) && w.add(E), f.has(E) || D(E);
@@ -670,7 +670,7 @@ var Q = class {
     const C = /* @__PURE__ */ new Set();
     for (const { selectorStates: y } of Object.values(e.components))
       for (const { selectedSource: f } of y) {
-        const v = h.get(f);
+        const v = x.get(f);
         v && v.kind === "column" && v.axesToBeFixed.forEach((P) => {
           C.add(P);
         });
@@ -678,7 +678,7 @@ var Q = class {
     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 (P = (v = g.get(O)) != null ? v : x.get(O)) != null ? P : ye(y);
     };
     return {
       components: r,
@@ -692,7 +692,7 @@ var Q = class {
   }
   async getUniqueSourceValuesWithLabels(t, e, o, n, l, s) {
     var r;
-    const c = (u) => u.sort((m, d) => m.label.localeCompare(d.label, "en", { numeric: !0 })), i = e.getSourceInfo(o), p = (r = i.annotations) == null ? void 0 : r[ke];
+    const c = (u) => u.sort((m, d) => m.label.localeCompare(d.label, "en", { numeric: !0 })), i = e.getSourceInfo(o), p = (r = i.annotations) == null ? void 0 : r[Ee];
     try {
       const u = p ? JSON.parse(p).map((m) => String(m)) : null;
       if (u) {
@@ -704,9 +704,9 @@ var Q = class {
     }
     if (i.kind === "axis") {
       const u = A(o), m = i.parentSources.map(A), d = await k(t, o, i.parentSources);
-      let h = [];
+      let x = [];
       if (d) {
-        l && (h = [{
+        l && (x = [{
           type: "bySingleColumnV2",
           column: {
             type: "column",
@@ -716,7 +716,7 @@ var Q = class {
             operator: "StringIContains",
             substring: l
           }
-        }]), s && (h = [{
+        }]), s && (x = [{
           type: "bySingleColumnV2",
           column: {
             type: "axis",
@@ -727,13 +727,13 @@ var Q = class {
             substring: s
           }
         }]);
-        const { data: D, axesData: b } = await t.pFrameProvider.getSingleColumnData(d, h), C = b[u.toCanonicalString()], a = [];
+        const { data: D, axesData: b } = await t.pFrameProvider.getSingleColumnData(d, x), C = b[u.toCanonicalString()], a = [];
         for (let S = 0; S < Math.min(C.length, n ?? C.length); S++)
           a.push({ value: String(C[S]), label: String(D[S]) });
         return c(a), { values: a, overflow: !(n === void 0 || C.length < n) };
       }
       const g = l ?? s;
-      g && (h = [{
+      g && (x = [{
         type: "bySingleColumnV2",
         column: {
           type: "axis",
@@ -744,8 +744,8 @@ var Q = class {
           substring: g
         }
       }]);
-      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 };
+      const h = await t.pFrameProvider.getAxisUniqueValues(u, [m[0]], n, x), w = h.values.map((D) => ({ value: String(D), label: String(D) }));
+      return c(w), { values: w, overflow: h.overflow };
     }
     if (i.kind === "column") {
       const u = l ?? s, m = A(o), d = u ? [{
@@ -758,8 +758,8 @@ var Q = class {
           operator: "StringIContains",
           substring: u
         }
-      }] : [], 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 };
+      }] : [], x = await t.pFrameProvider.getColumnUniqueValues(m, n, d), g = x.values.map((h) => ({ value: String(h), label: String(h) }));
+      return c(g), { values: g, overflow: x.overflow };
     }
     return { values: [], overflow: !1 };
   }
@@ -805,7 +805,7 @@ var Q = class {
         if (u && u.kind === "column" && u.axesToBeFixed.some(
           (m) => {
             var d;
-            return ((d = (p ?? []).find((h) => h.axisSource === m)) == null ? void 0 : d.axisValue) === void 0;
+            return ((d = (p ?? []).find((x) => x.axisSource === m)) == null ? void 0 : d.axisValue) === void 0;
           }
         )) {
           r = !0;
@@ -825,7 +825,7 @@ var Q = class {
   }
 }, Je = (t) => {
   var e;
-  return ((e = t == null ? void 0 : t.annotations) == null ? void 0 : e[xe]) === "true";
+  return ((e = t == null ? void 0 : t.annotations) == null ? void 0 : e[he]) === "true";
 }, De = class Be {
   constructor({
     componentName: e,
@@ -871,10 +871,10 @@ var Q = class {
           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)))
+            if (d.axesSpec.some((h) => i(h)))
               return !0;
             const g = te(d.axesSpec);
-            return g ? g.some((x) => l.has(j(x))) : !1;
+            return g ? g.some((h) => l.has(j(h))) : !1;
           } else
             return r.size === 0 || d.axesSpec.some((g) => i(g));
         }
@@ -919,7 +919,7 @@ var Q = class {
   }
   async getAllowedAxes(e, o, n) {
     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();
+    const m = this.getParentSelectedSources(e, o), d = /* @__PURE__ */ new Set(), x = [], g = /* @__PURE__ */ new Set(), h = /* @__PURE__ */ new Map();
     for (const D of m)
       if (B(D)) {
         const b = await e.pFrameProvider.getColumnSpecById(D);
@@ -927,9 +927,9 @@ var Q = class {
           const S = _.fromAxisSpec(C).toCanonicalString();
           if (d.has(S))
             continue;
-          d.add(S), h.push(C);
+          d.add(S), x.push(C);
           const y = Ae(C);
-          x.set(S, {
+          h.set(S, {
             kind: "axis",
             name: C.name,
             label: await T(e, S, [
@@ -940,7 +940,7 @@ var Q = class {
             dividable: !1,
             spec: C,
             annotations: C.annotations,
-            isSubsetFilter: ((s = C.annotations) == null ? void 0 : s[J]) === "true",
+            isSubsetFilter: ((s = C.annotations) == null ? void 0 : s[$]) === "true",
             isDiscreteFilter: C.type === "String" || ((r = C.annotations) == null ? void 0 : r[ee]) === "true",
             parentSources: [D.toCanonicalString()]
           });
@@ -958,16 +958,16 @@ var Q = class {
               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, {
+                h.has(v) || h.set(v, {
                   kind: "axis",
                   name: f.name,
-                  label: (i = (c = f.annotations) == null ? void 0 : c[he]) != null ? i : "",
+                  label: (i = (c = f.annotations) == null ? void 0 : c[xe]) != null ? i : "",
                   type: f.type,
                   mustBeConsumed: !1,
                   dividable: !1,
                   spec: f,
                   annotations: f.annotations,
-                  isSubsetFilter: ((p = f.annotations) == null ? void 0 : p[J]) === "true",
+                  isSubsetFilter: ((p = f.annotations) == null ? void 0 : p[$]) === "true",
                   isDiscreteFilter: f.type === "String" || ((u = f.annotations) == null ? void 0 : u[ee]) === "true",
                   parentSources: [y.toCanonicalString()]
                 });
@@ -976,15 +976,15 @@ var Q = class {
         }
       w = D;
     }
-    return { parentAxes: d, parentAxesList: h, linkerAxes: g, optionsInfo: x };
+    return { parentAxes: d, parentAxesList: x, linkerAxes: g, optionsInfo: h };
   }
   async getOptions(e, o, n, l, s, r, c, i = /* @__PURE__ */ new Set(), p = /* @__PURE__ */ new Set()) {
-    var u, m, d, h, g;
-    const x = this.settings.multipleSelectors, w = this.settings.required, D = await this.checkStateConsistency(e, o, s, r);
+    var u, m, d, x, g;
+    const h = this.settings.multipleSelectors, w = this.settings.required, D = await this.checkStateConsistency(e, o, s, r);
     if (this.dependsOn.length && this.dependsOn.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: x, required: w, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
+      return { multipleSelectors: h, required: w, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
     if (this.strictlyDependsOnParents && !this.settings.isDataComponent && this.parentComponents.some((O) => o.components[O].selectorStates.length === 0))
-      return { multipleSelectors: x, required: w, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
+      return { multipleSelectors: h, required: w, stateConsistency: D, options: [], optionsInfo: /* @__PURE__ */ new Map() };
     const b = this.getParentSelectedSources(e, o), C = (await e.pFrameProvider.getColumns([], !1, this.allowedTypes, void 0, this.annotations)).filter((O) => !l.has(O.toCanonicalString())), { parentAxes: a, linkerAxes: S, parentAxesList: y, optionsInfo: f } = await this.getAllowedAxes(e, o, s), v = o.components[this.componentName], P = [];
     if (this.settings.axesAllowed)
       for (const O of a) {
@@ -1028,7 +1028,7 @@ var Q = class {
             type: F.valueType,
             spec: F,
             annotations: F.annotations,
-            isSubsetFilter: ((h = F.annotations) == null ? void 0 : h[J]) === "true",
+            isSubsetFilter: ((x = F.annotations) == null ? void 0 : x[$]) === "true",
             isDiscreteFilter: F.valueType === "String" || ((g = F.annotations) == null ? void 0 : g[ee]) === "true",
             axesToBeFixed: G,
             axesToBeFixedIndexes: Z
@@ -1041,7 +1041,7 @@ var Q = class {
         !ne && !oe && P.push({ value: L });
       }
     }
-    return { multipleSelectors: x, required: w, stateConsistency: D, options: P, optionsInfo: f };
+    return { multipleSelectors: h, required: w, stateConsistency: D, options: P, optionsInfo: f };
   }
 };
 De.DefaultSettings = {
@@ -1054,7 +1054,7 @@ De.DefaultSettings = {
   columnsWithExtraAxesAllowed: !0,
   dimensionConsumer: !1
 };
-var I = De, $e = {
+var I = De, Qe = {
   type: "bubble",
   components: {
     valueSize: { type: "simple", selectorStates: [] },
@@ -1081,7 +1081,7 @@ function ae(t, e) {
   }
   return l;
 }
-var Qe = class extends Q {
+var Ze = class extends Q {
   constructor() {
     super({
       valueSize: new I({
@@ -1204,12 +1204,12 @@ var Qe = class extends Q {
     }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], 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 = [
+    ], x = Y(d), g = d.map((F) => A(F.selectedSource)).filter(B), h = [c, i].filter(B), w = h.map((F) => F.toCanonicalString()), D = await J(t, w), b = [
       e.components.facetBy,
       e.components.x,
       e.components.y,
       e.components.tooltipContent
-    ], C = [], a = x.map(() => []), S = [], y = [];
+    ], C = [], a = h.map(() => []), S = [], y = [];
     for (const { selectedSource: F, fixedAxes: G } of d)
       y.push(...await V(
         t,
@@ -1237,9 +1237,9 @@ var Qe = class extends Q {
         K && C.push(K);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
-      [...x, ...y, ...g],
+      [...h, ...y, ...g],
       C,
-      h,
+      x,
       !0,
       a,
       S
@@ -1279,7 +1279,7 @@ var Qe = class extends Q {
       type: "column",
       value: s,
       label: await T(t, s, [])
-    }, d = e.components.x.selectorStates.map(({ selectedSource: C }) => C).join(", "), g = e.components.y.selectorStates.map(({ selectedSource: C }) => C).join(", "), x = await Promise.all(e.components.facetBy.selectorStates.map(async (C) => {
+    }, d = e.components.x.selectorStates.map(({ selectedSource: C }) => C).join(", "), g = e.components.y.selectorStates.map(({ selectedSource: C }) => C).join(", "), h = await Promise.all(e.components.facetBy.selectorStates.map(async (C) => {
       var a, S;
       return {
         type: "column",
@@ -1313,14 +1313,14 @@ var Qe = class extends Q {
         label: D,
         valueLabels: "yLabels"
       },
-      facetBy: x,
+      facetBy: h,
       tooltips: {
         show: !0,
         content: b
       }
     };
   }
-}, Ze = {
+}, et = {
   type: "histogram",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -1330,7 +1330,7 @@ var Qe = class extends Q {
     facetBy: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, et = class extends Q {
+}, tt = class extends Q {
   constructor() {
     super(
       {
@@ -1409,32 +1409,32 @@ var Qe = class extends Q {
     }, { linkerColumnsMap: c, compositeLinkerMap: i } = await X(t), p = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], 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 = [];
+    ], u = Y(p), m = p.map((a) => A(a.selectedSource)).filter(B), d = [l], x = await J(t, d), g = [e.components.facetBy, e.components.grouping], h = [], w = [[]], D = [], b = [];
     for (const { selectedSource: a, fixedAxes: S } of p)
       b.push(
-        ...await V(t, c, i, h, a, S)
+        ...await V(t, c, i, x, a, S)
       ), w.push(
         (S ?? []).map(({ axisIdx: y, axisValue: f }) => ({ idx: y, value: f }))
       );
     for (const a of g)
       for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
-        x.push(A(S)), D.push(
+        h.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)
+          ...await V(t, c, i, x, S, y)
         );
         const f = await k(t, S, d);
-        f && x.push(f);
+        f && h.push(f);
       }
     const C = await t.pFrameProvider.getTableOuterJoin(
       [s, ...b, ...m],
-      x,
+      h,
       u,
       !0,
       w,
       D
     );
-    return x.forEach((a) => {
+    return h.forEach((a) => {
       const S = a.toCanonicalString();
       r.values[S] = B(a) ? C.columnsData[S] : C.axesData[S];
     }), r.values[s.toCanonicalString()] = C.columnsData[s.toCanonicalString()], { byColumns: r };
@@ -1477,7 +1477,7 @@ var Qe = class extends Q {
       grouping: p
     };
   }
-}, tt = {
+}, nt = {
   type: "discrete",
   components: {
     y: { type: "simple", selectorStates: [] },
@@ -1488,7 +1488,7 @@ var Qe = class extends Q {
     secondaryGrouping: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, nt = class extends Q {
+}, ot = class extends Q {
   constructor() {
     super(
       {
@@ -1572,7 +1572,7 @@ var Qe = class extends Q {
     }, { linkerColumnsMap: r, compositeLinkerMap: c } = await X(t), i = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], 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 = [];
+    ], p = Y(i), u = i.map((C) => A(C.selectedSource)).filter(B), m = [n], d = await J(t, m), x = [e.components.primaryGrouping, e.components.secondaryGrouping, e.components.facetBy], g = [], h = [[]], w = [], D = [];
     for (const { selectedSource: C, fixedAxes: a } of i)
       D.push(...await V(
         t,
@@ -1581,10 +1581,10 @@ var Qe = class extends Q {
         d,
         C,
         a
-      )), x.push(
+      )), h.push(
         (a ?? []).map(({ axisIdx: S, axisValue: y }) => ({ idx: S, value: y }))
       );
-    for (const C of h)
+    for (const C of x)
       for (const { selectedSource: a, fixedAxes: S } of C.selectorStates) {
         g.push(A(a)), w.push(
           (S ?? []).map(({ axisIdx: f, axisValue: v }) => ({ idx: f, value: v }))
@@ -1604,7 +1604,7 @@ var Qe = class extends Q {
       g,
       p,
       !0,
-      x,
+      h,
       w
     );
     return g.forEach((C) => {
@@ -1655,10 +1655,10 @@ var Qe = class extends Q {
       };
     }
     const u = await Promise.all(e.components.facetBy.selectorStates.map(async (m) => {
-      var d, h;
+      var d, x;
       return {
         type: "column",
-        value: (h = (d = await k(t, m.selectedSource, c)) == null ? void 0 : d.toCanonicalString()) != null ? h : m.selectedSource,
+        value: (x = (d = await k(t, m.selectedSource, c)) == null ? void 0 : d.toCanonicalString()) != null ? x : m.selectedSource,
         label: await T(t, m.selectedSource, c)
       };
     }));
@@ -1670,7 +1670,7 @@ var Qe = class extends Q {
       facetBy: u
     };
   }
-}, ot = {
+}, st = {
   type: "heatmap",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -1703,7 +1703,7 @@ function re(t, e) {
   }
   return l;
 }
-var st = class extends Q {
+var lt = class extends Q {
   constructor() {
     super(
       {
@@ -1901,7 +1901,7 @@ var st = class extends Q {
     }, { linkerColumnsMap: c, compositeLinkerMap: i } = await X(t), p = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], u = Y(p), m = p.map((L) => A(L.selectedSource)).filter(B), d = [l], h = await $(t, d), g = [
+    ], u = Y(p), m = p.map((L) => A(L.selectedSource)).filter(B), d = [l], x = await J(t, d), g = [
       e.components.facetBy,
       e.components.annotationsX,
       e.components.annotationsY,
@@ -1910,13 +1910,13 @@ var st = class extends Q {
       e.components.xGroupBy,
       e.components.yGroupBy,
       e.components.tooltipContent
-    ], x = [], w = [[]], D = [], b = [];
+    ], h = [], w = [[]], D = [], b = [];
     for (const { selectedSource: L, fixedAxes: E } of p)
       b.push(...await V(
         t,
         c,
         i,
-        h,
+        x,
         L,
         E
       )), w.push(
@@ -1924,28 +1924,28 @@ var st = class extends Q {
       );
     for (const L of g)
       for (const { selectedSource: E, fixedAxes: F } of L.selectorStates) {
-        x.push(A(E)), D.push(
+        h.push(A(E)), D.push(
           (F ?? []).map(({ axisIdx: M, axisValue: K }) => ({ idx: M, value: K }))
         ), b.push(...await V(
           t,
           c,
           i,
-          h,
+          x,
           E,
           F
         ));
         const G = await k(t, E, d);
-        G && x.push(G);
+        G && h.push(G);
       }
     const C = await t.pFrameProvider.getTableOuterJoin(
       [s, ...b, ...m],
-      x,
+      h,
       u,
       !0,
       w,
       D
     );
-    x.forEach((L) => {
+    h.forEach((L) => {
       const E = L.toCanonicalString();
       r.values[E] = B(L) ? C.columnsData[E] : C.axesData[E];
     }), r.values[s.toCanonicalString()] = C.columnsData[s.toCanonicalString()];
@@ -2002,7 +2002,7 @@ var st = class extends Q {
           valueLabels: (y = (S = await k(t, a.selectedSource, s)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
         };
       })
-    ), h = await Promise.all(
+    ), x = await Promise.all(
       e.components.yGroupBy.selectorStates.map(async (a) => {
         var S, y;
         return {
@@ -2012,7 +2012,7 @@ var st = class extends Q {
           valueLabels: (y = (S = await k(t, a.selectedSource, s)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
         };
       })
-    ), g = await t.pFrameProvider.getColumnSpecById(l), x = await Promise.all(
+    ), g = await t.pFrameProvider.getColumnSpecById(l), h = await Promise.all(
       e.components.annotationsX.selectorStates.map(async (a) => {
         var S, y;
         const f = a.selectedSource, v = A(f), P = B(v) ? await t.pFrameProvider.getColumnSpecById(v) : (y = (S = g == null ? void 0 : g.axesSpec) == null ? void 0 : S.find(
@@ -2082,15 +2082,15 @@ var st = class extends Q {
       },
       facetBy: m,
       xGroupBy: d,
-      yGroupBy: h,
-      annotations: [...x, ...w],
+      yGroupBy: x,
+      annotations: [...h, ...w],
       tooltips: {
         show: !0,
         content: C
       }
     };
   }
-}, lt = {
+}, at = {
   type: "scatterplot",
   components: {
     x: { type: "simple", selectorStates: [] },
@@ -2106,7 +2106,7 @@ var st = class extends Q {
     tooltipContent: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, at = class extends Q {
+}, rt = class extends Q {
   constructor() {
     super(
       {
@@ -2265,10 +2265,10 @@ var st = class extends Q {
     }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], 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)
+    ], x = Y(d), g = d.map((v) => A(v.selectedSource)).filter(B), h = [c, i].filter(B).map((v) => v.toCanonicalString());
+    if (h.length === 0)
       throw Error("One of X and Y should be a column");
-    const w = await $(t, x), D = [c, i, ...g], b = [], C = [[], []], a = [], S = [];
+    const w = await J(t, h), D = [c, i, ...g], b = [], C = [[], []], a = [], S = [];
     for (const { selectedSource: v, fixedAxes: P } of d)
       S.push(...await V(
         t,
@@ -2301,13 +2301,13 @@ var st = class extends Q {
           P,
           O
         ));
-        const N = await k(t, P, x);
+        const N = await k(t, P, h);
         N && b.push(N);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
       [c, i, ...S, ...g],
       b,
-      h,
+      x,
       !1,
       C,
       a
@@ -2330,7 +2330,7 @@ var st = class extends Q {
       type: "column",
       value: c,
       label: await T(t, c, u)
-    }, h = {
+    }, x = {
       type: "column",
       value: "key"
     }, g = await Promise.all(
@@ -2341,12 +2341,12 @@ var st = class extends Q {
           value: (y = (S = await k(t, a.selectedSource, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
         };
       })
-    ), x = ie.uniq([
+    ), h = ie.uniq([
       ...e.components.grouping.selectorStates.map((a) => a.selectedSource),
       ...e.components.size.selectorStates.map((a) => a.selectedSource),
       ...e.components.shape.selectorStates.map((a) => a.selectedSource)
     ]), w = await Promise.all(
-      x.map(async (a) => {
+      h.map(async (a) => {
         var S, y;
         return {
           type: "column",
@@ -2385,7 +2385,7 @@ var st = class extends Q {
       type: "scatterplot",
       x: m,
       y: d,
-      keyColumn: h,
+      keyColumn: x,
       facetBy: g,
       grouping: w,
       label: b,
@@ -2396,7 +2396,7 @@ var st = class extends Q {
       }
     };
   }
-}, rt = {
+}, ct = {
   type: "scatterplot-umap",
   components: {
     x: { type: "simple", selectorStates: [] },
@@ -2411,7 +2411,7 @@ var st = class extends Q {
     size: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, ct = class extends Q {
+}, it = class extends Q {
   constructor() {
     super(
       {
@@ -2562,10 +2562,10 @@ var st = class extends Q {
     }, { linkerColumnsMap: u, compositeLinkerMap: m } = await X(t), d = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], 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)
+    ], x = Y(d), g = d.map((v) => A(v.selectedSource)).filter(B), h = [c, i].filter(B).map((v) => v.toCanonicalString());
+    if (h.length === 0)
       throw Error("One of X and Y should be a column");
-    const w = await $(t, x), D = [c, i, ...g], b = [], C = [[], []], a = [], S = [];
+    const w = await J(t, h), D = [c, i, ...g], b = [], C = [[], []], a = [], S = [];
     for (const { selectedSource: v, fixedAxes: P } of d)
       S.push(...await V(
         t,
@@ -2597,13 +2597,13 @@ var st = class extends Q {
           P,
           O
         ));
-        const N = await k(t, P, x);
+        const N = await k(t, P, h);
         N && b.push(N);
       }
     const f = await t.pFrameProvider.getTableOuterJoin(
       [c, i, ...S, ...g],
       b,
-      h,
+      x,
       !1,
       C,
       a
@@ -2629,7 +2629,7 @@ var st = class extends Q {
       type: "column",
       value: c,
       label: await T(t, c, u)
-    }, h = {
+    }, x = {
       type: "column",
       value: "key"
     }, g = await Promise.all(
@@ -2640,11 +2640,11 @@ var st = class extends Q {
           value: (y = (S = await k(t, a.selectedSource, u)) == null ? void 0 : S.toCanonicalString()) != null ? y : a.selectedSource
         };
       })
-    ), x = ie.uniq([
+    ), h = 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) => {
+      h.map(async (a) => {
         var S, y;
         return {
           type: "column",
@@ -2683,7 +2683,7 @@ var st = class extends Q {
       type: "scatterplot-umap",
       x: m,
       y: d,
-      keyColumn: h,
+      keyColumn: x,
       facetBy: g,
       grouping: w,
       label: b,
@@ -2694,7 +2694,7 @@ var st = class extends Q {
       }
     };
   }
-}, me = "pl7.app/dendrogram/nodeId", de = "id", it = {
+}, me = "pl7.app/dendrogram/nodeId", de = "id", ut = {
   type: "dendro",
   components: {
     value: { type: "simple", selectorStates: [] },
@@ -2714,7 +2714,7 @@ var st = class extends Q {
     heatmapGroup: { type: "simple", selectorStates: [] }
   },
   dividedAxes: {}
-}, ut = class extends Q {
+}, pt = class extends Q {
   constructor() {
     super(
       {
@@ -2914,7 +2914,7 @@ var st = class extends Q {
     ]), 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 = [
+    ].filter(B), u = [l], m = await J(t, u), d = [], x = [], g = [], h = [e.components.value], w = [
       e.components.tableContent,
       // next components can content data mapped on tree
       e.components.labels,
@@ -2923,7 +2923,7 @@ var st = class extends Q {
       e.components.nodeShape,
       e.components.lineColor
     ], D = {};
-    for (const a of x)
+    for (const a of h)
       for (const { selectedSource: S, fixedAxes: y } of a.selectorStates) {
         g.push(...await V(
           t,
@@ -2947,15 +2947,15 @@ var st = class extends Q {
           y
         ));
         const f = await k(t, S, u), v = f ?? A(S);
-        D[S] = v.toCanonicalString(), h.push(v);
+        D[S] = v.toCanonicalString(), x.push(v);
       }
     const b = await t.pFrameProvider.getTableOuterJoin(
       [...d, ...p, ...g],
-      h,
+      x,
       i,
       !1
     );
-    for (const a of [...d, ...h]) {
+    for (const a of [...d, ...x]) {
       const S = a.toCanonicalString(), y = D[a.toCanonicalString()];
       n[y] = {
         data: B(a) ? b.columnsData[S] : b.axesData[S],
@@ -2987,7 +2987,7 @@ var st = class extends Q {
     }, u = [
       ...e.components.filters.selectorStates,
       ...e.components.tabBy.selectorStates
-    ], 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 = [
+    ], m = Y(u), d = u.map((y) => A(y.selectedSource)).filter(B), x = [c, i].filter(B).map((y) => y.toCanonicalString()), g = [], h = [], w = [], D = [], b = [
       e.components.value,
       e.components.height,
       e.components.labels,
@@ -3008,7 +3008,7 @@ var st = class extends Q {
         g.push(A(f)), w.push(
           (v ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
         );
-        const P = await k(t, f, h);
+        const P = await k(t, f, x);
         P && g.push(P);
       }
     u.forEach(({ fixedAxes: y }) => {
@@ -3018,21 +3018,21 @@ var st = class extends Q {
     });
     for (const y of C)
       for (const { selectedSource: f, fixedAxes: v } of y.selectorStates) {
-        x.push(A(f)), D.push(
+        h.push(A(f)), D.push(
           (v ?? []).map(({ axisIdx: O, axisValue: N }) => ({ idx: O, value: N }))
         );
-        const P = await k(t, f, h);
-        P && x.push(P);
+        const P = await k(t, f, x);
+        P && h.push(P);
       }
     const a = await t.pFrameProvider.getTableOuterJoin(
       [...g, ...d],
-      x,
+      h,
       m,
       !1,
       w,
       D
     );
-    [...g, ...x].forEach((y) => {
+    [...g, ...h].forEach((y) => {
       const f = y.toCanonicalString(), v = B(y) ? a.columnsData[f] : a.axesData[f];
       p.values[f] = [], p.values[f] = v;
     });
@@ -3090,10 +3090,10 @@ var st = class extends Q {
         }
       };
     }
-    let h, g, x;
+    let x, g, h;
     if (e.components.heatmapAnnotation.selectorStates.length && e.components.heatmapAxis.selectorStates.length) {
       const w = e.components.heatmapAnnotation.selectorStates[0].selectedSource;
-      h = {
+      x = {
         type: "column",
         value: w,
         label: await T(t, w, []),
@@ -3105,7 +3105,7 @@ var st = class extends Q {
         value: D,
         label: await T(t, D, [w]),
         valueLabels: (l = await k(t, D, [w])) == null ? void 0 : l.toCanonicalString()
-      }, x = await Promise.all(
+      }, h = await Promise.all(
         e.components.heatmapGroup.selectorStates.map(async (b) => {
           var C;
           return {
@@ -3118,7 +3118,7 @@ var st = class extends Q {
       );
     } else if (e.components.heatmapForSequence.selectorStates.length) {
       const w = e.components.heatmapForSequence.selectorStates[0].selectedSource;
-      h = {
+      x = {
         type: "column",
         value: w,
         label: await T(t, w, [])
@@ -3131,29 +3131,22 @@ var st = class extends Q {
       height: u,
       labels: m,
       aes: d,
-      heatmapAnnotation: h,
+      heatmapAnnotation: x,
       heatmapAxis: g,
-      heatmapGroup: x
+      heatmapGroup: h
     };
   }
 }, ge = 1e6;
 function ce(t, e) {
   if (t === "String")
     return e.data;
-  if (typeof e.data[0] == "bigint") {
-    const o = new Array(e.data.length);
-    for (let n = 0; n < e.data.length; n++)
-      o[n] = e.data[n] === BigInt(-9007199254740991) ? null : Number(e.data[n]);
-    return o;
-  }
-  for (let o = 0; o < e.data.length; o++) {
-    const n = e.data[o];
-    t === "Int" && n === -2147483648 || (t === "Double" || t === "Float") && isNaN(n) ? e.data[o] = null : e.data[o] = Number(e.data[o]);
-  }
-  return e.data;
+  const o = new Array(e.data.length);
+  for (let n = 0; n < e.data.length; n++)
+    o[n] = _e(e, n, { absent: null, na: null });
+  return o;
 }
 var H = !1;
-var pt = class {
+var mt = class {
   constructor(t, e) {
     this.pframeHandle = t, this.pframeDriver = e;
   }
@@ -3244,11 +3237,11 @@ var pt = class {
           type: n ? "inner" : "full",
           entries: r.map((p, u) => {
             var m;
-            const d = (m = l[u]) == null ? void 0 : m.map((h) => ({
+            const d = (m = l[u]) == null ? void 0 : m.map((x) => ({
               type: "constant",
-              axisIndex: h.idx,
-              constant: h.value
-            })).filter((h) => h.constant !== void 0);
+              axisIndex: x.idx,
+              constant: x.value
+            })).filter((x) => x.constant !== void 0);
             return d != null && d.length ? {
               type: "slicedColumn",
               newId: p.name,
@@ -3262,11 +3255,11 @@ var pt = class {
         },
         secondary: c.map((p, u) => {
           var m;
-          const d = (m = s[u]) == null ? void 0 : m.map((h) => ({
+          const d = (m = s[u]) == null ? void 0 : m.map((x) => ({
             type: "constant",
-            axisIndex: h.idx,
-            constant: h.value
-          })).filter((h) => h.constant !== void 0);
+            axisIndex: x.idx,
+            constant: x.value
+          })).filter((x) => x.constant !== void 0);
           return d != null && d.length ? {
             type: "slicedColumn",
             newId: p.name,
@@ -3282,29 +3275,29 @@ var pt = class {
       sorting: []
     };
     try {
-      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");
+      const p = Date.now(), u = await this.pframeDriver.calculateTableData(this.pframeHandle, i), m = u.filter((x) => x.spec.type === "axis"), d = u.filter((x) => x.spec.type === "column");
       return {
-        axesData: m.reduce((h, g) => {
-          const x = _.fromAxisSpec(g.spec.spec);
-          return h[x.toCanonicalString()] = ce(x.type, g.data), h;
+        axesData: m.reduce((x, g) => {
+          const h = _.fromAxisSpec(g.spec.spec);
+          return x[h.toCanonicalString()] = ce(h.type, g.data), x;
         }, {}),
-        columnsData: d.reduce((h, g) => {
-          const x = g.spec.spec, w = new W({
+        columnsData: d.reduce((x, g) => {
+          const h = g.spec.spec, w = new W({
             name: g.spec.id,
-            type: x.valueType
+            type: h.valueType
           });
-          return h[w.toCanonicalString()] = ce(w.type, g.data), h;
+          return x[w.toCanonicalString()] = ce(w.type, g.data), x;
         }, {}),
-        columnSpecs: d.reduce((h, g) => {
-          const x = g.spec.spec, w = new W({
+        columnSpecs: d.reduce((x, g) => {
+          const h = g.spec.spec, w = new W({
             name: g.spec.id,
-            type: x.valueType
+            type: h.valueType
           });
-          return h[w.toCanonicalString()] = x, h;
+          return x[w.toCanonicalString()] = h, x;
         }, {}),
-        axesSpecs: m.reduce((h, g) => {
-          const x = g.spec.spec, w = _.fromAxisSpec(x);
-          return h[w.toCanonicalString()] = x, h;
+        axesSpecs: m.reduce((x, g) => {
+          const h = g.spec.spec, w = _.fromAxisSpec(h);
+          return x[w.toCanonicalString()] = h, x;
         }, {})
       };
     } catch (p) {
@@ -3382,31 +3375,31 @@ var pt = class {
       throw console.error("PFrame: findColumns error"), l;
     }
   }
-}, ft = class {
+}, gt = class {
   constructor(t, e, o = (n, l) => l ?? n) {
-    this.labelsModifier = o, this.pFrameProvider = new pt(t, e);
+    this.labelsModifier = o, this.pFrameProvider = new mt(t, e);
   }
 }, Pe = {
   controllers: {
-    discrete: new nt(),
-    scatterplot: new at(),
-    "scatterplot-umap": new ct(),
-    heatmap: new st(),
-    dendro: new ut(),
-    histogram: new et(),
-    bubble: new Qe()
+    discrete: new ot(),
+    scatterplot: new rt(),
+    "scatterplot-umap": new it(),
+    heatmap: new lt(),
+    dendro: new pt(),
+    histogram: new tt(),
+    bubble: new Ze()
   },
   initialStates: {
-    discrete: tt,
-    scatterplot: lt,
-    "scatterplot-umap": rt,
-    heatmap: ot,
-    dendro: it,
-    histogram: Ze,
-    bubble: $e
+    discrete: nt,
+    scatterplot: at,
+    "scatterplot-umap": ct,
+    heatmap: st,
+    dendro: ut,
+    histogram: et,
+    bubble: Qe
   }
 };
-function gt(t) {
+function xt(t) {
   return Pe.controllers[t];
 }
 function ht(t) {
@@ -3414,15 +3407,15 @@ function ht(t) {
 }
 export {
   _ as AxisId,
-  Qe as BubbleStateController,
+  Ze as BubbleStateController,
   W as ColumnId,
-  ft as DemoDataStore,
-  ut as DendroStateController,
-  nt as DiscreteStateController,
-  st as HeatmapStateController,
-  at as ScatterplotStateController,
+  gt as DemoDataStore,
+  pt as DendroStateController,
+  ot as DiscreteStateController,
+  lt as HeatmapStateController,
+  rt as ScatterplotStateController,
   A as columnOrAxisIdFromString,
-  gt as getControllerByType,
+  xt as getControllerByType,
   ht as getInitialStateByType,
   B as isColumnId
 };