@platforma-sdk/model 1.69.0 → 1.71.0

package/src/labels/derive_distinct_tooltips.test.ts

@@ -34,12 +34,8 @@ function linkerSnapshot(name: string, label?: string): ColumnSnapshot<PObjectId>
   };
 }
 
-function pathStep(
-  linkerName: string,
-  qualifications: AxisQualification[],
-  label?: string,
-): MatchVariant["path"][number] {
-  return { linker: linkerSnapshot(linkerName, label), qualifications };
+function pathStep(linkerName: string, label?: string): MatchVariant["path"][number] {
+  return { linker: linkerSnapshot(linkerName, label) };
 }
 
 describe("deriveDistinctTooltips", () => {
@@ -63,16 +59,13 @@ describe("deriveDistinctTooltips", () => {
     const entries: TooltipEntry[] = [
       {
         spec: createSpec("hit_col", "Hit Col"),
-        linkerPath: [
-          pathStep("linker_a", [axisQualification("sample", { batch: "A" })], "Linker A"),
-        ],
+        linkerPath: [pathStep("linker_a", "Linker A")],
       },
     ];
     const [tooltip] = deriveDistinctTooltips(entries);
     expect(tooltip).toBeDefined();
     expect(tooltip).toContain("Origin path");
     expect(tooltip).toContain("linker 1: Linker A");
-    expect(tooltip).toContain("qualifies: sample context: batch=A");
     expect(tooltip).toContain("hit column: Hit Col");
   });
 
@@ -146,7 +139,7 @@ describe("deriveDistinctTooltips", () => {
       {
         spec: createSpec("col1", "Col 1"),
         qualifications: { forQueries: {}, forHit: [] },
-        linkerPath: [pathStep("linker_a", [], "Linker A")],
+        linkerPath: [pathStep("linker_a", "Linker A")],
       },
     ];
     const [tooltip] = deriveDistinctTooltips(entries);
@@ -157,10 +150,7 @@ describe("deriveDistinctTooltips", () => {
     const entries: TooltipEntry[] = [
       {
         spec: createSpec("hit_col", "Hit Col"),
-        linkerPath: [
-          pathStep("linker_a", [], "Linker A"),
-          pathStep("linker_b", [axisQualification("sample", { batch: "B" })], "Linker B"),
-        ],
+        linkerPath: [pathStep("linker_a", "Linker A"), pathStep("linker_b", "Linker B")],
       },
     ];
     const [tooltip] = deriveDistinctTooltips(entries);
@@ -174,7 +164,7 @@ describe("deriveDistinctTooltips", () => {
         spec: createSpec("hit_col", "Hit"),
         variantIndex: 2,
         variantCount: 2,
-        linkerPath: [pathStep("linker_a", [axisQualification("sample", { batch: "B" })], "LA")],
+        linkerPath: [pathStep("linker_a", "LA")],
         qualifications: {
           forQueries: { ["main" as PObjectId]: [axisQualification("sample", { batch: "B" })] },
           forHit: [axisQualification("sample", { batch: "B" })],

package/src/labels/derive_distinct_tooltips.ts

@@ -46,7 +46,6 @@ function formatTooltip(entry: TooltipEntry): undefined | string {
 }
 
 const BULLET_1 = "  • ";
-const SUB_BULLET = "      ";
 
 function formatHeader(entry: TooltipEntry): undefined | string {
   const lines: string[] = [];
@@ -67,8 +66,6 @@ function formatOriginPath(entry: TooltipEntry): undefined | string {
       readAnnotation(step.linker.spec, Annotation.Label) ??
       step.linker.spec.name;
     lines.push(`${BULLET_1}linker ${i + 1}: ${label}`);
-    const qs = formatAxisQualifications(step.qualifications);
-    if (qs !== undefined) lines.push(`${SUB_BULLET}qualifies: ${qs}`);
   });
   const hitName = readAnnotation(entry.spec, Annotation.Label) ?? entry.spec.name;
   lines.push(`${BULLET_1}hit column: ${hitName}`);

package/src/render/api.ts

@@ -29,10 +29,8 @@ import type {
 } from "@milaboratories/pl-model-common";
 import {
   AnchoredIdDeriver,
-  collectSpecQueryColumns,
   ensurePColumn,
   parseJson,
-  extractAllColumns,
   isDataInfo,
   isPColumn,
   isPColumnSpec,
@@ -46,6 +44,7 @@ import {
   readAnnotation,
   withEnrichments,
   legacyColumnSelectorsToPredicate,
+  extractAllColumns,
 } from "@milaboratories/pl-model-common";
 import canonicalize from "canonicalize";
 import type { Optional } from "utility-types";
@@ -70,9 +69,9 @@ import type { LabelDerivationOps } from "./util/label";
 import { deriveLabels } from "./util/label";
 import type { APColumnSelectorWithSplit } from "./util/split_selectors";
 import { patchInSetFilters } from "./util/pframe_upgraders";
-import { allPColumnsReady } from "./util/pcolumn_data";
 import type { PColumnDataUniversal } from "./internal";
 import { getService } from "../services";
+import { allPColumnsReady } from "./util";
 
 /**
  * Helper function to match domain objects
@@ -97,7 +96,7 @@ export type UniversalColumnOption = { label: string; value: SUniversalPColumnId
  * @returns Transformed data compatible with platform API
  */
 function transformPColumnData(
-  data: PColumn<PColumnDataUniversal> | PColumnLazy<PColumnDataUniversal>,
+  data: PColumn<undefined | PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>,
 ): PColumn<PColumnValues | AccessorHandle | DataInfo<AccessorHandle>> {
   return mapPObjectData(data, (d) => {
     if (d instanceof TreeNodeAccessor) {
@@ -105,7 +104,7 @@ function transformPColumnData(
     } else if (isDataInfo(d)) {
       return mapDataInfo(d, (accessor) => accessor.handle);
     } else {
-      return d;
+      return d ?? [];
     }
   });
 }
@@ -663,8 +662,6 @@ export abstract class RenderCtxBase<Args = unknown, Data = unknown> {
       PColumn<undefined | PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>
     >,
   ): PFrameHandle | undefined {
-    if (!allPColumnsReady(def)) return undefined;
-    this.verifyInlineAndExplicitColumnsSupport(def);
     return this.ctx.createPFrame(def.map((c) => transformPColumnData(c)));
   }
 
@@ -709,16 +706,7 @@ export abstract class RenderCtxBase<Args = unknown, Data = unknown> {
   public createPTableV2(
     def: PTableDefV2<PColumn<undefined | PColumnDataUniversal>>,
   ): PTableHandle | undefined {
-    const columns = collectSpecQueryColumns(def.query);
-    if (!allPColumnsReady(columns)) return undefined;
-    this.verifyInlineAndExplicitColumnsSupport(columns);
-    return this.ctx.createPTableV2(
-      mapPTableDefV2(def, (po) => {
-        if (po.data === undefined)
-          throw new Error("unreachable: column data undefined after readiness check");
-        return transformPColumnData({ id: po.id, spec: po.spec, data: po.data });
-      }),
-    );
+    return this.ctx.createPTableV2(mapPTableDefV2(def, (po) => transformPColumnData(po)));
   }
 
   /** @deprecated scheduled for removal from SDK */