@malloydata/malloy 0.0.269-dev250423193223 → 0.0.269

package/dist/lang/parse-malloy.js

@@ -445,6 +445,8 @@ class TranslateStep {
                 modelDef: {
                     ...that.modelDef,
                     dependencies: that.getDependencyTree(),
+                    references: that.references.toArray(),
+                    imports: [...that.imports],
                 },
                 fromSources: that.getDependencies(),
                 ...that.problemResponse(),
@@ -548,7 +550,12 @@ class MalloyTranslation {
             }
             const result = child.translate();
             if (result.modelDef) {
-                newModels.push({ url, modelDef: result.modelDef });
+                const modelDef = {
+                    ...result.modelDef,
+                    references: child.references.toArray(),
+                    imports: [...child.imports],
+                };
+                newModels.push({ url, modelDef });
                 newModels.push(...child.newlyTranslatedDependencies());
             }
         }

package/dist/lang/reference-list.d.ts

@@ -1,10 +1,11 @@
 import type { DocumentPosition, DocumentReference } from '../model';
 export declare class ReferenceList {
     private readonly sourceURL;
-    constructor(sourceURL: string);
     private readonly references;
+    constructor(sourceURL: string, references?: DocumentReference[]);
     private findIndexBefore;
     add(reference: DocumentReference): void;
     private isPositionEqual;
     find(position: DocumentPosition): DocumentReference | undefined;
+    toArray(): DocumentReference[];
 }

package/dist/lang/reference-list.js

@@ -25,10 +25,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferenceList = void 0;
 const utils_1 = require("./utils");
 class ReferenceList {
-    constructor(sourceURL) {
+    constructor(sourceURL, 
+    // These should always be sorted by their end positions
+    references = []) {
         this.sourceURL = sourceURL;
-        // These should always be sorted by their end positions
-        this.references = [];
+        this.references = references;
     }
     findIndexBefore(position) {
         let low = 0;
@@ -81,6 +82,9 @@ class ReferenceList {
         }
         return undefined;
     }
+    toArray() {
+        return [...this.references];
+    }
 }
 exports.ReferenceList = ReferenceList;
 //# sourceMappingURL=reference-list.js.map

package/dist/malloy.d.ts

@@ -186,9 +186,8 @@ export declare class Model implements Taggable {
     private modelDef;
     readonly problems: LogMessage[];
     readonly 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);
+    private readonly references;
+    constructor(modelDef: ModelDef, problems: LogMessage[], fromSources: string[]);
     tagParse(spec?: TagParseSpec): MalloyTagParse;
     getTaglines(prefix?: RegExp): string[];
     /**

package/dist/malloy.js

@@ -31,6 +31,8 @@ const version_1 = require("./version");
 const uuid_1 = require("uuid");
 const annotation_1 = require("./annotation");
 const sql_block_1 = require("./model/sql_block");
+const utils_1 = require("./lang/utils");
+const reference_list_1 = require("./lang/reference-list");
 const MALLOY_INTERNAL_URL = 'internal://internal.malloy';
 class Malloy {
     static get version() {
@@ -104,9 +106,7 @@ class Malloy {
             const cached = await cacheManager.getCachedModelDef(urlReader, url.toString());
             if (cached) {
                 return new Model(cached.modelDef, [], // TODO when using a model from cache, should we also store the problems??
-                [url.toString(), ...flatDeps(cached.modelDef.dependencies)]
-                // TODO maybe implement referenceAt and importAt by re-translating the model?
-                );
+                [url.toString(), ...flatDeps(cached.modelDef.dependencies)]);
             }
         }
         importBaseURL !== null && importBaseURL !== void 0 ? importBaseURL : (importBaseURL = url);
@@ -146,7 +146,10 @@ class Malloy {
                             invalidationKeys,
                         }));
                     }
-                    return new Model(result.modelDef, result.problems || [], [...((_b = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _b !== void 0 ? _b : []), ...((_c = result.fromSources) !== null && _c !== void 0 ? _c : [])], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
+                    return new Model(result.modelDef, result.problems || [], [
+                        ...((_b = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _b !== void 0 ? _b : []),
+                        ...((_c = result.fromSources) !== null && _c !== void 0 ? _c : []),
+                    ]);
                 }
                 else if (noThrowOnError) {
                     const emptyModel = {
@@ -157,7 +160,10 @@ class Malloy {
                         queryList: [],
                     };
                     const modelFromCompile = (model === null || model === void 0 ? void 0 : model._modelDef) || emptyModel;
-                    return new Model(modelFromCompile, result.problems || [], [...((_d = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _d !== void 0 ? _d : []), ...((_e = result.fromSources) !== null && _e !== void 0 ? _e : [])], (position) => translator.referenceAt(position), (position) => translator.importAt(position));
+                    return new Model(modelFromCompile, result.problems || [], [
+                        ...((_d = model === null || model === void 0 ? void 0 : model.fromSources) !== null && _d !== void 0 ? _d : []),
+                        ...((_e = result.fromSources) !== null && _e !== void 0 ? _e : []),
+                    ]);
                 }
                 else {
                     const errors = result.problems || [];
@@ -404,12 +410,12 @@ exports.MalloyError = MalloyError;
  * A compiled Malloy document.
  */
 class Model {
-    constructor(modelDef, problems, fromSources, referenceAt = () => undefined, importAt = () => undefined) {
+    constructor(modelDef, problems, fromSources) {
+        var _a, _b;
         this.modelDef = modelDef;
         this.problems = problems;
         this.fromSources = fromSources;
-        this._referenceAt = referenceAt;
-        this._importAt = importAt;
+        this.references = new reference_list_1.ReferenceList((_a = fromSources[0]) !== null && _a !== void 0 ? _a : '', (_b = modelDef.references) !== null && _b !== void 0 ? _b : []);
     }
     tagParse(spec) {
         return (0, annotation_1.annotationToTag)(this.modelDef.annotation, spec);
@@ -425,7 +431,7 @@ class Model {
      * @return A `DocumentReference` at that position if one exists.
      */
     getReference(position) {
-        return this._referenceAt(position);
+        return this.references.find(position);
     }
     /**
      * Retrieve an import for the token at the given position within
@@ -435,7 +441,8 @@ class Model {
      * @return An `ImportLocation` at that position if one exists.
      */
     getImport(position) {
-        return this._importAt(position);
+        var _a;
+        return (_a = this.modelDef.imports) === null || _a === void 0 ? void 0 : _a.find(i => (0, utils_1.locationContainsPosition)(i.location, 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

@@ -780,6 +780,8 @@ export interface ModelDef {
     annotation?: ModelAnnotation;
     queryList: Query[];
     dependencies: DependencyTree;
+    references?: DocumentReference[];
+    imports?: ImportLocation[];
 }
 /** Very common record type */
 export type NamedSourceDefs = Record<string, SourceDef>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.269-dev250423193223",
+  "version": "0.0.269",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "^0.0.269-dev250423193223",
-    "@malloydata/malloy-interfaces": "^0.0.269-dev250423193223",
-    "@malloydata/malloy-tag": "^0.0.269-dev250423193223",
+    "@malloydata/malloy-filter": "^0.0.269",
+    "@malloydata/malloy-interfaces": "^0.0.269",
+    "@malloydata/malloy-tag": "^0.0.269",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",