@cellaware/utils 8.11.20 → 8.11.21

package/dist/chatwms/datagrid.js

@@ -679,8 +679,37 @@ function pivotData(data, rowGroupCols, pivotCols, valueCols) {
         }
         grouped.get(groupKey).push(row);
     }
-    const rows = [];
+    const valueColumnNames = new Set();
     const mappedColumnNames = new Map();
+    const rows = [];
+    /* When processing pivoted data, we need to extract all possible value
+       columns first. This is to manually initialize these columns before
+       we start writing row values. If we do not initialize these, we will
+       likely end up with an incomplete result.
+    */
+    // Extract all value columns and get mapped column names.
+    for (const groupRows of grouped.values()) {
+        const pivotKeys = new Set();
+        for (const row of groupRows) {
+            pivotKeys.add(pivotBy(row));
+        }
+        for (const pivotKey of pivotKeys.values()) {
+            for (const { field, aggFunc } of valueCols) {
+                const key = `${pivotKey} ${field}`;
+                valueColumnNames.add(key);
+                let columnNames = mappedColumnNames.get(field);
+                if (!!columnNames) {
+                    columnNames.add(key);
+                }
+                else {
+                    columnNames = new Set([key]);
+                    mappedColumnNames.set(field, columnNames);
+                }
+            }
+        }
+    }
+    // Build results.
+    const valueColumnNamesArr = Array.from(valueColumnNames);
     for (const [groupKey, groupRows] of grouped.entries()) {
         const groupObj = JSON.parse(groupKey);
         const pivotBuckets = new Map();
@@ -691,62 +720,38 @@ function pivotData(data, rowGroupCols, pivotCols, valueCols) {
             }
             pivotBuckets.get(pivotKey).push(row);
         }
+        // Initialize value columns first.
+        for (const valueColumnName of valueColumnNamesArr) {
+            groupObj[valueColumnName] = 0;
+        }
+        // Now write row data.
         for (const [pivotKey, rows] of pivotBuckets.entries()) {
             for (const { field, aggFunc } of valueCols) {
                 const values = rows.map(r => r[field] ?? 0);
                 const key = `${pivotKey} ${field}`;
-                let columnNames = mappedColumnNames.get(field);
-                if (!!columnNames) {
-                    columnNames.add(key);
-                }
-                else {
-                    columnNames = new Set([key]);
-                    mappedColumnNames.set(field, columnNames);
-                }
                 switch (aggFunc) {
                     case 'sum':
                         groupObj[key] = values.map(Number).reduce((a, b) => a + b, 0);
-                        if (!groupObj[key]) {
-                            groupObj[key] = 0;
-                        }
                         break;
                     case 'count':
                         groupObj[key] = values.length;
-                        if (!groupObj[key]) {
-                            groupObj[key] = 0;
-                        }
                         break;
                     case 'min':
                         groupObj[key] = values.reduce((a, b) => (a < b ? a : b), values[0]);
-                        if (!groupObj[key]) {
-                            groupObj[key] = 0;
-                        }
                         break;
                     case 'max':
                         groupObj[key] = values.reduce((a, b) => (a > b ? a : b), values[0]);
-                        if (!groupObj[key]) {
-                            groupObj[key] = 0;
-                        }
                         break;
                     case 'avg': {
                         const nums = values.map(Number).filter(n => !isNaN(n));
                         groupObj[key] = nums.length ? nums.reduce((a, b) => a + b, 0) / nums.length : null;
-                        if (!groupObj[key]) {
-                            groupObj[key] = 0;
-                        }
                         break;
                     }
                     case 'first':
-                        groupObj[key] = values[0];
-                        if (!groupObj[key]) {
-                            groupObj[key] = '';
-                        }
+                        groupObj[key] = values[0] ?? '';
                         break;
                     case 'last':
-                        groupObj[key] = values[values.length - 1];
-                        if (!groupObj[key]) {
-                            groupObj[key] = '';
-                        }
+                        groupObj[key] = values[values.length - 1] ?? '';
                         break;
                     default:
                         groupObj[key] = '';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cellaware/utils",
-    "version": "8.11.20",
+    "version": "8.11.21",
     "description": "Cellaware Utilities for Node.js",
     "author": "Cellaware Technologies",
     "type": "module",