Fixed incorrect parsing of paren-expression (#33)

* fixed vulnerabilities * Fixed incorrect parsing of paren-expressions (#22)
jmespath-community · Oct 25, 2024 · 0d0da8e · 0d0da8e
1 parent a29e14d
commit 0d0da8e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/Parser.ts b/src/Parser.ts
@@ -178,17 +178,10 @@ class TokenParser {
         return { type: 'ExpressionReference', child };
       }
       case Token.TOK_LPAREN: {
+        console.log('nud::TOK_LPAREN');
         const args: ExpressionNode[] = [];
-        while (this.lookahead(0) !== Token.TOK_RPAREN) {
-          let expression: ExpressionNode;
-          if (this.lookahead(0) === Token.TOK_CURRENT) {
-            expression = { type: Token.TOK_CURRENT };
-            this.advance();
-          } else {
-            expression = this.expression(0);
-          }
-          args.push(expression);
-        }
+        let expression = this.expression(0);
+        args.push(expression);
         this.match(Token.TOK_RPAREN);
         return args[0];
       }

diff --git a/test/jmespath-parser.spec.ts b/test/jmespath-parser.spec.ts
@@ -55,4 +55,14 @@ describe('parsing', () => {
       return null;
     }, 'syntax');
   });
+  it('should parse paren expression', () => {
+    // see #22 - issue with parenthesized expression-type
+    const expected = {
+      type: 'AndExpression',
+      left: { type: 'Current' },
+      right: { type: 'Literal' }
+    };
+    expect(compile('  @ && \'truthy\' ')).toMatchObject(expected);
+    expect(compile('( @ && \'truthy\' )')).toMatchObject(expected);
+  });
 });