@platforma-sdk/model 1.34.8 → 1.34.10

package/dist/index.mjs

@@ -1,10 +1,10 @@
 var qe = Object.defineProperty;
 var ze = (t, e, n) => e in t ? qe(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
 var O = (t, e, n) => ze(t, typeof e != "symbol" ? e + "" : e, n);
-import { isPColumn as Le, mapPObjectData as be, isDataInfoEntries as Te, isDataInfo as we, dataInfoToEntries as Ye, selectorsToPredicate as X, resolveAnchors as Ae, deriveNativeId as Xe, isPColumnSpec as ne, isPartitionedDataInfoEntries as Qe, getAxisId as D, entriesToDataInfo as Ze, canonicalizeAxisId as et, withEnrichments as xe, AnchoredIdDeriver as Ce, isPlRef as tt, mapValueInVOE as nt, ensurePColumn as rt, extractAllColumns as it, mapPTableDef as st, mapDataInfo as ot, canonicalizeJson as K, matchAxisId as U, getColumnIdAndSpec as Ee, parseJson as fe, isPTableAbsent as at, uniquePlId as lt, PTableNA as ut } from "@milaboratories/pl-model-common";
+import { isPColumn as Le, mapPObjectData as be, isDataInfoEntries as Te, isDataInfo as we, dataInfoToEntries as Ye, selectorsToPredicate as X, resolveAnchors as Ae, deriveNativeId as Xe, isPColumnSpec as ne, isPartitionedDataInfoEntries as Qe, getAxisId as D, entriesToDataInfo as Ze, canonicalizeAxisId as et, withEnrichments as xe, AnchoredIdDeriver as Ce, isPlRef as tt, mapValueInVOE as nt, ensurePColumn as rt, extractAllColumns as it, mapPTableDef as st, mapDataInfo as ot, canonicalizeJson as K, matchAxisId as j, getColumnIdAndSpec as Ee, parseJson as fe, isPTableAbsent as at, uniquePlId as lt, PTableNA as ut } from "@milaboratories/pl-model-common";
 export * from "@milaboratories/pl-model-common";
 import ke from "canonicalize";
-import { z as M } from "zod";
+import { z as U } from "zod";
 export * from "@milaboratories/pl-error-like";
 class ct extends Error {
   constructor(e, n) {
@@ -219,7 +219,7 @@ function De(t) {
 function ft() {
   if (typeof globalThis.cfgRenderCtx < "u") return globalThis.cfgRenderCtx;
 }
-function m() {
+function y() {
   if (typeof globalThis.cfgRenderCtx < "u") return globalThis.cfgRenderCtx;
   throw new Error("Not in config rendering context");
 }
@@ -231,7 +231,7 @@ function H(t, e) {
 }
 const ce = /* @__PURE__ */ new Map();
 function ht(t, e) {
-  t in m().callbackRegistry || (m().callbackRegistry[t] = (n) => {
+  t in y().callbackRegistry || (y().callbackRegistry[t] = (n) => {
     for (const r of ce.get(t))
       r(n);
   }, ce.set(t, [])), ce.get(t).push(e);
@@ -300,46 +300,46 @@ class E {
       ...n.map((i) => typeof i == "string" ? i : i.field)
     ];
     return he(
-      m().resolveWithCommon(this.handle, e, ...n),
+      y().resolveWithCommon(this.handle, e, ...n),
       (i) => new E(i, r)
     );
   }
   get resourceType() {
-    return m().getResourceType(this.handle);
+    return y().getResourceType(this.handle);
   }
   getInputsLocked() {
-    return m().getInputsLocked(this.handle);
+    return y().getInputsLocked(this.handle);
   }
   getOutputsLocked() {
-    return m().getOutputsLocked(this.handle);
+    return y().getOutputsLocked(this.handle);
   }
   getIsReadyOrError() {
-    return m().getIsReadyOrError(this.handle);
+    return y().getIsReadyOrError(this.handle);
   }
   getIsFinal() {
-    return m().getIsFinal(this.handle);
+    return y().getIsFinal(this.handle);
   }
   getError() {
     const e = [...this.resolvePath, "error"];
     return he(
-      m().getError(this.handle),
+      y().getError(this.handle),
       (n) => new E(n, e)
     );
   }
   listInputFields() {
-    return m().listInputFields(this.handle);
+    return y().listInputFields(this.handle);
   }
   listOutputFields() {
-    return m().listOutputFields(this.handle);
+    return y().listOutputFields(this.handle);
   }
   listDynamicFields() {
-    return m().listDynamicFields(this.handle);
+    return y().listDynamicFields(this.handle);
   }
   getKeyValueBase64(e) {
-    return m().getKeyValueBase64(this.handle, e);
+    return y().getKeyValueBase64(this.handle, e);
   }
   getKeyValueAsString(e) {
-    return m().getKeyValueAsString(this.handle, e);
+    return y().getKeyValueAsString(this.handle, e);
   }
   getKeyValueAsJson(e) {
     const n = this.getKeyValueAsString(e);
@@ -347,10 +347,10 @@ class E {
     return JSON.parse(n);
   }
   getDataBase64() {
-    return m().getDataBase64(this.handle);
+    return y().getDataBase64(this.handle);
   }
   getDataAsString() {
-    return m().getDataAsString(this.handle);
+    return y().getDataAsString(this.handle);
   }
   getDataAsJson() {
     const e = this.getDataAsString();
@@ -371,7 +371,7 @@ class E {
    *
    */
   parsePObjectCollection(e = !1, n = "") {
-    const r = m().parsePObjectCollection(
+    const r = y().parsePObjectCollection(
       this.handle,
       e,
       n,
@@ -386,14 +386,14 @@ class E {
     return i;
   }
   getFileContentAsBase64(e) {
-    return new _(m().getBlobContentAsBase64(this.handle, e));
+    return new _(y().getBlobContentAsBase64(this.handle, e));
   }
   getFileContentAsString(e) {
-    return new _(m().getBlobContentAsString(this.handle, e));
+    return new _(y().getBlobContentAsString(this.handle, e));
   }
   getFileContentAsJson(e) {
     return new _(
-      m().getBlobContentAsString(this.handle, e)
+      y().getBlobContentAsString(this.handle, e)
     ).mapDefined((n) => JSON.parse(n));
   }
   /**
@@ -412,7 +412,7 @@ class E {
    * @returns downloaded file handle
    */
   getFileHandle() {
-    return new _(m().getDownloadedBlobContentHandle(this.handle));
+    return new _(y().getDownloadedBlobContentHandle(this.handle));
   }
   /**
    * @deprecated use getFileHandle
@@ -424,7 +424,7 @@ class E {
    * @returns downloaded file handle
    */
   getRemoteFileHandle() {
-    return new _(m().getOnDemandBlobContentHandle(this.handle));
+    return new _(y().getOnDemandBlobContentHandle(this.handle));
   }
   /**
    * @deprecated use getRemoteFileHandle
@@ -436,22 +436,22 @@ class E {
    * @returns the url to the extracted folder
    */
   extractArchiveAndGetURL(e) {
-    return new _(m().extractArchiveAndGetURL(this.handle, e));
+    return new _(y().extractArchiveAndGetURL(this.handle, e));
   }
   getImportProgress() {
-    return new _(m().getImportProgress(this.handle));
+    return new _(y().getImportProgress(this.handle));
   }
   getLastLogs(e) {
-    return new _(m().getLastLogs(this.handle, e));
+    return new _(y().getLastLogs(this.handle, e));
   }
   getProgressLog(e) {
-    return new _(m().getProgressLog(this.handle, e));
+    return new _(y().getProgressLog(this.handle, e));
   }
   getProgressLogWithInfo(e) {
-    return new _(m().getProgressLogWithInfo(this.handle, e));
+    return new _(y().getProgressLogWithInfo(this.handle, e));
   }
   getLogHandle() {
-    return new _(m().getLogHandle(this.handle));
+    return new _(y().getLogHandle(this.handle));
   }
   allFieldsResolved(e = "Input") {
     switch (e) {
@@ -509,82 +509,82 @@ const Tn = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   StagingAccessorName: Re,
   getAllFutureAwaits: mt,
   isFutureAwait: Ke
-}, Symbol.toStringTag, { value: "Module" })), yt = "pl7.app/label", vt = "pl7.app/trace", bt = M.object({
-  type: M.string(),
-  importance: M.number().optional(),
-  id: M.string().optional(),
-  label: M.string()
-}), wt = M.array(bt), At = 1e-3, xt = "__LABEL__", Pe = "__LABEL__@1";
+}, Symbol.toStringTag, { value: "Module" })), yt = "pl7.app/label", vt = "pl7.app/trace", bt = U.object({
+  type: U.string(),
+  importance: U.number().optional(),
+  id: U.string().optional(),
+  label: U.string()
+}), wt = U.array(bt), At = 1e-3, xt = "__LABEL__", Pe = "__LABEL__@1";
 function je(t, e, n = {}) {
-  const r = /* @__PURE__ */ new Map(), i = n.forceTraceElements !== void 0 && n.forceTraceElements.length > 0 ? new Set(n.forceTraceElements) : void 0, s = /* @__PURE__ */ new Map(), o = t.map((f) => {
+  const r = /* @__PURE__ */ new Map(), i = n.forceTraceElements !== void 0 && n.forceTraceElements.length > 0 ? new Set(n.forceTraceElements) : void 0, s = /* @__PURE__ */ new Map(), o = t.map((p) => {
     var P, R;
-    const w = e(f);
-    let p, g, b;
-    "spec" in w && typeof w.spec == "object" ? (p = w.spec, g = w.prefixTrace, b = w.suffixTrace) : p = w;
-    const h = (P = p.annotations) == null ? void 0 : P[yt], I = (R = p.annotations) == null ? void 0 : R[vt], x = (I ? wt.safeParse(JSON.parse(I)).data : void 0) ?? [], v = [
-      ...g ?? [],
+    const v = e(p);
+    let f, m, w;
+    "spec" in v && typeof v.spec == "object" ? (f = v.spec, m = v.prefixTrace, w = v.suffixTrace) : f = v;
+    const h = (P = f.annotations) == null ? void 0 : P[yt], I = (R = f.annotations) == null ? void 0 : R[vt], x = (I ? wt.safeParse(JSON.parse(I)).data : void 0) ?? [], b = [
+      ...m ?? [],
       ...x,
-      ...b ?? []
+      ...w ?? []
     ];
     if (h !== void 0) {
       const k = { label: h, type: xt, importance: -2 };
-      n.addLabelAsSuffix ? v.push(k) : v.splice(0, 0, k);
+      n.addLabelAsSuffix ? b.push(k) : b.splice(0, 0, k);
     }
     const A = [], L = /* @__PURE__ */ new Map();
-    for (let k = v.length - 1; k >= 0; --k) {
-      const { type: W } = v[k], j = v[k].importance ?? 0, $ = (L.get(W) ?? 0) + 1;
-      L.set(W, $);
-      const F = `${W}@${$}`;
+    for (let k = b.length - 1; k >= 0; --k) {
+      const { type: W } = b[k], V = b[k].importance ?? 0, N = (L.get(W) ?? 0) + 1;
+      L.set(W, N);
+      const F = `${W}@${N}`;
       s.set(F, (s.get(F) ?? 0) + 1), r.set(
         F,
         Math.max(
           r.get(F) ?? Number.NEGATIVE_INFINITY,
-          j - (v.length - k) * At
+          V - (b.length - k) * At
         )
-      ), A.push({ ...v[k], fullType: F, occurrenceIndex: $ });
+      ), A.push({ ...b[k], fullType: F, occurrenceIndex: N });
     }
     return A.reverse(), {
-      value: f,
-      spec: p,
+      value: p,
+      spec: f,
       label: h,
       fullTrace: A
     };
   }), a = [], l = [], u = [...r];
-  u.sort(([, f], [, w]) => w - f);
-  for (const [f] of u)
-    f.endsWith("@1") || s.get(f) === t.length ? a.push(f) : l.push(f);
-  const c = (f, w = !1) => {
-    const p = [];
-    for (let g = 0; g < o.length; g++) {
-      const b = o[g], h = b.fullTrace.filter((v) => f.has(v.fullType) || i && i.has(v.type));
+  u.sort(([, p], [, v]) => v - p);
+  for (const [p] of u)
+    p.endsWith("@1") || s.get(p) === t.length ? a.push(p) : l.push(p);
+  const c = (p, v = !1) => {
+    const f = [];
+    for (let m = 0; m < o.length; m++) {
+      const w = o[m], h = w.fullTrace.filter((b) => p.has(b.fullType) || i && i.has(b.type));
       if (h.length === 0)
-        if (w)
-          p.push({
+        if (v)
+          f.push({
             label: "Unlabeled",
-            value: b.value
+            value: w.value
           });
         else return;
-      const I = h.map((v) => v.label), x = n.separator ?? " / ";
-      p.push({
+      const I = h.map((b) => b.label), x = n.separator ?? " / ";
+      f.push({
         label: I.join(x),
-        value: b.value
+        value: w.value
       });
     }
-    return p;
+    return f;
   };
   if (a.length === 0) {
     if (l.length !== 0) throw new Error("Non-empty secondary types list while main types list is empty.");
     return c(new Set(Pe), !0);
   }
-  let d = 0, y = -1;
+  let d = 0, g = -1;
   for (; d < a.length; ) {
-    const f = /* @__PURE__ */ new Set();
-    n.includeNativeLabel && f.add(Pe);
-    for (let p = 0; p < d; ++p) f.add(a[p]);
-    y >= 0 && f.add(a[y]);
-    const w = c(f);
-    if (w !== void 0 && new Set(w.map((p) => p.label)).size === t.length) return w;
-    y++, y >= a.length && (d++, y = d);
+    const p = /* @__PURE__ */ new Set();
+    n.includeNativeLabel && p.add(Pe);
+    for (let f = 0; f < d; ++f) p.add(a[f]);
+    g >= 0 && p.add(a[g]);
+    const v = c(p);
+    if (v !== void 0 && new Set(v.map((f) => f.label)).size === t.length) return v;
+    g++, g >= a.length && (d++, g = d);
   }
   return c(/* @__PURE__ */ new Set([...a, ...l]), !0);
 }
@@ -959,43 +959,43 @@ class le {
     };
     let u = () => !1;
     if (a) {
-      const p = (Array.isArray(a) ? a : [a]).map((g) => {
-        if (Se(g)) {
+      const f = (Array.isArray(a) ? a : [a]).map((m) => {
+        if (Se(m)) {
           if (!r)
             throw new Error("Anchored selectors in exclude require an AnchoredIdDeriver to be provided in options.");
-          return X(Ae(r.anchors, g, n));
+          return X(Ae(r.anchors, m, n));
         } else
-          return X(g);
+          return X(m);
       });
-      u = (g) => p.some((b) => b(g));
+      u = (m) => f.some((w) => w(m));
     }
-    const c = typeof e == "function" ? [e] : Array.isArray(e) ? e : [e], d = [], y = /* @__PURE__ */ new Set();
-    for (const p of c) {
-      const g = Se(p);
-      let b;
-      if (g) {
+    const c = typeof e == "function" ? [e] : Array.isArray(e) ? e : [e], d = [], g = /* @__PURE__ */ new Set();
+    for (const f of c) {
+      const m = Se(f);
+      let w;
+      if (m) {
         if (!r)
           throw new Error("Anchored selectors require an AnchoredIdDeriver to be provided in options.");
-        b = Ae(r.anchors, p, n);
+        w = Ae(r.anchors, f, n);
       } else
-        b = p;
+        w = f;
       const h = /* @__PURE__ */ new Set(), I = [];
       for (const A of this.providers) {
-        const L = A.selectColumns(b);
+        const L = A.selectColumns(w);
         for (const P of L) {
           if (u(P.spec)) continue;
           if (h.has(P.id))
             throw new Error(`Duplicate column id ${P.id} in provider ${A.constructor.name}`);
           const R = Xe(P.spec);
-          y.has(R) || (h.add(P.id), y.add(R), I.push(P));
+          g.has(R) || (h.add(P.id), g.add(R), I.push(P));
         }
       }
       if (I.length === 0) continue;
-      const x = Dt(p), v = x.length > 0;
+      const x = Dt(f), b = x.length > 0;
       for (const A of I) {
         if (!ne(A.spec)) continue;
         const L = A.spec;
-        if (v) {
+        if (b) {
           if (Lt(A.data))
             throw new Error(`Splitting is not supported for PColumns with PColumnValues data format. Column id: ${A.id}`);
           const P = _t(A.data);
@@ -1008,33 +1008,33 @@ class le {
           const R = St(P), k = x[x.length - 1];
           if (k >= P.partitionKeyLength)
             throw new Error(`Not enough partition keys (${P.partitionKeyLength}) for requested split axes (max index ${k}) in column ${L.name}`);
-          const W = x.map((S) => this.findLabels(D(L.axesSpec[S]))), j = [], $ = (S, G) => {
+          const W = x.map((S) => this.findLabels(D(L.axesSpec[S]))), V = [], N = (S, G) => {
             if (G >= x.length) {
-              if (j.push([...S]), j.length > 1e4)
+              if (V.push([...S]), V.length > 1e4)
                 throw new Error("Too many key combinations, aborting.");
               return;
             }
-            const V = x[G];
-            if (V >= R.length)
-              throw new Error(`Axis index ${V} out of bounds for unique keys array (length ${R.length}) during split key generation for column ${A.id}`);
-            const N = R[V];
-            if (!N || N.length === 0) {
-              j.length = 0;
+            const $ = x[G];
+            if ($ >= R.length)
+              throw new Error(`Axis index ${$} out of bounds for unique keys array (length ${R.length}) during split key generation for column ${A.id}`);
+            const J = R[$];
+            if (!J || J.length === 0) {
+              V.length = 0;
               return;
             }
-            for (const ee of N)
-              S.push(ee), $(S, G + 1), S.pop();
+            for (const ee of J)
+              S.push(ee), N(S, G + 1), S.pop();
           };
-          if ($([], 0), j.length === 0)
+          if (N([], 0), V.length === 0)
             continue;
           const F = [...L.axesSpec], Be = x.map((S) => S);
           for (let S = x.length - 1; S >= 0; S--)
             F.splice(x[S], 1);
           const We = { ...L, axesSpec: F };
-          for (const S of j) {
-            const G = S.map((V, N) => {
-              const ee = Be[N], Ge = D(L.axesSpec[ee]), ue = W[N], He = (ue == null ? void 0 : ue[V]) ?? String(V);
-              return { axisIdx: ee, axisId: Ge, value: V, label: He };
+          for (const S of V) {
+            const G = S.map(($, J) => {
+              const ee = Be[J], Ge = D(L.axesSpec[ee]), ue = W[J], He = (ue == null ? void 0 : ue[$]) ?? String($);
+              return { axisIdx: ee, axisId: Ge, value: $, label: He };
             });
             d.push({
               type: "split",
@@ -1055,33 +1055,33 @@ class le {
       }
     }
     if (d.length === 0) return [];
-    const f = je(
+    const p = je(
       d,
-      (p) => ({
-        spec: p.spec,
-        suffixTrace: p.type === "split" ? Et(p.axisFilters) : void 0
+      (f) => ({
+        spec: f.spec,
+        suffixTrace: f.type === "split" ? Et(f.axisFilters) : void 0
       }),
       l
-    ), w = [];
-    for (const { value: p, label: g } of f) {
-      const { originalColumn: b, spec: h } = p, I = p.type === "split" ? p.axisFilters : void 0, x = kt(I);
-      let v;
-      r ? v = r.deriveS(h, x) : v = Ot(b.id, x);
-      let A = { ...p.adjustedSpec };
+    ), v = [];
+    for (const { value: f, label: m } of p) {
+      const { originalColumn: w, spec: h } = f, I = f.type === "split" ? f.axisFilters : void 0, x = kt(I);
+      let b;
+      r ? b = r.deriveS(h, x) : b = Ot(w.id, x);
+      let A = { ...f.adjustedSpec };
       o && (A = {
         ...A,
         annotations: {
           ...A.annotations ?? {},
-          "pl7.app/label": g
+          "pl7.app/label": m
         }
-      }), w.push({
-        id: v,
+      }), v.push({
+        id: b,
         spec: A,
-        data: () => p.type === "split" ? Ze(It(p.dataEntries, x)) : p.originalColumn.data,
-        label: g
+        data: () => f.type === "split" ? Ze(It(f.dataEntries, x)) : f.originalColumn.data,
+        label: m
       });
     }
-    return w;
+    return v;
   }
   getColumns(e, n) {
     const r = this.getUniversalEntries(e, {
@@ -1118,7 +1118,7 @@ function _e(t) {
 }
 class Rt {
   constructor() {
-    O(this, "ctx", m());
+    O(this, "ctx", y());
   }
   /**
    * @deprecated use getOptions()
@@ -1393,7 +1393,7 @@ class te {
     // lazy rendering because this feature is rarely used
     O(this, "_activeArgsCache");
     O(this, "resultPool", new Rt());
-    this.ctx = m(), this.args = JSON.parse(this.ctx.args), this.uiState = this.ctx.uiState !== void 0 ? JSON.parse(this.ctx.uiState) : {};
+    this.ctx = y(), this.args = JSON.parse(this.ctx.args), this.uiState = this.ctx.uiState !== void 0 ? JSON.parse(this.ctx.uiState) : {};
   }
   /**
    * Returns args snapshot the block was executed for (i.e. when "Run" button was pressed).
@@ -1469,7 +1469,7 @@ class te {
     this.ctx.logError(e);
   }
 }
-const Y = "1.34.8";
+const Y = "1.34.10";
 function Ft(t) {
   return t.__renderLambda === !0;
 }
@@ -1477,7 +1477,7 @@ function pe(t) {
   if (t !== void 0)
     return Ft(t) ? t.handle : t;
 }
-function J(t) {
+function M(t) {
   if (t !== void 0)
     return typeof t == "string" ? { __renderLambda: !0, handle: t, retentive: !1 } : t;
 }
@@ -1517,10 +1517,10 @@ function kn(t) {
       renderingMode: n,
       initialArgs: o,
       outputs: Object.fromEntries(
-        Object.entries(r).map(([u, c]) => [u, J(c)])
+        Object.entries(r).map(([u, c]) => [u, M(c)])
       ),
-      inputsValid: J(i),
-      sections: J(s),
+      inputsValid: M(i),
+      sections: M(s),
       initialUiState: void 0,
       code: a
     };
@@ -1535,10 +1535,10 @@ function kn(t) {
       renderingMode: r,
       initialArgs: o,
       outputs: Object.fromEntries(
-        Object.entries(i).map(([u, c]) => [u, J(c)])
+        Object.entries(i).map(([u, c]) => [u, M(c)])
       ),
-      inputsValid: J(n),
-      sections: J(s),
+      inputsValid: M(n),
+      sections: M(s),
       initialUiState: void 0,
       code: a
     };
@@ -1779,10 +1779,10 @@ function Je(t, e) {
   for (const a of r)
     for (const l of a.spec.axesSpec) {
       const u = D(l);
-      i.some((c) => U(c, u)) || i.push(u);
+      i.some((c) => j(c, u)) || i.push(u);
     }
   for (const a of n) {
-    const l = D(a.spec.axesSpec[0]), u = i.findIndex((c) => U(c, l));
+    const l = D(a.spec.axesSpec[0]), u = i.findIndex((c) => j(c, l));
     u !== -1 && i.splice(u, 1);
   }
   const s = (a, l) => {
@@ -1793,10 +1793,10 @@ function Je(t, e) {
     return u;
   }, o = [];
   for (const a of e) {
-    const l = a.spec.axesSpec[0], u = D(l), c = i.findIndex((d) => U(d, u));
+    const l = a.spec.axesSpec[0], u = D(l), c = i.findIndex((d) => j(d, u));
     if (c !== -1) {
-      const d = i[c], y = Object.keys(d.domain ?? {}).length, f = Object.keys(l.domain ?? {}).length;
-      y > f ? o.push({
+      const d = i[c], g = Object.keys(d.domain ?? {}).length, p = Object.keys(l.domain ?? {}).length;
+      g > p ? o.push({
         id: s(a.id, d.domain),
         spec: {
           ...a.spec,
@@ -1869,37 +1869,37 @@ function jt(t) {
   return ((e = t.annotations) == null ? void 0 : e["pl7.app/table/visibility"]) === "optional";
 }
 function Rn(t, e, n, r, i) {
-  var g, b;
-  const s = (i == null ? void 0 : i.coreJoinType) ?? "full", o = [...(i == null ? void 0 : i.filters) ?? [], ...((g = r == null ? void 0 : r.pTableParams) == null ? void 0 : g.filters) ?? []], a = ((b = r == null ? void 0 : r.pTableParams) == null ? void 0 : b.sorting) ?? [], l = e.filter((h) => !Kt(h.spec)), u = l.find((h) => n(h.spec));
+  var m, w;
+  const s = (i == null ? void 0 : i.coreJoinType) ?? "full", o = [...(i == null ? void 0 : i.filters) ?? [], ...((m = r == null ? void 0 : r.pTableParams) == null ? void 0 : m.filters) ?? []], a = ((w = r == null ? void 0 : r.pTableParams) == null ? void 0 : w.sorting) ?? [], l = e.filter((h) => !Kt(h.spec)), u = l.find((h) => n(h.spec));
   if (!u) return;
   const c = Ne(t.resultPool);
   if (!c) return;
   const d = new Set((() => {
     var I, x;
     if (s === "inner") return [];
-    const h = (x = (I = r == null ? void 0 : r.gridState.columnVisibility) == null ? void 0 : I.hiddenColIds) == null ? void 0 : x.map(fe).filter((v) => v.type === "column").map((v) => v.id);
-    return h || l.filter((v) => jt(v.spec)).map((v) => v.id);
+    const h = (x = (I = r == null ? void 0 : r.gridState.columnVisibility) == null ? void 0 : I.hiddenColIds) == null ? void 0 : x.map(fe).filter((b) => b.type === "column").map((b) => b.id);
+    return h || l.filter((b) => jt(b.spec)).map((b) => b.id);
   })());
   d.delete(u.id), [...o.map((h) => h.column), ...a.map((h) => h.column)].filter((h) => h.type === "column").map((h) => d.delete(h.id));
-  const y = l.filter((h) => !d.has(h.id)), f = Je(y.map(Ee), c), w = [
+  const g = l.filter((h) => !d.has(h.id)), p = Je(g.map(Ee), c), v = [
     ...u.spec.axesSpec.map((h) => ({
       type: "axis",
       id: D(h),
       spec: h
     })),
-    ...[...l, ...f].map((h) => ({
+    ...[...l, ...p].map((h) => ({
       type: "column",
       id: h.id,
       spec: h.spec
     }))
   ];
-  if (!Me([...y, ...f])) return;
-  const p = t.createPTable(
-    Ue(l, f, s, o, a, i == null ? void 0 : i.coreColumnPredicate)
+  if (!Me([...g, ...p])) return;
+  const f = t.createPTable(
+    Ue(l, p, s, o, a, i == null ? void 0 : i.coreColumnPredicate)
   );
   return {
-    tableSpec: w,
-    tableHandle: p
+    tableSpec: v,
+    tableHandle: f
   };
 }
 function Fn(t, e, n) {
@@ -1956,7 +1956,7 @@ function Ut(t) {
 function Bt(t, e) {
   const n = Ut(t), r = [...n.keys()].map(fe), i = [];
   for (const l of e.values()) {
-    const u = r.find((c) => U(l, c));
+    const u = r.find((c) => j(l, c));
     u && i.push(K(u));
   }
   const s = new Set(i), o = /* @__PURE__ */ new Map();
@@ -1982,21 +1982,21 @@ function Gt(t, e) {
     return [e];
   const r = n.map((u) => {
     const c = [];
-    for (const [d, y] of t)
-      U(y, u) && !U(u, y) && c.push(y);
+    for (const [d, g] of t)
+      j(g, u) && !j(u, g) && c.push(g);
     return c;
   }), i = $t(r), s = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set(), a = i.map((u) => {
     const c = /* @__PURE__ */ new Set();
-    return u.map((d, y) => {
-      const f = e.spec.axesSpec[y].domain, w = d.domain;
-      return Object.entries(w ?? {}).forEach(([p, g]) => {
-        if ((f == null ? void 0 : f[p]) === void 0) {
-          const b = JSON.stringify([p, g]);
-          c.add(b), s.add(b);
+    return u.map((d, g) => {
+      const p = e.spec.axesSpec[g].domain, v = d.domain;
+      return Object.entries(v ?? {}).forEach(([f, m]) => {
+        if ((p == null ? void 0 : p[f]) === void 0) {
+          const w = JSON.stringify([f, m]);
+          c.add(w), s.add(w);
         }
       }), {
         ...d,
-        annotations: e.spec.axesSpec[y].annotations
+        annotations: e.spec.axesSpec[g].annotations
       };
     }), c;
   });
@@ -2004,23 +2004,23 @@ function Gt(t, e) {
     a.some((c) => !c.has(u)) && o.add(u);
   });
   const l = i.map((u, c) => {
-    var p;
-    const d = Vt(e.id, u.map((g) => g.domain)), y = ((p = e.spec.annotations) == null ? void 0 : p[Ie]) ?? "", f = [...a[c]].filter((g) => o.has(g)).sort().map((g) => {
-      var b;
-      return (b = JSON.parse(g)) == null ? void 0 : b[1];
-    }).join(" / "), w = {
+    var f;
+    const d = Vt(e.id, u.map((m) => m.domain)), g = ((f = e.spec.annotations) == null ? void 0 : f[Ie]) ?? "", p = [...a[c]].filter((m) => o.has(m)).sort().map((m) => {
+      var w;
+      return (w = JSON.parse(m)) == null ? void 0 : w[1];
+    }).join(" / "), v = {
       ...e.spec.annotations,
       [Jt]: "true"
     };
-    return (y || f) && (w[Ie] = y && f ? y + " / " + f : y + f), {
+    return (g || p) && (v[Ie] = g && p ? g + " / " + p : g + p), {
       id: d,
       spec: {
         ...e.spec,
-        axesSpec: u.map((g, b) => ({
-          ...g,
-          annotations: e.spec.axesSpec[b].annotations
+        axesSpec: u.map((m, w) => ({
+          ...m,
+          annotations: e.spec.axesSpec[w].annotations
         })),
-        annotations: w
+        annotations: v
       },
       data: e.data
     };
@@ -2033,26 +2033,32 @@ function Kn(t, e) {
   n.addColumnProvider(t.resultPool), n.addColumns(e);
   const r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
   for (const d of e)
-    for (const y of d.spec.axesSpec) {
-      const f = D(y);
-      r.set(K(f), f), i.set(K(f), f);
+    for (const g of d.spec.axesSpec) {
+      const p = D(g);
+      r.set(K(p), p), i.set(K(p), p);
     }
   const s = n.getColumns((d) => Nt(d)) ?? [], o = Bt(s, r);
   for (const d of o)
     r.set(...d), i.set(...d);
-  const a = (n.getColumns([...r.values()].map((d) => ({
-    axes: [d],
-    partialAxesMatch: !0
-  })), { dontWaitAllData: !0, overrideLabelAnnotation: !1 }) ?? []).filter((d) => !ve(d.spec));
+  const a = (n.getColumns((d) => d.axesSpec.some((g) => {
+    const p = D(g);
+    for (const v of r.values())
+      if (j(v, p))
+        return !0;
+    return !1;
+  }), { dontWaitAllData: !0, overrideLabelAnnotation: !1 }) ?? []).filter((d) => !ve(d.spec));
   for (const d of a)
-    for (const y of d.spec.axesSpec) {
-      const f = D(y);
-      i.set(K(f), f);
+    for (const g of d.spec.axesSpec) {
+      const p = D(g);
+      i.set(K(p), p);
     }
-  const l = (n.getColumns([...i.values()].map((d) => ({
-    axes: [d],
-    partialAxesMatch: !0
-  })), { dontWaitAllData: !0, overrideLabelAnnotation: !1 }) ?? []).filter((d) => ve(d.spec)), u = [...a, ...l], c = Wt(r, u);
+  const l = (n.getColumns((d) => d.axesSpec.some((g) => {
+    const p = D(g);
+    for (const v of i.values())
+      if (j(v, p))
+        return !0;
+    return !1;
+  }), { dontWaitAllData: !0, overrideLabelAnnotation: !1 }) ?? []).filter((d) => ve(d.spec)), u = [...a, ...l], c = Wt(r, u);
   if (!c.some(
     (d) => d.data instanceof E && !d.data.getIsReadyOrError()
   ))