@platforma-open/milaboratories.repertoire-diversity-2.model 1.3.0 → 1.3.1

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/work/repertoire-diversity/repertoire-diversity/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @platforma-open/milaboratories.repertoire-diversity-2.model@1.3.0 build /home/runner/work/repertoire-diversity/repertoire-diversity/model
+> @platforma-open/milaboratories.repertoire-diversity-2.model@1.3.1 build /home/runner/work/repertoire-diversity/repertoire-diversity/model
 > tsup && vite build && block-tools build-model
 
 CLI Building entry: src/index.ts
@@ -11,14 +11,14 @@
 CLI Cleaning output folder
 CJS Build start
 ESM Build start
+DTS Build start
 ESM dist/index.js     2.38 KB
 ESM dist/index.js.map 6.07 KB
-ESM ⚡️ Build success in 112ms
+ESM ⚡️ Build success in 306ms
 CJS dist/index.cjs     2.38 KB
 CJS dist/index.cjs.map 6.13 KB
-CJS ⚡️ Build success in 114ms
-DTS Build start
-DTS ⚡️ Build success in 2218ms
+CJS ⚡️ Build success in 307ms
+DTS ⚡️ Build success in 3198ms
 DTS dist/index.d.cts 2.49 KB
 DTS dist/index.d.ts  2.49 KB
 vite v6.2.6 building for production...
@@ -26,6 +26,6 @@ transforming...
 ✓ 11 modules transformed.
 rendering chunks...
 computing gzip size...
-dist/bundle.js  189.06 kB │ gzip: 36.89 kB │ map: 405.47 kB
-dist/bundle.js  202.05 kB │ gzip: 37.55 kB │ map: 407.04 kB
-✓ built in 669ms
+dist/bundle.js  189.23 kB │ gzip: 36.91 kB │ map: 405.74 kB
+dist/bundle.js  202.24 kB │ gzip: 37.57 kB │ map: 407.31 kB
+✓ built in 832ms

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @platforma-open/milaboratories.repertoire-diversity-2.model
 
+## 1.3.1
+
+### Patch Changes
+
+- f95c059: Update SDK
+
 ## 1.3.0
 
 ### Minor Changes

package/dist/bundle.js

@@ -4507,12 +4507,12 @@
   }), c = l.extend({
     cause: z$1.lazy(() => s).optional(),
     errors: z$1.lazy(() => s.array()).optional()
-  }), m$1 = z$1.object({
+  }), m = z$1.object({
     type: z$1.literal("StandardError"),
     name: z$1.string(),
     message: z$1.string(),
     stack: z$1.string().optional()
-  }), p = m$1.extend({
+  }), p = m.extend({
     cause: z$1.lazy(() => s).optional(),
     errors: z$1.lazy(() => s.array()).optional()
   }), s = z$1.union([p, c]);
@@ -4543,7 +4543,7 @@
   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");
   }
