@malloydata/malloy-query-builder 0.0.293 → 0.0.295

package/dist/query-ast.d.ts

@@ -1257,7 +1257,7 @@ export declare class ASTReferenceExpression extends ASTObjectNode<Malloy.Express
     /**
      * @internal
      */
-    get field(): ASTField;
+    get segment(): ASTSegmentViewDefinition;
     get path(): string[] | undefined;
     getReference(): Malloy.ExpressionWithFieldReference;
     getFieldInfo(): Malloy.FieldInfoWithDimension | Malloy.FieldInfoWithMeasure;
@@ -1305,6 +1305,7 @@ export declare class ASTLiteralValueExpression extends ASTObjectNode<Malloy.Expr
     get literalValue(): ASTLiteralValue;
     get fieldType(): Malloy.AtomicType | undefined;
     getInheritedAnnotations(): Malloy.Annotation[];
+    getFieldInfo(): undefined;
 }
 export declare class ASTFilterOperation extends ASTObjectNode<Malloy.FilterOperation, {
     filter: ASTFilter;
@@ -1457,19 +1458,21 @@ export declare class ASTHavingViewOperation extends ASTObjectNode<Malloy.ViewOpe
 export type ASTFilter = ASTFilterWithFilterString | ASTFilterWithLiteralEquality;
 export declare const ASTFilter: {
     from(filter: Malloy.Filter): ASTFilterWithFilterString | ASTFilterWithLiteralEquality;
+    getSegment(filter: ASTFilter): ASTSegmentViewDefinition;
 };
 export declare class ASTFilterWithFilterString extends ASTObjectNode<Malloy.FilterWithFilterString, {
     kind: 'filter_string';
-    field_reference: ASTFieldReference;
+    expression: ASTExpression;
     filter: string;
 }> {
     node: Malloy.FilterWithFilterString;
     readonly kind: Malloy.FilterType;
     constructor(node: Malloy.FilterWithFilterString);
-    get fieldReference(): ASTFieldReference;
+    get expression(): ASTExpression;
     get filterString(): string;
     set filterString(filter: string);
     setFilterString(filterString: string): void;
+    get segment(): ASTSegmentViewDefinition;
     getFieldInfo(): Malloy.FieldInfoWithDimension | Malloy.FieldInfoWithMeasure;
     getFilterType(): Filter.FilterableType | 'other';
     setFilter(filter: ParsedFilter): void;
@@ -1477,14 +1480,15 @@ export declare class ASTFilterWithFilterString extends ASTObjectNode<Malloy.Filt
 }
 export declare class ASTFilterWithLiteralEquality extends ASTObjectNode<Malloy.FilterWithLiteralEquality, {
     kind: 'literal_equality';
-    field_reference: ASTFieldReference;
+    expression: ASTExpression;
     value: ASTLiteralValue;
 }> {
     node: Malloy.FilterWithLiteralEquality;
     readonly kind: Malloy.FilterType;
     constructor(node: Malloy.FilterWithLiteralEquality);
-    get fieldReference(): ASTFieldReference;
+    get expression(): ASTExpression;
     get value(): ASTLiteralValue;
+    get segment(): ASTSegmentViewDefinition;
 }
 export declare class ASTView extends ASTObjectNode<Malloy.View, {
     definition: ASTViewDefinition;

package/dist/query-ast.js

@@ -934,13 +934,7 @@ class ASTFieldReference extends ASTReference {
         }
         else if (parent instanceof ASTFilterWithFilterString ||
             parent instanceof ASTFilterWithLiteralEquality) {
-            const grand = parent.parent;
-            if (grand instanceof ASTFilterOperation) {
-                return grand.list.expression.field.segment;
-            }
-            else {
-                return grand.list.segment;
-            }
+            return parent.segment;
         }
         else {
             return parent.list.segment;
@@ -954,14 +948,7 @@ class ASTFieldReference extends ASTReference {
     }
     getFieldInfo() {
         const schema = this.getReferenceSchema();
-        const isDrill = this.parent instanceof ASTFilterWithLiteralEquality &&
-            this.parent.parent instanceof ASTDrillViewOperation;
-        if (isDrill) {
-            return ASTNode.schemaGetDrillField(schema, this.name, this.path);
-        }
-        else {
-            return ASTNode.schemaGet(schema, this.name, this.path);
-        }
+        return ASTNode.schemaGet(schema, this.name, this.path);
     }
 }
 exports.ASTFieldReference = ASTFieldReference;
@@ -2293,7 +2280,11 @@ class ASTSegmentViewDefinition extends ASTObjectNode {
             kind: 'where',
             filter: {
                 kind: 'filter_string',
-                field_reference: { name, path },
+                expression: {
+                    kind: 'field_reference',
+                    name,
+                    path,
+                },
                 filter: filterString,
             },
         });
@@ -2313,7 +2304,11 @@ class ASTSegmentViewDefinition extends ASTObjectNode {
             kind: 'having',
             filter: {
                 kind: 'filter_string',
-                field_reference: { name, path },
+                expression: {
+                    kind: 'field_reference',
+                    name,
+                    path,
+                },
                 filter: filterString,
             },
         });
