clarity-pattern-parser 11.3.2 → 11.3.4

package/dist/patterns/Expression.d.ts

@@ -23,6 +23,7 @@ export declare class Expression implements Pattern {
     private _shouldStopParsing;
     private _precedenceTree;
     private _hasOrganized;
+    private _atomsIdToAncestorsMap;
     get id(): string;
     get type(): string;
     get name(): string;
@@ -37,6 +38,7 @@ export declare class Expression implements Pattern {
     get startedOnIndex(): number;
     constructor(name: string, patterns: Pattern[]);
     private _organizePatterns;
+    private _cacheAncestors;
     private _extractName;
     private _isPrefix;
     private _extractPrefix;
@@ -53,6 +55,7 @@ export declare class Expression implements Pattern {
     private _tryToParse;
     private _tryToMatchPrefix;
     private _tryToMatchAtom;
+    private _isBeyondRecursiveAllowance;
     private _tryToMatchPostfix;
     private _tryToMatchBinary;
     test(text: string, record?: boolean): boolean;

package/package.json

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

package/src/patterns/Expression.ts

@@ -32,6 +32,7 @@ export class Expression implements Pattern {
     private _shouldStopParsing: boolean;
     private _precedenceTree: PrecedenceTree;
     private _hasOrganized: boolean;
+    private _atomsIdToAncestorsMap: Record<string, Pattern[]>
 
     get id(): string {
         return this._id;
@@ -106,6 +107,7 @@ export class Expression implements Pattern {
         this._hasOrganized = false;
         this._patterns = [];
         this._precedenceTree = new PrecedenceTree({}, {});
+        this._atomsIdToAncestorsMap = {};
     }
 
     private _organizePatterns(patterns: Pattern[]) {
@@ -163,6 +165,21 @@ export class Expression implements Pattern {
         return finalPatterns;
     }
 
+    private _cacheAncestors() {
+        for (let atom of this._atomPatterns) {
+            const id = atom.id;
+            const ancestors: Pattern[] = this._atomsIdToAncestorsMap[id] = [];
+
+            let pattern: Pattern | null = this.parent;
+            while (pattern != null) {
+                if (pattern.id === id) {
+                    ancestors.push(pattern);
+                }
+                pattern = pattern.parent;
+            }
+        }
+    }
+
     private _extractName(pattern: Pattern) {
         if (pattern.type === "right-associated") {
             return pattern.children[0].name;
@@ -262,6 +279,7 @@ export class Expression implements Pattern {
         if (!this._hasOrganized) {
             this._hasOrganized = true;
             this._organizePatterns(this._originalPatterns);
+            this._cacheAncestors();
         }
     }
 
@@ -367,6 +385,11 @@ export class Expression implements Pattern {
             cursor.moveTo(onIndex);
 
             const pattern = this._atomPatterns[i];
+
+            if (this._isBeyondRecursiveAllowance(pattern, onIndex)) {
+                continue;
+            }
+
             const node = pattern.parse(cursor);
 
             if (node != null) {
@@ -386,6 +409,11 @@ export class Expression implements Pattern {
         }
     }
 
+    private _isBeyondRecursiveAllowance(atom: Pattern, onIndex: number) {
+        const ancestors = this._atomsIdToAncestorsMap[atom.id];
+        return ancestors.some(a => a.startedOnIndex === onIndex);
+    }
+
     private _tryToMatchPostfix(cursor: Cursor) {
         let onIndex = cursor.index;