@@ -4555,7 +4555,7 @@
   }
   const ce = /* @__PURE__ */ new Map();
   function ht(t, e) {
-    t in m().callbackRegistry || (m().callbackRegistry[t] = (n2) => {
+    t in y().callbackRegistry || (y().callbackRegistry[t] = (n2) => {
       for (const r of ce.get(t))
         r(n2);
     }, ce.set(t, [])), ce.get(t).push(e);
@@ -4624,46 +4624,46 @@
         ...n2.map((i) => typeof i == "string" ? i : i.field)
       ];
       return he(
-        m().resolveWithCommon(this.handle, e, ...n2),
+        y().resolveWithCommon(this.handle, e, ...n2),
         (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),
         (n2) => new E(n2, 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 n2 = this.getKeyValueAsString(e);
@@ -4671,10 +4671,10 @@
       return JSON.parse(n2);
     }
     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();
@@ -4695,7 +4695,7 @@
      *
      */
     parsePObjectCollection(e = false, n2 = "") {
-      const r = m().parsePObjectCollection(
+      const r = y().parsePObjectCollection(
         this.handle,
         e,
         n2,
@@ -4710,14 +4710,14 @@
       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((n2) => JSON.parse(n2));
     }
     /**
@@ -4736,7 +4736,7 @@
      * @returns downloaded file handle
      */
     getFileHandle() {
-      return new _(m().getDownloadedBlobContentHandle(this.handle));
+      return new _(y().getDownloadedBlobContentHandle(this.handle));
     }
     /**
      * @deprecated use getFileHandle
@@ -4748,7 +4748,7 @@
      * @returns downloaded file handle
      */
     getRemoteFileHandle() {
-      return new _(m().getOnDemandBlobContentHandle(this.handle));
+      return new _(y().getOnDemandBlobContentHandle(this.handle));
     }
     /**
      * @deprecated use getRemoteFileHandle
@@ -4760,22 +4760,22 @@
      * @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) {
@@ -4812,75 +4812,75 @@
     label: z$1.string()
   }), wt = z$1.array(bt), At = 1e-3, xt = "__LABEL__", Pe = "__LABEL__@1";
   function je(t, e, n2 = {}) {
-    const r = /* @__PURE__ */ new Map(), i = n2.forceTraceElements !== void 0 && n2.forceTraceElements.length > 0 ? new Set(n2.forceTraceElements) : void 0, s2 = /* @__PURE__ */ new Map(), o = t.map((f2) => {
+    const r = /* @__PURE__ */ new Map(), i = n2.forceTraceElements !== void 0 && n2.forceTraceElements.length > 0 ? new Set(n2.forceTraceElements) : void 0, s2 = /* @__PURE__ */ new Map(), o = t.map((p2) => {
       var P2, R;
-      const w2 = e(f2);
-      let p2, g, b;
-      "spec" in w2 && typeof w2.spec == "object" ? (p2 = w2.spec, g = w2.prefixTrace, b = w2.suffixTrace) : p2 = w2;
-      const h2 = (P2 = p2.annotations) == null ? void 0 : P2[yt], I = (R = p2.annotations) == null ? void 0 : R[vt], x = (I ? wt.safeParse(JSON.parse(I)).data : void 0) ?? [], v = [
-        ...g ?? [],
+      const v = e(p2);
+      let f2, m2, w2;
+      "spec" in v && typeof v.spec == "object" ? (f2 = v.spec, m2 = v.prefixTrace, w2 = v.suffixTrace) : f2 = v;
+      const h2 = (P2 = f2.annotations) == null ? void 0 : P2[yt], I = (R = f2.annotations) == null ? void 0 : R[vt], x = (I ? wt.safeParse(JSON.parse(I)).data : void 0) ?? [], b = [
+        ...m2 ?? [],
         ...x,
-        ...b ?? []
+        ...w2 ?? []
       ];
       if (h2 !== void 0) {
         const k2 = { label: h2, type: xt, importance: -2 };
-        n2.addLabelAsSuffix ? v.push(k2) : v.splice(0, 0, k2);
+        n2.addLabelAsSuffix ? b.push(k2) : b.splice(0, 0, k2);
       }
       const A = [], L = /* @__PURE__ */ new Map();
-      for (let k2 = v.length - 1; k2 >= 0; --k2) {
-        const { type: W } = v[k2], j2 = v[k2].importance ?? 0, $ = (L.get(W) ?? 0) + 1;
-        L.set(W, $);
-        const F = `${W}@${$}`;
+      for (let k2 = b.length - 1; k2 >= 0; --k2) {
+        const { type: W } = b[k2], V = b[k2].importance ?? 0, N2 = (L.get(W) ?? 0) + 1;
+        L.set(W, N2);
+        const F = `${W}@${N2}`;
         s2.set(F, (s2.get(F) ?? 0) + 1), r.set(
           F,
           Math.max(
             r.get(F) ?? Number.NEGATIVE_INFINITY,
-            j2 - (v.length - k2) * At
+            V - (b.length - k2) * At
           )
-        ), A.push({ ...v[k2], fullType: F, occurrenceIndex: $ });
+        ), A.push({ ...b[k2], fullType: F, occurrenceIndex: N2 });
       }
       return A.reverse(), {
-        value: f2,
-        spec: p2,
+        value: p2,
+        spec: f2,
         label: h2,
         fullTrace: A
       };
     }), a = [], l2 = [], u2 = [...r];
-    u2.sort(([, f2], [, w2]) => w2 - f2);
-    for (const [f2] of u2)
-      f2.endsWith("@1") || s2.get(f2) === t.length ? a.push(f2) : l2.push(f2);
-    const c2 = (f2, w2 = false) => {
-      const p2 = [];
-      for (let g = 0; g < o.length; g++) {
-        const b = o[g], h2 = b.fullTrace.filter((v) => f2.has(v.fullType) || i && i.has(v.type));
+    u2.sort(([, p2], [, v]) => v - p2);
+    for (const [p2] of u2)
+      p2.endsWith("@1") || s2.get(p2) === t.length ? a.push(p2) : l2.push(p2);
+    const c2 = (p2, v = false) => {
+      const f2 = [];
+      for (let m2 = 0; m2 < o.length; m2++) {
+        const w2 = o[m2], h2 = w2.fullTrace.filter((b) => p2.has(b.fullType) || i && i.has(b.type));
         if (h2.length === 0)
-          if (w2)
-            p2.push({
+          if (v)
+            f2.push({
               label: "Unlabeled",
-              value: b.value
+              value: w2.value
             });
           else return;
-        const I = h2.map((v) => v.label), x = n2.separator ?? " / ";
-        p2.push({
+        const I = h2.map((b) => b.label), x = n2.separator ?? " / ";
+        f2.push({
           label: I.join(x),
-          value: b.value
+          value: w2.value
         });
       }
-      return p2;
+      return f2;
     };
     if (a.length === 0) {
       if (l2.length !== 0) throw new Error("Non-empty secondary types list while main types list is empty.");
       return c2(new Set(Pe), true);
     }
-    let d = 0, y = -1;
+    let d = 0, g = -1;
     for (; d < a.length; ) {
-      const f2 = /* @__PURE__ */ new Set();
-      n2.includeNativeLabel && f2.add(Pe);
-      for (let p2 = 0; p2 < d; ++p2) f2.add(a[p2]);
-      y >= 0 && f2.add(a[y]);
-      const w2 = c2(f2);
-      if (w2 !== void 0 && new Set(w2.map((p2) => p2.label)).size === t.length) return w2;
-      y++, y >= a.length && (d++, y = d);
+      const p2 = /* @__PURE__ */ new Set();
+      n2.includeNativeLabel && p2.add(Pe);
+      for (let f2 = 0; f2 < d; ++f2) p2.add(a[f2]);
+      g >= 0 && p2.add(a[g]);
+      const v = c2(p2);
+      if (v !== void 0 && new Set(v.map((f2) => f2.label)).size === t.length) return v;
+      g++, g >= a.length && (d++, g = d);
     }
     return c2(/* @__PURE__ */ new Set([...a, ...l2]), true);
   }
@@ -5218,43 +5218,43 @@
       };
       let u2 = () => false;
       if (a) {
-        const p2 = (Array.isArray(a) ? a : [a]).map((g) => {
-          if (Se(g)) {
+        const f2 = (Array.isArray(a) ? a : [a]).map((m2) => {
+          if (Se(m2)) {
             if (!r)
               throw new Error("Anchored selectors in exclude require an AnchoredIdDeriver to be provided in options.");
-            return Gn(Mn(r.anchors, g, n2));
+            return Gn(Mn(r.anchors, m2, n2));
           } else
-            return Gn(g);
+            return Gn(m2);
         });
-        u2 = (g) => p2.some((b) => b(g));
+        u2 = (m2) => f2.some((w2) => w2(m2));
       }
-      const c2 = typeof e == "function" ? [e] : Array.isArray(e) ? e : [e], d = [], y = /* @__PURE__ */ new Set();
-      for (const p2 of c2) {
-        const g = Se(p2);
-        let b;
-        if (g) {
+      const c2 = typeof e == "function" ? [e] : Array.isArray(e) ? e : [e], d = [], g = /* @__PURE__ */ new Set();
+      for (const f$1 of c2) {
+        const m2 = Se(f$1);
+        let w2;
+        if (m2) {
           if (!r)
             throw new Error("Anchored selectors require an AnchoredIdDeriver to be provided in options.");
-          b = Mn(r.anchors, p2, n2);
+          w2 = Mn(r.anchors, f$1, n2);
         } else
-          b = p2;
+          w2 = f$1;
         const h2 = /* @__PURE__ */ new Set(), I = [];
         for (const A of this.providers) {
-          const L = A.selectColumns(b);
+          const L = A.selectColumns(w2);
           for (const P2 of L) {
             if (u2(P2.spec)) continue;
             if (h2.has(P2.id))
               throw new Error(`Duplicate column id ${P2.id} in provider ${A.constructor.name}`);
             const R = Qn(P2.spec);
-            y.has(R) || (h2.add(P2.id), y.add(R), I.push(P2));
+            g.has(R) || (h2.add(P2.id), g.add(R), I.push(P2));
           }
         }
         if (I.length === 0) continue;
-        const x = Dt(p2), v = x.length > 0;
+        const x = Dt(f$1), b = x.length > 0;
         for (const A of I) {
           if (!f(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 P2 = _t(A.data);
@@ -5267,33 +5267,33 @@
             const R = St(P2), k2 = x[x.length - 1];
             if (k2 >= P2.partitionKeyLength)
               throw new Error(`Not enough partition keys (${P2.partitionKeyLength}) for requested split axes (max index ${k2}) in column ${L.name}`);
-            const W = x.map((S) => this.findLabels(p$1(L.axesSpec[S]))), j2 = [], $ = (S, G) => {
+            const W = x.map((S) => this.findLabels(p$1(L.axesSpec[S]))), V = [], N2 = (S, G) => {
               if (G >= x.length) {
-                if (j2.push([...S]), j2.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 N2 = R[V];
-              if (!N2 || N2.length === 0) {
-                j2.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 J2 = R[$];
+              if (!J2 || J2.length === 0) {
+                V.length = 0;
                 return;
               }
-              for (const ee of N2)
-                S.push(ee), $(S, G + 1), S.pop();
+              for (const ee of J2)
+                S.push(ee), N2(S, G + 1), S.pop();
             };
-            if ($([], 0), j2.length === 0)
+            if (N2([], 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 j2) {
-              const G = S.map((V, N2) => {
-                const ee = Be[N2], Ge = p$1(L.axesSpec[ee]), ue2 = W[N2], He = (ue2 == null ? void 0 : ue2[V]) ?? String(V);
-                return { axisIdx: ee, axisId: Ge, value: V, label: He };
+            for (const S of V) {
+              const G = S.map(($, J2) => {
+                const ee = Be[J2], Ge = p$1(L.axesSpec[ee]), ue2 = W[J2], He = (ue2 == null ? void 0 : ue2[$]) ?? String($);
+                return { axisIdx: ee, axisId: Ge, value: $, label: He };
               });
               d.push({
                 type: "split",
@@ -5314,33 +5314,33 @@
         }
       }
       if (d.length === 0) return [];
-      const f$1 = je(
+      const p2 = je(
         d,
-        (p2) => ({
-          spec: p2.spec,
-          suffixTrace: p2.type === "split" ? Et(p2.axisFilters) : void 0
+        (f2) => ({
+          spec: f2.spec,
+          suffixTrace: f2.type === "split" ? Et(f2.axisFilters) : void 0
         }),
         l2
-      ), w2 = [];
-      for (const { value: p2, label: g } of f$1) {
-        const { originalColumn: b, spec: h2 } = p2, I = p2.type === "split" ? p2.axisFilters : void 0, x = kt(I);
-        let v;
-        r ? v = r.deriveS(h2, x) : v = Ot(b.id, x);
-        let A = { ...p2.adjustedSpec };
+      ), v = [];
+      for (const { value: f2, label: m2 } of p2) {
+        const { originalColumn: w2, spec: h2 } = f2, I = f2.type === "split" ? f2.axisFilters : void 0, x = kt(I);
+        let b;
+        r ? b = r.deriveS(h2, x) : b = Ot(w2.id, x);
+        let A = { ...f2.adjustedSpec };
         o && (A = {
           ...A,
           annotations: {
             ...A.annotations ?? {},
-            "pl7.app/label": g
+            "pl7.app/label": m2
           }
-        }), w2.push({
-          id: v,
+        }), v.push({
+          id: b,
           spec: A,
-          data: () => p2.type === "split" ? Jn(It(p2.dataEntries, x)) : p2.originalColumn.data,
-          label: g
+          data: () => f2.type === "split" ? Jn(It(f2.dataEntries, x)) : f2.originalColumn.data,
+          label: m2
         });
       }
-      return w2;
+      return v;
     }
     getColumns(e, n2) {
       const r = this.getUniversalEntries(e, {
@@ -5377,7 +5377,7 @@
   }
   class Rt {
     constructor() {
-      O(this, "ctx", m());
+      O(this, "ctx", y());
     }
     /**
      * @deprecated use getOptions()
@@ -5651,7 +5651,7 @@
       O(this, "uiState");
       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).
@@ -5727,7 +5727,7 @@
       this.ctx.logError(e);
     }
   }
-  const Y = "1.34.8";
+  const Y = "1.34.10";
   function Ft(t) {
     return t.__renderLambda === true;
   }
@@ -5970,8 +5970,8 @@
     for (const a of e) {
       const l2 = a.spec.axesSpec[0], u2 = p$1(l2), c2 = i.findIndex((d) => Z$1(d, u2));
       if (c2 !== -1) {
-        const d = i[c2], y = Object.keys(d.domain ?? {}).length, f2 = Object.keys(l2.domain ?? {}).length;
-        y > f2 ? o.push({
+        const d = i[c2], g = Object.keys(d.domain ?? {}).length, p2 = Object.keys(l2.domain ?? {}).length;
+        g > p2 ? o.push({
           id: s2(a.id, d.domain),
           spec: {
             ...a.spec,
@@ -6104,21 +6104,21 @@
       return [e];
     const r = n2.map((u2) => {
       const c2 = [];
-      for (const [d, y] of t)
-        Z$1(y, u2) && !Z$1(u2, y) && c2.push(y);
+      for (const [d, g] of t)
+        Z$1(g, u2) && !Z$1(u2, g) && c2.push(g);
       return c2;
     }), i = $t(r), s2 = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set(), a = i.map((u2) => {
       const c2 = /* @__PURE__ */ new Set();
-      return u2.map((d, y) => {
-        const f2 = e.spec.axesSpec[y].domain, w2 = d.domain;
-        return Object.entries(w2 ?? {}).forEach(([p2, g]) => {
-          if ((f2 == null ? void 0 : f2[p2]) === void 0) {
-            const b = JSON.stringify([p2, g]);
-            c2.add(b), s2.add(b);
+      return u2.map((d, g) => {
+        const p2 = e.spec.axesSpec[g].domain, v = d.domain;
+        return Object.entries(v ?? {}).forEach(([f2, m2]) => {
+          if ((p2 == null ? void 0 : p2[f2]) === void 0) {
+            const w2 = JSON.stringify([f2, m2]);
+            c2.add(w2), s2.add(w2);
           }
         }), {
           ...d,
-          annotations: e.spec.axesSpec[y].annotations
+          annotations: e.spec.axesSpec[g].annotations
         };
       }), c2;
     });
@@ -6126,23 +6126,23 @@
       a.some((c2) => !c2.has(u2)) && o.add(u2);
     });
     const l2 = i.map((u2, c2) => {
-      var p2;
-      const d = Vt(e.id, u2.map((g) => g.domain)), y = ((p2 = e.spec.annotations) == null ? void 0 : p2[Ie]) ?? "", f2 = [...a[c2]].filter((g) => o.has(g)).sort().map((g) => {
-        var b;
-        return (b = JSON.parse(g)) == null ? void 0 : b[1];
-      }).join(" / "), w2 = {
+      var f2;
+      const d = Vt(e.id, u2.map((m2) => m2.domain)), g = ((f2 = e.spec.annotations) == null ? void 0 : f2[Ie]) ?? "", p2 = [...a[c2]].filter((m2) => o.has(m2)).sort().map((m2) => {
+        var w2;
+        return (w2 = JSON.parse(m2)) == null ? void 0 : w2[1];
+      }).join(" / "), v = {
         ...e.spec.annotations,
         [Jt]: "true"
       };
-      return (y || f2) && (w2[Ie] = y && f2 ? y + " / " + f2 : y + f2), {
+      return (g || p2) && (v[Ie] = g && p2 ? g + " / " + p2 : g + p2), {
         id: d,
         spec: {
           ...e.spec,
-          axesSpec: u2.map((g, b) => ({
-            ...g,
-            annotations: e.spec.axesSpec[b].annotations
+          axesSpec: u2.map((m2, w2) => ({
+            ...m2,
+            annotations: e.spec.axesSpec[w2].annotations
           })),
-          annotations: w2
+          annotations: v
         },
         data: e.data
       };
@@ -6155,26 +6155,32 @@
     n2.addColumnProvider(t.resultPool), n2.addColumns(e);
     const r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
     for (const d of e)
-      for (const y of d.spec.axesSpec) {
-        const f2 = p$1(y);
-        r.set(ue(f2), f2), i.set(ue(f2), f2);
+      for (const g of d.spec.axesSpec) {
+        const p2 = p$1(g);
+        r.set(ue(p2), p2), i.set(ue(p2), p2);
       }
     const s2 = n2.getColumns((d) => Nt(d)) ?? [], o = Bt(s2, r);
     for (const d of o)
       r.set(...d), i.set(...d);
-    const a = (n2.getColumns([...r.values()].map((d) => ({
-      axes: [d],
-      partialAxesMatch: true
-    })), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((d) => !ve(d.spec));
+    const a = (n2.getColumns((d) => d.axesSpec.some((g) => {
+      const p2 = p$1(g);
+      for (const v of r.values())
+        if (Z$1(v, p2))
+          return true;
+      return false;
+    }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((d) => !ve(d.spec));
     for (const d of a)
-      for (const y of d.spec.axesSpec) {
-        const f2 = p$1(y);
-        i.set(ue(f2), f2);
-      }
-    const l2 = (n2.getColumns([...i.values()].map((d) => ({
-      axes: [d],
-      partialAxesMatch: true
-    })), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((d) => ve(d.spec)), u2 = [...a, ...l2], c2 = Wt(r, u2);
+      for (const g of d.spec.axesSpec) {
+        const p2 = p$1(g);
+        i.set(ue(p2), p2);
+      }
+    const l2 = (n2.getColumns((d) => d.axesSpec.some((g) => {
+      const p2 = p$1(g);
+      for (const v of i.values())
+        if (Z$1(v, p2))
+          return true;
+      return false;
+    }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((d) => ve(d.spec)), u2 = [...a, ...l2], c2 = Wt(r, u2);
     if (!c2.some(
       (d) => d.data instanceof E && !d.data.getIsReadyOrError()
     ))