@malloydata/malloy 0.0.225-dev250111002123 → 0.0.225-dev250113200903

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

@@ -82,8 +82,9 @@ class ImportStatement extends malloy_element_1.ListOf {
             this.logError('no-translator-for-import', 'Cannot import without translation context');
         }
         else if (this.fullURL) {
+            const pretranslated = trans.root.pretranslatedModels.get(this.fullURL);
             const src = trans.root.importZone.getEntry(this.fullURL);
-            if (src.status === 'present') {
+            if (pretranslated || src.status === 'present') {
                 const importable = trans.getChildExports(this.fullURL);
                 if (this.notEmpty()) {
                     // just import the named objects

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

@@ -1,8 +1,6 @@
-import { ModelDef, Query, SQLSourceDef } from '../../../model/malloy_types';
+import { ModelDef } from '../../../model/malloy_types';
 import { ModelDataRequest } from '../../translate-response';
 export interface DocumentCompileResult {
     modelDef: ModelDef;
-    queryList: Query[];
-    sqlBlocks: SQLSourceDef[];
     needs: ModelDataRequest;
 }

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

@@ -1,4 +1,4 @@
-import { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Query, SQLSourceDef, StructDef } from '../../../model/malloy_types';
+import { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Query, StructDef } from '../../../model/malloy_types';
 import { Tag } from '../../../tags';
 import { LogMessageOptions, MessageLogger, MessageParameterType, MessageCode } from '../../parse-log';
 import { MalloyTranslation } from '../../parse-malloy';
@@ -121,7 +121,6 @@ export declare class Document extends MalloyElement implements NameSpace {
     globalNameSpace: NameSpace;
     documentModel: Record<string, ModelEntry>;
     queryList: Query[];
-    sqlBlocks: SQLSourceDef[];
     statements: DocStatementList;
     didInitModel: boolean;
     annotation: Annotation;
@@ -134,7 +133,6 @@ export declare class Document extends MalloyElement implements NameSpace {
     hasAnnotation(): boolean;
     currentModelAnnotation(): ModelAnnotation | undefined;
     modelDef(): ModelDef;
-    defineSQL(sql: SQLSourceDef, name?: string): boolean;
     getEntry(str: string): ModelEntry;
     setEntry(str: string, ent: ModelEntry): void;
     /**

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

@@ -430,7 +430,6 @@ class Document extends MalloyElement {
         this.globalNameSpace = new global_name_space_1.GlobalNameSpace();
         this.documentModel = {};
         this.queryList = [];
-        this.sqlBlocks = [];
         this.didInitModel = false;
         this.annotation = {};
         this.experiments = new tags_1.Tag({});
@@ -445,7 +444,6 @@ class Document extends MalloyElement {
         }
         this.documentModel = {};
         this.queryList = [];
-        this.sqlBlocks = [];
         if (extendingModelDef) {
             if (extendingModelDef.annotation) {
                 this.annotation.inherits = extendingModelDef.annotation;
@@ -471,11 +469,6 @@ class Document extends MalloyElement {
                     q.modelAnnotation = modelDef.annotation;
                 }
             }
-            for (const q of this.sqlBlocks) {
-                if (q.modelAnnotation === undefined && modelDef.annotation) {
-                    q.modelAnnotation = modelDef.annotation;
-                }
-            }
         }
         if (modelDef.annotation) {
             for (const sd of this.modelAnnotationTodoList) {
@@ -483,9 +476,10 @@ class Document extends MalloyElement {
             }
         }
         const ret = {
-            modelDef,
-            queryList: this.queryList,
-            sqlBlocks: this.sqlBlocks,
+            modelDef: {
+                ...modelDef,
+                queryList: this.queryList,
+            },
             needs,
         };
         return ret;
@@ -505,7 +499,13 @@ class Document extends MalloyElement {
         }
     }
     modelDef() {
-        const def = { name: '', exports: [], contents: {} };
+        const def = {
+            name: '',
+            exports: [],
+            contents: {},
+            queryList: [],
+            dependencies: {},
+        };
         if (this.hasAnnotation()) {
             def.annotation = this.currentModelAnnotation();
         }
@@ -524,21 +524,6 @@ class Document extends MalloyElement {
         }
         return def;
     }
-    defineSQL(sql, name) {
-        const ret = {
-            ...sql,
-            as: `$${this.sqlBlocks.length}`,
-        };
-        if (name) {
-            if (this.getEntry(name)) {
-                return false;
-            }
-            ret.as = name;
-            this.setEntry(name, { entry: ret });
-        }
-        this.sqlBlocks.push(ret);
-        return true;
-    }
     getEntry(str) {
         var _a;
         return (_a = this.globalNameSpace.getEntry(str)) !== null && _a !== void 0 ? _a : this.documentModel[str];

package/dist/lang/index.d.ts

@@ -1,4 +1,4 @@
-export { MalloyTranslator } from './parse-malloy';
+export { MalloyTranslator, MalloyTranslation } from './parse-malloy';
 export type { UpdateData, SchemaData, URLData, SQLSources as SQLBlockData, } from './parse-malloy';
 export type { TranslateResponse } from './translate-response';
 export { exploreQueryWalkerBuilder } from './parse-tree-walkers/explore-query-walker';

package/dist/lang/index.js

@@ -22,9 +22,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exploreQueryWalkerBuilder = exports.MalloyTranslator = void 0;
+exports.exploreQueryWalkerBuilder = exports.MalloyTranslation = exports.MalloyTranslator = void 0;
 var parse_malloy_1 = require("./parse-malloy");
 Object.defineProperty(exports, "MalloyTranslator", { enumerable: true, get: function () { return parse_malloy_1.MalloyTranslator; } });
+Object.defineProperty(exports, "MalloyTranslation", { enumerable: true, get: function () { return parse_malloy_1.MalloyTranslation; } });
 var explore_query_walker_1 = require("./parse-tree-walkers/explore-query-walker");
 Object.defineProperty(exports, "exploreQueryWalkerBuilder", { enumerable: true, get: function () { return explore_query_walker_1.exploreQueryWalkerBuilder; } });
 //# sourceMappingURL=index.js.map

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

@@ -1,5 +1,5 @@
 import { ANTLRErrorListener, ParserRuleContext, Token } from 'antlr4ts';
-import { DocumentLocation, DocumentPosition, DocumentRange, DocumentReference, ImportLocation, ModelDef, NamedModelObject, Query, SourceDef, SQLSourceDef } from '../model/malloy_types';
+import { DocumentLocation, DocumentPosition, DocumentRange, DocumentReference, ImportLocation, ModelDef, NamedModelObject, SourceDef, SQLSourceDef, DependencyTree } from '../model/malloy_types';
 import { BaseMessageLogger, LogMessage, LogMessageOptions, MessageCode, MessageLogger, MessageParameterType } from './parse-log';
 import { Zone, ZoneData } from './zone';
 import { ReferenceList } from './reference-list';
@@ -7,7 +7,7 @@ import { ASTResponse, CompletionsResponse, DataRequestResponse, ProblemResponse,
 import { Tag } from '../tags';
 import { MalloyParseInfo } from './malloy-parse-info';
 import { EventStream } from '../runtime_types';
-export type StepResponses = DataRequestResponse | ASTResponse | TranslateResponse | ParseResponse | MetadataResponse;
+export type StepResponses = DataRequestResponse | ASTResponse | TranslateResponse | ParseResponse | MetadataResponse | PretranslatedResponse;
 /**
  * A Translation is a series of translation steps. Each step can depend
  * on other steps, in which case the preceeding steps will be passed
@@ -27,6 +27,10 @@ interface ParseData extends ProblemResponse, NeedURLData, FinalResponse {
     parse: MalloyParseInfo;
 }
 export type ParseResponse = Partial<ParseData>;
+interface PretranslatedData {
+    translation: ModelDef;
+}
+export type PretranslatedResponse = PretranslatedData | null;
 /**
  * ParseStep -- Parse the source URL
  */
@@ -109,9 +113,7 @@ export declare abstract class MalloyTranslation {
     grammarRule: string;
     abstract root: MalloyTranslator;
     childTranslators: Map<string, MalloyTranslation>;
-    urlIsFullPath?: boolean;
-    queryList: Query[];
-    sqlBlocks: SQLSourceDef[];
+    sqlSources: SQLSourceDef[];
     modelDef: ModelDef;
     imports: ImportLocation[];
     compilerFlags: Tag;
@@ -126,8 +128,15 @@ export declare abstract class MalloyTranslation {
     readonly translateStep: TranslateStep;
     readonly references: ReferenceList;
     constructor(sourceURL: string, importBaseURL?: string | null, grammarRule?: string);
+    _urlIsFullPath: boolean | undefined;
+    get urlIsFullPath(): boolean;
     addChild(url: string): void;
     getDependencies(): string[];
+    getDependencyTree(): DependencyTree;
+    newlyTranslatedDependencies(): {
+        url: string;
+        modelDef: ModelDef;
+    }[];
     addReference(reference: DocumentReference): void;
     referenceAt(position: DocumentPosition): DocumentReference | undefined;
     /**
@@ -149,6 +158,7 @@ export declare abstract class MalloyTranslation {
     getChildExports(importURL: string): Record<string, NamedModelObject>;
     private finalAnswer?;
     translate(extendingModel?: ModelDef): TranslateResponse;
+    translatorForDependency(url: string): MalloyTranslation | undefined;
     importAt(position: DocumentPosition): ImportLocation | undefined;
     metadata(): MetadataResponse;
     modelAnnotation(extendingModel?: ModelDef): ModelAnnotationResponse;
@@ -188,6 +198,7 @@ export declare class MalloyTranslator extends MalloyTranslation {
     private readonly eventStream;
     schemaZone: Zone<SourceDef>;
     importZone: Zone<string>;
+    pretranslatedModels: Map<string, ModelDef>;
     sqlQueryZone: Zone<SQLSourceDef>;
     logger: BaseMessageLogger;
     readonly root: MalloyTranslator;
@@ -199,17 +210,21 @@ interface ErrorData {
     tables: Record<string, string>;
     urls: Record<string, string>;
     compileSQL: Record<string, string>;
+    translations: Record<string, string>;
 }
 export interface URLData {
     urls: ZoneData<string>;
 }
+export interface ModelData {
+    translations: ZoneData<ModelDef>;
+}
 export interface SchemaData {
     tables: ZoneData<SourceDef>;
 }
 export interface SQLSources {
     compileSQL: ZoneData<SQLSourceDef>;
 }
-export interface UpdateData extends URLData, SchemaData, SQLSources {
+export interface UpdateData extends URLData, SchemaData, SQLSources, ModelData {
     errors: Partial<ErrorData>;
 }
 export type ParseUpdate = Partial<UpdateData>;

package/dist/lang/parse-malloy.js

@@ -81,17 +81,6 @@ class ParseStep {
         if (this.response) {
             return this.response;
         }
-        if (that.urlIsFullPath === undefined) {
-            try {
-                const _checkFull = new URL(that.sourceURL);
-                that.urlIsFullPath = true;
-            }
-            catch (e) {
-                const msg = e instanceof Error ? e.message : '';
-                that.urlIsFullPath = false;
-                that.root.logError('failed-to-compute-absolute-import-url', `Could not compute full path URL: ${msg}`);
-            }
-        }
         if (!that.urlIsFullPath) {
             return that.fatalResponse();
         }
@@ -196,6 +185,7 @@ class ImportsAndTablesStep {
         this.parseReferences = undefined;
     }
     step(that) {
+        var _a;
         const parseReq = this.parseStep.step(that);
         if (parseReq.parse === undefined) {
             return parseReq;
@@ -248,14 +238,17 @@ class ImportsAndTablesStep {
             }
             allMissing = { tables };
         }
-        const missingImports = that.root.importZone.getUndefined();
-        if (missingImports) {
+        const missingImports = ((_a = that.root.importZone.getUndefined()) !== null && _a !== void 0 ? _a : []).filter(url => that.root.pretranslatedModels.get(url) === undefined);
+        if (missingImports.length > 0) {
             allMissing = { ...allMissing, urls: missingImports };
         }
         if ((0, translate_response_1.isNeedResponse)(allMissing)) {
             return allMissing;
         }
         for (const child of that.childTranslators.values()) {
+            if (that.root.pretranslatedModels.get(child.sourceURL)) {
+                continue;
+            }
             const kidNeeds = child.importsAndTablesStep.step(child);
             if ((0, translate_response_1.isNeedResponse)(kidNeeds)) {
                 return kidNeeds;
@@ -311,6 +304,9 @@ class ASTStep {
         // Now make sure that every child has fully translated itself
         // before this tree is ready to also translate ...
         for (const child of that.childTranslators.values()) {
+            if (that.root.pretranslatedModels.get(child.sourceURL)) {
+                continue;
+            }
             const kidNeeds = child.astStep.step(child);
             if ((0, translate_response_1.isNeedResponse)(kidNeeds)) {
                 return kidNeeds;
@@ -460,6 +456,15 @@ class TranslateStep {
         if (this.response) {
             return this.response;
         }
+        const pretranslate = that.root.pretranslatedModels.get(that.sourceURL);
+        if (pretranslate !== undefined) {
+            that.modelDef = pretranslate;
+            return {
+                modelDef: pretranslate,
+                final: true,
+                fromSources: that.getDependencies(),
+            };
+        }
         // begin with the compiler flags of the model we are extending
         if (extendingModel && !this.importedAnnotations) {
             const tagParse = tags_1.Tag.annotationToTag(extendingModel.annotation, {
@@ -487,8 +492,6 @@ class TranslateStep {
                     }
                     else {
                         that.modelDef = docCompile.modelDef;
-                        that.queryList = docCompile.queryList;
-                        that.sqlBlocks = docCompile.sqlBlocks;
                         break;
                     }
                 }
@@ -505,10 +508,9 @@ class TranslateStep {
         }
         else {
             this.response = {
-                translated: {
-                    modelDef: that.modelDef,
-                    queryList: that.queryList,
-                    sqlBlocks: that.sqlBlocks,
+                modelDef: {
+                    ...that.modelDef,
+                    dependencies: that.getDependencyTree(),
                 },
                 fromSources: that.getDependencies(),
                 ...that.problemResponse(),
@@ -523,10 +525,10 @@ class MalloyTranslation {
         this.sourceURL = sourceURL;
         this.importBaseURL = importBaseURL;
         this.grammarRule = grammarRule;
-        this.queryList = [];
-        this.sqlBlocks = [];
+        this.sqlSources = [];
         this.imports = [];
         this.compilerFlags = new tags_1.Tag();
+        this._urlIsFullPath = undefined;
         /*
          Experimental dialect support, not confident this is how this should work.
       
@@ -544,6 +546,8 @@ class MalloyTranslation {
             name: sourceURL,
             exports: [],
             contents: {},
+            queryList: [],
+            dependencies: {},
         };
         /**
          * This is sort of the makefile for the translation, all the steps
@@ -563,18 +567,59 @@ class MalloyTranslation {
         this.translateStep = new TranslateStep(this.astStep);
         this.references = new reference_list_1.ReferenceList(sourceURL);
     }
+    get urlIsFullPath() {
+        if (this._urlIsFullPath === undefined) {
+            try {
+                const _checkFull = new URL(this.sourceURL);
+                this._urlIsFullPath = true;
+            }
+            catch (e) {
+                const msg = e instanceof Error ? e.message : '';
+                this._urlIsFullPath = false;
+                this.root.logError('failed-to-compute-absolute-import-url', `Could not compute full path URL: ${msg}`);
+            }
+        }
+        return this._urlIsFullPath;
+    }
     addChild(url) {
         if (!this.childTranslators.get(url)) {
             this.childTranslators.set(url, new MalloyChildTranslator(url, this.root));
         }
     }
     getDependencies() {
-        const dependencies = [this.sourceURL];
+        const dependencies = this.getDependencyTree();
+        return [this.sourceURL, ...flattenDependencyTree(dependencies)];
+    }
+    getDependencyTree() {
+        const pretranslated = this.root.pretranslatedModels.get(this.sourceURL);
+        if (pretranslated !== undefined) {
+            return pretranslated.dependencies;
+        }
+        const dependencies = {};
         for (const [_childURL, child] of this.childTranslators) {
-            dependencies.push(...child.getDependencies());
+            dependencies[_childURL] = child.getDependencyTree();
         }
         return dependencies;
     }
+    newlyTranslatedDependencies() {
+        const pretranslated = this.root.pretranslatedModels.get(this.sourceURL);
+        if (pretranslated !== undefined) {
+            return [];
+        }
+        const newModels = [];
+        for (const [url, child] of this.childTranslators) {
+            const pretranslated = this.root.pretranslatedModels.get(url);
+            if (pretranslated !== undefined) {
+                continue;
+            }
+            const result = child.translate();
+            if (result.modelDef) {
+                newModels.push({ url, modelDef: result.modelDef });
+                newModels.push(...child.newlyTranslatedDependencies());
+            }
+        }
+        return newModels;
+    }
     addReference(reference) {
         this.references.add(reference);
     }
@@ -677,7 +722,7 @@ class MalloyTranslation {
         const child = this.childTranslators.get(childURL);
         if (child) {
             const did = child.translate();
-            if (did.translated) {
+            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') {
@@ -699,6 +744,9 @@ class MalloyTranslation {
         }
         return attempt;
     }
+    translatorForDependency(url) {
+        return this.childTranslators.get(url);
+    }
     importAt(position) {
         // Here we assume that imports DO NOT overlap. And then we do a linear
         // search to find the one we're looking for.
@@ -812,6 +860,7 @@ class MalloyTranslator extends MalloyTranslation {
         this.eventStream = eventStream;
         this.schemaZone = new zone_1.Zone();
         this.importZone = new zone_1.Zone();
+        this.pretranslatedModels = new Map();
         this.sqlQueryZone = new zone_1.Zone();
         this.root = this;
         this.logger = new parse_log_1.BaseMessageLogger(eventStream);
@@ -824,6 +873,9 @@ class MalloyTranslator extends MalloyTranslation {
         this.schemaZone.updateFrom(dd.tables, (_a = dd.errors) === null || _a === void 0 ? void 0 : _a.tables);
         this.importZone.updateFrom(dd.urls, (_b = dd.errors) === null || _b === void 0 ? void 0 : _b.urls);
         this.sqlQueryZone.updateFrom(dd.compileSQL, (_c = dd.errors) === null || _c === void 0 ? void 0 : _c.compileSQL);
+        for (const url in dd.translations) {
+            this.pretranslatedModels.set(url, dd.translations[url]);
+        }
     }
     logError(code, parameters, options) {
         this.logger.log((0, parse_log_1.makeLogMessage)(code, parameters, { severity: 'error', ...options }));
@@ -851,4 +903,14 @@ class MalloyParserErrorHandler {
     }
 }
 exports.MalloyParserErrorHandler = MalloyParserErrorHandler;
+function flattenDependencyTree(dependencies) {
+    return [
+        ...Object.keys(dependencies),
+        ...Object.keys(dependencies)
+            .map(dependency => {
+            return flattenDependencyTree(dependencies[dependency]);
+        })
+            .flat(),
+    ];
+}
 //# sourceMappingURL=parse-malloy.js.map

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

@@ -228,9 +228,9 @@ describe('document annotation', () => {
       ## model2
     `);
         expect(m).toTranslate();
-        const model = (_a = m.translate()) === null || _a === void 0 ? void 0 : _a.translated;
+        const model = (_a = m.translate()) === null || _a === void 0 ? void 0 : _a.modelDef;
         expect(model).toBeDefined();
-        const notes = model === null || model === void 0 ? void 0 : model.modelDef.annotation;
+        const notes = model === null || model === void 0 ? void 0 : model.annotation;
         expect(notes).matchesAnnotation({ notes: ['## model1\n', '## model2\n'] });
     });
     test('ignores objectless object annotations', () => {
@@ -253,14 +253,14 @@ describe('document annotation', () => {
         expect(m.translator.compilerFlags.has('flagThis')).toBeTruthy();
     });
     test('extended models inherit model flags', () => {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const first = (0, test_translator_1.model) `## from=1\n`;
         expect(first).toTranslate();
-        const firstModel = (_b = (_a = first.translator.translate()) === null || _a === void 0 ? void 0 : _a.translated) === null || _b === void 0 ? void 0 : _b.modelDef;
+        const firstModel = (_a = first.translator.translate()) === null || _a === void 0 ? void 0 : _a.modelDef;
         expect(firstModel).toBeDefined();
         const second = (0, test_translator_1.model) `## from=2\n`;
         second.translator.internalModel = firstModel;
-        const secondModel = (_d = (_c = second.translator.translate()) === null || _c === void 0 ? void 0 : _c.translated) === null || _d === void 0 ? void 0 : _d.modelDef;
+        const secondModel = (_b = second.translator.translate()) === null || _b === void 0 ? void 0 : _b.modelDef;
         expect(secondModel === null || secondModel === void 0 ? void 0 : secondModel.annotation).matchesAnnotation({
             inherits: { notes: ['## from=1\n'] },
             notes: ['## from=2\n'],

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

@@ -222,8 +222,8 @@ describe('expressions', () => {
             test('x is expr y is not null', () => {
                 const isNullSrc = (0, test_translator_1.model) `source: xa is a extend { dimension: x is 1 y is not null }`;
                 expect(isNullSrc).toTranslate();
-                const xaModel = isNullSrc.translator.translate().translated;
-                const xa = (0, test_translator_1.getExplore)(xaModel.modelDef, 'xa');
+                const xaModel = isNullSrc.translator.translate().modelDef;
+                const xa = (0, test_translator_1.getExplore)(xaModel, 'xa');
                 const x = (0, test_translator_1.getFieldDef)(xa, 'x');
                 expect(x).toMatchObject({ e: { node: 'numberLiteral' } });
                 const y = (0, test_translator_1.getFieldDef)(xa, 'y');

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

@@ -31,6 +31,7 @@ const test_translator_1 = require("./test-translator");
 const escapeRegExp_1 = __importDefault(require("lodash/escapeRegExp"));
 describe('import:', () => {
     test('simple source', () => {
+        var _a;
         const docParse = new test_translator_1.TestTranslator('import "child"');
         const xr = docParse.unresolved();
         expect(docParse).toParse();
@@ -41,8 +42,12 @@ describe('import:', () => {
         expect(docParse).toTranslate();
         const aa = docParse.getSourceDef('aa');
         expect(aa).toBeDefined();
+        expect((_a = docParse.translate().modelDef) === null || _a === void 0 ? void 0 : _a.dependencies).toMatchObject({
+            'internal://test/langtests/child': {},
+        });
     });
     test('simple source with importBaseURL', () => {
+        var _a;
         const docParse = new test_translator_1.TestTranslator('import "child"', 'http://example.com/');
         const xr = docParse.unresolved();
         expect(docParse).toParse();
@@ -53,8 +58,12 @@ describe('import:', () => {
         expect(docParse).toTranslate();
         const aa = docParse.getSourceDef('aa');
         expect(aa).toBeDefined();
+        expect((_a = docParse.translate().modelDef) === null || _a === void 0 ? void 0 : _a.dependencies).toMatchObject({
+            'http://example.com/child': {},
+        });
     });
     test('simple query', () => {
+        var _a;
         const docParse = new test_translator_1.TestTranslator('import "child"');
         const xr = docParse.unresolved();
         expect(docParse).toParse();
@@ -67,6 +76,9 @@ describe('import:', () => {
         expect(docParse).toTranslate();
         const aq = docParse.getQuery('aq');
         expect(aq).toBeDefined();
+        expect((_a = docParse.translate().modelDef) === null || _a === void 0 ? void 0 : _a.dependencies).toMatchObject({
+            'internal://test/langtests/child': {},
+        });
     });
     test('query based source with named structref', () => {
         const docParse = new test_translator_1.TestTranslator(`
@@ -115,6 +127,7 @@ source: botProjQSrc is botProjQ
         expect(docParse).toLog((0, test_translator_1.errorMessage)(new RegExp((0, escapeRegExp_1.default)(reportedError))));
     });
     test('chained imports', () => {
+        var _a, _b;
         const docParse = new test_translator_1.TestTranslator('import "child"');
         docParse.update({
             urls: { 'internal://test/langtests/child': 'import "grandChild"' },
@@ -126,12 +139,27 @@ source: botProjQSrc is botProjQ
             urls: { 'internal://test/langtests/grandChild': '// empty file' },
         });
         expect(docParse).toTranslate();
-        const sources = docParse.translate().fromSources;
+        const translated = docParse.translate();
+        const sources = translated.fromSources;
         expect(sources).toEqual([
             'internal://test/langtests/root.malloy',
             'internal://test/langtests/child',
             'internal://test/langtests/grandChild',
         ]);
+        expect((_a = translated.modelDef) === null || _a === void 0 ? void 0 : _a.dependencies).toMatchObject({
+            'internal://test/langtests/child': {
+                'internal://test/langtests/grandChild': {},
+            },
+        });
+        const newDependencies = docParse.newlyTranslatedDependencies();
+        expect(newDependencies).toMatchObject([
+            { url: 'internal://test/langtests/child', modelDef: {} },
+            { url: 'internal://test/langtests/grandChild', modelDef: {} },
+        ]);
+        const child = docParse.translatorForDependency('internal://test/langtests/child');
+        expect((_b = child.translate().modelDef) === null || _b === void 0 ? void 0 : _b.dependencies).toMatchObject({
+            'internal://test/langtests/grandChild': {},
+        });
     });
     test('relative imports', () => {
         const docParse = new test_translator_1.TestTranslator('import "../parent.malloy"');

package/dist/lang/test/parse-expects.js

@@ -343,7 +343,7 @@ function checkForProblems(context, expectCompiles, s, ...msgs) {
     emsg += `\nSource:\n${src}`;
     m.compile();
     const t = m.translate();
-    if (t.translated && !expectCompiles) {
+    if (t.modelDef && !expectCompiles) {
         return { pass: false, message: () => emsg };
     }
     else if (t.problems === undefined) {

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

@@ -0,0 +1 @@
+import './parse-expects';

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

@@ -0,0 +1,80 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./parse-expects");
+const test_translator_1 = require("./test-translator");
+describe('pretranslated models', () => {
+    test('import of pretranslated', () => {
+        var _a, _b;
+        const docParse = new test_translator_1.TestTranslator('import "child"');
+        const xr = docParse.unresolved();
+        expect(docParse).toParse();
+        expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
+        docParse.update({
+            translations: {
+                'internal://test/langtests/child': {
+                    name: 'child',
+                    exports: ['foo'],
+                    queryList: [],
+                    contents: {
+                        foo: {
+                            type: 'table',
+                            tablePath: 'foo',
+                            connection: 'duckdb',
+                            dialect: 'duckdb',
+                            name: 'foo',
+                            fields: [],
+                        },
+                    },
+                    dependencies: {
+                        'internal://test/langtests/grandchild': {
+                            'internal://test/langtests/grandgrandchild1': {},
+                            'internal://test/langtests/grandgrandchild2': {},
+                        },
+                    },
+                },
+            },
+        });
+        expect(docParse).toTranslate();
+        const foo = docParse.getSourceDef('foo');
+        expect(foo).toBeDefined();
+        const translated = docParse.translate();
+        expect((_a = translated.modelDef) === null || _a === void 0 ? void 0 : _a.dependencies).toMatchObject({
+            'internal://test/langtests/child': {
+                'internal://test/langtests/grandchild': {
+                    'internal://test/langtests/grandgrandchild1': {},
+                    'internal://test/langtests/grandgrandchild2': {},
+                },
+            },
+        });
+        const newDependencies = docParse.newlyTranslatedDependencies();
+        expect(newDependencies).toMatchObject([]);
+        expect(translated.fromSources).toEqual([
+            'internal://test/langtests/root.malloy',
+            'internal://test/langtests/child',
+            'internal://test/langtests/grandchild',
+            'internal://test/langtests/grandgrandchild1',
+            'internal://test/langtests/grandgrandchild2',
+        ]);
+        const child = docParse.translatorForDependency('internal://test/langtests/child');
+        const childTranslated = child.translate();
+        expect((_b = childTranslated.modelDef) === null || _b === void 0 ? void 0 : _b.dependencies).toMatchObject({
+            'internal://test/langtests/grandchild': {
+                'internal://test/langtests/grandgrandchild1': {},
+                'internal://test/langtests/grandgrandchild2': {},
+            },
+        });
+        expect(childTranslated.fromSources).toEqual([
+            'internal://test/langtests/child',
+            'internal://test/langtests/grandchild',
+            'internal://test/langtests/grandgrandchild1',
+            'internal://test/langtests/grandgrandchild2',
+        ]);
+    });
+});
+//# sourceMappingURL=pretranslate.spec.js.map

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

@@ -985,8 +985,8 @@ describe('query:', () => {
       `);
             expect(m).toTranslate();
             const t = m.translate();
-            if (t.translated) {
-                const q = t.translated.queryList[0].pipeline[0];
+            if (t.modelDef) {
+                const q = t.modelDef.queryList[0].pipeline[0];
                 expect(q).toBeDefined();
                 if (q.type === 'reduce' && q.extendSource) {
                     expect(q.extendSource.length).toBe(1);
@@ -1010,8 +1010,8 @@ describe('query:', () => {
       `);
             expect(m).toTranslate();
             const t = m.translate();
-            if (t.translated) {
-                const q = t.translated.queryList[0].pipeline[0];
+            if (t.modelDef) {
+                const q = t.modelDef.queryList[0].pipeline[0];
                 if (q.type === 'reduce' && q.extendSource) {
                     expect(q.extendSource.length).toBe(1);
                     const f = q.extendSource[0];
@@ -1034,8 +1034,8 @@ describe('query:', () => {
       `);
             expect(m).toTranslate();
             const t = m.translate();
-            if (t.translated) {
-                const q = t.translated.queryList[0].pipeline[0];
+            if (t.modelDef) {
+                const q = t.modelDef.queryList[0].pipeline[0];
                 if (q.type === 'reduce' && q.extendSource) {
                     expect(q.extendSource.length).toBe(1);
                     expect((0, model_1.isJoined)(q.extendSource[0])).toBeTruthy();

package/dist/lang/test/sql-block.spec.js

@@ -127,7 +127,7 @@ describe('connection sql()', () => {
         expect(m).toParse();
     });
     test('source from extended sql-based-source', () => {
-        var _a, _b;
+        var _a;
         const model = new test_translator_1.TestTranslator(`
       source: sql_block is aConnection.sql("""${selStmt}""")
       source: malloy_source is sql_block extend { primary_key: ai }
@@ -135,14 +135,14 @@ describe('connection sql()', () => {
         const sql = (0, sql_block_1.makeSQLSentence)([{ sql: selStmt }], 'aConnection');
         model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
         expect(model).toTranslate();
-        const modelDef = (_b = (_a = model === null || model === void 0 ? void 0 : model.translate()) === null || _a === void 0 ? void 0 : _a.translated) === null || _b === void 0 ? void 0 : _b.modelDef;
+        const modelDef = (_a = model === null || model === void 0 ? void 0 : model.translate()) === null || _a === void 0 ? void 0 : _a.modelDef;
         // this tests the underlying api that .extendModel calls
         const extModel = new parse_malloy_1.MalloyTranslator('sqlblocktest://main');
         extModel.importZone.define('sqlblocktest://main', 'run: malloy_source -> { select: * }');
         const tr = extModel.translate(modelDef);
         // because extModel is not a TestTranslator we can't use the hotness
         expect(tr.problems).toEqual([]);
-        expect(tr.translated).toBeDefined();
+        expect(tr.modelDef).toBeDefined();
     });
 });
 //# sourceMappingURL=sql-block.spec.js.map

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

@@ -241,6 +241,8 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         this.internalModel = {
             name: testURI,
             exports: [],
+            queryList: [],
+            dependencies: {},
             contents: {
                 _db_: { type: 'connection', name: '_db_' },
                 a: { ...exports.aTableDef, primaryKey: 'astr', as: 'a' },
@@ -341,7 +343,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
     get nameSpace() {
         var _a;
         const gotModel = this.translate();
-        return ((_a = gotModel === null || gotModel === void 0 ? void 0 : gotModel.translated) === null || _a === void 0 ? void 0 : _a.modelDef.contents) || {};
+        return ((_a = gotModel === null || gotModel === void 0 ? void 0 : gotModel.modelDef) === null || _a === void 0 ? void 0 : _a.contents) || {};
     }
     exploreFor(exploreName) {
         const explore = this.nameSpace[exploreName];
@@ -352,9 +354,8 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
     }
     compile() {
         const compileTo = this.translate();
-        if (compileTo.translated && TestTranslator.inspectCompile) {
-            console.log('MODEL: ', pretty(compileTo.translated.modelDef));
-            console.log('QUERIES: ', pretty(compileTo.translated.queryList));
+        if (compileTo.modelDef && TestTranslator.inspectCompile) {
+            console.log('MODEL: ', pretty(compileTo.modelDef));
         }
         // All the stuff to ask the ast for a translation is already in TestTranslator
     }
@@ -362,19 +363,18 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         return this.importsAndTablesStep.step(this);
     }
     getSourceDef(srcName) {
-        var _a;
-        const t = this.translate().translated;
-        const s = (_a = t === null || t === void 0 ? void 0 : t.modelDef) === null || _a === void 0 ? void 0 : _a.contents[srcName];
+        const t = this.translate().modelDef;
+        const s = t === null || t === void 0 ? void 0 : t.contents[srcName];
         if (s && (0, malloy_types_1.isSourceDef)(s)) {
             return s;
         }
         return undefined;
     }
     getQuery(queryName) {
-        const t = this.translate().translated;
+        const t = this.translate().modelDef;
         if (t) {
             const s = typeof queryName === 'string'
-                ? t.modelDef.contents[queryName]
+                ? t.contents[queryName]
                 : t.queryList[queryName];
             if ((s === null || s === void 0 ? void 0 : s.type) === 'query') {
                 return s;

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

@@ -1,4 +1,4 @@
-import { Annotation, ModelDef, Query, SQLSentence, SQLSourceDef } from '../model/malloy_types';
+import { Annotation, ModelDef, SQLSentence } from '../model/malloy_types';
 import { MalloyElement } from './ast';
 import { LogMessage } from './parse-log';
 import { DocumentSymbol } from './parse-tree-walkers/document-symbol-walker';
@@ -55,11 +55,7 @@ interface HelpContext extends NeededData, ProblemResponse, FinalResponse {
 }
 export type HelpContextResponse = Partial<HelpContext>;
 interface TranslatedResponseData extends NeededData, ProblemResponse, FinalResponse {
-    translated: {
-        modelDef: ModelDef;
-        queryList: Query[];
-        sqlBlocks: SQLSourceDef[];
-    };
+    modelDef: ModelDef;
     fromSources: string[];
 }
 interface TablePath extends NeededData, ProblemResponse, FinalResponse {

package/dist/malloy.d.ts

@@ -165,12 +165,11 @@ export declare class MalloyError extends Error {
  */
 export declare class Model implements Taggable {
     private modelDef;
-    private queryList;
     readonly problems: LogMessage[];
     readonly fromSources: string[];
     _referenceAt: (location: ModelDocumentPosition) => DocumentReference | undefined;
     _importAt: (location: ModelDocumentPosition) => ImportLocation | undefined;
-    constructor(modelDef: ModelDef, queryList: InternalQuery[], problems: LogMessage[], fromSources: string[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined, importAt?: (location: ModelDocumentPosition) => ImportLocation | undefined);
+    constructor(modelDef: ModelDef, problems: LogMessage[], fromSources: string[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined, importAt?: (location: ModelDocumentPosition) => ImportLocation | undefined);
     tagParse(spec?: TagParseSpec): TagParse;
     getTaglines(prefix?: RegExp): string[];
     /**

package/dist/malloy.js

@@ -87,17 +87,19 @@ class Malloy {
         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.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));
+                if (result.modelDef) {
+                    return new Model(result.modelDef, 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 = {
                         name: 'modelDidNotCompile',
                         exports: [],
                         contents: {},
+                        dependencies: {},
+                        queryList: [],
                     };
                     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 || [];
@@ -273,6 +275,8 @@ class Malloy {
                 name: 'empty_model',
                 exports: [],
                 contents: {},
+                queryList: [],
+                dependencies: {},
             });
         }
         else if (preparedResult) {
@@ -358,9 +362,8 @@ exports.MalloyError = MalloyError;
  * A compiled Malloy document.
  */
 class Model {
-    constructor(modelDef, queryList, problems, fromSources, referenceAt = () => undefined, importAt = () => undefined) {
+    constructor(modelDef, problems, fromSources, referenceAt = () => undefined, importAt = () => undefined) {
         this.modelDef = modelDef;
-        this.queryList = queryList;
         this.problems = problems;
         this.fromSources = fromSources;
         this._referenceAt = referenceAt;
@@ -415,10 +418,10 @@ class Model {
         if (index < 0) {
             throw new Error(`Invalid index ${index}.`);
         }
-        else if (index >= this.queryList.length) {
+        else if (index >= this.modelDef.queryList.length) {
             throw new Error(`Query index ${index} is out of bounds.`);
         }
-        return new PreparedQuery(this.queryList[index], this.modelDef, this.problems);
+        return new PreparedQuery(this.modelDef.queryList[index], this.modelDef, this.problems);
     }
     /**
      * Retrieve a prepared query for the final unnamed query at the top level of a model.
@@ -434,10 +437,10 @@ class Model {
      * @return A prepared query.
      */
     getPreparedQuery() {
-        if (this.queryList.length === 0) {
+        if (this.modelDef.queryList.length === 0) {
             throw new Error('Model has no queries.');
         }
-        return new PreparedQuery(this.queryList[this.queryList.length - 1], this.modelDef, this.problems);
+        return new PreparedQuery(this.modelDef.queryList[this.modelDef.queryList.length - 1], this.modelDef, this.problems);
     }
     /**
      * Retrieve an `Explore` from the model by name.
@@ -1032,10 +1035,12 @@ class Explore extends Entity {
             name: 'generated_model',
             exports: [],
             contents: { [this.structDef.name]: this.structDef },
+            queryList: [],
+            dependencies: {},
         };
     }
     getSingleExploreModel() {
-        return new Model(this.modelDef, [], [], []);
+        return new Model(this.modelDef, [], []);
     }
     get fieldMap() {
         var _a;
@@ -1652,7 +1657,7 @@ class Runtime {
     //      be used in tests.
     _loadModelFromModelDef(modelDef, options) {
         return new ModelMaterializer(this, async () => {
-            return new Model(modelDef, [], [], []);
+            return new Model(modelDef, [], []);
         }, options);
     }
     /**

package/dist/model/malloy_types.d.ts

@@ -748,12 +748,17 @@ export type TypedDef = AtomicTypeDef | JoinFieldDef | TurtleDef | RefToField | S
 /** Get the output name for a NamedObject */
 export declare function getIdentifier(n: AliasedName): string;
 export type NamedModelObject = SourceDef | NamedQuery | FunctionDef | ConnectionDef;
+export interface DependencyTree {
+    [url: string]: DependencyTree;
+}
 /** Result of parsing a model file */
 export interface ModelDef {
     name: string;
     exports: string[];
     contents: Record<string, NamedModelObject>;
     annotation?: ModelAnnotation;
+    queryList: Query[];
+    dependencies: DependencyTree;
 }
 /** Very common record type */
 export type NamedSourceDefs = Record<string, SourceDef>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.225-dev250111002123",
+  "version": "0.0.225-dev250113200903",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",