clarity-pattern-parser 10.3.5 → 10.3.7

package/dist/index.js

@@ -2964,6 +2964,7 @@ class ExpressionPattern {
         this._firstIndex = cursor.index;
         const node = this._tryToParse(cursor);
         if (node != null) {
+            node.normalize(this._firstIndex);
             cursor.moveTo(node.lastIndex);
             cursor.resolveError();
             this._compactResult(node);
@@ -3053,6 +3054,9 @@ class ExpressionPattern {
                 break;
             }
             onIndex = cursor.index;
+            if (prefix != null && this._recursivePatterns.length === 0) {
+                lastAtomNode = createNode(prefixName, [prefix, lastAtomNode]);
+            }
             for (let i = 0; i < this._recursivePatterns.length; i++) {
                 const pattern = this._recursivePatterns[i];
                 const node = pattern.parse(cursor);
@@ -3067,7 +3071,6 @@ class ExpressionPattern {
                         }
                         const frontExpression = lastBinaryNode == null ? lastAtomNode : lastBinaryNode.findRoot();
                         const recursiveNode = createNode(name, [frontExpression, ...node.children]);
-                        recursiveNode.normalize(this._firstIndex);
                         return recursiveNode;
                     }
                     else {
@@ -3075,7 +3078,6 @@ class ExpressionPattern {
                             lastAtomNode = createNode(prefixName, [prefix, lastAtomNode]);
                         }
                         const recursiveNode = createNode(name, [lastAtomNode, ...node.children]);
-                        recursiveNode.normalize(lastAtomNode.startIndex);
                         lastAtomNode = recursiveNode;
                         if (cursor.hasNext()) {
                             cursor.next();
@@ -3184,7 +3186,6 @@ class ExpressionPattern {
                     return lastAtomNode;
                 }
             }
-            root.normalize(this._firstIndex);
             return root;
         }
     }