@malloydata/malloy 0.0.22-dev230207144036 → 0.0.22-dev230207180844

package/dist/lang/ast/query-items/field-references.js

@@ -0,0 +1,80 @@
+"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.FieldReferences = exports.WildcardFieldReference = exports.FieldReference = void 0;
+const malloy_element_1 = require("../types/malloy-element");
+class FieldReference extends malloy_element_1.ListOf {
+    constructor(names) {
+        super("fieldReference", names);
+        this.elementType = "fieldReference";
+    }
+    get refString() {
+        return this.list.map((n) => n.refString).join(".");
+    }
+    get outputName() {
+        const last = this.list[this.list.length - 1];
+        return last.refString;
+    }
+    get sourceString() {
+        if (this.list.length > 1) {
+            return this.list
+                .slice(0, -1)
+                .map((n) => n.refString)
+                .join(".");
+        }
+        return undefined;
+    }
+    get nameString() {
+        return this.list[this.list.length - 1].refString;
+    }
+    getField(fs) {
+        return fs.lookup(this.list);
+    }
+}
+exports.FieldReference = FieldReference;
+class WildcardFieldReference extends malloy_element_1.MalloyElement {
+    constructor(joinPath, star) {
+        super();
+        this.joinPath = joinPath;
+        this.star = star;
+        this.elementType = "wildcardFieldReference";
+        this.has({ joinPath });
+    }
+    getFieldDef() {
+        throw this.internalError("fielddef request from wildcard reference");
+    }
+    get refString() {
+        return this.joinPath
+            ? `${this.joinPath.refString}.${this.star}`
+            : this.star;
+    }
+}
+exports.WildcardFieldReference = WildcardFieldReference;
+class FieldReferences extends malloy_element_1.ListOf {
+    constructor(members) {
+        super("fieldReferenceList", members);
+    }
+}
+exports.FieldReferences = FieldReferences;
+//# sourceMappingURL=field-references.js.map

package/dist/lang/ast/query-properties/aggregate.d.ts

@@ -0,0 +1,5 @@
+import { ListOf } from "../types/malloy-element";
+import { QueryItem } from "../types/query-item";
+export declare class Aggregate extends ListOf<QueryItem> {
+    constructor(members: QueryItem[]);
+}

package/dist/lang/ast/query-properties/aggregate.js

@@ -0,0 +1,39 @@
+"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.Aggregate = void 0;
+const field_declaration_1 = require("../query-items/field-declaration");
+const malloy_element_1 = require("../types/malloy-element");
+class Aggregate extends malloy_element_1.ListOf {
+    constructor(members) {
+        super("aggregate", members);
+        for (const el of members) {
+            if (el instanceof field_declaration_1.FieldDeclaration) {
+                el.isMeasure = true;
+            }
+        }
+    }
+}
+exports.Aggregate = Aggregate;
+//# sourceMappingURL=aggregate.js.map

package/dist/lang/ast/query-properties/declare-fields.d.ts

@@ -0,0 +1,5 @@
+import { FieldDeclaration } from "../query-items/field-declaration";
+import { ListOf } from "../types/malloy-element";
+export declare class DeclareFields extends ListOf<FieldDeclaration> {
+    constructor(fields: FieldDeclaration[], fieldType?: string);
+}

package/dist/lang/ast/query-properties/declare-fields.js

@@ -0,0 +1,33 @@
+"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.DeclareFields = void 0;
+const malloy_element_1 = require("../types/malloy-element");
+class DeclareFields extends malloy_element_1.ListOf {
+    constructor(fields, fieldType = "declare") {
+        super(fieldType, fields);
+    }
+}
+exports.DeclareFields = DeclareFields;
+//# sourceMappingURL=declare-fields.js.map

package/dist/lang/ast/query-properties/dimmensions.d.ts

@@ -0,0 +1,5 @@
+import { FieldDeclaration } from "../query-items/field-declaration";
+import { DeclareFields } from "./declare-fields";
+export declare class Dimensions extends DeclareFields {
+    constructor(dimensions: FieldDeclaration[]);
+}

