clarity-pattern-parser 10.2.10 → 10.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-pattern-parser",
-  "version": "10.2.10",
+  "version": "10.2.12",
   "description": "Parsing Library for Typescript and Javascript.",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",

package/src/patterns/ExpressionPattern.test.ts

@@ -76,7 +76,7 @@ function createExpressionPattern() {
     ]);
 
     const expression = new ExpressionPattern("expression", [
-        multDivExpression,
+        new RightAssociatedPattern(multDivExpression),
         addSubExpression,
         boolExpression,
         ternary,
@@ -100,20 +100,20 @@ describe("Expression Pattern", () => {
     test("Single Expression", () => {
         const expression = createExpressionPattern();
         let result = expression.exec("a || c || b / c * a + d");
-         result = expression.exec("a + b");
-         result = expression.exec("a + b * c * d");
-         result = expression.exec("a + b * c || d + e");
-         result = expression.exec("(a + b) * (c + d)");
-         result = expression.exec("(a + b) * c + (d + e)");
-         result = expression.exec("a + b * c ? d : e");
-         result = expression.exec("a + b * (a + b * c ? d : e) ? d : e");
-         result = expression.exec("a + b * a + b * c ? d : e ? d : e");
-         result = expression.exec("a + b * ?");
+        result = expression.exec("a + b");
+        result = expression.exec("a + b * c * d");
+        result = expression.exec("a + b * c || d + e");
+        result = expression.exec("(a + b) * (c + d)");
+        result = expression.exec("(a + b) * c + (d + e)");
+        result = expression.exec("a + b * c ? d : e");
+        result = expression.exec("a + b * (a + b * c ? d : e) ? d : e");
+        result = expression.exec("a + b * a + b * c ? d : e ? d : e");
+        result = expression.exec("a + b * ?");
 
         expect(result).toBe(result);
     });
 
-    test("Options like", ()=>{
+    test("Options like", () => {
         const expression = createOptionsExpression();
         const autoComplete = new AutoComplete(expression);
         const suggestion = autoComplete.suggestFor("a");

package/src/patterns/ExpressionPattern.ts

@@ -301,15 +301,15 @@ export class ExpressionPattern implements Pattern {
                         }
                         break;
                     }
-                } 
-                
+                }
+
                 cursor.resolveError();
                 cursor.moveTo(onIndex);
             }
 
-            cursor.resolveError();
             onIndex = cursor.index;
             for (let i = 0; i < this._binaryPatterns.length; i++) {
+                cursor.resolveError();
                 cursor.moveTo(onIndex);
 
                 const pattern = this._binaryPatterns[i];
@@ -332,7 +332,7 @@ export class ExpressionPattern implements Pattern {
                     lastBinaryNode = node;
                 } else if (lastBinaryNode != null && lastUnaryNode != null && delimiterNode != null) {
                     const precedence = this._precedenceMap[name];
-                    const lastPrecendece = lastBinaryNode == null ? 0 : this._precedenceMap[lastBinaryNode.name] || -1;
+                    const lastPrecendece = lastBinaryNode == null ? 0 : this._precedenceMap[lastBinaryNode.name] == null ? -1 : this._precedenceMap[lastBinaryNode.name];
                     const association = this._binaryAssociation[i];
 
                     if (precedence === lastPrecendece && association === Association.right) {