@malloydata/malloy 0.0.120-dev240131220408 → 0.0.120

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/dist/dialect/dialect_map.js +12 -2
  2. package/dist/dialect/functions/all_functions.js +3 -0
  3. package/dist/dialect/functions/string_agg.d.ts +3 -0
  4. package/dist/dialect/functions/string_agg.js +47 -0
  5. package/dist/dialect/functions/util.d.ts +5 -0
  6. package/dist/dialect/functions/util.js +3 -0
  7. package/dist/dialect/postgres/functions/postgres_functions.js +3 -0
  8. package/dist/dialect/postgres/functions/string_agg.d.ts +3 -0
  9. package/dist/dialect/postgres/functions/string_agg.js +47 -0
  10. package/dist/dialect/standardsql/functions/standardsql_functions.js +3 -0
  11. package/dist/dialect/standardsql/functions/string_agg.d.ts +3 -0
  12. package/dist/dialect/standardsql/functions/string_agg.js +49 -0
  13. package/dist/index.d.ts +2 -2
  14. package/dist/lang/ast/expressions/expr-func.d.ts +11 -0
  15. package/dist/lang/ast/expressions/expr-func.js +69 -10
  16. package/dist/lang/ast/expressions/{expr-filter.d.ts → expr-props.d.ts} +5 -4
  17. package/dist/lang/ast/expressions/expr-props.js +122 -0
  18. package/dist/lang/ast/expressions/function-ordering.d.ts +18 -0
  19. package/dist/lang/ast/expressions/function-ordering.js +75 -0
  20. package/dist/lang/ast/expressions/partition_by.d.ts +7 -0
  21. package/dist/lang/ast/expressions/partition_by.js +35 -0
  22. package/dist/lang/ast/index.d.ts +4 -1
  23. package/dist/lang/ast/index.js +4 -1
  24. package/dist/lang/ast/query-items/field-references.d.ts +4 -0
  25. package/dist/lang/ast/query-items/field-references.js +12 -1
  26. package/dist/lang/ast/types/expression-def.d.ts +4 -0
  27. package/dist/lang/ast/types/expression-def.js +12 -0
  28. package/dist/lang/ast/types/field-prop-statement.d.ts +7 -0
  29. package/dist/lang/ast/types/field-prop-statement.js +37 -0
  30. package/dist/lang/lib/Malloy/MalloyLexer.d.ts +136 -135
  31. package/dist/lang/lib/Malloy/MalloyLexer.js +1186 -1174
  32. package/dist/lang/lib/Malloy/MalloyParser.d.ts +278 -213
  33. package/dist/lang/lib/Malloy/MalloyParser.js +2200 -1683
  34. package/dist/lang/lib/Malloy/MalloyParserListener.d.ts +76 -36
  35. package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts +48 -22
  36. package/dist/lang/malloy-to-ast.d.ts +6 -2
  37. package/dist/lang/malloy-to-ast.js +33 -9
  38. package/dist/lang/test/expressions.spec.js +132 -9
  39. package/dist/model/malloy_query.d.ts +2 -2
  40. package/dist/model/malloy_query.js +59 -25
  41. package/dist/model/malloy_types.d.ts +20 -2
  42. package/dist/model/malloy_types.js +5 -1
  43. package/dist/run_sql_options.d.ts +1 -0
  44. package/dist/runtime_types.d.ts +4 -1
  45. package/package.json +1 -1
  46. package/dist/lang/ast/expressions/expr-filter.js +0 -66
