tplm-lang 0.3.0 → 0.3.1

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.1",
   "description": "TPLm - Table Producing Language backed by Malloy.",
   "type": "module",
   "main": "./dist/index.js",