@malloydata/malloy 0.0.123-dev240209030627 → 0.0.123-dev240209165819

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

@@ -226,11 +226,12 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                     if (e.found === undefined) {
                         partitionField.log(`${partitionField.refString} is not defined`);
                     }
-                    else if ((0, malloy_types_1.expressionIsScalar)(e.found.typeDesc().expressionType)) {
-                        partitionByFields.push(partitionField.nameString);
+                    else if ((0, malloy_types_1.expressionIsAnalytic)(e.found.typeDesc().expressionType) ||
+                        (0, malloy_types_1.expressionIsUngroupedAggregate)(e.found.typeDesc().expressionType)) {
+                        partitionField.log('Partition expression must be scalar or aggregate');
                     }
                     else {
-                        partitionField.log('Partition expression must be scalar');
+                        partitionByFields.push(partitionField.nameString);
                     }
                 }
             }

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

@@ -215,6 +215,25 @@ describe('expressions', () => {
           calculate: x is lag(ai) { partition_by: ai; order_by: ai }
         }
       `).toTranslate();
+        });
+        test('partition by works with scalar and aggregate', () => {
+            expect((0, test_translator_1.markSource) `
+        run: a -> {
+          group_by: ai
+          aggregate: c is count()
+          calculate: x is lag(ai) { partition_by: ai, c }
+        }
+      `).toTranslate();
+        });
+        test('partition by fails with analytic and ungrouped aggregate', () => {
+            expect((0, test_translator_1.markSource) `
+        run: a -> {
+          group_by: ai
+          aggregate: ac is all(count())
+          calculate: x is lag(ai) { partition_by: ac }
+          calculate: y is lag(ai) { partition_by: x }
+        }
+      `).translationToFailWith('Partition expression must be scalar or aggregate', 'Partition expression must be scalar or aggregate');
         });
         test('analytics order_by requires expression', () => {
             expect((0, test_translator_1.markSource) `

package/package.json

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