@malloydata/malloy 0.0.123-dev240205152128 → 0.0.123-dev240205203117

package/dist/lang/ast/expressions/expr-aggregate-function.js

@@ -87,7 +87,8 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
                     // locality to be that join path
                     const joinUsage = this.getJoinUsage(inputFS);
                     const allUsagesSame = joinUsage.length === 1 ||
-                        joinUsage.slice(1).every(p => joinPathEq(p, joinUsage[0]));
+                        (joinUsage.length > 1 &&
+                            joinUsage.slice(1).every(p => joinPathEq(p, joinUsage[0])));
                     if (allUsagesSame) {
                         structPath = joinUsage[0].map(p => p.name);
                         sourceRelationship = joinUsage[0];
@@ -227,7 +228,6 @@ function getJoinUsage(fs, expr) {
     };
     (0, utils_1.exprWalk)(expr, frag => {
         if (typeof frag !== 'string') {
-            // TODO make this work for field references inside sql_* functions
             if (frag.type === 'field') {
                 const def = lookup(fs, frag.path);
                 if (def.def.type !== 'struct' && def.def.type !== 'turtle') {
@@ -240,6 +240,15 @@ function getJoinUsage(fs, expr) {
                     }
                 }
             }
+            else if (frag.type === 'source-reference') {
+                if (frag.path) {
+                    const def = lookup(fs, frag.path);
+                    result.push(def.relationship);
+                }
+                else {
+                    result.push([]);
+                }
+            }
         }
     });
     return result;

package/dist/lang/ast/view-elements/qop-desc-view.d.ts

@@ -16,4 +16,5 @@ export declare class QOpDescView extends View {
     pipelineComp(fs: FieldSpace, isNestIn?: QueryOperationSpace): PipelineComp;
     private getOp;
     refine(inputFS: FieldSpace, _pipeline: PipeSegment[], isNestIn: QueryOperationSpace | undefined): PipeSegment[];
+    getImplicitName(): string | undefined;
 }

package/dist/lang/ast/view-elements/qop-desc-view.js

@@ -93,6 +93,9 @@ class QOpDescView extends view_1.View {
         }
         return pipeline;
     }
+    getImplicitName() {
+        return undefined;
+    }
 }
 exports.QOpDescView = QOpDescView;
 //# sourceMappingURL=qop-desc-view.js.map

package/dist/lang/ast/view-elements/reference-view.d.ts

@@ -24,4 +24,5 @@ export declare class ReferenceView extends View {
     };
     private getRefinementSegment;
     refine(inputFS: FieldSpace, pipeline: PipeSegment[], _isNestIn: QueryOperationSpace | undefined): PipeSegment[];
+    getImplicitName(): string | undefined;
 }

package/dist/lang/ast/view-elements/reference-view.js

@@ -142,6 +142,9 @@ class ReferenceView extends view_1.View {
         // TODO better error pipeline
         return pipeline;
     }
+    getImplicitName() {
+        return this.reference.nameString;
+    }
 }
 exports.ReferenceView = ReferenceView;
 //# sourceMappingURL=reference-view.js.map

package/dist/lang/ast/view-elements/view-arrow.d.ts

@@ -16,4 +16,5 @@ export declare class ViewArrow extends View {
     constructor(base: View, operation: View);
     pipelineComp(fs: FieldSpace): PipelineComp;
     refine(_inputFS: FieldSpace, _pipeline: PipeSegment[], _isNestIn: QueryOperationSpace | undefined): PipeSegment[];
+    getImplicitName(): string | undefined;
 }

package/dist/lang/ast/view-elements/view-arrow.js

@@ -51,6 +51,9 @@ class ViewArrow extends view_1.View {
         this.log('A multi-segment view cannot be used as a refinement');
         return [];
     }
+    getImplicitName() {
+        return this.operation.getImplicitName();
+    }
 }
 exports.ViewArrow = ViewArrow;
 //# sourceMappingURL=view-arrow.js.map

package/dist/lang/ast/view-elements/view-refine.d.ts

@@ -16,4 +16,5 @@ export declare class ViewRefine extends View {
     constructor(base: View, refinement: View);
     pipelineComp(fs: FieldSpace, isNestIn?: QueryOperationSpace): PipelineComp;
     refine(inputFS: FieldSpace, pipeline: PipeSegment[], isNestIn: QueryOperationSpace | undefined): PipeSegment[];
+    getImplicitName(): string | undefined;
 }

package/dist/lang/ast/view-elements/view-refine.js

@@ -60,6 +60,9 @@ class ViewRefine extends view_1.View {
         }
         return (0, refine_utils_1.refine)(this, pipeline, refineFrom[0]);
     }
+    getImplicitName() {
+        return this.base.getImplicitName();
+    }
 }
 exports.ViewRefine = ViewRefine;
 //# sourceMappingURL=view-refine.js.map

package/dist/lang/ast/view-elements/view.d.ts

@@ -22,4 +22,5 @@ export declare abstract class View extends MalloyElement {
     abstract pipelineComp(fs: FieldSpace, isNestIn?: QueryOperationSpace): PipelineComp;
     pipeline(fs: FieldSpace, isNestIn?: QueryOperationSpace): PipeSegment[];
     abstract refine(inputFS: FieldSpace, pipeline: PipeSegment[], isNestIn: QueryOperationSpace | undefined): PipeSegment[];
+    abstract getImplicitName(): string | undefined;
 }

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

@@ -1532,21 +1532,11 @@ export declare class NestEntryContext extends ParserRuleContext {
     get ruleIndex(): number;
     copyFrom(ctx: NestEntryContext): void;
 }
-export declare class NestExistingContext extends NestEntryContext {
-    tags(): TagsContext;
-    fieldPath(): FieldPathContext;
-    PLUS(): TerminalNode | undefined;
-    vExpr(): VExprContext | undefined;
-    constructor(ctx: NestEntryContext);
-    enterRule(listener: MalloyParserListener): void;
-    exitRule(listener: MalloyParserListener): void;
-    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
-}
 export declare class NestDefContext extends NestEntryContext {
     tags(): TagsContext;
-    queryName(): QueryNameContext;
-    isDefine(): IsDefineContext;
     vExpr(): VExprContext;
+    queryName(): QueryNameContext | undefined;
+    isDefine(): IsDefineContext | undefined;
     constructor(ctx: NestEntryContext);
     enterRule(listener: MalloyParserListener): void;
     exitRule(listener: MalloyParserListener): void;