@@ -28,141 +28,142 @@ export declare class MalloyParser extends Parser {
28
28
  static readonly MEASURE = 17;
29
29
  static readonly NEST = 18;
30
30
  static readonly ORDER_BY = 19;
31
- static readonly PRIMARY_KEY = 20;
32
- static readonly PROJECT = 21;
33
- static readonly QUERY = 22;
34
- static readonly RENAME = 23;
35
- static readonly RUN = 24;
36
- static readonly SAMPLE = 25;
37
- static readonly SELECT = 26;
38
- static readonly SOURCE = 27;
39
- static readonly SQLC = 28;
40
- static readonly TOP = 29;
41
- static readonly WHERE = 30;
42
- static readonly VIEW = 31;
43
- static readonly TIMEZONE = 32;
44
- static readonly ALL = 33;
45
- static readonly AND = 34;
46
- static readonly AS = 35;
47
- static readonly ASC = 36;
48
- static readonly AVG = 37;
49
- static readonly BOOLEAN = 38;
50
- static readonly BY = 39;
51
- static readonly CASE = 40;
52
- static readonly CAST = 41;
53
- static readonly CONDITION = 42;
54
- static readonly COUNT = 43;
55
- static readonly DATE = 44;
56
- static readonly DAY = 45;
57
- static readonly DESC = 46;
58
- static readonly DISTINCT = 47;
59
- static readonly ELSE = 48;
60
- static readonly END = 49;
61
- static readonly EXCLUDE = 50;
62
- static readonly EXTEND = 51;
63
- static readonly FALSE = 52;
64
- static readonly FULL = 53;
65
- static readonly FOR = 54;
66
- static readonly FROM = 55;
67
- static readonly FROM_SQL = 56;
68
- static readonly HAS = 57;
69
- static readonly HOUR = 58;
70
- static readonly IMPORT = 59;
71
- static readonly INNER = 60;
72
- static readonly IS = 61;
73
- static readonly JSON = 62;
74
- static readonly LAST = 63;
75
- static readonly LEFT = 64;
76
- static readonly MAX = 65;
77
- static readonly MIN = 66;
78
- static readonly MINUTE = 67;
79
- static readonly MONTH = 68;
80
- static readonly NOT = 69;
81
- static readonly NOW = 70;
82
- static readonly NULL = 71;
83
- static readonly NUMBER = 72;
84
- static readonly ON = 73;
85
- static readonly OR = 74;
86
- static readonly PICK = 75;
87
- static readonly QUARTER = 76;
88
- static readonly RIGHT = 77;
89
- static readonly SECOND = 78;
90
- static readonly STRING = 79;
91
- static readonly SOURCE_KW = 80;
92
- static readonly SUM = 81;
93
- static readonly SQL = 82;
94
- static readonly TABLE = 83;
95
- static readonly THEN = 84;
96
- static readonly THIS = 85;
97
- static readonly TIMESTAMP = 86;
98
- static readonly TO = 87;
99
- static readonly TRUE = 88;
100
- static readonly TURTLE = 89;
101
- static readonly WEEK = 90;
102
- static readonly WHEN = 91;
103
- static readonly WITH = 92;
104
- static readonly YEAR = 93;
105
- static readonly UNGROUPED = 94;
106
- static readonly STRING_ESCAPE = 95;
107
- static readonly HACKY_REGEX = 96;
108
- static readonly SQ_STRING = 97;
109
- static readonly DQ_STRING = 98;
110
- static readonly BQ_STRING = 99;
111
- static readonly DOC_ANNOTATION = 100;
112
- static readonly ANNOTATION = 101;
113
- static readonly AMPER = 102;
114
- static readonly ARROW = 103;
115
- static readonly FAT_ARROW = 104;
116
- static readonly OPAREN = 105;
117
- static readonly CPAREN = 106;
118
- static readonly OBRACK = 107;
119
- static readonly CBRACK = 108;
120
- static readonly OCURLY = 109;
121
- static readonly CCURLY = 110;
122
- static readonly DOUBLECOLON = 111;
123
- static readonly TRIPLECOLON = 112;
124
- static readonly EXCLAM = 113;
125
- static readonly COLON = 114;
126
- static readonly COMMA = 115;
127
- static readonly DOT = 116;
128
- static readonly LT = 117;
129
- static readonly GT = 118;
130
- static readonly EQ = 119;
131
- static readonly NE = 120;
132
- static readonly LTE = 121;
133
- static readonly GTE = 122;
134
- static readonly PLUS = 123;
135
- static readonly MINUS = 124;
136
- static readonly STAR = 125;
137
- static readonly STARSTAR = 126;
138
- static readonly SLASH = 127;
139
- static readonly BAR = 128;
140
- static readonly SEMI = 129;
141
- static readonly NOT_MATCH = 130;
142
- static readonly MATCH = 131;
143
- static readonly PERCENT = 132;
144
- static readonly DOUBLE_QMARK = 133;
145
- static readonly QMARK = 134;
146
- static readonly LITERAL_TIMESTAMP = 135;
147
- static readonly LITERAL_HOUR = 136;
148
- static readonly LITERAL_DAY = 137;
149
- static readonly LITERAL_QUARTER = 138;
150
- static readonly LITERAL_MONTH = 139;
151
- static readonly LITERAL_WEEK = 140;
152
- static readonly LITERAL_YEAR = 141;
153
- static readonly IDENTIFIER = 142;
154
- static readonly PERCENT_LITERAL = 143;
155
- static readonly NUMERIC_LITERAL = 144;
156
- static readonly INTEGER_LITERAL = 145;
157
- static readonly BLOCK_COMMENT = 146;
158
- static readonly COMMENT_TO_EOL = 147;
159
- static readonly WHITE_SPACE = 148;
160
- static readonly SQL_BEGIN = 149;
161
- static readonly CLOSE_CODE = 150;
162
- static readonly UNWATED_CHARS_TRAILING_NUMBERS = 151;
163
- static readonly UNEXPECTED_CHAR = 152;
164
- static readonly OPEN_CODE = 153;
165
- static readonly SQL_END = 154;
31
+ static readonly PARTITION_BY = 20;
32
+ static readonly PRIMARY_KEY = 21;
33
+ static readonly PROJECT = 22;
34
+ static readonly QUERY = 23;
35
+ static readonly RENAME = 24;
36
+ static readonly RUN = 25;
37
+ static readonly SAMPLE = 26;
38
+ static readonly SELECT = 27;
39
+ static readonly SOURCE = 28;
40
+ static readonly SQLC = 29;
41
+ static readonly TOP = 30;
42
+ static readonly WHERE = 31;
43
+ static readonly VIEW = 32;
44
+ static readonly TIMEZONE = 33;
45
+ static readonly ALL = 34;
46
+ static readonly AND = 35;
47
+ static readonly AS = 36;
48
+ static readonly ASC = 37;
49
+ static readonly AVG = 38;
50
+ static readonly BOOLEAN = 39;
51
+ static readonly BY = 40;
52
+ static readonly CASE = 41;
53
+ static readonly CAST = 42;
54
+ static readonly CONDITION = 43;
55
+ static readonly COUNT = 44;
56
+ static readonly DATE = 45;
57
+ static readonly DAY = 46;
58
+ static readonly DESC = 47;
59
+ static readonly DISTINCT = 48;
60
+ static readonly ELSE = 49;
61
+ static readonly END = 50;
62
+ static readonly EXCLUDE = 51;
63
+ static readonly EXTEND = 52;
64
+ static readonly FALSE = 53;
65
+ static readonly FULL = 54;
66
+ static readonly FOR = 55;
67
+ static readonly FROM = 56;
68
+ static readonly FROM_SQL = 57;
69
+ static readonly HAS = 58;
70
+ static readonly HOUR = 59;
71
+ static readonly IMPORT = 60;
72
+ static readonly INNER = 61;
73
+ static readonly IS = 62;
74
+ static readonly JSON = 63;
75
+ static readonly LAST = 64;
76
+ static readonly LEFT = 65;
77
+ static readonly MAX = 66;
78
+ static readonly MIN = 67;
79
+ static readonly MINUTE = 68;
80
+ static readonly MONTH = 69;
81
+ static readonly NOT = 70;
82
+ static readonly NOW = 71;
83
+ static readonly NULL = 72;
84
+ static readonly NUMBER = 73;
85
+ static readonly ON = 74;
86
+ static readonly OR = 75;
87
+ static readonly PICK = 76;
88
+ static readonly QUARTER = 77;
89
+ static readonly RIGHT = 78;
90
+ static readonly SECOND = 79;
91
+ static readonly STRING = 80;
92
+ static readonly SOURCE_KW = 81;
93
+ static readonly SUM = 82;
94
+ static readonly SQL = 83;
95
+ static readonly TABLE = 84;
96
+ static readonly THEN = 85;
97
+ static readonly THIS = 86;
98
+ static readonly TIMESTAMP = 87;
99
+ static readonly TO = 88;
100
+ static readonly TRUE = 89;
101
+ static readonly TURTLE = 90;
102
+ static readonly WEEK = 91;
103
+ static readonly WHEN = 92;
104
+ static readonly WITH = 93;
105
+ static readonly YEAR = 94;
106
+ static readonly UNGROUPED = 95;
107
+ static readonly STRING_ESCAPE = 96;
108
+ static readonly HACKY_REGEX = 97;
109
+ static readonly SQ_STRING = 98;
110
+ static readonly DQ_STRING = 99;
111
+ static readonly BQ_STRING = 100;
112
+ static readonly DOC_ANNOTATION = 101;
113
+ static readonly ANNOTATION = 102;
114
+ static readonly AMPER = 103;
115
+ static readonly ARROW = 104;
116
+ static readonly FAT_ARROW = 105;
117
+ static readonly OPAREN = 106;
118
+ static readonly CPAREN = 107;
119
+ static readonly OBRACK = 108;
120
+ static readonly CBRACK = 109;
121
+ static readonly OCURLY = 110;
122
+ static readonly CCURLY = 111;
123
+ static readonly DOUBLECOLON = 112;
124
+ static readonly TRIPLECOLON = 113;
125
+ static readonly EXCLAM = 114;
126
+ static readonly COLON = 115;
127
+ static readonly COMMA = 116;
128
+ static readonly DOT = 117;
129
+ static readonly LT = 118;
130
+ static readonly GT = 119;
131
+ static readonly EQ = 120;
132
+ static readonly NE = 121;
133
+ static readonly LTE = 122;
134
+ static readonly GTE = 123;
135
+ static readonly PLUS = 124;
136
+ static readonly MINUS = 125;
137
+ static readonly STAR = 126;
138
+ static readonly STARSTAR = 127;
139
+ static readonly SLASH = 128;
140
+ static readonly BAR = 129;
141
+ static readonly SEMI = 130;
142
+ static readonly NOT_MATCH = 131;
143
+ static readonly MATCH = 132;
144
+ static readonly PERCENT = 133;
145
+ static readonly DOUBLE_QMARK = 134;
146
+ static readonly QMARK = 135;
147
+ static readonly LITERAL_TIMESTAMP = 136;
148
+ static readonly LITERAL_HOUR = 137;
149
+ static readonly LITERAL_DAY = 138;
150
+ static readonly LITERAL_QUARTER = 139;
151
+ static readonly LITERAL_MONTH = 140;
152
+ static readonly LITERAL_WEEK = 141;
153
+ static readonly LITERAL_YEAR = 142;
154
+ static readonly IDENTIFIER = 143;
155
+ static readonly PERCENT_LITERAL = 144;
156
+ static readonly NUMERIC_LITERAL = 145;
157
+ static readonly INTEGER_LITERAL = 146;
158
+ static readonly BLOCK_COMMENT = 147;
159
+ static readonly COMMENT_TO_EOL = 148;
160
+ static readonly WHITE_SPACE = 149;
161
+ static readonly SQL_BEGIN = 150;
162
+ static readonly CLOSE_CODE = 151;
163
+ static readonly UNWATED_CHARS_TRAILING_NUMBERS = 152;
164
+ static readonly UNEXPECTED_CHAR = 153;
165
+ static readonly OPEN_CODE = 154;
166
+ static readonly SQL_END = 155;
166
167
  static readonly RULE_malloyDocument = 0;
167
168
  static readonly RULE_malloyStatement = 1;
168
169
  static readonly RULE_defineSourceStatement = 2;
@@ -223,71 +224,77 @@ export declare class MalloyParser extends Parser {
223
224
  static readonly RULE_joinDef = 57;
224
225
  static readonly RULE_joinExpression = 58;
225
226
  static readonly RULE_filterStatement = 59;
226
- static readonly RULE_filteredBy = 60;
227
- static readonly RULE_filterClauseList = 61;
228
- static readonly RULE_whereStatement = 62;
229
- static readonly RULE_havingStatement = 63;
230
- static readonly RULE_subQueryDefList = 64;
231
- static readonly RULE_exploreQueryNameDef = 65;
232
- static readonly RULE_exploreQueryDef = 66;
233
- static readonly RULE_queryStatement = 67;
234
- static readonly RULE_queryJoinStatement = 68;
235
- static readonly RULE_groupByStatement = 69;
236
- static readonly RULE_queryFieldList = 70;
237
- static readonly RULE_queryFieldEntry = 71;
238
- static readonly RULE_nestStatement = 72;
239
- static readonly RULE_nestedQueryList = 73;
240
- static readonly RULE_nestEntry = 74;
241
- static readonly RULE_aggregateStatement = 75;
242
- static readonly RULE_calculateStatement = 76;
243
- static readonly RULE_projectStatement = 77;
244
- static readonly RULE_orderByStatement = 78;
245
- static readonly RULE_ordering = 79;
246
- static readonly RULE_orderBySpec = 80;
247
- static readonly RULE_limitStatement = 81;
248
- static readonly RULE_bySpec = 82;
249
- static readonly RULE_topStatement = 83;
250
- static readonly RULE_indexElement = 84;
251
- static readonly RULE_indexFields = 85;
252
- static readonly RULE_indexStatement = 86;
253
- static readonly RULE_sampleStatement = 87;
254
- static readonly RULE_timezoneStatement = 88;
255
- static readonly RULE_queryAnnotation = 89;
256
- static readonly RULE_sampleSpec = 90;
257
- static readonly RULE_aggregate = 91;
258
- static readonly RULE_malloyType = 92;
259
- static readonly RULE_compareOp = 93;
260
- static readonly RULE_string = 94;
261
- static readonly RULE_shortString = 95;
262
- static readonly RULE_numericLiteral = 96;
263
- static readonly RULE_literal = 97;
264
- static readonly RULE_dateLiteral = 98;
265
- static readonly RULE_tablePath = 99;
266
- static readonly RULE_tableURI = 100;
267
- static readonly RULE_id = 101;
268
- static readonly RULE_timeframe = 102;
269
- static readonly RULE_ungroup = 103;
270
- static readonly RULE_malloyOrSQLType = 104;
271
- static readonly RULE_fieldExpr = 105;
272
- static readonly RULE_partialAllowedFieldExpr = 106;
273
- static readonly RULE_pickStatement = 107;
274
- static readonly RULE_pick = 108;
275
- static readonly RULE_argumentList = 109;
276
- static readonly RULE_fieldNameList = 110;
277
- static readonly RULE_fieldCollection = 111;
278
- static readonly RULE_collectionWildCard = 112;
279
- static readonly RULE_starQualified = 113;
280
- static readonly RULE_taggedRef = 114;
281
- static readonly RULE_refExpr = 115;
282
- static readonly RULE_collectionMember = 116;
283
- static readonly RULE_fieldPath = 117;
284
- static readonly RULE_joinName = 118;
285
- static readonly RULE_fieldName = 119;
286
- static readonly RULE_justExpr = 120;
287
- static readonly RULE_sqlExploreNameRef = 121;
288
- static readonly RULE_nameSQLBlock = 122;
289
- static readonly RULE_connectionName = 123;
290
- static readonly RULE_experimentalStatementForTesting = 124;
227
+ static readonly RULE_fieldProperties = 60;
228
+ static readonly RULE_aggregateOrdering = 61;
229
+ static readonly RULE_aggregateOrderBySpec = 62;
230
+ static readonly RULE_aggregateOrderByStatement = 63;
231
+ static readonly RULE_fieldPropertyLimitStatement = 64;
232
+ static readonly RULE_fieldPropertyStatement = 65;
233
+ static readonly RULE_filterClauseList = 66;
234
+ static readonly RULE_whereStatement = 67;
235
+ static readonly RULE_havingStatement = 68;
236
+ static readonly RULE_subQueryDefList = 69;
237
+ static readonly RULE_exploreQueryNameDef = 70;
238
+ static readonly RULE_exploreQueryDef = 71;
239
+ static readonly RULE_queryStatement = 72;
240
+ static readonly RULE_queryJoinStatement = 73;
241
+ static readonly RULE_groupByStatement = 74;
242
+ static readonly RULE_queryFieldList = 75;
243
+ static readonly RULE_queryFieldEntry = 76;
244
+ static readonly RULE_nestStatement = 77;
245
+ static readonly RULE_nestedQueryList = 78;
246
+ static readonly RULE_nestEntry = 79;
247
+ static readonly RULE_aggregateStatement = 80;
248
+ static readonly RULE_calculateStatement = 81;
249
+ static readonly RULE_projectStatement = 82;
250
+ static readonly RULE_partitionByStatement = 83;
251
+ static readonly RULE_orderByStatement = 84;
252
+ static readonly RULE_ordering = 85;
253
+ static readonly RULE_orderBySpec = 86;
254
+ static readonly RULE_limitStatement = 87;
255
+ static readonly RULE_bySpec = 88;
256
+ static readonly RULE_topStatement = 89;
257
+ static readonly RULE_indexElement = 90;
258
+ static readonly RULE_indexFields = 91;
259
+ static readonly RULE_indexStatement = 92;
260
+ static readonly RULE_sampleStatement = 93;
261
+ static readonly RULE_timezoneStatement = 94;
262
+ static readonly RULE_queryAnnotation = 95;
263
+ static readonly RULE_sampleSpec = 96;
264
+ static readonly RULE_aggregate = 97;
265
+ static readonly RULE_malloyType = 98;
266
+ static readonly RULE_compareOp = 99;
267
+ static readonly RULE_string = 100;
268
+ static readonly RULE_shortString = 101;
269
+ static readonly RULE_numericLiteral = 102;
270
+ static readonly RULE_literal = 103;
271
+ static readonly RULE_dateLiteral = 104;
272
+ static readonly RULE_tablePath = 105;
273
+ static readonly RULE_tableURI = 106;
274
+ static readonly RULE_id = 107;
275
+ static readonly RULE_timeframe = 108;
276
+ static readonly RULE_ungroup = 109;
277
+ static readonly RULE_malloyOrSQLType = 110;
278
+ static readonly RULE_fieldExpr = 111;
279
+ static readonly RULE_partialAllowedFieldExpr = 112;
280
+ static readonly RULE_pickStatement = 113;
281
+ static readonly RULE_pick = 114;
282
+ static readonly RULE_argumentList = 115;
283
+ static readonly RULE_fieldNameList = 116;
284
+ static readonly RULE_fieldCollection = 117;
285
+ static readonly RULE_collectionWildCard = 118;
286
+ static readonly RULE_starQualified = 119;
287
+ static readonly RULE_taggedRef = 120;
288
+ static readonly RULE_refExpr = 121;
289
+ static readonly RULE_collectionMember = 122;
290
+ static readonly RULE_fieldPath = 123;
291
+ static readonly RULE_joinName = 124;
292
+ static readonly RULE_fieldName = 125;
293
+ static readonly RULE_justExpr = 126;
294
+ static readonly RULE_sqlExploreNameRef = 127;
295
+ static readonly RULE_nameSQLBlock = 128;
296
+ static readonly RULE_connectionName = 129;
297
+ static readonly RULE_experimentalStatementForTesting = 130;
291
298
  static readonly ruleNames: string[];
292
299
  private static readonly _LITERAL_NAMES;
293
300
  private static readonly _SYMBOLIC_NAMES;
@@ -360,7 +367,12 @@ export declare class MalloyParser extends Parser {
360
367
  joinDef(): JoinDefContext;
361
368
  joinExpression(): JoinExpressionContext;
362
369
  filterStatement(): FilterStatementContext;
363
- filteredBy(): FilteredByContext;
370
+ fieldProperties(): FieldPropertiesContext;
371
+ aggregateOrdering(): AggregateOrderingContext;
372
+ aggregateOrderBySpec(): AggregateOrderBySpecContext;
373
+ aggregateOrderByStatement(): AggregateOrderByStatementContext;
374
+ fieldPropertyLimitStatement(): FieldPropertyLimitStatementContext;
375
+ fieldPropertyStatement(): FieldPropertyStatementContext;
364
376
  filterClauseList(): FilterClauseListContext;
365
377
  whereStatement(): WhereStatementContext;
366
378
  havingStatement(): HavingStatementContext;
@@ -378,6 +390,7 @@ export declare class MalloyParser extends Parser {
378
390
  aggregateStatement(): AggregateStatementContext;
379
391
  calculateStatement(): CalculateStatementContext;
380
392
  projectStatement(): ProjectStatementContext;
393
+ partitionByStatement(): PartitionByStatementContext;
381
394
  orderByStatement(): OrderByStatementContext;
382
395
  ordering(): OrderingContext;
383
396
  orderBySpec(): OrderBySpecContext;
@@ -1308,22 +1321,64 @@ export declare class FilterStatementContext extends ParserRuleContext {
1308
1321
  exitRule(listener: MalloyParserListener): void;
1309
1322
  accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1310
1323
  }
1311
- export declare class FilteredByContext extends ParserRuleContext {
1324
+ export declare class FieldPropertiesContext extends ParserRuleContext {
1325
+ OCURLY(): TerminalNode;
1326
+ CCURLY(): TerminalNode;
1327
+ fieldPropertyStatement(): FieldPropertyStatementContext[];
1328
+ fieldPropertyStatement(i: number): FieldPropertyStatementContext;
1329
+ SEMI(): TerminalNode[];
1330
+ SEMI(i: number): TerminalNode;
1312
1331
  constructor(parent: ParserRuleContext | undefined, invokingState: number);
1313
1332
  get ruleIndex(): number;
1314
- copyFrom(ctx: FilteredByContext): void;
1333
+ enterRule(listener: MalloyParserListener): void;
1334
+ exitRule(listener: MalloyParserListener): void;
1335
+ accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1315
1336
  }
1316
- export declare class FilterByShortcutContext extends FilteredByContext {
1317
- QMARK(): TerminalNode;
1337
+ export declare class AggregateOrderingContext extends ParserRuleContext {
1338
+ aggregateOrderBySpec(): AggregateOrderBySpecContext[];
1339
+ aggregateOrderBySpec(i: number): AggregateOrderBySpecContext;
1340
+ COMMA(): TerminalNode[];
1341
+ COMMA(i: number): TerminalNode;
1342
+ constructor(parent: ParserRuleContext | undefined, invokingState: number);
1343
+ get ruleIndex(): number;
1344
+ enterRule(listener: MalloyParserListener): void;
1345
+ exitRule(listener: MalloyParserListener): void;
1346
+ accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1347
+ }
1348
+ export declare class AggregateOrderBySpecContext extends ParserRuleContext {
1318
1349
  fieldExpr(): FieldExprContext;
1319
- constructor(ctx: FilteredByContext);
1350
+ ASC(): TerminalNode | undefined;
1351
+ DESC(): TerminalNode | undefined;
1352
+ constructor(parent: ParserRuleContext | undefined, invokingState: number);
1353
+ get ruleIndex(): number;
1320
1354
  enterRule(listener: MalloyParserListener): void;
1321
1355
  exitRule(listener: MalloyParserListener): void;
1322
1356
  accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1323
1357
  }
1324
- export declare class FilterByWhereContext extends FilteredByContext {
1325
- whereStatement(): WhereStatementContext;
1326
- constructor(ctx: FilteredByContext);
1358
+ export declare class AggregateOrderByStatementContext extends ParserRuleContext {
1359
+ ORDER_BY(): TerminalNode;
1360
+ aggregateOrdering(): AggregateOrderingContext;
1361
+ constructor(parent: ParserRuleContext | undefined, invokingState: number);
1362
+ get ruleIndex(): number;
1363
+ enterRule(listener: MalloyParserListener): void;
1364
+ exitRule(listener: MalloyParserListener): void;
1365
+ accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1366
+ }
1367
+ export declare class FieldPropertyLimitStatementContext extends ParserRuleContext {
1368
+ limitStatement(): LimitStatementContext;
1369
+ constructor(parent: ParserRuleContext | undefined, invokingState: number);
1370
+ get ruleIndex(): number;
1371
+ enterRule(listener: MalloyParserListener): void;
1372
+ exitRule(listener: MalloyParserListener): void;
1373
+ accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1374
+ }
1375
+ export declare class FieldPropertyStatementContext extends ParserRuleContext {
1376
+ whereStatement(): WhereStatementContext | undefined;
1377
+ partitionByStatement(): PartitionByStatementContext | undefined;
1378
+ aggregateOrderByStatement(): AggregateOrderByStatementContext | undefined;
1379
+ fieldPropertyLimitStatement(): FieldPropertyLimitStatementContext | undefined;
1380
+ constructor(parent: ParserRuleContext | undefined, invokingState: number);
1381
+ get ruleIndex(): number;
1327
1382
  enterRule(listener: MalloyParserListener): void;
1328
1383
  exitRule(listener: MalloyParserListener): void;
1329
1384
  accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
@@ -1528,6 +1583,18 @@ export declare class ProjectStatementContext extends ParserRuleContext {
1528
1583
  exitRule(listener: MalloyParserListener): void;
1529
1584
  accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1530
1585
  }
1586
+ export declare class PartitionByStatementContext extends ParserRuleContext {
1587
+ PARTITION_BY(): TerminalNode;
1588
+ id(): IdContext[];
1589
+ id(i: number): IdContext;
1590
+ COMMA(): TerminalNode[];
1591
+ COMMA(i: number): TerminalNode;
1592
+ constructor(parent: ParserRuleContext | undefined, invokingState: number);
1593
+ get ruleIndex(): number;
1594
+ enterRule(listener: MalloyParserListener): void;
1595
+ exitRule(listener: MalloyParserListener): void;
1596
+ accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1597
+ }
1531
1598
  export declare class OrderByStatementContext extends ParserRuleContext {
1532
1599
  ORDER_BY(): TerminalNode;
1533
1600
  ordering(): OrderingContext;
@@ -1902,11 +1969,9 @@ export declare class ExprFieldPathContext extends FieldExprContext {
1902
1969
  exitRule(listener: MalloyParserListener): void;
1903
1970
  accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
1904
1971
  }
1905
- export declare class ExprFilterContext extends FieldExprContext {
1972
+ export declare class ExprFieldPropsContext extends FieldExprContext {
1906
1973
  fieldExpr(): FieldExprContext;
1907
- OCURLY(): TerminalNode;
1908
- filteredBy(): FilteredByContext;
1909
- CCURLY(): TerminalNode;
1974
+ fieldProperties(): FieldPropertiesContext;
1910
1975
  constructor(ctx: FieldExprContext);
1911
1976
  enterRule(listener: MalloyParserListener): void;
1912
1977
  exitRule(listener: MalloyParserListener): void;