@malloydata/malloy 0.0.331 → 0.0.332

package/dist/dialect/dialect.d.ts

@@ -76,6 +76,7 @@ export declare abstract class Dialect {
     supportsTempTables: boolean;
     hasModOperator: boolean;
     supportsLeftJoinUnnest: boolean;
+    requiresExplicitUnnestOrdering: boolean;
     supportsCountApprox: boolean;
     supportsHyperLogLog: boolean;
     supportsFullJoin: boolean;

package/dist/dialect/dialect.js

@@ -98,6 +98,9 @@ class Dialect {
         this.hasModOperator = true;
         // can LEFT JOIN UNNEST
         this.supportsLeftJoinUnnest = true;
+        // UNNEST in LATERAL JOINs doesn't guarantee array element order.
+        // When true, compiler adds ORDER BY on array ordinality columns (__row_id)
+        this.requiresExplicitUnnestOrdering = false;
         this.supportsCountApprox = false;
         this.supportsHyperLogLog = false;
         // MYSQL doesn't have full join, maybe others.

package/dist/dialect/duckdb/duckdb.d.ts

@@ -22,6 +22,7 @@ export declare class DuckDBDialect extends PostgresBase {
     supportsSafeCast: boolean;
     supportsNesting: boolean;
     supportsCountApprox: boolean;
+    requiresExplicitUnnestOrdering: boolean;
     integerTypeMappings: IntegerTypeMapping[];
     get udfPrefix(): string;
     quoteTablePath(tableName: string): string;
@@ -33,7 +34,7 @@ export declare class DuckDBDialect extends PostgresBase {
     sqlAnyValueTurtle(groupSet: number, fieldList: DialectFieldList): string;
     sqlAnyValueLastTurtle(name: string, groupSet: number, sqlName: string): string;
     sqlCoaleseMeasuresInline(groupSet: number, fieldList: DialectFieldList): string;
-    sqlUnnestAlias(source: string, alias: string, _fieldList: DialectFieldList, needDistinctKey: boolean, _isArray: boolean, isInNestedPipeline: boolean): string;
+    sqlUnnestAlias(source: string, alias: string, _fieldList: DialectFieldList, _needDistinctKey: boolean, _isArray: boolean, isInNestedPipeline: boolean): string;
     sqlSumDistinctHashedKey(_sqlDistinctKey: string): string;
     sqlGenerateUUID(): string;
     sqlDateToString(sqlDateExp: string): string;

package/dist/dialect/duckdb/duckdb.js

@@ -73,6 +73,8 @@ class DuckDBDialect extends pg_impl_1.PostgresBase {
         this.supportsSafeCast = true;
         this.supportsNesting = true;
         this.supportsCountApprox = true;
+        // DuckDB UNNEST in LATERAL JOINs doesn't preserve array element order
+        this.requiresExplicitUnnestOrdering = true;
         // DuckDB: 32-bit INTEGER is safe, larger integers need bigint
         this.integerTypeMappings = [
             { min: BigInt(dialect_1.MIN_INT32), max: BigInt(dialect_1.MAX_INT32), numberType: 'integer' },
@@ -139,7 +141,7 @@ class DuckDBDialect extends pg_impl_1.PostgresBase {
     //   // When DuckDB supports lateral joins...
     //   //return `,(select UNNEST(generate_series(1, length(${source}),1))) as ${alias}(__row_id)`;
     // }
-    sqlUnnestAlias(source, alias, _fieldList, needDistinctKey, _isArray, isInNestedPipeline) {
+    sqlUnnestAlias(source, alias, _fieldList, _needDistinctKey, _isArray, isInNestedPipeline) {
         if (this.unnestWithNumbers) {
             // Duckdb can't unnest in a coorelated subquery at the moment so we hack it.
             const arrayLen = isInNestedPipeline
@@ -149,13 +151,8 @@ class DuckDBDialect extends pg_impl_1.PostgresBase {
         ${arrayLen},
         1)) as __row_id) as ${alias} ON  ${alias}.__row_id <= array_length(${source})`;
         }
-        //Simulate left joins by guarenteeing there is at least one row.
-        if (!needDistinctKey) {
-            return `LEFT JOIN LATERAL (SELECT UNNEST(${source}), 1 as ignoreme) as ${alias}_outer(${alias},ignoreme) ON ${alias}_outer.ignoreme=1`;
-        }
-        else {
-            return `LEFT JOIN LATERAL (SELECT UNNEST(GENERATE_SERIES(1, length(${source}),1)) as __row_id, UNNEST(${source}), 1 as ignoreme) as ${alias}_outer(__row_id, ${alias},ignoreme) ON  ${alias}_outer.ignoreme=1`;
-        }
+        // Use WITH ORDINALITY to preserve array element order via __row_id
+        return `LEFT JOIN LATERAL UNNEST(${source}) WITH ORDINALITY as ${alias}_outer(${alias}, __row_id) ON true`;
     }
     sqlSumDistinctHashedKey(_sqlDistinctKey) {
         return 'uses sumDistinctFunction, should not be called';

package/dist/lang/ast/field-space/query-spaces.js

@@ -296,6 +296,9 @@ class QuerySpace extends QueryOperationSpace {
             throw new Error('Invalid type for fieldref');
         }
         ret.location = (_c = ret.location) !== null && _c !== void 0 ? _c : this.astEl.location;
+        if (queryFieldDef.annotation) {
+            ret.annotation = queryFieldDef.annotation;
+        }
         return ret;
     }
     // Gets the primary key field for the output struct of this query;

package/dist/lang/ast/source-elements/composite-source.js

@@ -95,7 +95,7 @@ function composeSources(sources, compositeCodeSource) {
                         fieldUsage: [
                             { path: [fieldName], at: compositeCodeSource.codeLocation },
                         ],
-                        code: compositeCodeSource.code,
+                        code: undefined,
                         location: compositeCodeSource.codeLocation,
                         // A composite field's grouping may differ from slice to slice
                         requiresGroupBy: undefined,

package/dist/lang/ast/types/expression-def.d.ts

@@ -1,5 +1,5 @@
 import type * as Malloy from '@malloydata/malloy-interfaces';
-import type { Expr, TimestampUnit } from '../../../model/malloy_types';
+import type { Expr, TimestampUnit, FilterExprType } from '../../../model/malloy_types';
 import type { ExprValue } from './expr-value';
 import type { FieldSpace } from './field-space';
 import { MalloyElement } from './malloy-element';
@@ -85,4 +85,4 @@ export declare function getMorphicValue(mv: ExprValue, mt: MorphicType): ExprVal
  * @return ExprValue of the expression
  */
 export declare function applyBinary(fs: FieldSpace, left: ExpressionDef, op: BinaryMalloyOperator, right: ExpressionDef): ExprValue;
-export declare function checkFilterExpression(logTo: MalloyElement, ft: string, fexpr: Expr): void;
+export declare function checkFilterExpression(logTo: MalloyElement, ft: FilterExprType, fexpr: Expr): void;

package/dist/lang/ast/types/expression-def.js

@@ -207,7 +207,7 @@ class ExprDuration extends ExpressionDef {
 }
 exports.ExprDuration = ExprDuration;
 function willMorphTo(ev, t) {
-    if (ev.type === t) {
+    if (ev.type === t || (t === 'timestamp' && ev.type === 'timestamptz')) {
         return ev.value;
     }
     return ev.morphic && ev.morphic[t];
@@ -542,7 +542,7 @@ function checkFilterExpression(logTo, ft, fexpr) {
     }
     const fsrc = fexpr.filterSrc;
     let err;
-    if (ft === 'date' || ft === 'timestamp') {
+    if ((0, malloy_types_1.isTemporalType)(ft)) {
         err = (_a = malloy_filter_1.TemporalFilterExpression.parse(fsrc).log[0]) === null || _a === void 0 ? void 0 : _a.message;
     }
     else if (ft === 'string') {

package/dist/model/query_query.d.ts

@@ -66,6 +66,11 @@ export declare class QueryQuery extends QueryField {
     generateSQLJoinBlock(stageWriter: StageWriter, ji: JoinInstance, depth: number): string;
     generateSQLPassthroughKeys(qs: QueryStruct): string;
     generateSQLJoins(stageWriter: StageWriter): string;
+    /**
+     * Collect all array joins from the join tree in depth-first order.
+     * This ordering ensures parent arrays are ordered before child arrays.
+     */
+    collectArrayJoins(ji: JoinInstance): JoinInstance[];
     genereateSQLOrderBy(queryDef: QuerySegment, resultStruct: FieldInstanceResult): string;
     generateSimpleSQL(stageWriter: StageWriter): string;
     generatePipelinedStages(outputPipelinedSQL: OutputPipelinedSQL[], lastStageName: string, stageWriter: StageWriter): string;

package/dist/model/query_query.js

@@ -737,10 +737,37 @@ class QueryQuery extends query_node_1.QueryField {
         }
         return s;
     }
+    /**
+     * Collect all array joins from the join tree in depth-first order.
+     * This ordering ensures parent arrays are ordered before child arrays.
+     */
+    collectArrayJoins(ji) {
+        const result = [];
+        if (ji.queryStruct.structDef.type === 'array') {
+            result.push(ji);
+        }
+        for (const child of ji.children) {
+            result.push(...this.collectArrayJoins(child));
+        }
+        return result;
+    }
     genereateSQLOrderBy(queryDef, resultStruct) {
         let s = '';
+        // Collect array joins for dialects that need explicit ordering.
+        // Only for project queries - reduce queries aggregate rows so individual
+        // row order doesn't matter, and we can't ORDER BY columns not in GROUP BY.
+        let arrayJoins = [];
+        if (this.parent.dialect.requiresExplicitUnnestOrdering &&
+            this.firstSegment.type === 'project') {
+            const [[, rootJoin]] = this.rootResult.joins;
+            arrayJoins = this.collectArrayJoins(rootJoin);
+        }
         if (this.firstSegment.type === 'project' && !queryDef.orderBy) {
-            return ''; // No default ordering for project.
+            // For project without explicit ordering, we still need array ordinality
+            // ordering if the dialect requires it
+            if (arrayJoins.length === 0) {
+                return ''; // No default ordering for project.
+            }
         }
         // Intermediate results (in a pipeline or join) that have no limit, don't need an orderby
         //  Some database don't have this optimization.
@@ -795,6 +822,10 @@ class QueryQuery extends query_node_1.QueryField {
                 }
             }
         }
+        // Add array ordinality ordering for dialects that require it
+        for (const aj of arrayJoins) {
+            o.push(`${aj.alias}_outer.__row_id ASC`);
+        }
         if (o.length > 0) {
             s = this.parent.dialect.sqlOrderBy(o, 'query') + '\n';
         }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.331";
+export declare const MALLOY_VERSION = "0.0.332";

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.331';
+exports.MALLOY_VERSION = '0.0.332';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.331",
+  "version": "0.0.332",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -45,9 +45,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.331",
-    "@malloydata/malloy-interfaces": "0.0.331",
-    "@malloydata/malloy-tag": "0.0.331",
+    "@malloydata/malloy-filter": "0.0.332",
+    "@malloydata/malloy-interfaces": "0.0.332",
+    "@malloydata/malloy-tag": "0.0.332",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",