@platforma-sdk/model 1.28.1 → 1.29.0

package/dist/index.mjs

@@ -3,8 +3,8 @@ var Ke = (t, e, n) => e in t ? je(t, e, { enumerable: !0, configurable: !0, writ
 var L = (t, e, n) => Ke(t, typeof e != "symbol" ? e + "" : e, n);
 import { isPColumn as ie, mapPObjectData as ge, isDataInfoEntries as xe, isDataInfo as me, dataInfoToEntries as Ve, resolveAnchors as $e, isPColumnSpec as Q, isPartitionedDataInfoEntries as Je, getAxisId as E, entriesToDataInfo as Ne, selectorsToPredicate as ce, canonicalizeAxisId as Ue, AnchoredIdDeriver as ye, isPlRef as Be, mapValueInVOE as Me, ensurePColumn as Ge, extractAllColumns as We, mapPTableDef as He, mapDataInfo as qe, matchAxisId as G } from "@milaboratories/pl-model-common";
 export * from "@milaboratories/pl-model-common";
-import { z as K } from "zod";
 import Pe from "canonicalize";
+import { z as K } from "zod";
 export * from "@milaboratories/pl-error-like";
 class ze extends Error {
   constructor(e, n) {
@@ -514,11 +514,11 @@ const cn = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
 }), st = K.array(it), ot = 1e-3, at = "__LABEL__", ve = "__LABEL__@1";
 function Ee(t, e, n = {}) {
   const r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), s = t.map((p) => {
-    var q, D;
+    var q, F;
     const c = e(p);
     let h, A, y;
     "spec" in c && typeof c.spec == "object" ? (h = c.spec, A = c.prefixTrace, y = c.suffixTrace) : h = c;
-    const v = (q = h.annotations) == null ? void 0 : q[nt], g = (D = h.annotations) == null ? void 0 : D[rt], P = (g ? st.safeParse(JSON.parse(g)).data : void 0) ?? [], b = [
+    const v = (q = h.annotations) == null ? void 0 : q[nt], g = (F = h.annotations) == null ? void 0 : F[rt], P = (g ? st.safeParse(JSON.parse(g)).data : void 0) ?? [], b = [
       ...A ?? [],
       ...P,
       ...y ?? []
@@ -527,7 +527,7 @@ function Ee(t, e, n = {}) {
       const I = { label: v, type: at, importance: -2 };
       n.addLabelAsSuffix ? b.push(I) : b.splice(0, 0, I);
     }
-    const F = [], $ = /* @__PURE__ */ new Map();
+    const k = [], $ = /* @__PURE__ */ new Map();
     for (let I = b.length - 1; I >= 0; --I) {
       const { type: R } = b[I], se = b[I].importance ?? 0, J = ($.get(R) ?? 0) + 1;
       $.set(R, J);
@@ -538,13 +538,13 @@ function Ee(t, e, n = {}) {
           r.get(w) ?? Number.NEGATIVE_INFINITY,
           se - (b.length - I) * ot
         )
-      ), F.push({ ...b[I], fullType: w, occurenceIndex: J });
+      ), k.push({ ...b[I], fullType: w, occurenceIndex: J });
     }
-    return F.reverse(), {
+    return k.reverse(), {
       value: p,
       spec: h,
       label: v,
-      fullTrace: F
+      fullTrace: k
     };
   }), o = [], a = [], l = [...r];
   l.sort(([, p], [, c]) => c - p);
@@ -577,17 +577,15 @@ function Ee(t, e, n = {}) {
     for (let h = 0; h < S; ++h) p.add(o[h]);
     p.add(o[d]);
     const c = u(p);
-    if (c !== void 0) {
-      if (new Set(c.map((h) => h.label)).size === t.length) return c;
-      d++, d == o.length && (S++, d = S);
-    }
+    if (c !== void 0 && new Set(c.map((h) => h.label)).size === t.length) return c;
+    d++, d >= o.length && (S++, d = S);
   }
   const f = u(/* @__PURE__ */ new Set([...o, ...a]));
   if (f === void 0) throw new Error("Assertion error.");
   return f;
 }
 const H = "PColumnData/", te = H + "ResourceMap", ne = H + "Partitioned/ResourceMap", U = H + "JsonPartitioned", V = H + "BinaryPartitioned", Fe = H + "Partitioned/", re = Fe + "JsonPartitioned", B = Fe + "BinaryPartitioned";
-function De(t, e, n, r = [], i) {
+function ke(t, e, n, r = [], i) {
   if (t === void 0) return !1;
   switch (t.resourceType.name) {
     case te: {
@@ -604,7 +602,7 @@ function De(t, e, n, r = [], i) {
         const a = t.resolve({ field: o, assertFieldType: "Input" });
         if (a === void 0) s = !1;
         else {
-          const l = [...r, ...JSON.parse(o)], u = De(
+          const l = [...r, ...JSON.parse(o)], u = ke(
             a,
             e,
             n,
@@ -622,7 +620,7 @@ function De(t, e, n, r = [], i) {
 }
 function pn(t, e, n = !1) {
   const r = [];
-  return { isComplete: De(t, e, r, [], n), data: r };
+  return { isComplete: ke(t, e, r, [], n), data: r };
 }
 const fe = (t) => {
   if (t.endsWith(".index"))
@@ -979,35 +977,36 @@ class be {
           }
           if (!Je(b))
             throw new Error(`Splitting requires Partitioned DataInfoEntries, but parsing resulted in ${b.type} for column ${g.id}`);
-          const F = ct(b), $ = y[y.length - 1];
+          const k = ct(b), $ = y[y.length - 1];
           if ($ >= b.partitionKeyLength)
             throw new Error(`Not enough partition keys (${b.partitionKeyLength}) for requested split axes (max index ${$}) in column ${P.name}`);
-          const q = y.map((w) => this.findLabels(E(P.axesSpec[w]))), D = [], I = (w, N) => {
+          const q = y.map((w) => this.findLabels(E(P.axesSpec[w]))), F = [], I = (w, N) => {
             if (N >= y.length) {
-              D.push([...w]);
+              if (F.push([...w]), F.length > 1e4)
+                throw new Error("Too many key combinations, aborting.");
               return;
             }
-            const k = y[N];
-            if (k >= F.length)
-              throw new Error(`Axis index ${k} out of bounds for unique keys array (length ${F.length}) during split key generation for column ${g.id}`);
-            const O = F[k];
+            const D = y[N];
+            if (D >= k.length)
+              throw new Error(`Axis index ${D} out of bounds for unique keys array (length ${k.length}) during split key generation for column ${g.id}`);
+            const O = k[D];
             if (!O || O.length === 0) {
-              D.length = 0;
+              F.length = 0;
               return;
             }
             for (const z of O)
               w.push(z), I(w, N + 1), w.pop();
           };
-          if (I([], 0), D.length === 0)
+          if (I([], 0), F.length === 0)
             continue;
           const R = [...P.axesSpec], se = y.map((w) => w);
           for (let w = y.length - 1; w >= 0; w--)
             R.splice(y[w], 1);
           const J = { ...P, axesSpec: R };
-          for (const w of D) {
-            const N = w.map((k, O) => {
-              const z = se[O], Re = E(P.axesSpec[z]), oe = q[O], Oe = (oe == null ? void 0 : oe[k]) ?? String(k);
-              return { axisIdx: z, axisId: Re, value: k, label: Oe };
+          for (const w of F) {
+            const N = w.map((D, O) => {
+              const z = se[O], Re = E(P.axesSpec[z]), oe = q[O], Oe = (oe == null ? void 0 : oe[D]) ?? String(D);
+              return { axisIdx: z, axisId: Re, value: D, label: Oe };
             });
             u.push({
               type: "split",
@@ -1346,12 +1345,15 @@ class bt {
    * @returns a map of axis value => label
    */
   findLabelsForColumnAxis(e, n) {
-    const r = this.findLabels(e.spec.axesSpec[n]);
-    if (r)
-      return Object.fromEntries(e.data.listInputFields().map((i) => {
-        const s = JSON.parse(i);
-        return [s[n], r[s[n]] ?? "Unlabelled"];
-      }));
+    var s;
+    const r = this.findLabels(e.axesSpec[n]);
+    if (!r) return;
+    const i = (s = e.annotations) == null ? void 0 : s["pl7.app/axisKeys/" + n];
+    if (i !== void 0) {
+      const o = JSON.parse(i);
+      return Object.fromEntries(o.map((a) => [a, r[a] ?? "Unlabelled"]));
+    } else
+      return r;
   }
 }
 class X {
@@ -1430,7 +1432,7 @@ class X {
       return this.ctx.getCurrentUnstableMarker();
   }
 }
-const M = "1.28.1";
+const M = "1.29.0";
 function wt(t) {
   return t.__renderLambda === !0;
 }
@@ -1771,7 +1773,7 @@ function xt(t, e) {
   const n = t.spec.axesSpec.map(E);
   return e.spec.axesSpec.map(E).every((i) => n.some((s) => G(s, i) && G(i, s)));
 }
-function ke(t, e) {
+function De(t, e) {
   const n = t.spec.axesSpec.map(E);
   return e.spec.axesSpec.map(E).every((i) => n.some((s) => G(s, i)));
 }
@@ -1780,7 +1782,7 @@ function Se(t, e) {
   const n = t.spec.axesSpec.map(E), r = e.spec.axesSpec.map(E);
   if (xt(t, e))
     return [];
-  if (!ke(t, e))
+  if (!De(t, e))
     return [];
   const o = r.map((d) => n.filter((f) => G(f, d))), a = St(o), l = /* @__PURE__ */ new Set(), u = /* @__PURE__ */ new Set(), S = a.map((d) => {
     const f = /* @__PURE__ */ new Set();
@@ -1840,7 +1842,7 @@ function _t(t, e) {
     for (const i of t) {
       if (i.id === r.id)
         break;
-      if (ke(i, r)) {
+      if (De(i, r)) {
         n.push(r);
         break;
       }