@platforma-sdk/model 1.63.12 → 1.65.0

package/src/render/api.ts

@@ -686,10 +686,12 @@ export abstract class RenderCtxBase<
 
   // TODO remove all non-PColumn fields
   public createPFrame(
-    def: PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>>,
+    def: PFrameDef<
+      PColumn<undefined | PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>
+    >,
   ): PFrameHandle | undefined {
-    this.verifyInlineAndExplicitColumnsSupport(def);
     if (!allPColumnsReady(def)) return undefined;
+    this.verifyInlineAndExplicitColumnsSupport(def);
     return this.ctx.createPFrame(def.map((c) => transformPColumnData(c)));
   }
 
@@ -731,11 +733,19 @@ export abstract class RenderCtxBase<
     return this.ctx.createPTable(mapPTableDef(rawDef, (po) => transformPColumnData(po)));
   }
 
-  public createPTableV2(def: PTableDefV2<PColumn<PColumnDataUniversal>>): PTableHandle | undefined {
+  public createPTableV2(
+    def: PTableDefV2<PColumn<undefined | PColumnDataUniversal>>,
+  ): PTableHandle | undefined {
     const columns = collectSpecQueryColumns(def.query);
-    this.verifyInlineAndExplicitColumnsSupport(columns);
     if (!allPColumnsReady(columns)) return undefined;
-    return this.ctx.createPTableV2(mapPTableDefV2(def, (po) => transformPColumnData(po)));
+    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 });
+      }),
+    );
   }
 
   /** @deprecated scheduled for removal from SDK */

package/src/render/util/column_collection.ts