package/dist/lang/ast/query-properties/dimmensions.js

@@ -0,0 +1,36 @@
+"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.Dimensions = void 0;
+const declare_fields_1 = require("./declare-fields");
+class Dimensions extends declare_fields_1.DeclareFields {
+    constructor(dimensions) {
+        super(dimensions, "dimension");
+        for (const dim of dimensions) {
+            dim.isMeasure = false;
+        }
+    }
+}
+exports.Dimensions = Dimensions;
+//# sourceMappingURL=dimmensions.js.map

package/dist/lang/ast/query-properties/filters.d.ts

@@ -0,0 +1,18 @@
+import { FilterExpression } from "../../../model/malloy_types";
+import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
+import { ListOf, MalloyElement } from "../types/malloy-element";
+export declare class FilterElement extends MalloyElement {
+    readonly expr: ExpressionDef;
+    readonly exprSrc: string;
+    elementType: string;
+    constructor(expr: ExpressionDef, exprSrc: string);
+    filterExpression(fs: FieldSpace): FilterExpression;
+}
+export declare class Filter extends ListOf<FilterElement> {
+    elementType: string;
+    private havingClause?;
+    constructor(elements?: FilterElement[]);
+    set having(isHaving: boolean);
+    getFilterList(fs: FieldSpace): FilterExpression[];
+}

package/dist/lang/ast/query-properties/filters.js

@@ -0,0 +1,89 @@
+"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.Filter = exports.FilterElement = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
+const utils_1 = require("../expressions/utils");
+const malloy_element_1 = require("../types/malloy-element");
+class FilterElement extends malloy_element_1.MalloyElement {
+    constructor(expr, exprSrc) {
+        super({ expr });
+        this.expr = expr;
+        this.exprSrc = exprSrc;
+        this.elementType = "filterElement";
+    }
+    filterExpression(fs) {
+        const exprVal = this.expr.getExpression(fs);
+        if (exprVal.dataType !== "boolean") {
+            this.expr.log("Filter expression must have boolean value");
+            return {
+                code: this.exprSrc,
+                expression: ["_FILTER_MUST_RETURN_BOOLEAN_"],
+                expressionType: "scalar",
+            };
+        }
+        const exprCond = {
+            code: this.exprSrc,
+            expression: (0, utils_1.compressExpr)(exprVal.value),
+            expressionType: exprVal.expressionType,
+        };
+        return exprCond;
+    }
+}
+exports.FilterElement = FilterElement;
+class Filter extends malloy_element_1.ListOf {
+    constructor(elements = []) {
+        super("filterElements", elements);
+        this.elementType = "filter";
+    }
+    set having(isHaving) {
+        this.elementType = isHaving ? "having" : "where";
+    }
+    getFilterList(fs) {
+        const checked = [];
+        for (const oneElement of this.list) {
+            const fExpr = oneElement.filterExpression(fs);
+            // Aggregates are ALSO checked at SQL generation time, but checking
+            // here allows better reflection of errors back to user.
+            if (this.havingClause !== undefined) {
+                if (this.havingClause) {
+                    if ((0, malloy_types_1.expressionIsCalculation)(fExpr.expressionType)) {
+                        oneElement.log("Aggregate or Analytical expression expected in HAVING filter");
+                        continue;
+                    }
+                }
+                else {
+                    if (fExpr.expressionType !== "scalar") {
+                        oneElement.log("Aggregate or Analytical expressions not allowed in WHERE");
+                        continue;
+                    }
+                }
+            }
+            checked.push(fExpr);
+        }
+        return checked;
+    }
+}
+exports.Filter = Filter;
+//# sourceMappingURL=filters.js.map

package/dist/lang/ast/query-properties/group-by.d.ts

@@ -0,0 +1,5 @@
+import { ListOf } from "../types/malloy-element";
+import { QueryItem } from "../types/query-item";
+export declare class GroupBy extends ListOf<QueryItem> {
+    constructor(members: QueryItem[]);
+}

package/dist/lang/ast/query-properties/group-by.js

