@malloydata/malloy 0.0.11-dev221202152346 → 0.0.11

package/dist/index.d.ts

@@ -4,6 +4,6 @@ export { HighlightType, MalloyTranslator, } from "./lang";
 export type { LogMessage, TranslateResponse } from "./lang";
 export { Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, Result, parseTableURI, QueryMaterializer, CSVWriter, JSONWriter, DataWriter, } from "./malloy";
 export type { Explore, Model, PreparedQuery, PreparedResult, Field, AtomicField, ExploreField, QueryField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, ModelMaterializer, DocumentSymbol, DocumentHighlight, ResultJSON, RunSQLOptions, PreparedResultMaterializer, SQLBlockMaterializer, ExploreMaterializer, WriteStream, } from "./malloy";
-export type { URLReader, InfoConnection, LookupConnection, Connection, QueryString, ModelString, QueryURL, ModelURL, PooledConnection, TestableConnection, PersistSQLResults, FetchSchemaAndRunSimultaneously, StreamingConnection, FetchSchemaAndRunStreamSimultaneously, } from "./runtime_types";
+export type { URLReader, InfoConnection, LookupConnection, Connection, QueryString, ModelString, QueryURL, ModelURL, PooledConnection, TestableConnection, PersistSQLResults, StreamingConnection, } from "./runtime_types";
 export type { Loggable } from "./malloy";
 export { toAsyncGenerator } from "./connection_utils";

package/dist/lang/ast/ast-main.d.ts

@@ -1,8 +1,7 @@
 import * as model from "../../model/malloy_types";
 import { FieldSpace, QuerySpace, LookupResult } from "../field-space";
-import { MalloyTranslation } from "../parse-malloy";
+import { MalloyTranslation, ModelDataRequest } from "../parse-malloy";
 import { ConstantSubExpression, ExpressionDef, FieldDeclaration } from "./index";
