clarity-pattern-parser 11.0.12 → 11.0.14

package/package.json

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

package/src/grammar/Grammar.test.ts

@@ -172,10 +172,10 @@ describe("Grammar", () => {
         const patterns = Grammar.parseString(expression);
         const pattern = patterns["digits"];
         const digit = new Regex("digit", "\\d");
-        const digits = new Optional("digits", new Repeat("digits", digit, { min: 0 }));
-
-        const expected = new Context("digits", digits, [digit]);
+        const digits = new Optional("optional-digits", new Repeat("digits", digit, { min: 0 }));
 
+        const expected = new Context("optional-digits", digits, [digit]);
+debugger;
         expect(pattern.isEqual(expected)).toBeTruthy();
     });
 

package/src/grammar/Grammar.ts

@@ -340,7 +340,7 @@ export class Grammar {
             const isNot = n.find(n => n.name === "not") != null;
             const isOptional = n.find(n => n.name === "is-optional");
             const pattern = this._buildPattern(patternNode);
-            const finalPattern = isOptional ? new Optional(pattern.name, pattern) : pattern;
+            const finalPattern = isOptional ? new Optional(`optional-${pattern.name}`, pattern) : pattern;
 
             if (isNot) {
                 return new Not(`not-${finalPattern.name}`, finalPattern);
@@ -410,7 +410,7 @@ export class Grammar {
             }
         }
 
-        return isOptional ? new Optional(name, new Repeat(name, pattern, options)) : new Repeat(name, pattern, options);
+        return isOptional ? new Optional(name, new Repeat(`inner-optional-${name}`, pattern, options)) : new Repeat(name, pattern, options);
     }
 
     private _saveConfigurableAnonymous(node: Node) {