@malloydata/malloy 0.0.43-dev230622180905 → 0.0.43-dev230622192152

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

@@ -48,20 +48,22 @@ import { ExprAggFuncContext } from "./MalloyParser";
 import { ExprFuncContext } from "./MalloyParser";
 import { ExprPickContext } from "./MalloyParser";
 import { ExprUngroupContext } from "./MalloyParser";
+import { RunStatementDefContext } from "./MalloyParser";
+import { RunStatementRefContext } from "./MalloyParser";
 import { ExploreArrowQueryContext } from "./MalloyParser";
 import { ArrowQueryContext } from "./MalloyParser";
 import { DefJoinOneContext } from "./MalloyParser";
 import { DefJoinManyContext } from "./MalloyParser";
 import { DefJoinCrossContext } from "./MalloyParser";
-import { DefExploreDimensionContext } from "./MalloyParser";
-import { DefExploreMeasureContext } from "./MalloyParser";
+import { DefExploreDimension_stubContext } from "./MalloyParser";
+import { DefExploreMeasure_stubContext } from "./MalloyParser";
 import { DefDeclare_stubContext } from "./MalloyParser";
 import { DefJoin_stubContext } from "./MalloyParser";
-import { DefExploreWhereContext } from "./MalloyParser";
+import { DefExploreWhere_stubContext } from "./MalloyParser";
 import { DefExplorePrimaryKeyContext } from "./MalloyParser";
 import { DefExploreRenameContext } from "./MalloyParser";
 import { DefExploreEditFieldContext } from "./MalloyParser";
-import { DefExploreQueryContext } from "./MalloyParser";
+import { DefExploreQuery_stubContext } from "./MalloyParser";
 import { DefExploreTimezoneContext } from "./MalloyParser";
 import { FilterByShortcutContext } from "./MalloyParser";
 import { FilterByWhereContext } from "./MalloyParser";
@@ -72,6 +74,7 @@ import { MalloyStatementContext } from "./MalloyParser";
 import { DefineSourceStatementContext } from "./MalloyParser";
 import { DefineQueryContext } from "./MalloyParser";
 import { TopLevelAnonQueryDefContext } from "./MalloyParser";
+import { RunStatementContext } from "./MalloyParser";
 import { DefineSQLStatementContext } from "./MalloyParser";
 import { SqlBlockContext } from "./MalloyParser";
 import { BlockSQLDefContext } from "./MalloyParser";
@@ -99,6 +102,8 @@ import { SourceNameDefContext } from "./MalloyParser";
 import { SourceIDContext } from "./MalloyParser";
 import { ExplorePropertiesContext } from "./MalloyParser";
 import { ExploreStatementContext } from "./MalloyParser";
+import { DefDimensionsContext } from "./MalloyParser";
+import { DefMeasuresContext } from "./MalloyParser";
 import { RenameListContext } from "./MalloyParser";
 import { ExploreRenameDefContext } from "./MalloyParser";
 import { DefListContext } from "./MalloyParser";
@@ -107,6 +112,9 @@ import { FieldNameDefContext } from "./MalloyParser";
 import { JoinNameDefContext } from "./MalloyParser";
 import { DeclareStatementContext } from "./MalloyParser";
 import { JoinStatementContext } from "./MalloyParser";
