@malloydata/malloy-query-builder 0.0.281 → 0.0.282

package/dist/query-ast.d.ts

@@ -424,6 +424,7 @@ export declare class ASTStringLiteralValue extends ASTObjectNode<Malloy.LiteralV
     node: Malloy.LiteralValueWithStringLiteral;
     readonly kind: Malloy.LiteralValueType;
     constructor(node: Malloy.LiteralValueWithStringLiteral);
+    get fieldType(): Malloy.AtomicType;
 }
 export declare class ASTNullLiteralValue extends ASTObjectNode<Malloy.LiteralValueWithNullLiteral, {
     kind: 'null_literal';
@@ -431,6 +432,7 @@ export declare class ASTNullLiteralValue extends ASTObjectNode<Malloy.LiteralVal
     node: Malloy.LiteralValueWithNullLiteral;
     readonly kind: Malloy.LiteralValueType;
     constructor(node: Malloy.LiteralValueWithNullLiteral);
+    get fieldType(): undefined;
 }
 export declare class ASTNumberLiteralValue extends ASTObjectNode<Malloy.LiteralValueWithNumberLiteral, {
     kind: 'number_literal';
@@ -439,6 +441,7 @@ export declare class ASTNumberLiteralValue extends ASTObjectNode<Malloy.LiteralV
     node: Malloy.LiteralValueWithNumberLiteral;
     readonly kind: Malloy.LiteralValueType;
     constructor(node: Malloy.LiteralValueWithNumberLiteral);
+    get fieldType(): Malloy.AtomicType;
 }
 export declare class ASTBooleanLiteralValue extends ASTObjectNode<Malloy.LiteralValueWithBooleanLiteral, {
     kind: 'boolean_literal';
@@ -447,6 +450,7 @@ export declare class ASTBooleanLiteralValue extends ASTObjectNode<Malloy.Literal
     node: Malloy.LiteralValueWithBooleanLiteral;
     readonly kind: Malloy.LiteralValueType;
     constructor(node: Malloy.LiteralValueWithBooleanLiteral);
+    get fieldType(): Malloy.AtomicType;
 }
 export declare class ASTDateLiteralValue extends ASTObjectNode<Malloy.LiteralValueWithDateLiteral, {
     kind: 'date_literal';
@@ -456,6 +460,7 @@ export declare class ASTDateLiteralValue extends ASTObjectNode<Malloy.LiteralVal
     node: Malloy.LiteralValueWithDateLiteral;
     readonly kind: Malloy.LiteralValueType;
     constructor(node: Malloy.LiteralValueWithDateLiteral);
+    get fieldType(): Malloy.AtomicType;
 }
 export declare class ASTTimestampLiteralValue extends ASTObjectNode<Malloy.LiteralValueWithTimestampLiteral, {
     kind: 'timestamp_literal';
@@ -465,6 +470,7 @@ export declare class ASTTimestampLiteralValue extends ASTObjectNode<Malloy.Liter
     node: Malloy.LiteralValueWithTimestampLiteral;
     readonly kind: Malloy.LiteralValueType;
     constructor(node: Malloy.LiteralValueWithTimestampLiteral);
+    get fieldType(): Malloy.AtomicType;
 }
 export declare class ASTFilterExpressionLiteralValue extends ASTObjectNode<Malloy.LiteralValueWithFilterExpressionLiteral, {
     kind: 'filter_expression_literal';
@@ -473,6 +479,7 @@ export declare class ASTFilterExpressionLiteralValue extends ASTObjectNode<Mallo
     node: Malloy.LiteralValueWithFilterExpressionLiteral;
     readonly kind: Malloy.LiteralValueType;
     constructor(node: Malloy.LiteralValueWithFilterExpressionLiteral);
+    get fieldType(): undefined;
 }
 export declare class ASTUnimplemented<T> extends ASTNode<T> {
     private readonly node;
@@ -902,6 +909,7 @@ export declare class ASTSegmentViewDefinition extends ASTObjectNode<Malloy.ViewD
      * @param path Join path for this dimension.
      */
     addGroupBy(name: string, path?: string[], rename?: string): ASTGroupByViewOperation;
+    addDrill(drill: Malloy.DrillOperation): ASTDrillViewOperation;
     addWhere(name: string, filter: ParsedFilter): ASTWhereViewOperation;
     addWhere(name: string, filterString: string): ASTWhereViewOperation;
     addWhere(name: string, path: string[], filter: ParsedFilter): ASTWhereViewOperation;
@@ -1010,7 +1018,7 @@ export declare class ASTViewOperationList extends ASTListNode<Malloy.ViewOperati
      */
     get segment(): ASTSegmentViewDefinition;
 }
