@malloydata/malloy 0.0.123-dev240207191052 → 0.0.123-dev240208155844

package/dist/lang/ast/expressions/expr-func.js

@@ -193,6 +193,11 @@ class ExprFunc extends expression_def_1.ExpressionDef {
         else {
             if ((props === null || props === void 0 ? void 0 : props.orderBys) && props.orderBys.length > 0) {
                 const isAnalytic = (0, malloy_types_1.expressionIsAnalytic)(overload.returnType.expressionType);
+                if (!isAnalytic) {
+                    if (!this.inExperiment('aggregate_order_by', true)) {
+                        props.orderBys[0].log('Enable experiment `aggregate_order_by` to use `order_by` with an aggregate function');
+                    }
+                }
                 if (dialectOverload.supportsOrderBy || isAnalytic) {
                     const allowExpression = dialectOverload.supportsOrderBy !== 'only_default';
                     const allObs = props.orderBys.flatMap(orderBy => isAnalytic
@@ -201,7 +206,7 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                     frag.orderBy = allObs;
                 }
                 else {
-                    props.orderBys[0].log(`Function ${this.name} does not support order_by`);
+                    props.orderBys[0].log(`Function \`${this.name}\` does not support \`order_by\``);
                 }
             }
             if ((props === null || props === void 0 ? void 0 : props.limit) !== undefined) {

package/dist/lang/malloy-to-ast.js

@@ -700,7 +700,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(new ast.FunctionOrderBy(f, dir), pcx);
     }
     visitAggregateOrderByStatement(pcx) {
-        this.inExperiment('function_order_by', pcx);
         return this.visitAggregateOrdering(pcx.aggregateOrdering());
     }
     visitAggregateOrdering(pcx) {
@@ -1124,7 +1123,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return new ast.ExprProps(this.getFieldExpr(pcx.fieldExpr()), statements);
     }
     visitPartitionByStatement(pcx) {
-        this.inExperiment('partition_by', pcx);
         return this.astAt(new ast.PartitionBy(pcx
             .id()
             .map(idCx => this.astAt(new ast.PartitionByFieldReference([

package/dist/lang/test/expressions.spec.js

@@ -163,30 +163,43 @@ describe('expressions', () => {
       `).translationToFailWith('Filtered expression requires an aggregate computation');
     });
     describe('expr props', () => {
-        test('props not allowed without experiments enabled', () => {
+        test('aggregate order by not allowed without experiments enabled', () => {
             expect((0, test_translator_1.markSource) `
           run: a -> {
             group_by: ai
-            group_by: x1 is string_agg(astr) { order_by: ai }
-            group_by: x2 is lag(ai) { partition_by: ai }
-            group_by: x3 is string_agg(astr) { limit: 10 }
+            aggregate: x1 is string_agg(astr) { order_by: ai }
+          }
+        `).translationToFailWith('Enable experiment `aggregate_order_by` to use `order_by` with an aggregate function');
+        });
+        test('aggregate limit not allowed without experiments enabled', () => {
+            expect((0, test_translator_1.markSource) `
+          run: a -> {
+            group_by: ai
+            aggregate: x3 is string_agg(astr) { limit: 10 }
+          }
+        `).translationToFailWith("Experimental flag 'aggregate_limit' required to enable this feature");
+        });
+        test('aggregate order_by not allowed with different experiment enabled', () => {
+            expect((0, test_translator_1.markSource) `
+        ##! experimental.something_else
+          run: a -> {
+            group_by: ai
+            aggregate: x1 is string_agg(astr) { order_by: ai }
           }
-        `).translationToFailWith("Experimental flag 'function_order_by' required to enable this feature", "Experimental flag 'partition_by' required to enable this feature", "Experimental flag 'aggregate_limit' required to enable this feature");
+        `).translationToFailWith('Enable experiment `aggregate_order_by` to use `order_by` with an aggregate function');
         });
-        test('props not allowed with different experiment enabled', () => {
+        test('aggregate limit not allowed with different experiment enabled', () => {
             expect((0, test_translator_1.markSource) `
         ##! experimental.something_else
           run: a -> {
             group_by: ai
-            group_by: x1 is string_agg(astr) { order_by: ai }
-            group_by: x2 is lag(ai) { partition_by: ai }
             group_by: x3 is string_agg(astr) { limit: 10 }
           }
-        `).translationToFailWith("Experimental flag 'function_order_by' required to enable this feature", "Experimental flag 'partition_by' required to enable this feature", "Experimental flag 'aggregate_limit' required to enable this feature");
+        `).translationToFailWith("Experimental flag 'aggregate_limit' required to enable this feature");
         });
         test('props not allowed on most expressions', () => {
             expect((0, test_translator_1.markSource) `
-          ##! experimental { function_order_by partition_by aggregate_limit }
+          ##! experimental { aggregate_order_by aggregate_limit }
           run: a -> {
             group_by: x1 is 1 { order_by: ai }
             group_by: x2 is 1 { partition_by: ai }
@@ -197,7 +210,6 @@ describe('expressions', () => {
         });
         test('analytics can take parititon_by and order_by', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by partition_by }
         run: a -> {
           group_by: ai
           calculate: x is lag(ai) { partition_by: ai; order_by: ai }
@@ -206,7 +218,7 @@ describe('expressions', () => {
         });
         test('analytics order_by requires expression', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           group_by: ai
           calculate: x is lag(ai) { order_by: asc }
@@ -215,7 +227,7 @@ describe('expressions', () => {
         });
         test('string_agg_distinct order by cannot specify expression', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           group_by: ai
           aggregate: x is string_agg_distinct(astr) { order_by: ai }
@@ -224,7 +236,7 @@ describe('expressions', () => {
         });
         test('string_agg_distinct order by can be just direction', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           group_by: ai
           aggregate: x is string_agg_distinct(astr) { order_by: asc }
@@ -233,7 +245,7 @@ describe('expressions', () => {
         });
         test('string_agg order by can be just direction', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           group_by: ai
           aggregate: x is string_agg(astr) { order_by: asc }
@@ -242,7 +254,6 @@ describe('expressions', () => {
         });
         test('can specify multiple partition_bys', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { partition_by }
         run: a -> {
           group_by: ai, astr, abool
           calculate: x is lag(ai) {
@@ -254,7 +265,7 @@ describe('expressions', () => {
         });
         test('can specify multiple order_bys', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           group_by: ai, astr, abool
           calculate: x is lag(ai) {
@@ -266,7 +277,7 @@ describe('expressions', () => {
         });
         test('aggregate order by cannot be aggregate', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           aggregate: x is string_agg(astr) {
             order_by: sum(ai)
@@ -276,7 +287,7 @@ describe('expressions', () => {
         });
         test('aggregate order by cannot be analytic', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           aggregate: x is string_agg(astr) {
             order_by: rank()
@@ -286,7 +297,7 @@ describe('expressions', () => {
         });
         test('analytic order by can be an aggregate', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           group_by: abool
           calculate: x is lag(abool) {
@@ -297,7 +308,7 @@ describe('expressions', () => {
         });
         test('analytic order by can be an output field', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           group_by: ai
           calculate: x is lag(ai) {
@@ -308,7 +319,7 @@ describe('expressions', () => {
         });
         test('analytic order by must be an output field', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           group_by: abool
           calculate: x is lag(abool) {
@@ -319,7 +330,7 @@ describe('expressions', () => {
         });
         test('can specify multiple wheres', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           aggregate: x is count() {
             where: ai > 10
@@ -330,7 +341,7 @@ describe('expressions', () => {
         });
         test('string_agg can take order_by', () => {
             expect((0, test_translator_1.markSource) `
-        ##! experimental { function_order_by }
+        ##! experimental { aggregate_order_by }
         run: a -> {
           aggregate: x1 is string_agg(astr) { order_by: ai }
           aggregate: x2 is string_agg(astr) { order_by: ai * 2 }

package/dist/runtime_types.d.ts

@@ -69,7 +69,7 @@ export interface InfoConnection {
      */
     get name(): string;
 }
-export type ConnectionParameterValue = string | number | boolean;
+export type ConnectionParameterValue = string | number | boolean | Array<ConnectionParameterValue>;
 export interface ConnectionParameter {
     name: string;
     label: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.123-dev240207191052",
+  "version": "0.0.123-dev240208155844",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",