clarity-pattern-parser 11.5.0 → 11.5.2

package/dist/index.js

@@ -2901,6 +2901,7 @@ class Expression {
         this._name = name;
         this._originalName = name;
         this._parent = null;
+        this._cachedParent = null;
         this._firstIndex = 0;
         this._atomPatterns = [];
         this._prefixPatterns = [];
@@ -3051,7 +3052,8 @@ class Expression {
         return pattern.name === this._originalName;
     }
     build() {
-        if (!this._hasOrganized) {
+        if (!this._hasOrganized || this._cachedParent !== this.parent) {
+            this._cachedParent = this.parent;
             this._hasOrganized = true;
             this._organizePatterns(this._originalPatterns);
             this._cacheAncestors();
@@ -3222,18 +3224,20 @@ class Expression {
         return execPattern(this, text, record);
     }
     getTokens() {
+        this.build();
         const atomTokens = this._atomPatterns.map(p => p.getTokens()).flat();
         const prefixTokens = this.prefixPatterns.map(p => p.getTokens()).flat();
         return [...prefixTokens, ...atomTokens];
     }
     getTokensAfter(childReference) {
+        this.build();
         if (this._prefixPatterns.includes(childReference) || this._binaryPatterns.includes(childReference)) {
             const atomTokens = this._atomPatterns.map(p => p.getTokens()).flat();
             const prefixTokens = this.prefixPatterns.map(p => p.getTokens()).flat();
             return [...prefixTokens, ...atomTokens];
         }
         if (this._atomPatterns.includes(childReference)) {
-            const postfixTokens = this.prefixPatterns.map(p => p.getTokens()).flat();
+            const postfixTokens = this.postfixPatterns.map(p => p.getTokens()).flat();
             if (postfixTokens.length === 0) {
                 return this._binaryPatterns.map(p => p.getTokens()).flat();
             }
@@ -3253,27 +3257,29 @@ class Expression {
         return this._parent.getTokensAfter(this);
     }
     getPatterns() {
+        this.build();
         const atomPatterns = this._atomPatterns.map(p => p.getPatterns()).flat();
         const prefixPatterns = this.prefixPatterns.map(p => p.getPatterns()).flat();
         return [...prefixPatterns, ...atomPatterns];
     }
     getPatternsAfter(childReference) {
+        this.build();
         if (this._prefixPatterns.includes(childReference) || this._binaryPatterns.includes(childReference)) {
             const atomPatterns = this._atomPatterns.map(p => p.getPatterns()).flat();
             const prefixPatterns = this.prefixPatterns.map(p => p.getPatterns()).flat();
             return [...prefixPatterns, ...atomPatterns];
         }
         if (this._atomPatterns.includes(childReference)) {
-            const postfixPatterns = this.prefixPatterns.map(p => p.getPatterns()).flat();
+            const postfixPatterns = this.postfixPatterns.map(p => p.getPatterns()).flat();
             if (postfixPatterns.length === 0) {
                 return this._binaryPatterns.map(p => p.getPatterns()).flat();
             }
             return postfixPatterns;
         }
         if (this._postfixPatterns.includes(childReference)) {
-            const postfixPaterns = this.postfixPatterns.map(p => p.getPatterns()).flat();
+            const postfixPatterns = this.postfixPatterns.map(p => p.getPatterns()).flat();
             const binaryPatterns = this._binaryPatterns.map(p => p.getPatterns()).flat();
-            return [...postfixPaterns, ...binaryPatterns];
+            return [...postfixPatterns, ...binaryPatterns];
         }
         return [];
     }