clarity-pattern-parser 11.0.7 → 11.0.9

package/dist/index.browser.js

@@ -850,6 +850,8 @@
             this._cachedPattern = null;
             this._children = [];
             this._firstIndex = 0;
+            this._cachedAncestors = false;
+            this._recursiveAncestors = [];
         }
         test(text, record = false) {
             return testPattern(this, text, record);
@@ -859,8 +861,36 @@
         }
         parse(cursor) {
             this._firstIndex = cursor.index;
+            this._cacheAncestors();
+            if (this._isBeyondRecursiveAllowance()) {
+                cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
+                return null;
+            }
             return this.getReferencePatternSafely().parse(cursor);
         }
+        _cacheAncestors() {
+            if (!this._cachedAncestors) {
+                let pattern = this.parent;
+                while (pattern != null) {
+                    if (pattern.type === this.type && pattern.id === this._id) {
+                        this._recursiveAncestors.push(pattern);
+                    }
+                    pattern = pattern.parent;
+                }
+            }
+        }
+        _isBeyondRecursiveAllowance() {
+            let depth = 0;
+            for (let pattern of this._recursiveAncestors) {
+                if (pattern._firstIndex === this._firstIndex) {
+                    depth++;
+                    if (depth > 2) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
         getReferencePatternSafely() {
             if (this._pattern === null) {
                 let pattern = null;
@@ -1046,9 +1076,6 @@
             return null;
         }
         _tryToParse(cursor) {
-            if (this._isBeyondRecursiveAllowance()) {
-                return null;
-            }
             const results = [];
             for (const pattern of this._children) {
                 cursor.moveTo(this._firstIndex);
@@ -1066,20 +1093,6 @@
             nonNullResults.sort((a, b) => b.endIndex - a.endIndex);
             return nonNullResults[0] || null;
         }
-        _isBeyondRecursiveAllowance() {
-            let depth = 0;
-            let pattern = this;
-            while (pattern != null) {
-                if (pattern.id === this.id && pattern.startedOnIndex === this.startedOnIndex) {
-                    depth++;
-                }
-                if (depth > 2) {
-                    return true;
-                }
-                pattern = pattern.parent;
-            }
-            return false;
-        }
         getTokens() {
             const tokens = [];
             for (const pattern of this._children) {
@@ -1735,10 +1748,6 @@
             return null;
         }
         tryToParse(cursor) {
-            if (this._isBeyondRecursiveAllowance()) {
-                cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
-                return false;
-            }
             let passed = false;
             for (let i = 0; i < this._children.length; i++) {
                 const runningCursorIndex = cursor.index;
@@ -1802,20 +1811,6 @@
             }
             return nodes[nodes.length - 1];
         }
-        _isBeyondRecursiveAllowance() {
-            let depth = 0;
-            let pattern = this;
-            while (pattern != null) {
-                if (pattern.id === this.id && pattern.startedOnIndex === this.startedOnIndex) {
-                    depth++;
-                }
-                if (depth > 1) {
-                    return true;
-                }
-                pattern = pattern.parent;
-            }
-            return false;
-        }
         areRemainingPatternsOptional(fromIndex) {
             const startOnIndex = fromIndex + 1;
             const length = this._children.length;
@@ -3059,10 +3054,6 @@
             return null;
         }
         _tryToParse(cursor) {
-            if (this._isBeyondRecursiveAllowance()) {
-                cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
-                return null;
-            }
             this._shouldStopParsing = false;
             while (true) {
                 cursor.resolveError();
@@ -3193,20 +3184,6 @@
                 this._shouldStopParsing = true;
             }
         }
-        _isBeyondRecursiveAllowance() {
-            let depth = 0;
-            let pattern = this;
-            while (pattern != null) {
-                if (pattern.id === this.id && pattern.startedOnIndex === this.startedOnIndex) {
-                    depth++;
-                }
-                if (depth > 2) {
-                    return true;
-                }
-                pattern = pattern.parent;
-            }
-            return false;
-        }
         test(text, record = false) {
             return testPattern(this, text, record);
         }
@@ -3694,7 +3671,7 @@
         _saveConfigurableAnonymous(node) {
             const nameNode = node.find(n => n.name === "name");
             const name = nameNode.value;
-            const anonymousNode = node.find(n => n.name === "complex-anonymous-pattern");
+            const anonymousNode = node.find(n => n.name === "configurable-anonymous-pattern");
             const isOptional = node.children[1] != null;
             const anonymous = isOptional ? new Optional(name, this._buildPattern(anonymousNode)) : this._buildPattern(anonymousNode);
             this._parseContext.patternsByName.set(name, anonymous);