clarity-pattern-parser 10.0.4 → 10.0.5

package/dist/patterns/Cursor.d.ts

@@ -5,7 +5,8 @@ import { Pattern } from "./Pattern";
 export declare class CyclicalParseError extends Error {
     readonly patternId: string;
     readonly patternName: string;
-    constructor(patternId: string, patternName: string);
+    readonly cursorIndex: number;
+    constructor(patternId: string, patternName: string, cursorIndex: number);
 }
 export declare class Cursor {
     private _text;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-pattern-parser",
-  "version": "10.0.4",
+  "version": "10.0.5",
   "description": "Parsing Library for Typescript and Javascript.",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",

package/src/patterns/Cursor.ts

@@ -6,11 +6,13 @@ import { Pattern } from "./Pattern";
 export class CyclicalParseError extends Error {
   readonly patternId: string;
   readonly patternName: string;
+  readonly cursorIndex: number;
 
-  constructor(patternId: string, patternName: string) {
+  constructor(patternId: string, patternName: string, cursorIndex: number) {
     super("Cyclical Parse Error");
     this.patternId = patternId;
     this.patternName = patternName;
+    this.cursorIndex = cursorIndex;
   }
 }
 
@@ -163,7 +165,7 @@ export class Cursor {
 
     const hasCycle = this._stackTrace.filter(t => t.pattern.id === pattern.id && this.index === t.cursorIndex).length > 1;
     if (hasCycle) {
-      throw new CyclicalParseError(pattern.id, pattern.name);
+      throw new CyclicalParseError(pattern.id, pattern.name, this.index);
     }
 
     this._history.pushStackTrace(trace);

package/src/patterns/Options.test.ts

@@ -295,4 +295,21 @@ describe("Options", () => {
         result = expression.exec("John ? Jane : John ? Jane : John");
         expect(result.ast?.toString()).toBe("John ? Jane : John ? Jane : John");
     });
+
+    test("Deeper Cyclical Error Recorvery", () => {
+        const john = new Literal("john", "John");
+        const expressionReference = new Reference("expression");
+
+        const johns = new Sequence("johns", [john, expressionReference]);
+        const expression = new Options("expression", [
+            john,
+            johns,
+        ], true);
+
+        let result = expression.exec("John");
+        expect(result.ast?.toString()).toBe("John");
+
+        result = expression.exec("JohnJohnJohnJohnJohn");
+        expect(result.ast?.toString()).toBe("JohnJohnJohnJohnJohn");
+    });
 });

package/src/patterns/Options.ts

@@ -111,13 +111,8 @@ export class Options implements Pattern {
 
       try {
         result = pattern.parse(cursor);
-      } catch (error: any) {
-        if (error.patternId === this._id) {
-          continue;
-        } else {
-          cursor.endParse();
-          throw error;
-        }
+      } catch {
+        continue;
       }
 
       if (this._isGreedy) {