tplm-lang 0.3.0 → 0.3.2

package/dist/compiler/grid-spec-builder.js

@@ -12,6 +12,58 @@
 import { collectBranches, } from "./table-spec.js";
 // Module-level reference to ordering provider for definition-order sorting
 let currentOrderingProvider;
+// ---
+// DATE NORMALIZATION
+// ---
+/**
+ * Normalize a raw data value: converts Date objects to formatted strings
+ * so they display cleanly as headers and work correctly with Set-based
+ * deduplication and value-based cell lookup.
+ *
+ * Dates at midnight UTC (date-only) become "YYYY-MM-DD".
+ * Timestamps with a time component become "YYYY-MM-DD HH:MM:SS".
+ */
+function normalizeDimValue(value) {
+    if (value instanceof Date) {
+        const iso = value.toISOString();
+        return iso.endsWith("T00:00:00.000Z")
+            ? iso.slice(0, 10)
+            : iso.slice(0, 19).replace("T", " ");
+    }
+    return value;
+}
+/**
+ * Recursively normalize all Date values in query result rows.
+ * This ensures Date objects are converted to formatted strings before
+ * any downstream processing (header extraction, cell indexing, etc.).
+ */
+function normalizeResultRow(row) {
+    const normalized = {};
+    for (const key of Object.keys(row)) {
+        const val = row[key];
+        if (Array.isArray(val)) {
+            normalized[key] = val.map((item) => item && typeof item === "object" && !Array.isArray(item) && !(item instanceof Date)
+                ? normalizeResultRow(item)
+                : normalizeDimValue(item));
+        }
+        else {
+            normalized[key] = normalizeDimValue(val);
+        }
+    }
+    return normalized;
+}
+/**
+ * Normalize all Date objects in query results to formatted strings.
+ * Applied once at the entry point so all downstream code sees
+ * consistent string values instead of raw Date objects.
+ */
+function normalizeQueryResults(results) {
+    const normalized = new Map();
+    for (const [queryId, rows] of results) {
+        normalized.set(queryId, rows.map(normalizeResultRow));
+    }
+    return normalized;
+}
 /**
  * Build a GridSpec from a TableSpec and query results.
  *
@@ -33,6 +85,10 @@ export function buildGridSpec(spec, plan, results, malloyQueriesOrOptions) {
     }
     // Set module-level ordering provider for definition-order sorting
     currentOrderingProvider = orderingProvider;
+    // Normalize Date objects in results to formatted strings before any processing.
+    // Malloy's toObject() returns JS Date objects for date/timestamp columns, which
+    // cause issues with Set-based dedup, value comparison, and display formatting.
+    results = normalizeQueryResults(results);
     try {
         // Build maps of query ID to special handling flags
         const invertedQueries = new Set();

package/dist/parser/chevrotain-parser.js

@@ -322,6 +322,9 @@ class TPLParser extends CstParser {
         this.SUBRULE(this.whereExpression);
     });
     // Simplified WHERE expression - captures tokens until ROWS
+    // Must accept all tokens that can appear in Malloy filter expressions,
+    // including @ for date literals (@2025-01-01), minus for negative numbers
+    // and date components, colon for timestamps, and comma for IN lists.
     whereExpression = this.RULE('whereExpression', () => {
         this.AT_LEAST_ONE(() => {
             this.OR([
@@ -336,6 +339,10 @@ class TPLParser extends CstParser {
                 { ALT: () => this.CONSUME(Dot) },
                 { ALT: () => this.CONSUME(LParen) },
                 { ALT: () => this.CONSUME(RParen) },
+                { ALT: () => this.CONSUME(At) }, // Malloy date literals: @2025-01-01
+                { ALT: () => this.CONSUME(Minus) }, // Negative numbers, date separators
+                { ALT: () => this.CONSUME(Colon) }, // Timestamp separators: 10:30:00
+                { ALT: () => this.CONSUME(CommaPunct) }, // IN lists, multiple conditions
             ]);
         });
     });
@@ -939,7 +946,9 @@ class TPLToAstVisitor extends BaseTPLVisitor {
         return this.visit(ctx.whereExpression[0]);
     }
     whereExpression(ctx) {
-        // Reconstruct the WHERE expression from tokens
+        // Reconstruct the WHERE expression from tokens, preserving original spacing.
+        // This is important for date literals like @2025-01-01 where tokens (@, 2025, -, 01)
+        // must not have spaces inserted between them.
         const allTokens = [];
         for (const key of Object.keys(ctx)) {
             const tokens = ctx[key];
@@ -947,9 +956,17 @@ class TPLToAstVisitor extends BaseTPLVisitor {
                 allTokens.push(...tokens);
             }
         }
-        // Sort by position and join
+        // Sort by position in the original input
         allTokens.sort((a, b) => a.startOffset - b.startOffset);
-        return allTokens.map(t => t.image).join(' ');
+        // Rebuild using original offsets to preserve spacing
+        if (allTokens.length === 0)
+            return '';
+        let result = allTokens[0].image;
+        for (let i = 1; i < allTokens.length; i++) {
+            const gap = allTokens[i].startOffset - (allTokens[i - 1].startOffset + allTokens[i - 1].image.length);
+            result += (gap > 0 ? ' '.repeat(gap) : '') + allTokens[i].image;
+        }
+        return result;
     }
     axis(ctx) {
         const groups = ctx.groups.map((g) => this.visit(g));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tplm-lang",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "TPLm - Table Producing Language backed by Malloy.",
   "type": "module",
   "main": "./dist/index.js",