fix: tokenize $ as id than punctuator (#58)

tokenizing $ as punctuator is breaking existing workflow engine
rudderlabs · Jun 6, 2024 · 89a4dc7 · 89a4dc7
1 parent 900504b
commit 89a4dc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/lexer.ts b/src/lexer.ts
@@ -121,7 +121,7 @@ export class JsonTemplateLexer {
     const token = this.lookahead();
     if (token.type === TokenType.PUNCT) {
       const { value } = token;
-      return value === '.' || value === '..' || value === '^' || value === '$' || value === '@';
+      return value === '.' || value === '..' || value === '^' || value === '@';
     }
 
     return false;
@@ -359,7 +359,7 @@ export class JsonTemplateLexer {
   }
 
   private static isIdStart(ch: string) {
-    return ch === '_' || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z');
+    return ch === '_' || ch === '$' || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z');
   }
 
   private static isIdPart(ch: string) {
@@ -607,7 +607,7 @@ export class JsonTemplateLexer {
     const start = this.idx;
     const ch1 = this.codeChars[this.idx];
 
-    if (',;:{}()[]^+-*/%!><|=@~$#?\n'.includes(ch1)) {
+    if (',;:{}()[]^+-*/%!><|=@~#?\n'.includes(ch1)) {
       return {
         type: TokenType.PUNCT,
         value: ch1,

diff --git a/src/parser.ts b/src/parser.ts
@@ -286,10 +286,10 @@ export class JsonTemplateParser {
     if (root) {
       return root;
     }
-    if (this.lexer.matchID()) {
+    const nextToken = this.lexer.lookahead();
+    if (nextToken.type === TokenType.ID && nextToken.value !== '$') {
       return this.lexer.value();
     }
-    const nextToken = this.lexer.lookahead();
     const tokenReturnValues = {
       '^': DATA_PARAM_KEY,
       $: pathType.inferredPathType === PathType.JSON ? DATA_PARAM_KEY : BINDINGS_PARAM_KEY,