@malloydata/malloy 0.0.163-dev240808193357 → 0.0.164-dev240808200109

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -135,6 +135,7 @@ import { QueryExtendStatementListContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
 import { IsExploreContext } from "./MalloyParser";
 import { MatrixOperationContext } from "./MalloyParser";
+import { JoinFromContext } from "./MalloyParser";
 import { JoinDefContext } from "./MalloyParser";
 import { JoinExpressionContext } from "./MalloyParser";
 import { FilterStatementContext } from "./MalloyParser";
@@ -1728,6 +1729,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitMatrixOperation?: (ctx: MatrixOperationContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.joinFrom`.
+     * @param ctx the parse tree
+     */
+    enterJoinFrom?: (ctx: JoinFromContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.joinFrom`.
+     * @param ctx the parse tree
+     */
+    exitJoinFrom?: (ctx: JoinFromContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.joinDef`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -135,6 +135,7 @@ import { QueryExtendStatementListContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
 import { IsExploreContext } from "./MalloyParser";
 import { MatrixOperationContext } from "./MalloyParser";
+import { JoinFromContext } from "./MalloyParser";
 import { JoinDefContext } from "./MalloyParser";
 import { JoinExpressionContext } from "./MalloyParser";
 import { FilterStatementContext } from "./MalloyParser";
@@ -1110,6 +1111,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitMatrixOperation?: (ctx: MatrixOperationContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.joinFrom`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitJoinFrom?: (ctx: JoinFromContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.joinDef`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.d.ts

@@ -91,7 +91,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.Joins;
     visitDefJoinCross(pcx: parse.DefJoinCrossContext): ast.Joins;
     protected getJoinList(pcx: parse.JoinListContext): ast.MalloyElement[];
-    protected getJoinSource(name: ast.ModelEntryReference, ecx: parse.IsExploreContext | undefined): {
+    protected getJoinFrom(cx: parse.JoinFromContext): {
+        joinAs: ast.ModelEntryReference;
         joinFrom: ast.SourceQueryElement;
         notes: Note[];
     };

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

@@ -407,13 +407,20 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     getJoinList(pcx) {
         return pcx.joinDef().map(jcx => this.visit(jcx));
     }
-    getJoinSource(name, ecx) {
+    getJoinFrom(cx) {
+        const ecx = cx.isExplore();
+        const joinAs = this.getModelEntryName(cx.joinNameDef());
         if (ecx) {
-            const joinSrc = this.getSqExpr(ecx.sqExpr());
+            const joinFrom = this.getSqExpr(ecx.sqExpr());
             const notes = this.getNotes(ecx._before_is).concat(this.getNotes(ecx._after_is));
-            return { joinFrom: joinSrc, notes };
+            return { joinFrom, notes, joinAs };
         }
-        return { joinFrom: new ast.SQReference(name), notes: [] };
+        const acx = cx.sourceArguments();
+        if (acx) {
+            const joinFrom = this.astAt(new ast.SQReference(joinAs, this.getSQArguments(acx)), cx);
+            return { joinFrom, notes: [], joinAs };
+        }
+        return { joinAs, joinFrom: new ast.SQReference(joinAs), notes: [] };
     }
     visitQueryJoinStatement(pcx) {
         const result = this.astAt(this.visit(pcx.joinStatement()), pcx);
@@ -422,8 +429,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitJoinOn(pcx) {
         var _a;
-        const joinAs = this.getModelEntryName(pcx.joinNameDef());
-        const { joinFrom, notes } = this.getJoinSource(joinAs, pcx.isExplore());
+        const { joinAs, joinFrom, notes } = this.getJoinFrom(pcx.joinFrom());
         const join = new ast.ExpressionJoin(joinAs, joinFrom);
         const onCx = pcx.joinExpression();
         const mop = ((_a = pcx.matrixOperation()) === null || _a === void 0 ? void 0 : _a.text.toLocaleLowerCase()) || 'left';
@@ -440,8 +446,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(join, pcx);
     }
     visitJoinWith(pcx) {
-        const joinAs = this.getModelEntryName(pcx.joinNameDef());
-        const { joinFrom, notes } = this.getJoinSource(joinAs, pcx.isExplore());
+        const { joinAs, joinFrom, notes } = this.getJoinFrom(pcx.joinFrom());
         const joinOn = this.getFieldExpr(pcx.fieldExpr());
         const join = new ast.KeyJoin(joinAs, joinFrom, joinOn);
         join.extendNote({ notes: this.getNotes(pcx).concat(notes) });

package/dist/lang/parse-tree-walkers/document-symbol-walker.js

@@ -232,7 +232,7 @@ class DocumentSymbolWalker {
     handleJoinDef(pcx) {
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
-            name: pcx.joinNameDef().id().text,
+            name: pcx.joinFrom().joinNameDef().id().text,
             type: 'join',
             children: [],
         };

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

@@ -286,7 +286,27 @@ describe('parameters', () => {
       run: ab_new(param is ${'ai'}) -> { select: * }
     `).translationToFailWith('`ai` is not defined');
     });
-    test('can pass through parameter to joined source', () => {
+    test('can pass through parameter to joined source (shorthand)', () => {
+        expect(`
+      ##! experimental.parameters
+      source: ab_ext_1(a_1::string) is ab extend {
+        where: ai = a_1
+      }
+
+      source: ab_ext_2(a_2::string) is ab extend {
+        where: ai = a_2
+        join_many: ab_ext_1(a_1 is a_2) on 1 = 1
+      }
+
+      run: ab_ext_2(a_2 is "CA") -> {
+        group_by:
+          a1 is ai,
+          a2 is ab_ext_1.ai
+        aggregate: c is count()
+      }
+    `).toTranslate();
+    });
+    test('can pass through parameter to joined source (longhand)', () => {
         expect(`
       ##! experimental.parameters
       source: ab_ext_1(a_1::string) is ab extend {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.163-dev240808193357",
+  "version": "0.0.164-dev240808200109",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",