@malloydata/malloy 0.0.24-dev230216003028 → 0.0.24-dev230216173847

package/dist/lang/ast/expressions/expr-logical-op.d.ts

@@ -1,10 +1,5 @@
 import { BinaryBoolean } from "./binary-boolean";
 export declare class ExprLogicalOp extends BinaryBoolean<"and" | "or"> {
     elementType: string;
-    legalChildTypes: (import("../types/type-desc").TypeDesc | {
-        aggregate: boolean;
-        dataType: import("../types/type-desc").FieldValueType;
-        expressionType: import("../../..").ExpressionType;
-        rawType?: string | undefined;
-    })[];
+    legalChildTypes: import("../types/type-desc").TypeDesc[];
 }

package/dist/lang/ast/expressions/expr-logical-op.js

@@ -29,7 +29,7 @@ class ExprLogicalOp extends binary_boolean_1.BinaryBoolean {
     constructor() {
         super(...arguments);
         this.elementType = "logical operator";
-        this.legalChildTypes = [fragtype_utils_1.FT.boolT, { ...fragtype_utils_1.FT.boolT, "aggregate": true }];
+        this.legalChildTypes = [fragtype_utils_1.FT.boolT, fragtype_utils_1.FT.aggregateBoolT];
     }
 }
 exports.ExprLogicalOp = ExprLogicalOp;

package/dist/lang/ast/fragtype-utils.d.ts

@@ -36,4 +36,5 @@ export declare class FT {
     static timestampT: TypeDesc;
     static boolT: TypeDesc;
     static anyAtomicT: TypeDesc[];
+    static aggregateBoolT: TypeDesc;
 }

package/dist/lang/ast/fragtype-utils.js

@@ -23,8 +23,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FT = void 0;
-function mkFragType(dType) {
-    return { "dataType": dType, "expressionType": "scalar" };
+function mkFragType(dataType, expressionType = "scalar") {
+    return { dataType, expressionType };
 }
 /**
  * Collects functions which operate on fragtype compatible objects
@@ -97,4 +97,5 @@ FT.anyAtomicT = [
     FT.timestampT,
     FT.boolT
 ];
+FT.aggregateBoolT = mkFragType("boolean", "aggregate");
 //# sourceMappingURL=fragtype-utils.js.map

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

@@ -786,6 +786,8 @@ describe("qops", () => {
     `));
     test("where single", modelOK("query:a->{ group_by: astr; where: af > 10 }"));
     test("having single", modelOK("query:ab->{ aggregate: acount; group_by: astr; having: acount > 10 }"));
+    test("compound having still works", modelOK("query:ab->{ aggregate: acount; having: acount > 10 and acount < 100 }"));
+    test("compound aggregate still works", modelOK("query:ab->{ aggregate: thing is acount > 10 and acount < 100 }"));
     test("where multiple", modelOK("query:a->{ group_by: astr; where: af > 10,astr~'a%' }"));
     test(`filters preserve source formatting in code:`, () => {
         const model = new BetaModel(`source: notb is a + { where: astr  !=  'b' }`);

package/package.json

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