clarity-pattern-parser 11.0.12 → 11.0.15

package/dist/index.js

@@ -859,18 +859,19 @@ class Reference {
     }
     parse(cursor) {
         this._firstIndex = cursor.index;
-        this._cacheAncestors();
+        const pattern = this.getReferencePatternSafely();
+        this._cacheAncestors(pattern.id);
         if (this._isBeyondRecursiveAllowance()) {
             cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
             return null;
         }
-        return this.getReferencePatternSafely().parse(cursor);
+        return pattern.parse(cursor);
     }
-    _cacheAncestors() {
+    _cacheAncestors(id) {
         if (!this._cachedAncestors) {
             let pattern = this.parent;
             while (pattern != null) {
-                if (pattern.type === this.type && pattern.id === this._id) {
+                if (pattern.id === id) {
                     this._recursiveAncestors.push(pattern);
                 }
                 pattern = pattern.parent;
@@ -3605,7 +3606,7 @@ class Grammar {
             const isNot = n.find(n => n.name === "not") != null;
             const isOptional = n.find(n => n.name === "is-optional");
             const pattern = this._buildPattern(patternNode);
-            const finalPattern = isOptional ? new Optional(pattern.name, pattern) : pattern;
+            const finalPattern = isOptional ? new Optional(`optional-${pattern.name}`, pattern) : pattern;
             if (isNot) {
                 return new Not(`not-${finalPattern.name}`, finalPattern);
             }
@@ -3664,7 +3665,7 @@ class Grammar {
                 isOptional = true;
             }
         }
-        return isOptional ? new Optional(name, new Repeat(name, pattern, options)) : new Repeat(name, pattern, options);
+        return isOptional ? new Optional(name, new Repeat(`inner-optional-${name}`, pattern, options)) : new Repeat(name, pattern, options);
     }
     _saveConfigurableAnonymous(node) {
         const nameNode = node.find(n => n.name === "name");