@malloydata/malloy 0.0.43 → 0.0.44-dev230623185845

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 (102) hide show
  1. package/dist/index.d.ts +2 -1
  2. package/dist/index.js +3 -1
  3. package/dist/lang/ast/elements/define-query.d.ts +7 -1
  4. package/dist/lang/ast/elements/define-query.js +10 -1
  5. package/dist/lang/ast/elements/define-source.d.ts +7 -1
  6. package/dist/lang/ast/elements/define-source.js +16 -9
  7. package/dist/lang/ast/elements/pipeline-desc.d.ts +2 -1
  8. package/dist/lang/ast/elements/pipeline-desc.js +6 -2
  9. package/dist/lang/ast/elements/refined-source.d.ts +5 -4
  10. package/dist/lang/ast/elements/refined-source.js +5 -0
  11. package/dist/lang/ast/expressions/expr-id-reference.js +4 -4
  12. package/dist/lang/ast/field-space/column-space-field.d.ts +1 -1
  13. package/dist/lang/ast/field-space/column-space-field.js +3 -3
  14. package/dist/lang/ast/field-space/field-definition-value.d.ts +1 -1
  15. package/dist/lang/ast/field-space/field-definition-value.js +16 -10
  16. package/dist/lang/ast/field-space/query-field-struct.js +1 -0
  17. package/dist/lang/ast/field-space/query-spaces.js +4 -1
  18. package/dist/lang/ast/field-space/reference-field.d.ts +8 -2
  19. package/dist/lang/ast/field-space/reference-field.js +51 -9
  20. package/dist/lang/ast/index.d.ts +2 -2
  21. package/dist/lang/ast/index.js +2 -2
  22. package/dist/lang/ast/query-elements/anonymous-query.d.ts +6 -1
  23. package/dist/lang/ast/query-elements/anonymous-query.js +8 -0
  24. package/dist/lang/ast/query-elements/existing-query.js +3 -0
  25. package/dist/lang/ast/query-elements/full-query.js +7 -4
  26. package/dist/lang/ast/query-elements/run-query.d.ts +6 -1
  27. package/dist/lang/ast/query-elements/run-query.js +11 -1
  28. package/dist/lang/ast/query-items/field-declaration.d.ts +6 -2
  29. package/dist/lang/ast/query-items/field-declaration.js +6 -0
  30. package/dist/lang/ast/query-items/field-references.d.ts +13 -5
  31. package/dist/lang/ast/query-items/field-references.js +10 -4
  32. package/dist/lang/ast/query-properties/aggregate.d.ts +3 -3
  33. package/dist/lang/ast/query-properties/aggregate.js +5 -4
  34. package/dist/lang/ast/query-properties/calculate.d.ts +3 -3
  35. package/dist/lang/ast/query-properties/calculate.js +5 -4
  36. package/dist/lang/ast/query-properties/declare-fields.d.ts +4 -3
  37. package/dist/lang/ast/query-properties/declare-fields.js +5 -4
  38. package/dist/lang/ast/query-properties/dimensions.d.ts +4 -0
  39. package/dist/lang/ast/query-properties/{dimmensions.js → dimensions.js} +4 -3
  40. package/dist/lang/ast/query-properties/extend.d.ts +1 -1
  41. package/dist/lang/ast/query-properties/extend.js +3 -2
  42. package/dist/lang/ast/query-properties/filters.d.ts +0 -1
  43. package/dist/lang/ast/query-properties/filters.js +2 -2
  44. package/dist/lang/ast/query-properties/group-by.d.ts +3 -3
  45. package/dist/lang/ast/query-properties/group-by.js +5 -4
  46. package/dist/lang/ast/query-properties/joins.d.ts +10 -4
  47. package/dist/lang/ast/query-properties/joins.js +16 -2
  48. package/dist/lang/ast/query-properties/measures.d.ts +1 -2
  49. package/dist/lang/ast/query-properties/measures.js +3 -2
  50. package/dist/lang/ast/query-properties/nest.d.ts +5 -1
  51. package/dist/lang/ast/query-properties/nest.js +11 -1
  52. package/dist/lang/ast/query-properties/nests.d.ts +3 -2
  53. package/dist/lang/ast/query-properties/nests.js +4 -3
  54. package/dist/lang/ast/query-properties/ordering.d.ts +1 -0
  55. package/dist/lang/ast/query-properties/ordering.js +2 -1
  56. package/dist/lang/ast/query-properties/project-statement.d.ts +3 -3
  57. package/dist/lang/ast/query-properties/project-statement.js +5 -4
  58. package/dist/lang/ast/query-properties/qop-desc.d.ts +1 -1
  59. package/dist/lang/ast/query-properties/qop-desc.js +3 -2
  60. package/dist/lang/ast/source-properties/renames.d.ts +1 -1
  61. package/dist/lang/ast/source-properties/renames.js +3 -2
  62. package/dist/lang/ast/source-properties/turtles.d.ts +3 -3
  63. package/dist/lang/ast/source-properties/turtles.js +5 -4
  64. package/dist/lang/ast/types/definition-list.d.ts +10 -0
  65. package/dist/lang/ast/types/definition-list.js +52 -0
  66. package/dist/lang/ast/types/malloy-element.d.ts +21 -6
  67. package/dist/lang/ast/types/malloy-element.js +45 -13
  68. package/dist/lang/ast/types/noteable.d.ts +12 -0
  69. package/dist/lang/ast/types/noteable.js +42 -0
  70. package/dist/lang/ast/types/query-extend-property.d.ts +1 -1
  71. package/dist/lang/ast/types/query-extend-property.js +2 -2
  72. package/dist/lang/ast/types/query-property.d.ts +3 -2
  73. package/dist/lang/ast/types/query-property.js +2 -0
  74. package/dist/lang/ast/types/source-desc.d.ts +5 -0
  75. package/dist/lang/ast/types/{explore-desc.js → source-desc.js} +7 -6
  76. package/dist/lang/ast/types/source-property.d.ts +2 -2
  77. package/dist/lang/ast/types/source-property.js +2 -0
  78. package/dist/lang/ast/types/space-field.d.ts +1 -0
  79. package/dist/lang/lib/Malloy/MalloyLexer.d.ts +56 -54
  80. package/dist/lang/lib/Malloy/MalloyLexer.js +1051 -1042
  81. package/dist/lang/lib/Malloy/MalloyParser.d.ts +326 -182
  82. package/dist/lang/lib/Malloy/MalloyParser.js +2894 -1718
  83. package/dist/lang/lib/Malloy/MalloyParserListener.d.ts +133 -19
  84. package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts +83 -11
  85. package/dist/lang/malloy-to-ast.d.ts +23 -10
  86. package/dist/lang/malloy-to-ast.js +144 -122
  87. package/dist/lang/parse-tree-walkers/document-symbol-walker.js +2 -1
  88. package/dist/lang/test/annotation.spec.d.ts +1 -0
  89. package/dist/lang/test/annotation.spec.js +565 -0
  90. package/dist/lang/test/parse.spec.js +20 -19
  91. package/dist/lang/test/test-translator.d.ts +2 -2
  92. package/dist/lang/test/test-translator.js +27 -15
  93. package/dist/malloy.d.ts +11 -5
  94. package/dist/malloy.js +16 -0
  95. package/dist/model/malloy_query.js +10 -0
  96. package/dist/model/malloy_types.d.ts +19 -2
  97. package/dist/model/malloy_types.js +1 -1
  98. package/dist/tags.d.ts +21 -0
  99. package/dist/tags.js +155 -0
  100. package/package.json +1 -1
  101. package/dist/lang/ast/query-properties/dimmensions.d.ts +0 -5
  102. package/dist/lang/ast/types/explore-desc.d.ts +0 -5
