@malloydata/malloy 0.0.110 → 0.0.111-dev231204165238
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.
- package/dist/lang/ast/query-properties/joins.d.ts +2 -0
- package/dist/lang/ast/query-properties/joins.js +12 -1
- package/dist/lang/lib/Malloy/MalloyLexer.d.ts +103 -99
- package/dist/lang/lib/Malloy/MalloyLexer.js +1164 -1142
- package/dist/lang/lib/Malloy/MalloyParser.d.ts +186 -167
- package/dist/lang/lib/Malloy/MalloyParser.js +1792 -1685
- package/dist/lang/lib/Malloy/MalloyParserListener.d.ts +11 -0
- package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts +7 -0
- package/dist/lang/malloy-to-ast.js +8 -0
- package/dist/lang/test/field-symbols.spec.js +1 -0
- package/dist/lang/test/test-translator.js +1 -0
- package/dist/model/malloy_query.d.ts +1 -0
- package/dist/model/malloy_query.js +20 -3
- package/dist/model/malloy_types.d.ts +3 -0
- package/dist/model/malloy_types.js +6 -2
- package/package.json +1 -1
|
@@ -61,105 +61,109 @@ export declare class MalloyParser extends Parser {
|
|
|
61
61
|
static readonly EXCLUDE = 50;
|
|
62
62
|
static readonly EXTEND = 51;
|
|
63
63
|
static readonly FALSE = 52;
|
|
64
|
-
static readonly
|
|
65
|
-
static readonly
|
|
66
|
-
static readonly
|
|
67
|
-
static readonly
|
|
68
|
-
static readonly
|
|
69
|
-
static readonly
|
|
70
|
-
static readonly
|
|
71
|
-
static readonly
|
|
72
|
-
static readonly
|
|
73
|
-
static readonly
|
|
74
|
-
static readonly
|
|
75
|
-
static readonly
|
|
76
|
-
static readonly
|
|
77
|
-
static readonly
|
|
78
|
-
static readonly
|
|
79
|
-
static readonly
|
|
80
|
-
static readonly
|
|
81
|
-
static readonly
|
|
82
|
-
static readonly
|
|
83
|
-
static readonly
|
|
84
|
-
static readonly
|
|
85
|
-
static readonly
|
|
86
|
-
static readonly
|
|
87
|
-
static readonly
|
|
88
|
-
static readonly
|
|
89
|
-
static readonly
|
|
90
|
-
static readonly
|
|
91
|
-
static readonly
|
|
92
|
-
static readonly
|
|
93
|
-
static readonly
|
|
94
|
-
static readonly
|
|
95
|
-
static readonly
|
|
96
|
-
static readonly
|
|
97
|
-
static readonly
|
|
98
|
-
static readonly
|
|
99
|
-
static readonly
|
|
100
|
-
static readonly
|
|
101
|
-
static readonly
|
|
102
|
-
static readonly
|
|
103
|
-
static readonly
|
|
104
|
-
static readonly
|
|
105
|
-
static readonly
|
|
106
|
-
static readonly
|
|
107
|
-
static readonly
|
|
108
|
-
static readonly
|
|
109
|
-
static readonly
|
|
110
|
-
static readonly
|
|
111
|
-
static readonly
|
|
112
|
-
static readonly
|
|
113
|
-
static readonly
|
|
114
|
-
static readonly
|
|
115
|
-
static readonly
|
|
116
|
-
static readonly
|
|
117
|
-
static readonly
|
|
118
|
-
static readonly
|
|
119
|
-
static readonly
|
|
120
|
-
static readonly
|
|
121
|
-
static readonly
|
|
122
|
-
static readonly
|
|
123
|
-
static readonly
|
|
124
|
-
static readonly
|
|
125
|
-
static readonly
|
|
126
|
-
static readonly
|
|
127
|
-
static readonly
|
|
128
|
-
static readonly
|
|
129
|
-
static readonly
|
|
130
|
-
static readonly
|
|
131
|
-
static readonly
|
|
132
|
-
static readonly
|
|
133
|
-
static readonly
|
|
134
|
-
static readonly
|
|
135
|
-
static readonly
|
|
136
|
-
static readonly
|
|
137
|
-
static readonly
|
|
138
|
-
static readonly
|
|
139
|
-
static readonly
|
|
140
|
-
static readonly
|
|
141
|
-
static readonly
|
|
142
|
-
static readonly
|
|
143
|
-
static readonly
|
|
144
|
-
static readonly
|
|
145
|
-
static readonly
|
|
146
|
-
static readonly
|
|
147
|
-
static readonly
|
|
148
|
-
static readonly
|
|
149
|
-
static readonly
|
|
150
|
-
static readonly
|
|
151
|
-
static readonly
|
|
152
|
-
static readonly
|
|
153
|
-
static readonly
|
|
154
|
-
static readonly
|
|
155
|
-
static readonly
|
|
156
|
-
static readonly
|
|
157
|
-
static readonly
|
|
158
|
-
static readonly
|
|
159
|
-
static readonly
|
|
160
|
-
static readonly
|
|
161
|
-
static readonly
|
|
162
|
-
static readonly
|
|
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 REFINE = 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;
|
|
163
167
|
static readonly RULE_malloyDocument = 0;
|
|
164
168
|
static readonly RULE_malloyStatement = 1;
|
|
165
169
|
static readonly RULE_defineSourceStatement = 2;
|
|
@@ -222,74 +226,75 @@ export declare class MalloyParser extends Parser {
|
|
|
222
226
|
static readonly RULE_queryExtendStatementList = 59;
|
|
223
227
|
static readonly RULE_joinList = 60;
|
|
224
228
|
static readonly RULE_isExplore = 61;
|
|
225
|
-
static readonly
|
|
226
|
-
static readonly
|
|
227
|
-
static readonly
|
|
228
|
-
static readonly
|
|
229
|
-
static readonly
|
|
230
|
-
static readonly
|
|
231
|
-
static readonly
|
|
232
|
-
static readonly
|
|
233
|
-
static readonly
|
|
234
|
-
static readonly
|
|
235
|
-
static readonly
|
|
236
|
-
static readonly
|
|
237
|
-
static readonly
|
|
238
|
-
static readonly
|
|
239
|
-
static readonly
|
|
240
|
-
static readonly
|
|
241
|
-
static readonly
|
|
242
|
-
static readonly
|
|
243
|
-
static readonly
|
|
244
|
-
static readonly
|
|
245
|
-
static readonly
|
|
246
|
-
static readonly
|
|
247
|
-
static readonly
|
|
248
|
-
static readonly
|
|
249
|
-
static readonly
|
|
250
|
-
static readonly
|
|
251
|
-
static readonly
|
|
252
|
-
static readonly
|
|
253
|
-
static readonly
|
|
254
|
-
static readonly
|
|
255
|
-
static readonly
|
|
256
|
-
static readonly
|
|
257
|
-
static readonly
|
|
258
|
-
static readonly
|
|
259
|
-
static readonly
|
|
260
|
-
static readonly
|
|
261
|
-
static readonly
|
|
262
|
-
static readonly
|
|
263
|
-
static readonly
|
|
264
|
-
static readonly
|
|
265
|
-
static readonly
|
|
266
|
-
static readonly
|
|
267
|
-
static readonly
|
|
268
|
-
static readonly
|
|
269
|
-
static readonly
|
|
270
|
-
static readonly
|
|
271
|
-
static readonly
|
|
272
|
-
static readonly
|
|
273
|
-
static readonly
|
|
274
|
-
static readonly
|
|
275
|
-
static readonly
|
|
276
|
-
static readonly
|
|
277
|
-
static readonly
|
|
278
|
-
static readonly
|
|
279
|
-
static readonly
|
|
280
|
-
static readonly
|
|
281
|
-
static readonly
|
|
282
|
-
static readonly
|
|
283
|
-
static readonly
|
|
284
|
-
static readonly
|
|
285
|
-
static readonly
|
|
286
|
-
static readonly
|
|
287
|
-
static readonly
|
|
288
|
-
static readonly
|
|
289
|
-
static readonly
|
|
290
|
-
static readonly
|
|
291
|
-
static readonly
|
|
292
|
-
static readonly
|
|
229
|
+
static readonly RULE_matrixOperation = 62;
|
|
230
|
+
static readonly RULE_joinDef = 63;
|
|
231
|
+
static readonly RULE_joinExpression = 64;
|
|
232
|
+
static readonly RULE_filterStatement = 65;
|
|
233
|
+
static readonly RULE_filteredBy = 66;
|
|
234
|
+
static readonly RULE_filterClauseList = 67;
|
|
235
|
+
static readonly RULE_whereStatement = 68;
|
|
236
|
+
static readonly RULE_havingStatement = 69;
|
|
237
|
+
static readonly RULE_subQueryDefList = 70;
|
|
238
|
+
static readonly RULE_exploreQueryNameDef = 71;
|
|
239
|
+
static readonly RULE_exploreQueryDef = 72;
|
|
240
|
+
static readonly RULE_queryStatement = 73;
|
|
241
|
+
static readonly RULE_queryJoinStatement = 74;
|
|
242
|
+
static readonly RULE_groupByStatement = 75;
|
|
243
|
+
static readonly RULE_queryFieldList = 76;
|
|
244
|
+
static readonly RULE_queryFieldEntry = 77;
|
|
245
|
+
static readonly RULE_nestStatement = 78;
|
|
246
|
+
static readonly RULE_nestedQueryList = 79;
|
|
247
|
+
static readonly RULE_nestEntry = 80;
|
|
248
|
+
static readonly RULE_aggregateStatement = 81;
|
|
249
|
+
static readonly RULE_calculateStatement = 82;
|
|
250
|
+
static readonly RULE_projectStatement = 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;
|
|
293
298
|
static readonly ruleNames: string[];
|
|
294
299
|
private static readonly _LITERAL_NAMES;
|
|
295
300
|
private static readonly _SYMBOLIC_NAMES;
|
|
@@ -363,6 +368,7 @@ export declare class MalloyParser extends Parser {
|
|
|
363
368
|
queryExtendStatementList(): QueryExtendStatementListContext;
|
|
364
369
|
joinList(): JoinListContext;
|
|
365
370
|
isExplore(): IsExploreContext;
|
|
371
|
+
matrixOperation(): MatrixOperationContext;
|
|
366
372
|
joinDef(): JoinDefContext;
|
|
367
373
|
joinExpression(): JoinExpressionContext;
|
|
368
374
|
filterStatement(): FilterStatementContext;
|
|
@@ -1301,6 +1307,17 @@ export declare class IsExploreContext extends ParserRuleContext {
|
|
|
1301
1307
|
exitRule(listener: MalloyParserListener): void;
|
|
1302
1308
|
accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
|
|
1303
1309
|
}
|
|
1310
|
+
export declare class MatrixOperationContext extends ParserRuleContext {
|
|
1311
|
+
LEFT(): TerminalNode | undefined;
|
|
1312
|
+
RIGHT(): TerminalNode | undefined;
|
|
1313
|
+
FULL(): TerminalNode | undefined;
|
|
1314
|
+
INNER(): TerminalNode | undefined;
|
|
1315
|
+
constructor(parent: ParserRuleContext | undefined, invokingState: number);
|
|
1316
|
+
get ruleIndex(): number;
|
|
1317
|
+
enterRule(listener: MalloyParserListener): void;
|
|
1318
|
+
exitRule(listener: MalloyParserListener): void;
|
|
1319
|
+
accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
|
|
1320
|
+
}
|
|
1304
1321
|
export declare class JoinDefContext extends ParserRuleContext {
|
|
1305
1322
|
constructor(parent: ParserRuleContext | undefined, invokingState: number);
|
|
1306
1323
|
get ruleIndex(): number;
|
|
@@ -1313,6 +1330,7 @@ export declare class JoinWithContext extends JoinDefContext {
|
|
|
1313
1330
|
ANNOTATION(): TerminalNode[];
|
|
1314
1331
|
ANNOTATION(i: number): TerminalNode;
|
|
1315
1332
|
isExplore(): IsExploreContext | undefined;
|
|
1333
|
+
matrixOperation(): MatrixOperationContext | undefined;
|
|
1316
1334
|
constructor(ctx: JoinDefContext);
|
|
1317
1335
|
enterRule(listener: MalloyParserListener): void;
|
|
1318
1336
|
exitRule(listener: MalloyParserListener): void;
|
|
@@ -1325,6 +1343,7 @@ export declare class JoinOnContext extends JoinDefContext {
|
|
|
1325
1343
|
isExplore(): IsExploreContext | undefined;
|
|
1326
1344
|
ON(): TerminalNode | undefined;
|
|
1327
1345
|
joinExpression(): JoinExpressionContext | undefined;
|
|
1346
|
+
matrixOperation(): MatrixOperationContext | undefined;
|
|
1328
1347
|
constructor(ctx: JoinDefContext);
|
|
1329
1348
|
enterRule(listener: MalloyParserListener): void;
|
|
1330
1349
|
exitRule(listener: MalloyParserListener): void;
|