@platforma-sdk/model 1.42.10 → 1.42.15

package/dist/render/util/axis_filtering.d.ts

@@ -1,4 +1,4 @@
-import { JsonDataInfoEntries, JsonPartitionedDataInfoEntries, BinaryPartitionedDataInfoEntries, AxisFilterByIdx } from '@milaboratories/pl-model-common';
+import { JsonDataInfoEntries, JsonPartitionedDataInfoEntries, BinaryPartitionedDataInfoEntries, ParquetPartitionedDataInfoEntries, PartitionedDataInfoEntries, AxisFilterByIdx } from '@milaboratories/pl-model-common';
 /**
  * Filters DataInfoEntries using axis filters, removing specified axes from keys and
  * only keeping entries that match the filter values.
@@ -7,8 +7,9 @@ import { JsonDataInfoEntries, JsonPartitionedDataInfoEntries, BinaryPartitionedD
  * @param axisFilters - Array of axis filters (index, value pairs)
  * @throws Error if any filter axis is outside the partitioning axes or data axes for Json data
  */
+export declare function filterDataInfoEntries<Blob>(dataInfoEntries: ParquetPartitionedDataInfoEntries<Blob>, axisFilters: AxisFilterByIdx[]): ParquetPartitionedDataInfoEntries<Blob>;
 export declare function filterDataInfoEntries<Blob>(dataInfoEntries: BinaryPartitionedDataInfoEntries<Blob>, axisFilters: AxisFilterByIdx[]): BinaryPartitionedDataInfoEntries<Blob>;
 export declare function filterDataInfoEntries<Blob>(dataInfoEntries: JsonPartitionedDataInfoEntries<Blob>, axisFilters: AxisFilterByIdx[]): JsonPartitionedDataInfoEntries<Blob>;
-export declare function filterDataInfoEntries<Blob>(dataInfoEntries: BinaryPartitionedDataInfoEntries<Blob> | JsonPartitionedDataInfoEntries<Blob>, axisFilters: AxisFilterByIdx[]): BinaryPartitionedDataInfoEntries<Blob> | JsonPartitionedDataInfoEntries<Blob>;
+export declare function filterDataInfoEntries<Blob>(dataInfoEntries: PartitionedDataInfoEntries<Blob>, axisFilters: AxisFilterByIdx[]): PartitionedDataInfoEntries<Blob>;
 export declare function filterDataInfoEntries(dataInfoEntries: JsonDataInfoEntries, axisFilters: AxisFilterByIdx[]): JsonDataInfoEntries;
 //# sourceMappingURL=axis_filtering.d.ts.map

