clarity-pattern-parser 11.4.2 → 11.5.1

package/dist/ast/Node.d.ts

@@ -40,13 +40,13 @@ export declare class Node {
     append(...nodes: Node[]): void;
     nextSibling(): Node | null;
     previousSibling(): Node | null;
-    find(predicate: (node: Node) => boolean): Node | null;
-    findAll(predicate: (node: Node) => boolean): Node[];
+    find(predicate: (node: Node) => boolean, breadthFirst?: boolean): Node | null;
+    findAll(predicate: (node: Node) => boolean, breadthFirst?: boolean): Node[];
     findRoot(): Node;
     findAncestor(predicate: (node: Node) => boolean): Node | null;
-    walkUp(callback: (node: Node) => void): void;
-    walkDown(callback: (node: Node) => void): void;
-    walkBreadthFirst(callback: (node: Node) => void): void;
+    walkUp(callback: (node: Node) => boolean | void): boolean;
+    walkDown(callback: (node: Node) => boolean | void): boolean;
+    walkBreadthFirst(callback: (node: Node) => boolean | void): boolean;
     transform(visitors: Record<string, (node: Node) => Node>): Node;
     flatten(): Node[];
     compact(): void;

package/dist/index.browser.js

@@ -130,16 +130,42 @@
             }
             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() {
@@ -162,22 +188,26 @@
             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();
@@ -2873,6 +2903,7 @@
             this._name = name;
             this._originalName = name;
             this._parent = null;
+            this._cachedParent = null;
             this._firstIndex = 0;
             this._atomPatterns = [];
             this._prefixPatterns = [];
@@ -3023,7 +3054,8 @@
             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();
@@ -3194,11 +3226,13 @@
             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();
@@ -3225,11 +3259,13 @@
             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();