@malloydata/malloy-query-builder 0.0.240-dev250305162504 → 0.0.240-dev250305163014

package/dist/query-ast.js

@@ -49,394 +49,233 @@ class ASTNode {
             this._parent.edit();
         return this;
     }
-    /**
-     * Returns this node as an `ASTQuery`. Throws if it is not an `ASTQuery`.
-     *
-     * There are variants of this method for _all_ ASTXYZ nodes `asXYZ`, but they
-     * are not shown here so the docs aren't crazy big.
-     *
-     * @returns Returns this node as an `ASTQuery`.
-     */
-    asQuery() {
-        if (this instanceof ASTQuery)
-            return this;
-        throw new Error('Not an ASTQuery');
-    }
-    /**
-     * Finds the AST node at the given `path`. Throws if it is not an `ASTQuery`.
-     *
-     * There are variants of this method for _all_ ASTXYZ nodes `findXYZ`, but they
-     * are not shown here so the docs aren't crazy big.
-     *
-     * @param path Path to the desired ASTNode, e.g. `['source', 'parameters', 0]`
-     * @returns Returns this node as an `ASTQuery`.
-     */
-    findQuery(path) {
-        return this.find(path).asQuery();
-    }
-    /**
-     * @hidden
-     */
-    asReference() {
-        if (this instanceof ASTReference)
-            return this;
-        throw new Error('Not an ASTReference');
-    }
-    /**
-     * @hidden
-     */
-    findReference(path) {
-        return this.find(path).asReference();
-    }
-    /**
-     * @hidden
-     */
-    asSourceReference() {
-        if (this instanceof ASTSourceReference)
-            return this;
-        throw new Error('Not an ASTSourceReference');
-    }
-    /**
-     * @hidden
-     */
-    findSourceReference(path) {
-        return this.find(path).asSourceReference();
-    }
-    /**
-     * @hidden
-     */
-    asParameterValueList() {
-        if (this instanceof ASTParameterValueList)
-            return this;
-        throw new Error('Not an ASTParameterValueList');
-    }
-    /**
-     * @hidden
-     */
-    findParameterValueList(path) {
-        return this.find(path).asParameterValueList();
-    }
-    /**
-     * @hidden
-     */
-    asWhere() {
-        if (this instanceof ASTWhere)
-            return this;
-        throw new Error('Not an ASTWhere');
-    }
-    /**
-     * @hidden
-     */
-    findWhere(path) {
-        return this.find(path).asWhere();
-    }
-    /**
-     * @hidden
-     */
-    asWhereList() {
-        if (this instanceof ASTWhereList)
-            return this;
-        throw new Error('Not an ASTWhereList');
-    }
-    /**
-     * @hidden
-     */
-    findWhereList(path) {
-        return this.find(path).asWhereList();
-    }
-    /**
-     * @hidden
-     */
-    asParameterValue() {
-        if (this instanceof ASTParameterValue)
-            return this;
-        throw new Error('Not an ASTParameterValue');
-    }
-    /**
-     * @hidden
-     */
-    findParameterValue(path) {
-        return this.find(path).asParameterValue();
-    }
-    /**
-     * @hidden
-     */
-    asStringLiteralValue() {
-        if (this instanceof ASTStringLiteralValue)
-            return this;
-        throw new Error('Not an ASTStringLiteralValue');
-    }
-    /**
-     * @hidden
-     */
-    findStringLiteralValue(path) {
-        return this.find(path).asStringLiteralValue();
-    }
-    /**
-     * @hidden
-     */
-    asNumberLiteralValue() {
-        if (this instanceof ASTNumberLiteralValue)
-            return this;
-        throw new Error('Not an ASTNumberLiteralValue');
-    }
-    /**
-     * @hidden
-     */
-    findNumberLiteralValue(path) {
-        return this.find(path).asNumberLiteralValue();
-    }
-    /**
-     * @hidden
-     */
-    asViewOperationList() {
-        if (this instanceof ASTViewOperationList)
-            return this;
-        throw new Error('Not an ASTViewOperationList');
-    }
-    /**
-     * @hidden
-     */
-    findViewOperationList(path) {
-        return this.find(path).asViewOperationList();
-    }
-    /**
-     * @hidden
-     */
-    asGroupByViewOperation() {
-        if (this instanceof ASTGroupByViewOperation)
-            return this;
-        throw new Error('Not an ASTGroupByViewOperation');
-    }
-    /**
-     * @hidden
-     */
-    findGroupByViewOperation(path) {
-        return this.find(path).asGroupByViewOperation();
-    }
-    /**
-     * @hidden
-     */
-    asAggregateViewOperation() {
-        if (this instanceof ASTAggregateViewOperation)
-            return this;
-        throw new Error('Not an ASTAggregateViewOperation');
-    }
-    /**
-     * @hidden
-     */
-    findAggregateViewOperation(path) {
-        return this.find(path).asAggregateViewOperation();
-    }
-    /**
-     * @hidden
-     */
-    asOrderByViewOperation() {
-        if (this instanceof ASTOrderByViewOperation)
-            return this;
-        throw new Error('Not an ASTOrderByViewOperation');
-    }
-    /**
-     * @hidden
-     */
-    findOrderByViewOperation(path) {
-        return this.find(path).asOrderByViewOperation();
-    }
-    /**
-     * @hidden
-     */
-    asField() {
-        if (this instanceof ASTField)
-            return this;
-        throw new Error('Not an ASTField');
-    }
-    /**
-     * @hidden
-     */
-    findField(path) {
-        return this.find(path).asField();
-    }
-    /**
-     * @hidden
-     */
-    asReferenceExpression() {
-        if (this instanceof ASTReferenceExpression)
-            return this;
-        throw new Error('Not an ASTReferenceExpression');
-    }
-    /**
-     * @hidden
-     */
-    findReferenceExpression(path) {
-        return this.find(path).asReferenceExpression();
-    }
-    /**
-     * @hidden
-     */
-    asReferenceViewDefinition() {
-        if (this instanceof ASTReferenceViewDefinition)
-            return this;
-        throw new Error('Not an ASTReferenceViewDefinition');
-    }
-    /**
-     * @hidden
-     */
-    findReferenceViewDefinition(path) {
-        return this.find(path).asReferenceViewDefinition();
-    }
-    /**
-     * @hidden
-     */
-    asArrowQueryDefinition() {
-        if (this instanceof ASTArrowQueryDefinition)
-            return this;
-        throw new Error('Not an ASTArrowQueryDefinition');
-    }
-    /**
-     * @hidden
-     */
-    findArrowQueryDefinition(path) {
-        return this.find(path).asArrowQueryDefinition();
-    }
-    /**
-     * @hidden
-     */
-    asArrowViewDefinition() {
-        if (this instanceof ASTArrowViewDefinition)
-            return this;
-        throw new Error('Not an ASTArrowViewDefinition');
-    }
-    /**
-     * @hidden
-     */
-    findArrowViewDefinition(path) {
-        return this.find(path).asArrowViewDefinition();
-    }
-    /**
-     * @hidden
-     */
-    asRefinementViewDefinition() {
-        if (this instanceof ASTRefinementViewDefinition)
-            return this;
-        throw new Error('Not an ASTRefinementViewDefinition');
-    }
-    /**
-     * @hidden
-     */
-    findRefinementViewDefinition(path) {
-        return this.find(path).asRefinementViewDefinition();
-    }
-    /**
-     * @hidden
-     */
-    asTimeTruncationExpression() {
-        if (this instanceof ASTTimeTruncationExpression)
-            return this;
-        throw new Error('Not an ASTTimeTruncationExpression');
-    }
-    /**
-     * @hidden
-     */
-    findTimeTruncationExpression(path) {
-        return this.find(path).asTimeTruncationExpression();
-    }
-    /**
-     * @hidden
-     */
-    asFilteredFieldExpression() {
-        if (this instanceof ASTFilteredFieldExpression)
-            return this;
-        throw new Error('Not an ASTFilteredFieldExpression');
-    }
-    /**
-     * @hidden
-     */
-    findFilteredFieldExpression(path) {
-        return this.find(path).asFilteredFieldExpression();
-    }
-    /**
-     * @hidden
-     */
-    asNestViewOperation() {
-        if (this instanceof ASTNestViewOperation)
-            return this;
-        throw new Error('Not an ASTNestViewOperation');
-    }
-    /**
-     * @hidden
-     */
-    findNestViewOperation(path) {
-        return this.find(path).asNestViewOperation();
-    }
-    /**
-     * @hidden
-     */
-    asView() {
-        if (this instanceof ASTView)
-            return this;
-        throw new Error('Not an ASTView');
-    }
-    /**
-     * @hidden
-     */
-    findView(path) {
-        return this.find(path).asView();
-    }
-    /**
-     * @hidden
-     */
-    asSegmentViewDefinition() {
-        if (this instanceof ASTSegmentViewDefinition)
-            return this;
-        throw new Error('Not an ASTSegmentViewDefinition');
-    }
-    /**
-     * @hidden
-     */
-    findSegmentViewDefinition(path) {
-        return this.find(path).asSegmentViewDefinition();
-    }
-    /**
-     * @hidden
-     */
-    asLimitViewOperation() {
-        if (this instanceof ASTLimitViewOperation)
-            return this;
-        throw new Error('Not an ASTLimitViewOperation');
-    }
-    /**
-     * @hidden
-     */
-    findLimitViewOperation(path) {
-        return this.find(path).asLimitViewOperation();
-    }
-    /**
-     * @hidden
-     */
-    asAnnotationList() {
-        if (this instanceof ASTAnnotationList)
-            return this;
-        throw new Error('Not an ASTAnnotationList');
-    }
-    /**
-     * @hidden
-     */
-    findAnnotationList(path) {
-        return this.find(path).asAnnotationList();
-    }
-    /**
-     * @hidden
-     */
-    asAnnotation() {
-        if (this instanceof ASTAnnotation)
-            return this;
-        throw new Error('Not an ASTAnnotation');
+    get as() {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const node = this;
+        return {
+            Query() {
+                if (node instanceof ASTQuery)
+                    return node;
+                throw new Error('Not an ASTQuery');
+            },
+            Reference() {
+                if (node instanceof ASTReference)
+                    return node;
+                throw new Error('Not an ASTReference');
+            },
+            SourceReference() {
+                if (node instanceof ASTSourceReference)
+                    return node;
+                throw new Error('Not an ASTSourceReference');
+            },
+            ParameterValueList() {
+                if (node instanceof ASTParameterValueList)
+                    return node;
+                throw new Error('Not an ASTParameterValueList');
+            },
+            Where() {
+                if (node instanceof ASTWhere)
+                    return node;
+                throw new Error('Not an ASTWhere');
+            },
+            WhereList() {
+                if (node instanceof ASTWhereList)
+                    return node;
+                throw new Error('Not an ASTWhereList');
+            },
+            ParameterValue() {
+                if (node instanceof ASTParameterValue)
+                    return node;
+                throw new Error('Not an ASTParameterValue');
+            },
+            StringLiteralValue() {
+                if (node instanceof ASTStringLiteralValue)
+                    return node;
+                throw new Error('Not an ASTStringLiteralValue');
+            },
+            NumberLiteralValue() {
+                if (node instanceof ASTNumberLiteralValue)
+                    return node;
+                throw new Error('Not an ASTNumberLiteralValue');
+            },
+            ViewOperationList() {
+                if (node instanceof ASTViewOperationList)
+                    return node;
+                throw new Error('Not an ASTViewOperationList');
+            },
+            GroupByViewOperation() {
+                if (node instanceof ASTGroupByViewOperation)
+                    return node;
+                throw new Error('Not an ASTGroupByViewOperation');
+            },
+            AggregateViewOperation() {
+                if (node instanceof ASTAggregateViewOperation)
+                    return node;
+                throw new Error('Not an ASTAggregateViewOperation');
+            },
+            OrderByViewOperation() {
+                if (node instanceof ASTOrderByViewOperation)
+                    return node;
+                throw new Error('Not an ASTOrderByViewOperation');
+            },
+            Field() {
+                if (node instanceof ASTField)
+                    return node;
+                throw new Error('Not an ASTField');
+            },
+            ReferenceExpression() {
+                if (node instanceof ASTReferenceExpression)
+                    return node;
+                throw new Error('Not an ASTReferenceExpression');
+            },
+            ReferenceViewDefinition() {
+                if (node instanceof ASTReferenceViewDefinition)
+                    return node;
+                throw new Error('Not an ASTReferenceViewDefinition');
+            },
+            ArrowQueryDefinition() {
+                if (node instanceof ASTArrowQueryDefinition)
+                    return node;
+                throw new Error('Not an ASTArrowQueryDefinition');
+            },
+            ArrowViewDefinition() {
+                if (node instanceof ASTArrowViewDefinition)
+                    return node;
+                throw new Error('Not an ASTArrowViewDefinition');
+            },
+            RefinementViewDefinition() {
+                if (node instanceof ASTRefinementViewDefinition)
+                    return node;
+                throw new Error('Not an ASTRefinementViewDefinition');
+            },
+            TimeTruncationExpression() {
+                if (node instanceof ASTTimeTruncationExpression)
+                    return node;
+                throw new Error('Not an ASTTimeTruncationExpression');
+            },
+            FilteredFieldExpression() {
+                if (node instanceof ASTFilteredFieldExpression)
+                    return node;
+                throw new Error('Not an ASTFilteredFieldExpression');
+            },
+            NestViewOperation() {
+                if (node instanceof ASTNestViewOperation)
+                    return node;
+                throw new Error('Not an ASTNestViewOperation');
+            },
+            View() {
+                if (node instanceof ASTView)
+                    return node;
+                throw new Error('Not an ASTView');
+            },
+            SegmentViewDefinition() {
+                if (node instanceof ASTSegmentViewDefinition)
+                    return node;
+                throw new Error('Not an ASTSegmentViewDefinition');
+            },
+            LimitViewOperation() {
+                if (node instanceof ASTLimitViewOperation)
+                    return node;
+                throw new Error('Not an ASTLimitViewOperation');
+            },
+            AnnotationList() {
+                if (node instanceof ASTAnnotationList)
+                    return node;
+                throw new Error('Not an ASTAnnotationList');
+            },
+            Annotation() {
+                if (node instanceof ASTAnnotation)
+                    return node;
+                throw new Error('Not an ASTAnnotation');
+            },
+        };
     }
-    /**
-     * @hidden
-     */
-    findAnnotation(path) {
-        return this.find(path).asAnnotation();
+    get find() {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const node = this;
+        return {
+            Query(path) {
+                return node.findAny(path).as.Query();
+            },
+            Reference(path) {
+                return node.findAny(path).as.Reference();
+            },
+            SourceReference(path) {
+                return node.findAny(path).as.SourceReference();
+            },
+            ParameterValueList(path) {
+                return node.findAny(path).as.ParameterValueList();
+            },
+            Where(path) {
+                return node.findAny(path).as.Where();
+            },
+            WhereList(path) {
+                return node.findAny(path).as.WhereList();
+            },
+            ParameterValue(path) {
+                return node.findAny(path).as.ParameterValue();
+            },
+            StringLiteralValue(path) {
+                return node.findAny(path).as.StringLiteralValue();
+            },
+            NumberLiteralValue(path) {
+                return node.findAny(path).as.NumberLiteralValue();
+            },
+            ViewOperationList(path) {
+                return node.findAny(path).as.ViewOperationList();
+            },
+            GroupByViewOperation(path) {
+                return node.findAny(path).as.GroupByViewOperation();
+            },
+            AggregateViewOperation(path) {
+                return node.findAny(path).as.AggregateViewOperation();
+            },
+            OrderByViewOperation(path) {
+                return node.findAny(path).as.OrderByViewOperation();
+            },
+            Field(path) {
+                return node.findAny(path).as.Field();
+            },
+            ReferenceExpression(path) {
+                return node.findAny(path).as.ReferenceExpression();
+            },
+            ReferenceViewDefinition(path) {
+                return node.findAny(path).as.ReferenceViewDefinition();
+            },
+            ArrowQueryDefinition(path) {
+                return node.findAny(path).as.ArrowQueryDefinition();
+            },
+            ArrowViewDefinition(path) {
+                return node.findAny(path).as.ArrowViewDefinition();
+            },
+            RefinementViewDefinition(path) {
+                return node.findAny(path).as.RefinementViewDefinition();
+            },
+            TimeTruncationExpression(path) {
+                return node.findAny(path).as.TimeTruncationExpression();
+            },
+            FilteredFieldExpression(path) {
+                return node.findAny(path).as.FilteredFieldExpression();
+            },
+            NestViewOperation(path) {
+                return node.findAny(path).as.NestViewOperation();
+            },
+            View(path) {
+                return node.findAny(path).as.View();
+            },
+            SegmentViewDefinition(path) {
+                return node.findAny(path).as.SegmentViewDefinition();
+            },
+            LimitViewOperation(path) {
+                return node.findAny(path).as.LimitViewOperation();
+            },
+            AnnotationList(path) {
+                return node.findAny(path).as.AnnotationList();
+            },
+            Annotation(path) {
+                return node.findAny(path).as.Annotation();
+            },
+        };
     }
     /**
      * @internal
@@ -489,6 +328,18 @@ class ASTNode {
             fields: [...a.fields, ...b.fields],
         };
     }
+    static tagFor(a, prefix = '# ') {
+        var _a, _b, _c;
+        const lines = (_b = (_a = a.annotations) === null || _a === void 0 ? void 0 : _a.map(a => a.value)) === null || _b === void 0 ? void 0 : _b.filter(l => l.startsWith(prefix));
+        return (_c = malloy_tag_1.Tag.fromTagLines(lines !== null && lines !== void 0 ? lines : []).tag) !== null && _c !== void 0 ? _c : new malloy_tag_1.Tag();
+    }
+    static fieldWasCalculation(a) {
+        if (a.kind !== 'dimension') {
+            throw new Error(`${a.name} could not be an output field, because it is a ${a.kind}, and only dimensions can appear in output schemas`);
+        }
+        const tag = ASTNode.tagFor(a, '#(malloy) ');
+        return tag.has('calculation');
+    }
 }
 function isBasic(t) {
     return (Array.isArray(t) ||
@@ -565,7 +416,7 @@ class ASTListNode extends ASTNode {
     /**
      * @internal
      */
-    find(path) {
+    findAny(path) {
         if (path.length === 0) {
             return this;
         }
@@ -574,7 +425,7 @@ class ASTListNode extends ASTNode {
             throw new Error(`${this.constructor.name} is a ASTListNode and thus cannot contain a ${head}`);
         }
         const child = this.children[head];
-        return child.find(rest);
+        return child.findAny(rest);
     }
     /**
      * @internal
@@ -629,7 +480,7 @@ class ASTObjectNode extends ASTNode {
     /**
      * @internal
      */
-    find(path) {
+    findAny(path) {
         if (path.length === 0) {
             return this;
         }
@@ -641,7 +492,7 @@ class ASTObjectNode extends ASTNode {
         if (isBasic(child)) {
             throw new Error(`${this.constructor.name}.${head} refers to a basic type, not an ASTNode`);
         }
-        return child.find(rest);
+        return child._find(rest);
     }
 }
 /**
@@ -762,7 +613,7 @@ class ASTQuery extends ASTObjectNode {
                 operations: [],
             },
         });
-        return this.definition.view.asSegmentViewDefinition();
+        return this.definition.view.as.SegmentViewDefinition();
     }
     isRunnable() {
         return this.definition.isRunnable();
@@ -916,7 +767,7 @@ class ASTQuery extends ASTObjectNode {
                 name,
             },
         });
-        return this.definition.view.asReferenceViewDefinition();
+        return this.definition.view.as.ReferenceViewDefinition();
     }
     getInheritedAnnotations() {
         var _a, _b;
@@ -1025,8 +876,14 @@ class ASTFieldReference extends ASTReference {
             return parent.list.segment;
         }
     }
+    getReferenceSchema() {
+        if (this.parent instanceof ASTOrderByViewOperation) {
+            return this.segment.getOutputSchema();
+        }
+        return this.segment.getInputSchema();
+    }
     getFieldInfo() {
-        const schema = this.segment.getInputSchema();
+        const schema = this.getReferenceSchema();
         return ASTNode.schemaGet(schema, this.name, this.path);
     }
 }
@@ -1036,7 +893,7 @@ class ASTSourceReference extends ASTReference {
      * @internal
      */
     get query() {
-        return this.parent.parent.asQuery();
+        return this.parent.parent.as.Query();
     }
     /**
      * Gets the `Malloy.SourceInfo` for the referenced source
@@ -1235,7 +1092,7 @@ class ASTUnimplemented extends ASTNode {
     build() {
         return this.node;
     }
-    find() {
+    findAny() {
         throw new Error('Tried to find a node from an unimplemented node type');
     }
 }
@@ -1288,7 +1145,7 @@ class ASTArrowQueryDefinition extends ASTObjectNode {
      * @internal
      */
     get query() {
-        return this.parent.asQuery();
+        return this.parent.as.Query();
     }
     /**
      * @internal
@@ -1340,7 +1197,7 @@ class ASTRefinementQueryDefinition extends ASTObjectNode {
      * @internal
      */
     get query() {
-        return this.parent.asQuery();
+        return this.parent.as.Query();
     }
     getOrAddDefaultSegment() {
         return this.refinement.getOrAddDefaultSegment();
@@ -1390,7 +1247,7 @@ class ASTReferenceQueryDefinition extends ASTObjectNode {
         return this.children.name;
     }
     get query() {
-        return this.parent.asQuery();
+        return this.parent.as.Query();
     }
     get parameters() {
         return this.children.parameters;
@@ -1417,7 +1274,7 @@ class ASTReferenceQueryDefinition extends ASTObjectNode {
             },
         });
         this.query.definition = newQuery;
-        return newQuery.refinement.asSegmentViewDefinition();
+        return newQuery.refinement.as.SegmentViewDefinition();
     }
     /**
      * @internal
@@ -1540,7 +1397,7 @@ class ASTReferenceViewDefinition extends ASTObjectNode {
     addEmptyRefinement() {
         const newView = ASTRefinementViewDefinition.segmentRefinementOf(this.build());
         swapViewInParent(this, newView);
-        return newView.refinement.asSegmentViewDefinition();
+        return newView.refinement.as.SegmentViewDefinition();
     }
     addViewRefinement(name, path) {
         const { error } = this.isValidViewRefinement(name, path);
@@ -1549,7 +1406,7 @@ class ASTReferenceViewDefinition extends ASTObjectNode {
         }
         const newView = ASTRefinementViewDefinition.viewRefinementOf(this.build(), name, path);
         swapViewInParent(this, newView);
-        return newView.refinement.asReferenceViewDefinition();
+        return newView.refinement.as.ReferenceViewDefinition();
     }
     isValidViewRefinement(name, path) {
         return isValidViewRefinement(this, name, path);
@@ -1925,16 +1782,18 @@ class ASTSegmentViewDefinition extends ASTObjectNode {
             if (operation instanceof ASTOrderByViewOperation) {
                 if (operation.name === name) {
                     operation.direction = direction;
-                    return;
+                    return operation;
                 }
             }
         }
-        // add a new order by operation
-        this.addOperation(new ASTOrderByViewOperation({
+        const operation = new ASTOrderByViewOperation({
             kind: 'order_by',
             field_reference: { name },
             direction,
-        }));
+        });
+        // add a new order by operation
+        this.addOperation(operation);
+        return operation;
     }
     /**
      * Adds an empty nest to this segment, with the given name.
@@ -2315,7 +2174,7 @@ class ASTSegmentViewDefinition extends ASTObjectNode {
     addEmptyRefinement() {
         const view = ASTRefinementViewDefinition.segmentRefinementOf(this.build());
         swapViewInParent(this, view);
-        return view.refinement.asSegmentViewDefinition();
+        return view.refinement.as.SegmentViewDefinition();
     }
     addViewRefinement(name, path) {
         const { error } = this.isValidViewRefinement(name, path);
@@ -2324,7 +2183,7 @@ class ASTSegmentViewDefinition extends ASTObjectNode {
         }
         const view = ASTRefinementViewDefinition.viewRefinementOf(this.build(), name, path);
         swapViewInParent(this, view);
-        return view.refinement.asReferenceViewDefinition();
+        return view.refinement.as.ReferenceViewDefinition();
     }
     getInputSchema() {
         return getInputSchemaFromViewParent(this.parent);
@@ -2362,7 +2221,7 @@ class ASTViewOperationList extends ASTListNode {
      * @internal
      */
     get segment() {
-        return this.parent.asSegmentViewDefinition();
+        return this.parent.as.SegmentViewDefinition();
     }
 }
 exports.ASTViewOperationList = ASTViewOperationList;
@@ -2413,7 +2272,7 @@ class ASTOrderByViewOperation extends ASTObjectNode {
         this.children.direction = direction;
     }
     get list() {
-        return this.parent.asViewOperationList();
+        return this.parent.as.ViewOperationList();
     }
     delete() {
         const list = this.list;
@@ -2462,7 +2321,7 @@ class ASTGroupByViewOperation extends ASTObjectNode {
      * @internal
      */
     get list() {
-        return this.parent.asViewOperationList();
+        return this.parent.as.ViewOperationList();
     }
     /**
      * Renames the group by item. If the field's name matches the given name,
@@ -2649,7 +2508,7 @@ class ASTAggregateViewOperation extends ASTObjectNode {
      * @internal
      */
     get list() {
-        return this.parent.asViewOperationList();
+        return this.parent.as.ViewOperationList();
     }
     delete() {
         this.list.remove(this);
@@ -2661,6 +2520,11 @@ class ASTAggregateViewOperation extends ASTObjectNode {
     }
     getFieldInfo() {
         return {
+            annotations: [
+                {
+                    value: malloy_tag_1.Tag.withPrefix('#(malloy) ').set(['calculation']).toString(),
+                },
+            ],
             kind: 'dimension',
             name: this.name,
             type: this.field.type,
@@ -2853,7 +2717,7 @@ class ASTReferenceExpression extends ASTObjectNode {
      * @internal
      */
     get field() {
-        return this.parent.asField();
+        return this.parent.as.Field();
     }
     get path() {
         return this.children.path;
@@ -2914,7 +2778,7 @@ class ASTTimeTruncationExpression extends ASTObjectNode {
      * @internal
      */
     get field() {
-        return this.parent.asField();
+        return this.parent.as.Field();
     }
     getFieldInfo() {
         const schema = this.field.segment.getInputSchema();
@@ -2954,7 +2818,7 @@ class ASTWhere extends ASTObjectNode {
         return this.children.filter;
     }
     get list() {
-        return this.parent.asWhereList();
+        return this.parent.as.WhereList();
     }
     delete() {
         this.list.remove(this);
@@ -2966,7 +2830,7 @@ class ASTWhereList extends ASTListNode {
         super(wheres, wheres.map(p => new ASTWhere(p)));
     }
     get expression() {
-        return this.parent.asFilteredFieldExpression();
+        return this.parent.as.FilteredFieldExpression();
     }
 }
 exports.ASTWhereList = ASTWhereList;
@@ -2996,7 +2860,7 @@ class ASTFilteredFieldExpression extends ASTObjectNode {
      * @internal
      */
     get field() {
-        return this.parent.asField();
+        return this.parent.as.Field();
     }
     getFieldInfo() {
         const schema = this.field.segment.getInputSchema();
@@ -3067,7 +2931,7 @@ class ASTNestViewOperation extends ASTObjectNode {
      * @internal
      */
     get list() {
-        return this.parent.asViewOperationList();
+        return this.parent.as.ViewOperationList();
     }
     getOrAddAnnotations() {
         return this.view.getOrAddAnnotations();
@@ -3183,7 +3047,7 @@ class ASTWhereViewOperation extends ASTObjectNode {
      * @internal
      */
     get list() {
-        return this.parent.asViewOperationList();
+        return this.parent.as.ViewOperationList();
     }
     delete() {
         this.list.remove(this);
@@ -3270,13 +3134,13 @@ class ASTView extends ASTObjectNode {
      * @internal
      */
     get nest() {
-        return this.parent.asNestViewOperation();
+        return this.parent.as.NestViewOperation();
     }
     getInputSchema() {
         return this.nest.list.segment.getInputSchema();
     }
     getOutputSchema() {
-        return this.definition.getOutputSchema();
+        return this.definition.getRefinementSchema();
     }
     /**
      * @internal
@@ -3355,7 +3219,7 @@ class ASTLimitViewOperation extends ASTObjectNode {
      * @internal
      */
     get list() {
-        return this.parent.asViewOperationList();
+        return this.parent.as.ViewOperationList();
     }
     delete() {
         this.list.remove(this);
@@ -3467,7 +3331,7 @@ class ASTAnnotation extends ASTObjectNode {
      * @internal
      */
     get list() {
-        return this.parent.asAnnotationList();
+        return this.parent.as.AnnotationList();
     }
     get index() {
         return this.list.indexOf(this);