clarity-pattern-parser 10.0.2 → 10.0.3

package/dist/ast/Node.d.ts

@@ -52,6 +52,7 @@ export declare class Node {
     toString(): string;
     toCycleFreeObject(): CycleFreeNode;
     toJson(space?: number): string;
+    isEqual(node: Node): boolean;
     static createValueNode(name: string, value: string): Node;
     static createNode(name: string, children: Node[]): Node;
 }

package/dist/index.browser.js

@@ -225,6 +225,9 @@
         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);
         }
@@ -1107,7 +1110,6 @@
             }
         }
         parse(cursor) {
-            var _a;
             cursor.startParseWith(this);
             const startIndex = cursor.index;
             const nodes = [];
@@ -1137,7 +1139,7 @@
                 }
             }
             if (this._trimDivider && this._hasDivider) {
-                const isDividerLastMatch = ((_a = cursor.leafMatch.pattern) === null || _a === void 0 ? void 0 : _a.id) === this.children[1].id;
+                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);
@@ -1408,10 +1410,11 @@
             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);
             }
@@ -1523,10 +1526,10 @@
             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++}`;
@@ -1762,7 +1765,7 @@
             const tokens = [];
             for (const child of this._children) {
                 tokens.push(...child.getTokens());
-                if (child.type !== "optional") {
+                if (child.type !== "optional" && child.type !== "not") {
                     break;
                 }
             }
@@ -1784,7 +1787,7 @@
             const patterns = [];
             for (const child of this._children) {
                 patterns.push(...child.getPatterns());
-                if (child.type !== "optional") {
+                if (child.type !== "optional" && child.type !== "not") {
                     break;
                 }
             }
@@ -2208,9 +2211,6 @@
         get children() {
             return this._children;
         }
-        get isOptional() {
-            return false;
-        }
         constructor(name, pattern) {
             this._id = `not-${idIndex++}`;
             this._type = "not";
@@ -2865,7 +2865,7 @@
                         .importedPatternsByName
                         .values());
                     const grammar = new Grammar({
-                        params: importedValues,
+                        params: [...importedValues, ...this._parseContext.paramsByName.values()],
                         originResource: this._originResource,
                         resolveImport: this._resolveImport
                     });