@@ -1,5 +1,5 @@
1
1
  import { ParseTreeListener } from "antlr4ts/tree/ParseTreeListener";
2
- import { NamedQueries_stubContext } from "./MalloyParser";
2
+ import { Use_top_level_query_defsContext } from "./MalloyParser";
3
3
  import { AnonymousQueryContext } from "./MalloyParser";
4
4
  import { NamedSourceContext } from "./MalloyParser";
5
5
  import { TableSourceContext } from "./MalloyParser";
@@ -63,8 +63,10 @@ import { DefExploreWhere_stubContext } from "./MalloyParser";
63
63
  import { DefExplorePrimaryKeyContext } from "./MalloyParser";
64
64
  import { DefExploreRenameContext } from "./MalloyParser";
65
65
  import { DefExploreEditFieldContext } from "./MalloyParser";
66
- import { DefExploreQuery_stubContext } from "./MalloyParser";
66
+ import { DefExploreQueryContext } from "./MalloyParser";
67
67
  import { DefExploreTimezoneContext } from "./MalloyParser";
68
+ import { DefExploreAnnotationContext } from "./MalloyParser";
69
+ import { DefIgnoreModel_stubContext } from "./MalloyParser";
68
70
  import { FilterByShortcutContext } from "./MalloyParser";
69
71
  import { FilterByWhereContext } from "./MalloyParser";
70
72
  import { JoinWithContext } from "./MalloyParser";
@@ -74,6 +76,8 @@ import { MalloyStatementContext } from "./MalloyParser";
74
76
  import { DefineSourceStatementContext } from "./MalloyParser";
75
77
  import { DefineQueryContext } from "./MalloyParser";
76
78
  import { TopLevelAnonQueryDefContext } from "./MalloyParser";
79
+ import { TagsContext } from "./MalloyParser";
80
+ import { IsDefineContext } from "./MalloyParser";
77
81
  import { RunStatementContext } from "./MalloyParser";
78
82
  import { DefineSQLStatementContext } from "./MalloyParser";
79
83
  import { SqlBlockContext } from "./MalloyParser";
@@ -82,6 +86,9 @@ import { SqlStringContext } from "./MalloyParser";
82
86
  import { SqlInterpolationContext } from "./MalloyParser";
83
87
  import { ImportStatementContext } from "./MalloyParser";
84
88
  import { ImportURLContext } from "./MalloyParser";
89
+ import { DocAnnotationsContext } from "./MalloyParser";
90
+ import { IgnoredObjectAnnotationsContext } from "./MalloyParser";
91
+ import { IgnoredModelAnnotationsContext } from "./MalloyParser";
85
92
  import { TopLevelQueryDefsContext } from "./MalloyParser";
86
93
  import { TopLevelQueryDefContext } from "./MalloyParser";
87
94
  import { RefineOperatorContext } from "./MalloyParser";
@@ -102,8 +109,8 @@ import { SourceNameDefContext } from "./MalloyParser";
102
109
  import { SourceIDContext } from "./MalloyParser";
103
110
  import { ExplorePropertiesContext } from "./MalloyParser";
104
111
  import { ExploreStatementContext } from "./MalloyParser";
105
- import { DefDimensionsContext } from "./MalloyParser";
106
112
  import { DefMeasuresContext } from "./MalloyParser";
113
+ import { DefDimensionsContext } from "./MalloyParser";
107
114
  import { RenameListContext } from "./MalloyParser";
108
115
  import { ExploreRenameDefContext } from "./MalloyParser";
109
116
  import { DefListContext } from "./MalloyParser";
@@ -116,6 +123,7 @@ import { QueryExtendContext } from "./MalloyParser";
116
123
  import { QueryExtendStatementContext } from "./MalloyParser";
117
124
  import { QueryExtendStatementListContext } from "./MalloyParser";
118
125
  import { JoinListContext } from "./MalloyParser";