package/dist/render/util/axis_filtering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"axis_filtering.d.ts","sourceRoot":"","sources":["../../../src/render/util/axis_filtering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAMV,mBAAmB,EACnB,8BAA8B,EAC9B,gCAAgC,EACjC,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EACxC,eAAe,EAAE,gCAAgC,CAAC,IAAI,CAAC,EACvD,WAAW,EAAE,eAAe,EAAE,GAC7B,gCAAgC,CAAC,IAAI,CAAC,CAAC;AAC1C,wBAAgB,qBAAqB,CAAC,IAAI,EACxC,eAAe,EAAE,8BAA8B,CAAC,IAAI,CAAC,EACrD,WAAW,EAAE,eAAe,EAAE,GAC7B,8BAA8B,CAAC,IAAI,CAAC,CAAC;AACxC,wBAAgB,qBAAqB,CAAC,IAAI,EACxC,eAAe,EAAE,gCAAgC,CAAC,IAAI,CAAC,GAAG,8BAA8B,CAAC,IAAI,CAAC,EAC9F,WAAW,EAAE,eAAe,EAAE,GAC7B,gCAAgC,CAAC,IAAI,CAAC,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;AACjF,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,mBAAmB,EACpC,WAAW,EAAE,eAAe,EAAE,GAC7B,mBAAmB,CAAC"}
+{"version":3,"file":"axis_filtering.d.ts","sourceRoot":"","sources":["../../../src/render/util/axis_filtering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAMV,mBAAmB,EACnB,8BAA8B,EAC9B,gCAAgC,EAChC,iCAAiC,EACjC,0BAA0B,EAC3B,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EACxC,eAAe,EAAE,iCAAiC,CAAC,IAAI,CAAC,EACxD,WAAW,EAAE,eAAe,EAAE,GAC7B,iCAAiC,CAAC,IAAI,CAAC,CAAC;AAC3C,wBAAgB,qBAAqB,CAAC,IAAI,EACxC,eAAe,EAAE,gCAAgC,CAAC,IAAI,CAAC,EACvD,WAAW,EAAE,eAAe,EAAE,GAC7B,gCAAgC,CAAC,IAAI,CAAC,CAAC;AAC1C,wBAAgB,qBAAqB,CAAC,IAAI,EACxC,eAAe,EAAE,8BAA8B,CAAC,IAAI,CAAC,EACrD,WAAW,EAAE,eAAe,EAAE,GAC7B,8BAA8B,CAAC,IAAI,CAAC,CAAC;AACxC,wBAAgB,qBAAqB,CAAC,IAAI,EACxC,eAAe,EAAE,0BAA0B,CAAC,IAAI,CAAC,EACjD,WAAW,EAAE,eAAe,EAAE,GAC7B,0BAA0B,CAAC,IAAI,CAAC,CAAC;AACpC,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,mBAAmB,EACpC,WAAW,EAAE,eAAe,EAAE,GAC7B,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.42.10",
+  "version": "1.42.15",
   "description": "Platforma.bio SDK / Block Model",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -22,7 +22,7 @@
     "utility-types": "^3.11.0",
     "canonicalize": "~2.1.0",
     "zod": "~3.23.8",
-    "@milaboratories/pl-model-common": "^1.19.3",
+    "@milaboratories/pl-model-common": "^1.19.4",
     "@milaboratories/pl-error-like": "^1.12.2"
   },
   "devDependencies": {

package/src/components/PlDataTable.ts

@@ -587,6 +587,9 @@ export function allColumnsComputed(
           case 'BinaryPartitioned':
             return Object.values(d.parts)
               .every((p) => p.index.getIsReadyOrError() && p.values.getIsReadyOrError());
+          case 'ParquetPartitioned':
+            return Object.values(d.parts)
+              .every((p) => p.getIsReadyOrError());
         }
       } else {
         // eslint-disable-next-line @typescript-eslint/restrict-template-expressions

package/src/render/util/axis_filtering.ts

@@ -7,6 +7,8 @@ import type {
   JsonDataInfoEntries,
   JsonPartitionedDataInfoEntries,
   BinaryPartitionedDataInfoEntries,
+  ParquetPartitionedDataInfoEntries,
+  PartitionedDataInfoEntries,
 } from '@milaboratories/pl-model-common';
 import type { AxisFilterByIdx } from '@milaboratories/pl-model-common';
 
@@ -18,6 +20,10 @@ import type { AxisFilterByIdx } from '@milaboratories/pl-model-common';
  * @param axisFilters - Array of axis filters (index, value pairs)
  * @throws Error if any filter axis is outside the partitioning axes or data axes for Json data
  */
+export function filterDataInfoEntries<Blob>(
+  dataInfoEntries: ParquetPartitionedDataInfoEntries<Blob>,
+  axisFilters: AxisFilterByIdx[],
+): ParquetPartitionedDataInfoEntries<Blob>;
 export function filterDataInfoEntries<Blob>(
   dataInfoEntries: BinaryPartitionedDataInfoEntries<Blob>,
   axisFilters: AxisFilterByIdx[],
@@ -27,9 +33,9 @@ export function filterDataInfoEntries<Blob>(
   axisFilters: AxisFilterByIdx[],
 ): JsonPartitionedDataInfoEntries<Blob>;
 export function filterDataInfoEntries<Blob>(
-  dataInfoEntries: BinaryPartitionedDataInfoEntries<Blob> | JsonPartitionedDataInfoEntries<Blob>,
+  dataInfoEntries: PartitionedDataInfoEntries<Blob>,
   axisFilters: AxisFilterByIdx[],
-): BinaryPartitionedDataInfoEntries<Blob> | JsonPartitionedDataInfoEntries<Blob>;
+): PartitionedDataInfoEntries<Blob>;
 export function filterDataInfoEntries(
   dataInfoEntries: JsonDataInfoEntries,
   axisFilters: AxisFilterByIdx[],
@@ -42,16 +48,27 @@ export function filterDataInfoEntries<Blob>(
   const sortedFilters = [...axisFilters].sort((a, b) => b[0] - a[0]);
 
   // Check for invalid filter axes
-  if (dataInfoEntries.type === 'JsonPartitioned' || dataInfoEntries.type === 'BinaryPartitioned') {
-    const { partitionKeyLength } = dataInfoEntries;
-    for (const [axisIdx] of axisFilters)
-      if (axisIdx >= partitionKeyLength)
-        throw new Error(`Can't filter on non-partitioned axis ${axisIdx}. Must be >= ${partitionKeyLength}`);
-  } else if (dataInfoEntries.type === 'Json') {
-    const { keyLength } = dataInfoEntries;
-    for (const [axisIdx] of axisFilters)
-      if (axisIdx >= keyLength)
-        throw new Error(`Can't filter on non-data axis ${axisIdx}. Must be >= ${keyLength}`);
+  const { type } = dataInfoEntries;
+  switch (type) {
+    case 'Json': {
+      const { keyLength } = dataInfoEntries;
+      for (const [axisIdx] of axisFilters)
+        if (axisIdx >= keyLength)
+          throw new Error(`Can't filter on non-data axis ${axisIdx}. Must be >= ${keyLength}`);
+      break;
+    }
+    case 'JsonPartitioned':
+    case 'BinaryPartitioned':
+    case 'ParquetPartitioned': {
+      const { partitionKeyLength } = dataInfoEntries;
+      for (const [axisIdx] of axisFilters)
+        if (axisIdx >= partitionKeyLength)
+          throw new Error(`Can't filter on non-partitioned axis ${axisIdx}. Must be >= ${partitionKeyLength}`);
+      break;
+    }
+    default:
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+      throw new Error(`Unsupported data info type: ${type satisfies never}`);
   }
 
   const keyMatchesFilters = (key: PColumnKey): boolean => {
@@ -72,49 +89,45 @@ export function filterDataInfoEntries<Blob>(
   };
 
   switch (dataInfoEntries.type) {
-    case 'Json': {
-      const filteredData: PColumnDataEntry<PColumnValue>[] = dataInfoEntries.data
-        .filter((entry: PColumnDataEntry<PColumnValue>) => keyMatchesFilters(entry.key))
-        .map((entry: PColumnDataEntry<PColumnValue>) => ({
+    case 'Json': return {
+      type: 'Json',
+      keyLength: dataInfoEntries.keyLength - axisFilters.length,
+      data: dataInfoEntries.data
+        .filter((entry) => keyMatchesFilters(entry.key))
+        .map((entry) => ({
           key: removeFilteredAxes(entry.key),
           value: entry.value,
-        }));
-
-      return {
-        type: 'Json',
-        keyLength: dataInfoEntries.keyLength - axisFilters.length,
-        data: filteredData,
-      };
-    }
-
-    case 'JsonPartitioned': {
-      const filteredParts = dataInfoEntries.parts
-        .filter((entry: PColumnDataEntry<Blob>) => keyMatchesFilters(entry.key))
-        .map((entry: PColumnDataEntry<Blob>) => ({
+        } satisfies PColumnDataEntry<PColumnValue>)),
+    };
+    case 'JsonPartitioned': return {
+      type: 'JsonPartitioned',
+      partitionKeyLength: dataInfoEntries.partitionKeyLength - axisFilters.length,
+      parts: dataInfoEntries.parts
+        .filter((entry) => keyMatchesFilters(entry.key))
+        .map((entry) => ({
           key: removeFilteredAxes(entry.key),
           value: entry.value,
-        }));
-
-      return {
-        type: 'JsonPartitioned',
-        partitionKeyLength: dataInfoEntries.partitionKeyLength - axisFilters.length,
-        parts: filteredParts,
-      };
-    }
-
-    case 'BinaryPartitioned': {
-      const filteredParts = dataInfoEntries.parts
-        .filter((entry: PColumnDataEntry<BinaryChunk<Blob>>) => keyMatchesFilters(entry.key))
-        .map((entry: PColumnDataEntry<BinaryChunk<Blob>>) => ({
+        } satisfies PColumnDataEntry<Blob>)),
+    };
+    case 'BinaryPartitioned': return {
+      type: 'BinaryPartitioned',
+      partitionKeyLength: dataInfoEntries.partitionKeyLength - axisFilters.length,
+      parts: dataInfoEntries.parts
+        .filter((entry) => keyMatchesFilters(entry.key))
+        .map((entry) => ({
           key: removeFilteredAxes(entry.key),
           value: entry.value,
-        }));
-
-      return {
-        type: 'BinaryPartitioned',
-        partitionKeyLength: dataInfoEntries.partitionKeyLength - axisFilters.length,
-        parts: filteredParts,
-      };
-    }
+        } satisfies PColumnDataEntry<BinaryChunk<Blob>>)),
+    };
+    case 'ParquetPartitioned': return {
+      type: 'ParquetPartitioned',
+      partitionKeyLength: dataInfoEntries.partitionKeyLength - axisFilters.length,
+      parts: dataInfoEntries.parts
+        .filter((entry) => keyMatchesFilters(entry.key))
+        .map((entry) => ({
+          key: removeFilteredAxes(entry.key),
+          value: entry.value,
+        } satisfies PColumnDataEntry<Blob>)),
+    };
   }
 }