clarity-pattern-parser 10.3.5 → 10.3.7

package/package.json

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

package/src/patterns/ExpressionPattern.ts

@@ -257,6 +257,8 @@ export class ExpressionPattern implements Pattern {
         const node = this._tryToParse(cursor);
 
         if (node != null) {
+            node.normalize(this._firstIndex);
+
             cursor.moveTo(node.lastIndex);
             cursor.resolveError();
             this._compactResult(node);
@@ -360,6 +362,10 @@ export class ExpressionPattern implements Pattern {
 
             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);
@@ -378,7 +384,6 @@ export class ExpressionPattern implements Pattern {
                         const frontExpression = lastBinaryNode == null ? lastAtomNode as Node : lastBinaryNode.findRoot();
                         const recursiveNode = createNode(name, [frontExpression, ...node.children]);
 
-                        recursiveNode.normalize(this._firstIndex);
 
                         return recursiveNode;
                     } else {
@@ -387,7 +392,6 @@ export class ExpressionPattern implements Pattern {
                         }
 
                         const recursiveNode = createNode(name, [lastAtomNode, ...node.children]);
-                        recursiveNode.normalize(lastAtomNode.startIndex);
                         lastAtomNode = recursiveNode;
 
                         if (cursor.hasNext()) {
@@ -511,7 +515,6 @@ export class ExpressionPattern implements Pattern {
                 }
             }
 
-            root.normalize(this._firstIndex);
             return root;
         }
     }