clarity-pattern-parser 10.1.2 → 10.1.4

package/dist/index.js

@@ -845,9 +845,7 @@ class Reference {
                 pattern = pattern.parent;
                 continue;
             }
-            const foundPattern = findPattern(pattern, (pattern) => {
-                return pattern.name === this._name && pattern.type !== "reference" && pattern.type !== "context";
-            });
+            const foundPattern = pattern.getPatternWithinContext(this.name);
             if (foundPattern != null) {
                 return foundPattern;
             }
@@ -2540,17 +2538,23 @@ class Context {
     get children() {
         return this._children;
     }
+    getPatternWithinContext(name) {
+        return this._patterns[name] || null;
+    }
+    getPatternsWithinContext() {
+        return Object.assign({}, this._patterns);
+    }
     constructor(name, pattern, context = []) {
         this._id = `context-${contextId++}`;
         this._type = "context";
         this._name = name;
         this._parent = null;
-        const clonedContext = context.map(p => p.clone());
+        this._patterns = {};
         const clonedPattern = pattern.clone();
-        clonedContext.forEach(p => p.parent = this);
+        context.forEach(p => this._patterns[p.name] = p);
         clonedPattern.parent = this;
         this._pattern = clonedPattern;
-        this._children = [...clonedContext, clonedPattern];
+        this._children = [clonedPattern];
     }
     parse(cursor) {
         return this._pattern.parse(cursor);
@@ -2562,7 +2566,7 @@ class Context {
         return this._pattern.test(text, record);
     }
     clone(name = this._name) {
-        const clone = new Context(name, this._pattern, this._children.slice(0, -1));
+        const clone = new Context(name, this._pattern, Object.values(this._patterns));
         return clone;
     }
     getTokens() {