clarity-pattern-parser 10.1.17 → 10.1.21

package/dist/index.js

@@ -1048,8 +1048,11 @@ class Options {
     }
     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;
     }
@@ -1068,6 +1071,9 @@ class Options {
     getPatterns() {
         const patterns = [];
         for (const pattern of this._children) {
+            if (pattern.type === "reference" && pattern.name === this.name) {
+                continue;
+            }
             patterns.push(...pattern.getPatterns());
         }
         return patterns;
@@ -1795,9 +1801,12 @@ class Sequence {
     }
     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;
             }
         }
@@ -1817,9 +1826,12 @@ class Sequence {
     }
     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;
             }
         }
@@ -2367,9 +2379,8 @@ class AutoComplete {
             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,
@@ -2380,6 +2391,25 @@ class AutoComplete {
             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));
     }