@malloydata/malloy-query-builder 0.0.294 → 0.0.295

package/src/query-ast.spec.ts

@@ -356,7 +356,10 @@ describe('query builder', () => {
                         {
                           filter: {
                             kind: 'filter_string',
-                            field_reference: {name: 'carrier'},
+                            expression: {
+                              kind: 'field_reference',
+                              name: 'carrier',
+                            },
                             filter: 'WN, AA',
                           },
                         },
@@ -406,7 +409,10 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: 'WN, AA',
                 },
               },
@@ -450,7 +456,11 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'state', path: ['origin']},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'state',
+                    path: ['origin'],
+                  },
                   filter: 'TX',
                 },
               },
@@ -497,7 +507,10 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: 'WN, AA',
                 },
               },
@@ -553,7 +566,10 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: "'",
                 },
               },
@@ -561,7 +577,10 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: '\'"',
                 },
               },
@@ -569,7 +588,10 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: '`',
                 },
               },
@@ -577,7 +599,10 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: "`'",
                 },
               },
@@ -585,7 +610,10 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: '`\'"',
                 },
               },
@@ -593,7 +621,10 @@ describe('query builder', () => {
                 kind: 'where',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: "`'\"\"\"'''",
                 },
               },
@@ -632,7 +663,8 @@ describe('query builder', () => {
       segment.addDrill({
         filter: {
           kind: 'filter_string',
-          field_reference: {
+          expression: {
+            kind: 'field_reference',
             name: 'carrier',
           },
           filter: 'WN, AA',
@@ -641,7 +673,8 @@ describe('query builder', () => {
       segment.addDrill({
         filter: {
           kind: 'literal_equality',
-          field_reference: {
+          expression: {
+            kind: 'field_reference',
             name: 'nickname',
             path: ['top_carriers'],
           },
@@ -668,7 +701,10 @@ describe('query builder', () => {
                 kind: 'drill',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'carrier'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'carrier',
+                  },
                   filter: 'WN, AA',
                 },
               },
@@ -676,7 +712,8 @@ describe('query builder', () => {
                 kind: 'drill',
                 filter: {
                   kind: 'literal_equality',
-                  field_reference: {
+                  expression: {
+                    kind: 'field_reference',
                     name: 'nickname',
                     path: ['top_carriers'],
                   },
@@ -718,7 +755,8 @@ describe('query builder', () => {
     const drill = segment.addDrill({
       filter: {
         kind: 'literal_equality',
-        field_reference: {
+        expression: {
+          kind: 'field_reference',
           name: 'nickname',
           path: ['top_carriers'],
         },
@@ -728,7 +766,7 @@ describe('query builder', () => {
         },
       },
     });
-    expect(drill.filter.fieldReference.getFieldInfo()).toMatchObject({
+    expect(drill.filter.expression.getFieldInfo()).toMatchObject({
       kind: 'dimension',
       type: {kind: 'string_type'},
     });
@@ -766,7 +804,10 @@ describe('query builder', () => {
                 kind: 'having',
                 filter: {
                   kind: 'filter_string',
-                  field_reference: {name: 'flight_count'},
+                  expression: {
+                    kind: 'field_reference',
+                    name: 'flight_count',
+                  },
                   filter: '>100',
                 },
               },
@@ -3051,7 +3092,10 @@ describe('query builder', () => {
                   filter: {
                     kind: 'filter_string',
                     filter: '> 10',
-                    field_reference: {name: 'd1'},
+                    expression: {
+                      kind: 'field_reference',
+                      name: 'd1',
+                    },
                   },
                 },
                 {
@@ -3059,7 +3103,10 @@ describe('query builder', () => {
                   filter: {
                     kind: 'filter_string',
                     filter: '> 10',
-                    field_reference: {name: 'm1'},
+                    expression: {
+                      kind: 'field_reference',
+                      name: 'm1',
+                    },
                   },
                 },
                 {kind: 'limit', limit: 10},
@@ -3242,7 +3289,11 @@ describe('query builder', () => {
                   kind: 'where',
                   filter: {
                     kind: 'filter_string',
-                    field_reference: {name: 'd1', path: ['r1']},
+                    expression: {
+                      kind: 'field_reference',
+                      name: 'd1',
+                      path: ['r1'],
+                    },
                     filter: 'WN, AA',
                   },
                 },
@@ -3286,7 +3337,11 @@ describe('query builder', () => {
                   kind: 'where',
                   filter: {
                     kind: 'filter_string',
-                    field_reference: {name: 'd1', path: ['rr1']},
+                    expression: {
+                      kind: 'field_reference',
+                      name: 'd1',
+                      path: ['rr1'],
+                    },
                     filter: 'WN, AA',
                   },
                 },

package/src/query-ast.ts

@@ -1124,16 +1124,7 @@ export class ASTFieldReference extends ASTReference {
       parent instanceof ASTFilterWithFilterString ||
       parent instanceof ASTFilterWithLiteralEquality
     ) {
-      const grand = parent.parent as
-        | ASTFilterOperation
-        | ASTWhereViewOperation
-        | ASTDrillViewOperation
-        | ASTHavingViewOperation;
-      if (grand instanceof ASTFilterOperation) {
-        return grand.list.expression.field.segment;
-      } else {
-        return grand.list.segment;
-      }
+      return parent.segment;
     } else {
       return parent.list.segment;
     }
@@ -1148,14 +1139,7 @@ export 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);
   }
 }
 
@@ -2942,7 +2926,11 @@ export class ASTSegmentViewDefinition
       kind: 'where',
       filter: {
         kind: 'filter_string',
-        field_reference: {name, path},
+        expression: {
+          kind: 'field_reference',
+          name,
+          path,
+        },
         filter: filterString,
       },
     });
@@ -2980,7 +2968,11 @@ export class ASTSegmentViewDefinition
       kind: 'having',
       filter: {
         kind: 'filter_string',
-        field_reference: {name, path},
+        expression: {
+          kind: 'field_reference',
+          name,
+          path,
+        },
         filter: filterString,
       },
     });
@@ -3758,7 +3750,11 @@ export class ASTAggregateViewOperation
     const where: Malloy.FilterOperation = {
       filter: {
         kind: 'filter_string',
-        field_reference: {name, path},
+        expression: {
+          kind: 'field_reference',
+          name,
+          path,
+        },
         filter: filterString,
       },
     };
@@ -3966,8 +3962,18 @@ export class ASTReferenceExpression
   /**
    * @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() {
@@ -3979,8 +3985,13 @@ export class ASTReferenceExpression
   }
 
   getFieldInfo(): Malloy.FieldInfoWithDimension | Malloy.FieldInfoWithMeasure {
-    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');
     }
@@ -4117,6 +4128,10 @@ export class ASTLiteralValueExpression extends ASTObjectNode<
   getInheritedAnnotations(): Malloy.Annotation[] {
     return [];
   }
+
+  getFieldInfo() {
+    return undefined;
+  }
 }
 
 export class ASTFilterOperation extends ASTObjectNode<
@@ -4499,13 +4514,25 @@ export const ASTFilter = {
         return new ASTFilterWithLiteralEquality(filter);
     }
   },
+  getSegment(filter: ASTFilter) {
+    const grand = filter.parent as
+      | ASTFilterOperation
+      | ASTWhereViewOperation
+      | ASTDrillViewOperation
+      | ASTHavingViewOperation;
+    if (grand instanceof ASTFilterOperation) {
+      return grand.list.expression.field.segment;
+    } else {
+      return grand.list.segment;
+    }
+  },
 };
 
 export class ASTFilterWithFilterString extends ASTObjectNode<
   Malloy.FilterWithFilterString,
   {
     kind: 'filter_string';
-    field_reference: ASTFieldReference;
+    expression: ASTExpression;
     filter: string;
   }
 > {
@@ -4513,13 +4540,13 @@ export class ASTFilterWithFilterString extends ASTObjectNode<
   constructor(public node: Malloy.FilterWithFilterString) {
     super(node, {
       kind: 'filter_string',
-      field_reference: new ASTFieldReference(node.field_reference),
+      expression: ASTExpression.from(node.expression),
       filter: node.filter,
     });
   }
 
-  get fieldReference() {
-    return this.children.field_reference;
+  get expression() {
+    return this.children.expression;
   }
 
   get filterString() {
@@ -4537,9 +4564,16 @@ export class ASTFilterWithFilterString extends ASTObjectNode<
     this.filterString = filterString;
   }
 
+  get segment() {
+    return 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;
@@ -4570,7 +4604,7 @@ export class ASTFilterWithLiteralEquality extends ASTObjectNode<
   Malloy.FilterWithLiteralEquality,
   {
     kind: 'literal_equality';
-    field_reference: ASTFieldReference;
+    expression: ASTExpression;
     value: ASTLiteralValue;
   }
 > {
@@ -4578,18 +4612,22 @@ export class ASTFilterWithLiteralEquality extends ASTObjectNode<
   constructor(public node: Malloy.FilterWithLiteralEquality) {
     super(node, {
       kind: 'literal_equality',
-      field_reference: new ASTFieldReference(node.field_reference),
+      expression: ASTExpression.from(node.expression),
       value: ASTLiteralValue.from(node.value),
     });
   }
 
-  get fieldReference() {
-    return this.children.field_reference;
+  get expression() {
+    return this.children.expression;
   }
 
   get value() {
     return this.children.value;
   }
+
+  get segment() {
+    return ASTFilter.getSegment(this);
+  }
 }
 
 export class ASTView