@malloydata/render 0.0.123-dev240209030627 → 0.0.123-dev240209210150

package/dist/bundle/bundled_renderer.js

@@ -56036,10 +56036,10 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                 const e12 = partitionField.getField(fs);
                 if (e12.found === void 0) {
                   partitionField.log(`${partitionField.refString} is not defined`);
-                } else if ((0, malloy_types_1.expressionIsScalar)(e12.found.typeDesc().expressionType)) {
-                  partitionByFields.push(partitionField.nameString);
+                } else if ((0, malloy_types_1.expressionIsAnalytic)(e12.found.typeDesc().expressionType) || (0, malloy_types_1.expressionIsUngroupedAggregate)(e12.found.typeDesc().expressionType)) {
+                  partitionField.log("Partition expression must be scalar or aggregate");
                 } else {
-                  partitionField.log("Partition expression must be scalar");
+                  partitionByFields.push(partitionField.nameString);
                 }
               }
             }
@@ -71618,6 +71618,7 @@ ${errText}`, errors);
           this.rowSeparator = "\n";
           this.quoteCharacter = '"';
           this.includeHeader = true;
+          this.emptyCell = "";
         }
         escape(value3) {
           const hasInnerQuote = value3.includes(this.quoteCharacter);
@@ -71632,43 +71633,136 @@ ${errText}`, errors);
           }
           return value3;
         }
-        stringify(cell2) {
-          if (cell2.isNull()) {
-            return "";
-          } else if (cell2.isArray() || cell2.isRecord() || cell2.isBoolean() || cell2.isNumber()) {
-            return JSON.stringify(cell2.value);
-          } else if (cell2.isDate() || cell2.isTimestamp()) {
-            return cell2.value.toISOString();
-          } else if (cell2.isString()) {
-            return cell2.value;
-          } else {
-            return `${cell2.value}`;
+        // Re-using the old stringify method for sanity.
+        stringify(value3) {
+          if (value3 === null) {
+            return this.emptyCell;
+          } else if (value3 instanceof Date) {
+            return value3.toISOString();
+          } else if (typeof value3 === "boolean" || typeof value3 === "number") {
+            return JSON.stringify(value3);
+          } else {
+            return `${value3}`;
+          }
+        }
+        // Extra weight to be added becase of nested tables inside the cells.
+        getColWeight(jsonVal) {
+          let firstVal = jsonVal;
+          if (Array.isArray(jsonVal)) {
+            firstVal = jsonVal[0];
+          }
+          let numKeys = 0;
+          for (const key2 in firstVal) {
+            numKeys = numKeys + 1;
+            const val = firstVal[key2];
+            if (Array.isArray(val)) {
+              const weight = this.getColWeight(val) - 1;
+              numKeys = numKeys + weight;
+            }
+          }
+          return numKeys;
+        }
+        // Get header row along with extra empty spaces for nested children.
+        getHeaderRow(row) {
+          const csv = [];
+          let width2 = 0;
+          for (const key2 in row) {
+            csv.push(this.escape(key2));
+            const val = row[key2];
+            width2++;
+            if (Array.isArray(val)) {
+              const numKeys = this.getColWeight(val) - 1;
+              width2 = width2 + numKeys;
+              for (let i6 = 0; i6 < numKeys; i6++) {
+                csv.push(this.emptyCell);
+              }
+            }
+          }
+          return { rows: [csv.join(this.columnSeparator)], length: 1, width: width2 };
+        }
+        // Merge the child matrices i.e. merge the columns into one bigger matrix i.e. CSV.
+        mergeMatrices(matrices) {
+          const maxLength = Math.max(...matrices.map((matrix) => matrix.length));
+          const matrixWidth = matrices.reduce((sum3, matrix) => sum3 + matrix.width, 0);
+          const csvMatrix = [];
+          for (let i6 = 0; i6 < maxLength; i6++) {
+            const csvRow = [];
+            for (const matrix of matrices) {
+              if (i6 < matrix.length) {
+                csvRow.push(matrix.rows[i6]);
+              } else {
+                const emptyCells = Array(matrix.width).fill(this.emptyCell);
+                csvRow.push(...emptyCells);
+              }
+            }
+            csvMatrix.push(csvRow.join(this.columnSeparator));
           }
+          return {
+            rows: csvMatrix,
+            length: maxLength,
+            width: matrixWidth
+          };
+        }
+        // Gets CSV for a data cell that has nested data.
+        getChildMatrix(jsonVal) {
+          if (!Array.isArray(jsonVal)) {
+            return {
+              rows: ["Invalid data found, value is not an array"],
+              length: 1,
+              width: 1
+            };
+          } else if (jsonVal.length === 0) {
+            return {
+              rows: [""],
+              length: 1,
+              width: 1
+            };
+          }
+          const csvMatrix = [];
+          const header = this.getHeaderRow(jsonVal[0]);
+          csvMatrix.push(...header.rows);
+          const width2 = header.width;
+          let rowCount = 1;
+          for (const row of jsonVal) {
+            const rowMatrix = this.getRowMatrix(row);
+            rowCount = rowCount + rowMatrix.length;
+            csvMatrix.push(...rowMatrix.rows);
+          }
+          return { rows: csvMatrix, length: rowCount, width: width2 };
+        }
+        // Creates CSV content for one row of data.
+        getRowMatrix(row) {
+          const matrices = [];
+          for (const key2 in row) {
+            const val = row[key2];
+            if (!Array.isArray(val)) {
+              const cell2 = {
+                rows: [this.stringify(val)],
+                length: 1,
+                width: 1
+              };
+              matrices.push(cell2);
+            } else {
+              const cell2 = this.getChildMatrix(val);
+              matrices.push(cell2);
+            }
+          }
+          return this.mergeMatrices(matrices);
         }
         async process(data3) {
-          let fields;
+          let headerDefined = false;
           for await (const row of data3) {
-            if (fields === void 0) {
-              fields = row.field.allFields;
-              if (this.includeHeader) {
-                for (let fieldIndex = 0; fieldIndex < fields.length; fieldIndex++) {
-                  const field3 = fields[fieldIndex];
-                  this.stream.write(this.escape(field3.name));
-                  if (fieldIndex !== fields.length - 1) {
-                    this.stream.write(this.columnSeparator);
-                  }
-                }
-                this.stream.write(this.rowSeparator);
-              }
+            if (!headerDefined && this.includeHeader) {
+              const header = this.getHeaderRow(row.toObject());
+              this.stream.write(header.rows[0]);
+              this.stream.write(this.rowSeparator);
+              headerDefined = true;
             }
-            for (let fieldIndex = 0; fieldIndex < fields.length; fieldIndex++) {
-              const field3 = fields[fieldIndex];
-              this.stream.write(this.escape(this.stringify(row.cell(field3))));
-              if (fieldIndex !== fields.length - 1) {
-                this.stream.write(this.columnSeparator);
-              }
+            const rowCsv = this.getRowMatrix(row.toObject());
+            for (const line4 of rowCsv.rows) {
+              this.stream.write(line4);
+              this.stream.write(this.rowSeparator);
             }
-            this.stream.write(this.rowSeparator);
           }
           this.stream.close();
         }