@milaboratories/milaboratories.monetization-test.model 1.0.24 → 1.0.26

package/.turbo/turbo-build.log

@@ -1,16 +1,16 @@
  WARN  Issue while reading "/home/runner/_work/platforma/platforma/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @milaboratories/milaboratories.monetization-test.model@1.0.24 build /home/runner/_work/platforma/platforma/etc/blocks/monetization-test/model
+> @milaboratories/milaboratories.monetization-test.model@1.0.26 build /home/runner/_work/platforma/platforma/etc/blocks/monetization-test/model
 > ts-builder build --target block-model && block-tools build-model
 
 Building block-model project...
 ↳ rollup -c /configs/rollup.block-model.config.js
 
 ./src/index.ts → dist, dist...
-created dist, dist in 4.7s
+created dist, dist in 3.9s
 
 ./src/index.ts → dist...
 (!) Circular dependency
 ../../../../sdk/model/dist/components/PFrameForGraphs.js -> ../../../../sdk/model/dist/components/PlDataTable.js -> ../../../../sdk/model/dist/components/PFrameForGraphs.js
-created dist in 4.2s
+created dist in 5.2s
 Build completed successfully

package/.turbo/turbo-type-check.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/_work/platforma/platforma/.npmrc". Failed to replace env in config: ${NPMJS_TOKEN}
 
-> @milaboratories/milaboratories.monetization-test.model@1.0.24 type-check /home/runner/_work/platforma/platforma/etc/blocks/monetization-test/model
+> @milaboratories/milaboratories.monetization-test.model@1.0.26 type-check /home/runner/_work/platforma/platforma/etc/blocks/monetization-test/model
 > ts-builder types --target block-model
 
 ↳ tsc --noEmit --project ./tsconfig.json

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @milaboratories/milaboratories.monetization-test.model
 
+## 1.0.26
+
+### Patch Changes
+
+- Updated dependencies [64cee78]
+  - @platforma-sdk/model@1.45.17
+
+## 1.0.25
+
+### Patch Changes
+
+- Updated dependencies [3ef2381]
+  - @platforma-sdk/model@1.45.0
+
 ## 1.0.24
 
 ### Patch Changes

package/dist/bundle.js

@@ -4385,6 +4385,36 @@
             }
         }
     }
+    /**
+     * @param dataInfo - The source DataInfo object
+     * @param cb - Callback, function that have access to every blob to visit them all
+     * @returns Nothing
+     */
+    function visitDataInfo(dataInfo, cb) {
+        switch (dataInfo.type) {
+            case 'Json':
+                // Json type doesn't contain blobs, so return as is
+                break;
+            case 'JsonPartitioned': {
+                // Visit each blob in parts
+                Object.values(dataInfo.parts).forEach(cb);
+                break;
+            }
+            case 'BinaryPartitioned': {
+                // Visit each index and values blob in parts
+                Object.values(dataInfo.parts).forEach((chunk) => {
+                    cb(chunk.index);
+                    cb(chunk.values);
+                });
+                break;
+            }
+            case 'ParquetPartitioned': {
+                // Visit each blob in parts
+                Object.values(dataInfo.parts).forEach(cb);
+                break;
+            }
+        }
+    }
     /**
      * Type guard function that checks if the given value is a valid DataInfoEntries.
      *
@@ -5451,6 +5481,89 @@
     const StagingAccessorName = 'staging';
     const MainAccessorName = 'main';
 
+    function filterDataInfoEntries(dataInfoEntries, axisFilters) {
+        // Sort filters by axis index in descending order to safely remove elements from arrays
+        const sortedFilters = [...axisFilters].sort((a, b) => b[0] - a[0]);
+        // Check for invalid filter axes
+        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}`);
+        }
+        const keyMatchesFilters = (key) => {
+            for (const [axisIdx, axisValue] of sortedFilters)
+                if (key[axisIdx] !== axisValue)
+                    return false;
+            return true;
+        };
+        const removeFilteredAxes = (key) => {
+            const newKey = [...key];
+            // Remove axes in descending order to maintain correct indices
+            for (const [axisIdx] of sortedFilters)
+                newKey.splice(axisIdx, 1);
+            return newKey;
+        };
+        switch (dataInfoEntries.type) {
+            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,
+                })),
+            };
+            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,
+                })),
+            };
+            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,
+                })),
+            };
+            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,
+                })),
+            };
+        }
+    }
+
     const TraceEntry = z.object({
         type: z.string(),
         importance: z.number().optional(),
@@ -5934,88 +6047,24 @@
             return parsePColumnData(acc);
         throw new Error(`Unexpected input type: ${typeof acc}`);
     }
-
-    function filterDataInfoEntries(dataInfoEntries, axisFilters) {
-        // Sort filters by axis index in descending order to safely remove elements from arrays
-        const sortedFilters = [...axisFilters].sort((a, b) => b[0] - a[0]);
-        // Check for invalid filter axes
-        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}`);
+    function isPColumnReady(c) {
+        const isValues = (d) => Array.isArray(d);
+        const isAccessor = (d) => d instanceof TreeNodeAccessor;
+        let ready = true;
+        if (isAccessor(c.data)) {
+            ready &&= c.data.getIsReadyOrError();
         }
-        const keyMatchesFilters = (key) => {
-            for (const [axisIdx, axisValue] of sortedFilters)
-                if (key[axisIdx] !== axisValue)
-                    return false;
-            return true;
-        };
-        const removeFilteredAxes = (key) => {
-            const newKey = [...key];
-            // Remove axes in descending order to maintain correct indices
-            for (const [axisIdx] of sortedFilters)
-                newKey.splice(axisIdx, 1);
-            return newKey;
-        };
-        switch (dataInfoEntries.type) {
-            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,
-                })),
-            };
-            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,
-                })),
-            };
-            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,
-                })),
-            };
-            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,
-                })),
-            };
+        else if (isDataInfo(c.data)) {
+            visitDataInfo(c.data, (v) => ready &&= v.getIsReadyOrError());
+        }
+        else if (!isValues(c.data)) {
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+            throw Error(`unsupported column data type: ${c.data}`);
         }
+        return ready;
+    }
+    function allPColumnsReady(columns) {
+        return columns.every(isPColumnReady);
     }
 
     function isPColumnValues(value) {
@@ -6821,6 +6870,8 @@
         // TODO remove all non-PColumn fields
         createPFrame(def) {
             this.verifyInlineAndExplicitColumnsSupport(def);
+            if (!allPColumnsReady(def))
+                return undefined;
             return this.ctx.createPFrame(def.map((c) => transformPColumnData(c)));
         }
         createPTable(def) {
@@ -6839,7 +6890,10 @@
             else {
                 rawDef = this.patchPTableDef(def);
             }
-            this.verifyInlineAndExplicitColumnsSupport(extractAllColumns(rawDef.src));
+            const columns = extractAllColumns(rawDef.src);
+            this.verifyInlineAndExplicitColumnsSupport(columns);
+            if (!allPColumnsReady(columns))
+                return undefined;
             return this.ctx.createPTable(mapPTableDef(rawDef, (po) => transformPColumnData(po)));
         }
         /** @deprecated scheduled for removal from SDK */
@@ -6860,7 +6914,7 @@
         }
     }
 
-    var version = "1.44.14";
+    var version = "1.45.17";
 
     const PlatformaSDKVersion = version;