@malloydata/malloy 0.0.88-dev231002231014 → 0.0.88-dev231003001139

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

@@ -17,8 +17,6 @@ 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";
@@ -49,10 +47,6 @@ import { ExprAggFuncContext } from "./MalloyParser";
 import { ExprFuncContext } from "./MalloyParser";
 import { ExprPickContext } from "./MalloyParser";
 import { ExprUngroupContext } 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";
@@ -70,15 +64,17 @@ 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 { SQIDContext } from "./MalloyParser";
+import { SQArrowContext } from "./MalloyParser";
+import { SQAmbiguousContext } from "./MalloyParser";
+import { SQExtendedSourceContext } from "./MalloyParser";
+import { SQRefinedQueryContext } from "./MalloyParser";
+import { SQFromContext } from "./MalloyParser";
+import { SQTableContext } from "./MalloyParser";
+import { SQLegacySQLBlockContext } from "./MalloyParser";
+import { SQSQLContext } from "./MalloyParser";
 import { MalloyDocumentContext } from "./MalloyParser";
 import { MalloyStatementContext } from "./MalloyParser";
 import { DefineSourceStatementContext } from "./MalloyParser";
@@ -104,11 +100,6 @@ 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";
@@ -121,7 +112,7 @@ import { ExploreQueryNameContext } from "./MalloyParser";
 import { QueryNameContext } from "./MalloyParser";
 import { SourcePropertyListContext } from "./MalloyParser";
 import { SourceDefinitionContext } from "./MalloyParser";
-import { ExploreContext } from "./MalloyParser";
+import { SqExploreContext } from "./MalloyParser";
 import { SourceNameDefContext } from "./MalloyParser";
 import { SourceIDContext } from "./MalloyParser";
 import { ExplorePropertiesContext } from "./MalloyParser";
@@ -137,6 +128,11 @@ import { JoinNameDefContext } from "./MalloyParser";
 import { DeclareStatementContext } from "./MalloyParser";
 import { JoinStatementContext } from "./MalloyParser";
 import { QueryExtendContext } from "./MalloyParser";
