clarity-pattern-parser 10.1.22 → 10.1.23

package/package.json

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

package/src/patterns/Context.ts

@@ -84,6 +84,9 @@ export class Context implements Pattern {
     }
 
     getTokensAfter(childReference: Pattern): string[] {
+        if (this.parent == null) {
+            return [];
+        }
         return this._pattern.getTokensAfter(childReference);
     }
 
@@ -96,7 +99,11 @@ export class Context implements Pattern {
     }
 
     getPatternsAfter(childReference: Pattern): Pattern[] {
-        return this._pattern.getPatternsAfter(childReference);
+        if (this.parent == null) {
+            return [];
+        }
+
+        return this.parent.getPatternsAfter(childReference);
     }
 
     getNextPatterns(): Pattern[] {

package/src/patterns/ExpressionPattern.ts

@@ -41,17 +41,23 @@ export class ExpressionPattern implements Pattern {
     }
 
     get children(): Pattern[] {
-        return [];
+        return this._patterns;
     }
 
-    constructor(name: string, patterns: []) {
+    constructor(name: string, patterns: Pattern[]) {
         this._id = `expression-${indexId++}`;
         this._type = "expression";
+        this._name = name;
         this._unaryPatterns = [];
         this._binaryPatterns = [];
+
+        this._patterns.forEach(p => p.parent = this);
+        this._patterns = this._organizePatterns(patterns);
+
     }
 
-    private _organizePatterns() {
+    private _organizePatterns(patterns: Pattern[]) {
+        const finalPatterns = [];
         this._patterns.forEach((pattern) => {
             if (this._isBinary(pattern)) {
                 this._binaryPatterns.push(pattern);
@@ -59,6 +65,8 @@ export class ExpressionPattern implements Pattern {
                 this._unaryPatterns.push();
             }
         });
+
+        return finalPatterns;
     }
 
     private _isBinary(pattern: Pattern) {