@platforma-sdk/model 1.13.0 → 1.13.5

package/dist/render/api.d.ts

@@ -1,4 +1,4 @@
-import { AxisId, Option, PColumn, PColumnSpec, PFrameDef, PFrameHandle, PObject, PObjectSpec, PSpecPredicate, PTableDef, PTableHandle, PTableRecordFilter, PTableSorting, Ref, ResultCollection, ValueOrError } from '@milaboratories/pl-model-common';
+import { AxisId, Option, PColumn, PColumnSpec, PFrameDef, PFrameHandle, PObject, PObjectSpec, PSpecPredicate, PTableDef, PTableHandle, PTableRecordFilter, PTableSorting, PlRef, ResultCollection, ValueOrError } from '@milaboratories/pl-model-common';
 import { Optional } from 'utility-types';
 import { TreeNodeAccessor } from './accessor';
 import { FutureRef } from './future';
@@ -10,7 +10,7 @@ export declare class ResultPool {
      */
     calculateOptions(predicate: PSpecPredicate): Option[];
     private defaultLabelFn;
-    getOptions(predicate: (spec: PObjectSpec) => boolean, label?: ((spec: PObjectSpec, ref: Ref) => string) | LabelDerivationOps): Option[];
+    getOptions(predicate: (spec: PObjectSpec) => boolean, label?: ((spec: PObjectSpec, ref: PlRef) => string) | LabelDerivationOps): Option[];
     /**
      * @deprecated use getData()
      */
@@ -30,18 +30,18 @@ export declare class ResultPool {
      * @param ref a Ref
      * @returns data associated with the ref
      */
-    getDataByRef(ref: Ref): PObject<TreeNodeAccessor> | undefined;
+    getDataByRef(ref: PlRef): PObject<TreeNodeAccessor> | undefined;
     /**
      * Returns data associated with the ref ensuring that it is a p-column.
      * @param ref a Ref
      * @returns p-column associated with the ref
      */
-    getPColumnByRef(ref: Ref): PColumn<TreeNodeAccessor> | undefined;
+    getPColumnByRef(ref: PlRef): PColumn<TreeNodeAccessor> | undefined;
     /**
      * @param ref a Ref
      * @returns object spec associated with the ref
      */
-    getSpecByRef(ref: Ref): PObjectSpec | undefined;
+    getSpecByRef(ref: PlRef): PObjectSpec | undefined;
     /**
      * @param spec object specification
      * @returns array of data objects with compatible specs

package/dist/render/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/render/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/render/api.ts"],"names":[],"mappings":"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"}

package/dist/render/util/index.d.ts

@@ -1,2 +1,3 @@
 export * from './resource_map';
+export * from './label';
 //# sourceMappingURL=index.d.ts.map

package/dist/render/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/render/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/render/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC"}

package/dist/render/util/label.d.ts

@@ -7,8 +7,12 @@ export type RecordsWithLabel<T> = {
     label: string;
 };
 export type LabelDerivationOps = {
+    /** Force inclusion of native column label */
     includeNativeLabel?: boolean;
+    /** Separator to use between label parts (" / " by default) */
     separator?: string;
+    /** If true, label will be added as suffix (at the end of the generated label). By default label added as a prefix. */
+    addLabelAsSuffix?: boolean;
 };
 export declare const TraceEntry: z.ZodObject<{
     type: z.ZodString;

package/dist/render/util/label.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"label.d.ts","sourceRoot":"","sources":["../../../src/render/util/label.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,gBAAgB,kBAAkB,CAAC;AAChD,eAAO,MAAM,gBAAgB,kBAAkB,CAAC;AAEhD,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAChC,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;EAKrB,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAGpD,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;WAAsB,CAAC;AACzC,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC;AAQ1C,wBAAgB,YAAY,CAAC,CAAC,EAC5B,MAAM,EAAE,CAAC,EAAE,EACX,aAAa,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,WAAW,EACtC,GAAG,GAAE,kBAAuB,GAC3B,gBAAgB,CAAC,CAAC,CAAC,EAAE,CA4GvB"}
+{"version":3,"file":"label.d.ts","sourceRoot":"","sources":["../../../src/render/util/label.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,gBAAgB,kBAAkB,CAAC;AAChD,eAAO,MAAM,gBAAgB,kBAAkB,CAAC;AAEhD,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAChC,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,6CAA6C;IAC7C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,8DAA8D;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sHAAsH;IACtH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;EAKrB,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAGpD,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;WAAsB,CAAC;AACzC,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC;AAQ1C,wBAAgB,YAAY,CAAC,CAAC,EAC5B,MAAM,EAAE,CAAC,EAAE,EACX,aAAa,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,WAAW,EACtC,GAAG,GAAE,kBAAuB,GAC3B,gBAAgB,CAAC,CAAC,CAAC,EAAE,CA4GvB"}

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const PlatformaSDKVersion = "1.13.0";
+export declare const PlatformaSDKVersion = "1.13.5";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.13.0",
+  "version": "1.13.5",
   "description": "Platforma.bio SDK / Block Model",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
   "dependencies": {
     "utility-types": "^3.11.0",
     "zod": "^3.23.8",
-    "@milaboratories/pl-model-common": "^1.6.2"
+    "@milaboratories/pl-model-common": "^1.6.4"
   },
   "devDependencies": {
     "typescript": "~5.5.4",

package/src/components/PlDataTable.ts

@@ -280,14 +280,14 @@ export function createPlDataTable<A, U>(
   columns: PColumn<TreeNodeAccessor>[],
   tableState?: PlDataTableState,
   filters?: PTableRecordFilter[]
-): PTableHandle {
+): PTableHandle | undefined {
   const allLabelCols = ctx.resultPool
     .getData()
     .entries.map((d) => d.obj)
     .filter(isPColumn)
     .filter((p) => p.spec.name === 'pl7.app/label' && p.spec.axesSpec.length === 1);
 
-  const labelColumns = new Map<PObjectId, PColumn<TreeNodeAccessor>>;
+  const labelColumns = new Map<PObjectId, PColumn<TreeNodeAccessor>>();
   for (const col of columns) {
     for (const axis of col.spec.axesSpec) {
       const axisId = getAxisId(axis);
@@ -299,6 +299,10 @@ export function createPlDataTable<A, U>(
     }
   }
 
+  // if at least one column is not yet ready, we can't show the table
+  if ([...columns, ...labelColumns.values()].find((a) => !a.data.getIsReadyOrError()))
+    return undefined;
+
   return ctx.createPTable({
     src: {
       type: 'outer',

package/src/render/api.ts

@@ -12,7 +12,7 @@ import {
   PTableHandle,
   PTableRecordFilter,
   PTableSorting,
-  Ref,
+  PlRef,
   ResultCollection,
   ValueOrError,
   ensurePColumn,
@@ -39,12 +39,12 @@ export class ResultPool {
     return this.ctx.calculateOptions(predicate);
   }
 
-  private defaultLabelFn = (spec: PObjectSpec, ref: Ref) =>
+  private defaultLabelFn = (spec: PObjectSpec, ref: PlRef) =>
     spec.annotations?.['pl7.app/label'] ?? `Unlabelled`;
 
   public getOptions(
     predicate: (spec: PObjectSpec) => boolean,
-    label?: ((spec: PObjectSpec, ref: Ref) => string) | LabelDerivationOps
+    label?: ((spec: PObjectSpec, ref: PlRef) => string) | LabelDerivationOps
   ): Option[] {
     const filtered = this.getSpecs().entries.filter((s) => predicate(s.obj));
     if (typeof label === 'object' || typeof label === 'undefined') {
@@ -122,7 +122,7 @@ export class ResultPool {
    * @param ref a Ref
    * @returns data associated with the ref
    */
-  public getDataByRef(ref: Ref): PObject<TreeNodeAccessor> | undefined {
+  public getDataByRef(ref: PlRef): PObject<TreeNodeAccessor> | undefined {
     // @TODO remove after 1 Jan 2025; forward compatibility
     if (typeof this.ctx.getDataFromResultPoolByRef === 'undefined')
       return this.getData().entries.find(
@@ -139,7 +139,7 @@ export class ResultPool {
    * @param ref a Ref
    * @returns p-column associated with the ref
    */
-  public getPColumnByRef(ref: Ref): PColumn<TreeNodeAccessor> | undefined {
+  public getPColumnByRef(ref: PlRef): PColumn<TreeNodeAccessor> | undefined {
     const data = this.getDataByRef(ref);
     if (!data) return undefined;
     return ensurePColumn(data);
@@ -149,7 +149,7 @@ export class ResultPool {
    * @param ref a Ref
    * @returns object spec associated with the ref
    */
-  public getSpecByRef(ref: Ref): PObjectSpec | undefined {
+  public getSpecByRef(ref: PlRef): PObjectSpec | undefined {
     // @TODO remove after 1 Jan 2025; forward compatibility
     if (typeof this.ctx.getSpecFromResultPoolByRef === 'undefined')
       return this.getSpecs().entries.find(

package/src/render/util/index.ts

@@ -1 +1,2 @@
-export * from './resource_map'
+export * from './resource_map';
+export * from './label';

package/src/render/util/label.ts

@@ -10,8 +10,12 @@ export type RecordsWithLabel<T> = {
 };
 
 export type LabelDerivationOps = {
+  /** Force inclusion of native column label */
   includeNativeLabel?: boolean;
+  /** Separator to use between label parts (" / " by default) */
   separator?: string;
+  /** If true, label will be added as suffix (at the end of the generated label). By default label added as a prefix. */
+  addLabelAsSuffix?: boolean;
 };
 
 export const TraceEntry = z.object({
@@ -48,7 +52,11 @@ export function deriveLabels<T>(
     const traceStr = spec.annotations?.[PAnnotationTrace];
     const trace = (traceStr ? Trace.safeParse(JSON.parse(traceStr)).data : undefined) ?? [];
 
-    if (label) trace.splice(0, 0, { label, type: LabelType, importance: -2 });
+    if (label) {
+      const labelEntry = { label, type: LabelType, importance: -2 };
+      if (ops.addLabelAsSuffix) trace.push(labelEntry);
+      else trace.splice(0, 0, labelEntry);
+    }
 
     const fullTrace: FullTrace = [];
 
@@ -123,18 +131,14 @@ export function deriveLabels<T>(
   let additinalType = 0;
   while (includedTypes < mainTypes.length) {
     const currentSet = new Set<string>();
+    if (ops.includeNativeLabel) currentSet.add(LabelTypeFull);
     for (let i = 0; i < includedTypes; ++i) currentSet.add(mainTypes[i]);
     currentSet.add(mainTypes[additinalType]);
 
     const candidateResult = calculate(currentSet);
 
     // checking if labels uniquely separate our records
-    if (new Set(candidateResult.map((c) => c.label)).size === values.length) {
-      if (ops.includeNativeLabel) {
-        currentSet.add(LabelTypeFull);
-        return calculate(currentSet);
-      } else return candidateResult;
-    }
+    if (new Set(candidateResult.map((c) => c.label)).size === values.length) return candidateResult;
 
     additinalType++;
     if (additinalType == mainTypes.length) {