@malloydata/render 0.0.130-dev240311192728 → 0.0.130-dev240312011825

package/dist/bundle/bundled_renderer.js

@@ -4967,20 +4967,28 @@ ${hackSplitComment}
       function fnStringAgg() {
         const value3 = (0, util_1.makeParam)("value", (0, util_1.maxScalar)("string"));
         const separator = (0, util_1.makeParam)("separator", (0, util_1.literal)((0, util_1.maxScalar)("string")));
-        const orderBy = { type: "aggregate_order_by" };
+        const orderBy = {
+          type: "aggregate_order_by",
+          prefix: " WITHIN GROUP(",
+          suffix: ")"
+        };
         return [
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`LISTAGG(${value3.arg}, ',') WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`LISTAGG(${value3.arg}, ${separator.arg}) WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false })
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`LISTAGG(${value3.arg}, ',')${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`LISTAGG(${value3.arg}, ${separator.arg})${orderBy}`, { supportsOrderBy: true, supportsLimit: false })
         ];
       }
       exports.fnStringAgg = fnStringAgg;
       function fnStringAggDistinct() {
         const value3 = (0, util_1.makeParam)("value", (0, util_1.maxScalar)("string"));
         const separator = (0, util_1.makeParam)("separator", (0, util_1.literal)((0, util_1.maxScalar)("string")));
-        const orderBy = { type: "aggregate_order_by" };
+        const orderBy = {
+          type: "aggregate_order_by",
+          prefix: " WITHIN GROUP(",
+          suffix: ")"
+        };
         return [
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`LISTAGG(DISTINCT ${value3.arg}, ',') WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`LISTAGG(DISTINCT ${value3.arg}, ${separator.arg}) WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false })
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`LISTAGG(DISTINCT ${value3.arg}, ',')${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`LISTAGG(DISTINCT ${value3.arg}, ${separator.arg})${orderBy}`, { supportsOrderBy: true, supportsLimit: false })
         ];
       }
       exports.fnStringAggDistinct = fnStringAggDistinct;
@@ -5802,6 +5810,7 @@ ${(0, utils_1.indent)(sql)})
             throw new Error(`Function is not defined for dialect ${dialect}`);
           }
           return (0, utils_1.exprMap)(overload.dialect[dialect].e, (fragment) => {
+            var _a, _b;
             if (typeof fragment === "string") {
               return [fragment];
             } else if (fragment.type === "spread") {
@@ -5826,7 +5835,7 @@ ${(0, utils_1.indent)(sql)})
                 return args[entry2.argIndexes[0]];
               }
             } else if (fragment.type === "aggregate_order_by") {
-              return orderBy ? [` ${orderBy}`] : [];
+              return orderBy ? [` ${(_a = fragment.prefix) !== null && _a !== void 0 ? _a : ""}${orderBy}${(_b = fragment.suffix) !== null && _b !== void 0 ? _b : ""}`] : [];
             } else if (fragment.type === "aggregate_limit") {
               return limit ? [` ${limit}`] : [];
             }
@@ -5871,7 +5880,7 @@ ${(0, utils_1.indent)(sql)})
           const isSymmetric = (_a = frag.overload.isSymmetric) !== null && _a !== void 0 ? _a : false;
           const distinctKey = (0, malloy_types_1.expressionIsAggregate)(overload.returnType.expressionType) && !isSymmetric && this.generateDistinctKeyIfNecessary(resultSet, context3, frag.structPath);
           const aggregateLimit = frag.limit ? `LIMIT ${frag.limit}` : void 0;
-          if (frag.name === "string_agg" && distinctKey && !context3.dialect.supportsAggDistinct) {
+          if (frag.name === "string_agg" && distinctKey && !context3.dialect.supportsAggDistinct && context3.dialect.name !== "snowflake") {
             return this.generateAsymmetricStringAggExpression(resultSet, context3, args[0], args[1], distinctKey, frag.orderBy, context3.dialect.name, state);
           }
           if (distinctKey) {
@@ -6537,6 +6546,9 @@ ${(0, utils_1.indent)(sql)})
           for (const [_name, fi] of this.allFields) {
             if (fi instanceof FieldInstanceField) {
               if (fi.fieldUsage.type === "result") {
+                if (fi.f.fieldDef.type === "turtle" || fi.f.fieldDef.type === "struct" || (0, malloy_types_1.expressionIsAnalytic)(fi.f.fieldDef.expressionType)) {
+                  continue;
+                }
                 firstField || (firstField = fi.fieldUsage.resultIndex);
                 if (["date", "timestamp"].indexOf(fi.f.fieldDef.type) > -1) {
                   return [{ dir: "desc", field: fi.fieldUsage.resultIndex }];
@@ -7416,7 +7428,17 @@ ${(0, utils_1.indent)(select2)}) AS ${ji.alias}
       `);
         }
         generateStage0Fields(resultSet, output3, stageWriter) {
+          const scalarFields = [];
+          const otherFields = [];
           for (const [name, fi] of resultSet.allFields) {
+            if (fi instanceof FieldInstanceField && isScalarField(fi.f)) {
+              scalarFields.push([name, fi]);
+            } else {
+              otherFields.push([name, fi]);
+            }
+          }
+          const orderedFields = [...scalarFields, ...otherFields];
+          for (const [name, fi] of orderedFields) {
             const outputName = this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultSet.groupSet}`);
             if (fi instanceof FieldInstanceField) {
               if (fi.fieldUsage.type === "result") {