clarity-pattern-parser 10.3.4 → 10.3.6

package/dist/patterns/ExpressionPattern.d.ts

@@ -28,7 +28,8 @@ export declare class ExpressionPattern implements Pattern {
     get parent(): Pattern | null;
     set parent(pattern: Pattern | null);
     get children(): Pattern[];
-    get unaryPatterns(): readonly Pattern[];
+    get unaryPrefixPatterns(): readonly Pattern[];
+    get atomPatterns(): readonly Pattern[];
     get binaryPatterns(): readonly Pattern[];
     get recursivePatterns(): readonly Pattern[];
     get startedOnIndex(): number;

package/package.json

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

package/src/patterns/ExpressionPattern.ts

@@ -62,7 +62,11 @@ export class ExpressionPattern implements Pattern {
         return this._patterns;
     }
 
-    get unaryPatterns(): readonly Pattern[] {
+    get unaryPrefixPatterns(): readonly Pattern[] {
+        return this._unaryPrefixPatterns;
+    }
+
+    get atomPatterns(): readonly Pattern[] {
         return this._atomPatterns;
     }
 
@@ -114,7 +118,7 @@ export class ExpressionPattern implements Pattern {
 
             if (this._isUnary(pattern)) {
                 const unaryPrefix = this._extractUnaryPrefixPattern(pattern).clone();
-                this._unaryPrefixPatterns.push(pattern);
+                this._unaryPrefixPatterns.push(unaryPrefix);
                 this._unaryPrefixNames.push(pattern.name);
                 unaryPrefix.parent = this;
 
@@ -356,6 +360,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);
@@ -550,11 +558,11 @@ export class ExpressionPattern implements Pattern {
     }
 
     getTokens(): string[] {
-        return this.unaryPatterns.map(p => p.getTokens()).flat();
+        return this.atomPatterns.map(p => p.getTokens()).flat();
     }
 
     getTokensAfter(childReference: Pattern): string[] {
-        if (this.unaryPatterns.indexOf(childReference)) {
+        if (this.atomPatterns.indexOf(childReference)) {
             const recursiveTokens = this._recursivePatterns.map(p => p.getTokens()).flat();
             const binaryTokens = this._binaryPatterns.map(p => p.getTokens()).flat();
 
@@ -588,11 +596,11 @@ export class ExpressionPattern implements Pattern {
     }
 
     getPatterns(): Pattern[] {
-        return this.unaryPatterns.map(p => p.getPatterns()).flat();
+        return this.atomPatterns.map(p => p.getPatterns()).flat();
     }
 
     getPatternsAfter(childReference: Pattern): Pattern[] {
-        if (this.unaryPatterns.indexOf(childReference)) {
+        if (this.atomPatterns.indexOf(childReference)) {
             const recursivePatterns = this._recursivePatterns.map(p => p.getPatterns()).flat();
             const binaryPatterns = this._binaryPatterns.map(p => p.getPatterns()).flat();