@malloydata/malloy 0.0.203-dev241021134413 → 0.0.203-dev241021171612

package/dist/lang/ast/query-builders/index-builder.d.ts

@@ -14,6 +14,7 @@ export declare class IndexBuilder implements QueryBuilder {
     sample?: Sampling;
     resultFS: IndexFieldSpace;
     inputFS: QueryInputSpace;
+    alwaysJoins: string[];
     readonly type = "index";
     constructor(inputFS: SourceFieldSpace, refineThis: PipeSegment | undefined, isNestIn: QueryOperationSpace | undefined, astEl: MalloyElement);
     execute(qp: QueryProperty): void;

package/dist/lang/ast/query-builders/index-builder.js

@@ -33,6 +33,7 @@ const index_field_space_1 = require("../field-space/index-field-space");
 class IndexBuilder {
     constructor(inputFS, refineThis, isNestIn, astEl) {
         this.filters = [];
+        this.alwaysJoins = [];
         this.type = 'index';
         this.resultFS = new index_field_space_1.IndexFieldSpace(inputFS, refineThis, isNestIn, astEl);
         this.inputFS = this.resultFS.inputSpace();
@@ -91,6 +92,9 @@ class IndexBuilder {
         if (this.sample) {
             indexSegment.sample = this.sample;
         }
+        if (this.alwaysJoins.length > 0) {
+            indexSegment.alwaysJoins = [...this.alwaysJoins];
+        }
         return indexSegment;
     }
 }

package/dist/lang/ast/query-builders/reduce-builder.d.ts

@@ -10,6 +10,7 @@ import { MalloyElement } from '../types/malloy-element';
 export declare abstract class QuerySegmentBuilder implements QueryBuilder {
     order?: Top | Ordering;
     limit?: number;
+    alwaysJoins: string[];
     abstract inputFS: QueryInputSpace;
     abstract resultFS: QueryOperationSpace;
     abstract readonly type: 'grouping' | 'project';

package/dist/lang/ast/query-builders/reduce-builder.js

@@ -33,6 +33,7 @@ const query_spaces_1 = require("../field-space/query-spaces");
 const definition_list_1 = require("../types/definition-list");
 class QuerySegmentBuilder {
     constructor() {
+        this.alwaysJoins = [];
         this.filters = [];
     }
     execute(qp) {
@@ -113,6 +114,9 @@ class QuerySegmentBuilder {
         else if (oldFilters) {
             to.filterList = [...oldFilters, ...this.filters];
         }
+        if (this.alwaysJoins.length > 0) {
+            to.alwaysJoins = [...this.alwaysJoins];
+        }
     }
 }
 exports.QuerySegmentBuilder = QuerySegmentBuilder;

package/dist/lang/ast/source-properties/join.js

@@ -179,6 +179,7 @@ class JoinStatement extends definition_list_1.DefinitionList {
     queryExecute(executeFor) {
         for (const qel of this.list) {
             executeFor.inputFS.extendSource(qel);
+            executeFor.alwaysJoins.push(qel.name.refString);
         }
     }
 }

package/dist/lang/ast/types/query-builder.d.ts

@@ -6,6 +6,7 @@ export interface QueryBuilder {
     type: 'grouping' | 'index' | 'project';
     inputFS: QueryInputSpace;
     resultFS: QueryOperationSpace;
+    alwaysJoins: string[];
     execute(qp: QueryProperty): void;
     finalize(refineFrom: PipeSegment | undefined): PipeSegment;
 }

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

@@ -419,9 +419,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return { joinAs, joinFrom: new ast.SQReference(joinAs), notes: [] };
     }
     visitQueryJoinStatement(pcx) {
-        const result = this.astAt(this.visit(pcx.joinStatement()), pcx);
-        this.m4advisory(pcx, 'join-statement-in-view', 'Joins in queries are deprecated, move into an `extend:` block.');
-        return result;
+        return this.astAt(this.visit(pcx.joinStatement()), pcx);
     }
     visitJoinOn(pcx) {
         var _a;

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

@@ -923,8 +923,13 @@ describe('query:', () => {
           source: a2 is a extend { ${'declare: x is 1'} }`).toLog((0, test_translator_1.warningMessage)('`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block'));
             });
             test('joins in query', () => {
-                expect((0, test_translator_1.markSource) `##! m4warnings=warn
-          run: a -> { ${'join_one: b on true'}; ${'join_many: c is b on true'}; ${'join_cross: d is b on true'}; group_by: b.astr }`).toLog((0, test_translator_1.warningMessage)('Joins in queries are deprecated, move into an `extend:` block.'), (0, test_translator_1.warningMessage)('Joins in queries are deprecated, move into an `extend:` block.'), (0, test_translator_1.warningMessage)('Joins in queries are deprecated, move into an `extend:` block.'));
+                expect((0, test_translator_1.markSource) `
+          run: a -> {
+            join_one: b on true
+            join_many: c is b on true
+            join_cross: d is b on true
+            group_by: b.astr
+          }`).toTranslate();
             });
         });
         test('refine query with extended source', () => {

package/dist/model/malloy_query.d.ts

@@ -264,6 +264,7 @@ declare class QueryQuery extends QueryField {
     expandFilters(resultStruct: FieldInstanceResult): void;
     generateSQLFilters(resultStruct: FieldInstanceResult, which: 'where' | 'having'): AndChain;
     prepare(_stageWriter: StageWriter | undefined): void;
+    addAlwaysJoins(rootResult: FieldInstanceResultRoot): void;
     getResultMetadata(fi: FieldInstance): ResultStructMetadataDef | ResultMetadataDef | undefined;
     /**  returns a fields and primary key of a struct for this query */
     getResultStructDef(resultStruct?: FieldInstanceResult, isRoot?: boolean): SourceDef;

package/dist/model/malloy_query.js

@@ -1802,10 +1802,24 @@ class QueryQuery extends QueryField {
             this.expandFields(this.rootResult);
             this.rootResult.addStructToJoin(this.parent, this, undefined, []);
             this.rootResult.findJoins(this);
+            this.addAlwaysJoins(this.rootResult);
             this.rootResult.calculateSymmetricAggregates();
             this.prepared = true;
         }
     }
+    addAlwaysJoins(rootResult) {
+        var _a;
+        const stage = this.fieldDef.pipeline[0];
+        if (stage.type !== 'raw') {
+            const alwaysJoins = (_a = stage.alwaysJoins) !== null && _a !== void 0 ? _a : [];
+            for (const joinName of alwaysJoins) {
+                const qs = this.parent.getChildByName(joinName);
+                if (qs instanceof QueryStruct) {
+                    rootResult.addStructToJoin(qs, this, undefined, []);
+                }
+            }
+        }
+    }
     // get the source fieldname and filters associated with the field (so we can drill later)
     getResultMetadata(fi) {
         if (fi instanceof FieldInstanceField) {

package/dist/model/malloy_types.d.ts

@@ -531,6 +531,7 @@ export interface IndexSegment extends Filtered {
     limit?: number;
     weightMeasure?: string;
     sample?: Sampling;
+    alwaysJoins?: string[];
 }
 export declare function isIndexSegment(pe: PipeSegment): pe is IndexSegment;
 export interface QuerySegment extends Filtered {
@@ -541,6 +542,7 @@ export interface QuerySegment extends Filtered {
     by?: By;
     orderBy?: OrderBy[];
     queryTimezone?: string;
+    alwaysJoins?: string[];
 }
 export interface TurtleDef extends NamedObject, Pipeline {
     type: 'turtle';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.203-dev241021134413",
+  "version": "0.0.203-dev241021171612",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",