@platforma-sdk/model 1.29.12 → 1.29.13

package/dist/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.29.12",
+  "version": "1.29.13",
   "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.0",
-    "@milaboratories/pl-model-common": "^1.13.6"
+    "@milaboratories/pl-model-common": "^1.13.7",
+    "@milaboratories/pl-error-like": "^1.12.0"
   },
   "devDependencies": {
     "typescript": "~5.5.4",
@@ -31,8 +31,8 @@
     "jest": "^29.7.0",
     "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.6",
-    "@platforma-sdk/eslint-config": "1.0.3",
-    "@milaboratories/platforma-build-configs": "1.0.3"
+    "@milaboratories/platforma-build-configs": "1.0.3",
+    "@platforma-sdk/eslint-config": "1.0.3"
   },
   "scripts": {
     "type-check": "node ./scripts/save-package-version.cjs && tsc --noEmit --composite false",

package/src/components/PFrameForGraphs.test.ts

@@ -187,6 +187,43 @@ describe('PFrameForGraph', () => {
         expect(enrichedColumns.map((c) => c.id)).toEqual(['id1', 'id2', 'id3'])
     })
 
+    test('enrichColumnsWithCompatibleMetadata doesn\'t add column with identical spec', () => {
+        const columnSpec1: PColumnSpec = {
+            kind: 'PColumn',
+            name: 'column1',
+            valueType: 'Int',
+            axesSpec: [
+                {type: 'String', name: 'axis1', domain: {key1: 'a'}},
+                {type: 'String', name: 'axis2', domain: {key1: 'b'}},
+            ]
+        };
+        const metaColumnSpec1: PColumnSpec = {
+            kind: 'PColumn',
+            name: 'metadata1',
+            valueType: 'Int',
+            axesSpec: [{type: 'String', name: 'axis1'}]
+        };
+        const metaColumnSpec2: PColumnSpec = {
+            kind: 'PColumn',
+            name: 'metadata2',
+            valueType: 'String',
+            axesSpec: [{type: 'String', name: 'axis1', domain: {key1: 'a'}}]
+        };
+
+        const columns: PColumn<TreeNodeAccessor | PColumnValues>[] = [
+            {id: 'id1' as PObjectId, spec: columnSpec1, data: []},
+        ] as PColumn<PColumnValues>[];
+        const upstream: PColumn<TreeNodeAccessor | PColumnValues>[] = [
+            {id: 'id2' as PObjectId, spec: columnSpec1, data: []},
+            {id: 'id3' as PObjectId, spec: metaColumnSpec1, data: []},
+            {id: 'id4' as PObjectId, spec: metaColumnSpec2, data: []},
+        ] as PColumn<PColumnValues>[];
+
+        const enrichedColumns = enrichColumnsWithCompatible(columns, upstream);
+        expect(enrichedColumns.map((c) => c.id)).toEqual(['id1', 'id3', 'id4'])
+    })
+
+
     test('Labels of added columns include added domains, but not include common domains', () => {
         const columnSpec1: PColumnSpec = {
             kind: 'PColumn',

package/src/components/PFrameForGraphs.ts

@@ -1,12 +1,16 @@
 import type {
   AxisId,
+  CanonicalizedJson,
   PColumn,
+  PColumnSpecId,
   PColumnValues,
   PFrameHandle,
   PObjectId,
   ValueType } from '@milaboratories/pl-model-common';
 import {
+  canonicalizeJson,
   getAxisId,
+  getPColumnSpecId,
   isPColumn,
   matchAxisId,
 } from '@milaboratories/pl-model-common';
@@ -172,19 +176,29 @@ export function enrichColumnsWithCompatible(
   mainColumns: PColumn<TreeNodeAccessor | PColumnValues>[],
   secondaryColumns: PColumn<TreeNodeAccessor | PColumnValues>[],
 ): PColumn<TreeNodeAccessor | PColumnValues>[] {
-  const result = [...mainColumns];
+  const mainColumnsIds = new Set<PObjectId>();
+  const mainColumnsBySpec = new Map<CanonicalizedJson<PColumnSpecId>, typeof mainColumns[number]>();
+  mainColumns.forEach((column) => {
+    mainColumnsIds.add(column.id);
+    mainColumnsBySpec.set(canonicalizeJson(getPColumnSpecId(column.spec)), column);
+  });
+
+  const secondaryColumnsBySpec = new Map<CanonicalizedJson<PColumnSpecId>, typeof secondaryColumns[number]>();
   for (const secondaryColumn of secondaryColumns) {
-    for (const mainColumn of mainColumns) {
-      if (mainColumn.id === secondaryColumn.id) {
-        break;
-      }
+    if (mainColumnsIds.has(secondaryColumn.id)) continue;
+
+    const spec = canonicalizeJson(getPColumnSpecId(secondaryColumn.spec));
+    if (mainColumnsBySpec.has(spec)) continue;
+
+    for (const mainColumn of mainColumnsBySpec.values()) {
       if (checkCompatibility(mainColumn, secondaryColumn)) {
-        result.push(secondaryColumn);
+        secondaryColumnsBySpec.set(spec, secondaryColumn);
         break;
       }
     }
   }
-  return result;
+
+  return [...mainColumnsBySpec.values(), ...secondaryColumnsBySpec.values()];
 }
 
 const VALUE_TYPES: ValueType[] = [

package/src/components/PlDataTable.ts

@@ -1,5 +1,6 @@
 import type {
   AxisSpec,
+  CanonicalizedJson,
   DataInfo,
   JoinEntry,
   PColumn,
@@ -15,19 +16,25 @@ import type {
   PTableRecordSingleValueFilterV2,
   PTableSorting,
 } from '@milaboratories/pl-model-common';
-import { getAxisId, getColumnIdAndSpec, matchAxisId } from '@milaboratories/pl-model-common';
+import { canonicalizeJson, getAxisId, getColumnIdAndSpec, matchAxisId } from '@milaboratories/pl-model-common';
 import type { AxisLabelProvider, ColumnProvider, RenderCtx } from '../render';
 import { PColumnCollection, TreeNodeAccessor } from '../render';
-import canonicalize from 'canonicalize';
 
 /** Canonicalized PTableColumnSpec JSON string */
-export type PTableColumnSpecJson = string & {
-  __json_canonicalized: PTableColumnSpec;
-};
+export type PTableColumnSpecJson = CanonicalizedJson<PTableColumnSpec>;
 
 /** Encode `PTableColumnId` as canonicalized JSON string */
 export function strinfigyPTableColumnId(spec: PTableColumnSpec): PTableColumnSpecJson {
-  return canonicalize(spec)! as PTableColumnSpecJson;
+  const type = spec.type;
+  switch (type) {
+    case 'axis':
+      return canonicalizeJson(spec);
+    case 'column':
+      return canonicalizeJson(spec);
+    default:
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+      throw Error(`unsupported column type: ${type satisfies never}`);
+  }
 }
 
 /** Parse `PTableColumnId` from JSON string */