@malloydata/malloy 0.0.248-dev250325232143 → 0.0.248-dev250326010711

package/dist/dialect/dialect.d.ts

@@ -29,7 +29,8 @@ export type FieldReferenceType = 'table' | 'nest source' | 'array[scalar]' | 'ar
 export declare const dayIndex: number;
 export declare function inDays(units: string): boolean;
 export declare function qtz(qi: QueryInfo): string | undefined;
-export type OrderByClauseType = 'output_name' | 'ordinal';
+export type OrderByClauseType = 'output_name' | 'ordinal' | 'expression';
+export type OrderByRequest = 'query' | 'turtle' | 'analytical';
 export declare abstract class Dialect {
     abstract name: string;
     abstract defaultNumberType: string;
@@ -121,7 +122,12 @@ export declare abstract class Dialect {
     sqlSumDistinct(_key: string, _value: string, _funcName: string): string;
     sqlAggDistinct(_key: string, _values: string[], _func: (valNames: string[]) => string): string;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
-    sqlOrderBy(orderTerms: string[]): string;
+    /**
+     * MySQL is NULLs first, all other dialects have a way to make NULLs last.
+     * isBaseOrdering is a hack to allow the MySQL dialect to partially implement
+     * NULLs last, but should go away once MySQL fully implements NULLs last.
+     */
+    sqlOrderBy(orderTerms: string[], _orderFor?: OrderByRequest): string;
     sqlTzStr(qi: QueryInfo): string;
     sqlMakeUnnestKey(key: string, rowKey: string): string;
     sqlStringAggDistinct(distinctKey: string, valueSQL: string, separatorSQL: string): string;

package/dist/dialect/dialect.js

@@ -179,7 +179,12 @@ class Dialect {
         }
         return tableSQL;
     }
-    sqlOrderBy(orderTerms) {
+    /**
+     * MySQL is NULLs first, all other dialects have a way to make NULLs last.
+     * isBaseOrdering is a hack to allow the MySQL dialect to partially implement
+     * NULLs last, but should go away once MySQL fully implements NULLs last.
+     */
+    sqlOrderBy(orderTerms, _orderFor) {
         return `ORDER BY ${orderTerms.join(',')}`;
     }
     sqlTzStr(qi) {

package/dist/dialect/mysql/mysql.d.ts

@@ -1,5 +1,5 @@
 import type { Sampling, MeasureTimeExpr, TimeLiteralNode, RegexMatchExpr, TimeDeltaExpr, TimeTruncExpr, TimeExtractExpr, TypecastExpr, LeafAtomicTypeDef, AtomicTypeDef, ArrayLiteralNode, RecordLiteralNode } from '../../model/malloy_types';
-import type { DialectFieldList, FieldReferenceType, QueryInfo } from '../dialect';
+import type { DialectFieldList, FieldReferenceType, OrderByClauseType, QueryInfo } from '../dialect';
 import { Dialect } from '../dialect';
 import type { DialectFunctionOverloadDef } from '../functions';
 export declare class MySQLDialect extends Dialect {
@@ -30,6 +30,7 @@ export declare class MySQLDialect extends Dialect {
     supportsArraysInData: boolean;
     compoundObjectInSchema: boolean;
     booleanAsNumbers: boolean;
+    orderByClause: OrderByClauseType;
     malloyTypeToSQLType(malloyType: AtomicTypeDef): string;
     sqlTypeToMalloyType(sqlType: string): LeafAtomicTypeDef;
     quoteTablePath(tablePath: string): string;
@@ -65,7 +66,6 @@ export declare class MySQLDialect extends Dialect {
     sqlMeasureTimeExpr(df: MeasureTimeExpr): string;
     sqlAggDistinct(_key: string, _values: string[], _func: (valNames: string[]) => string): string;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
-    sqlOrderBy(orderTerms: string[]): string;
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getDialectFunctionOverrides(): {

package/dist/dialect/mysql/mysql.js

@@ -94,6 +94,7 @@ class MySQLDialect extends dialect_1.Dialect {
         this.supportsArraysInData = false;
         this.compoundObjectInSchema = false;
         this.booleanAsNumbers = true;
+        this.orderByClause = 'ordinal';
     }
     malloyTypeToSQLType(malloyType) {
         switch (malloyType.type) {
@@ -400,11 +401,6 @@ class MySQLDialect extends dialect_1.Dialect {
         }
         return tableSQL;
     }
-    sqlOrderBy(orderTerms) {
-        return `ORDER BY ${orderTerms
-            .map(t => `${t.trim().slice(0, t.trim().lastIndexOf(' '))} IS NULL DESC, ${t}`)
-            .join(',')}`;
-    }
     sqlLiteralString(literal) {
         const noVirgule = literal.replace(/\\/g, '\\\\');
         return "'" + noVirgule.replace(/'/g, "\\'") + "'";

package/dist/dialect/standardsql/standardsql.d.ts

@@ -1,6 +1,6 @@
 import type { Sampling, AtomicTypeDef, TimeTruncExpr, TimeExtractExpr, TimeDeltaExpr, TypecastExpr, RegexMatchExpr, TimeLiteralNode, MeasureTimeExpr, LeafAtomicTypeDef, RecordLiteralNode, ArrayLiteralNode } from '../../model/malloy_types';
 import type { DialectFunctionOverloadDef } from '../functions';
-import type { DialectFieldList, QueryInfo } from '../dialect';
+import type { DialectFieldList, OrderByRequest, QueryInfo } from '../dialect';
 import { Dialect } from '../dialect';
 export declare class StandardSQLDialect extends Dialect {
     name: string;
@@ -30,6 +30,7 @@ export declare class StandardSQLDialect extends Dialect {
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     sqlAnyValue(groupSet: number, fieldName: string): string;
+    sqlOrderBy(orderTerms: string[], obr?: OrderByRequest): string;
     sqlAggregateTurtle(groupSet: number, fieldList: DialectFieldList, orderBy: string | undefined, limit: number | undefined): string;
     sqlAnyValueTurtle(groupSet: number, fieldList: DialectFieldList): string;
     sqlAnyValueLastTurtle(name: string, groupSet: number, sqlName: string): string;

package/dist/dialect/standardsql/standardsql.js

@@ -110,6 +110,12 @@ class StandardSQLDialect extends dialect_1.Dialect {
     sqlAnyValue(groupSet, fieldName) {
         return `ANY_VALUE(CASE WHEN group_set=${groupSet} THEN ${fieldName} END)`;
     }
+    sqlOrderBy(orderTerms, obr) {
+        if (obr === 'analytical' || obr === 'turtle') {
+            return `ORDER BY ${orderTerms.join(',')}`;
+        }
+        return `ORDER BY ${orderTerms.map(t => `${t} NULLS LAST`).join(',')}`;
+    }
     // can array agg or any_value a struct...
     sqlAggregateTurtle(groupSet, fieldList, orderBy, limit) {
         let tail = '';

package/dist/lang/ast/expressions/expr-filter-expr.js

@@ -58,9 +58,6 @@ class ExprFilterExpression extends expression_def_1.ExpressionDef {
                     return this.loggedErrorExpr('filter-expression-error', `Filter parse error: ${err.message}`);
                 }
             }
-            if (!fParse.parsed) {
-                return this.loggedErrorExpr('filter-expression-type', 'FJKLD:JDKSL: expression parsed to null');
-            }
             const filterMatch = {
                 node: 'filterMatch',
                 dataType: matchExpr.type,

package/dist/model/filter_compilers.d.ts

@@ -1,7 +1,7 @@
 import type { BooleanFilter, FilterExpression, NumberFilter, StringFilter, TemporalFilter } from '@malloydata/malloy-filter';
 import type { Dialect } from '../dialect';
 export declare const FilterCompilers: {
-    compile(t: string, c: FilterExpression, x: string, d: Dialect): string;
+    compile(t: string, c: FilterExpression | null, x: string, d: Dialect): string;
     numberCompile(nc: NumberFilter, x: string, d: Dialect): string;
     booleanCompile(bc: BooleanFilter, x: string, _d: Dialect): string;
     stringCompile(sc: StringFilter, x: string, d: Dialect): string;

package/dist/model/filter_compilers.js

@@ -37,6 +37,9 @@ function unlike(disLiked, x) {
  */
 exports.FilterCompilers = {
     compile(t, c, x, d) {
+        if (c === null) {
+            return 'true';
+        }
         if (t === 'string' && (0, malloy_filter_1.isStringFilter)(c)) {
             return exports.FilterCompilers.stringCompile(c, x, d);
         }

package/dist/model/malloy_query.js

@@ -677,7 +677,7 @@ class QueryField extends QueryNode {
                 }
             }
             if (obSQL.length > 0) {
-                orderBy = ' ' + this.parent.dialect.sqlOrderBy(obSQL);
+                orderBy = ' ' + this.parent.dialect.sqlOrderBy(obSQL, 'analytical');
             }
         }
         let between = '';
@@ -889,7 +889,7 @@ class QueryField extends QueryNode {
                     expr.dataType === 'date' ||
                     expr.dataType === 'timestamp' ||
                     expr.dataType === 'boolean') {
-                    if ((0, malloy_filter_1.isFilterExpression)(expr.filter)) {
+                    if (expr.filter === null || (0, malloy_filter_1.isFilterExpression)(expr.filter)) {
                         return filter_compilers_1.FilterCompilers.compile(expr.dataType, expr.filter, expr.e.sql || '', this.parent.dialect);
                     }
                 }
@@ -2249,6 +2249,10 @@ class QueryQuery extends QueryField {
                     else if (this.parent.dialect.orderByClause === 'output_name') {
                         o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(f.field)} ${f.dir || 'ASC'}`);
                     }
+                    else if (this.parent.dialect.orderByClause === 'expression') {
+                        const fieldExpr = fi.getSQL();
+                        o.push(`${fieldExpr} ${f.dir || 'ASC'}`);
+                    }
                 }
                 else {
                     throw new Error(`Unknown field in ORDER BY ${f.field}`);
@@ -2262,10 +2266,15 @@ class QueryQuery extends QueryField {
                     const orderingField = resultStruct.getFieldByNumber(f.field);
                     o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(orderingField.name)} ${f.dir || 'ASC'}`);
                 }
+                else if (this.parent.dialect.orderByClause === 'expression') {
+                    const orderingField = resultStruct.getFieldByNumber(f.field);
+                    const fieldExpr = orderingField.fif.getSQL();
+                    o.push(`${fieldExpr} ${f.dir || 'ASC'}`);
+                }
             }
         }
         if (o.length > 0) {
-            s = this.parent.dialect.sqlOrderBy(o) + '\n';
+            s = this.parent.dialect.sqlOrderBy(o, 'query') + '\n';
         }
         return s;
     }
@@ -2689,7 +2698,7 @@ class QueryQuery extends QueryField {
             }
         }
         if (obSQL.length > 0) {
-            orderBy = ' ' + this.parent.dialect.sqlOrderBy(obSQL);
+            orderBy = ' ' + this.parent.dialect.sqlOrderBy(obSQL, 'turtle');
         }
         const dialectFieldList = this.buildDialectFieldList(resultStruct);
         let resultType;

package/dist/model/malloy_types.d.ts

@@ -181,7 +181,7 @@ export interface FilterMatchExpr extends ExprE {
     notMatch?: true;
     filter: {
         operator: string;
-    };
+    } | null;
 }
 export interface TimeLiteralNode extends ExprLeaf {
     node: 'timeLiteral';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.248-dev250325232143",
+  "version": "0.0.248-dev250326010711",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,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.248-dev250325232143",
-    "@malloydata/malloy-interfaces": "^0.0.248-dev250325232143",
-    "@malloydata/malloy-tag": "^0.0.248-dev250325232143",
+    "@malloydata/malloy-filter": "^0.0.248-dev250326010711",
+    "@malloydata/malloy-interfaces": "^0.0.248-dev250326010711",
+    "@malloydata/malloy-tag": "^0.0.248-dev250326010711",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jest-diff": "^29.6.2",