clarity-pattern-parser 11.4.2 → 11.5.1

package/dist/index.js

@@ -128,16 +128,42 @@ class Node {
         }
         return null;
     }
-    find(predicate) {
-        return this.findAll(predicate)[0] || null;
+    find(predicate, breadthFirst = false) {
+        let match = null;
+        if (breadthFirst) {
+            this.walkBreadthFirst(n => {
+                if (predicate(n)) {
+                    match = n;
+                    return false;
+                }
+            });
+        }
+        else {
+            this.walkUp(n => {
+                if (predicate(n)) {
+                    match = n;
+                    return false;
+                }
+            });
+        }
+        return match;
     }
-    findAll(predicate) {
+    findAll(predicate, breadthFirst = false) {
         const matches = [];
-        this.walkUp(n => {
-            if (predicate(n)) {
-                matches.push(n);
-            }
-        });
+        if (breadthFirst) {
+            this.walkBreadthFirst(n => {
+                if (predicate(n)) {
+                    matches.push(n);
+                }
+            });
+        }
+        else {
+            this.walkUp(n => {
+                if (predicate(n)) {
+                    matches.push(n);
+                }
+            });
+        }
         return matches;
     }
     findRoot() {
@@ -160,22 +186,26 @@ class Node {
         return null;
     }
     walkUp(callback) {
+        var _a;
         const childrenCopy = this._children.slice();
-        childrenCopy.forEach(c => c.walkUp(callback));
-        callback(this);
+        const result = childrenCopy.every(c => c.walkUp(callback));
+        return ((_a = callback(this)) !== null && _a !== void 0 ? _a : true) && result;
     }
     walkDown(callback) {
+        var _a;
         const childrenCopy = this._children.slice();
-        callback(this);
-        childrenCopy.forEach(c => c.walkDown(callback));
+        return ((_a = callback(this)) !== null && _a !== void 0 ? _a : true) && childrenCopy.every(c => c.walkDown(callback));
     }
     walkBreadthFirst(callback) {
         const queue = [this];
         while (queue.length > 0) {
             const current = queue.shift();
-            callback(current);
+            if (callback(current) === false) {
+                return false;
+            }
             queue.push(...current.children);
         }
+        return true;
     }
     transform(visitors) {
         const childrenCopy = this._children.slice();
@@ -2871,6 +2901,7 @@ class Expression {
         this._name = name;
         this._originalName = name;
         this._parent = null;
+        this._cachedParent = null;
         this._firstIndex = 0;
         this._atomPatterns = [];
         this._prefixPatterns = [];
@@ -3021,7 +3052,8 @@ class Expression {
         return pattern.name === this._originalName;
     }
     build() {
-        if (!this._hasOrganized) {
+        if (!this._hasOrganized || this._cachedParent !== this.parent) {
+            this._cachedParent = this.parent;
             this._hasOrganized = true;
             this._organizePatterns(this._originalPatterns);
             this._cacheAncestors();
@@ -3192,11 +3224,13 @@ class Expression {
         return execPattern(this, text, record);
     }
     getTokens() {
+        this.build();
         const atomTokens = this._atomPatterns.map(p => p.getTokens()).flat();
         const prefixTokens = this.prefixPatterns.map(p => p.getTokens()).flat();
         return [...prefixTokens, ...atomTokens];
     }
     getTokensAfter(childReference) {
+        this.build();
         if (this._prefixPatterns.includes(childReference) || this._binaryPatterns.includes(childReference)) {
             const atomTokens = this._atomPatterns.map(p => p.getTokens()).flat();
             const prefixTokens = this.prefixPatterns.map(p => p.getTokens()).flat();
@@ -3223,11 +3257,13 @@ class Expression {
         return this._parent.getTokensAfter(this);
     }
     getPatterns() {
+        this.build();
         const atomPatterns = this._atomPatterns.map(p => p.getPatterns()).flat();
         const prefixPatterns = this.prefixPatterns.map(p => p.getPatterns()).flat();
         return [...prefixPatterns, ...atomPatterns];
     }
     getPatternsAfter(childReference) {
+        this.build();
         if (this._prefixPatterns.includes(childReference) || this._binaryPatterns.includes(childReference)) {
             const atomPatterns = this._atomPatterns.map(p => p.getPatterns()).flat();
             const prefixPatterns = this.prefixPatterns.map(p => p.getPatterns()).flat();