-export type ASTViewOperation = ASTGroupByViewOperation | ASTAggregateViewOperation | ASTOrderByViewOperation | ASTNestViewOperation | ASTLimitViewOperation | ASTWhereViewOperation | ASTHavingViewOperation;
+export type ASTViewOperation = ASTGroupByViewOperation | ASTAggregateViewOperation | ASTOrderByViewOperation | ASTNestViewOperation | ASTLimitViewOperation | ASTWhereViewOperation | ASTDrillViewOperation | ASTHavingViewOperation;
 export declare const ASTViewOperation: {
     from(value: Malloy.ViewOperation): ASTViewOperation;
     isLimit(x: ASTViewOperation): x is ASTLimitViewOperation;
@@ -1195,7 +1203,7 @@ export declare class ASTField extends ASTObjectNode<Malloy.Field, {
     constructor(node: Malloy.Field);
     get expression(): ASTExpression;
     set expression(expression: ASTExpression);
-    get name(): string;
+    get name(): string | undefined;
     get type(): Malloy.AtomicType | {
         timeframe: Malloy.DateTimeframe;
         kind: "date_type";
@@ -1205,7 +1213,7 @@ export declare class ASTField extends ASTObjectNode<Malloy.Field, {
     };
     get annotations(): ASTAnnotationList | undefined;
     set annotations(annotations: ASTAnnotationList | undefined);
-    getReference(): Malloy.Reference;
+    getReference(): Malloy.Reference | undefined;
     getOrAddAnnotations(): ASTAnnotationList;
     getInheritedTag(prefix?: RegExp | string): Tag;
     getIntrinsicTag(prefix?: RegExp | string): Tag;
@@ -1218,7 +1226,7 @@ export declare class ASTField extends ASTObjectNode<Malloy.Field, {
     get segment(): ASTSegmentViewDefinition;
     getInheritedAnnotations(): Malloy.Annotation[];
 }
-export type ASTExpression = ASTReferenceExpression | ASTFilteredFieldExpression | ASTTimeTruncationExpression;
+export type ASTExpression = ASTReferenceExpression | ASTFilteredFieldExpression | ASTTimeTruncationExpression | ASTLiteralValueExpression;
 export declare const ASTExpression: {
     from(value: Malloy.Expression): ASTExpression;
 };
@@ -1274,11 +1282,23 @@ export declare class ASTTimeTruncationExpression extends ASTObjectNode<Malloy.Ex
     };
     getInheritedAnnotations(): Malloy.Annotation[];
 }
+export declare class ASTLiteralValueExpression extends ASTObjectNode<Malloy.ExpressionWithLiteralValue, {
+    kind: 'literal_value';
+    literal_value: ASTLiteralValue;
+}> {
+    node: Malloy.ExpressionWithLiteralValue;
+    readonly kind: Malloy.ExpressionType;
+    constructor(node: Malloy.ExpressionWithLiteralValue);
+    get name(): undefined;
+    get literalValue(): ASTLiteralValue;
+    get fieldType(): Malloy.AtomicType | undefined;
+    getInheritedAnnotations(): Malloy.Annotation[];
+}
 export declare class ASTFilterOperation extends ASTObjectNode<Malloy.FilterOperation, {
     filter: ASTFilter;
 }> {
     constructor(node: Malloy.FilterOperation);
-    get filter(): ASTFilterWithFilterString;
+    get filter(): ASTFilter;
     get list(): ASTFilterOperationList;
     delete(): void;
 }
@@ -1387,7 +1407,21 @@ export declare class ASTWhereViewOperation extends ASTObjectNode<Malloy.ViewOper
     node: Malloy.ViewOperationWithWhere;
     readonly kind: Malloy.ViewOperationType;
     constructor(node: Malloy.ViewOperationWithWhere);
-    get filter(): ASTFilterWithFilterString;
+    get filter(): ASTFilter;
+    /**
+     * @internal
+     */
+    get list(): ASTViewOperationList;
+    delete(): void;
+}
+export declare class ASTDrillViewOperation extends ASTObjectNode<Malloy.ViewOperationWithDrill, {
+    kind: 'drill';
+    filter: ASTFilter;
+}> {
+    node: Malloy.ViewOperationWithDrill;
+    readonly kind: Malloy.ViewOperationType;
+    constructor(node: Malloy.ViewOperationWithDrill);
+    get filter(): ASTFilter;
     /**
      * @internal
      */
@@ -1401,16 +1435,16 @@ export declare class ASTHavingViewOperation extends ASTObjectNode<Malloy.ViewOpe
     node: Malloy.ViewOperationWithHaving;
     readonly kind: Malloy.ViewOperationType;
     constructor(node: Malloy.ViewOperationWithHaving);
-    get filter(): ASTFilterWithFilterString;
+    get filter(): ASTFilter;
     /**
      * @internal
      */
     get list(): ASTViewOperationList;
     delete(): void;
 }