@@ -0,0 +1,39 @@
+"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.GroupBy = void 0;
+const field_declaration_1 = require("../query-items/field-declaration");
+const malloy_element_1 = require("../types/malloy-element");
+class GroupBy extends malloy_element_1.ListOf {
+    constructor(members) {
+        super("groupBy", members);
+        for (const el of members) {
+            if (el instanceof field_declaration_1.FieldDeclaration) {
+                el.isMeasure = false;
+            }
+        }
+    }
+}
+exports.GroupBy = GroupBy;
+//# sourceMappingURL=group-by.js.map

package/dist/lang/ast/query-properties/indexing.d.ts

@@ -0,0 +1,10 @@
+import { MalloyElement } from "../types/malloy-element";
+import { FieldReferences } from "../query-items/field-references";
+import { FieldName } from "../types/field-space";
+export declare class Index extends MalloyElement {
+    readonly fields: FieldReferences;
+    elementType: string;
+    weightBy?: FieldName;
+    constructor(fields: FieldReferences);
+    useWeight(fn: FieldName): void;
+}

package/dist/lang/ast/query-properties/indexing.js

@@ -0,0 +1,39 @@
+"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.Index = void 0;
+const malloy_element_1 = require("../types/malloy-element");
+class Index extends malloy_element_1.MalloyElement {
+    constructor(fields) {
+        super({ fields });
+        this.fields = fields;
+        this.elementType = "index";
+    }
+    useWeight(fn) {
+        this.has({ weightBy: fn });
+        this.weightBy = fn;
+    }
+}
+exports.Index = Index;
+//# sourceMappingURL=indexing.js.map

package/dist/lang/ast/query-properties/joins.d.ts

@@ -0,0 +1,36 @@
+import { Expr, StructDef } from "../../../model/malloy_types";
+import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
+import { Source } from "../elements/source";
+import { ListOf, MalloyElement, ModelEntryReference } from "../types/malloy-element";
+export declare abstract class Join extends MalloyElement {
+    abstract name: ModelEntryReference;
+    abstract structDef(): StructDef;
+    abstract fixupJoinOn(outer: FieldSpace, inStruct: StructDef): void;
+}
+export declare class KeyJoin extends Join {
+    readonly name: ModelEntryReference;
+    readonly source: Source;
+    readonly keyExpr: ExpressionDef;
+    elementType: string;
+    constructor(name: ModelEntryReference, source: Source, keyExpr: ExpressionDef);
+    structDef(): StructDef;
+    fixupJoinOn(outer: FieldSpace, inStruct: StructDef): void;
+}
+declare type ExpressionJoinType = "many" | "one" | "cross";
+export declare class ExpressionJoin extends Join {
+    readonly name: ModelEntryReference;
+    readonly source: Source;
+    elementType: string;
+    joinType: ExpressionJoinType;
+    private expr?;
+    constructor(name: ModelEntryReference, source: Source);
+    set joinOn(joinExpr: ExpressionDef | undefined);
+    get joinOn(): ExpressionDef | undefined;
+    fixupJoinOn(outer: FieldSpace, inStruct: StructDef): Expr | undefined;
+    structDef(): StructDef;
+}
+export declare class Joins extends ListOf<Join> {
+    constructor(joins: Join[]);
+}
+export {};

package/dist/lang/ast/query-properties/joins.js

