clarity-pattern-parser 10.1.7 → 10.1.8

package/dist/patterns/Reference.d.ts

@@ -22,6 +22,7 @@ export declare class Reference implements Pattern {
     parse(cursor: Cursor): Node | null;
     private _getPatternSafely;
     private _findPattern;
+    private _isValidPattern;
     private _getRoot;
     getTokens(): string[];
     getTokensAfter(_lastMatched: Pattern): string[];

package/package.json

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

package/src/patterns/Reference.ts

@@ -108,7 +108,7 @@ export class Reference implements Pattern {
 
       const foundPattern = (pattern as Context).getPatternWithinContext(this.name);
 
-      if (foundPattern != null && foundPattern.type !== "reference") {
+      if (foundPattern != null && this._isValidPattern(foundPattern)) {
         return foundPattern;
       }
 
@@ -117,10 +117,22 @@ export class Reference implements Pattern {
 
     const root = this._getRoot();
     return findPattern(root, (pattern: Pattern) => {
-      return pattern.name === this._name && pattern.type !== "reference";
+      return pattern.name === this._name && this._isValidPattern(pattern);
     });
   }
 
+  private _isValidPattern(pattern: Pattern) {
+    if (pattern.type === "reference") {
+      return false;
+    }
+
+    if (pattern.type === "context" && pattern.children[0].type === "reference") {
+      return false;
+    }
+
+    return true;
+  }
+
   private _getRoot(): Pattern {
     let node: Pattern = this;