@malloydata/malloy 0.0.195-dev241003204905 → 0.0.195-dev241007154000

package/dist/malloy.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.SQLBlockMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.UnsupportedField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentTablePath = exports.Parse = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
+exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.UnsupportedField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentTablePath = exports.Parse = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
 const lang_1 = require("./lang");
 const model_1 = require("./model");
 const luxon_1 = require("luxon");
@@ -84,12 +84,11 @@ class Malloy {
                     : Date.now();
         }
         const translator = parse._translator;
-        // eslint-disable-next-line no-constant-condition
-        while (true) {
+        for (;;) {
             const result = translator.translate(model === null || model === void 0 ? void 0 : model._modelDef);
             if (result.final) {
                 if (result.translated) {
-                    return new Model(result.translated.modelDef, result.translated.queryList, result.translated.sqlBlocks, result.problems || [], [...((_a = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _a !== void 0 ? _a : []), ...((_b = result.fromSources) !== null && _b !== void 0 ? _b : [])], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
+                    return new Model(result.translated.modelDef, result.translated.queryList, result.problems || [], [...((_a = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _a !== void 0 ? _a : []), ...((_b = result.fromSources) !== null && _b !== void 0 ? _b : [])], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
                 }
                 else if (noThrowOnError) {
                     const emptyModel = {
@@ -98,7 +97,7 @@ class Malloy {
                         contents: {},
                     };
                     const modelFromCompile = (model === null || model === void 0 ? void 0 : model._modelDef) || emptyModel;
-                    return new Model(modelFromCompile, [], [], result.problems || [], [...((_c = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _c !== void 0 ? _c : []), ...((_d = result.fromSources) !== null && _d !== void 0 ? _d : [])], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
+                    return new Model(modelFromCompile, [], result.problems || [], [...((_c = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _c !== void 0 ? _c : []), ...((_d = result.fromSources) !== null && _d !== void 0 ? _d : [])], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
                 }
                 else {
                     const errors = result.problems || [];
@@ -147,7 +146,7 @@ class Malloy {
                             // TODO detect if the union of `Object.keys(tables)` and `Object.keys(errors)` is not the same
                             //      as `Object.keys(tablePathByKey)`, i.e. that all tables are accounted for. Otherwise
                             //      the translator runs into an infinite loop fetching tables.
-                            const { schemas: tables, errors } = await connection.fetchSchemaForTables(tablePathByKey, {
+                            const { schemas: tables, errors } = await Malloy.safelyFetchTableSchema(connection, tablePathByKey, {
                                 refreshTimestamp,
                                 modelAnnotation,
                             });
@@ -171,12 +170,12 @@ class Malloy {
                     const connectionName = toCompile.connection;
                     try {
                         const conn = await connections.lookupConnection(connectionName);
-                        const expanded = Malloy.compileSQLBlock(result.partialModel, toCompile, {
+                        const expanded = Malloy.compileSQLBlock(conn.dialectName, result.partialModel, toCompile, {
                             replaceMaterializedReferences,
                             materializedTablePrefix,
                             eventStream,
                         });
-                        const resolved = await conn.fetchSchemaForSQLBlock(expanded, {
+                        const resolved = await conn.fetchSchemaForSQLStruct(expanded, {
                             refreshTimestamp,
                             modelAnnotation,
                         });
@@ -186,11 +185,9 @@ class Malloy {
                             });
                         }
                         if (resolved.structDef) {
-                            if ((0, model_1.isSQLBlockStruct)(resolved.structDef)) {
-                                translator.update({
-                                    compileSQL: { [expanded.name]: resolved.structDef },
-                                });
-                            }
+                            translator.update({
+                                compileSQL: { [expanded.name]: resolved.structDef },
+                            });
                         }
                     }
                     catch (error) {
@@ -202,12 +199,26 @@ class Malloy {
             }
         }
     }
-    static compileSQLBlock(partialModel, toCompile, options) {
+    /**
+     * A dialect must provide a response for every table, or the translator loop
+     * will never exit. Because there was a time when this happened, we throw
+     * instead of looping forever, but the fix is to correct the dialect.
+     */
+    static async safelyFetchTableSchema(connection, toFetch, opts) {
+        const ret = await connection.fetchSchemaForTables(toFetch, opts);
+        for (const req of Object.keys(toFetch)) {
+            if (ret.schemas[req] === undefined && ret.errors[req] === undefined) {
+                throw new Error(`Schema fetch error for ${connection.name}, no response for ${req} from ${connection.dialectName}`);
+            }
+        }
+        return ret;
+    }
+    static compileSQLBlock(dialect, partialModel, toCompile, options) {
         let queryModel = undefined;
         let selectStr = '';
         let parenAlready = false;
         for (const segment of toCompile.select) {
-            if ((0, model_1.isSQLFragment)(segment)) {
+            if ((0, model_1.isSegmentSQL)(segment)) {
                 selectStr += segment.sql;
                 parenAlready = segment.sql.match(/\(\s*$/) !== null;
             }
@@ -225,32 +236,35 @@ class Malloy {
             }
         }
         const { name, connection } = toCompile;
-        return { type: 'sqlBlock', name, connection, selectStr };
+        return {
+            type: 'sql_select',
+            name,
+            connection,
+            dialect,
+            selectStr,
+            fields: [],
+        };
     }
     static async run({ connections, preparedResult, sqlStruct, connection, options, }) {
-        const sqlBlock = sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.structSource.sqlBlock;
         if (!connection) {
             if (!connections) {
                 throw new Error('Internal Error: Connection or LookupConnection<Connection> must be provided.');
             }
-            const connectionName = (sqlBlock === null || sqlBlock === void 0 ? void 0 : sqlBlock.connection) || (preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.connectionName);
+            const connectionName = (sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.connection) || (preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.connectionName);
             connection = await connections.lookupConnection(connectionName);
         }
-        if (sqlStruct && sqlBlock) {
-            if (sqlStruct.structRelationship.type !== 'basetable') {
-                throw new Error("Expected schema's structRelationship type to be 'basetable'.");
-            }
-            const data = await connection.runSQL(sqlBlock.selectStr);
+        if (sqlStruct) {
+            const data = await connection.runSQL(sqlStruct.selectStr);
             return new Result({
                 structs: [sqlStruct],
-                sql: sqlBlock.selectStr,
+                sql: sqlStruct.selectStr,
                 result: data.rows,
                 totalRows: data.totalRows,
                 runStats: data.runStats,
-                lastStageName: sqlBlock.name,
+                lastStageName: sqlStruct.name,
                 // TODO feature-sql-block There is no malloy code...
                 malloy: '',
-                connectionName: sqlStruct.structRelationship.connectionName,
+                connectionName: sqlStruct.connection,
                 // TODO feature-sql-block There is no source explore...
                 sourceExplore: '',
                 sourceFilters: [],
@@ -276,11 +290,10 @@ class Malloy {
         }
     }
     static async *runStream({ connections, preparedResult, sqlStruct, connection, options, }) {
-        const sqlBlock = sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.structSource.sqlBlock;
-        if (sqlBlock === undefined && preparedResult === undefined) {
+        if (sqlStruct === undefined && preparedResult === undefined) {
             throw new Error('Internal error: sqlBlock or preparedResult must be provided.');
         }
-        const connectionName = (sqlBlock === null || sqlBlock === void 0 ? void 0 : sqlBlock.connection) || (preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.connectionName);
+        const connectionName = (sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.connection) || (preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.connectionName);
         if (connection === undefined) {
             if (connections === undefined) {
                 throw new Error('Internal Error: Connection or LookupConnection<Connection> must be provided.');
@@ -294,11 +307,8 @@ class Malloy {
         let sql;
         let resultExplore;
         if (sqlStruct) {
-            if (sqlStruct.structRelationship.type !== 'basetable') {
-                throw new Error("Expected schema's structRelationship type to be 'basetable'.");
-            }
             resultExplore = new Explore(sqlStruct);
-            sql = sqlStruct.structSource.sqlBlock.selectStr;
+            sql = sqlStruct.selectStr;
         }
         else if (preparedResult !== undefined) {
             resultExplore = preparedResult.resultExplore;
@@ -314,17 +324,16 @@ class Malloy {
         }
     }
     static async estimateQueryCost({ connections, preparedResult, sqlStruct, }) {
-        const sqlBlock = sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.structSource.sqlBlock;
         if (!connections) {
             throw new Error('Internal Error: Connection or LookupConnection<Connection> must be provided.');
         }
-        const connectionName = (sqlBlock === null || sqlBlock === void 0 ? void 0 : sqlBlock.connection) || (preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.connectionName);
+        const connectionName = (sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.connection) || (preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.connectionName);
         const connection = await connections.lookupConnection(connectionName);
-        if (sqlBlock) {
-            return await connection.estimateQueryCost(sqlBlock === null || sqlBlock === void 0 ? void 0 : sqlBlock.selectStr);
+        if (sqlStruct) {
+            return await connection.estimateQueryCost(sqlStruct.selectStr);
         }
         else if (preparedResult) {
-            return await connection.estimateQueryCost(preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.sql);
+            return await connection.estimateQueryCost(preparedResult.sql);
         }
         else {
             throw new Error('Internal error: sqlStruct or preparedResult must be provided.');
@@ -349,10 +358,9 @@ exports.MalloyError = MalloyError;
  * A compiled Malloy document.
  */
 class Model {
-    constructor(modelDef, queryList, sqlBlocks, problems, fromSources, referenceAt = () => undefined, importAt = () => undefined) {
+    constructor(modelDef, queryList, problems, fromSources, referenceAt = () => undefined, importAt = () => undefined) {
         this.modelDef = modelDef;
         this.queryList = queryList;
-        this.sqlBlocks = sqlBlocks;
         this.problems = problems;
         this.fromSources = fromSources;
         this._referenceAt = referenceAt;
@@ -412,32 +420,6 @@ class Model {
         }
         return new PreparedQuery(this.queryList[index], this.modelDef, this.problems);
     }
-    /**
-     * Retrieve a prepared query by the name of a query at the top level of the model.
-     *
-     * @param queryName Name of the query to retrieve.
-     * @return A prepared query.
-     */
-    getSQLBlockByName(sqlBlockName) {
-        const sqlBlock = this.sqlBlocks.find(sqlBlock => sqlBlock.as === sqlBlockName);
-        if (sqlBlock === undefined) {
-            throw new Error(`No SQL Block named '${sqlBlockName}'`);
-        }
-        return sqlBlock;
-    }
-    /**
-     * Retrieve a prepared query by the name of a query at the top level of the model.
-     *
-     * @param index Index of the SQL Block to retrieve.
-     * @return A prepared query.
-     */
-    getSQLBlockByIndex(index) {
-        const sqlBlock = this.sqlBlocks[index];
-        if (sqlBlock === undefined) {
-            throw new Error(`No SQL Block at index ${index}`);
-        }
-        return sqlBlock;
-    }
     /**
      * Retrieve a prepared query for the final unnamed query at the top level of a model.
      *
@@ -465,7 +447,7 @@ class Model {
      */
     getExploreByName(name) {
         const struct = this.modelDef.contents[name];
-        if (struct.type === 'struct') {
+        if ((0, model_1.modelObjIsSource)(struct)) {
             return new Explore(struct);
         }
         throw new Error("'name' is not an explore");
@@ -476,9 +458,8 @@ class Model {
      * @return An array of `Explore`s contained in the model.
      */
     get explores() {
-        const isStructDef = (object) => object.type === 'struct';
         return Object.values(this.modelDef.contents)
-            .filter(isStructDef)
+            .filter(model_1.modelObjIsSource)
             .map(structDef => new Explore(structDef));
     }
     /**
@@ -543,7 +524,7 @@ class PreparedQuery {
         const source = typeof sourceRef === 'string'
             ? this._modelDef.contents[sourceRef]
             : sourceRef;
-        if (source.type !== 'struct') {
+        if (!(0, model_1.modelObjIsSource)(source)) {
             throw new Error('Invalid source for query');
         }
         return source.dialect;
@@ -837,7 +818,7 @@ class PreparedResult {
         if (explore === undefined) {
             throw new Error('Malformed query result.');
         }
-        if (explore.type === 'struct') {
+        if ((0, model_1.modelObjIsSource)(explore)) {
             return new Explore(explore);
         }
         throw new Error(`'${name} is not an explore`);
@@ -999,7 +980,13 @@ class Explore extends Entity {
         return this.sourceExplore;
     }
     isIntrinsic() {
-        return (0, model_1.FieldIsIntrinsic)(this._structDef);
+        // Don't have the right discriminator, if this was a field def at some point, the field-defness ahs been lost.
+        // A record or an array might be atomic, AND be a structdef, unless they are a dimension (i.e. have a an
+        // expression)
+        if ((0, model_1.isAtomicFieldType)(this._structDef.type)) {
+            return !('e' in this._structDef);
+        }
+        return false;
     }
     isExploreField() {
         return false;
@@ -1021,9 +1008,13 @@ class Explore extends Entity {
         return this.structDef.as || this.structDef.name;
     }
     getQueryByName(name) {
+        const structRef = this.sourceStructDef;
+        if (!structRef) {
+            throw new Error(`Cannot get query by name from a struct of type ${this.structDef.type}`);
+        }
         const internalQuery = {
             type: 'query',
-            structRef: this.structDef,
+            structRef,
             pipeline: [
                 {
                     type: 'reduce',
@@ -1041,7 +1032,7 @@ class Explore extends Entity {
         };
     }
     getSingleExploreModel() {
-        return new Model(this.modelDef, [], [], [], []);
+        return new Model(this.modelDef, [], [], []);
     }
     get fieldMap() {
         var _a;
@@ -1050,7 +1041,7 @@ class Explore extends Entity {
             this._fieldMap = new Map(this.structDef.fields.map(fieldDef => {
                 const name = fieldDef.as || fieldDef.name;
                 const sourceField = sourceFields.get(fieldDef.name);
-                if (fieldDef.type === 'struct') {
+                if ((0, model_1.isJoined)(fieldDef)) {
                     return [name, new ExploreField(fieldDef, this, sourceField)];
                 }
                 else if (fieldDef.type === 'turtle') {
@@ -1097,10 +1088,10 @@ class Explore extends Entity {
         return [...this.fieldMap.values()];
     }
     get allFieldsWithOrder() {
-        var _a, _b;
+        var _a, _b, _c;
         if (!this._allFieldsWithOrder) {
             const orderByFields = [
-                ...(((_b = (_a = this.structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy) === null || _b === void 0 ? void 0 : _b.map(f => {
+                ...(((_c = (_b = (_a = this.sourceStructDef) === null || _a === void 0 ? void 0 : _a.resultMetadata) === null || _b === void 0 ? void 0 : _b.orderBy) === null || _c === void 0 ? void 0 : _c.map(f => {
                     if (typeof f.field === 'string') {
                         const a = {
                             field: this.fieldMap.get(f.field),
@@ -1143,44 +1134,38 @@ class Explore extends Entity {
         return this.fieldMap.get(fieldName);
     }
     get primaryKey() {
-        return this.structDef.primaryKey;
+        var _a;
+        return (_a = this.sourceStructDef) === null || _a === void 0 ? void 0 : _a.primaryKey;
     }
     get parentExplore() {
         return this._parentExplore;
     }
-    get sourceRelationship() {
-        switch (this.structDef.structRelationship.type) {
-            case 'many':
-                return SourceRelationship.Many;
-            case 'one':
-                return SourceRelationship.One;
-            case 'cross':
-                return SourceRelationship.Cross;
-            case 'inline':
-                return SourceRelationship.Inline;
-            case 'nested':
-                return SourceRelationship.Nested;
-            case 'basetable':
-                return SourceRelationship.BaseTable;
-        }
-    }
     hasParentExplore() {
         return this instanceof ExploreField;
     }
     // TODO wrapper type for FilterCondition
     get filters() {
         var _a;
-        return ((_a = this.structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.filterList) || [];
+        if ((0, model_1.isSourceDef)(this.structDef)) {
+            return ((_a = this.structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.filterList) || [];
+        }
+        return [];
     }
     get limit() {
-        var _a;
-        return (_a = this.structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.limit;
+        var _a, _b;
+        return (_b = (_a = this.sourceStructDef) === null || _a === void 0 ? void 0 : _a.resultMetadata) === null || _b === void 0 ? void 0 : _b.limit;
     }
     get structDef() {
         return this._structDef;
     }
     get queryTimezone() {
-        return this.structDef.queryTimezone;
+        var _a;
+        return (_a = this.sourceStructDef) === null || _a === void 0 ? void 0 : _a.queryTimezone;
+    }
+    get sourceStructDef() {
+        if ((0, model_1.isSourceDef)(this.structDef)) {
+            return this.structDef;
+        }
     }
     toJSON() {
         var _a, _b;
@@ -1239,6 +1224,13 @@ class AtomicField extends Entity {
                 return AtomicFieldType.NativeUnsupported;
             case 'error':
                 return AtomicFieldType.Error;
+            case 'record':
+            case 'array':
+                throw new Error(`MTOY TODO IMPLEMENT Atomic ${this.fieldTypeDef.type}`);
+            default: {
+                const x = this.fieldTypeDef;
+                throw new Error(`Can't make an atomic field from ${x}`);
+            }
         }
     }
     tagParse(spec) {
@@ -1249,7 +1241,7 @@ class AtomicField extends Entity {
         return tags_1.Tag.annotationToTaglines(this.fieldTypeDef.annotation, prefix);
     }
     isIntrinsic() {
-        return (0, model_1.FieldIsIntrinsic)(this.fieldTypeDef);
+        return (0, model_1.fieldIsIntrinsic)(this.fieldTypeDef);
     }
     isQueryField() {
         return false;
@@ -1514,19 +1506,16 @@ class ExploreField extends Explore {
         this._parentExplore = parentExplore;
     }
     get joinRelationship() {
-        switch (this.structDef.structRelationship.type) {
-            case 'one':
-                return JoinRelationship.OneToMany;
-            case 'many':
-            case 'cross':
-                return JoinRelationship.ManyToOne;
-            case 'inline':
-                return JoinRelationship.OneToOne;
-            case 'nested':
-                return JoinRelationship.ManyToOne;
-            default:
-                throw new Error('A source field must have a join relationship.');
+        if ((0, model_1.isJoined)(this.structDef)) {
+            switch (this.structDef.join) {
+                case 'one':
+                    return JoinRelationship.OneToOne;
+                case 'many':
+                case 'cross':
+                    return JoinRelationship.ManyToOne;
+            }
         }
+        throw new Error('A source field must have a join relationship.');
     }
     get isRecord() {
         return this.joinRelationship === JoinRelationship.OneToOne;
@@ -1660,7 +1649,7 @@ class Runtime {
     //      be used in tests.
     _loadModelFromModelDef(modelDef, options) {
         return new ModelMaterializer(this, async () => {
-            return new Model(modelDef, [], [], [], []);
+            return new Model(modelDef, [], [], []);
         }, options);
     }
     /**
@@ -1697,30 +1686,6 @@ class Runtime {
     loadQueryByName(model, name, options) {
         return this.loadModel(model, options).loadQueryByName(name, options);
     }
-    /**
-     * Load a SQL block by the URL or contents of a Malloy model document
-     * and the name of a query contained in the model.
-     *
-     * @param model The model URL or contents to load and (eventually) compile to retrieve the requested query.
-     * @param name The name of the sql block to use within the model.
-     * @return A `SQLBlockMaterializer` capable of materializing the requested query, running it,
-     * or loading further related objects.
-     */
-    loadSQLBlockByName(model, name, options) {
-        return this.loadModel(model, options).loadSQLBlockByName(name);
-    }
-    /**
-     * Load a SQL block by the URL or contents of a Malloy model document
-     * and the name of a query contained in the model.
-     *
-     * @param model The model URL or contents to load and (eventually) compile to retrieve the requested query.
-     * @param index The index of the SQL block to use within the model. Note: named blocks are indexable, too.
-     * @return A `SQLBlockMaterializer` capable of materializing the requested query, running it,
-     * or loading further related objects.
-     */
-    loadSQLBlockByIndex(model, index, options) {
-        return this.loadModel(model, options).loadSQLBlockByIndex(index);
-    }
     // TODO maybe use overloads for the alternative parameters
     /**
      * Compile a Malloy model by URL or contents.
@@ -1762,28 +1727,6 @@ class Runtime {
     getQueryByName(model, name, options) {
         return this.loadQueryByName(model, name, options).getPreparedQuery();
     }
-    /**
-     * Get a SQL block by the URL or contents of a Malloy model document
-     * and the name of a SQL block contained in the model.
-     *
-     * @param model The model URL or contents to load and (eventually) compile to retrieve the requested query.
-     * @param name The name of the sql block to use within the model.
-     * @return A promise of a `CompiledSQLBlock`.
-     */
-    getSQLBlockByName(model, name, options) {
-        return this.loadSQLBlockByName(model, name, options).getSQLBlock();
-    }
-    /**
-     * Get a SQL block by the URL or contents of a Malloy model document
-     * and the name of a query contained in the model.
-     *
-     * @param model The model URL or contents to load and (eventually) compile to retrieve the requested query.
-     * @param index The index of the SQL block to use within the model. Note: named blocks are indexable, too.
-     * @return A promise of a `SQLBlock`.
-     */
-    getSQLBlockByIndex(model, index, options) {
-        return this.loadSQLBlockByIndex(model, index, options).getSQLBlock();
-    }
 }
 exports.Runtime = Runtime;
 class ConnectionRuntime extends Runtime {
@@ -1862,12 +1805,6 @@ class FluentState {
     makePreparedResultMaterializer(materialize) {
         return new PreparedResultMaterializer(this.runtime, materialize);
     }
-    makeSQLBlockMaterializer(materialize) {
-        return new SQLBlockMaterializer(this.runtime, materialize);
-    }
-    get eventStream() {
-        return this.runtime.eventStream;
-    }
 }
 /**
  * An object representing the task of loading a `Model`, capable of
@@ -2013,18 +1950,18 @@ class ModelMaterializer extends FluentState {
         const model = await this.materialize();
         const queryModel = new model_1.QueryModel(model._modelDef, eventStream);
         const schema = model.getExploreByName(sourceName).structDef;
-        if (schema.structRelationship.type !== 'basetable') {
-            throw new Error("Expected schema's structRelationship type to be 'basetable'.");
+        if (!(0, model_1.isSourceDef)(schema)) {
+            throw new Error('Source to be searched was unexpectedly, not a source');
         }
-        const connectionName = schema.structRelationship.connectionName;
+        const connectionName = schema.connection;
         const connection = await this.runtime.connections.lookupConnection(connectionName);
         return await queryModel.searchIndex(connection, sourceName, searchTerm, limit, searchField);
     }
     async searchValueMap(sourceName, limit = 10, options) {
         const model = await this.materialize();
         const schema = model.getExploreByName(sourceName);
-        if (schema.structDef.structRelationship.type !== 'basetable') {
-            throw new Error("Expected schema's structRelationship type to be 'basetable'.");
+        if (!(0, model_1.isSourceDef)(schema.structDef)) {
+            throw new Error('Source to be searched was unexpectedly, not a source');
         }
         let indexQuery = '{index: *}';
         if (schema.getFieldByNameIfExists('search_index')) {
@@ -2050,32 +1987,6 @@ class ModelMaterializer extends FluentState {
         });
         return result._queryResult.result;
     }
-    /**
-     * Load a SQL Block by name.
-     *
-     * @param name The name of the SQL Block to load.
-     * @return A `SQLBlockMaterializer` capable of materializing the requested sql block, running it,
-     * or loading further related objects.
-     */
-    loadSQLBlockByName(name) {
-        return this.makeSQLBlockMaterializer(async () => {
-            return (await this.materialize()).getSQLBlockByName(name);
-        });
-    }
-    /**
-     * Load a SQL Block by index.
-     *
-     * @param index The index of the SQL Block to load. Note: named SQL blocks are indexable, too.
-     * @return A `SQLBlockMaterializer` capable of materializing the requested sql block, running it,
-     * or loading further related objects.
-     *
-     * TODO feature-sql-block Should named SQL blocks be indexable? This is not the way unnamed queries work.
-     */
-    loadSQLBlockByIndex(index) {
-        return this.makeSQLBlockMaterializer(async () => {
-            return (await this.materialize()).getSQLBlockByIndex(index);
-        });
-    }
     /**
      * Materialize the final query contained within this loaded `Model`.
      *
@@ -2111,26 +2022,6 @@ class ModelMaterializer extends FluentState {
     getQuery(query, options) {
         return this.loadQuery(query, options).getPreparedQuery();
     }
-    /**
-     * Get a SQL Block by name.
-     *
-     * @param name The name of the SQL Block to load.
-     * @return A promise of a `SQLBlock`.
-     */
-    getSQLBlockByName(name) {
-        return this.loadSQLBlockByName(name).getSQLBlock();
-    }
-    /**
-     * Get a SQL Block by index.
-     *
-     * @param index The index of the SQL Block to load. Note: named SQL blocks are indexable, too.
-     * @return A promise of a `SQLBlock`.
-     *
-     * TODO feature-sql-block Should named SQL blocks be indexable? This is not the way unnamed queries work.
-     */
-    getSQLBlockByIndex(index) {
-        return this.loadSQLBlockByIndex(index).getSQLBlock();
-    }
     // TODO Consider formalizing this. Perhaps as a `withQuery` method,
     //      as well as a `PreparedQuery.fromQueryDefinition` if we choose to expose
     //      `InternalQuery` to the world formally. For now, this should only
@@ -2259,6 +2150,9 @@ class QueryMaterializer extends FluentState {
         const preparedResult = await this.getPreparedResult(options);
         return Malloy.estimateQueryCost({ connections, preparedResult });
     }
+    get eventStream() {
+        return this.runtime.eventStream;
+    }
 }
 exports.QueryMaterializer = QueryMaterializer;
 function runSQLOptionsWithAnnotations(preparedResult, givenOptions) {
@@ -2320,58 +2214,6 @@ class PreparedResultMaterializer extends FluentState {
     }
 }
 exports.PreparedResultMaterializer = PreparedResultMaterializer;
-/**
- * An object representing the task of loading a `SQLBlock`, capable of
- * materializing the SQLBlock (via `getSQLBlock()`) or extending the task run
- * the query.
- */
-class SQLBlockMaterializer extends FluentState {
-    /**
-     * Run this SQL block.
-     *
-     * @return A promise to the query result data.
-     */
-    async run(options) {
-        const sqlBlock = await this.getSQLBlock();
-        const connections = this.runtime.connections;
-        return Malloy.run({
-            connections,
-            sqlStruct: sqlBlock,
-            options,
-        });
-    }
-    async *runStream(options) {
-        const sqlStruct = await this.getSQLBlock();
-        const connections = this.runtime.connections;
-        const stream = Malloy.runStream({ connections, sqlStruct, options });
-        for await (const row of stream) {
-            yield row;
-        }
-    }
-    /**
-     * Materialize this loaded SQL block.
-     *
-     * @return A promise of a SQL block.
-     */
-    getSQLBlock() {
-        return this.materialize();
-    }
-    /**
-     * Materialize the SQL of this loaded SQL block.
-     *
-     * @return A promise to the SQL string.
-     */
-    async getSQL() {
-        const sqlStruct = await this.getSQLBlock();
-        return sqlStruct.structSource.sqlBlock.selectStr;
-    }
-    async estimateQueryCost() {
-        const connections = this.runtime.connections;
-        const sqlStruct = await this.getSQLBlock();
-        return Malloy.estimateQueryCost({ connections, sqlStruct });
-    }
-}
-exports.SQLBlockMaterializer = SQLBlockMaterializer;
 /**
  * An object representing the task of loading an `Explore`, capable of
  * materializing the explore (via `getExplore()`) or extending the task to produce