@malloydata/malloy 0.0.421 → 0.0.423

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

@@ -51,6 +51,7 @@ const malloy_tag_1 = require("@malloydata/malloy-tag");
 const utils_1 = require("./utils");
 const malloy_filter_1 = require("@malloydata/malloy-filter");
 const timing_1 = require("../timing");
+const noteable_1 = require("./ast/types/noteable");
 class ErrorNode extends ast.SourceQueryElement {
     constructor() {
         super(...arguments);
@@ -290,7 +291,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const defs = defsCx.map(dcx => this.visitSourceDefinition(dcx));
         const blockNotes = this.getNotes(pcx.tags());
         const defList = new ast.DefineSourceList(defs);
-        defList.extendNote({ blockNotes });
+        (0, noteable_1.extendOwnAnnotation)(defList, { blockNotes });
         return defList;
     }
     visitDefineGivenStatement(pcx) {
@@ -300,7 +301,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const blockNotes = this.getNotes(pcx.tags());
         const block = new ast.DefineGivens(givens);
         for (const g of givens) {
-            g.extendNote({ blockNotes });
+            (0, noteable_1.extendOwnAnnotation)(g, { blockNotes });
         }
         return this.astAt(block, pcx);
     }
@@ -342,7 +343,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const decl = new ast.GivenDeclaration(name, typeDef, defVal, inline);
-        decl.extendNote({ notes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(decl, { notes: this.getNotes(pcx.tags()) });
         return this.astAt(decl, pcx);
     }
     /**
@@ -390,14 +391,14 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const defs = defsCx.map(dcx => this.visitUserTypeDefinition(dcx));
         const blockNotes = this.getNotes(pcx.tags());
         const defList = new ast.DefineUserTypeList(defs);
-        defList.extendNote({ blockNotes });
+        (0, noteable_1.extendOwnAnnotation)(defList, { blockNotes });
         return defList;
     }
     visitUserTypeDefinition(pcx) {
         const shape = this.getUserTypeShapeExpr(pcx.userTypeExpr());
         const def = new ast.DefineUserType((0, parse_utils_1.getId)(pcx.userTypeNameDef()), shape, true);
         const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
-        def.extendNote({ notes });
+        (0, noteable_1.extendOwnAnnotation)(def, { notes });
         return this.astAt(def, pcx);
     }
     getUserTypeShapeExpr(cx) {
@@ -437,7 +438,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             member = new ast.UserTypeMemberDef(name, typeResult);
         }
         const notes = this.getNotes(pcx.tags());
-        member.extendNote({ notes });
+        (0, noteable_1.extendOwnAnnotation)(member, { notes });
         return this.astAt(member, pcx);
     }
     getUserTypeFieldType(pcx) {
@@ -523,7 +524,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const params = this.getSourceParameters(pcx.sourceParameters());
         const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), exploreExpr instanceof ast.SourceQueryElement ? exploreExpr : undefined, true, params);
         const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
-        exploreDef.extendNote({ notes });
+        (0, noteable_1.extendOwnAnnotation)(exploreDef, { notes });
         return this.astAt(exploreDef, pcx);
     }
     getSourceExtensions(extensions) {
@@ -581,7 +582,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinMany = new ast.JoinStatement(joins, accessLabel);
-        joinMany.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(joinMany, { blockNotes: this.getNotes(pcx.tags()) });
         return joinMany;
     }
     visitDefJoinOne(pcx) {
@@ -597,7 +598,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinOne = new ast.JoinStatement(joins, accessLabel);
-        joinOne.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(joinOne, { blockNotes: this.getNotes(pcx.tags()) });
         return joinOne;
     }
     visitDefJoinCross(pcx) {
@@ -616,7 +617,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinCross = new ast.JoinStatement(joins, accessLabel);
-        joinCross.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(joinCross, { blockNotes: this.getNotes(pcx.tags()) });
         return joinCross;
     }
     getJoinList(pcx) {
@@ -655,14 +656,14 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         if (onCx) {
             join.joinOn = this.getFieldExpr(onCx);
         }
-        join.extendNote({ notes: this.getNotes(pcx.tags()).concat(notes) });
+        (0, noteable_1.extendOwnAnnotation)(join, { notes: this.getNotes(pcx.tags()).concat(notes) });
         return this.astAt(join, pcx);
     }
     visitJoinWith(pcx) {
         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.tags()).concat(notes) });
+        (0, noteable_1.extendOwnAnnotation)(join, { notes: this.getNotes(pcx.tags()).concat(notes) });
         return this.astAt(join, pcx);
     }
     getFieldDef(pcx, makeFieldDef) {
@@ -671,14 +672,14 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const valExpr = this.getFieldExpr(defCx);
         const def = new makeFieldDef(valExpr, fieldName, this.getSourceCode(defCx));
         const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
-        def.extendNote({ notes });
+        (0, noteable_1.extendOwnAnnotation)(def, { notes });
         return this.astAt(def, pcx);
     }
     visitDefDimensions(pcx) {
         const accessLabel = this.getAccessLabel(pcx.accessLabel());
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DimensionFieldDeclaration);
         const stmt = new ast.Dimensions(defs, accessLabel);
-        stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(stmt, { blockNotes: this.getNotes(pcx.tags()) });
         return this.astAt(stmt, pcx);
     }
     getAccessLabel(pcx) {
@@ -707,7 +708,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const accessLabel = this.getAccessLabel(pcx.accessLabel());
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.MeasureFieldDeclaration);
         const stmt = new ast.Measures(defs, accessLabel);
-        stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(stmt, { blockNotes: this.getNotes(pcx.tags()) });
         return this.astAt(stmt, pcx);
     }
     visitQueryExtend(pcx) {
@@ -732,7 +733,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const oldName = pcx.fieldName(1);
         const rename = new ast.RenameField((0, parse_utils_1.getId)(newName), this.getFieldName(oldName));
         const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
-        rename.extendNote({ notes });
+        (0, noteable_1.extendOwnAnnotation)(rename, { notes });
         return this.astAt(rename, pcx);
     }
     visitDefExploreRename(pcx) {
@@ -741,7 +742,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const renames = rcxs.map(rcx => this.visitRenameEntry(rcx));
         const stmt = new ast.Renames(renames, accessLabel);
         const blockNotes = this.getNotes(pcx.tags());
-        stmt.extendNote({ blockNotes });
+        (0, noteable_1.extendOwnAnnotation)(stmt, { blockNotes });
         return this.astAt(stmt, pcx);
     }
     visitFilterClauseList(pcx) {
@@ -772,7 +773,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             .map(cx => this.visitExploreQueryDef(cx));
         const queryDefs = new ast.Views(babyTurtles, accessLabel);
         const blockNotes = this.getNotes(pcx.tags());
-        queryDefs.extendNote({ blockNotes });
+        (0, noteable_1.extendOwnAnnotation)(queryDefs, { blockNotes });
         return queryDefs;
     }
     visitDefExplorePrimaryKey(pcx) {
@@ -844,17 +845,17 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitAggregateStatement(pcx) {
         const agStmt = new ast.Aggregate(this.getQueryItems(pcx.queryFieldList(), ast.AggregateFieldDeclaration, ast.AggregateFieldReference));
-        agStmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(agStmt, { blockNotes: this.getNotes(pcx.tags()) });
         return agStmt;
     }
     visitGroupByStatement(pcx) {
         const groupBy = new ast.GroupBy(this.getQueryItems(pcx.queryFieldList(), ast.GroupByFieldDeclaration, ast.GroupByFieldReference));
-        groupBy.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(groupBy, { blockNotes: this.getNotes(pcx.tags()) });
         return groupBy;
     }
     visitCalculateStatement(pcx) {
         const stmt = new ast.Calculate(this.getQueryItems(pcx.queryFieldList(), ast.CalculateFieldDeclaration, ast.CalculateFieldReference));
-        stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(stmt, { blockNotes: this.getNotes(pcx.tags()) });
         return stmt;
     }
     getTaggedRef(pcx, makeFieldDef, makeFieldRef) {
@@ -879,11 +880,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 }
             }
             const def = new makeFieldDef(expr, ref.outputName);
-            def.extendNote({ notes: this.getNotes(pcx.tags()) });
+            (0, noteable_1.extendOwnAnnotation)(def, { notes: this.getNotes(pcx.tags()) });
             return def;
         }
         const ref = this.getFieldPath(pcx.fieldPath(), makeFieldRef);
-        ref.extendNote({ notes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(ref, { notes: this.getNotes(pcx.tags()) });
         return ref;
     }
     getFieldCollectionMember(pcx, makeFieldDef, makeFieldRef) {
@@ -910,7 +911,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitProjectStatement(pcx) {
         const stmt = this.visitFieldCollection(pcx.fieldCollection());
-        stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(stmt, { blockNotes: this.getNotes(pcx.tags()) });
         return stmt;
     }
     visitCollectionWildCard(pcx) {
@@ -1021,7 +1022,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             .map(cx => this.visitTopLevelQueryDef(cx));
         const blockNotes = this.getNotes(pcx.tags());
         const queryDefs = new ast.DefineQueryList(stmts);
-        queryDefs.extendNote({ blockNotes });
+        (0, noteable_1.extendOwnAnnotation)(queryDefs, { blockNotes });
         return queryDefs;
     }
     visitTopLevelQueryDef(pcx) {
@@ -1030,7 +1031,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
         if (queryExpr instanceof ast.SourceQueryElement) {
             const queryDef = new ast.DefineQuery(queryName, queryExpr);
-            queryDef.extendNote({ notes });
+            (0, noteable_1.extendOwnAnnotation)(queryDef, { notes });
             return this.astAt(queryDef, pcx);
         }
         throw this.internalError(pcx, `Expected query definition, got a '${queryExpr.elementType}'`);
@@ -1041,12 +1042,12 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const theQuery = this.astAt(new ast.AnonymousQuery(query), defCx);
         const notes = this.getNotes(pcx.topLevelAnonQueryDef().tags());
         const blockNotes = this.getNotes(pcx.tags());
-        theQuery.extendNote({ notes, blockNotes });
+        (0, noteable_1.extendOwnAnnotation)(theQuery, { notes, blockNotes });
         return this.astAt(theQuery, pcx);
     }
     visitNestStatement(pcx) {
         const nests = this.visitNestedQueryList(pcx.nestedQueryList());
-        nests.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
+        (0, noteable_1.extendOwnAnnotation)(nests, { blockNotes: this.getNotes(pcx.tags()) });
         return nests;
     }
     visitNestedQueryList(pcx) {
@@ -1068,7 +1069,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         const nestDef = new ast.NestFieldDeclaration(name, vExpr);
         const isDefineCx = pcx.isDefine();
-        nestDef.extendNote({
+        (0, noteable_1.extendOwnAnnotation)(nestDef, {
             notes: this.getNotes(pcx.tags()).concat(isDefineCx ? this.getIsNotes(isDefineCx) : []),
         });
         return this.astAt(nestDef, pcx);
@@ -1077,7 +1078,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const name = (0, parse_utils_1.getId)(pcx.exploreQueryNameDef());
         const queryDef = new ast.ViewFieldDeclaration(name, this.getVExpr(pcx.vExpr()));
         const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
-        queryDef.extendNote({ notes });
+        (0, noteable_1.extendOwnAnnotation)(queryDef, { notes });
         return this.astAt(queryDef, pcx);
     }
     visitExprNot(pcx) {
@@ -1678,7 +1679,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             const kind = this.getAccessLabelProp(pcx.accessLabelProp());
             const fieldList = this.getIncludeList(listCx);
             const item = this.astAt(new ast.IncludeAccessItem(kind, fieldList), pcx);
-            item.extendNote({ blockNotes });
+            (0, noteable_1.extendOwnAnnotation)(item, { blockNotes });
             return item;
         }
     }
@@ -1724,7 +1725,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             throw this.internalError(pcx, 'Expected a field name or wildcard');
         }
         const item = this.astAt(new ast.IncludeListItem(reference, as === null || as === void 0 ? void 0 : as.refString), pcx);
-        item.extendNote({ notes });
+        (0, noteable_1.extendOwnAnnotation)(item, { notes });
         return item;
     }
     visitSQParens(pcx) {

package/dist/lang/test/test-translator.d.ts

@@ -20,6 +20,7 @@ export declare function humanify(value: unknown): string;
 export declare const TEST_DIALECT = "duckdb";
 export declare const aTableDef: TableSourceDef;
 export declare const bqTableDef: SourceDef;
+export declare const pgTableDef: SourceDef;
 /**
  * A TestTranlator never actually talks to connection, instead uses
  * some mocked schema definitions.

package/dist/lang/test/test-translator.js

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.mockSchema = exports.bqTableDef = exports.aTableDef = exports.TEST_DIALECT = void 0;
+exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.mockSchema = exports.pgTableDef = exports.bqTableDef = exports.aTableDef = exports.TEST_DIALECT = void 0;
 exports.pretty = pretty;
 exports.humanify = humanify;
 exports.getExplore = getExplore;
@@ -171,6 +171,17 @@ exports.bqTableDef = {
     connection: '_bq_',
     fields: baseFields,
 };
+// Postgres table definition — Postgres is the only dialect with
+// `hasFinalStage = true`, so it is the one that exercises the persist-source
+// finalize=false path (see PersistSource.getSQL).
+exports.pgTableDef = {
+    type: 'table',
+    name: 'aTable',
+    dialect: 'postgres',
+    tablePath: 'aTable',
+    connection: '_pg_',
+    fields: baseFields,
+};
 /**
  * A TestTranlator never actually talks to connection, instead uses
  * some mocked schema definitions.
@@ -178,6 +189,7 @@ exports.bqTableDef = {
 exports.mockSchema = [
     exports.aTableDef,
     exports.bqTableDef,
+    exports.pgTableDef,
     {
         type: 'table',
         name: 'carriers',
@@ -350,6 +362,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
             contents: {
                 _db_: { type: 'connection', name: '_db_' },
                 _bq_: { type: 'connection', name: '_bq_' },
+                _pg_: { type: 'connection', name: '_pg_' },
                 a: { ...exports.aTableDef, primaryKey: 'astr', name: 'a' },
                 b: { ...exports.aTableDef, primaryKey: 'astr', name: 'b' },
                 bq_a: { ...exports.bqTableDef, primaryKey: 'astr', name: 'bq_a' },
@@ -405,6 +418,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         }
         this.connectionDialectZone.define('_db_', exports.TEST_DIALECT);
         this.connectionDialectZone.define('_bq_', 'standardsql');
+        this.connectionDialectZone.define('_pg_', 'postgres');
         for (const flag of (_e = options.compilerFlags) !== null && _e !== void 0 ? _e : []) {
             this.compilerFlagSrc.push(`##! ${flag}\n`);
         }

package/dist/model/filter_compilers.js

@@ -31,11 +31,25 @@ function unlike(disLiked, x) {
  * defined in this slightly weird way. At some point the code here for
  * XXXXFilterCompiler.compile() will move to XXXFilterExpression.compile()
  */
+// The `none` filter ("always false") compiles to a constant, independent of
+// column type or value; `not none` is "always true". Shared by the top-level
+// guard and every per-type compiler so the constant lives in one place.
+function noneToSQL(not) {
+    return not ? 'true' : 'false';
+}
 exports.FilterCompilers = {
     compile(t, c, x, d, qi = {}) {
         if (c === null) {
             return 'true';
         }
+        // `none` is the always-false filter (companion to the empty/`null` filter,
+        // which is always-true above). It compiles to a constant independent of
+        // column type/value, so it is handled here before type dispatch — this is
+        // also the primary path for boolean, whose compiler has no switch and
+        // would otherwise route `none` through the null/false truth-table.
+        if (c.operator === 'none') {
+            return noneToSQL(c.not);
+        }
         if (t === 'string' && (0, malloy_filter_1.isStringFilter)(c)) {
             return exports.FilterCompilers.stringCompile(c, x, d);
         }
@@ -87,6 +101,8 @@ exports.FilterCompilers = {
             }
             case 'null':
                 return nc.not ? `${x} IS NOT NULL` : `${x} IS NULL`;
+            case 'none':
+                return noneToSQL(nc.not);
             case '()': {
                 const wrapped = '(' + exports.FilterCompilers.numberCompile(nc.expr, x, d) + ')';
                 return nc.not ? `NOT ${wrapped}` : wrapped;
@@ -115,7 +131,13 @@ exports.FilterCompilers = {
          * =false            |   F    |   T     |   NULL
          * not =false        |   T    |   F     |   NULL
          */
-        if (bc.operator === '=true') {
+        if (bc.operator === 'none') {
+            // Normally intercepted by compile()'s top-level guard; handled here too so
+            // booleanCompile is self-safe (this if-chain has no default, and `none`
+            // must not fall through to the null/false truth-table below).
+            return noneToSQL(bc.not);
+        }
+        else if (bc.operator === '=true') {
             return bc.not ? `NOT ${px}` : x;
         }
         else if (bc.operator === '=false') {
@@ -149,6 +171,8 @@ exports.FilterCompilers = {
         switch (sc.operator) {
             case 'null':
                 return sc.not ? `${x} IS NOT NULL` : `${x} IS NULL`;
+            case 'none':
+                return noneToSQL(sc.not);
             case 'empty':
                 return sc.not ? `COALESCE(${x},'') != ''` : `COALESCE(${x},'') = ''`;
             case '=': {
@@ -396,6 +420,8 @@ class TemporalFilterCompiler {
             }
             case 'null':
                 return tc.not ? `${x} IS NOT NULL` : `${x} IS NULL`;
+            case 'none':
+                return noneToSQL(tc.not);
             case '()': {
                 const wrapped = '(' + this.compile(tc.expr) + ')';
                 return tc.not ? `NOT ${wrapped}` : wrapped;

package/dist/model/malloy_types.d.ts

@@ -330,9 +330,9 @@ export type Argument = Parameter;
  * Type of a given declaration. The grammar's `malloyType` already excludes
  * `json` and `sql native`, so any value of this union is a legal given type.
  *
- * The fully-narrowed recursive form described in `~/ctx/mp/implementation.md`
- * (a fresh union over a smaller atomic base) lands with the IR work; the
- * shape here is the conservative "not yet narrowed" version.
+ * The fully-narrowed recursive form (a fresh union over a smaller atomic
+ * base) lands with the IR work; the shape here is the conservative
+ * "not yet narrowed" version.
  */
 export type GivenTypeDef = AtomicTypeDef | FilterExpressionParamTypeDef;
 export interface Given extends HasLocation, HasAnnotations {

package/dist/model/query_query.d.ts

@@ -110,7 +110,7 @@ export declare class QueryQuery extends QueryField {
      * falls back to the general demux path, which is correct for every case.
      */
     canUseSingleGroupSetSQL(): boolean;
-    generatePipelinedStages(outputPipelinedSQL: OutputPipelinedSQL[], lastStageName: string, stageWriter: StageWriter, priorStageColumns: StageOutputColumn[]): string;
+    generatePipelinedStages(outputPipelinedSQL: OutputPipelinedSQL[], lastStageName: string, stageWriter: StageWriter, priorStageColumns: StageOutputColumn[], finalStageOrderBy?: string): string;
     generateStage0Fields(resultSet: FieldInstanceResult, output: StageOutputContext, stageWriter: StageWriter): void;
     generateSQLWhereChildren(resultStruct: FieldInstanceResult): AndChain;
     generateSQLWhereTurtled(): string;

package/dist/model/query_query.js

@@ -1013,7 +1013,7 @@ class QueryQuery extends query_node_1.QueryField {
     // everything else is carried through unchanged by its emitted name -- for a
     // grouped stage that is the group-set-suffixed form (e.g. `f1__0`), not the
     // final output name.
-    priorStageColumns) {
+    priorStageColumns, finalStageOrderBy = '') {
         if (outputPipelinedSQL.length === 0) {
             return lastStageName;
         }
@@ -1031,6 +1031,9 @@ class QueryQuery extends query_node_1.QueryField {
                 .map(c => c.name)
                 .filter(name => outputFields.indexOf(name) === -1);
             retSQL = `SELECT ${fields.length > 0 ? fields.join(', ') + ',' : ''} ${pipelinesSQL} FROM ${lastStageName}`;
+            if (finalStageOrderBy.length > 0) {
+                retSQL += `\n${finalStageOrderBy}`;
+            }
         }
         return stageWriter.addStage(retSQL);
     }
@@ -1503,13 +1506,14 @@ class QueryQuery extends query_node_1.QueryField {
             s += `GROUP BY ${dimensionPositions.join(',')}\n`;
         }
         // order by
-        s += this.genereateSQLOrderBy(this.firstSegment, this.rootResult);
+        const orderBySQL = this.genereateSQLOrderBy(this.firstSegment, this.rootResult);
+        s += orderBySQL;
         // limit
         if (!(0, malloy_types_1.isRawSegment)(this.firstSegment) && this.firstSegment.limit) {
             s += `LIMIT ${this.firstSegment.limit}\n`;
         }
         this.resultStage = stageWriter.addStage(s);
-        this.resultStage = this.generatePipelinedStages(outputPipelinedSQL, this.resultStage, stageWriter, columns);
+        this.resultStage = this.generatePipelinedStages(outputPipelinedSQL, this.resultStage, stageWriter, columns, orderBySQL);
         return this.resultStage;
     }
     // create a simplified version of the StructDef for dialects.

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.421";
+export declare const MALLOY_VERSION = "0.0.423";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.421';
+exports.MALLOY_VERSION = '0.0.423';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.421",
+  "version": "0.0.423",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -51,9 +51,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.421",
-    "@malloydata/malloy-interfaces": "0.0.421",
-    "@malloydata/malloy-tag": "0.0.421",
+    "@malloydata/malloy-filter": "0.0.423",
+    "@malloydata/malloy-interfaces": "0.0.423",
+    "@malloydata/malloy-tag": "0.0.423",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",