clarity-pattern-parser 11.0.4 → 11.0.6

package/dist/index.browser.js

@@ -2930,12 +2930,12 @@
             this._postfixNames = [];
             this._binaryPatterns = [];
             this._binaryNames = [];
-            this.associationMap = {};
+            this._associationMap = {};
             this._precedenceMap = {};
             this._originalPatterns = patterns;
             this._patterns = this._organizePatterns(patterns);
             this._shouldStopParsing = false;
-            this._precedenceTree = new PrecedenceTree(this._precedenceMap, this.associationMap);
+            this._precedenceTree = new PrecedenceTree(this._precedenceMap, this._associationMap);
             if (this._atomPatterns.length === 0) {
                 throw new Error("Need at least one terminating pattern with an 'expression' pattern.");
             }
@@ -2973,10 +2973,10 @@
                     this._binaryPatterns.push(clone);
                     this._binaryNames.push(name);
                     if (pattern.type === "right-associated") {
-                        this.associationMap[name] = Association.right;
+                        this._associationMap[name] = Association.right;
                     }
                     else {
-                        this.associationMap[name] = Association.left;
+                        this._associationMap[name] = Association.left;
                     }
                     finalPatterns.push(clone);
                 }
@@ -3004,7 +3004,7 @@
         _isAtom(pattern) {
             pattern = this._unwrapAssociationIfNecessary(pattern);
             const firstChild = pattern.children[0];
-            const lastChild = pattern.children[1];
+            const lastChild = pattern.children[pattern.children.length - 1];
             const firstChildIsReference = this._isRecursiveReference(firstChild);
             const lastChildIsReference = this._isRecursiveReference(lastChild);
             return !firstChildIsReference && !lastChildIsReference;
@@ -3221,7 +3221,24 @@
         getTokens() {
             return this.atomPatterns.map(p => p.getTokens()).flat();
         }
-        getTokensAfter(_childReference) {
+        getTokensAfter(childReference) {
+            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();
+                if (postfixTokens.length === 0) {
+                    return this._binaryPatterns.map(p => p.getTokens()).flat();
+                }
+                return postfixTokens;
+            }
+            if (this._postfixPatterns.includes(childReference)) {
+                const postfixTokens = this.postfixPatterns.map(p => p.getTokens()).flat();
+                const binaryTokens = this._binaryPatterns.map(p => p.getTokens()).flat();
+                return [...postfixTokens, ...binaryTokens];
+            }
             return [];
         }
         getNextTokens() {
@@ -3233,7 +3250,24 @@
         getPatterns() {
             return this.atomPatterns.map(p => p.getPatterns()).flat();
         }
-        getPatternsAfter(_childReference) {
+        getPatternsAfter(childReference) {
+            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();
+                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 binaryPatterns = this._binaryPatterns.map(p => p.getPatterns()).flat();
+                return [...postfixPaterns, ...binaryPatterns];
+            }
             return [];
         }
         getNextPatterns() {