clarity-pattern-parser 11.5.2 → 11.5.3

package/dist/patterns/Expression.d.ts

@@ -17,7 +17,7 @@ export declare class Expression implements Pattern {
     private _prefixNames;
     private _postfixPatterns;
     private _postfixNames;
-    private _binaryPatterns;
+    private _infixPatterns;
     private _binaryNames;
     private _associationMap;
     private _precedenceMap;

package/package.json

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

package/src/patterns/Expression.ts

@@ -26,7 +26,7 @@ export class Expression implements Pattern {
     private _prefixNames: string[];
     private _postfixPatterns: Pattern[];
     private _postfixNames: string[];
-    private _binaryPatterns: Pattern[];
+    private _infixPatterns: Pattern[];
     private _binaryNames: string[];
     private _associationMap: Record<string, Association>;
     private _precedenceMap: Record<string, number>;
@@ -72,7 +72,7 @@ export class Expression implements Pattern {
     }
 
     get binaryPatterns(): readonly Pattern[] {
-        return this._binaryPatterns;
+        return this._infixPatterns;
     }
 
     get originalPatterns(): readonly Pattern[] {
@@ -100,7 +100,7 @@ export class Expression implements Pattern {
         this._prefixNames = [];
         this._postfixPatterns = [];
         this._postfixNames = [];
-        this._binaryPatterns = [];
+        this._infixPatterns = [];
         this._binaryNames = [];
         this._associationMap = {};
         this._precedenceMap = {};
@@ -150,7 +150,7 @@ export class Expression implements Pattern {
                 binary.parent = this;
 
                 this._precedenceMap[name] = index;
-                this._binaryPatterns.push(binary);
+                this._infixPatterns.push(binary);
                 this._binaryNames.push(name);
 
                 if (pattern.type === "right-associated") {
@@ -456,10 +456,10 @@ export class Expression implements Pattern {
             this._shouldStopParsing = true;
         }
 
-        for (let i = 0; i < this._binaryPatterns.length; i++) {
+        for (let i = 0; i < this._infixPatterns.length; i++) {
             cursor.moveTo(onIndex);
 
-            const pattern = this._binaryPatterns[i];
+            const pattern = this._infixPatterns[i];
             const name = this._binaryNames[i];
             const node = pattern.parse(cursor);
 
@@ -503,7 +503,7 @@ export class Expression implements Pattern {
 
     getTokensAfter(childReference: Pattern): string[] {
         this.build();
-        if (this._prefixPatterns.includes(childReference) || this._binaryPatterns.includes(childReference)) {
+        if (this._prefixPatterns.includes(childReference) || this._infixPatterns.includes(childReference)) {
             const atomTokens = this._atomPatterns.map(p => p.getTokens()).flat();
             const prefixTokens = this.prefixPatterns.map(p => p.getTokens()).flat();
 
@@ -512,19 +512,24 @@ export class Expression implements Pattern {
 
         if (this._atomPatterns.includes(childReference)) {
             const postfixTokens = this.postfixPatterns.map(p => p.getTokens()).flat();
+            const infixTokens = this._infixPatterns.map(p => p.getTokens()).flat();
 
-            if (postfixTokens.length === 0) {
-                return this._binaryPatterns.map(p => p.getTokens()).flat();
+            if (this._parent != null) {
+                return [...postfixTokens, ...infixTokens, ...this._parent.getNextTokens()];
             }
 
-            return postfixTokens;
+            return [...postfixTokens, ...infixTokens];
         }
 
         if (this._postfixPatterns.includes(childReference)) {
             const postfixTokens = this.postfixPatterns.map(p => p.getTokens()).flat();
-            const binaryTokens = this._binaryPatterns.map(p => p.getTokens()).flat();
+            const infixTokens = this._infixPatterns.map(p => p.getTokens()).flat();
 
-            return [...postfixTokens, ...binaryTokens];
+            if (this._parent != null) {
+                return [...postfixTokens, ...infixTokens, ...this._parent.getNextTokens()];
+            }
+
+            return [...postfixTokens, ...infixTokens];
         }
 
         return [];
@@ -548,7 +553,7 @@ export class Expression implements Pattern {
 
     getPatternsAfter(childReference: Pattern): Pattern[] {
         this.build();
-        if (this._prefixPatterns.includes(childReference) || this._binaryPatterns.includes(childReference)) {
+        if (this._prefixPatterns.includes(childReference) || this._infixPatterns.includes(childReference)) {
             const atomPatterns = this._atomPatterns.map(p => p.getPatterns()).flat();
             const prefixPatterns = this.prefixPatterns.map(p => p.getPatterns()).flat();
 
@@ -557,19 +562,24 @@ export class Expression implements Pattern {
 
         if (this._atomPatterns.includes(childReference)) {
             const postfixPatterns = this.postfixPatterns.map(p => p.getPatterns()).flat();
+            const infixPatterns = this._infixPatterns.map(p => p.getPatterns()).flat();
 
-            if (postfixPatterns.length === 0) {
-                return this._binaryPatterns.map(p => p.getPatterns()).flat();
+            if (this._parent != null) {
+                return  [...postfixPatterns, ...infixPatterns, ...this._parent.getNextPatterns()];
             }
 
-            return postfixPatterns;
+            return [...postfixPatterns, ...infixPatterns];
         }
 
         if (this._postfixPatterns.includes(childReference)) {
             const postfixPatterns = this.postfixPatterns.map(p => p.getPatterns()).flat();
-            const binaryPatterns = this._binaryPatterns.map(p => p.getPatterns()).flat();
+            const infixPatterns = this._infixPatterns.map(p => p.getPatterns()).flat();
+
+            if (this._parent != null) {
+                return [...postfixPatterns, ...infixPatterns, ...this._parent.getNextPatterns()];
+            }
 
-            return [...postfixPatterns, ...binaryPatterns];
+            return [...postfixPatterns, ...infixPatterns];
         }
 
         return [];