@malloydata/malloy 0.0.55-dev230707183945 → 0.0.55

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

@@ -1,6 +1,6 @@
 import { CodePointCharStream, CommonTokenStream, ParserRuleContext, Token } from 'antlr4ts';
 import { ParseTree } from 'antlr4ts/tree';
-import { DocumentLocation, DocumentPosition, DocumentRange, DocumentReference, ModelDef, NamedModelObject, Query, SQLBlockStructDef, StructDef } from '../model/malloy_types';
+import { DocumentLocation, DocumentPosition, DocumentRange, DocumentReference, ImportLocation, ModelDef, NamedModelObject, Query, SQLBlockStructDef, StructDef } from '../model/malloy_types';
 import { LogMessage, MessageLog } from './parse-log';
 import { Zone, ZoneData } from './zone';
 import { ReferenceList } from './reference-list';
@@ -104,6 +104,7 @@ export declare abstract class MalloyTranslation {
     queryList: Query[];
     sqlBlocks: SQLBlockStructDef[];
     modelDef: ModelDef;
+    imports: ImportLocation[];
     readonly parseStep: ParseStep;
     readonly importsAndTablesStep: ImportsAndTablesStep;
     readonly astStep: ASTStep;
@@ -134,6 +135,8 @@ export declare abstract class MalloyTranslation {
     getChildExports(importURL: string): Record<string, NamedModelObject>;
     private finalAnswer?;
     translate(extendingModel?: ModelDef): TranslateResponse;
+    importAt(position: DocumentPosition): ImportLocation | undefined;
+    private buildImports;
     metadata(): MetadataResponse;
     completions(position: {
         line: number;

package/dist/lang/parse-malloy.js

@@ -61,6 +61,7 @@ const document_help_context_walker_1 = require("./parse-tree-walkers/document-he
 const reference_list_1 = require("./reference-list");
 const translate_response_1 = require("./translate-response");
 const parse_error_handler_1 = require("./parse-error-handler");
+const utils_1 = require("./utils");
 /**
  * This ignores a -> popMode when the mode stack is empty, which is a hack,
  * but it let's us parse }%
@@ -507,6 +508,7 @@ class MalloyTranslation {
         this.grammarRule = grammarRule;
         this.queryList = [];
         this.sqlBlocks = [];
+        this.imports = [];
         this.childTranslators = new Map();
         this.modelDef = {
             name: sourceURL,
@@ -642,9 +644,30 @@ class MalloyTranslation {
         const attempt = this.translateStep.step(this, extendingModel);
         if (attempt.final) {
             this.finalAnswer = attempt;
+            this.buildImports();
         }
         return attempt;
     }
+    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.
+        for (let index = 0; index < this.imports.length; index++) {
+            const imp = this.imports[index];
+            if ((0, utils_1.locationContainsPosition)(imp.location, position)) {
+                return imp;
+            }
+        }
+        return undefined;
+    }
+    buildImports() {
+        for (const [key, value] of Object.entries(this.root.importZone.location)) {
+            // Ignore any import in another file
+            if (value.url !== this.sourceURL) {
+                continue;
+            }
+            this.imports.push({ importURL: key, location: value });
+        }
+    }
     metadata() {
         return this.metadataStep.step(this);
     }

package/dist/lang/reference-list.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferenceList = void 0;
+const utils_1 = require("./utils");
 class ReferenceList {
     constructor(sourceURL) {
         this.sourceURL = sourceURL;
@@ -75,12 +76,7 @@ class ReferenceList {
             return undefined;
         }
         const reference = this.references[index];
-        if (reference.location.range.start.line <= position.line &&
-            reference.location.range.end.line >= position.line &&
-            (position.line !== reference.location.range.start.line ||
-                position.character >= reference.location.range.start.character) &&
-            (position.line !== reference.location.range.end.line ||
-                position.character <= reference.location.range.end.character)) {
+        if ((0, utils_1.locationContainsPosition)(reference.location, position)) {
             return reference;
         }
         return undefined;

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

@@ -2407,6 +2407,25 @@ describe('source references', () => {
         });
     });
 });
+describe('translate imports', () => {
+    test('import at', () => {
+        const source = (0, test_translator_1.markSource) `import ${'"myfile.malloy"'}`;
+        const m = new test_translator_1.TestTranslator(source.code);
+        const resp1 = m.translate();
+        expect(resp1.final).toBeUndefined();
+        m.update({
+            urls: {
+                'internal://test/langtests/myfile.malloy': 'query: ab -> { project: * }',
+            },
+        });
+        const resp2 = m.translate();
+        expect(resp2.final).toBeDefined();
+        const im = m.importAt({ line: 0, character: 10 });
+        expect(im === null || im === void 0 ? void 0 : im.importURL).toEqual('internal://test/langtests/myfile.malloy');
+        expect(im === null || im === void 0 ? void 0 : im.location.url).toEqual('internal://test/langtests/root.malloy');
+        expect(im === null || im === void 0 ? void 0 : im.location).toMatchObject(source.locations[0]);
+    });
+});
 describe('translation need error locations', () => {
     test('import error location', () => {
         const source = (0, test_translator_1.model) `import ${'"badfile"'}`;

package/dist/lang/utils.d.ts

@@ -0,0 +1,2 @@
+import { DocumentLocation, DocumentPosition } from '../model/malloy_types';
+export declare function locationContainsPosition(location: DocumentLocation, position: DocumentPosition): boolean;

package/dist/lang/utils.js

@@ -0,0 +1,35 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.locationContainsPosition = void 0;
+function locationContainsPosition(location, position) {
+    return (location.range.start.line <= position.line &&
+        location.range.end.line >= position.line &&
+        (position.line !== location.range.start.line ||
+            position.character >= location.range.start.character) &&
+        (position.line !== location.range.end.line ||
+            position.character <= location.range.end.character));
+}
+exports.locationContainsPosition = locationContainsPosition;
+//# sourceMappingURL=utils.js.map

package/dist/malloy.d.ts

@@ -2,7 +2,7 @@
 import { RunSQLOptions } from './run_sql_options';
 import { DocumentCompletion as DocumentCompletionDefinition, DocumentHighlight as DocumentHighlightDefinition, DocumentSymbol as DocumentSymbolDefinition, LogMessage, MalloyTranslator } from './lang';
 import { DocumentHelpContext } from './lang/parse-tree-walkers/document-help-context-walker';
-import { CompiledQuery, DocumentReference, FieldBooleanDef, FieldDateDef, FieldJSONDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SQLBlock, SQLBlockStructDef, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, FieldUnsupportedDef, QueryRunStats } from './model';
+import { CompiledQuery, DocumentReference, FieldBooleanDef, FieldDateDef, FieldJSONDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SQLBlock, SQLBlockStructDef, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, FieldUnsupportedDef, QueryRunStats, ImportLocation } from './model';
 import { Connection, InfoConnection, LookupConnection, ModelString, ModelURL, QueryString, QueryURL, URLReader } from './runtime_types';
 import { Taggable, Tags } from './tags';
 export interface Loggable {
@@ -149,8 +149,9 @@ export declare class Model implements Taggable {
     private queryList;
     private sqlBlocks;
     _referenceAt: (location: ModelDocumentPosition) => DocumentReference | undefined;
+    _importAt: (location: ModelDocumentPosition) => ImportLocation | undefined;
     readonly problems: LogMessage[];
-    constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlockStructDef[], problems: LogMessage[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined);
+    constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlockStructDef[], problems: LogMessage[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined, importAt?: (location: ModelDocumentPosition) => ImportLocation | undefined);
     getTags(): Tags;
     /**
      * Retrieve a document reference for the token at the given position within
@@ -160,6 +161,14 @@ export declare class Model implements Taggable {
      * @return A `DocumentReference` at that position if one exists.
      */
     getReference(position: ModelDocumentPosition): DocumentReference | undefined;
+    /**
+     * Retrieve an import for the token at the given position within
+     * the document that produced this model.
+     *
+     * @param position A position within the document.
+     * @return An `ImportLocation` at that position if one exists.
+     */
+    getImport(position: ModelDocumentPosition): ImportLocation | undefined;
     /**
      * Retrieve a prepared query by the name of a query at the top level of the model.
      *

package/dist/malloy.js

@@ -79,7 +79,7 @@ class Malloy {
             const result = translator.translate(model === null || model === void 0 ? void 0 : model._modelDef);
             if (result.final) {
                 if (result.translated) {
-                    return new Model(result.translated.modelDef, result.translated.queryList, result.translated.sqlBlocks, result.problems || [], (position) => translator.referenceAt(position));
+                    return new Model(result.translated.modelDef, result.translated.queryList, result.translated.sqlBlocks, result.problems || [], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
                 }
                 else {
                     const errors = result.problems || [];
@@ -317,11 +317,12 @@ exports.MalloyError = MalloyError;
  * A compiled Malloy document.
  */
 class Model {
-    constructor(modelDef, queryList, sqlBlocks, problems, referenceAt = () => undefined) {
+    constructor(modelDef, queryList, sqlBlocks, problems, referenceAt = () => undefined, importAt = () => undefined) {
         this.modelDef = modelDef;
         this.queryList = queryList;
         this.sqlBlocks = sqlBlocks;
         this._referenceAt = referenceAt;
+        this._importAt = importAt;
         this.problems = problems;
     }
     getTags() {
@@ -337,6 +338,16 @@ class Model {
     getReference(position) {
         return this._referenceAt(position);
     }
+    /**
+     * Retrieve an import for the token at the given position within
+     * the document that produced this model.
+     *
+     * @param position A position within the document.
+     * @return An `ImportLocation` at that position if one exists.
+     */
+    getImport(position) {
+        return this._importAt(position);
+    }
     /**
      * Retrieve a prepared query by the name of a query at the top level of the model.
      *

package/dist/model/malloy_types.d.ts

@@ -24,6 +24,10 @@ export interface DocumentPosition {
     line: number;
     character: number;
 }
+export interface ImportLocation {
+    importURL: string;
+    location: DocumentLocation;
+}
 export interface DocumentLocation {
     url: string;
     range: DocumentRange;

package/package.json

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