@malloydata/render 0.0.247-dev250321153536 → 0.0.247

package/dist/module/index.mjs

@@ -122257,16 +122257,30 @@ class PXe {
   constructor(e, r, i = "timestamp") {
     this.expr = e, this.timetype = i, this.d = r;
   }
+  time(e) {
+    return this.timetype === "timestamp" ? e : this.d.sqlCast({}, {
+      node: "cast",
+      e: {
+        node: "genericSQLExpr",
+        src: ["", e],
+        kids: { args: [] },
+        sql: e
+      },
+      srcType: { type: "timestamp" },
+      dstType: { type: "date" },
+      safe: !1
+    });
+  }
   compile(e) {
     const r = this.expr;
     switch (e.operator) {
       case "after":
-        return `${r} ${e.not ? "<" : ">="} ${this.moment(e.after).end}`;
+        return `${r} ${e.not ? "<" : ">="} ${this.time(this.moment(e.after).end)}`;
       case "before":
-        return `${r} ${e.not ? ">=" : "<"} ${this.moment(e.before).begin}`;
+        return `${r} ${e.not ? ">=" : "<"} ${this.time(this.moment(e.before).begin.sql)}`;
       case "in": {
         const i = this.moment(e.in);
-        return this.isIn(e.not, i.begin.sql, i.end);
+        return i.begin.sql === i.end ? e.not ? `${r} != ${this.time(i.end)} OR ${r} IS NULL` : `${r} = ${this.time(i.end)}` : this.isIn(e.not, i.begin.sql, i.end);
       }
       case "for": {
         const i = this.moment(e.begin), s = this.delta(i.begin, "+", e.n, e.units);
@@ -122278,7 +122292,7 @@ class PXe {
       }
       case "to": {
         const i = this.moment(e.fromMoment), s = this.moment(e.toMoment);
-        return this.isIn(e.not, i.begin.sql, s.end);
+        return this.isIn(e.not, i.begin.sql, s.begin.sql);
       }
       case "last": {
         const i = this.nowDot(e.units), s = this.delta(i, "-", e.n, e.units);
@@ -122408,16 +122422,10 @@ class PXe {
         return this.expandLiteral(e);
       case "ago":
       case "from_now": {
-        const r = {
-          node: "trunc",
-          e: this.nowExpr(),
-          units: e.units
-        };
-        r.sql = this.d.sqlTruncExpr({}, r);
-        const i = (0, WO.mkTemporal)(r, "timestamp"), s = this.delta(i, e.moment === "ago" ? "-" : "+", e.n, e.units);
+        const r = this.nowDot(e.units), i = (0, WO.mkTemporal)(r, "timestamp"), s = this.delta(i, e.moment === "ago" ? "-" : "+", e.n, e.units);
         if (e.moment === "ago" && e.n === "1")
           return { begin: s, end: r.sql };
-        const o = Number(e.n) + e.moment === "ago" ? -1 : 1, u = {
+        const o = Number(e.n) + (e.moment === "ago" ? -1 : 1), u = {
           ...s,
           kids: { base: i, delta: this.n(o.toString()) }
         };
@@ -122462,7 +122470,7 @@ class PXe {
   }
   isIn(e, r, i) {
     let s = ">=", o = "<", u = "AND";
-    return e && (u = "OR", s = "<", o = ">="), `${this.expr} ${s} ${r} ${u} ${this.expr} ${o} ${i}`;
+    return e && (u = "OR", s = "<", o = ">="), r = this.time(r), i = this.time(i), `${this.expr} ${s} ${r} ${u} ${this.expr} ${o} ${i}`;
   }
 }
 dT.TemporalFilterCompiler = PXe;
@@ -122488,7 +122496,7 @@ dT.TemporalFilterCompiler = PXe;
       if (u === "boolean" && (0, e.isBooleanFilter)(a))
         return t.FilterCompilers.booleanCompile(a, l, c);
       if ((u === "date" || u === "timestamp") && (0, e.isTemporalFilter)(a))
-        return t.FilterCompilers.temporalCompile(a, l, c);
+        return t.FilterCompilers.temporalCompile(a, l, c, u);
       throw new Error("INTERNAL ERROR: No filter compiler for " + u);
     },
     numberCompile(u, a, l) {
@@ -122603,8 +122611,8 @@ dT.TemporalFilterCompiler = PXe;
       }
     },
     // mtoy todo figure out what to do about dates
-    temporalCompile(u, a, l) {
-      return new r.TemporalFilterCompiler(a, l).compile(u);
+    temporalCompile(u, a, l, c) {
+      return new r.TemporalFilterCompiler(a, l, c).compile(u);
     }
   };
 })(Yle);
@@ -123116,7 +123124,7 @@ let lk = class extends VXe {
       case "filterMatch":
         if ((a.dataType === "string" || a.dataType === "number" || a.dataType === "date" || a.dataType === "timestamp" || a.dataType === "boolean") && (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 (FCU) ${a.dataType}`);
+        throw new Error(`Internal Error: Filter Compiler Undefined Type '${a.dataType}'`);
       default:
         throw new Error(`Internal Error: Unknown expression node '${a.node}' ${JSON.stringify(a, void 0, 2)}`);
     }
@@ -130478,7 +130486,7 @@ class $ut extends Iut.ExpressionDef {
       }
       if (a.log.length > 0)
         for (const c of a.log)
-          return this.loggedErrorExpr("filter-expression-type", `Filter parse error: ${a.log[0].message}`);
+          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 = {