@malloydata/malloy 0.0.5 → 0.0.6-221108175803

package/dist/lang/ast/ast-main.js

@@ -616,6 +616,12 @@ class NamedSource extends Mallobj {
         if (this.isBlock) {
             return this.structDef();
         }
+        const modelEnt = this.modelEntry(this.ref);
+        if (modelEnt && !modelEnt.exported) {
+            // If we are not exporting the referenced structdef, don't
+            // use the reference
+            return this.structDef();
+        }
         return this.refName;
     }
     modelStruct() {

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

@@ -61,7 +61,7 @@ class BetaModel extends Testable {
             const s = typeof queryName == "string"
                 ? t.modelDef.contents[queryName]
                 : t.queryList[queryName];
-            if (s.type == "query") {
+            if ((s === null || s === void 0 ? void 0 : s.type) == "query") {
                 return s;
             }
         }
@@ -498,6 +498,29 @@ describe("model statements", () => {
             });
             expect(docParse).compileToFailWith("Cannot redefine 'astr'");
         });
+        test("source references expanded when not exported", () => {
+            const srcFiles = {
+                "internal://test/langtests/middle": `
+          import "bottom"
+          source: midSrc is from(bottomSrc -> { group_by: astr })
+        `,
+                "internal://test/langtests/bottom": `source: bottomSrc is table('aTable')`,
+            };
+            const fullModel = new BetaModel(`
+        import "middle"
+      `);
+            fullModel.update({ urls: srcFiles });
+            expect(fullModel).toTranslate();
+            const ms = fullModel.getSourceDef("midSrc");
+            expect(ms).toBeDefined();
+            if (ms) {
+                expect(ms.structSource.type).toBe("query");
+                if (ms.structSource.type == "query") {
+                    const qs = ms.structSource.query.structRef;
+                    expect(typeof qs).not.toBe("string");
+                }
+            }
+        });
     });
 });
 describe("explore properties", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.5",
+  "version": "0.0.6-221108175803",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",