@malloydata/malloy 0.0.195-dev241003204819 → 0.0.195-dev241007154000

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

@@ -1,4 +1,6 @@
 import { ParseTreeListener } from "antlr4ts/tree/ParseTreeListener";
+import { RecordRefContext } from "./MalloyParser";
+import { RecordExprContext } from "./MalloyParser";
 import { VSegContext } from "./MalloyParser";
 import { VArrowContext } from "./MalloyParser";
 import { Use_top_level_query_defsContext } from "./MalloyParser";
@@ -21,8 +23,8 @@ import { TableFunctionContext } from "./MalloyParser";
 import { TableMethodContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
-import { ExprFieldPropsContext } from "./MalloyParser";
 import { ExprLiteralContext } from "./MalloyParser";
+import { ExprFieldPropsContext } from "./MalloyParser";
 import { ExprDurationContext } from "./MalloyParser";
 import { ExprTimeTruncContext } from "./MalloyParser";
 import { ExprCastContext } from "./MalloyParser";
@@ -195,6 +197,8 @@ import { FieldExprContext } from "./MalloyParser";
 import { PartialAllowedFieldExprContext } from "./MalloyParser";
 import { PickStatementContext } from "./MalloyParser";
 import { PickContext } from "./MalloyParser";
+import { RecordKeyContext } from "./MalloyParser";
+import { RecordElementContext } from "./MalloyParser";
 import { ArgumentListContext } from "./MalloyParser";
 import { FieldNameListContext } from "./MalloyParser";
 import { FieldCollectionContext } from "./MalloyParser";
@@ -216,6 +220,30 @@ import { ExperimentalStatementForTestingContext } from "./MalloyParser";
  * `MalloyParser`.
  */
 export interface MalloyParserListener extends ParseTreeListener {
+    /**
+     * Enter a parse tree produced by the `recordRef`
+     * labeled alternative in `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     */
+    enterRecordRef?: (ctx: RecordRefContext) => void;
+    /**
+     * Exit a parse tree produced by the `recordRef`
+     * labeled alternative in `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     */
+    exitRecordRef?: (ctx: RecordRefContext) => void;
+    /**
+     * Enter a parse tree produced by the `recordExpr`
+     * labeled alternative in `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     */
+    enterRecordExpr?: (ctx: RecordExprContext) => void;
+    /**
+     * Exit a parse tree produced by the `recordExpr`
+     * labeled alternative in `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     */
+    exitRecordExpr?: (ctx: RecordExprContext) => void;
     /**
      * Enter a parse tree produced by the `VSeg`
      * labeled alternative in `MalloyParser.vExpr`.
@@ -481,29 +509,29 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitExprFieldPath?: (ctx: ExprFieldPathContext) => void;
     /**
-     * Enter a parse tree produced by the `exprFieldProps`
+     * Enter a parse tree produced by the `exprLiteral`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    enterExprFieldProps?: (ctx: ExprFieldPropsContext) => void;
+    enterExprLiteral?: (ctx: ExprLiteralContext) => void;
     /**
-     * Exit a parse tree produced by the `exprFieldProps`
+     * Exit a parse tree produced by the `exprLiteral`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    exitExprFieldProps?: (ctx: ExprFieldPropsContext) => void;
+    exitExprLiteral?: (ctx: ExprLiteralContext) => void;
     /**
-     * Enter a parse tree produced by the `exprLiteral`
+     * Enter a parse tree produced by the `exprFieldProps`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    enterExprLiteral?: (ctx: ExprLiteralContext) => void;
+    enterExprFieldProps?: (ctx: ExprFieldPropsContext) => void;
     /**
-     * Exit a parse tree produced by the `exprLiteral`
+     * Exit a parse tree produced by the `exprFieldProps`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    exitExprLiteral?: (ctx: ExprLiteralContext) => void;
+    exitExprFieldProps?: (ctx: ExprFieldPropsContext) => void;
     /**
      * Enter a parse tree produced by the `exprDuration`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -2332,6 +2360,26 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitPick?: (ctx: PickContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.recordKey`.
+     * @param ctx the parse tree
+     */
+    enterRecordKey?: (ctx: RecordKeyContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.recordKey`.
+     * @param ctx the parse tree
+     */
+    exitRecordKey?: (ctx: RecordKeyContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     */
+    enterRecordElement?: (ctx: RecordElementContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     */
+    exitRecordElement?: (ctx: RecordElementContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.argumentList`.
      * @param ctx the parse tree

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

@@ -1,4 +1,6 @@
 import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
+import { RecordRefContext } from "./MalloyParser";
+import { RecordExprContext } from "./MalloyParser";
 import { VSegContext } from "./MalloyParser";
 import { VArrowContext } from "./MalloyParser";
 import { Use_top_level_query_defsContext } from "./MalloyParser";
@@ -21,8 +23,8 @@ import { TableFunctionContext } from "./MalloyParser";
 import { TableMethodContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
-import { ExprFieldPropsContext } from "./MalloyParser";
 import { ExprLiteralContext } from "./MalloyParser";
+import { ExprFieldPropsContext } from "./MalloyParser";
 import { ExprDurationContext } from "./MalloyParser";
 import { ExprTimeTruncContext } from "./MalloyParser";
 import { ExprCastContext } from "./MalloyParser";
@@ -195,6 +197,8 @@ import { FieldExprContext } from "./MalloyParser";
 import { PartialAllowedFieldExprContext } from "./MalloyParser";
 import { PickStatementContext } from "./MalloyParser";
 import { PickContext } from "./MalloyParser";
+import { RecordKeyContext } from "./MalloyParser";
+import { RecordElementContext } from "./MalloyParser";
 import { ArgumentListContext } from "./MalloyParser";
 import { FieldNameListContext } from "./MalloyParser";
 import { FieldCollectionContext } from "./MalloyParser";
@@ -219,6 +223,20 @@ import { ExperimentalStatementForTestingContext } from "./MalloyParser";
  * operations with no return type.
  */
 export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
+    /**
+     * Visit a parse tree produced by the `recordRef`
+     * labeled alternative in `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRecordRef?: (ctx: RecordRefContext) => Result;
+    /**
+     * Visit a parse tree produced by the `recordExpr`
+     * labeled alternative in `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRecordExpr?: (ctx: RecordExprContext) => Result;
     /**
      * Visit a parse tree produced by the `VSeg`
      * labeled alternative in `MalloyParser.vExpr`.
@@ -374,19 +392,19 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitExprFieldPath?: (ctx: ExprFieldPathContext) => Result;
     /**
-     * Visit a parse tree produced by the `exprFieldProps`
+     * Visit a parse tree produced by the `exprLiteral`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExprFieldProps?: (ctx: ExprFieldPropsContext) => Result;
+    visitExprLiteral?: (ctx: ExprLiteralContext) => Result;
     /**
-     * Visit a parse tree produced by the `exprLiteral`
+     * Visit a parse tree produced by the `exprFieldProps`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExprLiteral?: (ctx: ExprLiteralContext) => Result;
+    visitExprFieldProps?: (ctx: ExprFieldPropsContext) => Result;
     /**
      * Visit a parse tree produced by the `exprDuration`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -1473,6 +1491,18 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitPick?: (ctx: PickContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.recordKey`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRecordKey?: (ctx: RecordKeyContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.recordElement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRecordElement?: (ctx: RecordElementContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.argumentList`.
      * @param ctx the parse tree

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

@@ -88,10 +88,10 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitTableFunction(pcx: parse.TableFunctionContext): ast.TableSource;
     visitTableMethod(pcx: parse.TableMethodContext): ast.TableSource;
     visitSqlSource(pcx: parse.SqlSourceContext): ast.SQLSource;
-    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[];
+    visitDefJoinMany(pcx: parse.DefJoinManyContext): ast.JoinStatement;
+    visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.JoinStatement;
+    visitDefJoinCross(pcx: parse.DefJoinCrossContext): ast.JoinStatement;
+    protected getJoinList(pcx: parse.JoinListContext): ast.Join[];
     protected getJoinFrom(cx: parse.JoinFromContext): {
         joinAs: ast.ModelEntryReference;
         joinFrom: ast.SourceQueryElement;

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

@@ -360,7 +360,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 }
             }
         }
-        const joinMany = new ast.Joins(joins);
+        const joinMany = new ast.JoinStatement(joins);
         joinMany.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return joinMany;
     }
@@ -375,7 +375,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 }
             }
         }
-        const joinOne = new ast.Joins(joins);
+        const joinOne = new ast.JoinStatement(joins);
         joinOne.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return joinOne;
     }
@@ -393,12 +393,12 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 }
             }
         }
-        const joinCross = new ast.Joins(joins);
+        const joinCross = new ast.JoinStatement(joins);
         joinCross.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return joinCross;
     }
     getJoinList(pcx) {
-        return pcx.joinDef().map(jcx => this.visit(jcx));
+        return this.only(pcx.joinDef().map(scx => this.visit(scx)), x => x instanceof ast.Join && x, 'join');
     }
     getJoinFrom(cx) {
         const ecx = cx.isExplore();
@@ -1312,6 +1312,34 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         this.inExperiment('compilerTestExperimentParse', pcx);
         return this.astAt(new ast.ExperimentalExperiment('compilerTestExperimentTranslate'), pcx);
     }
+    // visitRecordRef(pcx: parse.RecordRefContext) {
+    //   const pathCx = pcx.fieldPath();
+    //   const tailEl = pathCx.fieldName().at(-1);
+    //   if (tailEl) {
+    //     const elementKey = getId(tailEl);
+    //     const idRef = new ast.ExprIdReference(
+    //       this.getFieldPath(pathCx, ast.ExpressionFieldReference)
+    //     );
+    //     return new ast.RecordElement(elementKey, idRef);
+    //   }
+    //   throw this.internalError(
+    //     pathCx,
+    //     'IMPOSSIBLY A PATH CONTAINED ZERO ELEMENTS'
+    //   );
+    // }
+    // visitRecordExpr(pcx: parse.RecordExprContext) {
+    //   const elementKey = getId(pcx.recordKey());
+    //   const elementVal = this.getFieldExpr(pcx.fieldExpr());
+    //   return new ast.RecordElement(elementKey, elementVal);
+    // }
+    // visitExprLiteralRecord(pcx: parse.ExprLiteralRecordContext) {
+    //   const els = this.only<ast.RecordElement>(
+    //     pcx.recordElement().map(elCx => this.astAt(this.visit(elCx), elCx)),
+    //     visited => visited instanceof ast.RecordElement && visited,
+    //     'a key value pair'
+    //   );
+    //   return new ast.RecordLiteral(els);
+    // }
     visitExprWarnLike(pcx) {
         let op = '~';
         const left = pcx.fieldExpr(0);

package/dist/lang/parse-log.d.ts

@@ -104,9 +104,7 @@ type MessageParameterTypes = {
     'mismatched-coalesce-types': string;
     'function-not-found': string;
     'case-insensitive-function': string;
-    'struct-not-callable': string;
-    'connection-not-callable': string;
-    'query-not-callable': string;
+    'call-of-non-function': string;
     'no-matching-function-overload': string;
     'invalid-function-argument-expression-type': string;
     'invalid-function-argument-evaluation-space': string;
@@ -217,7 +215,7 @@ type MessageParameterTypes = {
     'invalid-source-from-query': string;
     'invalid-source-from-function': string;
     'invalid-source-from-connection': string;
-    'invalid-source-from-sql-block': string;
+    'invalid-source-source': string;
     'unnamed-source-argument': string;
     'duplicate-source-argument': string;
     'source-parameter-not-found': string;
@@ -243,13 +241,10 @@ type MessageParameterTypes = {
     'failed-to-compute-arrow-source': string;
     'failed-to-compute-source-from-query': string;
     'failed-to-compute-source-to-extend': string;
-    'cannot-use-function-as-query': string;
-    'cannot-use-struct-as-query': string;
-    'cannot-use-connection-as-query': string;
+    'cannot-use-as-query': string;
     'source-or-query-not-found': string;
     'illegal-query-argument': string;
-    'cannot-use-function-as-source': string;
-    'cannot-use-connection-as-source': string;
+    'cannot-use-struct-as-source': string;
     'illegal-refinement-of-source': string;
     'invalid-source-as-query': string;
     'invalid-sql-source-interpolation': string;
@@ -319,6 +314,7 @@ type MessageParameterTypes = {
     'sql-like': string;
     'sql-is-not-null': string;
     'sql-is-null': string;
+    'illegal-record-property-type': string;
 };
 export declare const MESSAGE_FORMATTERS: PartialErrorCodeMessageMap;
 export type MessageCode = keyof MessageParameterTypes;

package/dist/lang/parse-malloy.d.ts

@@ -1,6 +1,6 @@
 import { ANTLRErrorListener, ParserRuleContext, Token } from 'antlr4ts';
-import { DocumentLocation, DocumentPosition, DocumentRange, DocumentReference, ImportLocation, ModelDef, NamedModelObject, Query, SQLBlockStructDef, StructDef } from '../model/malloy_types';
-import { LogMessage, LogMessageOptions, MessageCode, MessageLogger, MessageParameterType } from './parse-log';
+import { DocumentLocation, DocumentPosition, DocumentRange, DocumentReference, ImportLocation, ModelDef, NamedModelObject, Query, SourceDef, SQLSourceDef } from '../model/malloy_types';
+import { BaseMessageLogger, LogMessage, LogMessageOptions, MessageCode, MessageLogger, MessageParameterType } from './parse-log';
 import { Zone, ZoneData } from './zone';
 import { ReferenceList } from './reference-list';
 import { ASTResponse, CompletionsResponse, DataRequestResponse, ProblemResponse, FatalResponse, FinalResponse, HelpContextResponse, MetadataResponse, ModelDataRequest, NeedURLData, TranslateResponse, ModelAnnotationResponse, TablePathResponse } from './translate-response';
@@ -111,7 +111,7 @@ export declare abstract class MalloyTranslation {
     childTranslators: Map<string, MalloyTranslation>;
     urlIsFullPath?: boolean;
     queryList: Query[];
-    sqlBlocks: SQLBlockStructDef[];
+    sqlBlocks: SQLSourceDef[];
     modelDef: ModelDef;
     imports: ImportLocation[];
     compilerFlags: Tag;
@@ -186,10 +186,10 @@ export declare class MalloyChildTranslator extends MalloyTranslation {
  */
 export declare class MalloyTranslator extends MalloyTranslation {
     private readonly eventStream;
-    schemaZone: Zone<StructDef>;
+    schemaZone: Zone<SourceDef>;
     importZone: Zone<string>;
-    sqlQueryZone: Zone<SQLBlockStructDef>;
-    logger: MessageLogger;
+    sqlQueryZone: Zone<SQLSourceDef>;
+    logger: BaseMessageLogger;
     readonly root: MalloyTranslator;
     constructor(rootURL: string, importURL?: string | null, preload?: ParseUpdate | null, eventStream?: EventStream | null);
     update(dd: ParseUpdate): void;
@@ -204,12 +204,12 @@ export interface URLData {
     urls: ZoneData<string>;
 }
 export interface SchemaData {
-    tables: ZoneData<StructDef>;
+    tables: ZoneData<SourceDef>;
 }
-export interface SQLBlockData {
-    compileSQL: ZoneData<SQLBlockStructDef>;
+export interface SQLSources {
+    compileSQL: ZoneData<SQLSourceDef>;
 }
-export interface UpdateData extends URLData, SchemaData, SQLBlockData {
+export interface UpdateData extends URLData, SchemaData, SQLSources {
     errors: Partial<ErrorData>;
 }
 export type ParseUpdate = Partial<UpdateData>;

package/dist/lang/parse-malloy.js

@@ -47,6 +47,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MalloyParserErrorHandler = exports.MalloyTranslator = exports.MalloyChildTranslator = exports.MalloyTranslation = void 0;
 const antlr4ts_1 = require("antlr4ts");
+const malloy_types_1 = require("../model/malloy_types");
 const MalloyLexer_1 = require("./lib/Malloy/MalloyLexer");
 const MalloyParser_1 = require("./lib/Malloy/MalloyParser");
 const ast = __importStar(require("./ast"));
@@ -679,7 +680,7 @@ class MalloyTranslation {
             if (did.translated) {
                 for (const fromChild of child.modelDef.exports) {
                     const modelEntry = child.modelDef.contents[fromChild];
-                    if (modelEntry.type === 'struct' || modelEntry.type === 'query') {
+                    if ((0, malloy_types_1.modelObjIsSource)(modelEntry) || modelEntry.type === 'query') {
                         exports[fromChild] = modelEntry;
                     }
                 }

package/dist/lang/test/annotation.spec.js

@@ -40,6 +40,12 @@ expect.extend({
             }
             return clean;
         }
+        if (result === undefined) {
+            return {
+                pass: false,
+                message: () => 'Annotation was undefined',
+            };
+        }
         const got = stripAt(result);
         if (!this.equals(got, shouldBe)) {
             return {
@@ -412,7 +418,7 @@ describe('query operation annotations', () => {
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation(defaultTags);
         }
     });
-    test('project ref inherits annotation', () => {
+    test('select: ref inherits annotation', () => {
         const m = new test_translator_1.TestTranslator(`
       run: a extend {
         # blockNote

package/dist/lang/test/field-symbols.spec.js

@@ -34,11 +34,11 @@ const space_param_1 = require("../ast/types/space-param");
 describe('structdef comprehension', () => {
     function mkStructDef(field) {
         return {
-            type: 'struct',
+            type: 'table',
             name: 'test',
             dialect: 'standardsql',
-            structSource: { type: 'table', tablePath: 'test' },
-            structRelationship: { type: 'basetable', connectionName: 'test' },
+            tablePath: 'test',
+            connection: 'test',
             fields: [field],
         };
     }
@@ -102,17 +102,14 @@ describe('structdef comprehension', () => {
         const oField = space.structDef().fields[0];
         expect(oField).toEqual(field);
     });
-    test('import nested field', () => {
+    test('import repeated record', () => {
         const field = {
             name: 't',
-            type: 'struct',
+            type: 'array',
             dialect: 'standardsql',
-            structRelationship: {
-                type: 'nested',
-                fieldName: 'a',
-                isArray: false,
-            },
-            structSource: { type: 'nested' },
+            elementTypeDef: { type: 'string' },
+            join: 'many',
+            matrixOperation: 'left',
             fields: [{ type: 'string', name: 'b' }],
         };
         const struct = mkStructDef(field);
@@ -124,10 +121,10 @@ describe('structdef comprehension', () => {
     test('import inline field', () => {
         const field = {
             name: 't',
-            type: 'struct',
+            type: 'record',
             dialect: 'standardsql',
-            structRelationship: { type: 'inline' },
-            structSource: { type: 'inline' },
+            join: 'one',
+            matrixOperation: 'left',
             fields: [{ type: 'string', name: 'a' }],
         };
         const struct = mkStructDef(field);
@@ -139,20 +136,19 @@ describe('structdef comprehension', () => {
     test('import join field', () => {
         const field = {
             name: 't',
-            type: 'struct',
+            type: 'table',
             dialect: 'standardsql',
-            structRelationship: {
-                type: 'one',
-                matrixOperation: 'left',
-                onExpression: {
-                    node: '=',
-                    kids: {
-                        left: { node: 'field', path: ['aKey'] },
-                        right: { node: 'field', path: ['t', 'a'] },
-                    },
+            connection: 'test',
+            join: 'one',
+            matrixOperation: 'left',
+            onExpression: {
+                node: '=',
+                kids: {
+                    left: { node: 'field', path: ['aKey'] },
+                    right: { node: 'field', path: ['t', 'a'] },
                 },
             },
-            structSource: { type: 'table', tablePath: 't' },
+            tablePath: 't',
             fields: [{ type: 'string', name: 'a' }],
         };
         const struct = mkStructDef(field);

package/dist/lang/test/imports.spec.js

@@ -25,6 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+const model_1 = require("../../model");
 require("./parse-expects");
 const test_translator_1 = require("./test-translator");
 const escapeRegExp_1 = __importDefault(require("lodash/escapeRegExp"));
@@ -88,13 +89,14 @@ source: botProjQSrc is botProjQ
         });
         expect(docParse).toTranslate();
         const newSrc = docParse.getSourceDef('newSrc');
-        const f = newSrc === null || newSrc === void 0 ? void 0 : newSrc.fields.find(f => f.name === 'b');
-        expect(f === null || f === void 0 ? void 0 : f.type).toBe('struct');
-        if ((f === null || f === void 0 ? void 0 : f.type) === 'struct') {
-            const ss = f.structSource;
-            expect(ss.type).toBe('query');
-            if (ss.type === 'query') {
-                expect(typeof ss.query.structRef).not.toBe('string');
+        const maybeField = newSrc === null || newSrc === void 0 ? void 0 : newSrc.fields.find(f => f.name === 'b');
+        expect(maybeField).toBeDefined();
+        const f = maybeField;
+        expect((0, model_1.isJoined)(f)).toBeTruthy();
+        if ((0, model_1.isJoined)(f)) {
+            expect(f.type).toBe('query_source');
+            if (f.type === 'query_source') {
+                expect(typeof f.query.structRef).not.toBe('string');
             }
         }
     });
@@ -176,9 +178,9 @@ source: botProjQSrc is botProjQ
         const ms = fullModel.getSourceDef('midSrc');
         expect(ms).toBeDefined();
         if (ms) {
-            expect(ms.structSource.type).toBe('query');
-            if (ms.structSource.type === 'query') {
-                const qs = ms.structSource.query.structRef;
+            expect(ms.type).toBe('query_source');
+            if (ms.type === 'query_source') {
+                const qs = ms.query.structRef;
                 expect(typeof qs).not.toBe('string');
             }
         }

package/dist/lang/test/lenses.spec.js

@@ -217,7 +217,7 @@ describe('lenses', () => {
           join_one: y is a on true
           view: m is { aggregate: c is count() }
         }
-        run: x -> m + y + { limit: 1 }`).toLog((0, test_translator_1.errorMessage)('named refinement `y` must be a view, found a struct'));
+        run: x -> m + y + { limit: 1 }`).toLog((0, test_translator_1.errorMessage)('named refinement `y` must be a view, found a table'));
     });
     test('cannot use view from join as whole pipeline', () => {
         expect((0, test_translator_1.markSource) `
@@ -286,7 +286,7 @@ describe('lenses', () => {
           view: d is { group_by: n }
         }
         run: x -> d + b
-      `).toLog((0, test_translator_1.errorMessage)('named refinement `b` must be a view, found a struct'));
+      `).toLog((0, test_translator_1.errorMessage)('named refinement `b` must be a view, found a table'));
     });
     test('cannot reference field in LHS of refinement in group_by', () => {
         expect((0, test_translator_1.markSource) `

package/dist/lang/test/model_serialization.spec.d.ts

@@ -1,5 +1,5 @@
-import { StructDef } from '../../model/malloy_types';
-export declare const CHILD_EXPLORE: StructDef;
-export declare const PARENT_EXPLORE: StructDef;
-export declare const GRADPARENT_EXPLORE: StructDef;
+import { StructDef, TableSourceDef } from '../../model/malloy_types';
+export declare const CHILD_EXPLORE: TableSourceDef;
+export declare const PARENT_EXPLORE: TableSourceDef;
+export declare const GRANDPARENT_EXPLORE: TableSourceDef;
 export declare const SOURCE_EXPLORE: StructDef;