clarity-pattern-parser 10.2.0 → 10.2.2

package/package.json

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

package/src/patterns/ExpressionPattern.test.ts

@@ -99,16 +99,16 @@ function createOptionsExpression() {
 describe("Expression Pattern", () => {
     test("Single Expression", () => {
         const expression = createExpressionPattern();
-        let result = expression.exec("a");
-        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 * ?");
+        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 * ?");
 
         expect(result).toBe(result);
     });
@@ -125,7 +125,7 @@ describe("Expression Pattern", () => {
         const expression = createExpressionPattern();
 
         const autoComplete = new AutoComplete(expression);
-        const suggestion = autoComplete.suggestFor("a ? b ");
+        const suggestion = autoComplete.suggestFor("a");
 
         expect(suggestion).toBe(suggestion);
     });

package/src/patterns/ExpressionPattern.ts

@@ -144,11 +144,11 @@ export class ExpressionPattern implements Pattern {
 
     private _isBinaryPattern(pattern: Pattern) {
         return pattern.type === "sequence" &&
+            pattern.children.length === 3 &&
             pattern.children[0].type === "reference" &&
             pattern.children[0].name === this.name &&
             pattern.children[2].type === "reference" &&
-            pattern.children[2].name === this.name &&
-            pattern.children.length === 3;
+            pattern.children[2].name === this.name;
     }
 
     private _extractDelimiter(pattern: Pattern) {
@@ -310,11 +310,26 @@ export class ExpressionPattern implements Pattern {
                         node.append(lastBinaryNode, delimiterNode);
                         lastBinaryNode = node;
                     } else if (precedence > lastPrecendece) {
-                        const root = lastBinaryNode.findRoot();
+                        let ancestor = lastBinaryNode.parent;
+                        let root: Node | null = lastBinaryNode;
+
+                        while (ancestor != null) {
+                            const nodePrecedence = this._precedenceMap[ancestor.name];
+
+                            if (nodePrecedence > precedence) {
+                                break;
+                            }
+                            root = ancestor;
+                            ancestor = ancestor.parent;
+                        }
+
                         lastBinaryNode.appendChild(lastUnaryNode);
 
                         if (root != null) {
-                            const node = createNode(name, [root, delimiterNode]);
+                            const node = createNode(name, []);
+                            root.replaceWith(node);
+                            node.append(root, delimiterNode);
+
                             lastBinaryNode = node;
                         } else {
                             const node = createNode(name, [lastUnaryNode, delimiterNode]);
@@ -338,7 +353,7 @@ export class ExpressionPattern implements Pattern {
                 break;
             }
 
-            if (lastBinaryNode == null){
+            if (lastBinaryNode == null) {
                 break;
             }
         }