clarity-pattern-parser 10.2.11 → 10.2.13

package/package.json

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

package/src/ast/Node.test.ts

@@ -392,6 +392,26 @@ describe("Node", () => {
         expect(parent.endIndex).toBe(11);
     });
 
+    test("Normalize values and index deep", () => {
+        const firstChild = new Node("literal", "first", 0, 0, [], "first");
+        const secondChild = new Node("literal", "second", 0, 0, [], "second");
+        const grandChild = new Node("literal", "three", 0, 0, [], "three");
+        const parent = new Node("literal", "parent", 0, 0);
+
+        parent.appendChild(firstChild);
+        parent.appendChild(secondChild);
+
+        parent.normalize();
+
+        secondChild.appendChild(grandChild);
+        parent.normalize();
+
+        expect(parent.startIndex).toBe(0);
+        expect(parent.firstIndex).toBe(0);
+        expect(parent.lastIndex).toBe(9);
+        expect(parent.endIndex).toBe(10);
+    });
+
     test("Normalize values with no values", () => {
         const node = new Node("literal", "node", 0, 0, [], "");
         node.normalize();
@@ -451,8 +471,6 @@ describe("Node", () => {
             Node.createValueNode("aunt", "aunt")
         ]);
 
-        
-
         expect(result.toJson()).toBe(expected.toJson());
     });
 

package/src/ast/Node.ts

@@ -291,11 +291,17 @@ export class Node {
 
   normalize(startIndex = this._firstIndex): number {
     let length = 0;
+    let runningOffset = startIndex;
 
     if (this.children.length === 0) {
       length = this._value.length;
     } else {
-      length = this.children.reduce((acc, c) => acc + c.normalize(acc + startIndex), startIndex) - startIndex;
+      for (let x = 0; x < this.children.length; x++) {
+        const child = this.children[x];
+        const childLength = child.normalize(runningOffset);
+        runningOffset += childLength;
+        length += childLength;
+      }
     }
 
     this._firstIndex = startIndex;

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,7 +301,7 @@ export class ExpressionPattern implements Pattern {
                         }
                         break;
                     }
-                } 
+                }
 
                 cursor.resolveError();
                 cursor.moveTo(onIndex);
@@ -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) {