@malloydata/malloy 0.0.39-dev230613161129 → 0.0.39

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

@@ -12,141 +12,144 @@ export declare class MalloyParser extends Parser {
     static readonly JSON_STRING = 1;
     static readonly ACCEPT = 2;
     static readonly AGGREGATE = 3;
-    static readonly CONNECTION = 4;
-    static readonly DECLARE = 5;
-    static readonly DIMENSION = 6;
-    static readonly EXCEPT = 7;
-    static readonly GROUP_BY = 8;
-    static readonly HAVING = 9;
-    static readonly INDEX = 10;
-    static readonly JOIN_CROSS = 11;
-    static readonly JOIN_ONE = 12;
-    static readonly JOIN_MANY = 13;
-    static readonly LIMIT = 14;
-    static readonly MEASURE = 15;
-    static readonly NEST = 16;
-    static readonly ORDER_BY = 17;
-    static readonly PRIMARY_KEY = 18;
-    static readonly PROJECT = 19;
-    static readonly QUERY = 20;
-    static readonly RENAME = 21;
-    static readonly SAMPLE = 22;
-    static readonly SELECT = 23;
-    static readonly SOURCE = 24;
-    static readonly SQL = 25;
-    static readonly TOP = 26;
-    static readonly WHERE = 27;
-    static readonly TIMEZONE = 28;
-    static readonly ALL = 29;
-    static readonly AND = 30;
-    static readonly AS = 31;
-    static readonly ASC = 32;
-    static readonly AVG = 33;
-    static readonly BOOLEAN = 34;
-    static readonly BY = 35;
-    static readonly CASE = 36;
-    static readonly CAST = 37;
-    static readonly CONDITION = 38;
-    static readonly COUNT = 39;
-    static readonly DATE = 40;
-    static readonly DAY = 41;
-    static readonly DESC = 42;
-    static readonly DISTINCT = 43;
-    static readonly ELSE = 44;
-    static readonly END = 45;
-    static readonly EXCLUDE = 46;
-    static readonly FALSE = 47;
-    static readonly FOR = 48;
-    static readonly FROM = 49;
-    static readonly FROM_SQL = 50;
-    static readonly HAS = 51;
-    static readonly HOUR = 52;
-    static readonly IMPORT = 53;
-    static readonly IS = 54;
-    static readonly JSON = 55;
-    static readonly LAST = 56;
-    static readonly MAX = 57;
-    static readonly MIN = 58;
-    static readonly MINUTE = 59;
-    static readonly MONTH = 60;
-    static readonly NOT = 61;
-    static readonly NOW = 62;
-    static readonly NULL = 63;
-    static readonly NUMBER = 64;
-    static readonly ON = 65;
-    static readonly OR = 66;
-    static readonly PICK = 67;
-    static readonly QUARTER = 68;
-    static readonly SECOND = 69;
-    static readonly STRING = 70;
-    static readonly SUM = 71;
-    static readonly TABLE = 72;
-    static readonly THEN = 73;
-    static readonly THIS = 74;
-    static readonly TIMESTAMP = 75;
-    static readonly TO = 76;
-    static readonly TRUE = 77;
-    static readonly TURTLE = 78;
-    static readonly WEEK = 79;
-    static readonly WHEN = 80;
-    static readonly WITH = 81;
-    static readonly YEAR = 82;
-    static readonly UNGROUPED = 83;
-    static readonly STRING_ESCAPE = 84;
-    static readonly HACKY_REGEX = 85;
-    static readonly STRING_LITERAL = 86;
-    static readonly AMPER = 87;
-    static readonly ARROW = 88;
-    static readonly FAT_ARROW = 89;
-    static readonly OPAREN = 90;
-    static readonly CPAREN = 91;
-    static readonly OBRACK = 92;
-    static readonly CBRACK = 93;
-    static readonly OCURLY = 94;
-    static readonly CCURLY = 95;
-    static readonly DOUBLECOLON = 96;
-    static readonly COLON = 97;
-    static readonly COMMA = 98;
-    static readonly DOT = 99;
-    static readonly LT = 100;
-    static readonly GT = 101;
-    static readonly EQ = 102;
-    static readonly NE = 103;
-    static readonly LTE = 104;
-    static readonly GTE = 105;
-    static readonly PLUS = 106;
-    static readonly MINUS = 107;
-    static readonly STAR = 108;
-    static readonly STARSTAR = 109;
-    static readonly SLASH = 110;
-    static readonly BAR = 111;
-    static readonly SEMI = 112;
-    static readonly NOT_MATCH = 113;
-    static readonly MATCH = 114;
-    static readonly PERCENT = 115;
-    static readonly DOUBLE_QMARK = 116;
-    static readonly QMARK = 117;
-    static readonly LITERAL_TIMESTAMP = 118;
-    static readonly LITERAL_HOUR = 119;
-    static readonly LITERAL_DAY = 120;
-    static readonly LITERAL_QUARTER = 121;
-    static readonly LITERAL_MONTH = 122;
-    static readonly LITERAL_WEEK = 123;
-    static readonly LITERAL_YEAR = 124;
-    static readonly IDENTIFIER = 125;
-    static readonly PERCENT_LITERAL = 126;
-    static readonly INTEGER_LITERAL = 127;
-    static readonly NUMERIC_LITERAL = 128;
-    static readonly OBJECT_NAME_LITERAL = 129;
-    static readonly BLOCK_COMMENT = 130;
-    static readonly COMMENT_TO_EOL = 131;
-    static readonly WHITE_SPACE = 132;
-    static readonly SQL_BEGIN = 133;
-    static readonly CLOSE_CODE = 134;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 135;
-    static readonly UNEXPECTED_CHAR = 136;
-    static readonly OPEN_CODE = 137;
-    static readonly SQL_END = 138;
+    static readonly CALCULATE = 4;
+    static readonly CALCULATION = 5;
+    static readonly CONNECTION = 6;
+    static readonly DECLARE = 7;
+    static readonly DIMENSION = 8;
+    static readonly EXCEPT = 9;
+    static readonly GROUP_BY = 10;
+    static readonly HAVING = 11;
+    static readonly INDEX = 12;
+    static readonly JOIN_CROSS = 13;
+    static readonly JOIN_ONE = 14;
+    static readonly JOIN_MANY = 15;
+    static readonly LIMIT = 16;
+    static readonly MEASURE = 17;
+    static readonly NEST = 18;
+    static readonly ORDER_BY = 19;
+    static readonly PRIMARY_KEY = 20;
+    static readonly PROJECT = 21;
+    static readonly QUERY = 22;
+    static readonly RENAME = 23;
+    static readonly SAMPLE = 24;
+    static readonly SELECT = 25;
+    static readonly SOURCE = 26;
+    static readonly SQL = 27;
+    static readonly TOP = 28;
+    static readonly WHERE = 29;
+    static readonly TIMEZONE = 30;
+    static readonly ALL = 31;
+    static readonly AND = 32;
+    static readonly AS = 33;
+    static readonly ASC = 34;
+    static readonly AVG = 35;
+    static readonly BOOLEAN = 36;
+    static readonly BY = 37;
+    static readonly CASE = 38;
+    static readonly CAST = 39;
+    static readonly CONDITION = 40;
+    static readonly COUNT = 41;
+    static readonly DATE = 42;
+    static readonly DAY = 43;
+    static readonly DESC = 44;
+    static readonly DISTINCT = 45;
+    static readonly ELSE = 46;
+    static readonly END = 47;
+    static readonly EXCLUDE = 48;
+    static readonly FALSE = 49;
+    static readonly FOR = 50;
+    static readonly FROM = 51;
+    static readonly FROM_SQL = 52;
+    static readonly HAS = 53;
+    static readonly HOUR = 54;
+    static readonly IMPORT = 55;
+    static readonly IS = 56;
+    static readonly JSON = 57;
+    static readonly LAST = 58;
+    static readonly MAX = 59;
+    static readonly MIN = 60;
+    static readonly MINUTE = 61;
+    static readonly MONTH = 62;
+    static readonly NOT = 63;
+    static readonly NOW = 64;
+    static readonly NULL = 65;
+    static readonly NUMBER = 66;
+    static readonly ON = 67;
+    static readonly OR = 68;
+    static readonly PICK = 69;
+    static readonly QUARTER = 70;
+    static readonly SECOND = 71;
+    static readonly STRING = 72;
+    static readonly SUM = 73;
+    static readonly TABLE = 74;
+    static readonly THEN = 75;
+    static readonly THIS = 76;
+    static readonly TIMESTAMP = 77;
+    static readonly TO = 78;
+    static readonly TRUE = 79;
+    static readonly TURTLE = 80;
+    static readonly WEEK = 81;
+    static readonly WHEN = 82;
+    static readonly WITH = 83;
+    static readonly YEAR = 84;
+    static readonly UNGROUPED = 85;
+    static readonly STRING_ESCAPE = 86;
+    static readonly HACKY_REGEX = 87;
+    static readonly STRING_LITERAL = 88;
+    static readonly AMPER = 89;
+    static readonly ARROW = 90;
+    static readonly FAT_ARROW = 91;
+    static readonly OPAREN = 92;
+    static readonly CPAREN = 93;
+    static readonly OBRACK = 94;
+    static readonly CBRACK = 95;
+    static readonly OCURLY = 96;
+    static readonly CCURLY = 97;
+    static readonly DOUBLECOLON = 98;
+    static readonly EXCLAM = 99;
+    static readonly COLON = 100;
+    static readonly COMMA = 101;
+    static readonly DOT = 102;
+    static readonly LT = 103;
+    static readonly GT = 104;
+    static readonly EQ = 105;
+    static readonly NE = 106;
+    static readonly LTE = 107;
+    static readonly GTE = 108;
+    static readonly PLUS = 109;
+    static readonly MINUS = 110;
+    static readonly STAR = 111;
+    static readonly STARSTAR = 112;
+    static readonly SLASH = 113;
+    static readonly BAR = 114;
+    static readonly SEMI = 115;
+    static readonly NOT_MATCH = 116;
+    static readonly MATCH = 117;
+    static readonly PERCENT = 118;
+    static readonly DOUBLE_QMARK = 119;
+    static readonly QMARK = 120;
+    static readonly LITERAL_TIMESTAMP = 121;
+    static readonly LITERAL_HOUR = 122;
+    static readonly LITERAL_DAY = 123;
+    static readonly LITERAL_QUARTER = 124;
+    static readonly LITERAL_MONTH = 125;
+    static readonly LITERAL_WEEK = 126;
+    static readonly LITERAL_YEAR = 127;
+    static readonly IDENTIFIER = 128;
+    static readonly PERCENT_LITERAL = 129;
+    static readonly INTEGER_LITERAL = 130;
+    static readonly NUMERIC_LITERAL = 131;
+    static readonly OBJECT_NAME_LITERAL = 132;
+    static readonly BLOCK_COMMENT = 133;
+    static readonly COMMENT_TO_EOL = 134;
+    static readonly WHITE_SPACE = 135;
+    static readonly SQL_BEGIN = 136;
+    static readonly CLOSE_CODE = 137;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 138;
+    static readonly UNEXPECTED_CHAR = 139;
+    static readonly OPEN_CODE = 140;
+    static readonly SQL_END = 141;
     static readonly RULE_malloyDocument = 0;
     static readonly RULE_malloyStatement = 1;
     static readonly RULE_defineSourceStatement = 2;
@@ -181,76 +184,75 @@ export declare class MalloyParser extends Parser {
     static readonly RULE_exploreStatement = 31;
     static readonly RULE_renameList = 32;
     static readonly RULE_exploreRenameDef = 33;
-    static readonly RULE_dimensionDefList = 34;
-    static readonly RULE_measureDefList = 35;
-    static readonly RULE_fieldDef = 36;
-    static readonly RULE_fieldNameDef = 37;
-    static readonly RULE_joinNameDef = 38;
-    static readonly RULE_measureDef = 39;
-    static readonly RULE_declareStatement = 40;
-    static readonly RULE_joinStatement = 41;
-    static readonly RULE_joinList = 42;
-    static readonly RULE_joinDef = 43;
-    static readonly RULE_joinExpression = 44;
-    static readonly RULE_filterStatement = 45;
-    static readonly RULE_filteredBy = 46;
-    static readonly RULE_filterClauseList = 47;
-    static readonly RULE_whereStatement = 48;
-    static readonly RULE_havingStatement = 49;
-    static readonly RULE_subQueryDefList = 50;
-    static readonly RULE_exploreQueryNameDef = 51;
-    static readonly RULE_exploreQueryDef = 52;
-    static readonly RULE_queryStatement = 53;
-    static readonly RULE_groupByStatement = 54;
-    static readonly RULE_queryFieldList = 55;
-    static readonly RULE_dimensionDef = 56;
-    static readonly RULE_queryFieldEntry = 57;
-    static readonly RULE_nestStatement = 58;
-    static readonly RULE_nestedQueryList = 59;
-    static readonly RULE_nestEntry = 60;
-    static readonly RULE_aggregateStatement = 61;
-    static readonly RULE_projectStatement = 62;
-    static readonly RULE_orderByStatement = 63;
-    static readonly RULE_ordering = 64;
-    static readonly RULE_orderBySpec = 65;
-    static readonly RULE_limitStatement = 66;
-    static readonly RULE_bySpec = 67;
-    static readonly RULE_topStatement = 68;
-    static readonly RULE_indexElement = 69;
-    static readonly RULE_indexFields = 70;
-    static readonly RULE_indexStatement = 71;
-    static readonly RULE_sampleStatement = 72;
-    static readonly RULE_timezoneStatement = 73;
-    static readonly RULE_sampleSpec = 74;
-    static readonly RULE_aggregate = 75;
-    static readonly RULE_malloyType = 76;
-    static readonly RULE_compareOp = 77;
-    static readonly RULE_literal = 78;
-    static readonly RULE_dateLiteral = 79;
-    static readonly RULE_tableName = 80;
-    static readonly RULE_id = 81;
-    static readonly RULE_timeframe = 82;
-    static readonly RULE_ungroup = 83;
-    static readonly RULE_fieldExpr = 84;
-    static readonly RULE_partialAllowedFieldExpr = 85;
-    static readonly RULE_pickStatement = 86;
-    static readonly RULE_pick = 87;
-    static readonly RULE_argumentList = 88;
-    static readonly RULE_fieldNameList = 89;
-    static readonly RULE_fieldCollection = 90;
-    static readonly RULE_collectionMember = 91;
-    static readonly RULE_fieldPath = 92;
-    static readonly RULE_joinName = 93;
-    static readonly RULE_fieldName = 94;
-    static readonly RULE_justExpr = 95;
-    static readonly RULE_json = 96;
-    static readonly RULE_jsonValue = 97;
-    static readonly RULE_jsonObject = 98;
-    static readonly RULE_jsonProperty = 99;
-    static readonly RULE_jsonArray = 100;
-    static readonly RULE_sqlExploreNameRef = 101;
-    static readonly RULE_nameSQLBlock = 102;
-    static readonly RULE_connectionName = 103;
+    static readonly RULE_defList = 34;
+    static readonly RULE_fieldDef = 35;
+    static readonly RULE_fieldNameDef = 36;
+    static readonly RULE_joinNameDef = 37;
+    static readonly RULE_declareStatement = 38;
+    static readonly RULE_joinStatement = 39;
+    static readonly RULE_joinList = 40;
+    static readonly RULE_joinDef = 41;
+    static readonly RULE_joinExpression = 42;
+    static readonly RULE_filterStatement = 43;
+    static readonly RULE_filteredBy = 44;
+    static readonly RULE_filterClauseList = 45;
+    static readonly RULE_whereStatement = 46;
+    static readonly RULE_havingStatement = 47;
+    static readonly RULE_subQueryDefList = 48;
+    static readonly RULE_exploreQueryNameDef = 49;
+    static readonly RULE_exploreQueryDef = 50;
+    static readonly RULE_queryStatement = 51;
+    static readonly RULE_groupByStatement = 52;
+    static readonly RULE_queryFieldList = 53;
+    static readonly RULE_queryFieldEntry = 54;
+    static readonly RULE_nestStatement = 55;
+    static readonly RULE_nestedQueryList = 56;
+    static readonly RULE_nestEntry = 57;
+    static readonly RULE_aggregateStatement = 58;
+    static readonly RULE_calculateStatement = 59;
+    static readonly RULE_projectStatement = 60;
+    static readonly RULE_orderByStatement = 61;
+    static readonly RULE_ordering = 62;
+    static readonly RULE_orderBySpec = 63;
+    static readonly RULE_limitStatement = 64;
+    static readonly RULE_bySpec = 65;
+    static readonly RULE_topStatement = 66;
+    static readonly RULE_indexElement = 67;
+    static readonly RULE_indexFields = 68;
+    static readonly RULE_indexStatement = 69;
+    static readonly RULE_sampleStatement = 70;
+    static readonly RULE_timezoneStatement = 71;
+    static readonly RULE_sampleSpec = 72;
+    static readonly RULE_aggregate = 73;
+    static readonly RULE_malloyType = 74;
+    static readonly RULE_compareOp = 75;
+    static readonly RULE_literal = 76;
+    static readonly RULE_dateLiteral = 77;
+    static readonly RULE_tableName = 78;
+    static readonly RULE_id = 79;
+    static readonly RULE_timeframe = 80;
+    static readonly RULE_ungroup = 81;
+    static readonly RULE_fieldExpr = 82;
+    static readonly RULE_partialAllowedFieldExpr = 83;
+    static readonly RULE_pickStatement = 84;
+    static readonly RULE_pick = 85;
+    static readonly RULE_argumentList = 86;
+    static readonly RULE_fieldNameList = 87;
+    static readonly RULE_fieldCollection = 88;
+    static readonly RULE_collectionWildCard = 89;
+    static readonly RULE_collectionMember = 90;
+    static readonly RULE_fieldPath = 91;
+    static readonly RULE_joinName = 92;
+    static readonly RULE_fieldName = 93;
+    static readonly RULE_justExpr = 94;
+    static readonly RULE_json = 95;
+    static readonly RULE_jsonValue = 96;
+    static readonly RULE_jsonObject = 97;
+    static readonly RULE_jsonProperty = 98;
+    static readonly RULE_jsonArray = 99;
+    static readonly RULE_sqlExploreNameRef = 100;
+    static readonly RULE_nameSQLBlock = 101;
+    static readonly RULE_connectionName = 102;
     static readonly ruleNames: string[];
     private static readonly _LITERAL_NAMES;
     private static readonly _SYMBOLIC_NAMES;
@@ -295,12 +297,10 @@ export declare class MalloyParser extends Parser {
     exploreStatement(): ExploreStatementContext;
     renameList(): RenameListContext;
     exploreRenameDef(): ExploreRenameDefContext;
-    dimensionDefList(): DimensionDefListContext;
-    measureDefList(): MeasureDefListContext;
+    defList(): DefListContext;
     fieldDef(): FieldDefContext;
     fieldNameDef(): FieldNameDefContext;
     joinNameDef(): JoinNameDefContext;
-    measureDef(): MeasureDefContext;
     declareStatement(): DeclareStatementContext;
     joinStatement(): JoinStatementContext;
     joinList(): JoinListContext;
@@ -317,12 +317,12 @@ export declare class MalloyParser extends Parser {
     queryStatement(): QueryStatementContext;
     groupByStatement(): GroupByStatementContext;
     queryFieldList(): QueryFieldListContext;
-    dimensionDef(): DimensionDefContext;
     queryFieldEntry(): QueryFieldEntryContext;
     nestStatement(): NestStatementContext;
     nestedQueryList(): NestedQueryListContext;
     nestEntry(): NestEntryContext;
     aggregateStatement(): AggregateStatementContext;
+    calculateStatement(): CalculateStatementContext;
     projectStatement(): ProjectStatementContext;
     orderByStatement(): OrderByStatementContext;
     ordering(): OrderingContext;
@@ -353,6 +353,7 @@ export declare class MalloyParser extends Parser {
     argumentList(): ArgumentListContext;
     fieldNameList(): FieldNameListContext;
     fieldCollection(): FieldCollectionContext;
+    collectionWildCard(): CollectionWildCardContext;
     collectionMember(): CollectionMemberContext;
     fieldPath(): FieldPathContext;
     joinName(): JoinNameContext;
@@ -750,7 +751,7 @@ export declare class ExploreStatementContext extends ParserRuleContext {
 }
 export declare class DefExploreDimensionContext extends ExploreStatementContext {
     DIMENSION(): TerminalNode;
-    dimensionDefList(): DimensionDefListContext;
+    defList(): DefListContext;
     constructor(ctx: ExploreStatementContext);
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;
@@ -758,7 +759,7 @@ export declare class DefExploreDimensionContext extends ExploreStatementContext
 }
 export declare class DefExploreMeasureContext extends ExploreStatementContext {
     MEASURE(): TerminalNode;
-    measureDefList(): MeasureDefListContext;
+    defList(): DefListContext;
     constructor(ctx: ExploreStatementContext);
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;
@@ -846,20 +847,9 @@ export declare class ExploreRenameDefContext extends ParserRuleContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
-export declare class DimensionDefListContext extends ParserRuleContext {
-    dimensionDef(): DimensionDefContext[];
-    dimensionDef(i: number): DimensionDefContext;
-    COMMA(): TerminalNode[];
-    COMMA(i: number): TerminalNode;
-    constructor(parent: ParserRuleContext | undefined, invokingState: number);
-    get ruleIndex(): number;
-    enterRule(listener: MalloyParserListener): void;
-    exitRule(listener: MalloyParserListener): void;
-    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
-}
-export declare class MeasureDefListContext extends ParserRuleContext {
-    measureDef(): MeasureDefContext[];
-    measureDef(i: number): MeasureDefContext;
+export declare class DefListContext extends ParserRuleContext {
+    fieldDef(): FieldDefContext[];
+    fieldDef(i: number): FieldDefContext;
     COMMA(): TerminalNode[];
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -894,20 +884,9 @@ export declare class JoinNameDefContext extends ParserRuleContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
-export declare class MeasureDefContext extends ParserRuleContext {
-    fieldDef(): FieldDefContext;
-    constructor(parent: ParserRuleContext | undefined, invokingState: number);
-    get ruleIndex(): number;
-    enterRule(listener: MalloyParserListener): void;
-    exitRule(listener: MalloyParserListener): void;
-    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
-}
 export declare class DeclareStatementContext extends ParserRuleContext {
     DECLARE(): TerminalNode;
-    fieldDef(): FieldDefContext[];
-    fieldDef(i: number): FieldDefContext;
-    COMMA(): TerminalNode[];
-    COMMA(i: number): TerminalNode;
+    defList(): DefListContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;
@@ -1083,6 +1062,7 @@ export declare class QueryStatementContext extends ParserRuleContext {
     projectStatement(): ProjectStatementContext | undefined;
     indexStatement(): IndexStatementContext | undefined;
     aggregateStatement(): AggregateStatementContext | undefined;
+    calculateStatement(): CalculateStatementContext | undefined;
     topStatement(): TopStatementContext | undefined;
     limitStatement(): LimitStatementContext | undefined;
     orderByStatement(): OrderByStatementContext | undefined;
@@ -1117,29 +1097,11 @@ export declare class QueryFieldListContext extends ParserRuleContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
-export declare class DimensionDefContext extends ParserRuleContext {
-    fieldDef(): FieldDefContext;
-    constructor(parent: ParserRuleContext | undefined, invokingState: number);
-    get ruleIndex(): number;
-    enterRule(listener: MalloyParserListener): void;
-    exitRule(listener: MalloyParserListener): void;
-    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
-}
 export declare class QueryFieldEntryContext extends ParserRuleContext {
+    fieldPath(): FieldPathContext | undefined;
+    fieldDef(): FieldDefContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    copyFrom(ctx: QueryFieldEntryContext): void;
-}
-export declare class QueryFieldRefContext extends QueryFieldEntryContext {
-    fieldPath(): FieldPathContext;
-    constructor(ctx: QueryFieldEntryContext);
-    enterRule(listener: MalloyParserListener): void;
-    exitRule(listener: MalloyParserListener): void;
-    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
-}
-export declare class QueryFieldDefContext extends QueryFieldEntryContext {
-    dimensionDef(): DimensionDefContext;
-    constructor(ctx: QueryFieldEntryContext);
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
@@ -1196,6 +1158,15 @@ export declare class AggregateStatementContext extends ParserRuleContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
+export declare class CalculateStatementContext extends ParserRuleContext {
+    CALCULATE(): TerminalNode;
+    queryFieldList(): QueryFieldListContext;
+    constructor(parent: ParserRuleContext | undefined, invokingState: number);
+    get ruleIndex(): number;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
+}
 export declare class ProjectStatementContext extends ParserRuleContext {
     PROJECT(): TerminalNode;
     fieldCollection(): FieldCollectionContext;
@@ -1738,12 +1709,26 @@ export declare class ExprExprContext extends FieldExprContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
+export declare class ExprAggFuncContext extends FieldExprContext {
+    id(): IdContext;
+    OPAREN(): TerminalNode;
+    CPAREN(): TerminalNode;
+    fieldPath(): FieldPathContext | undefined;
+    DOT(): TerminalNode | undefined;
+    argumentList(): ArgumentListContext | undefined;
+    constructor(ctx: FieldExprContext);
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
+}
 export declare class ExprFuncContext extends FieldExprContext {
     OPAREN(): TerminalNode;
     CPAREN(): TerminalNode;
-    id(): IdContext | undefined;
     timeframe(): TimeframeContext | undefined;
+    id(): IdContext | undefined;
     argumentList(): ArgumentListContext | undefined;
+    EXCLAM(): TerminalNode | undefined;
+    malloyType(): MalloyTypeContext | undefined;
     constructor(ctx: FieldExprContext);
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;
@@ -1837,31 +1822,23 @@ export declare class FieldCollectionContext extends ParserRuleContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
-export declare class CollectionMemberContext extends ParserRuleContext {
-    constructor(parent: ParserRuleContext | undefined, invokingState: number);
-    get ruleIndex(): number;
-    copyFrom(ctx: CollectionMemberContext): void;
-}
-export declare class NameMemberContext extends CollectionMemberContext {
-    fieldPath(): FieldPathContext;
-    constructor(ctx: CollectionMemberContext);
-    enterRule(listener: MalloyParserListener): void;
-    exitRule(listener: MalloyParserListener): void;
-    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
-}
-export declare class WildMemberContext extends CollectionMemberContext {
+export declare class CollectionWildCardContext extends ParserRuleContext {
     STAR(): TerminalNode | undefined;
     STARSTAR(): TerminalNode | undefined;
     fieldPath(): FieldPathContext | undefined;
     DOT(): TerminalNode | undefined;
-    constructor(ctx: CollectionMemberContext);
+    constructor(parent: ParserRuleContext | undefined, invokingState: number);
+    get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
-export declare class NewMemberContext extends CollectionMemberContext {
-    fieldDef(): FieldDefContext;
-    constructor(ctx: CollectionMemberContext);
+export declare class CollectionMemberContext extends ParserRuleContext {
+    fieldPath(): FieldPathContext | undefined;
+    collectionWildCard(): CollectionWildCardContext | undefined;
+    fieldDef(): FieldDefContext | undefined;
+    constructor(parent: ParserRuleContext | undefined, invokingState: number);
+    get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;