Merge pull request #70 from paustint/bug-69

Queries consecutive left parens not accurately parsed #69

Author: paustint

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.1
+
+- Queries with multiple consecutive left parens in a where clause were not correctly parsed. (#69)
+- Fixed npm reported security vulnerabilities.
+
 ## 1.2.0
 
 - Changed compose methods to public to allow external access (#65)

debug/test.js

@@ -1,6 +1,14 @@
 var soqlParserJs = require('./lib');
 
-const query = `SELECT Title FROM KnowledgeArticleVersion WHERE PublishStatus = 'online' WITH DATA CATEGORY Geography__c ABOVE usa__c WITH SECURITY_ENFORCED`;
+const query = `SELECT Id, Name
+FROM Account
+WHERE (((Name = '1'
+OR Name = '2')
+AND Name = '3'))
+AND (((Description = '123')
+OR (Id = '1'
+AND Id = '2')))
+AND Id = '1'`;
 // const query = `
 // SELECT Id, Name, FORMAT(Amount),
 //   (SELECT Quantity, ListPrice, PricebookEntry.UnitPrice, PricebookEntry.Name FROM OpportunityLineItems)

docs/package-lock.json

@@ -13,7 +13,7 @@
     "react": "^16.5.2",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.5.2",
-    "react-scripts-ts": "3.1.0",
+    "react-scripts-ts": "^4.0.8",
     "react-syntax-highlighter": "^9.0.0",
     "soql-parser-js": "^1.2.0"
   },
@@ -33,5 +33,11 @@
     "@types/react": "^16.4.16",
     "@types/react-dom": "^16.0.9",
     "typescript": "^3.1.3"
-  }
+  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
 }

docs/package.json

@@ -1069,7 +1069,8 @@ export class Listener implements SOQLListener {
       console.log('enterParenthesis:', ctx.text);
     }
     if (this.context.currentItem === 'where' || this.context.currentItem === 'having') {
-      this.context.tempData.nextHasOpenParen = true;
+      this.context.tempData.nextOpenParenCount = this.context.tempData.nextOpenParenCount || 0;
+      this.context.tempData.nextOpenParenCount += 1;
     }
   }
   exitParenthesis(ctx: Parser.ParenthesisContext) {
@@ -1100,10 +1101,10 @@ export class Listener implements SOQLListener {
       const currItem: any = {};
       if (!this.context.tempData.currConditionOperation.left) {
         this.context.tempData.currConditionOperation.left = currItem;
-        if (this.context.tempData.nextHasOpenParen) {
+        if (this.context.tempData.nextOpenParenCount) {
           currItem.openParen = currItem.openParen || 0;
-          currItem.openParen += 1;
-          this.context.tempData.nextHasOpenParen = false;
+          currItem.openParen += this.context.tempData.nextOpenParenCount;
+          this.context.tempData.nextOpenParenCount = 0;
         }
         if (this.context.tempData.nextHasLogicalPrefix) {
           currItem.logicalPrefix = this.context.tempData.nextHasLogicalPrefix;
@@ -1121,10 +1122,10 @@ export class Listener implements SOQLListener {
       const currItem: any = {};
       if (!this.context.tempData.currConditionOperation.left) {
         this.context.tempData.currConditionOperation.left = currItem;
-        if (this.context.tempData.nextHasOpenParen) {
+        if (this.context.tempData.nextOpenParenCount) {
           currItem.openParen = currItem.openParen || 0;
-          currItem.openParen += 1;
-          this.context.tempData.nextHasOpenParen = false;
+          currItem.openParen += this.context.tempData.nextOpenParenCount;
+          this.context.tempData.nextOpenParenCount = 0;
         }
         if (this.context.tempData.nextHasLogicalPrefix) {
           currItem.logicalPrefix = this.context.tempData.nextHasLogicalPrefix;
@@ -1151,10 +1152,10 @@ export class Listener implements SOQLListener {
       const currItem: any = {};
       if (!this.context.tempData.currConditionOperation.left) {
         this.context.tempData.currConditionOperation.left = currItem;
-        if (this.context.tempData.nextHasOpenParen) {
+        if (this.context.tempData.nextOpenParenCount) {
           currItem.openParen = currItem.openParen || 0;
-          currItem.openParen += 1;
-          this.context.tempData.nextHasOpenParen = false;
+          currItem.openParen += this.context.tempData.nextOpenParenCount;
+          this.context.tempData.nextOpenParenCount = 0;
         }
         if (this.context.tempData.nextHasLogicalPrefix) {
           currItem.logicalPrefix = this.context.tempData.nextHasLogicalPrefix;
@@ -1185,10 +1186,10 @@ export class Listener implements SOQLListener {
       const currItem: any = {};
       if (!this.context.tempData.currConditionOperation.left) {
         this.context.tempData.currConditionOperation.left = currItem;
-        if (this.context.tempData.nextHasOpenParen) {
+        if (this.context.tempData.nextOpenParenCount) {
           currItem.openParen = currItem.openParen || 0;
-          currItem.openParen += 1;
-          this.context.tempData.nextHasOpenParen = false;
+          currItem.openParen += this.context.tempData.nextOpenParenCount;
+          this.context.tempData.nextOpenParenCount = 0;
         }
         if (this.context.tempData.nextHasLogicalPrefix) {
           currItem.logicalPrefix = this.context.tempData.nextHasLogicalPrefix;