@malloydata/malloy 0.0.362 → 0.0.363

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

@@ -74,6 +74,9 @@ import { DefExploreAnnotationContext } from "./MalloyParser";
 import { DefIgnoreModel_stubContext } from "./MalloyParser";
 import { JoinWithContext } from "./MalloyParser";
 import { JoinOnContext } from "./MalloyParser";
+import { UserTypeRefContext } from "./MalloyParser";
+import { UserTypeInlineContext } from "./MalloyParser";
+import { UserTypeExtendContext } from "./MalloyParser";
 import { SQIDContext } from "./MalloyParser";
 import { SQParensContext } from "./MalloyParser";
 import { SQComposeContext } from "./MalloyParser";
@@ -81,11 +84,21 @@ import { SQRefinedQueryContext } from "./MalloyParser";
 import { SQArrowContext } from "./MalloyParser";
 import { SQExtendedSourceContext } from "./MalloyParser";
 import { SQIncludeContext } from "./MalloyParser";
+import { SQTypedSourceContext } from "./MalloyParser";
 import { SQTableContext } from "./MalloyParser";
+import { SQVirtualContext } from "./MalloyParser";
 import { SQSQLContext } from "./MalloyParser";
 import { MalloyDocumentContext } from "./MalloyParser";
 import { MalloyStatementContext } from "./MalloyParser";
 import { DefineSourceStatementContext } from "./MalloyParser";
+import { DefineUserTypeStatementContext } from "./MalloyParser";
+import { UserTypePropertyListContext } from "./MalloyParser";
+import { UserTypeDefinitionContext } from "./MalloyParser";
+import { UserTypeNameDefContext } from "./MalloyParser";
+import { UserTypeExprContext } from "./MalloyParser";
+import { UserTypeShapeContext } from "./MalloyParser";
+import { UserTypeFieldContext } from "./MalloyParser";
+import { UserTypeFieldTypeContext } from "./MalloyParser";
 import { DefineQueryContext } from "./MalloyParser";
 import { TopLevelAnonQueryDefContext } from "./MalloyParser";
 import { AnnotationContext } from "./MalloyParser";
@@ -110,6 +123,7 @@ import { RefineOperatorContext } from "./MalloyParser";
 import { TurtleNameContext } from "./MalloyParser";
 import { SqlSourceContext } from "./MalloyParser";
 import { ExploreTableContext } from "./MalloyParser";
+import { VirtualSourceContext } from "./MalloyParser";
 import { ConnectionIdContext } from "./MalloyParser";
 import { QueryPropertiesContext } from "./MalloyParser";
 import { QueryNameContext } from "./MalloyParser";
@@ -141,6 +155,8 @@ import { SourceArgumentsContext } from "./MalloyParser";
 import { ArgumentIdContext } from "./MalloyParser";
 import { SourceArgumentContext } from "./MalloyParser";
 import { SqExprContext } from "./MalloyParser";
+import { SourceTypeConstraintsContext } from "./MalloyParser";
+import { UserTypeNameContext } from "./MalloyParser";
 import { IncludeBlockContext } from "./MalloyParser";
 import { IncludeItemContext } from "./MalloyParser";
 import { OrphanedAnnotationContext } from "./MalloyParser";
