@platforma-sdk/model 1.39.8 → 1.40.0

package/dist/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.39.8",
+  "version": "1.40.0",
   "description": "Platforma.bio SDK / Block Model",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -21,7 +21,7 @@
     "utility-types": "^3.11.0",
     "canonicalize": "~2.1.0",
     "zod": "~3.23.8",
-    "@milaboratories/pl-model-common": "^1.16.3",
+    "@milaboratories/pl-model-common": "^1.16.4",
     "@milaboratories/pl-error-like": "^1.12.2"
   },
   "devDependencies": {
@@ -32,8 +32,8 @@
     "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.6",
     "@platforma-sdk/eslint-config": "1.0.3",
-    "@milaboratories/build-configs": "1.0.4",
-    "@milaboratories/helpers": "^1.6.17"
+    "@milaboratories/helpers": "^1.6.17",
+    "@milaboratories/build-configs": "1.0.4"
   },
   "scripts": {
     "type-check": "node ./scripts/save-package-version.cjs && tsc --noEmit --composite false",

package/src/components/PFrameForGraphs.ts

@@ -9,7 +9,9 @@ import type {
 import {
   canonicalizeJson,
   getAxisId,
+  isDataInfo,
   matchAxisId, parseJson,
+  visitDataInfo,
 } from '@milaboratories/pl-model-common';
 import type { PColumnDataUniversal, RenderCtx } from '../render';
 import { PColumnCollection, TreeNodeAccessor } from '../render';
@@ -203,6 +205,22 @@ function getAdditionalColumnsForColumn(
   return [column, ...additionalColumns];
 }
 
+export function isColumnReady(c: PColumn<PColumnDataUniversal>) {
+  let ready = true;
+  if (c.data instanceof TreeNodeAccessor) {
+    ready = ready && c.data.getIsReadyOrError();
+  } else if (isDataInfo(c.data)) {
+    visitDataInfo(c.data, (v) => {
+      ready = ready && v.getIsReadyOrError();
+    });
+  }
+  return ready;
+}
+
+export function allColumnsReady(columns: PColumn<PColumnDataUniversal>[]): boolean {
+  return columns.every(isColumnReady);
+}
+
 /**
  The aim of createPFrameForGraphs: to create pframe with block’s columns and all compatible columns from result pool
  (including linker columns and all label columns).
@@ -217,10 +235,37 @@ function getAdditionalColumnsForColumn(
  */
 export function createPFrameForGraphs<A, U>(
   ctx: RenderCtx<A, U>,
-  blockColumns: PColumn<PColumnDataUniversal>[] | undefined,
+  blockColumns?: PColumn<PColumnDataUniversal>[],
 ): PFrameHandle | undefined {
-  if (!blockColumns) return undefined;
+  // if current block doesn't produce own columns then use all columns from result pool
+  if (!blockColumns) {
+    const columns = new PColumnCollection();
+    columns.addColumnProvider(ctx.resultPool);
+
+    const allColumns = columns.getColumns(() => true, { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? [];
+    // if at least one column is not yet ready, we can't show the graph
+    if (!allColumnsReady(allColumns)) {
+      return undefined;
+    }
+
+    const allAxes = new Map(allColumns
+      .flatMap((column) => column.spec.axesSpec)
+      .map((axisSpec) => {
+        const axisId = getAxisId(axisSpec);
+        return [canonicalizeJson(axisId), axisId];
+      }));
+
+    // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match
+    const extendedColumns = enrichCompatible(allAxes, allColumns);
+
+    return ctx.createPFrame(extendedColumns);
+  };
 
+  if (!allColumnsReady(blockColumns)) {
+    return undefined;
+  }
+
+  // if current block has its own columns then take from result pool only compatible with them
   const columns = new PColumnCollection();
   columns.addColumnProvider(ctx.resultPool);
   columns.addColumns(blockColumns);
@@ -258,6 +303,11 @@ export function createPFrameForGraphs<A, U>(
     return false;
   }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => !isLabelColumn(column.spec));
 
+  // if at least one column is not yet ready, we can't show the graph
+  if (!allColumnsReady(compatibleWithoutLabels)) {
+    return undefined;
+  }
+
   // extend axes set for label columns request
   for (const c of compatibleWithoutLabels) {
     for (const id of c.spec.axesSpec) {
@@ -277,18 +327,15 @@ export function createPFrameForGraphs<A, U>(
     return false;
   }), { dontWaitAllData: true, overrideLabelAnnotation: false }) ?? []).filter((column) => isLabelColumn(column.spec));
 
+  // if at least one column is not yet ready, we can't show the graph
+  if (!allColumnsReady(compatibleLabels)) {
+    return undefined;
+  }
+
   const compatible = [...compatibleWithoutLabels, ...compatibleLabels];
 
   // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match
   const extendedColumns = enrichCompatible(blockAxes, compatible);
 
-  // if at least one column is not yet ready, we can't show the table
-  if (
-    extendedColumns.some(
-      (a) => a.data instanceof TreeNodeAccessor && !a.data.getIsReadyOrError(),
-    )
-  )
-    return undefined;
-
   return ctx.createPFrame(extendedColumns);
 }

package/src/components/PlMultiSequenceAlignment.ts

@@ -12,11 +12,27 @@ import { type PlSelectionModel } from './PlSelectionModel';
 
 export type PColumnPredicate = (column: PColumnIdAndSpec) => boolean;
 
-export type PlMultiSequenceAlignmentModel = {
-  version?: number;
+export interface PlMultiSequenceAlignmentSettings {
   sequenceColumnIds?: PObjectId[];
   labelColumnIds?: PTableColumnId[];
-};
+  colorScheme: PlMultiSequenceAlignmentColorSchemeOption;
+  widgets: ('consensus' | 'seqLogo' | 'legend')[];
+  alignmentParams: {
+    gpo: number;
+    gpe: number;
+    tgpe: number;
+  };
+}
+
+export interface PlMultiSequenceAlignmentModel
+  extends Partial<PlMultiSequenceAlignmentSettings> {
+  version?: number;
+}
+
+export type PlMultiSequenceAlignmentColorSchemeOption =
+  | { type: 'no-color' }
+  | { type: 'chemical-properties' }
+  | { type: 'markup'; columnId: PObjectId };
 
 export function createRowSelectionColumn({
   selection,