@malloydata/malloy 0.0.24-dev230216003028 → 0.0.24-dev230217165618

package/dist/lang/ast/expressions/constant-sub-expression.js

@@ -66,7 +66,7 @@ class DollarReference extends expression_def_1.ExpressionDef {
 }
 class ConstantSubExpression extends expression_def_1.ExpressionDef {
     constructor(expr) {
-        super({ expr });
+        super({ "expr": expr });
         this.expr = expr;
         this.elementType = "constantExpression";
     }

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

@@ -1,4 +1,26 @@
 "use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprAsymmetric = void 0;
 const expr_aggregate_function_1 = require("./expr-aggregate-function");

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

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExprCast = exports.isCastType = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.ExprCast = exports.isCastType = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExprCast = exports.isCastType = void 0;
 const time_utils_1 = require("../time-utils");
 const expression_def_1 = require("../types/expression-def");
 const utils_1 = require("./utils");

package/dist/lang/ast/expressions/expr-count.d.ts

@@ -1,5 +1,5 @@
-import { ExprValue } from "../types/expr-value";
 import { FieldReference } from "../query-items/field-references";
+import { ExprValue } from "../types/expr-value";
 import { FieldSpace } from "../types/field-space";
 import { ExprAggregateFunction } from "./expr-aggregate-function";
 export declare class ExprCount extends ExprAggregateFunction {

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

@@ -29,7 +29,7 @@ class ExprCount extends expr_aggregate_function_1.ExprAggregateFunction {
         super("count");
         this.source = source;
         this.elementType = "count";
-        this.has({ source });
+        this.has({ "source": source });
     }
     defaultFieldName() {
         if (this.source) {

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

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExprFilter = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.ExprFilter = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExprFilter = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
 const fragtype_utils_1 = require("../fragtype-utils");

package/dist/lang/ast/expressions/expr-granular-time.d.ts

@@ -1,7 +1,7 @@
 import { TimestampUnit } from "../../../model/malloy_types";
-import { FieldSpace } from "../types/field-space";
 import { ExprValue } from "../types/expr-value";
 import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
 /**
  * GranularTime is a moment in time which ALSO has a "granularity"
  * commonly this are created by applying ".datePart" to an expression

package/dist/lang/ast/expressions/expr-granular-time.js

@@ -25,11 +25,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprGranularTime = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
-const expr_time_1 = require("./expr-time");
 const fragtype_utils_1 = require("../fragtype-utils");
-const range_1 = require("./range");
 const time_utils_1 = require("../time-utils");
 const expression_def_1 = require("../types/expression-def");
+const expr_time_1 = require("./expr-time");
+const range_1 = require("./range");
 /**
  * GranularTime is a moment in time which ALSO has a "granularity"
  * commonly this are created by applying ".datePart" to an expression
@@ -39,7 +39,7 @@ const expression_def_1 = require("../types/expression-def");
  */
 class ExprGranularTime extends expression_def_1.ExpressionDef {
     constructor(expr, units, truncate) {
-        super({ expr });
+        super({ "expr": expr });
         this.expr = expr;
         this.units = units;
         this.truncate = truncate;

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/expressions/expr-max.js

@@ -1,4 +1,26 @@
 "use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprMax = void 0;
 const fragtype_utils_1 = require("../fragtype-utils");

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

@@ -1,4 +1,26 @@
 "use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprMin = void 0;
 const fragtype_utils_1 = require("../fragtype-utils");

package/dist/lang/ast/expressions/expr-mul-div.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExprMulDiv = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.ExprMulDiv = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExprMulDiv = void 0;
 const binary_numeric_1 = require("./binary-numeric");
 class ExprMulDiv extends binary_numeric_1.BinaryNumeric {
     constructor() {

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

@@ -1,4 +1,26 @@
 "use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprSum = void 0;
 const expr_asymmetric_1 = require("./expr-asymmetric");

package/dist/lang/ast/expressions/expr-time-extract.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExprTimeExtract = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.ExprTimeExtract = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExprTimeExtract = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
 const expression_def_1 = require("../types/expression-def");

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

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExprUngroup = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.ExprUngroup = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExprUngroup = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
 const query_spaces_1 = require("../field-space/query-spaces");

package/dist/lang/ast/expressions/granular-literal.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GranularLiteral = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.GranularLiteral = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GranularLiteral = void 0;
 const luxon_1 = require("luxon");
 const malloy_types_1 = require("../../../model/malloy_types");
 const range_1 = require("./range");

package/dist/lang/ast/expressions/partial-compare.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PartialCompare = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.PartialCompare = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PartialCompare = void 0;
 const ast_utils_1 = require("../ast-utils");
 const expression_def_1 = require("../types/expression-def");
 class PartialCompare extends expression_def_1.ExpressionDef {

package/dist/lang/ast/expressions/time-frame.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Timeframe = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.Timeframe = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Timeframe = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const malloy_element_1 = require("../types/malloy-element");
 class Timeframe extends malloy_element_1.MalloyElement {

package/dist/lang/ast/expressions/top-by.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TopBy = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.TopBy = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TopBy = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const expression_def_1 = require("../types/expression-def");
 const malloy_element_1 = require("../types/malloy-element");

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/ast/parameters/constant-parameter.js

@@ -29,7 +29,7 @@ class ConstantParameter extends has_parameter_1.HasParameter {
     constructor(name, value) {
         super({ name, "isCondition": false });
         this.value = value;
-        this.has({ value });
+        this.has({ "value": value });
     }
     parameter() {
         const cVal = this.value.constantValue();

package/dist/lang/ast/sources/named-source.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NamedSource = exports.IsValueBlock = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.NamedSource = exports.IsValueBlock = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NamedSource = exports.IsValueBlock = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const source_1 = require("../elements/source");
 const error_factory_1 = require("../error-factory");
@@ -106,7 +106,7 @@ class NamedSource extends source_1.Source {
             notFound.dialect = notFound.dialect + err;
             return notFound;
         }
-        const declared = { ...ret.parameters } || {};
+        const declared = { ...ret.parameters };
         const makeWith = ((_a = this.isBlock) === null || _a === void 0 ? void 0 : _a.isMap) || {};
         for (const [pName, pExpr] of Object.entries(makeWith)) {
             const decl = declared[pName];

package/dist/lang/ast/types/expression-def.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyBinary = exports.ExprDuration = exports.ExpressionDef = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.applyBinary = exports.ExprDuration = exports.ExpressionDef = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyBinary = exports.ExprDuration = exports.ExpressionDef = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
 const utils_1 = require("../expressions/utils");

package/dist/lang/ast/types/field-collection-member.js

@@ -1,6 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFieldCollectionMember = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -23,6 +21,8 @@ exports.isFieldCollectionMember = void 0;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isFieldCollectionMember = void 0;
 const field_declaration_1 = require("../query-items/field-declaration");
 const field_references_1 = require("../query-items/field-references");
 function isFieldCollectionMember(el) {

package/dist/lang/ast/types/granular-result.js

@@ -1,4 +1,26 @@
 "use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isGranularResult = void 0;
 function isGranularResult(v) {

package/dist/lang/ast/types/malloy-element.d.ts

@@ -62,8 +62,8 @@ export interface DocStatement extends MalloyElement {
 }
 export declare function isDocStatement(e: MalloyElement): e is DocStatement;
 export declare class ListOf<ET extends MalloyElement> extends MalloyElement {
-    elementType: string;
     protected elements: ET[];
+    elementType: string;
     constructor(listDesc: string, elements: ET[]);
     private newContents;
     get list(): ET[];

package/dist/lang/ast/types/malloy-element.js

@@ -263,8 +263,8 @@ exports.isDocStatement = isDocStatement;
 class ListOf extends MalloyElement {
     constructor(listDesc, elements) {
         super();
-        this.elementType = "genericElementList";
         this.elements = elements;
+        this.elementType = "genericElementList";
         if (this.elementType === "genericElementList") {
             this.elementType = listDesc;
         }

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-dev230217165618",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",