@platforma-sdk/model 1.45.42 → 1.46.0

package/src/render/api.ts

@@ -5,6 +5,7 @@ import type {
   DataInfo,
   Option,
   PColumn,
+  PColumnLazy,
   PColumnSelector,
   PColumnSpec,
   PColumnValues,
@@ -79,8 +80,9 @@ export type UniversalColumnOption = { label: string; value: SUniversalPColumnId
  * @param data Data from a PColumn to transform
  * @returns Transformed data compatible with platform API
  */
-function transformPColumnData(data: PColumn<PColumnDataUniversal>):
-PColumn<PColumnValues | AccessorHandle | DataInfo<AccessorHandle>> {
+function transformPColumnData(
+  data: PColumn<PColumnDataUniversal> | PColumnLazy<PColumnDataUniversal>,
+): PColumn<PColumnValues | AccessorHandle | DataInfo<AccessorHandle>> {
   return mapPObjectData(data, (d) => {
     if (d instanceof TreeNodeAccessor) {
       return d.handle;
@@ -591,7 +593,7 @@ export class RenderCtx<Args, UiState> {
     return this.resultPool.findLabels(axis);
   }
 
-  private verifyInlineAndExplicitColumnsSupport(columns: PColumn<PColumnDataUniversal>[]) {
+  private verifyInlineAndExplicitColumnsSupport(columns: (PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>)[]) {
     const hasInlineColumns = columns.some((c) => !(c.data instanceof TreeNodeAccessor) || isDataInfo(c.data)); // Updated check for DataInfo
     const inlineColumnsSupport = this.ctx.featureFlags?.inlineColumnsSupport === true;
     if (hasInlineColumns && !inlineColumnsSupport) throw Error(`Inline or explicit columns not supported`); // Combined check
@@ -619,7 +621,7 @@ export class RenderCtx<Args, UiState> {
   }
 
   // TODO remove all non-PColumn fields
-  public createPFrame(def: PFrameDef<PColumn<PColumnDataUniversal>>): PFrameHandle | undefined {
+  public createPFrame(def: PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>>): PFrameHandle | undefined {
     this.verifyInlineAndExplicitColumnsSupport(def);
     if (!allPColumnsReady(def)) return undefined;
     return this.ctx.createPFrame(

package/src/render/util/column_collection.ts

@@ -7,6 +7,7 @@ import type {
   NativePObjectId,
   PartitionedDataInfoEntries,
   PColumn,
+  PColumnLazy,
   PColumnSelector,
   PColumnSpec,
   PColumnValues,
@@ -64,15 +65,22 @@ class ArrayColumnProvider implements ColumnProvider {
   }
 }
 
-export type PColumnEntryWithLabel = {
-  id: PObjectId;
-  spec: PColumnSpec;
-  /** Lazy calculates the data, returns undefined if data is not ready. */
-  data(): PColumnDataUniversal | undefined;
+/** Lazy calculates the data, returns undefined if data is not ready. */
+export type PColumnLazyWithLabel<T> = PColumnLazy<T> & {
   label: string;
 };
 
 /** Universal column is a column that uses a universal column id, and always have label. */
+export type PColumnLazyUniversal<T> = PColumnLazyWithLabel<T> & {
+  id: SUniversalPColumnId;
+};
+
+/** @deprecated Use PColumnLazyWithLabel instead. */
+export type PColumnEntryWithLabel = PColumnLazy<undefined | PColumnDataUniversal> & {
+  label: string;
+};
+
+/** @deprecated Use PColumnLazyUniversal instead. */
 export type PColumnEntryUniversal = PColumnEntryWithLabel & {
   id: SUniversalPColumnId;
 };

package/src/render/util/pcolumn_data.ts

@@ -2,6 +2,7 @@ import type {
   DataInfo,
   PartitionedDataInfoEntries,
   PColumn,
+  PColumnLazy,
   PColumnValues,
 } from '@milaboratories/pl-model-common';
 import {
@@ -501,8 +502,9 @@ export function parsePColumnData(
  * @param acc - The input data, which can be TreeNodeAccessor, DataInfoEntries, DataInfo, or undefined.
  * @returns The data in DataInfoEntries format, or undefined if the input was undefined or data is not ready.
  */
-export function convertOrParsePColumnData(acc: TreeNodeAccessor | DataInfoEntries<TreeNodeAccessor> | DataInfo<TreeNodeAccessor> | undefined):
-DataInfoEntries<TreeNodeAccessor> | undefined {
+export function convertOrParsePColumnData(
+  acc: TreeNodeAccessor | DataInfoEntries<TreeNodeAccessor> | DataInfo<TreeNodeAccessor> | undefined,
+): DataInfoEntries<TreeNodeAccessor> | undefined {
   if (acc === undefined) return undefined;
 
   if (isDataInfoEntries(acc)) return acc;
@@ -512,22 +514,25 @@ DataInfoEntries<TreeNodeAccessor> | undefined {
   throw new Error(`Unexpected input type: ${typeof acc}`);
 }
 
-export function isPColumnReady(c: PColumn<PColumnDataUniversal>): boolean {
+export function isPColumnReady(c: (PColumn<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 => d instanceof TreeNodeAccessor;
 
   let ready = true;
-  if (isAccessor(c.data)) {
-    ready &&= c.data.getIsReadyOrError();
-  } else if (isDataInfo(c.data)) {
-    visitDataInfo(c.data, (v) => ready &&= v.getIsReadyOrError());
-  } else if (!isValues(c.data)) {
+  const data = typeof c.data === 'function' ? c.data() : c.data;
+  if (data == null) {
+    return false;
+  } else if (isAccessor(data)) {
+    ready &&= data.getIsReadyOrError();
+  } 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: ${c.data satisfies never}`);
+    throw Error(`unsupported column data type: ${data satisfies never}`);
   }
   return ready;
 }
 
-export function allPColumnsReady(columns: PColumn<PColumnDataUniversal>[]): boolean {
+export function allPColumnsReady(columns: (PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>)[]): columns is (PColumn<PColumnDataUniversal> | PColumnLazy<PColumnDataUniversal>)[] {
   return columns.every(isPColumnReady);
 }