clarity-pattern-parser 10.1.17 → 10.1.21

package/dist/index.browser.js

@@ -1050,8 +1050,11 @@
         }
         getTokens() {
             const tokens = [];
-            for (const child of this._children) {
-                tokens.push(...child.getTokens());
+            for (const pattern of this._children) {
+                if (pattern.type === "reference" && pattern.name === this.name) {
+                    continue;
+                }
+                tokens.push(...pattern.getTokens());
             }
             return tokens;
         }
@@ -1070,6 +1073,9 @@
         getPatterns() {
             const patterns = [];
             for (const pattern of this._children) {
+                if (pattern.type === "reference" && pattern.name === this.name) {
+                    continue;
+                }
                 patterns.push(...pattern.getPatterns());
             }
             return patterns;
@@ -1797,9 +1803,12 @@
         }
         getTokens() {
             const tokens = [];
-            for (const child of this._children) {
-                tokens.push(...child.getTokens());
-                if (child.type !== "optional" && child.type !== "not") {
+            for (const pattern of this._children) {
+                if (pattern.type === "reference" && pattern.name === this.name && pattern === this.children[0]) {
+                    return tokens;
+                }
+                tokens.push(...pattern.getTokens());
+                if (pattern.type !== "optional" && pattern.type !== "not") {
                     break;
                 }
             }
@@ -1819,9 +1828,12 @@
         }
         getPatterns() {
             const patterns = [];
-            for (const child of this._children) {
-                patterns.push(...child.getPatterns());
-                if (child.type !== "optional" && child.type !== "not") {
+            for (const pattern of this._children) {
+                if (pattern.type === "reference" && pattern.name === this.name && pattern === this.children[0]) {
+                    return patterns;
+                }
+                patterns.push(...pattern.getPatterns());
+                if (pattern.type !== "optional" && pattern.type !== "not") {
                     break;
                 }
             }
@@ -2369,9 +2381,8 @@
                 errorAtIndex = startIndex;
             }
             else if (!isComplete && this._cursor.hasError && this._cursor.furthestError != null) {
-                errorAtIndex = this._cursor.furthestError.endIndex;
-                error = this._cursor.furthestError;
-                errorAtIndex = options.reduce((errorAtIndex, option) => Math.max(errorAtIndex, option.startIndex), errorAtIndex);
+                errorAtIndex = this.getFurthestPosition(cursor);
+                error = new ParseError(errorAtIndex, errorAtIndex, this._pattern);
             }
             return {
                 isComplete: isComplete,
@@ -2382,6 +2393,25 @@
                 ast,
             };
         }
+        getFurthestPosition(cursor) {
+            const furthestError = cursor.furthestError;
+            const furthestMatch = cursor.allMatchedNodes[cursor.allMatchedNodes.length - 1];
+            if (furthestError && furthestMatch) {
+                if (furthestError.endIndex > furthestMatch.endIndex) {
+                    return furthestMatch.endIndex;
+                }
+                else {
+                    return furthestError.endIndex;
+                }
+            }
+            if (furthestError == null && furthestMatch != null) {
+                return furthestMatch.endIndex;
+            }
+            if (furthestMatch == null && furthestError != null) {
+                return furthestError.endIndex;
+            }
+            return 0;
+        }
         suggestFor(text) {
             return this.suggestForWithCursor(new Cursor(text));
         }