@@ -2897,7 +2892,11 @@ class ASTAggregateViewOperation extends ASTObjectNode {
         const where = {
             filter: {
                 kind: 'filter_string',
-                field_reference: { name, path },
+                expression: {
+                    kind: 'field_reference',
+                    name,
+                    path,
+                },
                 filter: filterString,
             },
         };
@@ -3060,8 +3059,18 @@ class ASTReferenceExpression extends ASTObjectNode {
     /**
      * @internal
      */
-    get field() {
-        return this.parent.as.Field();
+    get segment() {
+        const parent = this.parent;
+        if (parent instanceof ASTField) {
+            return parent.segment;
+        }
+        else if (parent instanceof ASTFilterWithFilterString ||
+            parent instanceof ASTFilterWithLiteralEquality) {
+            return parent.segment;
+        }
+        else {
+            throw new Error('Invalid expression parent');
+        }
     }
     get path() {
         return this.children.path;
@@ -3070,8 +3079,12 @@ class ASTReferenceExpression extends ASTObjectNode {
         return this.build();
     }
     getFieldInfo() {
-        const schema = this.field.segment.getInputSchema();
-        const def = ASTNode.schemaGet(schema, this.name, this.path);
+        const schema = this.segment.getInputSchema();
+        const isDrill = this.parent instanceof ASTFilterWithLiteralEquality &&
+            this.parent.parent instanceof ASTDrillViewOperation;
+        const def = isDrill
+            ? ASTNode.schemaGetDrillField(schema, this.name, this.path)
+            : ASTNode.schemaGet(schema, this.name, this.path);
         if (def.kind !== 'dimension' && def.kind !== 'measure') {
             throw new Error('Invalid field for ASTReferenceExpression');
         }
@@ -3177,6 +3190,9 @@ class ASTLiteralValueExpression extends ASTObjectNode {
     getInheritedAnnotations() {
         return [];
     }
+    getFieldInfo() {
+        return undefined;
+    }
 }
 exports.ASTLiteralValueExpression = ASTLiteralValueExpression;
 class ASTFilterOperation extends ASTObjectNode {
@@ -3480,19 +3496,28 @@ exports.ASTFilter = {
                 return new ASTFilterWithLiteralEquality(filter);
         }
     },
+    getSegment(filter) {
+        const grand = filter.parent;
+        if (grand instanceof ASTFilterOperation) {
+            return grand.list.expression.field.segment;
+        }
+        else {
+            return grand.list.segment;
+        }
+    },
 };
 class ASTFilterWithFilterString extends ASTObjectNode {
     constructor(node) {
         super(node, {
             kind: 'filter_string',
-            field_reference: new ASTFieldReference(node.field_reference),
+            expression: exports.ASTExpression.from(node.expression),
             filter: node.filter,
         });
         this.node = node;
         this.kind = 'filter_string';
     }
-    get fieldReference() {
-        return this.children.field_reference;
+    get expression() {
+        return this.children.expression;
     }
     get filterString() {
         return this.children.filter;
@@ -3506,9 +3531,13 @@ class ASTFilterWithFilterString extends ASTObjectNode {
         parseFilter(this.filterString, kind);
         this.filterString = filterString;
     }
+    get segment() {
+        return exports.ASTFilter.getSegment(this);
+    }
     getFieldInfo() {
-        const field = this.fieldReference.getFieldInfo();
-        if (field.kind !== 'dimension' && field.kind !== 'measure') {
+        const field = this.expression.getFieldInfo();
+        if (field === undefined ||
+            (field.kind !== 'dimension' && field.kind !== 'measure')) {
             throw new Error('Invalid field type for filter with filter string');
         }
         return field;
@@ -3534,18 +3563,21 @@ class ASTFilterWithLiteralEquality extends ASTObjectNode {
     constructor(node) {
         super(node, {
             kind: 'literal_equality',
-            field_reference: new ASTFieldReference(node.field_reference),
+            expression: exports.ASTExpression.from(node.expression),
             value: exports.ASTLiteralValue.from(node.value),
         });
         this.node = node;
         this.kind = 'literal_equality';
     }
-    get fieldReference() {
-        return this.children.field_reference;
+    get expression() {
+        return this.children.expression;
     }
     get value() {
         return this.children.value;
     }
+    get segment() {
+        return exports.ASTFilter.getSegment(this);
+    }
 }
 exports.ASTFilterWithLiteralEquality = ASTFilterWithLiteralEquality;
 class ASTView extends ASTObjectNode {