clarity-pattern-parser 10.1.2 → 10.1.4

package/dist/patterns/Context.d.ts

@@ -9,12 +9,17 @@ export declare class Context implements Pattern {
     private _parent;
     private _children;
     private _pattern;
+    private _patterns;
     get id(): string;
     get type(): string;
     get name(): string;
     get parent(): Pattern | null;
     set parent(pattern: Pattern | null);
     get children(): Pattern[];
+    getPatternWithinContext(name: string): Pattern | null;
+    getPatternsWithinContext(): {
+        [x: string]: Pattern;
+    };
     constructor(name: string, pattern: Pattern, context?: Pattern[]);
     parse(cursor: Cursor): Node | null;
     exec(text: string, record?: boolean | undefined): ParseResult;

package/package.json

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

package/src/patterns/Context.ts

@@ -12,6 +12,7 @@ export class Context implements Pattern {
     private _parent: Pattern | null;
     private _children: Pattern[];
     private _pattern: Pattern;
+    private _patterns: Record<string, Pattern>;
 
     get id(): string {
         return this._id;
@@ -37,20 +38,28 @@ export class Context implements Pattern {
         return this._children;
     }
 
+    getPatternWithinContext(name: string): Pattern | null {
+        return this._patterns[name] || null;
+    }
+
+    getPatternsWithinContext() {
+        return { ...this._patterns };
+    }
+
     constructor(name: string, pattern: Pattern, context: Pattern[] = []) {
         this._id = `context-${contextId++}`;
         this._type = "context";
         this._name = name;
         this._parent = null;
+        this._patterns = {};
 
-        const clonedContext = context.map(p => p.clone());
-        const clonedPattern = pattern.clone();
 
-        clonedContext.forEach(p => p.parent = this);
+        const clonedPattern = pattern.clone();
+        context.forEach(p => this._patterns[p.name] = p);
         clonedPattern.parent = this;
 
         this._pattern = clonedPattern;
-        this._children = [...clonedContext, clonedPattern];
+        this._children = [clonedPattern];
     }
 
     parse(cursor: Cursor): Node | null {
@@ -66,7 +75,7 @@ export class Context implements Pattern {
     }
 
     clone(name = this._name): Pattern {
-        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;
     }
 

package/src/patterns/Reference.ts

@@ -3,6 +3,7 @@ import { Cursor } from "./Cursor";
 import { Pattern } from "./Pattern";
 import { findPattern } from "./findPattern";
 import { ParseResult } from "./ParseResult";
+import { Context } from "./Context";
 
 let idIndex = 0;
 
@@ -105,9 +106,7 @@ export class Reference implements Pattern {
         continue;
       }
 
-      const foundPattern = findPattern(pattern, (pattern: Pattern) => {
-        return pattern.name === this._name && pattern.type !== "reference" && pattern.type !== "context";
-      });
+      const foundPattern = (pattern as Context).getPatternWithinContext(this.name);
 
       if (foundPattern != null) {
         return foundPattern;