@@ -0,0 +1,143 @@
+"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.Joins = exports.ExpressionJoin = exports.KeyJoin = exports.Join = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
+const utils_1 = require("../expressions/utils");
+const malloy_element_1 = require("../types/malloy-element");
+class Join extends malloy_element_1.MalloyElement {
+}
+exports.Join = Join;
+class KeyJoin extends Join {
+    constructor(name, source, keyExpr) {
+        super({ name, source, keyExpr });
+        this.name = name;
+        this.source = source;
+        this.keyExpr = keyExpr;
+        this.elementType = "joinOnKey";
+    }
+    structDef() {
+        const sourceDef = this.source.structDef();
+        const joinStruct = {
+            ...sourceDef,
+            structRelationship: {
+                type: "one",
+                onExpression: ["('join fixup'='not done yet')"],
+            },
+            location: this.location,
+        };
+        if (sourceDef.structSource.type === "query") {
+            // the name from query does not need to be preserved
+            joinStruct.name = this.name.refString;
+        }
+        else {
+            joinStruct.as = this.name.refString;
+        }
+        return joinStruct;
+    }
+    fixupJoinOn(outer, inStruct) {
+        const exprX = this.keyExpr.getExpression(outer);
+        if (inStruct.primaryKey) {
+            const pkey = inStruct.fields.find((f) => (f.as || f.name) === inStruct.primaryKey);
+            if (pkey) {
+                if (pkey.type === exprX.dataType) {
+                    inStruct.structRelationship = {
+                        type: "one",
+                        onExpression: [
+                            { type: "field", path: `${this.name}.${inStruct.primaryKey}` },
+                            "=",
+                            ...exprX.value,
+                        ],
+                    };
+                    return;
+                }
+                else {
+                    this.log(`join_one: with type mismatch with primary key: ${exprX.dataType}/${pkey.type}`);
+                }
+            }
+            else {
+                this.log(`join_one: Primary key '${pkey}' not found in source`);
+            }
+        }
+        else {
+            this.log(`join_one: Cannot use with unless source has a primary key`);
+        }
+    }
+}
+exports.KeyJoin = KeyJoin;
+class ExpressionJoin extends Join {
+    constructor(name, source) {
+        super({ name, source });
+        this.name = name;
+        this.source = source;
+        this.elementType = "joinOnExpr";
+        this.joinType = "one";
+    }
+    set joinOn(joinExpr) {
+        this.expr = joinExpr;
+        this.has({ on: joinExpr });
+    }
+    get joinOn() {
+        return this.expr;
+    }
+    fixupJoinOn(outer, inStruct) {
+        if (this.expr == undefined) {
+            return;
+        }
+        const exprX = this.expr.getExpression(outer);
+        if (exprX.dataType !== "boolean") {
+            this.log("join conditions must be boolean expressions");
+            return;
+        }
+        const joinRel = inStruct.structRelationship;
+        if ((0, malloy_types_1.isJoinOn)(joinRel)) {
+            joinRel.onExpression = (0, utils_1.compressExpr)(exprX.value);
+        }
+    }
+    structDef() {
+        const sourceDef = this.source.structDef();
+        const joinStruct = {
+            ...sourceDef,
+            structRelationship: { type: this.joinType },
+            location: this.location,
+        };
+        if (sourceDef.structSource.type === "query") {
+            // the name from query does not need to be preserved
+            joinStruct.name = this.name.refString;
+            delete joinStruct.as;
+        }
+        else {
+            joinStruct.as = this.name.refString;
+        }
+        return joinStruct;
+    }
+}
+exports.ExpressionJoin = ExpressionJoin;
+class Joins extends malloy_element_1.ListOf {
+    constructor(joins) {
+        super("joinList", joins);
+    }
+}
+exports.Joins = Joins;
+//# sourceMappingURL=joins.js.map

package/dist/lang/ast/query-properties/limit.d.ts

@@ -0,0 +1,6 @@
+import { MalloyElement } from "../types/malloy-element";
+export declare class Limit extends MalloyElement {
+    readonly limit: number;
+    elementType: string;
+    constructor(limit: number);
+}

package/dist/lang/ast/query-properties/limit.js

@@ -0,0 +1,35 @@
+"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.Limit = void 0;
+const malloy_element_1 = require("../types/malloy-element");
+class Limit extends malloy_element_1.MalloyElement {
+    constructor(limit) {
+        super();
+        this.limit = limit;
+        this.elementType = "limit";
+    }
+}
+exports.Limit = Limit;
+//# sourceMappingURL=limit.js.map

package/dist/lang/ast/query-properties/measures.d.ts

@@ -0,0 +1,5 @@
+import { FieldDeclaration } from "../query-items/field-declaration";
+import { DeclareFields } from "./declare-fields";
+export declare class Measures extends DeclareFields {
+    constructor(measures: FieldDeclaration[]);
+}