@platforma-sdk/model 1.33.17 → 1.34.8

package/dist/version.d.ts

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

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.33.17",
+  "version": "1.34.8",
   "description": "Platforma.bio SDK / Block Model",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -21,8 +21,8 @@
     "utility-types": "^3.11.0",
     "canonicalize": "~2.1.0",
     "zod": "~3.23.8",
-    "@milaboratories/pl-error-like": "^1.12.1",
-    "@milaboratories/pl-model-common": "^1.15.5"
+    "@milaboratories/pl-model-common": "^1.15.5",
+    "@milaboratories/pl-error-like": "^1.12.1"
   },
   "devDependencies": {
     "typescript": "~5.5.4",

package/src/components/PFrameForGraphs.ts

@@ -203,6 +203,18 @@ function getAdditionalColumnsForColumn(
   return [column, ...additionalColumns];
 }
 
+/**
+ 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).
+ Block’s columns are added to pframe as is.
+ Other columns are added basing on set of axes of block’s columns, considering available with linker columns.
+ Compatible columns must have at least one axis from block’s axes set. This axis of the compatible column from
+ result pool must satisfy matchAxisId (it can have less domain keys than in block’s axis, but without conflicting values
+ among existing ones).
+ In requests to pframe (calculateTableData) columns must have strictly the same axes. For compatibility in case
+ of partially matched axis we add to pframe a copy of this column with modified axis (with filled missed domains)
+ and modified label (with added domain values in case if more than one copy with different domains exist).
+ */
 export function createPFrameForGraphs<A, U>(
   ctx: RenderCtx<A, U>,
   blockColumns: PColumn<PColumnDataUniversal>[] | undefined,

package/src/components/PlMultiSequenceAlignment.ts

@@ -1,71 +1,56 @@
-import type {
-  CanonicalizedJson,
-  PColumn,
-  PColumnIdAndSpec,
-  PColumnKey,
-  PColumnValues,
-  PColumnValuesEntry,
-  PObjectId,
-  PTableColumnId,
-} from '@milaboratories/pl-model-common';
 import {
-  canonicalizeJson,
   isPTableAbsent,
+  type PColumn,
+  type PColumnIdAndSpec,
+  type PColumnKey,
+  type PColumnValues,
+  type PObjectId,
+  type PTableColumnId,
+  uniquePlId,
 } from '@milaboratories/pl-model-common';
-import type { PlSelectionModel } from './PlSelectionModel';
-
-/** Canonicalized PTableColumnId JSON string */
-export type PTableColumnIdJson = CanonicalizedJson<PTableColumnId>;
-
-/** Encode `PTableColumnId` as canonicalized JSON string */
-export function stringifyPTableColumnId(
-  id: PTableColumnId,
-): PTableColumnIdJson {
-  const type = id.type;
-  switch (type) {
-    case 'axis':
-      return canonicalizeJson(id);
-    case 'column':
-      return canonicalizeJson(id);
-    default:
-      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-      throw Error(`unsupported column type: ${type satisfies never}`);
-  }
-}
+import { type PlSelectionModel } from './PlSelectionModel';
 
 export type PColumnPredicate = (column: PColumnIdAndSpec) => boolean;
 
 export type PlMultiSequenceAlignmentModel = {
+  version?: number;
   sequenceColumnIds?: PObjectId[];
-  labelColumnIds?: PTableColumnIdJson[];
+  labelColumnIds?: PTableColumnId[];
 };
 
-export function createRowSelectionColumn(
-  columnId: PObjectId,
-  rowSelectionModel: PlSelectionModel | undefined,
-  label?: string,
-  domain?: Record<string, string>,
-): PColumn<PColumnValues> | undefined {
-  if (!rowSelectionModel || rowSelectionModel.axesSpec.length === 0) {
-    return undefined;
+export function createRowSelectionColumn({
+  selection,
+  columnId = uniquePlId() as string as PObjectId,
+  label = 'Selection marker',
+  domain,
+}: {
+  selection: PlSelectionModel | undefined;
+  columnId?: PObjectId;
+  label?: string;
+  domain?: Record<string, string>;
+}): PColumn<PColumnValues> | undefined {
+  if (!selection?.axesSpec.length) {
+    return;
+  }
+  const data: PColumnValues = selection.selectedKeys
+    .filter((r): r is PColumnKey => r.every((v) => !isPTableAbsent(v)))
+    .map((r) => ({ key: r, val: 1 }));
+  if (!data.length) {
+    return;
   }
-
   return {
     id: columnId,
     spec: {
       kind: 'PColumn',
       valueType: 'Int',
       name: 'pl7.app/table/row-selection',
-      axesSpec: rowSelectionModel.axesSpec,
-      ...(domain && { domain }),
+      axesSpec: selection.axesSpec,
+      ...(domain && Object.keys(domain).length && { domain }),
       annotations: {
-        'pl7.app/label': label ?? 'Selected rows',
+        'pl7.app/label': label,
         'pl7.app/discreteValues': '[1]',
       },
     },
-    data: rowSelectionModel
-      .selectedKeys
-      .filter((r): r is PColumnKey => !r.some((v) => isPTableAbsent(v)))
-      .map((r) => ({ key: r, val: 1 } satisfies PColumnValuesEntry)),
-  } satisfies PColumn<PColumnValues>;
+    data,
+  };
 }