clarity-pattern-parser 10.0.1 → 10.0.3

package/dist/index.esm.js

@@ -219,6 +219,9 @@ class Node {
     toJson(space) {
         return JSON.stringify(this.toCycleFreeObject(), null, space);
     }
+    isEqual(node) {
+        return node.toJson(0) === this.toJson(0);
+    }
     static createValueNode(name, value) {
         return new Node("custom-value-node", name, 0, 0, [], value);
     }
@@ -1130,7 +1133,7 @@ class FiniteRepeat {
             }
         }
         if (this._trimDivider && this._hasDivider) {
-            const isDividerLastMatch = cursor.leafMatch.pattern === this.children[1];
+            const isDividerLastMatch = this.children.length > 1 && nodes[nodes.length - 1].name === this.children[1].name;
             if (isDividerLastMatch) {
                 const node = nodes.pop();
                 cursor.moveTo(node.firstIndex);
@@ -1371,7 +1374,7 @@ class InfiniteRepeat {
                     else {
                         if (dividerNode == null) {
                             cursor.moveTo(dividerStartIndex);
-                            if (dividerNode == null && repeatNode == null) {
+                            if (repeatNode == null) {
                                 // If neither the repeat pattern or divider pattern matched get out. 
                                 passed = true;
                                 break;
@@ -1401,10 +1404,11 @@ class InfiniteRepeat {
         return passed;
     }
     _createNode(cursor) {
+        var _a;
         const hasDivider = this._divider != null;
         if (hasDivider &&
             this._trimDivider &&
-            cursor.leafMatch.pattern === this._divider) {
+            this._nodes[this._nodes.length - 1].name === ((_a = this._divider) === null || _a === void 0 ? void 0 : _a.name)) {
             const dividerNode = this._nodes.pop();
             cursor.moveTo(dividerNode.firstIndex);
         }
@@ -1516,10 +1520,10 @@ class Repeat {
         return this._children;
     }
     get min() {
-        return this.children[0].min;
+        return this._options.min;
     }
     get max() {
-        return this.children[0].max || Infinity;
+        return this._options.max;
     }
     constructor(name, pattern, options = {}) {
         this._id = `repeat-${idIndex$3++}`;
@@ -1755,7 +1759,7 @@ class Sequence {
         const tokens = [];
         for (const child of this._children) {
             tokens.push(...child.getTokens());
-            if (child.type !== "optional") {
+            if (child.type !== "optional" && child.type !== "not") {
                 break;
             }
         }
@@ -1777,7 +1781,7 @@ class Sequence {
         const patterns = [];
         for (const child of this._children) {
             patterns.push(...child.getPatterns());
-            if (child.type !== "optional") {
+            if (child.type !== "optional" && child.type !== "not") {
                 break;
             }
         }
@@ -2201,9 +2205,6 @@ class Not {
     get children() {
         return this._children;
     }
-    get isOptional() {
-        return false;
-    }
     constructor(name, pattern) {
         this._id = `not-${idIndex++}`;
         this._type = "not";
@@ -2858,7 +2859,7 @@ class Grammar {
                     .importedPatternsByName
                     .values());
                 const grammar = new Grammar({
-                    params: importedValues,
+                    params: [...importedValues, ...this._parseContext.paramsByName.values()],
                     originResource: this._originResource,
                     resolveImport: this._resolveImport
                 });