@malloydata/malloy 0.0.39-dev230613161129 → 0.0.39

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -1,7 +1,4 @@
 import { ParseTreeListener } from "antlr4ts/tree/ParseTreeListener";
-import { NameMemberContext } from "./MalloyParser";
-import { WildMemberContext } from "./MalloyParser";
-import { NewMemberContext } from "./MalloyParser";
 import { NamedQueries_stubContext } from "./MalloyParser";
 import { AnonymousQueryContext } from "./MalloyParser";
 import { NamedSourceContext } from "./MalloyParser";
@@ -22,8 +19,6 @@ import { ExprNULLContext } from "./MalloyParser";
 import { ExprBoolContext } from "./MalloyParser";
 import { ExprRegexContext } from "./MalloyParser";
 import { ExprNowContext } from "./MalloyParser";
-import { QueryFieldRefContext } from "./MalloyParser";
-import { QueryFieldDefContext } from "./MalloyParser";
 import { NestExistingContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
@@ -49,6 +44,7 @@ import { ExprCastContext } from "./MalloyParser";
 import { ExprCountDisinctContext } from "./MalloyParser";
 import { ExprAggregateContext } from "./MalloyParser";
 import { ExprExprContext } from "./MalloyParser";
+import { ExprAggFuncContext } from "./MalloyParser";
 import { ExprFuncContext } from "./MalloyParser";
 import { ExprPickContext } from "./MalloyParser";
 import { ExprUngroupContext } from "./MalloyParser";
@@ -105,12 +101,10 @@ import { ExplorePropertiesContext } from "./MalloyParser";
 import { ExploreStatementContext } from "./MalloyParser";
 import { RenameListContext } from "./MalloyParser";
 import { ExploreRenameDefContext } from "./MalloyParser";
-import { DimensionDefListContext } from "./MalloyParser";
-import { MeasureDefListContext } from "./MalloyParser";
+import { DefListContext } from "./MalloyParser";
 import { FieldDefContext } from "./MalloyParser";
 import { FieldNameDefContext } from "./MalloyParser";
 import { JoinNameDefContext } from "./MalloyParser";
-import { MeasureDefContext } from "./MalloyParser";
 import { DeclareStatementContext } from "./MalloyParser";
 import { JoinStatementContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
@@ -127,12 +121,12 @@ import { ExploreQueryDefContext } from "./MalloyParser";
 import { QueryStatementContext } from "./MalloyParser";
 import { GroupByStatementContext } from "./MalloyParser";
 import { QueryFieldListContext } from "./MalloyParser";
-import { DimensionDefContext } from "./MalloyParser";
 import { QueryFieldEntryContext } from "./MalloyParser";
 import { NestStatementContext } from "./MalloyParser";
 import { NestedQueryListContext } from "./MalloyParser";
 import { NestEntryContext } from "./MalloyParser";
 import { AggregateStatementContext } from "./MalloyParser";
+import { CalculateStatementContext } from "./MalloyParser";
 import { ProjectStatementContext } from "./MalloyParser";
 import { OrderByStatementContext } from "./MalloyParser";
 import { OrderingContext } from "./MalloyParser";
@@ -162,6 +156,7 @@ import { PickContext } from "./MalloyParser";
 import { ArgumentListContext } from "./MalloyParser";
 import { FieldNameListContext } from "./MalloyParser";
 import { FieldCollectionContext } from "./MalloyParser";
+import { CollectionWildCardContext } from "./MalloyParser";
 import { CollectionMemberContext } from "./MalloyParser";
 import { FieldPathContext } from "./MalloyParser";
 import { JoinNameContext } from "./MalloyParser";
@@ -180,42 +175,6 @@ import { ConnectionNameContext } from "./MalloyParser";
  * `MalloyParser`.
  */
 export interface MalloyParserListener extends ParseTreeListener {
-    /**
-     * Enter a parse tree produced by the `nameMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     */
-    enterNameMember?: (ctx: NameMemberContext) => void;
-    /**
-     * Exit a parse tree produced by the `nameMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     */
-    exitNameMember?: (ctx: NameMemberContext) => void;
-    /**
-     * Enter a parse tree produced by the `wildMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     */
-    enterWildMember?: (ctx: WildMemberContext) => void;
-    /**
-     * Exit a parse tree produced by the `wildMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     */
-    exitWildMember?: (ctx: WildMemberContext) => void;
-    /**
-     * Enter a parse tree produced by the `newMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     */
-    enterNewMember?: (ctx: NewMemberContext) => void;
-    /**
-     * Exit a parse tree produced by the `newMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     */
-    exitNewMember?: (ctx: NewMemberContext) => void;
     /**
      * Enter a parse tree produced by the `namedQueries_stub`
      * labeled alternative in `MalloyParser.defineQuery`.
@@ -456,30 +415,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExprNow?: (ctx: ExprNowContext) => void;
-    /**
-     * Enter a parse tree produced by the `queryFieldRef`
-     * labeled alternative in `MalloyParser.queryFieldEntry`.
-     * @param ctx the parse tree
-     */
-    enterQueryFieldRef?: (ctx: QueryFieldRefContext) => void;
-    /**
-     * Exit a parse tree produced by the `queryFieldRef`
-     * labeled alternative in `MalloyParser.queryFieldEntry`.
-     * @param ctx the parse tree
-     */
-    exitQueryFieldRef?: (ctx: QueryFieldRefContext) => void;
-    /**
-     * Enter a parse tree produced by the `queryFieldDef`
-     * labeled alternative in `MalloyParser.queryFieldEntry`.
-     * @param ctx the parse tree
-     */
-    enterQueryFieldDef?: (ctx: QueryFieldDefContext) => void;
-    /**
-     * Exit a parse tree produced by the `queryFieldDef`
-     * labeled alternative in `MalloyParser.queryFieldEntry`.
-     * @param ctx the parse tree
-     */
-    exitQueryFieldDef?: (ctx: QueryFieldDefContext) => void;
     /**
      * Enter a parse tree produced by the `nestExisting`
      * labeled alternative in `MalloyParser.nestEntry`.
@@ -780,6 +715,18 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExprExpr?: (ctx: ExprExprContext) => void;
+    /**
+     * Enter a parse tree produced by the `exprAggFunc`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    enterExprAggFunc?: (ctx: ExprAggFuncContext) => void;
+    /**
+     * Exit a parse tree produced by the `exprAggFunc`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    exitExprAggFunc?: (ctx: ExprAggFuncContext) => void;
     /**
      * Enter a parse tree produced by the `exprFunc`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -1385,25 +1332,15 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitExploreRenameDef?: (ctx: ExploreRenameDefContext) => void;
     /**
-     * Enter a parse tree produced by `MalloyParser.dimensionDefList`.
+     * Enter a parse tree produced by `MalloyParser.defList`.
      * @param ctx the parse tree
      */
-    enterDimensionDefList?: (ctx: DimensionDefListContext) => void;
+    enterDefList?: (ctx: DefListContext) => void;
     /**
-     * Exit a parse tree produced by `MalloyParser.dimensionDefList`.
+     * Exit a parse tree produced by `MalloyParser.defList`.
      * @param ctx the parse tree
      */
-    exitDimensionDefList?: (ctx: DimensionDefListContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.measureDefList`.
-     * @param ctx the parse tree
-     */
-    enterMeasureDefList?: (ctx: MeasureDefListContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.measureDefList`.
-     * @param ctx the parse tree
-     */
-    exitMeasureDefList?: (ctx: MeasureDefListContext) => void;
+    exitDefList?: (ctx: DefListContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.fieldDef`.
      * @param ctx the parse tree
@@ -1434,16 +1371,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitJoinNameDef?: (ctx: JoinNameDefContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.measureDef`.
-     * @param ctx the parse tree
-     */
-    enterMeasureDef?: (ctx: MeasureDefContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.measureDef`.
-     * @param ctx the parse tree
-     */
-    exitMeasureDef?: (ctx: MeasureDefContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.declareStatement`.
      * @param ctx the parse tree
@@ -1604,16 +1531,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitQueryFieldList?: (ctx: QueryFieldListContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.dimensionDef`.
-     * @param ctx the parse tree
-     */
-    enterDimensionDef?: (ctx: DimensionDefContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.dimensionDef`.
-     * @param ctx the parse tree
-     */
-    exitDimensionDef?: (ctx: DimensionDefContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.queryFieldEntry`.
      * @param ctx the parse tree
@@ -1664,6 +1581,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitAggregateStatement?: (ctx: AggregateStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.calculateStatement`.
+     * @param ctx the parse tree
+     */
+    enterCalculateStatement?: (ctx: CalculateStatementContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.calculateStatement`.
+     * @param ctx the parse tree
+     */
+    exitCalculateStatement?: (ctx: CalculateStatementContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.projectStatement`.
      * @param ctx the parse tree
@@ -1954,6 +1881,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitFieldCollection?: (ctx: FieldCollectionContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.collectionWildCard`.
+     * @param ctx the parse tree
+     */
+    enterCollectionWildCard?: (ctx: CollectionWildCardContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.collectionWildCard`.
+     * @param ctx the parse tree
+     */
+    exitCollectionWildCard?: (ctx: CollectionWildCardContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.collectionMember`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -1,7 +1,4 @@
 import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
-import { NameMemberContext } from "./MalloyParser";
-import { WildMemberContext } from "./MalloyParser";
-import { NewMemberContext } from "./MalloyParser";
 import { NamedQueries_stubContext } from "./MalloyParser";
 import { AnonymousQueryContext } from "./MalloyParser";
 import { NamedSourceContext } from "./MalloyParser";
@@ -22,8 +19,6 @@ import { ExprNULLContext } from "./MalloyParser";
 import { ExprBoolContext } from "./MalloyParser";
 import { ExprRegexContext } from "./MalloyParser";
 import { ExprNowContext } from "./MalloyParser";
-import { QueryFieldRefContext } from "./MalloyParser";
-import { QueryFieldDefContext } from "./MalloyParser";
 import { NestExistingContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
@@ -49,6 +44,7 @@ import { ExprCastContext } from "./MalloyParser";
 import { ExprCountDisinctContext } from "./MalloyParser";
 import { ExprAggregateContext } from "./MalloyParser";
 import { ExprExprContext } from "./MalloyParser";
+import { ExprAggFuncContext } from "./MalloyParser";
 import { ExprFuncContext } from "./MalloyParser";
 import { ExprPickContext } from "./MalloyParser";
 import { ExprUngroupContext } from "./MalloyParser";
@@ -105,12 +101,10 @@ import { ExplorePropertiesContext } from "./MalloyParser";
 import { ExploreStatementContext } from "./MalloyParser";
 import { RenameListContext } from "./MalloyParser";
 import { ExploreRenameDefContext } from "./MalloyParser";
-import { DimensionDefListContext } from "./MalloyParser";
-import { MeasureDefListContext } from "./MalloyParser";
+import { DefListContext } from "./MalloyParser";
 import { FieldDefContext } from "./MalloyParser";
 import { FieldNameDefContext } from "./MalloyParser";
 import { JoinNameDefContext } from "./MalloyParser";
-import { MeasureDefContext } from "./MalloyParser";
 import { DeclareStatementContext } from "./MalloyParser";
 import { JoinStatementContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
@@ -127,12 +121,12 @@ import { ExploreQueryDefContext } from "./MalloyParser";
 import { QueryStatementContext } from "./MalloyParser";
 import { GroupByStatementContext } from "./MalloyParser";
 import { QueryFieldListContext } from "./MalloyParser";
-import { DimensionDefContext } from "./MalloyParser";
 import { QueryFieldEntryContext } from "./MalloyParser";
 import { NestStatementContext } from "./MalloyParser";
 import { NestedQueryListContext } from "./MalloyParser";
 import { NestEntryContext } from "./MalloyParser";
 import { AggregateStatementContext } from "./MalloyParser";
+import { CalculateStatementContext } from "./MalloyParser";
 import { ProjectStatementContext } from "./MalloyParser";
 import { OrderByStatementContext } from "./MalloyParser";
 import { OrderingContext } from "./MalloyParser";
@@ -162,6 +156,7 @@ import { PickContext } from "./MalloyParser";
 import { ArgumentListContext } from "./MalloyParser";
 import { FieldNameListContext } from "./MalloyParser";
 import { FieldCollectionContext } from "./MalloyParser";
+import { CollectionWildCardContext } from "./MalloyParser";
 import { CollectionMemberContext } from "./MalloyParser";
 import { FieldPathContext } from "./MalloyParser";
 import { JoinNameContext } from "./MalloyParser";
@@ -183,27 +178,6 @@ import { ConnectionNameContext } from "./MalloyParser";
  * operations with no return type.
  */
 export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
-    /**
-     * Visit a parse tree produced by the `nameMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitNameMember?: (ctx: NameMemberContext) => Result;
-    /**
-     * Visit a parse tree produced by the `wildMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitWildMember?: (ctx: WildMemberContext) => Result;
-    /**
-     * Visit a parse tree produced by the `newMember`
-     * labeled alternative in `MalloyParser.collectionMember`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitNewMember?: (ctx: NewMemberContext) => Result;
     /**
      * Visit a parse tree produced by the `namedQueries_stub`
      * labeled alternative in `MalloyParser.defineQuery`.
@@ -344,20 +318,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExprNow?: (ctx: ExprNowContext) => Result;
-    /**
-     * Visit a parse tree produced by the `queryFieldRef`
-     * labeled alternative in `MalloyParser.queryFieldEntry`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitQueryFieldRef?: (ctx: QueryFieldRefContext) => Result;
-    /**
-     * Visit a parse tree produced by the `queryFieldDef`
-     * labeled alternative in `MalloyParser.queryFieldEntry`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitQueryFieldDef?: (ctx: QueryFieldDefContext) => Result;
     /**
      * Visit a parse tree produced by the `nestExisting`
      * labeled alternative in `MalloyParser.nestEntry`.
@@ -533,6 +493,13 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExprExpr?: (ctx: ExprExprContext) => Result;
+    /**
+     * Visit a parse tree produced by the `exprAggFunc`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitExprAggFunc?: (ctx: ExprAggFuncContext) => Result;
     /**
      * Visit a parse tree produced by the `exprFunc`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -892,17 +859,11 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitExploreRenameDef?: (ctx: ExploreRenameDefContext) => Result;
     /**
-     * Visit a parse tree produced by `MalloyParser.dimensionDefList`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitDimensionDefList?: (ctx: DimensionDefListContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.measureDefList`.
+     * Visit a parse tree produced by `MalloyParser.defList`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitMeasureDefList?: (ctx: MeasureDefListContext) => Result;
+    visitDefList?: (ctx: DefListContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.fieldDef`.
      * @param ctx the parse tree
@@ -921,12 +882,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitJoinNameDef?: (ctx: JoinNameDefContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.measureDef`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitMeasureDef?: (ctx: MeasureDefContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.declareStatement`.
      * @param ctx the parse tree
@@ -1023,12 +978,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitQueryFieldList?: (ctx: QueryFieldListContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.dimensionDef`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitDimensionDef?: (ctx: DimensionDefContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.queryFieldEntry`.
      * @param ctx the parse tree
@@ -1059,6 +1008,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitAggregateStatement?: (ctx: AggregateStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.calculateStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitCalculateStatement?: (ctx: CalculateStatementContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.projectStatement`.
      * @param ctx the parse tree
@@ -1233,6 +1188,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitFieldCollection?: (ctx: FieldCollectionContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.collectionWildCard`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitCollectionWildCard?: (ctx: CollectionWildCardContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.collectionMember`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.d.ts

@@ -6,6 +6,7 @@ import * as parse from './lib/Malloy/MalloyParser';
 import * as ast from './ast';
 import { LogSeverity, MessageLogger } from './parse-log';
 import { MalloyParseRoot } from './parse-malloy';
+import { FieldDeclarationConstructor } from './ast';
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
  * AST from an ANTLR parse tree.
@@ -47,7 +48,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected astAt<MT extends ast.MalloyElement>(el: MT, cx: ParserRuleContext): MT;
     protected getSourceCode(cx: ParserRuleContext): string;
     protected getFilterElement(cx: parse.FieldExprContext): ast.FilterElement;
-    protected getFieldDefs(cxList: ParserRuleContext[], isAgg?: boolean): ast.FieldDeclaration[];
+    protected getFieldDefs(cxList: parse.FieldDefContext[], makeFieldDef: ast.FieldDeclarationConstructor): ast.FieldDeclaration[];
     protected getFieldExpr(cx: parse.FieldExprContext): ast.ExpressionDef;
     protected getSegments(segments: parse.PipeElementContext[]): ast.QOPDesc[];
     protected getFilterShortcut(cx: parse.FilterShortcutContext): ast.Filter;
@@ -74,7 +75,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected getJoinSource(name: ast.ModelEntryReference, ecx: parse.ExploreContext | undefined): ast.Source;
     visitJoinOn(pcx: parse.JoinOnContext): ast.Join;
     visitJoinWith(pcx: parse.JoinWithContext): ast.Join;
-    visitFieldDef(pcx: parse.FieldDefContext): ast.FieldDeclaration;
+    getFieldDef(pcx: parse.FieldDefContext, makeFieldDef: ast.FieldDeclarationConstructor): ast.FieldDeclaration;
     visitDefExploreDimension(pcx: parse.DefExploreDimensionContext): ast.Dimensions;
     visitDefExploreMeasure(pcx: parse.DefExploreMeasureContext): ast.Measures;
     visitDeclareStatement(pcx: parse.DeclareStatementContext): ast.DeclareFields;
@@ -91,14 +92,16 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitDefExploreTimezone(cx: parse.DefExploreTimezoneContext): ast.TimezoneStatement;
     visitTimezoneStatement(cx: parse.TimezoneStatementContext): ast.TimezoneStatement;
     visitQueryProperties(pcx: parse.QueryPropertiesContext): ast.QOPDesc;
-    visitFieldPath(pcx: parse.FieldPathContext): ast.FieldReference;
-    visitQueryFieldDef(pcx: parse.QueryFieldDefContext): ast.QueryItem;
-    visitQueryFieldRef(pcx: parse.QueryFieldRefContext): ast.QueryItem;
-    protected getQueryItems(pcx: parse.QueryFieldListContext): ast.QueryItem[];
+    getFieldPath(pcx: parse.FieldPathContext, makeFieldRef: ast.FieldReferenceConstructor): ast.FieldReference;
+    getQueryFieldDef(pcx: parse.FieldDefContext, makeFieldDef: ast.FieldDeclarationConstructor): ast.QueryItem;
+    getQueryFieldEntry(ctx: parse.QueryFieldEntryContext, makeFieldDef: ast.FieldDeclarationConstructor, makeFieldRef: ast.FieldReferenceConstructor): ast.QueryItem;
+    protected getQueryItems(pcx: parse.QueryFieldListContext, makeFieldDef: ast.FieldDeclarationConstructor, makeFieldRef: ast.FieldReferenceConstructor): ast.QueryItem[];
     visitAggregateStatement(pcx: parse.AggregateStatementContext): ast.Aggregate;
     visitGroupByStatement(pcx: parse.GroupByStatementContext): ast.GroupBy;
+    visitCalculateStatement(pcx: parse.CalculateStatementContext): ast.Calculate;
+    getFieldCollectionMember(pcx: parse.CollectionMemberContext, makeFieldDef: FieldDeclarationConstructor, makeFieldRef: ast.FieldReferenceConstructor): ast.FieldCollectionMember;
     visitFieldCollection(pcx: parse.FieldCollectionContext): ast.ProjectStatement;
-    visitWildMember(pcx: parse.WildMemberContext): ast.FieldReferenceElement;
+    visitCollectionWildCard(pcx: parse.CollectionWildCardContext): ast.FieldReferenceElement;
     visitIndexFields(pcx: parse.IndexFieldsContext): ast.FieldReferences;
     visitIndexStatement(pcx: parse.IndexStatementContext): ast.Index;
     visitLimitStatement(pcx: parse.LimitStatementContext): ast.Limit;
@@ -146,6 +149,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExprTimeTrunc(pcx: parse.ExprTimeTruncContext): ast.ExprGranularTime;
     visitTimeframe(pcx: parse.TimeframeContext): ast.Timeframe;
     visitExprForRange(pcx: parse.ExprForRangeContext): ast.ForRange;
+    visitExprAggFunc(pcx: parse.ExprAggFuncContext): ast.ExpressionDef;
     visitExprFunc(pcx: parse.ExprFuncContext): ast.ExpressionDef;
     visitExprDuration(pcx: parse.ExprDurationContext): ast.ExprDuration;
     visitPickStatement(pcx: parse.PickStatementContext): ast.Pick;