@@ -126,8 +126,8 @@ type IntermediateDirectEntry = {
 // Union type for intermediate processing
 type IntermediateColumnEntry = IntermediateSplitEntry | IntermediateDirectEntry;
 
-function splitFiltersToTrace(splitFilters?: AxisFilterInfo[]) {
-  if (!splitFilters) return undefined;
+function splitFiltersToExtraTrace(splitFilters?: AxisFilterInfo[]) {
+  if (splitFilters === undefined) return undefined;
   return splitFilters.map((filter) => ({
     type: `split:${canonicalizeAxisId(filter.axisId)}`,
     label: filter.label,
@@ -467,7 +467,8 @@ export class PColumnCollection {
       intermediateResults,
       (entry) => ({
         spec: entry.spec,
-        suffixTrace: entry.type === "split" ? splitFiltersToTrace(entry.axisFilters) : undefined,
+        extraTrace:
+          entry.type === "split" ? splitFiltersToExtraTrace(entry.axisFilters) : undefined,
       }),
       labelOps,
     );

package/src/render/util/label.ts

@@ -20,6 +20,6 @@ export function deriveLabels<T>(
   options: DeriveLabelsOptions = {},
 ): WithLabel<T>[] {
   const specs = values.map(getSpec);
-  const labeled = deriveDistinctLabels(specs, options);
-  return labeled.map((l, i) => ({ value: values[i], label: l.label }));
+  const labels = deriveDistinctLabels(specs, options);
+  return labels.map((label, i) => ({ value: values[i], label }));
 }

package/src/render/util/pcolumn_data.ts

@@ -546,7 +546,7 @@ export function convertOrParsePColumnData(
 }
 
 export function isPColumnReady(
-  c: PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>,
+  c: PColumn<undefined | PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>,
 ): c is PColumn<PColumnDataUniversal> | PColumnLazy<PColumnDataUniversal> {
   const isValues = (d: PColumnDataUniversal): d is PColumnValues => Array.isArray(d);
   const isAccessor = (d: PColumnDataUniversal): d is TreeNodeAccessor =>
@@ -561,14 +561,16 @@ export function isPColumnReady(
   } else if (isDataInfo(data)) {
     visitDataInfo(data, (v) => (ready &&= v.getIsReadyOrError()));
   } else if (!isValues(data)) {
-    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
     throw Error(`unsupported column data type: ${data satisfies never}`);
   }
   return ready;
 }
 
 export function allPColumnsReady(
-  columns: (PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>)[],
+  columns: (
+    | PColumn<undefined | PColumnDataUniversal>
+    | PColumnLazy<undefined | PColumnDataUniversal>
+  )[],
 ): columns is (PColumn<PColumnDataUniversal> | PColumnLazy<PColumnDataUniversal>)[] {
   return columns.every(isPColumnReady);
 }

package/dist/labels/write_labels_to_specs.cjs

@@ -1,14 +0,0 @@
-require("../_virtual/_rolldown/runtime.cjs");
-let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
-//#region src/labels/write_labels_to_specs.ts
-function writeLabelsToSpecs(items) {
-	for (const { value, label } of items) {
-		value.spec.annotations = value.spec.annotations ?? {};
-		value.spec.annotations[_milaboratories_pl_model_common.Annotation.Label] = label;
-		value.spec.annotations["pl7.app/label/isDerived"] = "true";
-	}
-}
-//#endregion
-exports.writeLabelsToSpecs = writeLabelsToSpecs;
-
-//# sourceMappingURL=write_labels_to_specs.cjs.map

package/dist/labels/write_labels_to_specs.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"write_labels_to_specs.cjs","names":["Annotation"],"sources":["../../src/labels/write_labels_to_specs.ts"],"sourcesContent":["import { Annotation } from \"@milaboratories/pl-model-common\";\nimport type { ColumnSnapshot } from \"../columns\";\nimport type { WithLabel } from \"./derive_distinct_labels\";\n\nexport function writeLabelsToSpecs(items: WithLabel<ColumnSnapshot>[]): void {\n  for (const { value, label } of items) {\n    // @ts-expect-error - annotations are mutable at runtime, even if not in the type\n    value.spec.annotations = value.spec.annotations ?? {};\n    value.spec.annotations[Annotation.Label] = label;\n    value.spec.annotations[\"pl7.app/label/isDerived\"] = \"true\";\n  }\n}\n"],"mappings":";;;AAIA,SAAgB,mBAAmB,OAA0C;AAC3E,MAAK,MAAM,EAAE,OAAO,WAAW,OAAO;AAEpC,QAAM,KAAK,cAAc,MAAM,KAAK,eAAe,EAAE;AACrD,QAAM,KAAK,YAAYA,gCAAAA,WAAW,SAAS;AAC3C,QAAM,KAAK,YAAY,6BAA6B"}

package/dist/labels/write_labels_to_specs.d.ts

@@ -1,7 +0,0 @@
-import { WithLabel } from "./derive_distinct_labels.js";
-import { ColumnSnapshot } from "../columns/column_snapshot.js";
-//#region src/labels/write_labels_to_specs.d.ts
-declare function writeLabelsToSpecs(items: WithLabel<ColumnSnapshot>[]): void;
-//#endregion
-export { writeLabelsToSpecs };
-//# sourceMappingURL=write_labels_to_specs.d.ts.map

package/dist/labels/write_labels_to_specs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"write_labels_to_specs.d.ts","names":[],"sources":["../../src/labels/write_labels_to_specs.ts"],"mappings":";;;iBAIgB,kBAAA,CAAmB,KAAA,EAAO,SAAA,CAAU,cAAA"}

package/dist/labels/write_labels_to_specs.js

@@ -1,13 +0,0 @@
-import { Annotation } from "@milaboratories/pl-model-common";
-//#region src/labels/write_labels_to_specs.ts
-function writeLabelsToSpecs(items) {
-	for (const { value, label } of items) {
-		value.spec.annotations = value.spec.annotations ?? {};
-		value.spec.annotations[Annotation.Label] = label;
-		value.spec.annotations["pl7.app/label/isDerived"] = "true";
-	}
-}
-//#endregion
-export { writeLabelsToSpecs };
-
-//# sourceMappingURL=write_labels_to_specs.js.map

package/dist/labels/write_labels_to_specs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"write_labels_to_specs.js","names":[],"sources":["../../src/labels/write_labels_to_specs.ts"],"sourcesContent":["import { Annotation } from \"@milaboratories/pl-model-common\";\nimport type { ColumnSnapshot } from \"../columns\";\nimport type { WithLabel } from \"./derive_distinct_labels\";\n\nexport function writeLabelsToSpecs(items: WithLabel<ColumnSnapshot>[]): void {\n  for (const { value, label } of items) {\n    // @ts-expect-error - annotations are mutable at runtime, even if not in the type\n    value.spec.annotations = value.spec.annotations ?? {};\n    value.spec.annotations[Annotation.Label] = label;\n    value.spec.annotations[\"pl7.app/label/isDerived\"] = \"true\";\n  }\n}\n"],"mappings":";;AAIA,SAAgB,mBAAmB,OAA0C;AAC3E,MAAK,MAAM,EAAE,OAAO,WAAW,OAAO;AAEpC,QAAM,KAAK,cAAc,MAAM,KAAK,eAAe,EAAE;AACrD,QAAM,KAAK,YAAY,WAAW,SAAS;AAC3C,QAAM,KAAK,YAAY,6BAA6B"}

package/src/labels/write_labels_to_specs.ts

@@ -1,12 +0,0 @@
-import { Annotation } from "@milaboratories/pl-model-common";
-import type { ColumnSnapshot } from "../columns";
-import type { WithLabel } from "./derive_distinct_labels";
-
-export function writeLabelsToSpecs(items: WithLabel<ColumnSnapshot>[]): void {
-  for (const { value, label } of items) {
-    // @ts-expect-error - annotations are mutable at runtime, even if not in the type
-    value.spec.annotations = value.spec.annotations ?? {};
-    value.spec.annotations[Annotation.Label] = label;
-    value.spec.annotations["pl7.app/label/isDerived"] = "true";
-  }
-}