@malloydata/malloy 0.0.56-dev230710162623 → 0.0.56-dev230710183220

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

@@ -1,11 +1,6 @@
 import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
 import { Use_top_level_query_defsContext } from "./MalloyParser";
 import { AnonymousQueryContext } from "./MalloyParser";
-import { NamedSourceContext } from "./MalloyParser";
-import { TableSourceContext } from "./MalloyParser";
-import { QuerySourceContext } from "./MalloyParser";
-import { SQLSourceNameContext } from "./MalloyParser";
-import { SQLSourceContext } from "./MalloyParser";
 import { LiteralTimestampContext } from "./MalloyParser";
 import { LiteralHourContext } from "./MalloyParser";
 import { LiteralDayContext } from "./MalloyParser";
@@ -22,6 +17,8 @@ import { ExprRegexContext } from "./MalloyParser";
 import { ExprNowContext } from "./MalloyParser";
 import { TableFunctionContext } from "./MalloyParser";
 import { TableMethodContext } from "./MalloyParser";
+import { BareExtendedSource_stubContext } from "./MalloyParser";
+import { ExtendedQueryContext } from "./MalloyParser";
 import { NestExistingContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
@@ -51,10 +48,10 @@ 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 { QueryByNameContext } from "./MalloyParser";
+import { QueryByTurtleNameContext } from "./MalloyParser";
+import { NormalQueryContext } from "./MalloyParser";
+import { QueryFromSQLSourceContext } from "./MalloyParser";
 import { DefJoinOneContext } from "./MalloyParser";
 import { DefJoinManyContext } from "./MalloyParser";
 import { DefJoinCrossContext } from "./MalloyParser";
@@ -72,6 +69,13 @@ import { DefExploreAnnotationContext } from "./MalloyParser";
 import { DefIgnoreModel_stubContext } from "./MalloyParser";
 import { FilterByShortcutContext } from "./MalloyParser";
 import { FilterByWhereContext } from "./MalloyParser";
+import { QueryFromSourceContext } from "./MalloyParser";
+import { RefinedQueryContext } from "./MalloyParser";
+import { SourceFromNamedModelEntryContext } from "./MalloyParser";
+import { TableSourceContext } from "./MalloyParser";
+import { QuerySourceContext } from "./MalloyParser";
+import { SQLSourceNameContext } from "./MalloyParser";
+import { SQLSource_stubContext } from "./MalloyParser";
 import { JoinWithContext } from "./MalloyParser";
 import { JoinOnContext } from "./MalloyParser";
 import { MalloyDocumentContext } from "./MalloyParser";
@@ -95,7 +99,14 @@ import { IgnoredModelAnnotationsContext } from "./MalloyParser";
 import { TopLevelQueryDefsContext } from "./MalloyParser";
 import { TopLevelQueryDefContext } from "./MalloyParser";
 import { RefineOperatorContext } from "./MalloyParser";
+import { QueryRefinementContext } from "./MalloyParser";
+import { SourceExtensionContext } from "./MalloyParser";
 import { QueryContext } from "./MalloyParser";
+import { UnrefinableQueryContext } from "./MalloyParser";
+import { RefinableQueryContext } from "./MalloyParser";
+import { UnextendableSourceContext } from "./MalloyParser";
+import { ExtendableSourceContext } from "./MalloyParser";
+import { SqlSourceContext } from "./MalloyParser";
 import { PipelineFromNameContext } from "./MalloyParser";
 import { FirstSegmentContext } from "./MalloyParser";
 import { PipeElementContext } from "./MalloyParser";
@@ -108,7 +119,6 @@ import { QueryNameContext } from "./MalloyParser";
 import { SourcePropertyListContext } from "./MalloyParser";
 import { SourceDefinitionContext } from "./MalloyParser";
 import { ExploreContext } from "./MalloyParser";
-import { ExploreSourceContext } from "./MalloyParser";
 import { SourceNameDefContext } from "./MalloyParser";
 import { SourceIDContext } from "./MalloyParser";
 import { ExplorePropertiesContext } from "./MalloyParser";
@@ -214,41 +224,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitAnonymousQuery?: (ctx: AnonymousQueryContext) => Result;
-    /**
-     * Visit a parse tree produced by the `NamedSource`
-     * labeled alternative in `MalloyParser.exploreSource`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitNamedSource?: (ctx: NamedSourceContext) => Result;
-    /**
-     * Visit a parse tree produced by the `TableSource`
-     * labeled alternative in `MalloyParser.exploreSource`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitTableSource?: (ctx: TableSourceContext) => Result;
-    /**
-     * Visit a parse tree produced by the `QuerySource`
-     * labeled alternative in `MalloyParser.exploreSource`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitQuerySource?: (ctx: QuerySourceContext) => Result;
-    /**
-     * Visit a parse tree produced by the `SQLSourceName`
-     * labeled alternative in `MalloyParser.exploreSource`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitSQLSourceName?: (ctx: SQLSourceNameContext) => Result;
-    /**
-     * Visit a parse tree produced by the `SQLSource`
-     * labeled alternative in `MalloyParser.exploreSource`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitSQLSource?: (ctx: SQLSourceContext) => Result;
     /**
      * Visit a parse tree produced by the `literalTimestamp`
      * labeled alternative in `MalloyParser.dateLiteral`.
@@ -361,6 +336,20 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitTableMethod?: (ctx: TableMethodContext) => Result;
+    /**
+     * Visit a parse tree produced by the `BareExtendedSource_stub`
+     * labeled alternative in `MalloyParser.explore`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitBareExtendedSource_stub?: (ctx: BareExtendedSource_stubContext) => Result;
+    /**
+     * Visit a parse tree produced by the `ExtendedQuery`
+     * labeled alternative in `MalloyParser.explore`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitExtendedQuery?: (ctx: ExtendedQueryContext) => Result;
     /**
      * Visit a parse tree produced by the `nestExisting`
      * labeled alternative in `MalloyParser.nestEntry`.
@@ -565,33 +554,33 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitExprUngroup?: (ctx: ExprUngroupContext) => Result;
     /**
-     * Visit a parse tree produced by the `runStatementDef`
-     * labeled alternative in `MalloyParser.runStatement`.
+     * Visit a parse tree produced by the `QueryByName`
+     * labeled alternative in `MalloyParser.refinableQuery`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitRunStatementDef?: (ctx: RunStatementDefContext) => Result;
+    visitQueryByName?: (ctx: QueryByNameContext) => Result;
     /**
-     * Visit a parse tree produced by the `runStatementRef`
-     * labeled alternative in `MalloyParser.runStatement`.
+     * Visit a parse tree produced by the `QueryByTurtleName`
+     * labeled alternative in `MalloyParser.refinableQuery`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitRunStatementRef?: (ctx: RunStatementRefContext) => Result;
+    visitQueryByTurtleName?: (ctx: QueryByTurtleNameContext) => Result;
     /**
-     * Visit a parse tree produced by the `exploreArrowQuery`
+     * Visit a parse tree produced by the `NormalQuery`
      * labeled alternative in `MalloyParser.query`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExploreArrowQuery?: (ctx: ExploreArrowQueryContext) => Result;
+    visitNormalQuery?: (ctx: NormalQueryContext) => Result;
     /**
-     * Visit a parse tree produced by the `arrowQuery`
+     * Visit a parse tree produced by the `QueryFromSQLSource`
      * labeled alternative in `MalloyParser.query`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitArrowQuery?: (ctx: ArrowQueryContext) => Result;
+    visitQueryFromSQLSource?: (ctx: QueryFromSQLSourceContext) => Result;
     /**
      * Visit a parse tree produced by the `defJoinOne`
      * labeled alternative in `MalloyParser.joinStatement`.
@@ -711,6 +700,55 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitFilterByWhere?: (ctx: FilterByWhereContext) => Result;
+    /**
+     * Visit a parse tree produced by the `QueryFromSource`
+     * labeled alternative in `MalloyParser.unrefinableQuery`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitQueryFromSource?: (ctx: QueryFromSourceContext) => Result;
+    /**
+     * Visit a parse tree produced by the `RefinedQuery`
+     * labeled alternative in `MalloyParser.unrefinableQuery`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRefinedQuery?: (ctx: RefinedQueryContext) => Result;
+    /**
+     * Visit a parse tree produced by the `SourceFromNamedModelEntry`
+     * labeled alternative in `MalloyParser.extendableSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSourceFromNamedModelEntry?: (ctx: SourceFromNamedModelEntryContext) => Result;
+    /**
+     * Visit a parse tree produced by the `TableSource`
+     * labeled alternative in `MalloyParser.extendableSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTableSource?: (ctx: TableSourceContext) => Result;
+    /**
+     * Visit a parse tree produced by the `QuerySource`
+     * labeled alternative in `MalloyParser.extendableSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitQuerySource?: (ctx: QuerySourceContext) => Result;
+    /**
+     * Visit a parse tree produced by the `SQLSourceName`
+     * labeled alternative in `MalloyParser.extendableSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSQLSourceName?: (ctx: SQLSourceNameContext) => Result;
+    /**
+     * Visit a parse tree produced by the `SQLSource_stub`
+     * labeled alternative in `MalloyParser.extendableSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSQLSource_stub?: (ctx: SQLSource_stubContext) => Result;
     /**
      * Visit a parse tree produced by the `joinWith`
      * labeled alternative in `MalloyParser.joinDef`.
@@ -851,12 +889,54 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitRefineOperator?: (ctx: RefineOperatorContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.queryRefinement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitQueryRefinement?: (ctx: QueryRefinementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sourceExtension`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSourceExtension?: (ctx: SourceExtensionContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.query`.
      * @param ctx the parse tree
      * @return the visitor result
      */
     visitQuery?: (ctx: QueryContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.unrefinableQuery`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUnrefinableQuery?: (ctx: UnrefinableQueryContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.refinableQuery`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRefinableQuery?: (ctx: RefinableQueryContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.unextendableSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUnextendableSource?: (ctx: UnextendableSourceContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.extendableSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitExtendableSource?: (ctx: ExtendableSourceContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sqlSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSqlSource?: (ctx: SqlSourceContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.pipelineFromName`.
      * @param ctx the parse tree
@@ -929,12 +1009,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExplore?: (ctx: ExploreContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.exploreSource`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitExploreSource?: (ctx: ExploreSourceContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.sourceNameDef`.
      * @param ctx the parse tree

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

@@ -8,6 +8,7 @@ import { LogSeverity, MessageLogger } from './parse-log';
 import { MalloyParseRoot } from './parse-malloy';
 import { FieldDeclarationConstructor } from './ast';
 import { HasString, HasID } from './parse-utils';
+import { MalloyTagProperties } from '../tags';
 declare class IgnoredElement extends ast.MalloyElement {
     elementType: string;
     malloySrc: string;
@@ -20,6 +21,7 @@ declare class IgnoredElement extends ast.MalloyElement {
 export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElement> implements MalloyParserVisitor<ast.MalloyElement> {
     readonly parse: MalloyParseRoot;
     readonly msgLog: MessageLogger;
+    compilerFlags: MalloyTagProperties;
     constructor(parse: MalloyParseRoot, msgLog: MessageLogger);
     /**
      * Mostly used to flag a case where the grammar and the type system are
@@ -39,6 +41,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
      */
     protected contextError(cx: ParserRuleContext, msg: string, sev?: LogSeverity): void;
     protected only<T extends ast.MalloyElement>(els: ast.MalloyElement[], isGood: (el: ast.MalloyElement) => T | false, desc: string): T[];
+    protected m4WarningsEnabled(): boolean;
     protected getNumber(term: ParseTree): number;
     protected getFieldName(cx: HasID): ast.FieldName;
     protected getModelEntryName(cx: HasID): ast.ModelEntryReference;
@@ -50,8 +53,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected getFieldExpr(cx: parse.FieldExprContext): ast.ExpressionDef;
     protected getSegments(segments: parse.PipeElementContext[]): ast.QOPDesc[];
     protected getFilterShortcut(cx: parse.FilterShortcutContext): ast.Filter;
-    protected getExploreSource(pcx: parse.ExploreSourceContext): ast.Source;
     protected getPlainString(cx: HasString): string;
+    protected getSource(pcx: parse.ExploreContext): ast.Source;
     protected makeSqlString(pcx: parse.SqlStringContext, sqlStr: ast.SQLString): void;
     /**
      * Parse a time string into an AST TimeLiteral, if the string fails
@@ -61,13 +64,22 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitMalloyDocument(pcx: parse.MalloyDocumentContext): ast.Document;
     visitDefineSourceStatement(pcx: parse.DefineSourceStatementContext): ast.DefineSourceList;
     visitSourceDefinition(pcx: parse.SourceDefinitionContext): ast.DefineSource;
-    visitExplore(pcx: parse.ExploreContext): ast.Source;
+    visitQueryFromSQLSource(pcx: parse.QueryFromSQLSourceContext): ast.QueryElement;
+    visitQueryFromSource(pcx: parse.QueryFromSourceContext): ast.QueryElement;
+    protected getQueryRefinements(pcx: parse.QueryRefinementContext): ast.QOPDesc;
+    visitRefinedQuery(pcx: parse.RefinedQueryContext): ast.QueryElement;
+    visitQueryByTurtleName(pcx: parse.QueryByTurtleNameContext): ast.QueryElement;
+    visitQueryByName(pcx: parse.QueryByNameContext): ast.QueryElement;
+    protected getSourceExtensions(pcx: parse.SourceExtensionContext): ast.SourceDesc;
+    visitUnextendableSource(pcx: parse.UnextendableSourceContext): ast.Source;
+    visitNormalQuery(pcx: parse.NormalQueryContext): ast.QueryElement;
+    visitExtendedQuery(pcx: parse.ExtendedQueryContext): ast.RefinedSource;
     visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.SourceDesc;
     visitTableFunction(pcx: parse.TableFunctionContext): ast.TableSource;
     visitTableMethod(pcx: parse.TableMethodContext): ast.TableSource;
     visitTableSource(pcx: parse.TableSourceContext): ast.TableSource;
     visitSQLSourceName(pcx: parse.SQLSourceNameContext): ast.FromSQLSource;
-    visitSQLSource(pcx: parse.SQLSourceContext): ast.SQLSource;
+    visitSqlSource(pcx: parse.SqlSourceContext): ast.SQLSource;
     visitQuerySource(pcx: parse.QuerySourceContext): ast.Source;
     visitDefJoinMany(pcx: parse.DefJoinManyContext): ast.Joins;
     visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.Joins;
@@ -119,13 +131,10 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitTopStatement(pcx: parse.TopStatementContext): ast.Top;
     visitSourceID(pcx: parse.SourceIDContext): ast.NamedSource;
     protected buildPipelineFromName(pipe: ast.TurtleHeadedPipe, pipeCx: parse.PipelineFromNameContext): void;
-    visitExploreArrowQuery(pcx: parse.ExploreArrowQueryContext): ast.FullQuery;
-    visitArrowQuery(pcx: parse.ArrowQueryContext): ast.ExistingQuery;
     visitTopLevelQueryDefs(pcx: parse.TopLevelQueryDefsContext): ast.DefineQueryList;
     visitTopLevelQueryDef(pcx: parse.TopLevelQueryDefContext): ast.DefineQuery;
     visitAnonymousQuery(pcx: parse.AnonymousQueryContext): ast.AnonymousQuery;
-    visitRunStatementDef(pcx: parse.RunStatementDefContext): ast.RunQueryDef;
-    visitRunStatementRef(pcx: parse.RunStatementRefContext): ast.RunQueryRef;
+    visitRunStatement(pcx: parse.RunStatementContext): ast.RunQuery;
     visitNestStatement(pcx: parse.NestStatementContext): ast.Nests;
     visitNestedQueryList(pcx: parse.NestedQueryListContext): ast.Nests;
     visitNestExisting(pcx: parse.NestExistingContext): ast.NestedQuery;
@@ -165,7 +174,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExprFunc(pcx: parse.ExprFuncContext): ast.ExpressionDef;
     visitExprDuration(pcx: parse.ExprDurationContext): ast.ExprDuration;
     visitPickStatement(pcx: parse.PickStatementContext): ast.Pick;
-    visitNamedSource(pcx: parse.NamedSourceContext): ast.NamedSource;
+    visitSourceFromNamedModelEntry(pcx: parse.SourceFromNamedModelEntryContext): ast.Source;
     visitExprFilter(pcx: parse.ExprFilterContext): ast.ExprFilter;
     visitLiteralTimestamp(pcx: parse.LiteralTimestampContext): ast.ExpressionDef;
     visitLiteralHour(pcx: parse.LiteralHourContext): ast.ExpressionDef;