126
+ import { IsExploreContext } from "./MalloyParser";
119
127
  import { JoinDefContext } from "./MalloyParser";
120
128
  import { JoinExpressionContext } from "./MalloyParser";
121
129
  import { FilterStatementContext } from "./MalloyParser";
@@ -149,6 +157,7 @@ import { IndexStatementContext } from "./MalloyParser";
149
157
  import { SampleStatementContext } from "./MalloyParser";
150
158
  import { TimezoneStatementContext } from "./MalloyParser";
151
159
  import { TimezoneNameContext } from "./MalloyParser";
160
+ import { QueryAnnotationContext } from "./MalloyParser";
152
161
  import { SampleSpecContext } from "./MalloyParser";
153
162
  import { AggregateContext } from "./MalloyParser";
154
163
  import { MalloyTypeContext } from "./MalloyParser";
@@ -167,6 +176,7 @@ import { ArgumentListContext } from "./MalloyParser";
167
176
  import { FieldNameListContext } from "./MalloyParser";
168
177
  import { FieldCollectionContext } from "./MalloyParser";
169
178
  import { CollectionWildCardContext } from "./MalloyParser";
179
+ import { TaggedRefContext } from "./MalloyParser";
170
180
  import { CollectionMemberContext } from "./MalloyParser";
171
181
  import { FieldPathContext } from "./MalloyParser";
172
182
  import { JoinNameContext } from "./MalloyParser";
@@ -186,17 +196,17 @@ import { ConnectionNameContext } from "./MalloyParser";
186
196
  */
