@malloydata/malloy 0.0.83 → 0.0.84-dev230920141302

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

@@ -6,6 +6,7 @@ export interface MalloyParseInfo {
     tokenStream: CommonTokenStream;
     sourceStream: CodePointCharStream;
     sourceURL: string;
+    importBaseURL: string;
     rangeFromContext: (pcx: ParserRuleContext) => DocumentRange;
     malloyVersion: string;
 }

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

@@ -1254,7 +1254,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitImportStatement(pcx) {
         const url = this.getPlainString(pcx.importURL());
-        const importStmt = this.astAt(new ast.ImportStatement(url, this.parseInfo.sourceURL), pcx);
+        const importStmt = this.astAt(new ast.ImportStatement(url, this.parseInfo.importBaseURL), pcx);
         const selectCx = pcx.importSelect();
         if (selectCx) {
             for (const item of selectCx.importItem()) {

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

@@ -91,6 +91,7 @@ declare class TranslateStep implements TranslationStep {
 }
 export declare abstract class MalloyTranslation {
     readonly sourceURL: string;
+    readonly importBaseURL: string | null;
     grammarRule: string;
     abstract root: MalloyTranslator;
     childTranslators: Map<string, MalloyTranslation>;
@@ -107,7 +108,7 @@ export declare abstract class MalloyTranslation {
     readonly helpContextStep: HelpContextStep;
     readonly translateStep: TranslateStep;
     readonly references: ReferenceList;
-    constructor(sourceURL: string, grammarRule?: string);
+    constructor(sourceURL: string, importBaseURL?: string | null, grammarRule?: string);
     addChild(url: string): void;
     addReference(reference: DocumentReference): void;
     referenceAt(position: DocumentPosition): DocumentReference | undefined;
@@ -167,7 +168,7 @@ export declare class MalloyTranslator extends MalloyTranslation {
     logger: MessageLog;
     compilerFlags: Tag;
     readonly root: MalloyTranslator;
-    constructor(rootURL: string, preload?: ParseUpdate | null);
+    constructor(rootURL: string, importURL?: string | null, preload?: ParseUpdate | null);
     update(dd: ParseUpdate): void;
 }
 interface ErrorData {

package/dist/lang/parse-malloy.js

@@ -187,6 +187,7 @@ class ParseStep {
             tokenStream: tokenStream,
             sourceStream: inputStream,
             sourceURL: that.sourceURL,
+            importBaseURL: that.importBaseURL || that.sourceURL,
             rangeFromContext: cx => that.rangeFromContext(cx),
             // TODO put the real version here
             malloyVersion: '0.0.0-m4',
@@ -214,7 +215,7 @@ class ImportsAndTablesStep {
             for (const relativeRef in this.parseReferences.urls) {
                 const firstRef = this.parseReferences.urls[relativeRef];
                 try {
-                    const ref = decodeURI(new URL(relativeRef, that.sourceURL).toString());
+                    const ref = decodeURI(new URL(relativeRef, that.importBaseURL || that.sourceURL).toString());
                     that.addChild(ref);
                     that.root.importZone.reference(ref, {
                         url: that.sourceURL,
@@ -505,8 +506,9 @@ class TranslateStep {
     }
 }
 class MalloyTranslation {
-    constructor(sourceURL, grammarRule = 'malloyDocument') {
+    constructor(sourceURL, importBaseURL = null, grammarRule = 'malloyDocument') {
         this.sourceURL = sourceURL;
+        this.importBaseURL = importBaseURL;
         this.grammarRule = grammarRule;
         this.queryList = [];
         this.sqlBlocks = [];
@@ -759,8 +761,8 @@ exports.MalloyChildTranslator = MalloyChildTranslator;
  * no need to call again, the translation is finished or error'd.
  */
 class MalloyTranslator extends MalloyTranslation {
-    constructor(rootURL, preload = null) {
-        super(rootURL);
+    constructor(rootURL, importURL = null, preload = null) {
+        super(rootURL, importURL);
         this.schemaZone = new zone_1.Zone();
         this.importZone = new zone_1.Zone();
         this.sqlQueryZone = new zone_1.Zone();

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

@@ -41,6 +41,18 @@ describe('import:', () => {
         const aa = docParse.getSourceDef('aa');
         expect(aa).toBeDefined();
     });
+    test('simple source with importBaseURL', () => {
+        const docParse = new test_translator_1.TestTranslator('import "child"', 'http://example.com/');
+        const xr = docParse.unresolved();
+        expect(docParse).toParse();
+        expect(xr).toEqual({ urls: ['http://example.com/child'] });
+        docParse.update({
+            urls: { 'http://example.com/child': 'source: aa is a' },
+        });
+        expect(docParse).toTranslate();
+        const aa = docParse.getSourceDef('aa');
+        expect(aa).toBeDefined();
+    });
     test('simple query', () => {
         const docParse = new test_translator_1.TestTranslator('import "child"');
         const xr = docParse.unresolved();

package/dist/lang/test/test-translator.d.ts

@@ -28,7 +28,7 @@ export declare class TestTranslator extends MalloyTranslator {
     readonly testSrc: string;
     testRoot?: TestRoot;
     internalModel: ModelDef;
-    constructor(testSrc: string, rootRule?: string, internalModel?: ModelDef);
+    constructor(testSrc: string, importBaseURL?: string | null, rootRule?: string, internalModel?: ModelDef);
     translate(): TranslateResponse;
     addChild(url: string): void;
     ast(): MalloyElement | undefined;

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

@@ -204,8 +204,8 @@ class TestChildTranslator extends parse_malloy_1.MalloyChildTranslator {
 exports.TestChildTranslator = TestChildTranslator;
 const testURI = 'internal://test/langtests/root.malloy';
 class TestTranslator extends parse_malloy_1.MalloyTranslator {
-    constructor(testSrc, rootRule = 'malloyDocument', internalModel) {
-        super(testURI);
+    constructor(testSrc, importBaseURL = null, rootRule = 'malloyDocument', internalModel) {
+        super(testURI, importBaseURL);
         this.testSrc = testSrc;
         /*
          * All test source files can assume that an import of this
@@ -374,7 +374,7 @@ exports.TestTranslator = TestTranslator;
 TestTranslator.inspectCompile = false;
 class BetaExpression extends TestTranslator {
     constructor(src) {
-        super(src, 'justExpr');
+        super(src, null, 'justExpr');
     }
     testFS() {
         const aStruct = this.internalModel.contents['ab'];
@@ -477,7 +477,7 @@ function makeModelFunc(options) {
         return {
             ...ms,
             translator: new TestTranslator(((_a = options.prefix) !== null && _a !== void 0 ? _a : '') +
-                (options.wrap ? options.wrap(ms.code) : ms.code), undefined, options === null || options === void 0 ? void 0 : options.model),
+                (options.wrap ? options.wrap(ms.code) : ms.code), null, undefined, options === null || options === void 0 ? void 0 : options.model),
         };
     };
 }

package/dist/malloy.d.ts

@@ -11,6 +11,9 @@ export interface Loggable {
     warn: (message?: any, ...optionalParams: any[]) => void;
     error: (message?: any, ...optionalParams: any[]) => void;
 }
+export interface ParseOptions {
+    importBaseURL?: URL;
+}
 export declare class Malloy {
     static get version(): string;
     private static _log;
@@ -24,9 +27,10 @@ export declare class Malloy {
      * @param urlReader Object capable of fetching URL contents.
      * @return A (promise of a) `Parse` result.
      */
-    static parse({ url, urlReader, }: {
+    static parse({ url, urlReader, options, }: {
         url: URL;
         urlReader: URLReader;
+        options?: ParseOptions;
     }): Promise<Parse>;
     /**
      * Parse a Malloy document by contents.
@@ -35,9 +39,10 @@ export declare class Malloy {
      * @param source The contents of the Malloy document to parse.
      * @return A `Parse` result.
      */
-    static parse({ source, url }: {
+    static parse({ source, url, options, }: {
         url?: URL;
         source: string;
+        options?: ParseOptions;
     }): Parse;
     /**
      * Compile a parsed Malloy document.
@@ -700,7 +705,7 @@ export declare class Runtime {
      * @return A `ModelMaterializer` capable of materializing the requested model,
      * or loading further related objects.
      */
-    loadModel(source: ModelURL | ModelString): ModelMaterializer;
+    loadModel(source: ModelURL | ModelString, options?: ParseOptions): ModelMaterializer;
     _loadModelFromModelDef(modelDef: ModelDef): ModelMaterializer;
     /**
      * Load a Malloy query by URL or contents.
@@ -709,7 +714,7 @@ export declare class Runtime {
      * @return A `QueryMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadQuery(query: QueryURL | QueryString): QueryMaterializer;
+    loadQuery(query: QueryURL | QueryString, options?: ParseOptions): QueryMaterializer;
     /**
      * Load a Malloy query by the URL or contents of a Malloy model document
      * and the index of an unnamed query contained in the model.
@@ -719,7 +724,7 @@ export declare class Runtime {
      * @return A `QueryMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadQueryByIndex(model: ModelURL | ModelString, index: number): QueryMaterializer;
+    loadQueryByIndex(model: ModelURL | ModelString, index: number, options?: ParseOptions): QueryMaterializer;
     /**
      * Load a Malloy query by the URL or contents of a Malloy model document
      * and the name of a query contained in the model.
@@ -729,7 +734,7 @@ export declare class Runtime {
      * @return A `QueryMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadQueryByName(model: ModelURL | ModelString, name: string): QueryMaterializer;
+    loadQueryByName(model: ModelURL | ModelString, name: string, options?: ParseOptions): QueryMaterializer;
     /**
      * Load a SQL block by the URL or contents of a Malloy model document
      * and the name of a query contained in the model.
@@ -739,7 +744,7 @@ export declare class Runtime {
      * @return A `SQLBlockMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadSQLBlockByName(model: ModelURL | ModelString, name: string): SQLBlockMaterializer;
+    loadSQLBlockByName(model: ModelURL | ModelString, name: string, options?: ParseOptions): SQLBlockMaterializer;
     /**
      * Load a SQL block by the URL or contents of a Malloy model document
      * and the name of a query contained in the model.
@@ -749,21 +754,21 @@ export declare class Runtime {
      * @return A `SQLBlockMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadSQLBlockByIndex(model: ModelURL | ModelString, index: number): SQLBlockMaterializer;
+    loadSQLBlockByIndex(model: ModelURL | ModelString, index: number, options?: ParseOptions): SQLBlockMaterializer;
     /**
      * Compile a Malloy model by URL or contents.
      *
      * @param source The URL or contents of a Malloy model document to compile.
      * @return A promise of a compiled `Model`.
      */
-    getModel(source: ModelURL | ModelString): Promise<Model>;
+    getModel(source: ModelURL | ModelString, options?: ParseOptions): Promise<Model>;
     /**
      * Compile a Malloy query by URL or contents.
      *
      * @param query The URL or contents of a Malloy query document to compile.
      * @return A promise of a compiled `PreparedQuery`.
      */
-    getQuery(query: QueryURL | QueryString): Promise<PreparedQuery>;
+    getQuery(query: QueryURL | QueryString, options?: ParseOptions): Promise<PreparedQuery>;
     /**
      * Compile a Malloy query by the URL or contents of a model document
      * and the index of an unnamed query contained within the model.
@@ -772,7 +777,7 @@ export declare class Runtime {
      * @param index The index of an unnamed query contained within the model.
      * @return A promise of a compiled `PreparedQuery`.
      */
-    getQueryByIndex(model: ModelURL | ModelString, index: number): Promise<PreparedQuery>;
+    getQueryByIndex(model: ModelURL | ModelString, index: number, options?: ParseOptions): Promise<PreparedQuery>;
     /**
      * Compile a Malloy query by the URL or contents of a model document
      * and the name of a query contained within the model.
@@ -781,7 +786,7 @@ export declare class Runtime {
      * @param name The name of a query contained within the model.
      * @return A promise of a compiled `PreparedQuery`.
      */
-    getQueryByName(model: ModelURL | ModelString, name: string): Promise<PreparedQuery>;
+    getQueryByName(model: ModelURL | ModelString, name: string, options?: ParseOptions): Promise<PreparedQuery>;
     /**
      * 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.
@@ -790,7 +795,7 @@ export declare class Runtime {
      * @param name The name of the sql block to use within the model.
      * @return A promise of a `CompiledSQLBlock`.
      */
-    getSQLBlockByName(model: ModelURL | ModelString, name: string): Promise<SQLBlockStructDef>;
+    getSQLBlockByName(model: ModelURL | ModelString, name: string, options?: ParseOptions): Promise<SQLBlockStructDef>;
     /**
      * Get a SQL block by the URL or contents of a Malloy model document
      * and the name of a query contained in the model.
@@ -799,7 +804,7 @@ export declare class Runtime {
      * @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: ModelURL | ModelString, index: number): Promise<SQLBlockStructDef>;
+    getSQLBlockByIndex(model: ModelURL | ModelString, index: number, options?: ParseOptions): Promise<SQLBlockStructDef>;
 }
 export declare class ConnectionRuntime extends Runtime {
     readonly rawConnections: Connection[];
@@ -860,7 +865,7 @@ export declare class ModelMaterializer extends FluentState<Model> {
      * @return A `QueryMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadQuery(query: QueryString | QueryURL): QueryMaterializer;
+    loadQuery(query: QueryString | QueryURL, options?: ParseOptions): QueryMaterializer;
     /**
      * Extend a Malloy model by URL or contents.
      *
@@ -868,9 +873,9 @@ export declare class ModelMaterializer extends FluentState<Model> {
      * @return A `ModelMaterializer` capable of materializing the requested model,
      * or loading further related objects.
      */
-    extendModel(query: QueryString | QueryURL): ModelMaterializer;
+    extendModel(query: QueryString | QueryURL, options?: ParseOptions): ModelMaterializer;
     search(sourceName: string, searchTerm: string, limit?: number, searchField?: string | undefined): Promise<SearchIndexResult[] | undefined>;
-    searchValueMap(sourceName: string, limit?: number): Promise<SearchValueMapResult[] | undefined>;
+    searchValueMap(sourceName: string, limit?: number, options?: ParseOptions): Promise<SearchValueMapResult[] | undefined>;
     /**
      * Load a SQL Block by name.
      *
@@ -915,7 +920,7 @@ export declare class ModelMaterializer extends FluentState<Model> {
      * @param query The URL or contents of a query document to compile.
      * @return A promise to a prepared query.
      */
-    getQuery(query: QueryString | QueryURL): Promise<PreparedQuery>;
+    getQuery(query: QueryString | QueryURL, options?: ParseOptions): Promise<PreparedQuery>;
     /**
      * Get a SQL Block by name.
      *

package/dist/malloy.js

@@ -39,18 +39,22 @@ class Malloy {
     static setLogger(log) {
         Malloy._log = log;
     }
-    static _parse(source, url) {
+    static _parse(source, url, options) {
         if (url === undefined) {
             url = new URL('internal://internal.malloy');
         }
-        const translator = new lang_1.MalloyTranslator(url.toString(), {
+        let importBaseURL = url;
+        if (options === null || options === void 0 ? void 0 : options.importBaseURL) {
+            importBaseURL = options === null || options === void 0 ? void 0 : options.importBaseURL;
+        }
+        const translator = new lang_1.MalloyTranslator(url.toString(), importBaseURL.toString(), {
             urls: { [url.toString()]: source },
         });
         return new Parse(translator);
     }
-    static parse({ url, urlReader, source, }) {
+    static parse({ url, urlReader, source, options, }) {
         if (source !== undefined) {
-            return Malloy._parse(source, url);
+            return Malloy._parse(source, url, options);
         }
         else {
             if (urlReader === undefined) {
@@ -60,7 +64,7 @@ class Malloy {
                 throw new Error('Internal Error: url is required if source not present.');
             }
             return urlReader.readURL(url).then(source => {
-                return Malloy._parse(source, url);
+                return Malloy._parse(source, url, options);
             });
         }
     }
@@ -1484,15 +1488,17 @@ class Runtime {
      * @return A `ModelMaterializer` capable of materializing the requested model,
      * or loading further related objects.
      */
-    loadModel(source) {
+    loadModel(source, options) {
         return new ModelMaterializer(this, async () => {
             const parse = source instanceof URL
                 ? await Malloy.parse({
                     url: source,
                     urlReader: this.urlReader,
+                    options,
                 })
                 : Malloy.parse({
                     source,
+                    options,
                 });
             return Malloy.compile({
                 urlReader: this.urlReader,
@@ -1517,8 +1523,8 @@ class Runtime {
      * @return A `QueryMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadQuery(query) {
-        return this.loadModel(query).loadFinalQuery();
+    loadQuery(query, options) {
+        return this.loadModel(query, options).loadFinalQuery();
     }
     /**
      * Load a Malloy query by the URL or contents of a Malloy model document
@@ -1529,8 +1535,8 @@ class Runtime {
      * @return A `QueryMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadQueryByIndex(model, index) {
-        return this.loadModel(model).loadQueryByIndex(index);
+    loadQueryByIndex(model, index, options) {
+        return this.loadModel(model, options).loadQueryByIndex(index);
     }
     /**
      * Load a Malloy query by the URL or contents of a Malloy model document
@@ -1541,8 +1547,8 @@ class Runtime {
      * @return A `QueryMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadQueryByName(model, name) {
-        return this.loadModel(model).loadQueryByName(name);
+    loadQueryByName(model, name, options) {
+        return this.loadModel(model, options).loadQueryByName(name);
     }
     /**
      * Load a SQL block by the URL or contents of a Malloy model document
@@ -1553,8 +1559,8 @@ class Runtime {
      * @return A `SQLBlockMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadSQLBlockByName(model, name) {
-        return this.loadModel(model).loadSQLBlockByName(name);
+    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
@@ -1565,8 +1571,8 @@ class Runtime {
      * @return A `SQLBlockMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadSQLBlockByIndex(model, index) {
-        return this.loadModel(model).loadSQLBlockByIndex(index);
+    loadSQLBlockByIndex(model, index, options) {
+        return this.loadModel(model, options).loadSQLBlockByIndex(index);
     }
     // TODO maybe use overloads for the alternative parameters
     /**
@@ -1575,8 +1581,8 @@ class Runtime {
      * @param source The URL or contents of a Malloy model document to compile.
      * @return A promise of a compiled `Model`.
      */
-    getModel(source) {
-        return this.loadModel(source).getModel();
+    getModel(source, options) {
+        return this.loadModel(source, options).getModel();
     }
     /**
      * Compile a Malloy query by URL or contents.
@@ -1584,8 +1590,8 @@ class Runtime {
      * @param query The URL or contents of a Malloy query document to compile.
      * @return A promise of a compiled `PreparedQuery`.
      */
-    getQuery(query) {
-        return this.loadQuery(query).getPreparedQuery();
+    getQuery(query, options) {
+        return this.loadQuery(query, options).getPreparedQuery();
     }
     /**
      * Compile a Malloy query by the URL or contents of a model document
@@ -1595,8 +1601,8 @@ class Runtime {
      * @param index The index of an unnamed query contained within the model.
      * @return A promise of a compiled `PreparedQuery`.
      */
-    getQueryByIndex(model, index) {
-        return this.loadQueryByIndex(model, index).getPreparedQuery();
+    getQueryByIndex(model, index, options) {
+        return this.loadQueryByIndex(model, index, options).getPreparedQuery();
     }
     /**
      * Compile a Malloy query by the URL or contents of a model document
@@ -1606,8 +1612,8 @@ class Runtime {
      * @param name The name of a query contained within the model.
      * @return A promise of a compiled `PreparedQuery`.
      */
-    getQueryByName(model, name) {
-        return this.loadQueryByName(model, name).getPreparedQuery();
+    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
@@ -1617,8 +1623,8 @@ class Runtime {
      * @param name The name of the sql block to use within the model.
      * @return A promise of a `CompiledSQLBlock`.
      */
-    getSQLBlockByName(model, name) {
-        return this.loadSQLBlockByName(model, name).getSQLBlock();
+    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
@@ -1628,8 +1634,8 @@ class Runtime {
      * @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) {
-        return this.loadSQLBlockByIndex(model, index).getSQLBlock();
+    getSQLBlockByIndex(model, index, options) {
+        return this.loadSQLBlockByIndex(model, index, options).getSQLBlock();
     }
 }
 exports.Runtime = Runtime;
@@ -1742,7 +1748,7 @@ class ModelMaterializer extends FluentState {
      * @return A `QueryMaterializer` capable of materializing the requested query, running it,
      * or loading further related objects.
      */
-    loadQuery(query) {
+    loadQuery(query, options) {
         return this.makeQueryMaterializer(async () => {
             const urlReader = this.runtime.urlReader;
             const connections = this.runtime.connections;
@@ -1750,9 +1756,11 @@ class ModelMaterializer extends FluentState {
                 ? await Malloy.parse({
                     url: query,
                     urlReader,
+                    options,
                 })
                 : Malloy.parse({
                     source: query,
+                    options,
                 });
             const model = await this.getModel();
             const queryModel = await Malloy.compile({
@@ -1771,7 +1779,7 @@ class ModelMaterializer extends FluentState {
      * @return A `ModelMaterializer` capable of materializing the requested model,
      * or loading further related objects.
      */
-    extendModel(query) {
+    extendModel(query, options) {
         return new ModelMaterializer(this.runtime, async () => {
             const urlReader = this.runtime.urlReader;
             const connections = this.runtime.connections;
@@ -1779,9 +1787,11 @@ class ModelMaterializer extends FluentState {
                 ? await Malloy.parse({
                     url: query,
                     urlReader,
+                    options,
                 })
                 : Malloy.parse({
                     source: query,
+                    options,
                 });
             const model = await this.getModel();
             const queryModel = await Malloy.compile({
@@ -1804,7 +1814,7 @@ class ModelMaterializer extends FluentState {
         const connection = await this.runtime.connections.lookupConnection(connectionName);
         return await queryModel.searchIndex(connection, sourceName, searchTerm, limit, searchField);
     }
-    async searchValueMap(sourceName, limit = 10) {
+    async searchValueMap(sourceName, limit = 10, options) {
         const model = await this.materialize();
         const schema = model.getExploreByName(sourceName);
         if (schema.structDef.structRelationship.type !== 'basetable') {
@@ -1829,7 +1839,7 @@ class ModelMaterializer extends FluentState {
           limit: 1000
         }
     `;
-        const result = await this.loadQuery(searchMapMalloy).run({
+        const result = await this.loadQuery(searchMapMalloy, options).run({
             rowLimit: 1000,
         });
         return result._queryResult.result;
@@ -1892,8 +1902,8 @@ class ModelMaterializer extends FluentState {
      * @param query The URL or contents of a query document to compile.
      * @return A promise to a prepared query.
      */
-    getQuery(query) {
-        return this.loadQuery(query).getPreparedQuery();
+    getQuery(query, options) {
+        return this.loadQuery(query, options).getPreparedQuery();
     }
     /**
      * Get a SQL Block by name.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.83",
+  "version": "0.0.84-dev230920141302",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",