clarity-pattern-parser 10.2.7 → 10.2.9

package/package.json

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

package/src/patterns/ExpressionPattern.ts

@@ -273,13 +273,13 @@ export class ExpressionPattern implements Pattern {
                 const node = pattern.parse(cursor);
 
                 if (node != null) {
-                    if (lastBinaryNode != null && lastUnaryNode != null) {
-                        lastBinaryNode.appendChild(lastUnaryNode);
-                    }
-
                     const name = this._recursiveNames[i];
 
                     if (this._endsInRecursion[i]) {
+                        if (lastBinaryNode != null && lastUnaryNode != null) {
+                            lastBinaryNode.appendChild(lastUnaryNode);
+                        }
+
                         const frontExpression = lastBinaryNode == null ? lastUnaryNode as Node : lastBinaryNode.findRoot();
                         const recursiveNode = createNode(name, [frontExpression, ...node.children]);
 
@@ -293,6 +293,11 @@ export class ExpressionPattern implements Pattern {
 
                         if (cursor.hasNext()) {
                             cursor.next();
+                        } else {
+                            if (lastBinaryNode != null) {
+                                lastBinaryNode.appendChild(lastUnaryNode);
+                            }
+                            break outer;
                         }
                         break;
                     }