@@ -1154,6 +1170,42 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitJoinOn?: (ctx: JoinOnContext) => void;
+    /**
+     * Enter a parse tree produced by the `userTypeRef`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeRef?: (ctx: UserTypeRefContext) => void;
+    /**
+     * Exit a parse tree produced by the `userTypeRef`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeRef?: (ctx: UserTypeRefContext) => void;
+    /**
+     * Enter a parse tree produced by the `userTypeInline`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeInline?: (ctx: UserTypeInlineContext) => void;
+    /**
+     * Exit a parse tree produced by the `userTypeInline`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeInline?: (ctx: UserTypeInlineContext) => void;
+    /**
+     * Enter a parse tree produced by the `userTypeExtend`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeExtend?: (ctx: UserTypeExtendContext) => void;
+    /**
+     * Exit a parse tree produced by the `userTypeExtend`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeExtend?: (ctx: UserTypeExtendContext) => void;
     /**
      * Enter a parse tree produced by the `SQID`
      * labeled alternative in `MalloyParser.sqExpr`.
@@ -1238,6 +1290,18 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitSQInclude?: (ctx: SQIncludeContext) => void;
+    /**
+     * Enter a parse tree produced by the `SQTypedSource`
+     * labeled alternative in `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     */
+    enterSQTypedSource?: (ctx: SQTypedSourceContext) => void;
+    /**
+     * Exit a parse tree produced by the `SQTypedSource`
+     * labeled alternative in `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     */
+    exitSQTypedSource?: (ctx: SQTypedSourceContext) => void;
     /**
      * Enter a parse tree produced by the `SQTable`
      * labeled alternative in `MalloyParser.sqExpr`.
@@ -1250,6 +1314,18 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitSQTable?: (ctx: SQTableContext) => void;
+    /**
+     * Enter a parse tree produced by the `SQVirtual`
+     * labeled alternative in `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     */
+    enterSQVirtual?: (ctx: SQVirtualContext) => void;
+    /**
+     * Exit a parse tree produced by the `SQVirtual`
+     * labeled alternative in `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     */
+    exitSQVirtual?: (ctx: SQVirtualContext) => void;
     /**
      * Enter a parse tree produced by the `SQSQL`
      * labeled alternative in `MalloyParser.sqExpr`.
@@ -1292,6 +1368,86 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitDefineSourceStatement?: (ctx: DefineSourceStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.defineUserTypeStatement`.
+     * @param ctx the parse tree
+     */
+    enterDefineUserTypeStatement?: (ctx: DefineUserTypeStatementContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.defineUserTypeStatement`.
+     * @param ctx the parse tree
+     */
+    exitDefineUserTypeStatement?: (ctx: DefineUserTypeStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.userTypePropertyList`.
+     * @param ctx the parse tree
+     */
+    enterUserTypePropertyList?: (ctx: UserTypePropertyListContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.userTypePropertyList`.
+     * @param ctx the parse tree
+     */
+    exitUserTypePropertyList?: (ctx: UserTypePropertyListContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.userTypeDefinition`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeDefinition?: (ctx: UserTypeDefinitionContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.userTypeDefinition`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeDefinition?: (ctx: UserTypeDefinitionContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.userTypeNameDef`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeNameDef?: (ctx: UserTypeNameDefContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.userTypeNameDef`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeNameDef?: (ctx: UserTypeNameDefContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeExpr?: (ctx: UserTypeExprContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeExpr?: (ctx: UserTypeExprContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.userTypeShape`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeShape?: (ctx: UserTypeShapeContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.userTypeShape`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeShape?: (ctx: UserTypeShapeContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.userTypeField`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeField?: (ctx: UserTypeFieldContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.userTypeField`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeField?: (ctx: UserTypeFieldContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.userTypeFieldType`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeFieldType?: (ctx: UserTypeFieldTypeContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.userTypeFieldType`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeFieldType?: (ctx: UserTypeFieldTypeContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.defineQuery`.
      * @param ctx the parse tree
@@ -1532,6 +1688,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExploreTable?: (ctx: ExploreTableContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.virtualSource`.
+     * @param ctx the parse tree
+     */
+    enterVirtualSource?: (ctx: VirtualSourceContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.virtualSource`.
+     * @param ctx the parse tree
+     */
+    exitVirtualSource?: (ctx: VirtualSourceContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.connectionId`.
      * @param ctx the parse tree
@@ -1842,6 +2008,26 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitSqExpr?: (ctx: SqExprContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.sourceTypeConstraints`.
+     * @param ctx the parse tree
+     */
+    enterSourceTypeConstraints?: (ctx: SourceTypeConstraintsContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.sourceTypeConstraints`.
+     * @param ctx the parse tree
+     */
+    exitSourceTypeConstraints?: (ctx: SourceTypeConstraintsContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.userTypeName`.
+     * @param ctx the parse tree
+     */
+    enterUserTypeName?: (ctx: UserTypeNameContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.userTypeName`.
+     * @param ctx the parse tree
+     */
+    exitUserTypeName?: (ctx: UserTypeNameContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.includeBlock`.
      * @param ctx the parse tree

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

@@ -74,6 +74,9 @@ import { DefExploreAnnotationContext } from "./MalloyParser";
 import { DefIgnoreModel_stubContext } from "./MalloyParser";
 import { JoinWithContext } from "./MalloyParser";
 import { JoinOnContext } from "./MalloyParser";
+import { UserTypeRefContext } from "./MalloyParser";
+import { UserTypeInlineContext } from "./MalloyParser";
+import { UserTypeExtendContext } from "./MalloyParser";
 import { SQIDContext } from "./MalloyParser";
 import { SQParensContext } from "./MalloyParser";
 import { SQComposeContext } from "./MalloyParser";
@@ -81,11 +84,21 @@ import { SQRefinedQueryContext } from "./MalloyParser";
 import { SQArrowContext } from "./MalloyParser";
 import { SQExtendedSourceContext } from "./MalloyParser";
 import { SQIncludeContext } from "./MalloyParser";
+import { SQTypedSourceContext } from "./MalloyParser";
 import { SQTableContext } from "./MalloyParser";
+import { SQVirtualContext } from "./MalloyParser";
 import { SQSQLContext } from "./MalloyParser";
 import { MalloyDocumentContext } from "./MalloyParser";
 import { MalloyStatementContext } from "./MalloyParser";
 import { DefineSourceStatementContext } from "./MalloyParser";
+import { DefineUserTypeStatementContext } from "./MalloyParser";
+import { UserTypePropertyListContext } from "./MalloyParser";
+import { UserTypeDefinitionContext } from "./MalloyParser";
+import { UserTypeNameDefContext } from "./MalloyParser";
+import { UserTypeExprContext } from "./MalloyParser";
+import { UserTypeShapeContext } from "./MalloyParser";
+import { UserTypeFieldContext } from "./MalloyParser";
+import { UserTypeFieldTypeContext } from "./MalloyParser";
 import { DefineQueryContext } from "./MalloyParser";
 import { TopLevelAnonQueryDefContext } from "./MalloyParser";
 import { AnnotationContext } from "./MalloyParser";
@@ -110,6 +123,7 @@ import { RefineOperatorContext } from "./MalloyParser";
 import { TurtleNameContext } from "./MalloyParser";
 import { SqlSourceContext } from "./MalloyParser";
 import { ExploreTableContext } from "./MalloyParser";
+import { VirtualSourceContext } from "./MalloyParser";
 import { ConnectionIdContext } from "./MalloyParser";
 import { QueryPropertiesContext } from "./MalloyParser";
 import { QueryNameContext } from "./MalloyParser";
@@ -141,6 +155,8 @@ import { SourceArgumentsContext } from "./MalloyParser";
 import { ArgumentIdContext } from "./MalloyParser";
 import { SourceArgumentContext } from "./MalloyParser";
 import { SqExprContext } from "./MalloyParser";
+import { SourceTypeConstraintsContext } from "./MalloyParser";
+import { UserTypeNameContext } from "./MalloyParser";
 import { IncludeBlockContext } from "./MalloyParser";
 import { IncludeItemContext } from "./MalloyParser";
 import { OrphanedAnnotationContext } from "./MalloyParser";
@@ -782,6 +798,27 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitJoinOn?: (ctx: JoinOnContext) => Result;
+    /**
+     * Visit a parse tree produced by the `userTypeRef`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeRef?: (ctx: UserTypeRefContext) => Result;
+    /**
+     * Visit a parse tree produced by the `userTypeInline`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeInline?: (ctx: UserTypeInlineContext) => Result;
+    /**
+     * Visit a parse tree produced by the `userTypeExtend`
+     * labeled alternative in `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeExtend?: (ctx: UserTypeExtendContext) => Result;
     /**
      * Visit a parse tree produced by the `SQID`
      * labeled alternative in `MalloyParser.sqExpr`.
@@ -831,6 +868,13 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitSQInclude?: (ctx: SQIncludeContext) => Result;
+    /**
+     * Visit a parse tree produced by the `SQTypedSource`
+     * labeled alternative in `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSQTypedSource?: (ctx: SQTypedSourceContext) => Result;
     /**
      * Visit a parse tree produced by the `SQTable`
      * labeled alternative in `MalloyParser.sqExpr`.
@@ -838,6 +882,13 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitSQTable?: (ctx: SQTableContext) => Result;
+    /**
+     * Visit a parse tree produced by the `SQVirtual`
+     * labeled alternative in `MalloyParser.sqExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSQVirtual?: (ctx: SQVirtualContext) => Result;
     /**
      * Visit a parse tree produced by the `SQSQL`
      * labeled alternative in `MalloyParser.sqExpr`.
@@ -863,6 +914,54 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitDefineSourceStatement?: (ctx: DefineSourceStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.defineUserTypeStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitDefineUserTypeStatement?: (ctx: DefineUserTypeStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.userTypePropertyList`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypePropertyList?: (ctx: UserTypePropertyListContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.userTypeDefinition`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeDefinition?: (ctx: UserTypeDefinitionContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.userTypeNameDef`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeNameDef?: (ctx: UserTypeNameDefContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.userTypeExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeExpr?: (ctx: UserTypeExprContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.userTypeShape`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeShape?: (ctx: UserTypeShapeContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.userTypeField`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeField?: (ctx: UserTypeFieldContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.userTypeFieldType`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeFieldType?: (ctx: UserTypeFieldTypeContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.defineQuery`.
      * @param ctx the parse tree
@@ -1007,6 +1106,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExploreTable?: (ctx: ExploreTableContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.virtualSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitVirtualSource?: (ctx: VirtualSourceContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.connectionId`.
      * @param ctx the parse tree
@@ -1193,6 +1298,18 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitSqExpr?: (ctx: SqExprContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sourceTypeConstraints`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSourceTypeConstraints?: (ctx: SourceTypeConstraintsContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.userTypeName`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitUserTypeName?: (ctx: UserTypeNameContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.includeBlock`.
      * @param ctx the parse tree

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

@@ -20,6 +20,11 @@ declare class IgnoredElement extends ast.MalloyElement {
     malloySrc: string;
     constructor(src: string);
 }
+interface IndirectUserType {
+    namedUserType: string;
+    arrayDepth: number;
+}
+type UserTypeFieldTypeResult = AtomicTypeDef | IndirectUserType;
 type HasAnnotations = ParserRuleContext & {
     annotation: () => parse.AnnotationContext[];
 };
@@ -84,12 +89,22 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected getIsNotes(cx: parse.IsDefineContext): Note[];
     visitMalloyDocument(pcx: parse.MalloyDocumentContext): ast.Document;
     visitDefineSourceStatement(pcx: parse.DefineSourceStatementContext): ast.DefineSourceList;
+    visitDefineUserTypeStatement(pcx: parse.DefineUserTypeStatementContext): ast.DefineUserTypeList;
+    visitUserTypeDefinition(pcx: parse.UserTypeDefinitionContext): ast.DefineUserType;
+    getUserTypeShapeExpr(cx: parse.UserTypeExprContext): ast.UserTypeShape;
+    visitUserTypeRef(pcx: parse.UserTypeRefContext): ast.ExtendedUserTypeShape;
+    visitUserTypeInline(pcx: parse.UserTypeInlineContext): ast.UserTypeShape;
+    visitUserTypeExtend(pcx: parse.UserTypeExtendContext): ast.ExtendedUserTypeShape;
+    getUserTypeShape(pcx: parse.UserTypeShapeContext): ast.UserTypeShape;
+    getUserTypeField(pcx: parse.UserTypeFieldContext): ast.UserTypeMember;
+    getUserTypeFieldType(pcx: parse.UserTypeFieldTypeContext): UserTypeFieldTypeResult;
     getSourceParameter(pcx: parse.SourceParameterContext): ast.HasParameter | null;
     getSourceParameters(pcx: parse.SourceParametersContext | undefined): ast.HasParameter[];
     visitSourceDefinition(pcx: parse.SourceDefinitionContext): ast.DefineSource;
     protected getSourceExtensions(extensions: parse.ExplorePropertiesContext): ast.SourceDesc;
     visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.SourceDesc;
     visitExploreTable(pcx: parse.ExploreTableContext): ast.TableSource;
+    visitVirtualSource(pcx: parse.VirtualSourceContext): ast.VirtualTableSource;
     visitSqlSource(pcx: parse.SqlSourceContext): ast.SQLSource;
     visitDefJoinMany(pcx: parse.DefJoinManyContext): ast.JoinStatement;
     visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.JoinStatement;
@@ -221,6 +236,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitSQID(pcx: parse.SQIDContext): ast.SQReference;
     protected getSqExpr(cx: parse.SqExprContext): ast.SourceQueryElement;
     visitSQExtendedSource(pcx: parse.SQExtendedSourceContext): ast.SQExtend;
+    visitSQTypedSource(pcx: parse.SQTypedSourceContext): ast.SQTypedSource;
     getIncludeItems(pcx: parse.IncludeBlockContext): ast.IncludeItem[];
     getIncludeItem(pcx: parse.IncludeItemContext): ast.IncludeItem | undefined;
     getIncludeList(pcx: parse.IncludeListContext): ast.IncludeListItem[];
@@ -238,6 +254,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitVArrow(pcx: parse.VArrowContext): ast.ViewArrow;
     visitSQRefinedQuery(pcx: parse.SQRefinedQueryContext): ast.SQRefine;
     visitSQTable(pcx: parse.SQTableContext): ErrorNode | ast.SQSource;
+    visitSQVirtual(pcx: parse.SQVirtualContext): ast.SQSource;
     visitSQSQL(pcx: parse.SQSQLContext): ast.SQSource;
     visitExperimentalStatementForTesting(pcx: parse.ExperimentalStatementForTestingContext): ast.ExperimentalExperiment;
     visitRecordRef(pcx: parse.RecordRefContext): ast.RecordElement;

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

@@ -82,6 +82,9 @@ class IgnoredElement extends ast.MalloyElement {
         this.malloySrc = src;
     }
 }
+function isIndirectUserType(t) {
+    return 'namedUserType' in t;
+}
 const DEFAULT_COMPILER_FLAGS = [];
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
@@ -283,6 +286,100 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         defList.extendNote({ blockNotes });
         return defList;
     }
+    visitDefineUserTypeStatement(pcx) {
+        this.inExperiment('virtual_source', pcx);
+        const defsCx = pcx.userTypePropertyList().userTypeDefinition();
+        const defs = defsCx.map(dcx => this.visitUserTypeDefinition(dcx));
+        const blockNotes = this.getNotes(pcx.tags());
+        const defList = new ast.DefineUserTypeList(defs);
+        defList.extendNote({ blockNotes });
+        return defList;
+    }
+    visitUserTypeDefinition(pcx) {
+        const shape = this.getUserTypeShapeExpr(pcx.userTypeExpr());
+        const def = new ast.DefineUserType((0, parse_utils_1.getId)(pcx.userTypeNameDef()), shape, true);
+        const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
+        def.extendNote({ notes });
+        return this.astAt(def, pcx);
+    }
+    getUserTypeShapeExpr(cx) {
+        const result = this.visit(cx);
+        if (result instanceof ast.UserTypeShape) {
+            return result;
+        }
+        throw this.internalError(cx, 'Expected a user type shape');
+    }
+    visitUserTypeRef(pcx) {
+        const name = (0, parse_utils_1.idToStr)(pcx.userTypeName().id());
+        return this.astAt(new ast.ExtendedUserTypeShape([], name), pcx);
+    }
+    visitUserTypeInline(pcx) {
+        return this.getUserTypeShape(pcx.userTypeShape());
+    }
+    visitUserTypeExtend(pcx) {
+        const baseName = (0, parse_utils_1.idToStr)(pcx.userTypeName().id());
+        const members = pcx
+            .userTypeShape()
+            .userTypeField()
+            .map(f => this.getUserTypeField(f));
+        return this.astAt(new ast.ExtendedUserTypeShape(members, baseName), pcx);
+    }
+    getUserTypeShape(pcx) {
+        const members = pcx.userTypeField().map(f => this.getUserTypeField(f));
+        return this.astAt(new ast.UserTypeShape(members), pcx);
+    }
+    getUserTypeField(pcx) {
+        const name = (0, parse_utils_1.getId)(pcx);
+        const typeResult = this.getUserTypeFieldType(pcx.userTypeFieldType());
+        let member;
+        if (isIndirectUserType(typeResult)) {
+            member = new ast.UserTypeMemberIndirect(name, typeResult.namedUserType, typeResult.arrayDepth);
+        }
+        else {
+            member = new ast.UserTypeMemberDef(name, typeResult);
+        }
+        const notes = this.getNotes(pcx.tags());
+        member.extendNote({ notes });
+        return this.astAt(member, pcx);
+    }
+    getUserTypeFieldType(pcx) {
+        const basicCx = pcx.malloyBasicType();
+        if (basicCx) {
+            return this.getBasicMalloyType(basicCx);
+        }
+        const bodyCx = pcx.userTypeShape();
+        if (bodyCx) {
+            const fields = bodyCx.userTypeField().map(fieldCx => {
+                const name = (0, parse_utils_1.getId)(fieldCx);
+                const fieldType = this.getUserTypeFieldType(fieldCx.userTypeFieldType());
+                if (isIndirectUserType(fieldType)) {
+                    this.contextError(fieldCx, 'unexpected-malloy-type', `Named user type reference '${fieldType.namedUserType}' cannot be used as an inline record field type`);
+                    return (0, malloy_types_1.mkFieldDef)({ type: 'error' }, name);
+                }
+                return (0, malloy_types_1.mkFieldDef)(fieldType, name);
+            });
+            return { type: 'record', fields };
+        }
+        const innerCx = pcx.userTypeFieldType();
+        if (innerCx) {
+            const inner = this.getUserTypeFieldType(innerCx);
+            if (isIndirectUserType(inner)) {
+                return { ...inner, arrayDepth: inner.arrayDepth + 1 };
+            }
+            return (0, malloy_types_1.mkArrayTypeDef)(inner);
+        }
+        const strCx = pcx.shortString();
+        if (strCx) {
+            const rawType = (0, parse_utils_1.getShortString)(strCx);
+            return { type: 'sql native', rawType };
+        }
+        const nameCx = pcx.userTypeName();
+        if (nameCx) {
+            return { namedUserType: (0, parse_utils_1.idToStr)(nameCx.id()), arrayDepth: 0 };
+        }
+        this.contextError(pcx, 'unexpected-malloy-type', 'Expected a user type field type');
+        return { type: 'error' };
+    }
     getSourceParameter(pcx) {
         const name = (0, parse_utils_1.getId)(pcx.parameterNameDef());
         let pType;
@@ -346,6 +443,13 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const tablePath = this.getPlainStringFrom(pcx.tablePath());
         return this.astAt(new ast.TableMethodSource(connectionName, tablePath), pcx);
     }
+    visitVirtualSource(pcx) {
+        this.inExperiment('virtual_source', pcx);
+        const connId = pcx.connectionId();
+        const connectionName = this.astAt(this.getModelEntryName(connId), connId);
+        const virtualName = (0, parse_utils_1.getShortString)(pcx.shortString());
+        return this.astAt(new ast.VirtualTableSource(connectionName, virtualName), pcx);
+    }
     visitSqlSource(pcx) {
         const connId = pcx.connectionId();
         const connectionName = this.astAt(this.getModelEntryName(connId), connId);
@@ -1391,6 +1495,15 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const src = new ast.SQExtend(extendSrc, this.getSourceExtensions(pcx.exploreProperties()), includeList);
         return this.astAt(src, pcx);
     }
+    visitSQTypedSource(pcx) {
+        this.inExperiment('virtual_source', pcx);
+        const sqSrc = this.getSqExpr(pcx.sqExpr());
+        const userTypes = pcx
+            .sourceTypeConstraints()
+            .userTypeName()
+            .map(nameCx => this.astAt(this.getModelEntryName(nameCx), nameCx));
+        return this.astAt(new ast.SQTypedSource(sqSrc, userTypes), pcx);
+    }
     getIncludeItems(pcx) {
         this.inExperiment('access_modifiers', pcx);
         return pcx
@@ -1524,6 +1637,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return new ErrorNode();
     }
+    visitSQVirtual(pcx) {
+        const theVirtual = this.visitVirtualSource(pcx.virtualSource());
+        const sqVirtual = new ast.SQSource(theVirtual);
+        return this.astAt(sqVirtual, pcx);
+    }
     visitSQSQL(pcx) {
         const sqExpr = new ast.SQSource(this.visitSqlSource(pcx.sqlSource()));
         return this.astAt(sqExpr, pcx);