@platforma-sdk/model 1.30.3 → 1.30.21

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const PlatformaSDKVersion = "1.30.3";
+export declare const PlatformaSDKVersion = "1.30.21";
 //# 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,WAAW,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.30.3",
+  "version": "1.30.21",
   "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.14.0",
+    "@milaboratories/pl-model-common": "^1.14.1",
     "@milaboratories/pl-error-like": "^1.12.1"
   },
   "devDependencies": {
@@ -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.ts

@@ -1,12 +1,14 @@
 import type {
   AxisId,
   CanonicalizedJson,
+  DataInfo,
   PColumn,
+  PColumnSpec,
   PColumnSpecId,
   PColumnValues,
   PFrameHandle,
   PObjectId,
-  ValueType } from '@milaboratories/pl-model-common';
+} from '@milaboratories/pl-model-common';
 import {
   canonicalizeJson,
   getAxisId,
@@ -49,21 +51,21 @@ function getKeysCombinations(idsLists: AxisId[][]) {
 
 /** Check if axes of secondary column are exactly in axes of main column */
 function checkFullCompatibility(
-  mainColumn: PColumn<TreeNodeAccessor | PColumnValues>,
-  secondaryColumn: PColumn<TreeNodeAccessor | PColumnValues>,
+  mainColumn: PColumnSpec,
+  secondaryColumn: PColumnSpec,
 ): boolean {
-  const mainAxesIds = mainColumn.spec.axesSpec.map(getAxisId);
-  const secondaryAxesIds = secondaryColumn.spec.axesSpec.map(getAxisId);
+  const mainAxesIds = mainColumn.axesSpec.map(getAxisId);
+  const secondaryAxesIds = secondaryColumn.axesSpec.map(getAxisId);
   return secondaryAxesIds.every((id) => mainAxesIds.some((mainId) => matchAxisId(mainId, id) && matchAxisId(id, mainId)));
 }
 
 /** Check if axes of secondary column are in axes of main column, but they can have compatible difference in domains */
 function checkCompatibility(
-  mainColumn: PColumn<TreeNodeAccessor | PColumnValues>,
-  secondaryColumn: PColumn<TreeNodeAccessor | PColumnValues>,
+  mainColumn: PColumnSpec,
+  secondaryColumn: PColumnSpec,
 ): boolean {
-  const mainAxesIds = mainColumn.spec.axesSpec.map(getAxisId);
-  const secondaryAxesIds = secondaryColumn.spec.axesSpec.map(getAxisId);
+  const mainAxesIds = mainColumn.axesSpec.map(getAxisId);
+  const secondaryAxesIds = secondaryColumn.axesSpec.map(getAxisId);
   return secondaryAxesIds.every((id) => mainAxesIds.some((mainId) => matchAxisId(mainId, id)));
 }
 
@@ -73,17 +75,17 @@ export const LABEL_ANNOTATION = 'pl7.app/label';
 /** Main column can have additional domains, if secondary column (meta-column) has all axes match main column axes
  we can add its copy with missed domain fields for compatibility */
 function getAdditionalColumnsForPair(
-  mainColumn: PColumn<TreeNodeAccessor | PColumnValues>,
-  secondaryColumn: PColumn<TreeNodeAccessor | PColumnValues>,
-): PColumn<TreeNodeAccessor | PColumnValues>[] {
+  mainColumn: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>,
+  secondaryColumn: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>,
+): PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[] {
   const mainAxesIds = mainColumn.spec.axesSpec.map(getAxisId);
   const secondaryAxesIds = secondaryColumn.spec.axesSpec.map(getAxisId);
 
-  const isFullCompatible = checkFullCompatibility(mainColumn, secondaryColumn);
+  const isFullCompatible = checkFullCompatibility(mainColumn.spec, secondaryColumn.spec);
   if (isFullCompatible) { // in this case it isn't necessary to add more columns
     return [];
   }
-  const isCompatible = checkCompatibility(mainColumn, secondaryColumn);
+  const isCompatible = checkCompatibility(mainColumn.spec, secondaryColumn.spec);
   if (!isCompatible) { // in this case it is impossible to add some compatible column
     return [];
   }
@@ -155,8 +157,10 @@ function getAdditionalColumnsForPair(
   });
 }
 
-export function getAdditionalColumns(columns: PColumn<TreeNodeAccessor | PColumnValues>[]): PColumn<TreeNodeAccessor | PColumnValues>[] {
-  const additionalColumns: PColumn<TreeNodeAccessor | PColumnValues>[] = [];
+export function getAdditionalColumns(
+  columns: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[],
+): PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[] {
+  const additionalColumns: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[] = [];
   for (let i = 0; i < columns.length; i++) {
     for (let j = i + 1; j < columns.length; j++) {
       const column1 = columns[i];
@@ -173,9 +177,9 @@ export function getAdditionalColumns(columns: PColumn<TreeNodeAccessor | PColumn
 }
 
 export function enrichColumnsWithCompatible(
-  mainColumns: PColumn<TreeNodeAccessor | PColumnValues>[],
-  secondaryColumns: PColumn<TreeNodeAccessor | PColumnValues>[],
-): PColumn<TreeNodeAccessor | PColumnValues>[] {
+  mainColumns: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[],
+  secondaryColumns: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[],
+): PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[] {
   const mainColumnsIds = new Set<PObjectId>();
   const mainColumnsBySpec = new Map<CanonicalizedJson<PColumnSpecId>, typeof mainColumns[number]>();
   mainColumns.forEach((column) => {
@@ -191,7 +195,7 @@ export function enrichColumnsWithCompatible(
     if (mainColumnsBySpec.has(spec)) continue;
 
     for (const mainColumn of mainColumnsBySpec.values()) {
-      if (checkCompatibility(mainColumn, secondaryColumn)) {
+      if (checkCompatibility(mainColumn.spec, secondaryColumn.spec)) {
         secondaryColumnsBySpec.set(spec, secondaryColumn);
         break;
       }
@@ -201,26 +205,16 @@ export function enrichColumnsWithCompatible(
   return [...mainColumnsBySpec.values(), ...secondaryColumnsBySpec.values()];
 }
 
-const VALUE_TYPES: ValueType[] = [
-  'Int',
-  'Long',
-  'Float',
-  'Double',
-  'String',
-  'Bytes',
-];
-
 export function createPFrameForGraphs<A, U>(
   ctx: RenderCtx<A, U>,
-  blockColumns?: PColumn<TreeNodeAccessor | PColumnValues>[],
+  blockColumns: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor> | PColumnValues>[] | undefined,
 ): PFrameHandle | undefined {
-  if (blockColumns === undefined) return undefined;
+  if (!blockColumns) return undefined;
 
   const upstreamColumns = ctx.resultPool
     .getData()
     .entries.map((v) => v.obj)
-    .filter(isPColumn)
-    .filter((column) => VALUE_TYPES.includes(column.spec.valueType));
+    .filter(isPColumn);
 
   const columnsWithCompatibleFromUpstream = enrichColumnsWithCompatible(blockColumns, upstreamColumns);
 

package/src/components/PlDataTable.ts

@@ -1,4 +1,5 @@
 import type {
+  AxisId,
   AxisSpec,
   CanonicalizedJson,
   DataInfo,
@@ -365,7 +366,39 @@ export function getMatchingLabelColumns(
   columns: PColumnIdAndSpec[],
   allLabelColumns: PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor>>[],
 ): PColumn<TreeNodeAccessor | DataInfo<TreeNodeAccessor>>[] {
-  const colId = (id: PObjectId, domain?: Record<string, string>) => {
+  // split input columns into label and value columns
+  const inputLabelColumns: typeof columns = [];
+  const inputValueColumns: typeof columns = [];
+  for (const column of columns) {
+    if (isLabelColumn(column.spec)) {
+      inputLabelColumns.push(column);
+    } else {
+      inputValueColumns.push(column);
+    }
+  }
+
+  // collect distinct axes of value columns
+  const unlabeledAxes: AxisId[] = [];
+  for (const column of inputValueColumns) {
+    for (const axis of column.spec.axesSpec) {
+      const axisId = getAxisId(axis);
+      if (!unlabeledAxes.some((id) => matchAxisId(id, axisId))) {
+        unlabeledAxes.push(axisId);
+      }
+    }
+  }
+
+  // remove axes matched by input label columns
+  for (const labelColumn of inputLabelColumns) {
+    const labelAxisId = getAxisId(labelColumn.spec.axesSpec[0]);
+    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));
+    if (labelMatch !== -1) {
+      unlabeledAxes.splice(labelMatch, 1);
+    }
+  }
+
+  // warning: changing this id will break backward compatibility
+  const colId = (id: PObjectId, domain?: Record<string, string>): PObjectId => {
     let wid = id.toString();
     if (domain) {
       for (const k in domain) {
@@ -373,39 +406,35 @@ export function getMatchingLabelColumns(
         wid += domain[k];
       }
     }
-    return wid;
+    return wid as PObjectId;
   };
 
-  const labelColumns = new Map<string, typeof allLabelColumns[number]>();
-  for (const col of columns) {
-    for (const axis of col.spec.axesSpec) {
-      const axisId = getAxisId(axis);
-      for (const labelColumn of allLabelColumns) {
-        const labelAxis = labelColumn.spec.axesSpec[0];
-        const labelAxisId = getAxisId(labelColumn.spec.axesSpec[0]);
-        if (matchAxisId(axisId, labelAxisId)) {
-          const dataDomainLen = Object.keys(axisId.domain ?? {}).length;
-          const labelDomainLen = Object.keys(labelAxisId.domain ?? {}).length;
-          if (dataDomainLen > labelDomainLen) {
-            const id = colId(labelColumn.id, axisId.domain);
-
-            labelColumns.set(id, {
-              id: id as PObjectId,
-              spec: {
-                ...labelColumn.spec,
-                axesSpec: [{ ...axisId, annotations: labelAxis.annotations }],
-              },
-              data: labelColumn.data,
-            });
-          } else {
-            labelColumns.set(colId(labelColumn.id), labelColumn);
-          }
-        }
+  // search label columns for unmatched axes
+  const labelColumns: typeof allLabelColumns = [];
+  for (const labelColumn of allLabelColumns) {
+    const labelAxis = labelColumn.spec.axesSpec[0];
+    const labelAxisId = getAxisId(labelAxis);
+    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));
+    if (labelMatch !== -1) {
+      const axisId = unlabeledAxes[labelMatch];
+      const dataDomainLen = Object.keys(axisId.domain ?? {}).length;
+      const labelDomainLen = Object.keys(labelAxis.domain ?? {}).length;
+      if (dataDomainLen > labelDomainLen) {
+        labelColumns.push({
+          id: colId(labelColumn.id, axisId.domain),
+          spec: {
+            ...labelColumn.spec,
+            axesSpec: [{ ...axisId, annotations: labelAxis.annotations }],
+          },
+          data: labelColumn.data,
+        });
+      } else {
+        labelColumns.push(labelColumn);
       }
+      unlabeledAxes.splice(labelMatch, 1);
     }
   }
-
-  return [...labelColumns.values()];
+  return labelColumns;
 }
 
 /** Check if all columns are computed */

package/src/render/util/label.ts

@@ -25,7 +25,7 @@ export const TraceEntry = z.object({
   label: z.string(),
 });
 export type TraceEntry = z.infer<typeof TraceEntry>;
-type FullTraceEntry = TraceEntry & { fullType: string; occurenceIndex: number };
+type FullTraceEntry = TraceEntry & { fullType: string; occurrenceIndex: number };
 
 export const Trace = z.array(TraceEntry);
 export type Trace = z.infer<typeof Trace>;
@@ -50,7 +50,7 @@ export function deriveLabels<T>(
 ): RecordsWithLabel<T>[] {
   const importances = new Map<string, number>();
 
-  // number of times certain type occured among all of the
+  // number of times certain type occurred among all of the
   const numberOfRecordsWithType = new Map<string, number>();
 
   const enrichedRecords = values.map((value) => {
@@ -88,13 +88,13 @@ export function deriveLabels<T>(
 
     const fullTrace: FullTrace = [];
 
-    const occurences = new Map<string, number>();
+    const occurrences = new Map<string, number>();
     for (let i = trace.length - 1; i >= 0; --i) {
       const { type: typeName } = trace[i];
       const importance = trace[i].importance ?? 0;
-      const occurenceIndex = (occurences.get(typeName) ?? 0) + 1;
-      occurences.set(typeName, occurenceIndex);
-      const fullType = `${typeName}@${occurenceIndex}`;
+      const occurrenceIndex = (occurrences.get(typeName) ?? 0) + 1;
+      occurrences.set(typeName, occurrenceIndex);
+      const fullType = `${typeName}@${occurrenceIndex}`;
       numberOfRecordsWithType.set(fullType, (numberOfRecordsWithType.get(fullType) ?? 0) + 1);
       importances.set(
         fullType,
@@ -103,7 +103,7 @@ export function deriveLabels<T>(
           importance - (trace.length - i) * DistancePenalty,
         ),
       );
-      fullTrace.push({ ...trace[i], fullType, occurenceIndex });
+      fullTrace.push({ ...trace[i], fullType, occurrenceIndex: occurrenceIndex });
     }
     fullTrace.reverse();
     return {
@@ -160,27 +160,27 @@ export function deriveLabels<T>(
   // *  *
   // T0 T1 T2 T3 T4 T5
   //          *
-  // additinalType = 3
+  // additionalType = 3
   //
   // Resulting set: T0, T1, T3
   //
   let includedTypes = 0;
-  let additinalType = 0;
+  let additionalType = 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]);
+    currentSet.add(mainTypes[additionalType]);
 
     const candidateResult = calculate(currentSet);
 
     // checking if labels uniquely separate our records
     if (candidateResult !== undefined && new Set(candidateResult.map((c) => c.label)).size === values.length) return candidateResult;
 
-    additinalType++;
-    if (additinalType >= mainTypes.length) {
+    additionalType++;
+    if (additionalType >= mainTypes.length) {
       includedTypes++;
-      additinalType = includedTypes;
+      additionalType = includedTypes;
     }
   }