-export type ASTFilter = ASTFilterWithFilterString;
+export type ASTFilter = ASTFilterWithFilterString | ASTFilterWithLiteralEquality;
 export declare const ASTFilter: {
-    from(filter: Malloy.Filter): ASTFilterWithFilterString;
+    from(filter: Malloy.Filter): ASTFilterWithFilterString | ASTFilterWithLiteralEquality;
 };
 export declare class ASTFilterWithFilterString extends ASTObjectNode<Malloy.FilterWithFilterString, {
     kind: 'filter_string';
@@ -1429,6 +1463,17 @@ export declare class ASTFilterWithFilterString extends ASTObjectNode<Malloy.Filt
     setFilter(filter: ParsedFilter): void;
     getFilter(): ParsedFilter;
 }
+export declare class ASTFilterWithLiteralEquality extends ASTObjectNode<Malloy.FilterWithLiteralEquality, {
+    kind: 'literal_equality';
+    field_reference: ASTFieldReference;
+    value: ASTLiteralValue;
+}> {
+    node: Malloy.FilterWithLiteralEquality;
+    readonly kind: Malloy.FilterType;
+    constructor(node: Malloy.FilterWithLiteralEquality);
+    get fieldReference(): ASTFieldReference;
+    get value(): ASTLiteralValue;
+}
 export declare class ASTView extends ASTObjectNode<Malloy.View, {
     definition: ASTViewDefinition;
     annotations?: ASTAnnotationList;

package/dist/query-ast.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASTAnnotation = exports.ASTAnnotationList = exports.ASTLimitViewOperation = exports.ASTView = exports.ASTFilterWithFilterString = exports.ASTFilter = exports.ASTHavingViewOperation = exports.ASTWhereViewOperation = exports.ASTNestViewOperation = exports.ASTFilteredFieldExpression = exports.ASTFilterOperationList = exports.ASTFilterOperation = exports.ASTTimeTruncationExpression = exports.ASTReferenceExpression = exports.ASTExpression = exports.ASTField = exports.ASTAggregateViewOperation = exports.ASTGroupByViewOperation = exports.ASTOrderByViewOperation = exports.ASTViewOperation = exports.ASTViewOperationList = exports.ASTSegmentViewDefinition = exports.ASTRefinementViewDefinition = exports.ASTArrowViewDefinition = exports.ASTReferenceViewDefinition = exports.ASTReferenceQueryArrowSource = exports.ASTReferenceQueryDefinition = exports.ASTRefinementQueryDefinition = exports.ASTArrowQueryDefinition = exports.ASTQueryDefinition = exports.ASTQueryArrowSource = exports.ASTUnimplemented = exports.ASTFilterExpressionLiteralValue = exports.ASTTimestampLiteralValue = exports.ASTDateLiteralValue = exports.ASTBooleanLiteralValue = exports.ASTNumberLiteralValue = exports.ASTNullLiteralValue = exports.ASTStringLiteralValue = exports.ASTLiteralValue = exports.ASTParameterValue = exports.ASTParameterValueList = exports.ASTFieldReference = exports.ASTReference = exports.ASTQuery = void 0;
+exports.ASTAnnotation = exports.ASTAnnotationList = exports.ASTLimitViewOperation = exports.ASTView = exports.ASTFilterWithLiteralEquality = exports.ASTFilterWithFilterString = exports.ASTFilter = exports.ASTHavingViewOperation = exports.ASTDrillViewOperation = exports.ASTWhereViewOperation = exports.ASTNestViewOperation = exports.ASTFilteredFieldExpression = exports.ASTFilterOperationList = exports.ASTFilterOperation = exports.ASTLiteralValueExpression = exports.ASTTimeTruncationExpression = exports.ASTReferenceExpression = exports.ASTExpression = exports.ASTField = exports.ASTAggregateViewOperation = exports.ASTGroupByViewOperation = exports.ASTOrderByViewOperation = exports.ASTViewOperation = exports.ASTViewOperationList = exports.ASTSegmentViewDefinition = exports.ASTRefinementViewDefinition = exports.ASTArrowViewDefinition = exports.ASTReferenceViewDefinition = exports.ASTReferenceQueryArrowSource = exports.ASTReferenceQueryDefinition = exports.ASTRefinementQueryDefinition = exports.ASTArrowQueryDefinition = exports.ASTQueryDefinition = exports.ASTQueryArrowSource = exports.ASTUnimplemented = exports.ASTFilterExpressionLiteralValue = exports.ASTTimestampLiteralValue = exports.ASTDateLiteralValue = exports.ASTBooleanLiteralValue = exports.ASTNumberLiteralValue = exports.ASTNullLiteralValue = exports.ASTStringLiteralValue = exports.ASTLiteralValue = exports.ASTParameterValue = exports.ASTParameterValueList = exports.ASTFieldReference = exports.ASTReference = exports.ASTQuery = void 0;
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -1045,6 +1045,11 @@ class ASTStringLiteralValue extends ASTObjectNode {
         this.node = node;
         this.kind = 'string_literal';
     }
+    get fieldType() {
+        return {
+            kind: 'string_type',
+        };
+    }
 }
 exports.ASTStringLiteralValue = ASTStringLiteralValue;
 class ASTNullLiteralValue extends ASTObjectNode {
@@ -1055,6 +1060,9 @@ class ASTNullLiteralValue extends ASTObjectNode {
         this.node = node;
         this.kind = 'null_literal';
     }
+    get fieldType() {
+        return undefined;
+    }
 }
 exports.ASTNullLiteralValue = ASTNullLiteralValue;
 class ASTNumberLiteralValue extends ASTObjectNode {
@@ -1066,6 +1074,14 @@ class ASTNumberLiteralValue extends ASTObjectNode {
         this.node = node;
         this.kind = 'number_literal';
     }
+    get fieldType() {
+        return {
+            kind: 'number_type',
+            subtype: Number.isInteger(this.children.number_value)
+                ? 'integer'
+                : 'decimal',
+        };
+    }
 }
 exports.ASTNumberLiteralValue = ASTNumberLiteralValue;
 class ASTBooleanLiteralValue extends ASTObjectNode {
@@ -1077,6 +1093,11 @@ class ASTBooleanLiteralValue extends ASTObjectNode {
         this.node = node;
         this.kind = 'boolean_literal';
     }
+    get fieldType() {
+        return {
+            kind: 'boolean_type',
+        };
+    }
 }
 exports.ASTBooleanLiteralValue = ASTBooleanLiteralValue;
 class ASTDateLiteralValue extends ASTObjectNode {
@@ -1089,6 +1110,12 @@ class ASTDateLiteralValue extends ASTObjectNode {
         this.node = node;
         this.kind = 'date_literal';
     }
+    get fieldType() {
+        return {
+            kind: 'date_type',
+            timeframe: this.children.granularity,
+        };
+    }
 }
 exports.ASTDateLiteralValue = ASTDateLiteralValue;
 class ASTTimestampLiteralValue extends ASTObjectNode {
@@ -1101,6 +1128,12 @@ class ASTTimestampLiteralValue extends ASTObjectNode {
         this.node = node;
         this.kind = 'timestamp_literal';
     }
+    get fieldType() {
+        return {
+            kind: 'timestamp_type',
+            timeframe: this.children.granularity,
+        };
+    }
 }
 exports.ASTTimestampLiteralValue = ASTTimestampLiteralValue;
 class ASTFilterExpressionLiteralValue extends ASTObjectNode {
@@ -1112,6 +1145,9 @@ class ASTFilterExpressionLiteralValue extends ASTObjectNode {
         this.node = node;
         this.kind = 'filter_expression_literal';
     }
+    get fieldType() {
+        return undefined;
+    }
 }
 exports.ASTFilterExpressionLiteralValue = ASTFilterExpressionLiteralValue;
 class ASTUnimplemented extends ASTNode {
@@ -1840,6 +1876,7 @@ class ASTSegmentViewDefinition extends ASTObjectNode {
         this.DEFAULT_INSERTION_ORDER = [
             'group_by',
             'aggregate',
+            'drill',
             'where',
             'having',
             'nest',
@@ -2104,7 +2141,9 @@ class ASTSegmentViewDefinition extends ASTObjectNode {
             if (operation instanceof ASTGroupByViewOperation ||
                 operation instanceof ASTAggregateViewOperation) {
                 const reference = operation.field.getReference();
-                if (reference.name === name && pathsMatch(reference.path, path)) {
+                if (reference &&
+                    reference.name === name &&
+                    pathsMatch(reference.path, path)) {
                     return operation;
                 }
             }
@@ -2203,6 +2242,14 @@ class ASTSegmentViewDefinition extends ASTObjectNode {
         this.addOperation(item);
         return item;
     }
+    addDrill(drill) {
+        const item = new ASTDrillViewOperation({
+            kind: 'drill',
+            ...drill,
+        });
+        this.addOperation(item);
+        return item;
+    }
     addWhere(name, arg2, arg3) {
         const path = Array.isArray(arg2) ? arg2 : [];
         const filter = arg3 === undefined ? arg2 : arg3;
@@ -2485,6 +2532,8 @@ exports.ASTViewOperation = {
                 return new ASTLimitViewOperation(value);
             case 'where':
                 return new ASTWhereViewOperation(value);
+            case 'drill':
+                return new ASTDrillViewOperation(value);
             case 'having':
                 return new ASTHavingViewOperation(value);
         }
@@ -2551,7 +2600,11 @@ class ASTGroupByViewOperation extends ASTObjectNode {
     }
     get name() {
         var _a;
-        return (_a = this.children.name) !== null && _a !== void 0 ? _a : this.field.name;
+        const name = (_a = this.children.name) !== null && _a !== void 0 ? _a : this.field.name;
+        if (name === undefined) {
+            throw new Error('Group by does not have a name');
+        }
+        return name;
     }
     set name(name) {
         if (this.name === name)
@@ -2705,7 +2758,11 @@ class ASTAggregateViewOperation extends ASTObjectNode {
     }
     get name() {
         var _a;
-        return (_a = this.children.name) !== null && _a !== void 0 ? _a : this.field.name;
+        const name = (_a = this.children.name) !== null && _a !== void 0 ? _a : this.field.name;
+        if (name === undefined) {
+            throw new Error('Aggregate does not have a name');
+        }
+        return name;
     }
     set name(name) {
         if (this.name === name)
@@ -2873,7 +2930,11 @@ class ASTField extends ASTObjectNode {
         return this.expression.name;
     }
     get type() {
-        return this.expression.fieldType;
+        const type = this.expression.fieldType;
+        if (type === undefined) {
+            throw new Error('Field expression does not have a type');
+        }
+        return type;
     }
     get annotations() {
         return this.children.annotations;
@@ -2884,6 +2945,9 @@ class ASTField extends ASTObjectNode {
     }
     // Returns a Malloy reference that this field points to
     getReference() {
+        if (this.expression instanceof ASTLiteralValueExpression) {
+            return undefined;
+        }
         return this.expression.getReference();
     }
     getOrAddAnnotations() {
@@ -2936,6 +3000,8 @@ exports.ASTExpression = {
                 return new ASTFilteredFieldExpression(value);
             case 'time_truncation':
                 return new ASTTimeTruncationExpression(value);
+            case 'literal_value':
+                return new ASTLiteralValueExpression(value);
         }
     },
 };
@@ -3060,6 +3126,29 @@ class ASTTimeTruncationExpression extends ASTObjectNode {
     }
 }
 exports.ASTTimeTruncationExpression = ASTTimeTruncationExpression;
+class ASTLiteralValueExpression extends ASTObjectNode {
+    constructor(node) {
+        super(node, {
+            kind: node.kind,
+            literal_value: exports.ASTLiteralValue.from(node.literal_value),
+        });
+        this.node = node;
+        this.kind = 'time_truncation';
+    }
+    get name() {
+        return undefined;
+    }
+    get literalValue() {
+        return this.children.literal_value;
+    }
+    get fieldType() {
+        return this.literalValue.fieldType;
+    }
+    getInheritedAnnotations() {
+        return [];
+    }
+}
+exports.ASTLiteralValueExpression = ASTLiteralValueExpression;
 class ASTFilterOperation extends ASTObjectNode {
     constructor(node) {
         super(node, {
@@ -3306,6 +3395,29 @@ class ASTWhereViewOperation extends ASTObjectNode {
     }
 }
 exports.ASTWhereViewOperation = ASTWhereViewOperation;
+class ASTDrillViewOperation extends ASTObjectNode {
+    constructor(node) {
+        super(node, {
+            kind: 'drill',
+            filter: exports.ASTFilter.from(node.filter),
+        });
+        this.node = node;
+        this.kind = 'drill';
+    }
+    get filter() {
+        return this.children.filter;
+    }
+    /**
+     * @internal
+     */
+    get list() {
+        return this.parent.as.ViewOperationList();
+    }
+    delete() {
+        this.list.remove(this);
+    }
+}
+exports.ASTDrillViewOperation = ASTDrillViewOperation;
 class ASTHavingViewOperation extends ASTObjectNode {
     constructor(node) {
         super(node, {
@@ -3331,7 +3443,12 @@ class ASTHavingViewOperation extends ASTObjectNode {
 exports.ASTHavingViewOperation = ASTHavingViewOperation;
 exports.ASTFilter = {
     from(filter) {
-        return new ASTFilterWithFilterString(filter);
+        switch (filter.kind) {
+            case 'filter_string':
+                return new ASTFilterWithFilterString(filter);
+            case 'literal_equality':
+                return new ASTFilterWithLiteralEquality(filter);
+        }
     },
 };
 class ASTFilterWithFilterString extends ASTObjectNode {
@@ -3383,6 +3500,24 @@ class ASTFilterWithFilterString extends ASTObjectNode {
     }
 }
 exports.ASTFilterWithFilterString = ASTFilterWithFilterString;
+class ASTFilterWithLiteralEquality extends ASTObjectNode {
+    constructor(node) {
+        super(node, {
+            kind: 'literal_equality',
+            field_reference: new ASTFieldReference(node.field_reference),
+            value: exports.ASTLiteralValue.from(node.value),
+        });
+        this.node = node;
+        this.kind = 'literal_equality';
+    }
+    get fieldReference() {
+        return this.children.field_reference;
+    }
+    get value() {
+        return this.children.value;
+    }
+}
+exports.ASTFilterWithLiteralEquality = ASTFilterWithLiteralEquality;
 class ASTView extends ASTObjectNode {
     constructor(node) {
         super(node, {