@platforma-sdk/model 1.34.0 → 1.34.10

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const PlatformaSDKVersion = "1.34.0";
+export declare const PlatformaSDKVersion = "1.34.10";
 //# 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.34.0",
+  "version": "1.34.10",
   "description": "Platforma.bio SDK / Block Model",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -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

@@ -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,
@@ -236,11 +248,15 @@ export function createPFrameForGraphs<A, U>(
   }
 
   // all compatible with block columns but without label columns
-  const compatibleWithoutLabels = (columns.getColumns([...blockAxes.values()]
-    .map((ax) => ({
-      axes: [ax],
-      partialAxesMatch: true,
-    })), {dontWaitAllData: true, overrideLabelAnnotation: false}) ?? []).filter((column) => !isLabelColumn(column.spec));
+  const compatibleWithoutLabels = (columns.getColumns((spec) => spec.axesSpec.some(axisSpec => {
+    const axisId = getAxisId(axisSpec);
+    for (const selectorAxisId of blockAxes.values()) {
+      if (matchAxisId(selectorAxisId, axisId)) {
+        return true;
+      }
+    }
+    return false;
+  }), {dontWaitAllData: true, overrideLabelAnnotation: false}) ?? []).filter((column) => !isLabelColumn(column.spec));
 
   // extend axes set for label columns request
   for (const c of compatibleWithoutLabels) {
@@ -251,11 +267,15 @@ export function createPFrameForGraphs<A, U>(
   }
 
   // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool
-  const compatibleLabels = (columns.getColumns([...allAxes.values()]
-    .map((ax) => ({
-      axes: [ax],
-      partialAxesMatch: true,
-    })), {dontWaitAllData: true, overrideLabelAnnotation: false}) ?? []).filter((column) => isLabelColumn(column.spec));
+  const compatibleLabels = (columns.getColumns((spec) => spec.axesSpec.some(axisSpec => {
+    const axisId = getAxisId(axisSpec);
+    for (const selectorAxisId of allAxes.values()) {
+      if (matchAxisId(selectorAxisId, axisId)) {
+        return true;
+      }
+    }
+    return false;
+  }), {dontWaitAllData: true, overrideLabelAnnotation: false}) ?? []).filter((column) => isLabelColumn(column.spec));
 
   const compatible = [...compatibleWithoutLabels, ...compatibleLabels];