+import { AmbiguousModificationContext } from "./MalloyParser";
+import { ModEitherContext } from "./MalloyParser";
+import { SqExprContext } from "./MalloyParser";
+import { LeadSegContext } from "./MalloyParser";
+import { QSegContext } from "./MalloyParser";
 import { QueryExtendStatementContext } from "./MalloyParser";
 import { QueryExtendStatementListContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
@@ -342,20 +338,6 @@ 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`.
@@ -566,34 +548,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExprUngroup?: (ctx: ExprUngroupContext) => Result;
-    /**
-     * Visit a parse tree produced by the `QueryByName`
-     * labeled alternative in `MalloyParser.refinableQuery`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitQueryByName?: (ctx: QueryByNameContext) => Result;
-    /**
-     * Visit a parse tree produced by the `QueryByTurtleName`
-     * labeled alternative in `MalloyParser.refinableQuery`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitQueryByTurtleName?: (ctx: QueryByTurtleNameContext) => Result;
-    /**
-     * Visit a parse tree produced by the `NormalQuery`
-     * labeled alternative in `MalloyParser.query`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitNormalQuery?: (ctx: NormalQueryContext) => Result;
-    /**
-     * Visit a parse tree produced by the `QueryFromSQLSource`
-     * labeled alternative in `MalloyParser.query`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitQueryFromSQLSource?: (ctx: QueryFromSQLSourceContext) => Result;
     /**
      * Visit a parse tree produced by the `defJoinOne`
      * labeled alternative in `MalloyParser.joinStatement`.
@@ -714,68 +668,82 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitFilterByWhere?: (ctx: FilterByWhereContext) => Result;
     /**
-     * Visit a parse tree produced by the `QueryFromSource`
-     * labeled alternative in `MalloyParser.unrefinableQuery`.
+     * Visit a parse tree produced by the `joinWith`
+     * labeled alternative in `MalloyParser.joinDef`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitQueryFromSource?: (ctx: QueryFromSourceContext) => Result;
+    visitJoinWith?: (ctx: JoinWithContext) => Result;
     /**
-     * Visit a parse tree produced by the `RefinedQuery`
-     * labeled alternative in `MalloyParser.unrefinableQuery`.
+     * Visit a parse tree produced by the `joinOn`
+     * labeled alternative in `MalloyParser.joinDef`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitRefinedQuery?: (ctx: RefinedQueryContext) => Result;
+    visitJoinOn?: (ctx: JoinOnContext) => Result;
     /**
-     * Visit a parse tree produced by the `SourceFromNamedModelEntry`
-     * labeled alternative in `MalloyParser.extendableSource`.
+     * Visit a parse tree produced by the `SQID`
+     * labeled alternative in `MalloyParser.sqExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitSourceFromNamedModelEntry?: (ctx: SourceFromNamedModelEntryContext) => Result;
+    visitSQID?: (ctx: SQIDContext) => Result;
     /**
-     * Visit a parse tree produced by the `TableSource`
-     * labeled alternative in `MalloyParser.extendableSource`.
+     * Visit a parse tree produced by the `SQArrow`
+     * labeled alternative in `MalloyParser.sqExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitTableSource?: (ctx: TableSourceContext) => Result;
+    visitSQArrow?: (ctx: SQArrowContext) => Result;
     /**
-     * Visit a parse tree produced by the `QuerySource`
-     * labeled alternative in `MalloyParser.extendableSource`.
+     * Visit a parse tree produced by the `SQAmbiguous`
+     * labeled alternative in `MalloyParser.sqExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitQuerySource?: (ctx: QuerySourceContext) => Result;
+    visitSQAmbiguous?: (ctx: SQAmbiguousContext) => Result;
     /**
-     * Visit a parse tree produced by the `SQLSourceName`
-     * labeled alternative in `MalloyParser.extendableSource`.
+     * Visit a parse tree produced by the `SQExtendedSource`
+     * labeled alternative in `MalloyParser.sqExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitSQLSourceName?: (ctx: SQLSourceNameContext) => Result;
+    visitSQExtendedSource?: (ctx: SQExtendedSourceContext) => Result;
     /**
-     * Visit a parse tree produced by the `SQLSource_stub`
-     * labeled alternative in `MalloyParser.extendableSource`.
+     * Visit a parse tree produced by the `SQRefinedQuery`
+     * labeled alternative in `MalloyParser.sqExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitSQLSource_stub?: (ctx: SQLSource_stubContext) => Result;
+    visitSQRefinedQuery?: (ctx: SQRefinedQueryContext) => Result;
     /**
-     * Visit a parse tree produced by the `joinWith`
-     * labeled alternative in `MalloyParser.joinDef`.
+     * Visit a parse tree produced by the `SQFrom`
+     * labeled alternative in `MalloyParser.sqExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitJoinWith?: (ctx: JoinWithContext) => Result;
+    visitSQFrom?: (ctx: SQFromContext) => Result;
     /**
-     * Visit a parse tree produced by the `joinOn`
-     * labeled alternative in `MalloyParser.joinDef`.
+     * Visit a parse tree produced by the `SQTable`
+     * labeled alternative in `MalloyParser.sqExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitJoinOn?: (ctx: JoinOnContext) => Result;
+    visitSQTable?: (ctx: SQTableContext) => Result;
+    /**
+     * Visit a parse tree produced by the `SQLegacySQLBlock`
+     * labeled alternative in `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSQLegacySQLBlock?: (ctx: SQLegacySQLBlockContext) => Result;
+    /**
+     * Visit a parse tree produced by the `SQSQL`
+     * labeled alternative in `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSQSQL?: (ctx: SQSQLContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.malloyDocument`.
      * @param ctx the parse tree
@@ -926,36 +894,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @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
@@ -1029,11 +967,11 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitSourceDefinition?: (ctx: SourceDefinitionContext) => Result;
     /**
-     * Visit a parse tree produced by `MalloyParser.explore`.
+     * Visit a parse tree produced by `MalloyParser.sqExplore`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExplore?: (ctx: ExploreContext) => Result;
+    visitSqExplore?: (ctx: SqExploreContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.sourceNameDef`.
      * @param ctx the parse tree
@@ -1124,6 +1062,36 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitQueryExtend?: (ctx: QueryExtendContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.ambiguousModification`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitAmbiguousModification?: (ctx: AmbiguousModificationContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.modEither`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitModEither?: (ctx: ModEitherContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSqExpr?: (ctx: SqExprContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.leadSeg`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitLeadSeg?: (ctx: LeadSegContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.qSeg`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitQSeg?: (ctx: QSegContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.queryExtendStatement`.
      * @param ctx the parse tree

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

@@ -11,6 +11,9 @@ import { HasString, HasID } from './parse-utils';
 import { CastType } from '../model';
 import { DocumentLocation, Note } from '../model/malloy_types';
 import { Tag } from '../tags';
+declare class ErrorNode extends ast.SourceQueryNode {
+    elementType: string;
+}
 declare class IgnoredElement extends ast.MalloyElement {
     elementType: string;
     malloySrc: string;
@@ -60,7 +63,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected getSegments(segments: parse.PipeElementContext[]): ast.QOPDesc[];
     protected getFilterShortcut(cx: parse.FilterShortcutContext): ast.Filter;
     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
@@ -77,29 +79,19 @@ 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;
-    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;
+    protected getLegacySQLSouce(pcx: parse.SqlExploreNameRefContext): ast.FromSQLSource;
     visitSqlSource(pcx: parse.SqlSourceContext): ast.SQLSource;
-    visitQuerySource(pcx: parse.QuerySourceContext): ast.Source;
     visitDefJoinMany(pcx: parse.DefJoinManyContext): ast.Joins;
     visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.Joins;
     visitDefJoinCross(pcx: parse.DefJoinCrossContext): ast.Joins;
     protected getJoinList(pcx: parse.JoinListContext): ast.MalloyElement[];
     protected getJoinSource(name: ast.ModelEntryReference, ecx: parse.IsExploreContext | undefined): {
-        joinFrom: ast.Source;
+        joinFrom: ast.SourceQueryNode;
         notes: Note[];
     };
     visitQueryJoinStatement(pcx: parse.QueryJoinStatementContext): ast.MalloyElement;
@@ -147,7 +139,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitTopLevelQueryDefs(pcx: parse.TopLevelQueryDefsContext): ast.DefineQueryList;
     visitTopLevelQueryDef(pcx: parse.TopLevelQueryDefContext): ast.DefineQuery;
     visitAnonymousQuery(pcx: parse.AnonymousQueryContext): ast.AnonymousQuery;
-    visitRunStatement(pcx: parse.RunStatementContext): ast.RunQuery;
+    visitRunStatement(pcx: parse.RunStatementContext): ast.AnonymousQuery;
     visitNestStatement(pcx: parse.NestStatementContext): ast.Nests;
     visitNestedQueryList(pcx: parse.NestedQueryListContext): ast.Nests;
     visitNestExisting(pcx: parse.NestExistingContext): ast.NestedQuery;
@@ -193,7 +185,6 @@ 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;
-    visitSourceFromNamedModelEntry(pcx: parse.SourceFromNamedModelEntryContext): ast.Source;
     visitExprFilter(pcx: parse.ExprFilterContext): ast.ExprFilter;
     visitLiteralTimestamp(pcx: parse.LiteralTimestampContext): ast.ExpressionDef;
     visitLiteralHour(pcx: parse.LiteralHourContext): ast.ExpressionDef;
@@ -210,5 +201,15 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitIgnoredObjectAnnotations(pcx: parse.IgnoredObjectAnnotationsContext): IgnoredElement;
     visitIgnoredModelAnnotations(pcx: parse.IgnoredModelAnnotationsContext): IgnoredElement;
     visitDefExploreAnnotation(pcx: parse.DefExploreAnnotationContext): ast.ObjectAnnotation;
+    visitSQAmbiguous(pcx: parse.SQAmbiguousContext): ast.SQLegacyModify;
+    visitSQID(pcx: parse.SQIDContext): ast.SQReference;
+    protected getSqExpr(cx: parse.SqExprContext): ast.SourceQueryNode;
+    visitSQExtendedSource(pcx: parse.SQExtendedSourceContext): ast.SQExtendedSource;
+    visitSQArrow(pcx: parse.SQArrowContext): ast.SQAppendView;
+    visitSQRefinedQuery(pcx: parse.SQRefinedQueryContext): ast.SQRefinedQuery;
+    visitSQFrom(pcx: parse.SQFromContext): ast.SQFrom;
+    visitSQTable(pcx: parse.SQTableContext): ast.SQSourceWrapper | ErrorNode;
+    visitSQLegacySQLBlock(pcx: parse.SQLegacySQLBlockContext): ast.SQSourceWrapper;
+    visitSQSQL(pcx: parse.SQSQLContext): ast.SQSourceWrapper;
 }
 export {};