@malloydata/malloy 0.0.101-dev231110210501 → 0.0.101-dev231110221413

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

@@ -112,6 +112,7 @@ export declare abstract class MalloyTranslation {
     readonly references: ReferenceList;
     constructor(sourceURL: string, importBaseURL?: string | null, grammarRule?: string);
     addChild(url: string): void;
+    getDependencies(): string[];
     addReference(reference: DocumentReference): void;
     referenceAt(position: DocumentPosition): DocumentReference | undefined;
     /**
@@ -134,7 +135,6 @@ export declare abstract class MalloyTranslation {
     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

@@ -217,6 +217,10 @@ class ImportsAndTablesStep {
                 try {
                     const ref = decodeURI(new URL(relativeRef, that.importBaseURL || that.sourceURL).toString());
                     that.addChild(ref);
+                    that.imports.push({
+                        importURL: ref,
+                        location: { url: that.sourceURL, range: firstRef },
+                    });
                     that.root.importZone.reference(ref, {
                         url: that.sourceURL,
                         range: firstRef,
@@ -507,6 +511,7 @@ class TranslateStep {
                     queryList: that.queryList,
                     sqlBlocks: that.sqlBlocks,
                 },
+                fromSources: that.getDependencies(),
                 ...that.problemResponse(),
                 final: true,
             };
@@ -550,6 +555,13 @@ class MalloyTranslation {
             this.childTranslators.set(url, new MalloyChildTranslator(url, this.root));
         }
     }
+    getDependencies() {
+        const dependencies = [this.sourceURL];
+        for (const [_childURL, child] of this.childTranslators) {
+            dependencies.push(...child.getDependencies());
+        }
+        return dependencies;
+    }
     addReference(reference) {
         this.references.add(reference);
     }
@@ -671,7 +683,6 @@ class MalloyTranslation {
         const attempt = this.translateStep.step(this, extendingModel);
         if (attempt.final) {
             this.finalAnswer = attempt;
-            this.buildImports();
         }
         return attempt;
     }
@@ -686,15 +697,6 @@ class MalloyTranslation {
         }
         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/test/imports.spec.js

@@ -120,6 +120,16 @@ source: botProjQSrc is botProjQ
         const xr = docParse.unresolved();
         expect(docParse).toParse();
         expect(xr).toEqual({ urls: ['internal://test/langtests/grandChild'] });
+        docParse.update({
+            urls: { 'internal://test/langtests/grandChild': '// empty file' },
+        });
+        expect(docParse).toTranslate();
+        const sources = docParse.translate().fromSources;
+        expect(sources).toEqual([
+            'internal://test/langtests/root.malloy',
+            'internal://test/langtests/child',
+            'internal://test/langtests/grandChild',
+        ]);
     });
     test('relative imports', () => {
         const docParse = new test_translator_1.TestTranslator('import "../parent.malloy"');

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

@@ -57,6 +57,7 @@ interface TranslatedResponseData extends NeededData, ProblemResponse, FinalRespo
         queryList: Query[];
         sqlBlocks: SQLBlockStructDef[];
     };
+    fromSources: string[];
 }
 export type TranslateResponse = Partial<TranslatedResponseData>;
 export {};

package/package.json

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