-import { SQLBlockRequest } from "../../model/sql_block";
 export declare class ErrorFactory {
     static get structDef(): model.StructDef;
     static isErrorStructDef(s: model.StructDef): boolean;
@@ -55,7 +54,7 @@ export declare abstract class MalloyElement {
 }
 export declare class ListOf<ET extends MalloyElement> extends MalloyElement {
     elementType: string;
-    private elements;
+    protected elements: ET[];
     constructor(listDesc: string, elements: ET[]);
     private newContents;
     get list(): ET[];
@@ -80,7 +79,11 @@ export declare abstract class Mallobj extends MalloyElement {
     withParameters(pList: HasParameter[] | undefined): model.StructDef;
 }
 export interface DocStatement extends MalloyElement {
-    execute(doc: Document): void;
+    execute(doc: Document): ModelDataRequest;
+}
+export declare class RunList extends ListOf<DocStatement> {
+    execCursor: number;
+    executeList(doc: Document): ModelDataRequest;
 }
 export declare function isDocStatement(e: MalloyElement): e is DocStatement;
 export declare class DefineExplore extends MalloyElement implements DocStatement {
@@ -90,11 +93,11 @@ export declare class DefineExplore extends MalloyElement implements DocStatement
     elementType: string;
     readonly parameters?: HasParameter[];
     constructor(name: string, mallobj: Mallobj, exported: boolean, params?: MalloyElement[]);
-    execute(doc: Document): void;
+    execute(doc: Document): ModelDataRequest;
 }
-export declare class DefineSourceList extends ListOf<DefineExplore> implements DocStatement {
+export declare class DefineSourceList extends RunList implements DocStatement {
     constructor(sourceList: DefineExplore[]);
-    execute(doc: Document): void;
+    execute(doc: Document): ModelDataRequest;
 }
 /**
  * A Mallobj made from a source and a set of refinements
@@ -263,22 +266,44 @@ export declare class QOPDesc extends ListOf<QueryProperty> {
     getOp(inputFS: FieldSpace, forPipeline: PipelineDesc | null): OpDesc;
 }
 export interface ModelEntry {
-    entry: model.NamedModelObject | model.SQLBlock;
+    entry: model.NamedModelObject;
     exported?: boolean;
+    sqlType?: boolean;
 }
 export interface NameSpace {
     getEntry(name: string): ModelEntry | undefined;
     setEntry(name: string, value: ModelEntry, exported: boolean): void;
 }
+interface DocumentCompileResult {
+    modelDef: model.ModelDef;
+    queryList: model.Query[];
+    sqlBlocks: model.SQLBlockStructDef[];
+    needs: ModelDataRequest;
+}
+/**
+ * The Document class is a little weird because we might need to bounce back
+ * to the requestor, which might be on the other side of a wire, to get
+ * back some schema information. The intended translation of a Document
+ * is to call initModelDef(), and then to call modelDataRequest() until it
+ * returns undefined. At any time you can call modelDef to get the model
+ * as it exists so far, but the translation is not complete until
+ * modelDataRequest() returns undefined;
+ *
+ * TODO probably modelRequest should be the method and you call it
+ * until it returns a model with no additional data needed ...
+ * that can be tomorrow
+ */
 export declare class Document extends MalloyElement implements NameSpace {
-    readonly statements: DocStatement[];
     elementType: string;
     documentModel: Record<string, ModelEntry>;
     queryList: model.Query[];
-    sqlBlocks: model.SQLBlock[];
+    sqlBlocks: model.SQLBlockStructDef[];
+    statements: RunList;
     constructor(statements: DocStatement[]);
-    getModelDef(extendingModelDef: model.ModelDef | undefined): model.ModelDef;
-    defineSQL(sql: model.SQLBlock, name?: string): boolean;
+    initModelDef(extendingModelDef: model.ModelDef | undefined): void;
+    compile(): DocumentCompileResult;
+    modelDef(): model.ModelDef;
+    defineSQL(sql: model.SQLBlockStructDef, name?: string): boolean;
     getEntry(str: string): ModelEntry;
     setEntry(str: string, ent: ModelEntry): void;
 }
@@ -399,22 +424,22 @@ export declare class Nests extends ListOf<NestedQuery> {
 }
 export declare type QueryElement = FullQuery | ExistingQuery;
 export declare function isQueryElement(e: MalloyElement): e is QueryElement;
-export declare class DefineQueryList extends ListOf<DefineQuery> implements DocStatement {
+export declare class DefineQueryList extends RunList implements DocStatement {
     constructor(queryList: DefineQuery[]);
-    execute(doc: Document): void;
+    execute(doc: Document): ModelDataRequest;
 }
 export declare class DefineQuery extends MalloyElement implements DocStatement {
     readonly name: string;
     readonly queryDetails: QueryElement;
     elementType: string;
     constructor(name: string, queryDetails: QueryElement);
-    execute(doc: Document): void;
+    execute(doc: Document): ModelDataRequest;
 }
 export declare class AnonymousQuery extends MalloyElement implements DocStatement {
     readonly theQuery: QueryElement;
     elementType: string;
     constructor(theQuery: QueryElement);
-    execute(doc: Document): void;
+    execute(doc: Document): ModelDataRequest;
 }
 declare type TopInit = FieldName | ExpressionDef;
 export declare class Top extends MalloyElement {
@@ -441,7 +466,7 @@ export declare class ImportStatement extends MalloyElement implements DocStateme
     elementType: string;
     fullURL?: string;
     constructor(url: string, baseURL: string);
-    execute(doc: Document): void;
+    execute(doc: Document): ModelDataRequest;
 }
 interface HasInit {
     name: string;
@@ -463,13 +488,28 @@ export declare class ConstantParameter extends HasParameter {
     constructor(name: string, value: ConstantSubExpression);
     parameter(): model.Parameter;
 }
+declare type SQLStringSegment = string | QueryElement;
+export declare class SQLString extends MalloyElement {
+    elementType: string;
+    elements: SQLStringSegment[];
+    containsQueries: boolean;
+    push(el: string | MalloyElement): void;
+    sqlPhrases(): model.SQLPhrase[];
+}
 export declare class SQLStatement extends MalloyElement implements DocStatement {
-    readonly blockReq: SQLBlockRequest;
+    readonly select: SQLString;
     elementType: string;
     is?: string;
-    constructor(blockReq: SQLBlockRequest);
-    sqlBlock(): model.SQLBlock;
-    execute(doc: Document): void;
+    connection?: string;
+    requestBlock?: model.SQLBlockSource;
+    constructor(select: SQLString);
+    sqlBlock(): model.SQLBlockSource;
+    /**
+     * This is the one statement which pauses execution. First time through
+     * it will generate a schema request, next time through it will either
+     * record the error or record the schema.
+     */
+    execute(doc: Document): ModelDataRequest;
 }
 export declare class SampleProperty extends MalloyElement {
     readonly sample: model.Sampling;

package/dist/lang/ast/ast-main.js

@@ -23,8 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FullQuery = exports.TurtleHeadedPipe = exports.ExistingQuery = exports.Index = exports.Turtles = exports.Limit = exports.Ordering = exports.OrderBy = exports.WildcardFieldReference = exports.RenameField = exports.PrimaryKey = exports.Document = exports.QOPDesc = exports.Aggregate = exports.GroupBy = exports.FieldListEdit = exports.ProjectStatement = exports.isFieldCollectionMember = exports.FieldReferences = exports.FieldReference = exports.FieldName = exports.Renames = exports.Dimensions = exports.Measures = exports.DeclareFields = exports.Filter = exports.FilterElement = exports.ExploreDesc = exports.isExploreProperty = exports.isQueryProperty = exports.Joins = exports.ExpressionJoin = exports.KeyJoin = exports.Join = exports.QuerySource = exports.SQLSource = exports.NamedSource = exports.ModelEntryReference = exports.IsValueBlock = exports.TableSource = exports.RefinedExplore = exports.DefineSourceList = exports.DefineExplore = exports.isDocStatement = exports.Mallobj = exports.isExploreField = exports.Unimplemented = exports.ListOf = exports.MalloyElement = exports.ErrorFactory = void 0;
-exports.SampleProperty = exports.SQLStatement = exports.ConstantParameter = exports.HasParameter = exports.ImportStatement = exports.JSONStructDef = exports.JSONElement = exports.Top = exports.AnonymousQuery = exports.DefineQuery = exports.DefineQueryList = exports.isQueryElement = exports.Nests = exports.isNestedQuery = exports.NestDefinition = exports.NestRefinement = exports.NestReference = exports.TurtleDecl = void 0;
+exports.TurtleHeadedPipe = exports.ExistingQuery = exports.Index = exports.Turtles = exports.Limit = exports.Ordering = exports.OrderBy = exports.WildcardFieldReference = exports.RenameField = exports.PrimaryKey = exports.Document = exports.QOPDesc = exports.Aggregate = exports.GroupBy = exports.FieldListEdit = exports.ProjectStatement = exports.isFieldCollectionMember = exports.FieldReferences = exports.FieldReference = exports.FieldName = exports.Renames = exports.Dimensions = exports.Measures = exports.DeclareFields = exports.Filter = exports.FilterElement = exports.ExploreDesc = exports.isExploreProperty = exports.isQueryProperty = exports.Joins = exports.ExpressionJoin = exports.KeyJoin = exports.Join = exports.QuerySource = exports.SQLSource = exports.NamedSource = exports.ModelEntryReference = exports.IsValueBlock = exports.TableSource = exports.RefinedExplore = exports.DefineSourceList = exports.DefineExplore = exports.isDocStatement = exports.RunList = exports.Mallobj = exports.isExploreField = exports.Unimplemented = exports.ListOf = exports.MalloyElement = exports.ErrorFactory = void 0;
+exports.SampleProperty = exports.SQLStatement = exports.SQLString = exports.ConstantParameter = exports.HasParameter = exports.ImportStatement = exports.JSONStructDef = exports.JSONElement = exports.Top = exports.AnonymousQuery = exports.DefineQuery = exports.DefineQueryList = exports.isQueryElement = exports.Nests = exports.isNestedQuery = exports.NestDefinition = exports.NestRefinement = exports.NestReference = exports.TurtleDecl = exports.FullQuery = void 0;
 /*
  * Copyright 2021 Google LLC
  *
@@ -174,20 +174,22 @@ class MalloyElement {
                 });
             }
             else if ((result === null || result === void 0 ? void 0 : result.entry.type) === "struct") {
-                this.addReference({
-                    type: "exploreReference",
-                    text: key,
-                    definition: result.entry,
-                    location: reference.location,
-                });
-            }
-            else if ((result === null || result === void 0 ? void 0 : result.entry.type) === "sqlBlock") {
-                this.addReference({
-                    type: "sqlBlockReference",
-                    text: key,
-                    definition: result.entry,
-                    location: reference.location,
-                });
+                if (model.isSQLBlock(result.entry)) {
+                    this.addReference({
+                        type: "sqlBlockReference",
+                        text: key,
+                        definition: result.entry,
+                        location: reference.location,
+                    });
+                }
+                else {
+                    this.addReference({
+                        type: "exploreReference",
+                        text: key,
+                        definition: result.entry,
+                        location: reference.location,
+                    });
+                }
             }
         }
         return result;
@@ -398,6 +400,30 @@ class QueryHeadStruct extends Mallobj {
         return ns.structDef();
     }
 }
+class RunList extends ListOf {
+    constructor() {
+        super(...arguments);
+        this.execCursor = 0;
+    }
+    executeList(doc) {
+        while (this.execCursor < this.elements.length) {
+            if (doc.errorsExist()) {
+                // This stops cascading errors
+                return;
+            }
+            const el = this.elements[this.execCursor];
+            if (isDocStatement(el)) {
+                const resp = el.execute(doc);
+                if (resp) {
+                    return resp;
+                }
+                this.execCursor += 1;
+            }
+        }
+        return undefined;
+    }
+}
+exports.RunList = RunList;
 function isDocStatement(e) {
     return e.execute !== undefined;
 }
@@ -443,15 +469,12 @@ class DefineExplore extends MalloyElement {
     }
 }
 exports.DefineExplore = DefineExplore;
-class DefineSourceList extends ListOf {
+class DefineSourceList extends RunList {
     constructor(sourceList) {
         super("defineSources", sourceList);
-        this.has({ sourceList });
     }
     execute(doc) {
-        for (const dq of this.list) {
-            dq.execute(doc);
-        }
+        return this.executeList(doc);
     }
 }
 exports.DefineSourceList = DefineSourceList;
@@ -563,9 +586,7 @@ class TableSource extends Mallobj {
                 };
             }
             if (tableDefEntry.status == "error") {
-                msg = tableDefEntry.message.includes(this.name)
-                    ? `'Schema error: ${tableDefEntry.message}`
-                    : `Schema error '${this.name}': ${tableDefEntry.message}`;
+                msg = tableDefEntry.message;
             }
         }
         this.log(msg);
@@ -625,22 +646,22 @@ class NamedSource extends Mallobj {
         return this.refName;
     }
     modelStruct() {
-        var _a;
-        const modelEnt = (_a = this.modelEntry(this.ref)) === null || _a === void 0 ? void 0 : _a.entry;
-        if (!modelEnt) {
+        const modelEnt = this.modelEntry(this.ref);
+        const entry = modelEnt === null || modelEnt === void 0 ? void 0 : modelEnt.entry;
+        if (!entry) {
             const undefMsg = `Undefined source '${this.refName}'`;
             (this.ref instanceof ModelEntryReference ? this.ref : this).log(undefMsg);
             return;
         }
-        if (modelEnt.type === "query") {
-            this.log(`Must use 'from()' to explore query '${this.refName}`);
+        if (entry.type === "query") {
+            this.log(`Must use 'from()' for query source '${this.refName}`);
             return;
         }
-        else if (modelEnt.type === "sqlBlock") {
-            this.log(`Must use 'from_sql()' to explore sql query '${this.refName}`);
+        else if (modelEnt.sqlType) {
+            this.log(`Must use 'from_sql()' for sql source '${this.refName}`);
             return;
         }
-        return { ...modelEnt };
+        return { ...entry };
     }
     structDef() {
         /*
@@ -712,51 +733,21 @@ class SQLSource extends NamedSource {
         return this.structDef();
     }
     modelStruct() {
-        var _a, _b;
-        const modelEnt = (_a = this.modelEntry(this.ref)) === null || _a === void 0 ? void 0 : _a.entry;
-        if (!modelEnt) {
+        const modelEnt = this.modelEntry(this.ref);
+        const entry = modelEnt === null || modelEnt === void 0 ? void 0 : modelEnt.entry;
+        if (!entry) {
             this.log(`Undefined from_sql source '${this.refName}'`);
             return;
         }
-        if (modelEnt.type === "query") {
+        if (entry.type === "query") {
             this.log(`Cannot use 'from_sql()' to explore query '${this.refName}'`);
             return;
         }
-        else if (modelEnt.type === "struct") {
+        else if (!modelEnt.sqlType) {
             this.log(`Cannot use 'from_sql()' to explore '${this.refName}'`);
             return;
         }
-        const sqlDefEntry = (_b = this.translator()) === null || _b === void 0 ? void 0 : _b.root.sqlQueryZone;
-        if (!sqlDefEntry) {
-            this.log(`Cant't look up schema for sql block '${this.refName}'`);
-            return;
-        }
-        if (modelEnt.type == "sqlBlock") {
-            const key = modelEnt.name;
-            const lookup = sqlDefEntry.getEntry(key);
-            let msg = `Schema read failure for sql query '${this.refName}'`;
-            if (lookup) {
-                if (lookup.status == "present") {
-                    const structDef = lookup.value;
-                    return {
-                        ...structDef,
-                        fields: structDef.fields.map((field) => ({
-                            ...field,
-                            location: modelEnt.location,
-                        })),
-                    };
-                }
-                if (lookup.status == "error") {
-                    msg = lookup.message.includes(this.refName)
-                        ? `'Schema error: ${lookup.message}`
-                        : `Schema error '${this.refName}': ${lookup.message}`;
-                }
-                this.log(msg);
-            }
-        }
-        else {
-            this.log(`Mis-typed definition for'${this.refName}'`);
-        }
+        return entry;
     }
 }
 exports.SQLSource = SQLSource;
@@ -1397,16 +1388,30 @@ class QOPDesc extends ListOf {
     }
 }
 exports.QOPDesc = QOPDesc;
+/**
+ * The Document class is a little weird because we might need to bounce back
+ * to the requestor, which might be on the other side of a wire, to get
+ * back some schema information. The intended translation of a Document
+ * is to call initModelDef(), and then to call modelDataRequest() until it
+ * returns undefined. At any time you can call modelDef to get the model
+ * as it exists so far, but the translation is not complete until
+ * modelDataRequest() returns undefined;
+ *
+ * TODO probably modelRequest should be the method and you call it
+ * until it returns a model with no additional data needed ...
+ * that can be tomorrow
+ */
 class Document extends MalloyElement {
     constructor(statements) {
-        super({ statements });
-        this.statements = statements;
+        super();
         this.elementType = "document";
         this.documentModel = {};
         this.queryList = [];
         this.sqlBlocks = [];
+        this.statements = new RunList("topLevelStatements", statements);
+        this.has({ statements });
     }
-    getModelDef(extendingModelDef) {
+    initModelDef(extendingModelDef) {
         this.documentModel = {};
         this.queryList = [];
         this.sqlBlocks = [];
@@ -1419,14 +1424,18 @@ class Document extends MalloyElement {
                 }
             }
         }
-        for (const stmt of this.statements) {
-            if (this.errorsExist()) {
-                // Once errors appear, don't continue executing statements, stops
-                // a number of cascasding errors.
-                break;
-            }
-            stmt.execute(this);
-        }
+    }
+    compile() {
+        const needs = this.statements.executeList(this);
+        const ret = {
+            modelDef: this.modelDef(),
+            queryList: this.queryList,
+            sqlBlocks: this.sqlBlocks,
+            needs,
+        };
+        return ret;
+    }
+    modelDef() {
         const def = { name: "", exports: [], contents: {} };
         for (const entry in this.documentModel) {
             const entryDef = this.documentModel[entry].entry;
@@ -1446,7 +1455,7 @@ class Document extends MalloyElement {
                 return false;
             }
             ret.as = name;
-            this.setEntry(name, { entry: ret });
+            this.setEntry(name, { entry: ret, sqlType: true });
         }
         this.sqlBlocks.push(ret);
         return true;
@@ -1844,15 +1853,12 @@ function isQueryElement(e) {
     return e instanceof FullQuery || e instanceof ExistingQuery;
 }
 exports.isQueryElement = isQueryElement;
-class DefineQueryList extends ListOf {
+class DefineQueryList extends RunList {
     constructor(queryList) {
         super("defineQueries", queryList);
-        this.has({ queryList });
     }
     execute(doc) {
-        for (const dq of this.list) {
-            dq.execute(doc);
-        }
+        return this.executeList(doc);
     }
 }
 exports.DefineQueryList = DefineQueryList;
@@ -1872,6 +1878,7 @@ class DefineQuery extends MalloyElement {
         };
         const exported = false;
         doc.setEntry(this.name, { entry, exported });
+        return undefined;
     }
 }
 exports.DefineQuery = DefineQuery;
@@ -1885,6 +1892,7 @@ class AnonymousQuery extends MalloyElement {
     execute(doc) {
         const modelQuery = this.theQuery.query();
         doc.queryList.push(modelQuery);
+        return undefined;
     }
 }
 exports.AnonymousQuery = AnonymousQuery;
@@ -1981,6 +1989,10 @@ class ImportStatement extends MalloyElement {
         else if (this.fullURL) {
             const src = trans.root.importZone.getEntry(this.fullURL);
             if (src.status === "present") {
+                const childNeeds = trans.childRequest(this.fullURL);
+                if (childNeeds) {
+                    return childNeeds;
+                }
                 const importStructs = trans.getChildExports(this.fullURL);
                 for (const importing in importStructs) {
                     doc.setEntry(importing, {
@@ -1996,6 +2008,7 @@ class ImportStatement extends MalloyElement {
                 this.log(`import failed with status: '${src.status}'`);
             }
         }
+        return undefined;
     }
 }
 exports.ImportStatement = ImportStatement;
@@ -2061,21 +2074,86 @@ class ConstantParameter extends HasParameter {
     }
 }
 exports.ConstantParameter = ConstantParameter;
+class SQLString extends MalloyElement {
+    constructor() {
+        super(...arguments);
+        this.elementType = "sqlString";
+        this.elements = [];
+        this.containsQueries = false;
+    }
+    push(el) {
+        if (typeof el == "string") {
+            if (el.length > 0) {
+                this.elements.push(el);
+            }
+        }
+        else if (isQueryElement(el)) {
+            this.elements.push(el);
+            this.containsQueries = true;
+            el.parent = this;
+        }
+        else {
+            el.log("This element is not legal inside an SQL string");
+        }
+    }
+    sqlPhrases() {
+        return this.elements.map((el) => {
+            if (typeof el == "string") {
+                return { sql: el };
+            }
+            return el.query();
+        });
+    }
+}
+exports.SQLString = SQLString;
 class SQLStatement extends MalloyElement {
-    constructor(blockReq) {
+    constructor(select) {
         super();
-        this.blockReq = blockReq;
+        this.select = select;
         this.elementType = "sqlStatement";
+        this.has({ select });
     }
     sqlBlock() {
-        const sqlBlock = (0, sql_block_1.makeSQLBlock)(this.blockReq);
-        sqlBlock.location = this.location;
-        return sqlBlock;
+        if (!this.requestBlock) {
+            this.requestBlock = (0, sql_block_1.makeSQLBlock)(this.select.sqlPhrases(), this.connection);
+        }
+        return this.requestBlock;
     }
+    /**
+     * This is the one statement which pauses execution. First time through
+     * it will generate a schema request, next time through it will either
+     * record the error or record the schema.
+     */
     execute(doc) {
-        if (!doc.defineSQL(this.sqlBlock(), this.is)) {
-            this.log(`${this.is} already defined`);
+        var _a;
+        const sqlDefEntry = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.root.sqlQueryZone;
+        if (!sqlDefEntry) {
+            this.log("Cant't look up schema for sql block");
+            return;
         }
+        const sql = this.sqlBlock();
+        sqlDefEntry.reference(sql.name, this.location);
+        const lookup = sqlDefEntry.getEntry(sql.name);
+        if (lookup.status == "error") {
+            this.select.log(`'Schema error: ${lookup.message}`);
+            return undefined;
+        }
+        if (lookup.status == "present") {
+            const location = this.select.location;
+            const locStruct = {
+                ...lookup.value,
+                fields: lookup.value.fields.map((f) => ({ ...f, location })),
+                location: this.location,
+            };
+            if (this.is && !doc.defineSQL(locStruct, this.is)) {
+                this.log(`'${this.is}' already defined`);
+            }
+            return undefined;
+        }
+        return {
+            compileSQL: sql,
+            partialModel: this.select.containsQueries ? doc.modelDef() : undefined,
+        };
     }
 }
 exports.SQLStatement = SQLStatement;

package/dist/lang/index.d.ts

@@ -1,5 +1,5 @@
 export { MalloyTranslator } from "./parse-malloy";
-export type { TranslateResponse, UpdateData, SchemaData, URLData, SQLStructData, } from "./parse-malloy";
+export type { TranslateResponse, UpdateData, SchemaData, URLData, SQLBlockData, } from "./parse-malloy";
 export { exploreQueryWalkerBuilder } from "./parse-tree-walkers/explore-query-walker";
 export type { ExploreClauseRef } from "./parse-tree-walkers/explore-query-walker";
 export { HighlightType } from "./parse-tree-walkers/document-highlight-walker";