187
197
  export interface MalloyParserListener extends ParseTreeListener {
188
198
  /**
189
- * Enter a parse tree produced by the `namedQueries_stub`
199
+ * Enter a parse tree produced by the `use_top_level_query_defs`
190
200
  * labeled alternative in `MalloyParser.defineQuery`.
191
201
  * @param ctx the parse tree
192
202
  */
193
- enterNamedQueries_stub?: (ctx: NamedQueries_stubContext) => void;
203
+ enterUse_top_level_query_defs?: (ctx: Use_top_level_query_defsContext) => void;
194
204
  /**
195
- * Exit a parse tree produced by the `namedQueries_stub`
205
+ * Exit a parse tree produced by the `use_top_level_query_defs`
196
206
  * labeled alternative in `MalloyParser.defineQuery`.
197
207
  * @param ctx the parse tree
198
208
  */
199
- exitNamedQueries_stub?: (ctx: NamedQueries_stubContext) => void;
209
+ exitUse_top_level_query_defs?: (ctx: Use_top_level_query_defsContext) => void;
200
210
  /**
201
211
  * Enter a parse tree produced by the `anonymousQuery`
202
212
  * labeled alternative in `MalloyParser.defineQuery`.
@@ -954,17 +964,17 @@ export interface MalloyParserListener extends ParseTreeListener {
954
964
  */
955
965
  exitDefExploreEditField?: (ctx: DefExploreEditFieldContext) => void;
956
966
  /**
957
- * Enter a parse tree produced by the `defExploreQuery_stub`
967
+ * Enter a parse tree produced by the `defExploreQuery`
958
968
  * labeled alternative in `MalloyParser.exploreStatement`.
959
969
  * @param ctx the parse tree
960
970
  */
961
- enterDefExploreQuery_stub?: (ctx: DefExploreQuery_stubContext) => void;
971
+ enterDefExploreQuery?: (ctx: DefExploreQueryContext) => void;
962
972
  /**
963
- * Exit a parse tree produced by the `defExploreQuery_stub`
973
+ * Exit a parse tree produced by the `defExploreQuery`
964
974
  * labeled alternative in `MalloyParser.exploreStatement`.
965
975
  * @param ctx the parse tree
966
976
  */
967
- exitDefExploreQuery_stub?: (ctx: DefExploreQuery_stubContext) => void;
977
+ exitDefExploreQuery?: (ctx: DefExploreQueryContext) => void;
968
978
  /**
969
979
  * Enter a parse tree produced by the `defExploreTimezone`
970
980
  * labeled alternative in `MalloyParser.exploreStatement`.
@@ -977,6 +987,30 @@ export interface MalloyParserListener extends ParseTreeListener {
977
987
  * @param ctx the parse tree
978
988
  */
979
989
  exitDefExploreTimezone?: (ctx: DefExploreTimezoneContext) => void;
990
+ /**
991
+ * Enter a parse tree produced by the `defExploreAnnotation`
992
+ * labeled alternative in `MalloyParser.exploreStatement`.
993
+ * @param ctx the parse tree
994
+ */
995
+ enterDefExploreAnnotation?: (ctx: DefExploreAnnotationContext) => void;
996
+ /**
997
+ * Exit a parse tree produced by the `defExploreAnnotation`
998
+ * labeled alternative in `MalloyParser.exploreStatement`.
999
+ * @param ctx the parse tree
1000
+ */
1001
+ exitDefExploreAnnotation?: (ctx: DefExploreAnnotationContext) => void;
1002
+ /**
1003
+ * Enter a parse tree produced by the `defIgnoreModel_stub`
1004
+ * labeled alternative in `MalloyParser.exploreStatement`.
1005
+ * @param ctx the parse tree
1006
+ */
1007
+ enterDefIgnoreModel_stub?: (ctx: DefIgnoreModel_stubContext) => void;
1008
+ /**
1009
+ * Exit a parse tree produced by the `defIgnoreModel_stub`
1010
+ * labeled alternative in `MalloyParser.exploreStatement`.
1011
+ * @param ctx the parse tree
1012
+ */
1013
+ exitDefIgnoreModel_stub?: (ctx: DefIgnoreModel_stubContext) => void;
980
1014
  /**
981
1015
  * Enter a parse tree produced by the `filterByShortcut`
982
1016
  * labeled alternative in `MalloyParser.filteredBy`.
@@ -1075,6 +1109,26 @@ export interface MalloyParserListener extends ParseTreeListener {
1075
1109
  * @param ctx the parse tree
1076
1110
  */
1077
1111
  exitTopLevelAnonQueryDef?: (ctx: TopLevelAnonQueryDefContext) => void;
1112
+ /**
1113
+ * Enter a parse tree produced by `MalloyParser.tags`.
1114
+ * @param ctx the parse tree
1115
+ */
1116
+ enterTags?: (ctx: TagsContext) => void;
1117
+ /**
1118
+ * Exit a parse tree produced by `MalloyParser.tags`.
1119
+ * @param ctx the parse tree
1120
+ */
1121
+ exitTags?: (ctx: TagsContext) => void;
1122
+ /**
1123
+ * Enter a parse tree produced by `MalloyParser.isDefine`.
1124
+ * @param ctx the parse tree
1125
+ */
1126
+ enterIsDefine?: (ctx: IsDefineContext) => void;
1127
+ /**
1128
+ * Exit a parse tree produced by `MalloyParser.isDefine`.
1129
+ * @param ctx the parse tree
1130
+ */
1131
+ exitIsDefine?: (ctx: IsDefineContext) => void;
1078
1132
  /**
1079
1133
  * Enter a parse tree produced by `MalloyParser.runStatement`.
1080
1134
  * @param ctx the parse tree
@@ -1155,6 +1209,36 @@ export interface MalloyParserListener extends ParseTreeListener {
1155
1209
  * @param ctx the parse tree
1156
1210
  */
1157
1211
  exitImportURL?: (ctx: ImportURLContext) => void;
1212
+ /**
1213
+ * Enter a parse tree produced by `MalloyParser.docAnnotations`.
1214
+ * @param ctx the parse tree
1215
+ */
1216
+ enterDocAnnotations?: (ctx: DocAnnotationsContext) => void;
1217
+ /**
1218
+ * Exit a parse tree produced by `MalloyParser.docAnnotations`.
1219
+ * @param ctx the parse tree
1220
+ */
1221
+ exitDocAnnotations?: (ctx: DocAnnotationsContext) => void;
1222
+ /**
1223
+ * Enter a parse tree produced by `MalloyParser.ignoredObjectAnnotations`.
1224
+ * @param ctx the parse tree
1225
+ */
1226
+ enterIgnoredObjectAnnotations?: (ctx: IgnoredObjectAnnotationsContext) => void;
1227
+ /**
1228
+ * Exit a parse tree produced by `MalloyParser.ignoredObjectAnnotations`.
1229
+ * @param ctx the parse tree
1230
+ */
1231
+ exitIgnoredObjectAnnotations?: (ctx: IgnoredObjectAnnotationsContext) => void;
1232
+ /**
1233
+ * Enter a parse tree produced by `MalloyParser.ignoredModelAnnotations`.
1234
+ * @param ctx the parse tree
1235
+ */
1236
+ enterIgnoredModelAnnotations?: (ctx: IgnoredModelAnnotationsContext) => void;
1237
+ /**
1238
+ * Exit a parse tree produced by `MalloyParser.ignoredModelAnnotations`.
1239
+ * @param ctx the parse tree
1240
+ */
1241
+ exitIgnoredModelAnnotations?: (ctx: IgnoredModelAnnotationsContext) => void;
1158
1242
  /**
1159
1243
  * Enter a parse tree produced by `MalloyParser.topLevelQueryDefs`.
1160
1244
  * @param ctx the parse tree
@@ -1356,25 +1440,25 @@ export interface MalloyParserListener extends ParseTreeListener {
1356
1440
  */
1357
1441
  exitExploreStatement?: (ctx: ExploreStatementContext) => void;
1358
1442
  /**
1359
- * Enter a parse tree produced by `MalloyParser.defDimensions`.
1443
+ * Enter a parse tree produced by `MalloyParser.defMeasures`.
1360
1444
  * @param ctx the parse tree
1361
1445
  */
1362
- enterDefDimensions?: (ctx: DefDimensionsContext) => void;
1446
+ enterDefMeasures?: (ctx: DefMeasuresContext) => void;
1363
1447
  /**
1364
- * Exit a parse tree produced by `MalloyParser.defDimensions`.
1448
+ * Exit a parse tree produced by `MalloyParser.defMeasures`.
1365
1449
  * @param ctx the parse tree
1366
1450
  */
1367
- exitDefDimensions?: (ctx: DefDimensionsContext) => void;
1451
+ exitDefMeasures?: (ctx: DefMeasuresContext) => void;
1368
1452
  /**
1369
- * Enter a parse tree produced by `MalloyParser.defMeasures`.
1453
+ * Enter a parse tree produced by `MalloyParser.defDimensions`.
1370
1454
  * @param ctx the parse tree
1371
1455
  */
1372
- enterDefMeasures?: (ctx: DefMeasuresContext) => void;
1456
+ enterDefDimensions?: (ctx: DefDimensionsContext) => void;
1373
1457
  /**
1374
- * Exit a parse tree produced by `MalloyParser.defMeasures`.
1458
+ * Exit a parse tree produced by `MalloyParser.defDimensions`.
1375
1459
  * @param ctx the parse tree
1376
1460
  */
1377
- exitDefMeasures?: (ctx: DefMeasuresContext) => void;
1461
+ exitDefDimensions?: (ctx: DefDimensionsContext) => void;
1378
1462
  /**
1379
1463
  * Enter a parse tree produced by `MalloyParser.renameList`.
1380
1464
  * @param ctx the parse tree
@@ -1495,6 +1579,16 @@ export interface MalloyParserListener extends ParseTreeListener {
1495
1579
  * @param ctx the parse tree
1496
1580
  */
1497
1581
  exitJoinList?: (ctx: JoinListContext) => void;
1582
+ /**
1583
+ * Enter a parse tree produced by `MalloyParser.isExplore`.
1584
+ * @param ctx the parse tree
1585
+ */
1586
+ enterIsExplore?: (ctx: IsExploreContext) => void;
1587
+ /**
1588
+ * Exit a parse tree produced by `MalloyParser.isExplore`.
1589
+ * @param ctx the parse tree
1590
+ */
1591
+ exitIsExplore?: (ctx: IsExploreContext) => void;
1498
1592
  /**
1499
1593
  * Enter a parse tree produced by `MalloyParser.joinDef`.
1500
1594
  * @param ctx the parse tree
@@ -1825,6 +1919,16 @@ export interface MalloyParserListener extends ParseTreeListener {
1825
1919
  * @param ctx the parse tree
1826
1920
  */
1827
1921
  exitTimezoneName?: (ctx: TimezoneNameContext) => void;
1922
+ /**
1923
+ * Enter a parse tree produced by `MalloyParser.queryAnnotation`.
1924
+ * @param ctx the parse tree
1925
+ */
1926
+ enterQueryAnnotation?: (ctx: QueryAnnotationContext) => void;
1927
+ /**
1928
+ * Exit a parse tree produced by `MalloyParser.queryAnnotation`.
1929
+ * @param ctx the parse tree
1930
+ */
1931
+ exitQueryAnnotation?: (ctx: QueryAnnotationContext) => void;
1828
1932
  /**
1829
1933
  * Enter a parse tree produced by `MalloyParser.sampleSpec`.
1830
1934
  * @param ctx the parse tree
@@ -2005,6 +2109,16 @@ export interface MalloyParserListener extends ParseTreeListener {
2005
2109
  * @param ctx the parse tree
2006
2110
  */
2007
2111
  exitCollectionWildCard?: (ctx: CollectionWildCardContext) => void;
2112
+ /**
2113
+ * Enter a parse tree produced by `MalloyParser.taggedRef`.
2114
+ * @param ctx the parse tree
2115
+ */
2116
+ enterTaggedRef?: (ctx: TaggedRefContext) => void;
2117
+ /**
2118
+ * Exit a parse tree produced by `MalloyParser.taggedRef`.
2119
+ * @param ctx the parse tree
2120
+ */
2121
+ exitTaggedRef?: (ctx: TaggedRefContext) => void;
2008
2122
  /**
2009
2123
  * Enter a parse tree produced by `MalloyParser.collectionMember`.
2010
2124
  * @param ctx the parse tree
@@ -1,5 +1,5 @@
1
1
  import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
2
- import { NamedQueries_stubContext } from "./MalloyParser";
2
+ import { Use_top_level_query_defsContext } from "./MalloyParser";
3
3
  import { AnonymousQueryContext } from "./MalloyParser";
4
4
  import { NamedSourceContext } from "./MalloyParser";
5
5
  import { TableSourceContext } from "./MalloyParser";
@@ -63,8 +63,10 @@ import { DefExploreWhere_stubContext } from "./MalloyParser";
63
63
  import { DefExplorePrimaryKeyContext } from "./MalloyParser";
64
64
  import { DefExploreRenameContext } from "./MalloyParser";
65
65
  import { DefExploreEditFieldContext } from "./MalloyParser";
66
- import { DefExploreQuery_stubContext } from "./MalloyParser";
66
+ import { DefExploreQueryContext } from "./MalloyParser";
67
67
  import { DefExploreTimezoneContext } from "./MalloyParser";
68
+ import { DefExploreAnnotationContext } from "./MalloyParser";
69
+ import { DefIgnoreModel_stubContext } from "./MalloyParser";
68
70
  import { FilterByShortcutContext } from "./MalloyParser";
69
71
  import { FilterByWhereContext } from "./MalloyParser";
70
72
  import { JoinWithContext } from "./MalloyParser";
@@ -74,6 +76,8 @@ import { MalloyStatementContext } from "./MalloyParser";
74
76
  import { DefineSourceStatementContext } from "./MalloyParser";
75
77
  import { DefineQueryContext } from "./MalloyParser";
76
78
  import { TopLevelAnonQueryDefContext } from "./MalloyParser";
79
+ import { TagsContext } from "./MalloyParser";
80
+ import { IsDefineContext } from "./MalloyParser";
77
81
  import { RunStatementContext } from "./MalloyParser";
78
82
  import { DefineSQLStatementContext } from "./MalloyParser";
79
83
  import { SqlBlockContext } from "./MalloyParser";
@@ -82,6 +86,9 @@ import { SqlStringContext } from "./MalloyParser";
82
86
  import { SqlInterpolationContext } from "./MalloyParser";
83
87
  import { ImportStatementContext } from "./MalloyParser";
84
88
  import { ImportURLContext } from "./MalloyParser";
89
+ import { DocAnnotationsContext } from "./MalloyParser";
90
+ import { IgnoredObjectAnnotationsContext } from "./MalloyParser";
91
+ import { IgnoredModelAnnotationsContext } from "./MalloyParser";
85
92
  import { TopLevelQueryDefsContext } from "./MalloyParser";
86
93
  import { TopLevelQueryDefContext } from "./MalloyParser";
87
94
  import { RefineOperatorContext } from "./MalloyParser";
@@ -102,8 +109,8 @@ import { SourceNameDefContext } from "./MalloyParser";
102
109
  import { SourceIDContext } from "./MalloyParser";
103
110
  import { ExplorePropertiesContext } from "./MalloyParser";
104
111
  import { ExploreStatementContext } from "./MalloyParser";
105
- import { DefDimensionsContext } from "./MalloyParser";
106
112
  import { DefMeasuresContext } from "./MalloyParser";
113
+ import { DefDimensionsContext } from "./MalloyParser";
107
114
  import { RenameListContext } from "./MalloyParser";
108
115
  import { ExploreRenameDefContext } from "./MalloyParser";
109
116
  import { DefListContext } from "./MalloyParser";
@@ -116,6 +123,7 @@ import { QueryExtendContext } from "./MalloyParser";
116
123
  import { QueryExtendStatementContext } from "./MalloyParser";
117
124
  import { QueryExtendStatementListContext } from "./MalloyParser";
118
125
  import { JoinListContext } from "./MalloyParser";
126
+ import { IsExploreContext } from "./MalloyParser";
119
127
  import { JoinDefContext } from "./MalloyParser";
120
128
  import { JoinExpressionContext } from "./MalloyParser";
121
129
  import { FilterStatementContext } from "./MalloyParser";
@@ -149,6 +157,7 @@ import { IndexStatementContext } from "./MalloyParser";
149
157
  import { SampleStatementContext } from "./MalloyParser";
150
158
  import { TimezoneStatementContext } from "./MalloyParser";
151
159
  import { TimezoneNameContext } from "./MalloyParser";
160
+ import { QueryAnnotationContext } from "./MalloyParser";
152
161
  import { SampleSpecContext } from "./MalloyParser";
153
162
  import { AggregateContext } from "./MalloyParser";
154
163
  import { MalloyTypeContext } from "./MalloyParser";
@@ -167,6 +176,7 @@ import { ArgumentListContext } from "./MalloyParser";
167
176
  import { FieldNameListContext } from "./MalloyParser";
168
177
  import { FieldCollectionContext } from "./MalloyParser";
169
178
  import { CollectionWildCardContext } from "./MalloyParser";
179
+ import { TaggedRefContext } from "./MalloyParser";
170
180
  import { CollectionMemberContext } from "./MalloyParser";
171
181
  import { FieldPathContext } from "./MalloyParser";
172
182
  import { JoinNameContext } from "./MalloyParser";
@@ -189,12 +199,12 @@ import { ConnectionNameContext } from "./MalloyParser";
189
199
  */
190
200
  export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
191
201
  /**
192
- * Visit a parse tree produced by the `namedQueries_stub`
202
+ * Visit a parse tree produced by the `use_top_level_query_defs`
193
203
  * labeled alternative in `MalloyParser.defineQuery`.
194
204
  * @param ctx the parse tree
195
205
  * @return the visitor result
196
206
  */
197
- visitNamedQueries_stub?: (ctx: NamedQueries_stubContext) => Result;
207
+ visitUse_top_level_query_defs?: (ctx: Use_top_level_query_defsContext) => Result;
198
208
  /**
199
209
  * Visit a parse tree produced by the `anonymousQuery`
200
210
  * labeled alternative in `MalloyParser.defineQuery`.
@@ -637,12 +647,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
637
647
  */
638
648
  visitDefExploreEditField?: (ctx: DefExploreEditFieldContext) => Result;
639
649
  /**
640
- * Visit a parse tree produced by the `defExploreQuery_stub`
650
+ * Visit a parse tree produced by the `defExploreQuery`
641
651
  * labeled alternative in `MalloyParser.exploreStatement`.
642
652
  * @param ctx the parse tree
643
653
  * @return the visitor result
644
654
  */
645
- visitDefExploreQuery_stub?: (ctx: DefExploreQuery_stubContext) => Result;
655
+ visitDefExploreQuery?: (ctx: DefExploreQueryContext) => Result;
646
656
  /**
647
657
  * Visit a parse tree produced by the `defExploreTimezone`
648
658
  * labeled alternative in `MalloyParser.exploreStatement`.
@@ -650,6 +660,20 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
650
660
  * @return the visitor result
651
661
  */
652
662
  visitDefExploreTimezone?: (ctx: DefExploreTimezoneContext) => Result;
663
+ /**
664
+ * Visit a parse tree produced by the `defExploreAnnotation`
665
+ * labeled alternative in `MalloyParser.exploreStatement`.
666
+ * @param ctx the parse tree
667
+ * @return the visitor result
668
+ */
669
+ visitDefExploreAnnotation?: (ctx: DefExploreAnnotationContext) => Result;
670
+ /**
671
+ * Visit a parse tree produced by the `defIgnoreModel_stub`
672
+ * labeled alternative in `MalloyParser.exploreStatement`.
673
+ * @param ctx the parse tree
674
+ * @return the visitor result
675
+ */
676
+ visitDefIgnoreModel_stub?: (ctx: DefIgnoreModel_stubContext) => Result;
653
677
  /**
654
678
  * Visit a parse tree produced by the `filterByShortcut`
655
679
  * labeled alternative in `MalloyParser.filteredBy`.
@@ -708,6 +732,18 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
708
732
  * @return the visitor result
709
733
  */
710
734
  visitTopLevelAnonQueryDef?: (ctx: TopLevelAnonQueryDefContext) => Result;
735
+ /**
736
+ * Visit a parse tree produced by `MalloyParser.tags`.
737
+ * @param ctx the parse tree
738
+ * @return the visitor result
739
+ */
740
+ visitTags?: (ctx: TagsContext) => Result;
741
+ /**
742
+ * Visit a parse tree produced by `MalloyParser.isDefine`.
743
+ * @param ctx the parse tree
744
+ * @return the visitor result
745
+ */
746
+ visitIsDefine?: (ctx: IsDefineContext) => Result;
711
747
  /**
712
748
  * Visit a parse tree produced by `MalloyParser.runStatement`.
713
749
  * @param ctx the parse tree
@@ -756,6 +792,24 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
756
792
  * @return the visitor result
757
793
  */
758
794
  visitImportURL?: (ctx: ImportURLContext) => Result;
795
+ /**
796
+ * Visit a parse tree produced by `MalloyParser.docAnnotations`.
797
+ * @param ctx the parse tree
798
+ * @return the visitor result
799
+ */
800
+ visitDocAnnotations?: (ctx: DocAnnotationsContext) => Result;
801
+ /**
802
+ * Visit a parse tree produced by `MalloyParser.ignoredObjectAnnotations`.
803
+ * @param ctx the parse tree
804
+ * @return the visitor result
805
+ */
806
+ visitIgnoredObjectAnnotations?: (ctx: IgnoredObjectAnnotationsContext) => Result;
807
+ /**
808
+ * Visit a parse tree produced by `MalloyParser.ignoredModelAnnotations`.
809
+ * @param ctx the parse tree
810
+ * @return the visitor result
811
+ */
812
+ visitIgnoredModelAnnotations?: (ctx: IgnoredModelAnnotationsContext) => Result;
759
813
  /**
760
814
  * Visit a parse tree produced by `MalloyParser.topLevelQueryDefs`.
761
815
  * @param ctx the parse tree
@@ -877,17 +931,17 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
877
931
  */
878
932
  visitExploreStatement?: (ctx: ExploreStatementContext) => Result;
879
933
  /**
880
- * Visit a parse tree produced by `MalloyParser.defDimensions`.
934
+ * Visit a parse tree produced by `MalloyParser.defMeasures`.
881
935
  * @param ctx the parse tree
882
936
  * @return the visitor result
883
937
  */
884
- visitDefDimensions?: (ctx: DefDimensionsContext) => Result;
938
+ visitDefMeasures?: (ctx: DefMeasuresContext) => Result;
885
939
  /**
886
- * Visit a parse tree produced by `MalloyParser.defMeasures`.
940
+ * Visit a parse tree produced by `MalloyParser.defDimensions`.
887
941
  * @param ctx the parse tree
888
942
  * @return the visitor result
889
943
  */
890
- visitDefMeasures?: (ctx: DefMeasuresContext) => Result;
944
+ visitDefDimensions?: (ctx: DefDimensionsContext) => Result;
891
945
  /**
892
946
  * Visit a parse tree produced by `MalloyParser.renameList`.
893
947
  * @param ctx the parse tree
@@ -960,6 +1014,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
960
1014
  * @return the visitor result
961
1015
  */
962
1016
  visitJoinList?: (ctx: JoinListContext) => Result;
1017
+ /**
1018
+ * Visit a parse tree produced by `MalloyParser.isExplore`.
1019
+ * @param ctx the parse tree
1020
+ * @return the visitor result
1021
+ */
1022
+ visitIsExplore?: (ctx: IsExploreContext) => Result;
963
1023
  /**
964
1024
  * Visit a parse tree produced by `MalloyParser.joinDef`.
965
1025
  * @param ctx the parse tree
@@ -1158,6 +1218,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
1158
1218
  * @return the visitor result
1159
1219
  */
1160
1220
  visitTimezoneName?: (ctx: TimezoneNameContext) => Result;
1221
+ /**
1222
+ * Visit a parse tree produced by `MalloyParser.queryAnnotation`.
1223
+ * @param ctx the parse tree
1224
+ * @return the visitor result
1225
+ */
1226
+ visitQueryAnnotation?: (ctx: QueryAnnotationContext) => Result;
1161
1227
  /**
1162
1228
  * Visit a parse tree produced by `MalloyParser.sampleSpec`.
1163
1229
  * @param ctx the parse tree
@@ -1266,6 +1332,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
1266
1332
  * @return the visitor result
1267
1333
  */
1268
1334
  visitCollectionWildCard?: (ctx: CollectionWildCardContext) => Result;
1335
+ /**
1336
+ * Visit a parse tree produced by `MalloyParser.taggedRef`.
1337
+ * @param ctx the parse tree
1338
+ * @return the visitor result
1339
+ */
1340
+ visitTaggedRef?: (ctx: TaggedRefContext) => Result;
1269
1341
  /**
1270
1342
  * Visit a parse tree produced by `MalloyParser.collectionMember`.
1271
1343
  * @param ctx the parse tree
@@ -7,6 +7,11 @@ import * as ast from './ast';
7
7
  import { LogSeverity, MessageLogger } from './parse-log';
8
8
  import { MalloyParseRoot } from './parse-malloy';
9
9
  import { FieldDeclarationConstructor } from './ast';
10
+ declare class IgnoredElement extends ast.MalloyElement {
11
+ elementType: string;
12
+ malloySrc: string;
13
+ constructor(src: string);
14
+ }
10
15
  /**
11
16
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
12
17
  * AST from an ANTLR parse tree.
@@ -32,11 +37,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
32
37
  * Log an error message relative to a parse node
33
38
  */
34
39
  protected contextError(cx: ParserRuleContext, msg: string, sev?: LogSeverity): void;
35
- protected onlyExploreProperties(els: ast.MalloyElement[]): ast.SourceProperty[];
36
- protected onlyJoins(els: ast.MalloyElement[]): ast.Join[];
37
- protected onlyDocStatements(els: ast.MalloyElement[]): ast.DocStatement[];
38
- protected onlyNestedQueries(els: ast.MalloyElement[]): ast.NestedQuery[];
39
- protected onlyQueryRefs(els: ast.MalloyElement[]): ast.QueryItem[];
40
+ protected only<T extends ast.MalloyElement>(els: ast.MalloyElement[], isGood: (el: ast.MalloyElement) => T | false, desc: string): T[];
40
41
  protected getNumber(term: ParseTree): number;
41
42
  protected optionalString(fromTerm: ParseTree | undefined): string | undefined;
42
43
  protected getIdText(fromTerm: ParseTree): string;
@@ -60,10 +61,10 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
60
61
  */
61
62
  protected parseTime(pcx: ParserRuleContext, parse: (s: string) => ast.ExpressionDef | undefined): ast.ExpressionDef;
62
63
  visitMalloyDocument(pcx: parse.MalloyDocumentContext): ast.Document;
63
- visitDefineSourceStatement(pcx: parse.DefineSourceStatementContext): ast.DefineSourceList | ast.DefineSource;
64
- visitsourceDefinition(pcx: parse.SourceDefinitionContext): ast.DefineSource;
64
+ visitDefineSourceStatement(pcx: parse.DefineSourceStatementContext): ast.DefineSourceList;
65
+ visitSourceDefinition(pcx: parse.SourceDefinitionContext): ast.DefineSource;
65
66
  visitExplore(pcx: parse.ExploreContext): ast.Source;
66
- visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.ExploreDesc;
67
+ visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.SourceDesc;
67
68
  visitExploreTable(pcx: parse.ExploreTableContext): ast.TableSource;
68
69
  visitTableSource(pcx: parse.TableSourceContext): ast.TableSource;
69
70
  visitSQLSourceName(pcx: parse.SQLSourceNameContext): ast.SQLSource;
@@ -72,7 +73,10 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
72
73
  visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.Joins;
73
74
  visitDefJoinCross(pcx: parse.DefJoinCrossContext): ast.Joins;
74
75
  protected getJoinList(pcx: parse.JoinListContext): ast.MalloyElement[];
75
- protected getJoinSource(name: ast.ModelEntryReference, ecx: parse.ExploreContext | undefined): ast.Source;
76
+ protected getJoinSource(name: ast.ModelEntryReference, ecx: parse.IsExploreContext | undefined): {
77
+ joinFrom: ast.Source;
78
+ notes: string[];
79
+ };
76
80
  visitQueryJoinStatement(pcx: parse.QueryJoinStatementContext): ast.MalloyElement;
77
81
  visitJoinOn(pcx: parse.JoinOnContext): ast.Join;
78
82
  visitJoinWith(pcx: parse.JoinWithContext): ast.Join;
@@ -88,6 +92,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
88
92
  visitWhereStatement(pcx: parse.WhereStatementContext): ast.Filter;
89
93
  visitHavingStatement(pcx: parse.HavingStatementContext): ast.Filter;
90
94
  visitSubQueryDefList(pcx: parse.SubQueryDefListContext): ast.Turtles;
95
+ visitDefExploreQuery(pcx: parse.DefExploreQueryContext): ast.MalloyElement;
91
96
  visitDefExplorePrimaryKey(pcx: parse.DefExplorePrimaryKeyContext): ast.PrimaryKey;
92
97
  visitFieldNameList(pcx: parse.FieldNameListContext): ast.FieldReferences;
93
98
  visitDefExploreEditField(pcx: parse.DefExploreEditFieldContext): ast.FieldListEdit;
@@ -101,8 +106,10 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
101
106
  visitAggregateStatement(pcx: parse.AggregateStatementContext): ast.Aggregate;
102
107
  visitGroupByStatement(pcx: parse.GroupByStatementContext): ast.GroupBy;
103
108
  visitCalculateStatement(pcx: parse.CalculateStatementContext): ast.Calculate;
109
+ getTaggedRef(pcx: parse.TaggedRefContext, makeFieldRef: ast.FieldReferenceConstructor): ast.FieldReference;
104
110
  getFieldCollectionMember(pcx: parse.CollectionMemberContext, makeFieldDef: FieldDeclarationConstructor, makeFieldRef: ast.FieldReferenceConstructor): ast.FieldCollectionMember;
105
111
  visitFieldCollection(pcx: parse.FieldCollectionContext): ast.ProjectStatement;
112
+ visitProjectStatement(pcx: parse.ProjectStatementContext): ast.ProjectStatement;
106
113
  visitCollectionWildCard(pcx: parse.CollectionWildCardContext): ast.FieldReferenceElement;
107
114
  visitIndexFields(pcx: parse.IndexFieldsContext): ast.FieldReferences;
108
115
  visitIndexStatement(pcx: parse.IndexStatementContext): ast.Index;
@@ -119,7 +126,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
119
126
  visitAnonymousQuery(pcx: parse.AnonymousQueryContext): ast.AnonymousQuery;
120
127
  visitRunStatementDef(pcx: parse.RunStatementDefContext): ast.RunQueryDef;
121
128
  visitRunStatementRef(pcx: parse.RunStatementRefContext): ast.RunQueryRef;
122
- visitNestedQueryList(pcx: parse.NestedQueryListContext): ast.MalloyElement;
129
+ visitNestStatement(pcx: parse.NestStatementContext): ast.Nests;
130
+ visitNestedQueryList(pcx: parse.NestedQueryListContext): ast.Nests;
123
131
  visitNestExisting(pcx: parse.NestExistingContext): ast.NestedQuery;
124
132
  visitNestDef(pcx: parse.NestDefContext): ast.NestDefinition;
125
133
  visitExploreQueryDef(pcx: parse.ExploreQueryDefContext): ast.TurtleDecl;
@@ -170,4 +178,9 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
170
178
  visitJustExpr(pcx: parse.JustExprContext): ast.ExpressionDef;
171
179
  visitDefineSQLStatement(pcx: parse.DefineSQLStatementContext): ast.SQLStatement;
172
180
  visitSampleStatement(pcx: parse.SampleStatementContext): ast.SampleProperty;
181
+ visitDocAnnotations(pcx: parse.DocAnnotationsContext): ast.ModelAnnotation;
182
+ visitIgnoredObjectAnnotations(pcx: parse.IgnoredObjectAnnotationsContext): IgnoredElement;
183
+ visitIgnoredModelAnnotations(pcx: parse.IgnoredModelAnnotationsContext): IgnoredElement;
184
+ visitDefExploreAnnotation(pcx: parse.DefExploreAnnotationContext): ast.ObjectAnnotation;
173
185
  }
186
+ export {};