@malloydata/render 0.0.248-dev250325232143 → 0.0.248-dev250326010711

package/dist/module/index.mjs

@@ -116767,7 +116767,12 @@ var qc = {};
         throw new Error(`Sampling is not supported on dialect ${this.name}.`);
       return l;
     }
-    sqlOrderBy(l) {
+    /**
+     * 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(l, c) {
       return `ORDER BY ${l.join(",")}`;
     }
     sqlTzStr(l) {
@@ -117820,6 +117825,9 @@ class eJe extends VKe.Dialect {
   sqlAnyValue(e, r) {
     return `ANY_VALUE(CASE WHEN group_set=${e} THEN ${r} END)`;
   }
+  sqlOrderBy(e, r) {
+    return r === "analytical" || r === "turtle" ? `ORDER BY ${e.join(",")}` : `ORDER BY ${e.map((i) => `${i} NULLS LAST`).join(",")}`;
+  }
   // can array agg or any_value a struct...
   sqlAggregateTurtle(e, r, i, s) {
     let o = "";
@@ -120330,7 +120338,7 @@ const u0 = Xe, PJe = It, sm = qc, DW = Qc, UJe = lT, jJe = cT, qJe = {
 };
 class HJe extends sm.Dialect {
   constructor() {
-    super(...arguments), this.name = "mysql", this.defaultNumberType = "DOUBLE PRECISION", this.defaultDecimalType = "DECIMAL", this.udfPrefix = "ms_temp.__udf", this.hasFinalStage = !1, this.stringTypeName = "VARCHAR(255)", this.divisionIsInteger = !0, this.supportsSumDistinctFunction = !0, this.unnestWithNumbers = !1, this.defaultSampling = { rows: 5e4 }, this.supportUnnestArrayAgg = !0, this.supportsAggDistinct = !0, this.supportsCTEinCoorelatedSubQueries = !0, this.supportsSafeCast = !1, this.dontUnionIndex = !1, this.supportsQualify = !1, this.supportsNesting = !0, this.experimental = !1, this.supportsFullJoin = !1, this.supportsPipelinesInViews = !1, this.readsNestedData = !1, this.supportsComplexFilteredSources = !1, this.supportsArraysInData = !1, this.compoundObjectInSchema = !1, this.booleanAsNumbers = !0;
+    super(...arguments), this.name = "mysql", this.defaultNumberType = "DOUBLE PRECISION", this.defaultDecimalType = "DECIMAL", this.udfPrefix = "ms_temp.__udf", this.hasFinalStage = !1, this.stringTypeName = "VARCHAR(255)", this.divisionIsInteger = !0, this.supportsSumDistinctFunction = !0, this.unnestWithNumbers = !1, this.defaultSampling = { rows: 5e4 }, this.supportUnnestArrayAgg = !0, this.supportsAggDistinct = !0, this.supportsCTEinCoorelatedSubQueries = !0, this.supportsSafeCast = !1, this.dontUnionIndex = !1, this.supportsQualify = !1, this.supportsNesting = !0, this.experimental = !1, this.supportsFullJoin = !1, this.supportsPipelinesInViews = !1, this.readsNestedData = !1, this.supportsComplexFilteredSources = !1, this.supportsArraysInData = !1, this.compoundObjectInSchema = !1, this.booleanAsNumbers = !0, this.orderByClause = "ordinal";
   }
   malloyTypeToSQLType(e) {
     switch (e.type) {
@@ -120563,9 +120571,6 @@ $$ LANGUAGE SQL;
     }
     return e;
   }
-  sqlOrderBy(e) {
-    return `ORDER BY ${e.map((r) => `${r.trim().slice(0, r.trim().lastIndexOf(" "))} IS NULL DESC, ${r}`).join(",")}`;
-  }
   sqlLiteralString(e) {
     return "'" + e.replace(/\\/g, "\\\\").replace(/'/g, "\\'") + "'";
   }
@@ -120880,6 +120885,8 @@ xT.BooleanFilterExpression = void 0;
 xT.BooleanFilterExpression = {
   parse(t) {
     var e;
+    if (t.match(/^\s*$/))
+      return { parsed: null, log: [] };
     const r = { parsed: null, log: [] };
     let i = t.toLowerCase().trim().replace(/\s\s+/, " "), s = !1;
     if (i.startsWith("not ") && (s = !0, i = i.slice(4)), i === "true")
@@ -121840,6 +121847,8 @@ h2.run_parser = OXe;
   const o = bn, u = i(ik), a = s(sk), l = h2;
   t.NumberFilterExpression = {
     parse(c) {
+      if (c.match(/^\s*$/))
+        return { parsed: null, log: [] };
       const f = new u.Parser(u.Grammar.fromCompiled(a.default)), x = (0, l.run_parser)(c, f);
       return x.parsed && (0, o.isNumberFilter)(x.parsed) ? { parsed: x.parsed, log: [] } : { parsed: null, log: x.log };
     },
@@ -121941,6 +121950,8 @@ uk.default = IXe;
   const o = bn, u = i(ik), a = s(uk), l = jt, c = h2;
   t.StringFilterExpression = {
     parse(f) {
+      if (f.match(/^\s*$/))
+        return { parsed: null, log: [] };
       const x = new u.Parser(u.Grammar.fromCompiled(a.default)), h = (0, c.run_parser)(f, x);
       return h.parsed && (0, o.isStringFilter)(h.parsed) ? { parsed: h.parsed, log: [] } : { parsed: null, log: h.log };
     },
@@ -122151,6 +122162,8 @@ ak.default = MXe;
   const o = bn, u = s(ak), a = i(ik), l = h2;
   t.TemporalFilterExpression = {
     parse(h) {
+      if (h.match(/^\s*$/))
+        return { parsed: null, log: [] };
       const p = new a.Parser(a.Grammar.fromCompiled(u.default)), m = (0, l.run_parser)(h, p);
       return m.parsed && (0, o.isTemporalFilter)(m.parsed) ? { parsed: m.parsed, log: [] } : { parsed: null, log: m.log };
     },
@@ -122489,6 +122502,8 @@ dT.TemporalFilterCompiler = PXe;
   }
   t.FilterCompilers = {
     compile(u, a, l, c) {
+      if (a === null)
+        return "true";
       if (u === "string" && (0, e.isStringFilter)(a))
         return t.FilterCompilers.stringCompile(a, l, c);
       if (u === "number" && (0, e.isNumberFilter)(a))
@@ -122979,7 +122994,7 @@ let lk = class extends VXe {
             _.push(` ${R} ${b.dir || "ASC"}`);
           } else r.firstSegment.type === "project" && _.push(` ${v.fif.f.generateExpression(r)} ${b.dir || "ASC"}`);
       }
-      _.length > 0 && (m = " " + this.parent.dialect.sqlOrderBy(_));
+      _.length > 0 && (m = " " + this.parent.dialect.sqlOrderBy(_, "analytical"));
     }
     let g = "";
     if (y.between) {
@@ -123122,7 +123137,7 @@ let lk = class extends VXe {
       case "compositeField":
         return "{COMPOSITE_FIELD}";
       case "filterMatch":
-        if ((a.dataType === "string" || a.dataType === "number" || a.dataType === "date" || a.dataType === "timestamp" || a.dataType === "boolean") && (0, zXe.isFilterExpression)(a.filter))
+        if ((a.dataType === "string" || a.dataType === "number" || a.dataType === "date" || a.dataType === "timestamp" || a.dataType === "boolean") && (a.filter === null || (0, zXe.isFilterExpression)(a.filter)))
           return HXe.FilterCompilers.compile(a.dataType, a.filter, a.e.sql || "", this.parent.dialect);
         throw new Error(`Internal Error: Filter Compiler Undefined Type '${a.dataType}'`);
       default:
@@ -123943,17 +123958,27 @@ ${(0, Sn.indent)(p)}) AS ${r.alias}
     for (const u of s)
       if (typeof u.field == "string") {
         const a = r.getField(u.field);
-        if (a && a.fieldUsage.type === "result")
-          this.parent.dialect.orderByClause === "ordinal" ? o.push(`${a.fieldUsage.resultIndex} ${u.dir || "ASC"}`) : this.parent.dialect.orderByClause === "output_name" && o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(u.field)} ${u.dir || "ASC"}`);
-        else
+        if (a && a.fieldUsage.type === "result") {
+          if (this.parent.dialect.orderByClause === "ordinal")
+            o.push(`${a.fieldUsage.resultIndex} ${u.dir || "ASC"}`);
+          else if (this.parent.dialect.orderByClause === "output_name")
+            o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(u.field)} ${u.dir || "ASC"}`);
+          else if (this.parent.dialect.orderByClause === "expression") {
+            const l = a.getSQL();
+            o.push(`${l} ${u.dir || "ASC"}`);
+          }
+        } else
           throw new Error(`Unknown field in ORDER BY ${u.field}`);
       } else if (this.parent.dialect.orderByClause === "ordinal")
         o.push(`${u.field} ${u.dir || "ASC"}`);
       else if (this.parent.dialect.orderByClause === "output_name") {
         const a = r.getFieldByNumber(u.field);
         o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(a.name)} ${u.dir || "ASC"}`);
+      } else if (this.parent.dialect.orderByClause === "expression") {
+        const l = r.getFieldByNumber(u.field).fif.getSQL();
+        o.push(`${l} ${u.dir || "ASC"}`);
       }
-    return o.length > 0 && (i = this.parent.dialect.sqlOrderBy(o) + `
+    return o.length > 0 && (i = this.parent.dialect.sqlOrderBy(o, "query") + `
 `), i;
   }
   generateSimpleSQL(e) {
@@ -124212,7 +124237,7 @@ FROM ${r}
         name: g.field,
         fif: e.getField(g.field)
       } : l = e.getFieldByNumber(g.field), e.firstSegment.type === "reduce" ? a.push(" " + this.parent.dialect.sqlMaybeQuoteIdentifier(`${l.name}__${e.groupSet}`) + ` ${g.dir || "ASC"}`) : e.firstSegment.type === "project" && a.push(` ${l.fif.f.generateExpression(e)} ${g.dir || "ASC"}`);
-    a.length > 0 && (o = " " + this.parent.dialect.sqlOrderBy(a));
+    a.length > 0 && (o = " " + this.parent.dialect.sqlOrderBy(a, "turtle"));
     const f = this.buildDialectFieldList(e);
     let x, h;
     (x = e.getRepeatedResultType()) !== "nested" ? x === "inline_all_numbers" ? h = this.parent.dialect.sqlCoaleseMeasuresInline(e.groupSet, f) : h = this.parent.dialect.sqlAnyValueTurtle(e.groupSet, f) : h = this.parent.dialect.sqlAggregateTurtle(e.groupSet, f, o, u);
@@ -130487,8 +130512,6 @@ class $ut extends Iut.ExpressionDef {
       if (a.log.length > 0)
         for (const c of a.log)
           return this.loggedErrorExpr("filter-expression-error", `Filter parse error: ${c.message}`);
-      if (!a.parsed)
-        return this.loggedErrorExpr("filter-expression-type", "FJKLD:JDKSL: expression parsed to null");
       const l = {
         node: "filterMatch",
         dataType: u.type,