@malloydata/malloy 0.0.335 → 0.0.336

package/dist/lang/ast/source-elements/sql-source.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLSource = void 0;
+const source_def_utils_1 = require("../../../model/source_def_utils");
 const sql_block_1 = require("../../../model/sql_block");
 const source_1 = require("./source");
 const error_factory_1 = require("../error-factory");
@@ -38,7 +39,11 @@ class SQLSource extends source_1.Source {
         const partialModel = this.select.containsQueries
             ? doc.modelDef()
             : undefined;
-        return (0, sql_block_1.compileSQLInterpolation)(this.select.sqlPhrases(), this.connectionName.refString, partialModel);
+        const [valid, phrases] = this.select.sqlPhrases();
+        if (valid) {
+            return (0, sql_block_1.getSourceRequest)(phrases, this.connectionName.refString, partialModel);
+        }
+        return undefined;
     }
     structRef() {
         return {
@@ -73,6 +78,9 @@ class SQLSource extends source_1.Source {
             this.requestBlock = this.sqlSourceRequest(doc);
         }
         const sql = this.requestBlock;
+        if (sql === undefined) {
+            return undefined;
+        }
         const sqlDefEntry = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.root.sqlQueryZone;
         if (!sqlDefEntry) {
             this.logError('failed-to-fetch-sql-source-schema', "Cant't look up schema for sql block");
@@ -101,7 +109,9 @@ class SQLSource extends source_1.Source {
             return error_factory_1.ErrorFactory.structDef;
         }
         if (this.requestBlock === undefined) {
-            this.logError('failed-to-fetch-sql-source-schema', 'Expected to have already compiled the sql block');
+            // Means we couldn't make a source request or there was
+            // a problem with the source request, both will have logged
+            // errors already.
             return error_factory_1.ErrorFactory.structDef;
         }
         const sql = this.requestBlock;
@@ -115,7 +125,8 @@ class SQLSource extends source_1.Source {
         }
         else if (lookup.status === 'present') {
             const location = this.select.location;
-            const locStruct = {
+            // Create a base struct with updated fields (adding location and fieldUsage)
+            const baseStruct = {
                 ...lookup.value,
                 fields: lookup.value.fields.map(f => {
                     var _a;
@@ -127,6 +138,10 @@ class SQLSource extends source_1.Source {
                 }),
                 location: this.location,
             };
+            // Use factory to create SQLSourceDef without propagating sourceID/extends
+            const [_valid, phrases] = this.select.sqlPhrases();
+            const selectSegments = this.select.containsQueries ? phrases : undefined;
+            const locStruct = (0, source_def_utils_1.mkSQLSourceDef)(baseStruct, lookup.value.selectStr, selectSegments);
             const fromDoc = this.document();
             const modelAnnotation = fromDoc === null || fromDoc === void 0 ? void 0 : fromDoc.currentModelAnnotation();
             if (modelAnnotation) {

package/dist/lang/ast/sql-elements/sql-string.d.ts

@@ -1,4 +1,4 @@
-import type { SQLPhraseSegment } from '../../../model/malloy_types';
+import { type SQLPhraseSegment } from '../../../model/malloy_types';
 import { MalloyElement } from '../types/malloy-element';
 import { SourceQueryElement } from '../source-query-elements/source-query-element';
 type SQLStringSegment = string | SourceQueryElement;
@@ -8,6 +8,6 @@ export declare class SQLString extends MalloyElement {
     containsQueries: boolean;
     complete(): void;
     push(el: string | MalloyElement): void;
-    sqlPhrases(): SQLPhraseSegment[];
+    sqlPhrases(): [boolean, SQLPhraseSegment[]];
 }
 export {};

package/dist/lang/ast/sql-elements/sql-string.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLString = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
 const malloy_element_1 = require("../types/malloy-element");
 const source_query_element_1 = require("../source-query-elements/source-query-element");
 class SQLString extends malloy_element_1.MalloyElement {
@@ -54,21 +55,37 @@ class SQLString extends malloy_element_1.MalloyElement {
     }
     sqlPhrases() {
         const ret = [];
+        let valid = true;
         for (const el of this.elements) {
             if (typeof el === 'string') {
                 ret.push({ sql: el });
             }
+            else if (el.isSource()) {
+                // Check if it's a persistable source first
+                const source = el.getSource();
+                if (source) {
+                    const sourceDef = source.getSourceDef(undefined);
+                    if ((0, malloy_types_1.isPersistableSourceDef)(sourceDef)) {
+                        ret.push(sourceDef);
+                        continue;
+                    }
+                }
+                el.sqLog('failed-to-expand-sql-source', 'Cannot expand into a query');
+                valid = false;
+            }
             else {
+                // Not a source - try as a query
                 const queryObject = el.getQuery();
                 if (queryObject) {
                     ret.push(queryObject.query());
                 }
                 else {
                     el.sqLog('failed-to-expand-sql-source', 'Cannot expand into a query');
+                    valid = false;
                 }
             }
         }
-        return ret;
+        return [valid, ret];
     }
 }
 exports.SQLString = SQLString;

package/dist/lang/ast/statements/define-source.js

@@ -23,6 +23,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefineSourceList = exports.DefineSource = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
+const source_def_utils_1 = require("../../../model/source_def_utils");
 const error_factory_1 = require("../error-factory");
 const malloy_element_1 = require("../types/malloy-element");
 const noteable_1 = require("../types/noteable");
@@ -45,7 +47,7 @@ class DefineSource extends malloy_element_1.MalloyElement {
         }
     }
     execute(doc) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (doc.modelEntry(this.name)) {
             this.logError('source-definition-name-conflict', `Cannot redefine '${this.name}'`);
             return;
@@ -65,13 +67,16 @@ class DefineSource extends malloy_element_1.MalloyElement {
             as: this.name,
             location: this.location,
         };
+        if ((0, malloy_types_1.isPersistableSourceDef)(entry)) {
+            entry.sourceID = (0, source_def_utils_1.mkSourceID)(this.name, (_b = this.location) === null || _b === void 0 ? void 0 : _b.url);
+        }
         if (this.note) {
             entry.annotation = structDef.annotation
                 ? { ...this.note, inherits: structDef.annotation }
                 : this.note;
         }
         entry.partitionComposite =
-            (_c = (0, composite_source_utils_1.getPartitionCompositeDesc)(this.note, structDef, (_b = this.sourceExpr) !== null && _b !== void 0 ? _b : this)) !== null && _c !== void 0 ? _c : structDef.partitionComposite;
+            (_d = (0, composite_source_utils_1.getPartitionCompositeDesc)(this.note, structDef, (_c = this.sourceExpr) !== null && _c !== void 0 ? _c : this)) !== null && _d !== void 0 ? _d : structDef.partitionComposite;
         doc.setEntry(this.name, { entry, exported: this.exported });
     }
     deduplicatedParameters() {

package/dist/lang/ast/statements/import-statement.js

@@ -24,6 +24,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportStatement = exports.ImportSelect = exports.ImportSourceName = void 0;
 const malloy_element_1 = require("../types/malloy-element");
+const malloy_types_1 = require("../../../model/malloy_types");
+const source_def_utils_1 = require("../../../model/source_def_utils");
+const persist_utils_1 = require("../../../model/persist_utils");
+/** Walk BuildNode tree and collect all sourceIDs */
+function collectSourceIDs(nodes, into) {
+    for (const node of nodes) {
+        into.add(node.sourceID);
+        collectSourceIDs(node.dependsOn, into);
+    }
+}
 class ImportSourceName extends malloy_element_1.MalloyElement {
     constructor(text) {
         super();
@@ -85,34 +95,56 @@ class ImportStatement extends malloy_element_1.ListOf {
             const pretranslated = trans.root.pretranslatedModels.get(this.fullURL);
             const src = trans.root.importZone.getEntry(this.fullURL);
             if (pretranslated || src.status === 'present') {
-                const importable = trans.getChildExports(this.fullURL);
-                if (this.notEmpty()) {
-                    // just import the named objects
+                const importedModel = trans.importModelDef(this.fullURL);
+                if (importedModel) {
+                    const importAll = this.empty();
+                    const explicitImport = {};
                     for (const importOne of this.list) {
-                        const fetchName = importOne.from || importOne;
-                        if (doc.getEntry(importOne.text)) {
-                            importOne.logError('name-conflict-on-selective-import', `Cannot redefine '${importOne.text}'`);
+                        const dstName = importOne.text;
+                        const srcName = importOne.from ? importOne.from.text : dstName;
+                        if (importedModel.contents[srcName] === undefined) {
+                            importOne.logError('selective-import-not-found', `Cannot find '${srcName}', not imported`);
                         }
-                        else if (importable[fetchName.text]) {
-                            const importMe = { ...importable[fetchName.text] };
-                            if (importOne.from) {
-                                importMe.as = importOne.text;
-                            }
-                            doc.setEntry(importOne.text, { entry: importMe, exported: false });
+                        else if (doc.getEntry(dstName)) {
+                            importOne.logError('name-conflict-on-selective-import', `Cannot redefine '${dstName}'`);
                         }
                         else {
-                            fetchName.logError('selective-import-not-found', `Cannot find '${fetchName.text}', not imported`);
+                            explicitImport[srcName] = dstName;
                         }
                     }
-                }
-                else {
-                    // import everything
-                    for (const [importing, entry] of Object.entries(trans.getChildExports(this.fullURL))) {
-                        if (doc.getEntry(importing)) {
-                            this.logError('name-conflict-on-indiscriminate-import', `Cannot redefine '${importing}'`);
+                    const neededSourceIDs = new Set();
+                    for (const srcName of importedModel.exports) {
+                        const picked = explicitImport[srcName];
+                        const dstName = picked || srcName;
+                        if (importAll || picked) {
+                            const importMe = { ...importedModel.contents[srcName] };
+                            importMe.as = dstName;
+                            doc.setEntry(dstName, { entry: importMe, exported: false });
+                            // Collect dependencies for persistable sources
+                            if ((0, malloy_types_1.isSourceDef)(importMe) && (0, malloy_types_1.isPersistableSourceDef)(importMe)) {
+                                const deps = (0, persist_utils_1.findPersistentDependencies)(importMe, importedModel);
+                                collectSourceIDs(deps, neededSourceIDs);
+                            }
                         }
-                        else {
-                            doc.setEntry(importing, { entry, exported: false });
+                    }
+                    // Register hidden dependencies from child's registry
+                    for (const sourceID of neededSourceIDs) {
+                        if (!(sourceID in doc.documentSrcRegistry)) {
+                            const value = importedModel.sourceRegistry[sourceID];
+                            if (value) {
+                                // If entry is a reference, resolve it to actual SourceDef
+                                // (parent can't resolve by name since it's not in namespace)
+                                let entry = value.entry;
+                                if ((0, malloy_types_1.isSourceRegistryReference)(entry)) {
+                                    const resolved = importedModel.contents[entry.name];
+                                    if (resolved &&
+                                        (0, malloy_types_1.isSourceDef)(resolved) &&
+                                        (0, malloy_types_1.isPersistableSourceDef)(resolved)) {
+                                        entry = resolved;
+                                    }
+                                }
+                                (0, source_def_utils_1.registerSource)(doc.documentSrcRegistry, sourceID, entry);
+                            }
                         }
                     }
                 }

package/dist/lang/ast/types/document-compile-result.d.ts

@@ -3,4 +3,5 @@ import type { ModelDataRequest } from '../../translate-response';
 export interface DocumentCompileResult {
     modelDef: ModelDef;
     needs: ModelDataRequest;
+    modelWasModified: boolean;
 }

package/dist/lang/ast/types/malloy-element.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Query, StructDef } from '../../../model/malloy_types';
+import type { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Query, SourceID, SourceRegistryValue, StructDef } from '../../../model/malloy_types';
 import { Tag } from '@malloydata/malloy-tag';
 import type { LogMessageOptions, MessageLogger, MessageParameterType, MessageCode } from '../../parse-log';
 import type { MalloyTranslation } from '../../parse-malloy';
@@ -121,9 +121,11 @@ export declare class Document extends MalloyElement implements NameSpace {
     elementType: string;
     globalNameSpace: NameSpace;
     documentModel: Record<string, ModelEntry>;
+    documentSrcRegistry: Record<SourceID, SourceRegistryValue>;
     queryList: Query[];
     statements: DocStatementList;
     didInitModel: boolean;
+    modelWasModified: boolean;
     annotation: Annotation;
     experiments: Tag;
     constructor(statements: (DocStatement | DocStatementList)[]);

package/dist/lang/ast/types/malloy-element.js

@@ -27,6 +27,7 @@ exports.isDocStatement = isDocStatement;
 exports.isDocStatementOrDocStatementList = isDocStatementOrDocStatementList;
 const dialect_1 = require("../../../dialect");
 const malloy_types_1 = require("../../../model/malloy_types");
+const utils_1 = require("../../../model/utils");
 const malloy_tag_1 = require("@malloydata/malloy-tag");
 const parse_log_1 = require("../../parse-log");
 const ast_utils_1 = require("../ast-utils");
@@ -437,8 +438,10 @@ class Document extends MalloyElement {
         this.elementType = 'document';
         this.globalNameSpace = new global_name_space_1.GlobalNameSpace();
         this.documentModel = {};
+        this.documentSrcRegistry = {};
         this.queryList = [];
         this.didInitModel = false;
+        this.modelWasModified = false;
         this.annotation = {};
         this.experiments = new malloy_tag_1.Tag({});
         this.modelAnnotationTodoList = [];
@@ -451,6 +454,7 @@ class Document extends MalloyElement {
             return;
         }
         this.documentModel = {};
+        this.documentSrcRegistry = {};
         this.queryList = [];
         if (extendingModelDef) {
             if (extendingModelDef.annotation) {
@@ -489,6 +493,7 @@ class Document extends MalloyElement {
                 queryList: this.queryList,
             },
             needs,
+            modelWasModified: this.modelWasModified,
         };
         return ret;
     }
@@ -507,13 +512,7 @@ class Document extends MalloyElement {
         }
     }
     modelDef() {
-        const def = {
-            name: '',
-            exports: [],
-            contents: {},
-            queryList: [],
-            dependencies: {},
-        };
+        const def = (0, utils_1.mkModelDef)('');
         if (this.hasAnnotation()) {
             def.annotation = this.currentModelAnnotation();
         }
@@ -530,6 +529,8 @@ class Document extends MalloyElement {
                 def.contents[entry] = newEntry;
             }
         }
+        // Copy the accumulated sourceRegistry
+        def.sourceRegistry = { ...this.documentSrcRegistry };
         return def;
     }
     getEntry(str) {
@@ -544,7 +545,22 @@ class Document extends MalloyElement {
         if ((0, malloy_types_1.isSourceDef)(ent.entry)) {
             this.checkExperimentalDialect(this, ent.entry.dialect);
         }
+        // Track if the model was modified after initialization
+        if (this.didInitModel) {
+            this.modelWasModified = true;
+        }
         this.documentModel[str] = ent;
+        // Maintain sourceRegistry for persistable sources with sourceID
+        if ((0, malloy_types_1.isSourceDef)(ent.entry) &&
+            (0, malloy_types_1.isPersistableSourceDef)(ent.entry) &&
+            ent.entry.sourceID) {
+            this.documentSrcRegistry[ent.entry.sourceID] = {
+                entry: {
+                    type: 'source_registry_reference',
+                    name: str,
+                },
+            };
+        }
     }
     /**
      * Return an error message if this dialect is the first reference to this particular

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

@@ -10,7 +10,7 @@ import type { FieldDeclarationConstructor } from './ast';
 import type { HasString, HasID } from './parse-utils';
 import type { CastType } from '../model';
 import type { AccessModifierLabel, DocumentLocation, DocumentRange, Note } from '../model/malloy_types';
-import { Tag } from '@malloydata/malloy-tag';
+import type { Tag } from '@malloydata/malloy-tag';
 import type * as Malloy from '@malloydata/malloy-interfaces';
 import { Timer } from '../timing';
 declare class ErrorNode extends ast.SourceQueryElement {

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

@@ -96,7 +96,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         this.timer = new timing_1.Timer('generate_ast');
         const parseCompilerFlagsTimer = new timing_1.Timer('parse_compiler_flags');
         for (const flag of DEFAULT_COMPILER_FLAGS) {
-            const withNewTag = malloy_tag_1.Tag.fromTagLine(flag, 0, this.compilerFlags);
+            const withNewTag = (0, malloy_tag_1.parseTag)(flag, this.compilerFlags);
             this.compilerFlags = withNewTag.tag;
         }
         this.timer.contribute([parseCompilerFlagsTimer.stop()]);

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

@@ -1,4 +1,4 @@
-import type { DocumentLocation, DocumentPosition, DocumentReference, ImportLocation, ModelDef, NamedModelObject, SourceDef, SQLSourceDef, DependencyTree, DocumentRange } from '../model/malloy_types';
+import type { DocumentLocation, DocumentPosition, DocumentReference, ImportLocation, ModelDef, SourceDef, SQLSourceDef, DependencyTree, DocumentRange } from '../model/malloy_types';
 import type { LogMessage, LogMessageOptions, MessageCode, MessageParameterType } from './parse-log';
 import { BaseMessageLogger } from './parse-log';
 import type { ZoneData } from './zone';
@@ -112,6 +112,7 @@ export declare abstract class MalloyTranslation {
     childTranslators: Map<string, MalloyTranslation>;
     sqlSources: SQLSourceDef[];
     modelDef: ModelDef;
+    modelWasModified: boolean;
     imports: ImportLocation[];
     compilerFlags: Tag;
     readonly parseStep: ParseStep;
@@ -152,7 +153,7 @@ export declare abstract class MalloyTranslation {
     codeAtLocation(location: DocumentLocation): string;
     prettyErrors(): string;
     childRequest(importURL: string): ModelDataRequest;
-    getChildExports(importURL: string): Record<string, NamedModelObject>;
+    importModelDef(importURL: string): ModelDef | undefined;
     private finalAnswer?;
     translate(extendingModel?: ModelDef): TranslateResponse;
     translatorForDependency(url: string): MalloyTranslation | undefined;

package/dist/lang/parse-malloy.js

@@ -56,7 +56,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MalloyTranslator = exports.MalloyChildTranslator = exports.MalloyTranslation = void 0;
-const malloy_types_1 = require("../model/malloy_types");
+const utils_1 = require("../model/utils");
 const ast = __importStar(require("./ast"));
 const malloy_to_ast_1 = require("./malloy-to-ast");
 const parse_log_1 = require("./parse-log");
@@ -67,7 +67,7 @@ const document_completion_walker_1 = require("./parse-tree-walkers/document-comp
 const document_help_context_walker_1 = require("./parse-tree-walkers/document-help-context-walker");
 const reference_list_1 = require("./reference-list");
 const translate_response_1 = require("./translate-response");
-const utils_1 = require("./utils");
+const utils_2 = require("./utils");
 const malloy_tag_1 = require("@malloydata/malloy-tag");
 const model_annotation_walker_1 = require("./parse-tree-walkers/model-annotation-walker");
 const find_table_path_walker_1 = require("./parse-tree-walkers/find-table-path-walker");
@@ -98,7 +98,7 @@ class ParseStep {
         }
         const parseModelTimer = new timing_1.Timer('parse_malloy');
         const source = srcEnt.value === '' ? '\n' : srcEnt.value;
-        this.sourceInfo = (0, utils_1.getSourceInfo)(source);
+        this.sourceInfo = (0, utils_2.getSourceInfo)(source);
         let parse;
         try {
             parse = this.runParser(source, this.sourceInfo, that);
@@ -419,6 +419,7 @@ class TranslateStep {
                 modelDef: pretranslate,
                 final: true,
                 fromSources: that.getDependencies(),
+                modelWasModified: false,
             };
         }
         // begin with the compiler flags of the model we are extending
@@ -456,6 +457,7 @@ class TranslateStep {
                 }
                 else {
                     that.modelDef = docCompile.modelDef;
+                    that.modelWasModified = docCompile.modelWasModified;
                 }
             }
             else {
@@ -477,6 +479,7 @@ class TranslateStep {
                     imports: [...that.imports],
                 },
                 fromSources: that.getDependencies(),
+                modelWasModified: that.modelWasModified,
                 ...that.problemResponse(),
                 final: true,
             };
@@ -490,6 +493,7 @@ class MalloyTranslation {
         this.importBaseURL = importBaseURL;
         this.grammarRule = grammarRule;
         this.sqlSources = [];
+        this.modelWasModified = false;
         this.imports = [];
         this.compilerFlags = new malloy_tag_1.Tag();
         this._urlIsFullPath = undefined;
@@ -506,13 +510,7 @@ class MalloyTranslation {
         this.dialectAlreadyChecked = {};
         this.allDialectsEnabled = false;
         this.childTranslators = new Map();
-        this.modelDef = {
-            name: sourceURL,
-            exports: [],
-            contents: {},
-            queryList: [],
-            dependencies: {},
-        };
+        this.modelDef = (0, utils_1.mkModelDef)(sourceURL);
         /**
          * This is sort of the makefile for the translation, all the steps
          * and the dependencies of the steps are declared here. Then when
@@ -684,23 +682,14 @@ class MalloyTranslation {
             };
         }
     }
-    getChildExports(importURL) {
-        const exports = {};
+    importModelDef(importURL) {
         const childURL = decodeURI(new URL(importURL, this.sourceURL).toString());
         const child = this.childTranslators.get(childURL);
         if (child) {
-            const did = child.translate();
-            if (did.modelDef) {
-                for (const fromChild of child.modelDef.exports) {
-                    const modelEntry = child.modelDef.contents[fromChild];
-                    if ((0, malloy_types_1.isSourceDef)(modelEntry) || modelEntry.type === 'query') {
-                        exports[fromChild] = modelEntry;
-                    }
-                }
-            }
-            // else nothing, assuming there are already errors in the log
+            const result = child.translate();
+            return result.modelDef;
         }
-        return exports;
+        return undefined;
     }
     translate(extendingModel) {
         if (this.finalAnswer) {
@@ -720,7 +709,7 @@ class MalloyTranslation {
         // search to find the one we're looking for.
         for (let index = 0; index < this.imports.length; index++) {
             const imp = this.imports[index];
-            if ((0, utils_1.locationContainsPosition)(imp.location, position)) {
+            if ((0, utils_2.locationContainsPosition)(imp.location, position)) {
                 return imp;
             }
         }
@@ -751,7 +740,7 @@ class MalloyTranslation {
         };
     }
     rangeFromContext(pcx) {
-        return (0, utils_1.rangeFromContext)(this.parseStep.sourceInfo, pcx);
+        return (0, utils_2.rangeFromContext)(this.parseStep.sourceInfo, pcx);
     }
     firstReferenceToDialect(dialect) {
         if (this.dialectAlreadyChecked[dialect]) {

package/dist/lang/test/test-translator.js

@@ -365,6 +365,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
             name: testURI,
             exports: [],
             queryList: [],
+            sourceRegistry: {},
             dependencies: {},
             contents: {
                 _db_: { type: 'connection', name: '_db_' },

package/dist/lang/translate-response.d.ts

@@ -64,6 +64,7 @@ export type HelpContextResponse = Partial<HelpContext>;
 interface TranslatedResponseData extends ResponseBase, NeededData, ProblemResponse, FinalResponse {
     modelDef: ModelDef;
     fromSources: string[];
+    modelWasModified: boolean;
 }
 interface TablePath extends ResponseBase, NeededData, ProblemResponse, FinalResponse {
     pathInfo: PathInfo[];

package/dist/model/constant_expression_compiler.js

@@ -84,18 +84,17 @@ class ConstantQueryStruct extends query_node_1.QueryStruct {
             connection: dialect.name,
             dialect: dialect.name,
         };
-        // Create a minimal model interface that only provides eventStream
-        const minimalModel = { eventStream };
-        // Create minimal prepare result options
-        const minimalPrepareOptions = {};
+        // Create minimal model with empty structs map
+        const minimalModel = {
+            structs: new Map(),
+        };
+        // Create minimal prepare result options with eventStream
+        const minimalPrepareOptions = { eventStream };
         // Call parent constructor with minimal requirements
         super(minimalStructDef, undefined, // no source arguments initially
         { model: minimalModel }, minimalPrepareOptions);
         this.dialect = dialect;
         this._constantArguments = parameters;
-        if (eventStream) {
-            this.model.eventStream = eventStream;
-        }
     }
     /**
      * Override arguments() to return our parameters

package/dist/model/index.d.ts

@@ -4,5 +4,7 @@ import { QueryQuery } from './query_query';
 import { QueryModelImpl } from './query_model_impl';
 export { QueryField, QueryStruct, QueryQuery, QueryModelImpl as QueryModel };
 export { getResultStructDefForQuery, getResultStructDefForView, } from './query_model_impl';
-export { indent, composeSQLExpr } from './utils';
+export { indent, composeSQLExpr, makeDigest, mkModelDef } from './utils';
 export { constantExprToSQL } from './constant_expression_compiler';
+export { getCompiledSQL } from './sql_compiled';
+export { mkSourceID, mkBuildID, mkQuerySourceDef, mkSQLSourceDef, mkTableSourceDef, resolveSourceID, registerSource, hasSourceRegistryEntry, } from './source_def_utils';

package/dist/model/index.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.constantExprToSQL = exports.composeSQLExpr = exports.indent = exports.getResultStructDefForView = exports.getResultStructDefForQuery = exports.QueryModel = exports.QueryQuery = exports.QueryStruct = exports.QueryField = void 0;
+exports.hasSourceRegistryEntry = exports.registerSource = exports.resolveSourceID = exports.mkTableSourceDef = exports.mkSQLSourceDef = exports.mkQuerySourceDef = exports.mkBuildID = exports.mkSourceID = exports.getCompiledSQL = exports.constantExprToSQL = exports.mkModelDef = exports.makeDigest = exports.composeSQLExpr = exports.indent = exports.getResultStructDefForView = exports.getResultStructDefForQuery = exports.QueryModel = exports.QueryQuery = exports.QueryStruct = exports.QueryField = void 0;
 __exportStar(require("./malloy_types"), exports);
 const query_node_1 = require("./query_node");
 Object.defineProperty(exports, "QueryField", { enumerable: true, get: function () { return query_node_1.QueryField; } });
@@ -47,15 +47,8 @@ Object.defineProperty(exports, "QueryQuery", { enumerable: true, get: function (
 const field_instance_1 = require("./field_instance");
 const query_model_impl_1 = require("./query_model_impl");
 Object.defineProperty(exports, "QueryModel", { enumerable: true, get: function () { return query_model_impl_1.QueryModelImpl; } });
-// We have a circular dependency issue, and this is the minimal
-// dependency injection needed to get around it. Ideally, we would
-// like to avoid this, and I think a thoughtful pass through
-// FieldInstance and QueryField might eliminate the need for this.
 function getLookupFun(mri) {
-    if (mri instanceof query_model_impl_1.QueryModelImpl) {
-        return (name) => mri.structs.get(name);
-    }
-    return () => undefined;
+    return (name) => mri.structs.get(name);
 }
 field_instance_1.FieldInstanceField.registerExpressionCompiler(expression_compiler_1.exprToSQL);
 query_node_1.QueryStruct.registerTurtleFieldMaker((field, parent) => query_query_1.QueryQuery.makeQuery(field, parent, undefined, false, getLookupFun(parent.getModel())));
@@ -65,6 +58,19 @@ Object.defineProperty(exports, "getResultStructDefForView", { enumerable: true,
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "indent", { enumerable: true, get: function () { return utils_1.indent; } });
 Object.defineProperty(exports, "composeSQLExpr", { enumerable: true, get: function () { return utils_1.composeSQLExpr; } });
+Object.defineProperty(exports, "makeDigest", { enumerable: true, get: function () { return utils_1.makeDigest; } });
+Object.defineProperty(exports, "mkModelDef", { enumerable: true, get: function () { return utils_1.mkModelDef; } });
 var constant_expression_compiler_1 = require("./constant_expression_compiler");
 Object.defineProperty(exports, "constantExprToSQL", { enumerable: true, get: function () { return constant_expression_compiler_1.constantExprToSQL; } });
+var sql_compiled_1 = require("./sql_compiled");
+Object.defineProperty(exports, "getCompiledSQL", { enumerable: true, get: function () { return sql_compiled_1.getCompiledSQL; } });
+var source_def_utils_1 = require("./source_def_utils");
+Object.defineProperty(exports, "mkSourceID", { enumerable: true, get: function () { return source_def_utils_1.mkSourceID; } });
+Object.defineProperty(exports, "mkBuildID", { enumerable: true, get: function () { return source_def_utils_1.mkBuildID; } });
+Object.defineProperty(exports, "mkQuerySourceDef", { enumerable: true, get: function () { return source_def_utils_1.mkQuerySourceDef; } });
+Object.defineProperty(exports, "mkSQLSourceDef", { enumerable: true, get: function () { return source_def_utils_1.mkSQLSourceDef; } });
+Object.defineProperty(exports, "mkTableSourceDef", { enumerable: true, get: function () { return source_def_utils_1.mkTableSourceDef; } });
+Object.defineProperty(exports, "resolveSourceID", { enumerable: true, get: function () { return source_def_utils_1.resolveSourceID; } });
+Object.defineProperty(exports, "registerSource", { enumerable: true, get: function () { return source_def_utils_1.registerSource; } });
+Object.defineProperty(exports, "hasSourceRegistryEntry", { enumerable: true, get: function () { return source_def_utils_1.hasSourceRegistryEntry; } });
 //# sourceMappingURL=index.js.map