+import { QueryExtendContext } from "./MalloyParser";
+import { QueryExtendStatementContext } from "./MalloyParser";
+import { QueryExtendStatementListContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
 import { JoinDefContext } from "./MalloyParser";
 import { JoinExpressionContext } from "./MalloyParser";
@@ -119,6 +127,7 @@ import { SubQueryDefListContext } from "./MalloyParser";
 import { ExploreQueryNameDefContext } from "./MalloyParser";
 import { ExploreQueryDefContext } from "./MalloyParser";
 import { QueryStatementContext } from "./MalloyParser";
+import { QueryJoinStatementContext } from "./MalloyParser";
 import { GroupByStatementContext } from "./MalloyParser";
 import { QueryFieldListContext } from "./MalloyParser";
 import { QueryFieldEntryContext } from "./MalloyParser";
@@ -139,6 +148,7 @@ import { IndexFieldsContext } from "./MalloyParser";
 import { IndexStatementContext } from "./MalloyParser";
 import { SampleStatementContext } from "./MalloyParser";
 import { TimezoneStatementContext } from "./MalloyParser";
+import { TimezoneNameContext } from "./MalloyParser";
 import { SampleSpecContext } from "./MalloyParser";
 import { AggregateContext } from "./MalloyParser";
 import { MalloyTypeContext } from "./MalloyParser";
@@ -763,6 +773,30 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExprUngroup?: (ctx: ExprUngroupContext) => void;
+    /**
+     * Enter a parse tree produced by the `runStatementDef`
+     * labeled alternative in `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     */
+    enterRunStatementDef?: (ctx: RunStatementDefContext) => void;
+    /**
+     * Exit a parse tree produced by the `runStatementDef`
+     * labeled alternative in `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     */
+    exitRunStatementDef?: (ctx: RunStatementDefContext) => void;
+    /**
+     * Enter a parse tree produced by the `runStatementRef`
+     * labeled alternative in `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     */
+    enterRunStatementRef?: (ctx: RunStatementRefContext) => void;
+    /**
+     * Exit a parse tree produced by the `runStatementRef`
+     * labeled alternative in `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     */
+    exitRunStatementRef?: (ctx: RunStatementRefContext) => void;
     /**
      * Enter a parse tree produced by the `exploreArrowQuery`
      * labeled alternative in `MalloyParser.query`.
@@ -824,29 +858,29 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitDefJoinCross?: (ctx: DefJoinCrossContext) => void;
     /**
-     * Enter a parse tree produced by the `defExploreDimension`
+     * Enter a parse tree produced by the `defExploreDimension_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      */
-    enterDefExploreDimension?: (ctx: DefExploreDimensionContext) => void;
+    enterDefExploreDimension_stub?: (ctx: DefExploreDimension_stubContext) => void;
     /**
-     * Exit a parse tree produced by the `defExploreDimension`
+     * Exit a parse tree produced by the `defExploreDimension_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      */
-    exitDefExploreDimension?: (ctx: DefExploreDimensionContext) => void;
+    exitDefExploreDimension_stub?: (ctx: DefExploreDimension_stubContext) => void;
     /**
-     * Enter a parse tree produced by the `defExploreMeasure`
+     * Enter a parse tree produced by the `defExploreMeasure_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      */
-    enterDefExploreMeasure?: (ctx: DefExploreMeasureContext) => void;
+    enterDefExploreMeasure_stub?: (ctx: DefExploreMeasure_stubContext) => void;
     /**
-     * Exit a parse tree produced by the `defExploreMeasure`
+     * Exit a parse tree produced by the `defExploreMeasure_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      */
-    exitDefExploreMeasure?: (ctx: DefExploreMeasureContext) => void;
+    exitDefExploreMeasure_stub?: (ctx: DefExploreMeasure_stubContext) => void;
     /**
      * Enter a parse tree produced by the `defDeclare_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
@@ -872,17 +906,17 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitDefJoin_stub?: (ctx: DefJoin_stubContext) => void;
     /**
-     * Enter a parse tree produced by the `defExploreWhere`
+     * Enter a parse tree produced by the `defExploreWhere_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      */
-    enterDefExploreWhere?: (ctx: DefExploreWhereContext) => void;
+    enterDefExploreWhere_stub?: (ctx: DefExploreWhere_stubContext) => void;
     /**
-     * Exit a parse tree produced by the `defExploreWhere`
+     * Exit a parse tree produced by the `defExploreWhere_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      */
-    exitDefExploreWhere?: (ctx: DefExploreWhereContext) => void;
+    exitDefExploreWhere_stub?: (ctx: DefExploreWhere_stubContext) => void;
     /**
      * Enter a parse tree produced by the `defExplorePrimaryKey`
      * labeled alternative in `MalloyParser.exploreStatement`.
@@ -920,17 +954,17 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitDefExploreEditField?: (ctx: DefExploreEditFieldContext) => void;
     /**
-     * Enter a parse tree produced by the `defExploreQuery`
+     * Enter a parse tree produced by the `defExploreQuery_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      */
-    enterDefExploreQuery?: (ctx: DefExploreQueryContext) => void;
+    enterDefExploreQuery_stub?: (ctx: DefExploreQuery_stubContext) => void;
     /**
-     * Exit a parse tree produced by the `defExploreQuery`
+     * Exit a parse tree produced by the `defExploreQuery_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      */
-    exitDefExploreQuery?: (ctx: DefExploreQueryContext) => void;
+    exitDefExploreQuery_stub?: (ctx: DefExploreQuery_stubContext) => void;
     /**
      * Enter a parse tree produced by the `defExploreTimezone`
      * labeled alternative in `MalloyParser.exploreStatement`.
@@ -1041,6 +1075,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitTopLevelAnonQueryDef?: (ctx: TopLevelAnonQueryDefContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     */
+    enterRunStatement?: (ctx: RunStatementContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     */
+    exitRunStatement?: (ctx: RunStatementContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.defineSQLStatement`.
      * @param ctx the parse tree
@@ -1311,6 +1355,26 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExploreStatement?: (ctx: ExploreStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.defDimensions`.
+     * @param ctx the parse tree
+     */
+    enterDefDimensions?: (ctx: DefDimensionsContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.defDimensions`.
+     * @param ctx the parse tree
+     */
+    exitDefDimensions?: (ctx: DefDimensionsContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.defMeasures`.
+     * @param ctx the parse tree
+     */
+    enterDefMeasures?: (ctx: DefMeasuresContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.defMeasures`.
+     * @param ctx the parse tree
+     */
+    exitDefMeasures?: (ctx: DefMeasuresContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.renameList`.
      * @param ctx the parse tree
@@ -1391,6 +1455,36 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitJoinStatement?: (ctx: JoinStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.queryExtend`.
+     * @param ctx the parse tree
+     */
+    enterQueryExtend?: (ctx: QueryExtendContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.queryExtend`.
+     * @param ctx the parse tree
+     */
+    exitQueryExtend?: (ctx: QueryExtendContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.queryExtendStatement`.
+     * @param ctx the parse tree
+     */
+    enterQueryExtendStatement?: (ctx: QueryExtendStatementContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.queryExtendStatement`.
+     * @param ctx the parse tree
+     */
+    exitQueryExtendStatement?: (ctx: QueryExtendStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.queryExtendStatementList`.
+     * @param ctx the parse tree
+     */
+    enterQueryExtendStatementList?: (ctx: QueryExtendStatementListContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.queryExtendStatementList`.
+     * @param ctx the parse tree
+     */
+    exitQueryExtendStatementList?: (ctx: QueryExtendStatementListContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.joinList`.
      * @param ctx the parse tree
@@ -1511,6 +1605,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitQueryStatement?: (ctx: QueryStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.queryJoinStatement`.
+     * @param ctx the parse tree
+     */
+    enterQueryJoinStatement?: (ctx: QueryJoinStatementContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.queryJoinStatement`.
+     * @param ctx the parse tree
+     */
+    exitQueryJoinStatement?: (ctx: QueryJoinStatementContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.groupByStatement`.
      * @param ctx the parse tree
@@ -1711,6 +1815,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitTimezoneStatement?: (ctx: TimezoneStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.timezoneName`.
+     * @param ctx the parse tree
+     */
+    enterTimezoneName?: (ctx: TimezoneNameContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.timezoneName`.
+     * @param ctx the parse tree
+     */
+    exitTimezoneName?: (ctx: TimezoneNameContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.sampleSpec`.
      * @param ctx the parse tree

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

@@ -48,20 +48,22 @@ import { ExprAggFuncContext } from "./MalloyParser";
 import { ExprFuncContext } from "./MalloyParser";
 import { ExprPickContext } from "./MalloyParser";
 import { ExprUngroupContext } from "./MalloyParser";
+import { RunStatementDefContext } from "./MalloyParser";
+import { RunStatementRefContext } from "./MalloyParser";
 import { ExploreArrowQueryContext } from "./MalloyParser";
 import { ArrowQueryContext } from "./MalloyParser";
 import { DefJoinOneContext } from "./MalloyParser";
 import { DefJoinManyContext } from "./MalloyParser";
 import { DefJoinCrossContext } from "./MalloyParser";
-import { DefExploreDimensionContext } from "./MalloyParser";
-import { DefExploreMeasureContext } from "./MalloyParser";
+import { DefExploreDimension_stubContext } from "./MalloyParser";
+import { DefExploreMeasure_stubContext } from "./MalloyParser";
 import { DefDeclare_stubContext } from "./MalloyParser";
 import { DefJoin_stubContext } from "./MalloyParser";
-import { DefExploreWhereContext } from "./MalloyParser";
+import { DefExploreWhere_stubContext } from "./MalloyParser";
 import { DefExplorePrimaryKeyContext } from "./MalloyParser";
 import { DefExploreRenameContext } from "./MalloyParser";
 import { DefExploreEditFieldContext } from "./MalloyParser";
-import { DefExploreQueryContext } from "./MalloyParser";
+import { DefExploreQuery_stubContext } from "./MalloyParser";
 import { DefExploreTimezoneContext } from "./MalloyParser";
 import { FilterByShortcutContext } from "./MalloyParser";
 import { FilterByWhereContext } from "./MalloyParser";
@@ -72,6 +74,7 @@ import { MalloyStatementContext } from "./MalloyParser";
 import { DefineSourceStatementContext } from "./MalloyParser";
 import { DefineQueryContext } from "./MalloyParser";
 import { TopLevelAnonQueryDefContext } from "./MalloyParser";
+import { RunStatementContext } from "./MalloyParser";
 import { DefineSQLStatementContext } from "./MalloyParser";
 import { SqlBlockContext } from "./MalloyParser";
 import { BlockSQLDefContext } from "./MalloyParser";
@@ -99,6 +102,8 @@ import { SourceNameDefContext } from "./MalloyParser";
 import { SourceIDContext } from "./MalloyParser";
 import { ExplorePropertiesContext } from "./MalloyParser";
 import { ExploreStatementContext } from "./MalloyParser";
+import { DefDimensionsContext } from "./MalloyParser";
+import { DefMeasuresContext } from "./MalloyParser";
 import { RenameListContext } from "./MalloyParser";
 import { ExploreRenameDefContext } from "./MalloyParser";
 import { DefListContext } from "./MalloyParser";
@@ -107,6 +112,9 @@ import { FieldNameDefContext } from "./MalloyParser";
 import { JoinNameDefContext } from "./MalloyParser";
 import { DeclareStatementContext } from "./MalloyParser";
 import { JoinStatementContext } from "./MalloyParser";
+import { QueryExtendContext } from "./MalloyParser";
+import { QueryExtendStatementContext } from "./MalloyParser";
+import { QueryExtendStatementListContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
 import { JoinDefContext } from "./MalloyParser";
 import { JoinExpressionContext } from "./MalloyParser";
@@ -119,6 +127,7 @@ import { SubQueryDefListContext } from "./MalloyParser";
 import { ExploreQueryNameDefContext } from "./MalloyParser";
 import { ExploreQueryDefContext } from "./MalloyParser";
 import { QueryStatementContext } from "./MalloyParser";
+import { QueryJoinStatementContext } from "./MalloyParser";
 import { GroupByStatementContext } from "./MalloyParser";
 import { QueryFieldListContext } from "./MalloyParser";
 import { QueryFieldEntryContext } from "./MalloyParser";
@@ -139,6 +148,7 @@ import { IndexFieldsContext } from "./MalloyParser";
 import { IndexStatementContext } from "./MalloyParser";
 import { SampleStatementContext } from "./MalloyParser";
 import { TimezoneStatementContext } from "./MalloyParser";
+import { TimezoneNameContext } from "./MalloyParser";
 import { SampleSpecContext } from "./MalloyParser";
 import { AggregateContext } from "./MalloyParser";
 import { MalloyTypeContext } from "./MalloyParser";
@@ -521,6 +531,20 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExprUngroup?: (ctx: ExprUngroupContext) => Result;
+    /**
+     * Visit a parse tree produced by the `runStatementDef`
+     * labeled alternative in `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRunStatementDef?: (ctx: RunStatementDefContext) => Result;
+    /**
+     * Visit a parse tree produced by the `runStatementRef`
+     * labeled alternative in `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRunStatementRef?: (ctx: RunStatementRefContext) => Result;
     /**
      * Visit a parse tree produced by the `exploreArrowQuery`
      * labeled alternative in `MalloyParser.query`.
@@ -557,19 +581,19 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitDefJoinCross?: (ctx: DefJoinCrossContext) => Result;
     /**
-     * Visit a parse tree produced by the `defExploreDimension`
+     * Visit a parse tree produced by the `defExploreDimension_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitDefExploreDimension?: (ctx: DefExploreDimensionContext) => Result;
+    visitDefExploreDimension_stub?: (ctx: DefExploreDimension_stubContext) => Result;
     /**
-     * Visit a parse tree produced by the `defExploreMeasure`
+     * Visit a parse tree produced by the `defExploreMeasure_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitDefExploreMeasure?: (ctx: DefExploreMeasureContext) => Result;
+    visitDefExploreMeasure_stub?: (ctx: DefExploreMeasure_stubContext) => Result;
     /**
      * Visit a parse tree produced by the `defDeclare_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
@@ -585,12 +609,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitDefJoin_stub?: (ctx: DefJoin_stubContext) => Result;
     /**
-     * Visit a parse tree produced by the `defExploreWhere`
+     * Visit a parse tree produced by the `defExploreWhere_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitDefExploreWhere?: (ctx: DefExploreWhereContext) => Result;
+    visitDefExploreWhere_stub?: (ctx: DefExploreWhere_stubContext) => Result;
     /**
      * Visit a parse tree produced by the `defExplorePrimaryKey`
      * labeled alternative in `MalloyParser.exploreStatement`.
@@ -613,12 +637,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitDefExploreEditField?: (ctx: DefExploreEditFieldContext) => Result;
     /**
-     * Visit a parse tree produced by the `defExploreQuery`
+     * Visit a parse tree produced by the `defExploreQuery_stub`
      * labeled alternative in `MalloyParser.exploreStatement`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitDefExploreQuery?: (ctx: DefExploreQueryContext) => Result;
+    visitDefExploreQuery_stub?: (ctx: DefExploreQuery_stubContext) => Result;
     /**
      * Visit a parse tree produced by the `defExploreTimezone`
      * labeled alternative in `MalloyParser.exploreStatement`.
@@ -684,6 +708,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitTopLevelAnonQueryDef?: (ctx: TopLevelAnonQueryDefContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.runStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRunStatement?: (ctx: RunStatementContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.defineSQLStatement`.
      * @param ctx the parse tree
@@ -846,6 +876,18 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExploreStatement?: (ctx: ExploreStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.defDimensions`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitDefDimensions?: (ctx: DefDimensionsContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.defMeasures`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitDefMeasures?: (ctx: DefMeasuresContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.renameList`.
      * @param ctx the parse tree
@@ -894,6 +936,24 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitJoinStatement?: (ctx: JoinStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.queryExtend`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitQueryExtend?: (ctx: QueryExtendContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.queryExtendStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitQueryExtendStatement?: (ctx: QueryExtendStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.queryExtendStatementList`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitQueryExtendStatementList?: (ctx: QueryExtendStatementListContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.joinList`.
      * @param ctx the parse tree
@@ -966,6 +1026,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitQueryStatement?: (ctx: QueryStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.queryJoinStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitQueryJoinStatement?: (ctx: QueryJoinStatementContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.groupByStatement`.
      * @param ctx the parse tree
@@ -1086,6 +1152,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitTimezoneStatement?: (ctx: TimezoneStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.timezoneName`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTimezoneName?: (ctx: TimezoneNameContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.sampleSpec`.
      * @param ctx the parse tree

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

@@ -73,11 +73,13 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitDefJoinCross(pcx: parse.DefJoinCrossContext): ast.Joins;
     protected getJoinList(pcx: parse.JoinListContext): ast.MalloyElement[];
     protected getJoinSource(name: ast.ModelEntryReference, ecx: parse.ExploreContext | undefined): ast.Source;
+    visitQueryJoinStatement(pcx: parse.QueryJoinStatementContext): ast.MalloyElement;
     visitJoinOn(pcx: parse.JoinOnContext): ast.Join;
     visitJoinWith(pcx: parse.JoinWithContext): ast.Join;
     getFieldDef(pcx: parse.FieldDefContext, makeFieldDef: ast.FieldDeclarationConstructor): ast.FieldDeclaration;
-    visitDefExploreDimension(pcx: parse.DefExploreDimensionContext): ast.Dimensions;
-    visitDefExploreMeasure(pcx: parse.DefExploreMeasureContext): ast.Measures;
+    visitDefDimensions(pcx: parse.DefDimensionsContext): ast.Dimensions;
+    visitDefMeasures(pcx: parse.DefMeasuresContext): ast.Measures;
+    visitQueryExtend(pcx: parse.QueryExtendContext): ast.ExtendBlock;
     visitDeclareStatement(pcx: parse.DeclareStatementContext): ast.DeclareFields;
     visitExploreRenameDef(pcx: parse.ExploreRenameDefContext): ast.RenameField;
     visitDefExploreRename(pcx: parse.DefExploreRenameContext): ast.Renames;
@@ -115,6 +117,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitTopLevelQueryDefs(pcx: parse.TopLevelQueryDefsContext): ast.DocStatement;
     visitTopLevelQueryDef(pcx: parse.TopLevelQueryDefContext): ast.DefineQuery;
     visitAnonymousQuery(pcx: parse.AnonymousQueryContext): ast.AnonymousQuery;
+    visitRunStatementDef(pcx: parse.RunStatementDefContext): ast.RunQueryDef;
+    visitRunStatementRef(pcx: parse.RunStatementRefContext): ast.RunQueryRef;
     visitNestedQueryList(pcx: parse.NestedQueryListContext): ast.MalloyElement;
     visitNestExisting(pcx: parse.NestExistingContext): ast.NestedQuery;
     visitNestDef(pcx: parse.NestDefContext): ast.NestDefinition;

package/dist/lang/malloy-to-ast.js

@@ -49,6 +49,7 @@ exports.MalloyToAST = void 0;
 const AbstractParseTreeVisitor_1 = require("antlr4ts/tree/AbstractParseTreeVisitor");
 const ast = __importStar(require("./ast"));
 const Interval_1 = require("antlr4ts/misc/Interval");
+const ENABLE_M4_WARNINGS = false;
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
  * AST from an ANTLR parse tree.
@@ -366,6 +367,13 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return new ast.NamedSource(name);
     }
+    visitQueryJoinStatement(pcx) {
+        const result = this.astAt(this.visit(pcx.joinStatement()), pcx);
+        if (ENABLE_M4_WARNINGS) {
+            this.astError(result, 'Joins in queries are deprecated, move into an `extend:` block.', 'warn');
+        }
+        return result;
+    }
     visitJoinOn(pcx) {
         const joinAs = this.getModelEntryName(pcx.joinNameDef());
         const joinFrom = this.getJoinSource(joinAs, pcx.explore());
@@ -390,20 +398,41 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const def = new makeFieldDef(valExpr, fieldName, this.getSourceCode(defCx));
         return this.astAt(def, pcx);
     }
-    visitDefExploreDimension(pcx) {
+    visitDefDimensions(pcx) {
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DimensionFieldDeclaration);
         const stmt = new ast.Dimensions(defs);
         return this.astAt(stmt, pcx);
     }
-    visitDefExploreMeasure(pcx) {
+    visitDefMeasures(pcx) {
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.MeasureFieldDeclaration);
         const stmt = new ast.Measures(defs);
         return this.astAt(stmt, pcx);
     }
+    visitQueryExtend(pcx) {
+        const extensions = [];
+        const items = pcx
+            .queryExtendStatementList()
+            .queryExtendStatement()
+            .map(ctx => this.visit(ctx));
+        for (const item of items) {
+            if (ast.isQueryExtendProperty(item)) {
+                extensions.push(item);
+            }
+            else {
+                throw this.internalError(pcx, `Query extend matched, but ${item.elementType} found`);
+            }
+        }
+        const el = new ast.ExtendBlock(extensions);
+        return this.astAt(el, pcx);
+    }
     visitDeclareStatement(pcx) {
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DeclareFieldDeclaration);
         const stmt = new ast.DeclareFields(defs);
-        return this.astAt(stmt, pcx);
+        const result = this.astAt(stmt, pcx);
+        if (ENABLE_M4_WARNINGS) {
+            this.astError(result, '`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block', 'warn');
+        }
+        return result;
     }
     visitExploreRenameDef(pcx) {
         const newName = pcx.fieldName(0).id();
@@ -458,7 +487,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.visitTimezoneStatement(cx.timezoneStatement());
     }
     visitTimezoneStatement(cx) {
-        const timezoneStatement = new ast.TimezoneStatement(this.stripQuotes(cx.STRING_LITERAL().text));
+        const tz = cx.timezoneName();
+        const timezoneStatement = this.astAt(new ast.TimezoneStatement(this.stripQuotes(tz.STRING_LITERAL().text)), tz);
         if (!timezoneStatement.isValid) {
             this.astError(timezoneStatement, `Invalid timezone: ${timezoneStatement.tz}`);
         }
@@ -673,12 +703,30 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         throw this.internalError(pcx, `Expect query definition, got a '${queryDef.elementType}'`);
     }
     visitAnonymousQuery(pcx) {
-        const query = this.visit(pcx.topLevelAnonQueryDef().query());
+        const defCx = pcx.topLevelAnonQueryDef();
+        const query = this.visit(defCx.query());
         if (ast.isQueryElement(query)) {
-            return new ast.AnonymousQuery(query);
+            const el = this.astAt(new ast.AnonymousQuery(query), defCx);
+            if (ENABLE_M4_WARNINGS) {
+                this.astError(el, 'Anonymous `query:` statements are deprecated, use `run:` instead', 'warn');
+            }
+            return el;
         }
         throw this.internalError(pcx, `Anonymous query matched, but ${query.elementType} found`);
     }
+    visitRunStatementDef(pcx) {
+        const query = this.visit(pcx.topLevelAnonQueryDef().query());
+        if (ast.isQueryElement(query)) {
+            const el = new ast.RunQueryDef(query);
+            return this.astAt(el, pcx);
+        }
+        throw this.internalError(pcx, `Run query matched, but ${query.elementType} found`);
+    }
+    visitRunStatementRef(pcx) {
+        const name = this.getModelEntryName(pcx.queryName());
+        const el = this.astAt(new ast.RunQueryRef(name), pcx.queryName());
+        return this.astAt(el, pcx);
+    }
     visitNestedQueryList(pcx) {
         const nestedList = pcx.nestEntry().map(cx => this.visit(cx));
         if (nestedList.length === 1) {