clarity-pattern-parser 8.4.15 → 9.1.0

package/dist/index.browser.js

@@ -249,6 +249,7 @@
             this._patterns = [];
             this._nodes = [];
             this._errors = [];
+            this._trace = [];
         }
         get isRecording() {
             return this._isRecording;
@@ -277,6 +278,9 @@
         get patterns() {
             return this._patterns;
         }
+        get trace() {
+            return this._trace;
+        }
         recordMatch(pattern, node) {
             if (this._isRecording) {
                 this._patterns.push(pattern);
@@ -331,6 +335,11 @@
         resolveError() {
             this._currentError = null;
         }
+        pushStackTrace(trace) {
+            if (this._isRecording) {
+                this._trace.push(trace);
+            }
+        }
     }
 
     class Cursor {
@@ -387,6 +396,7 @@
             this._index = 0;
             this._length = text.length;
             this._history = new CursorHistory();
+            this._stackTrace = [];
         }
         hasNext() {
             return this._index + 1 < this._length;
@@ -436,15 +446,51 @@
         stopRecording() {
             this._history.stopRecording();
         }
+        startParseWith(pattern) {
+            const patternName = pattern.name;
+            const trace = {
+                pattern,
+                cursorIndex: this.index
+            };
+            if (this._stackTrace.find(t => t.pattern.id === pattern.id && this.index === t.cursorIndex)) {
+                throw new Error(`Cyclical Pattern: ${this._stackTrace.map(t => `${t.pattern.name}#${t.pattern.id}{${t.cursorIndex}}`).join(" -> ")} -> ${patternName}#${pattern.id}{${this.index}}.`);
+            }
+            this._history.pushStackTrace(trace);
+            this._stackTrace.push(trace);
+        }
+        endParse() {
+            this._stackTrace.pop();
+        }
+        audit() {
+            return this._history.trace.map(t => {
+                const onChar = this.getChars(t.cursorIndex, t.cursorIndex);
+                const restChars = this.getChars(t.cursorIndex + 1, t.cursorIndex + 5);
+                const context = `{${t.cursorIndex}}[${onChar}]${restChars}`;
+                return `${this._buildPatternContext(t.pattern)}-->${context}`;
+            });
+        }
+        _buildPatternContext(pattern) {
+            if (pattern.parent != null) {
+                return `${pattern.parent.name}.${pattern.name}`;
+            }
+            return pattern.name;
+        }
     }
 
+    let idIndex$9 = 0;
     class Literal {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._type;
         }
         get name() {
             return this._name;
         }
+        get value() {
+            return this._text;
+        }
         get parent() {
             return this._parent;
         }
@@ -454,18 +500,15 @@
         get children() {
             return [];
         }
-        get isOptional() {
-            return this._isOptional;
-        }
-        constructor(name, value, isOptional = false) {
+        constructor(name, value) {
             if (value.length === 0) {
                 throw new Error("Value Cannot be empty.");
             }
+            this._id = `literal-${idIndex$9++}`;
             this._type = "literal";
             this._name = name;
-            this._literal = value;
+            this._text = value;
             this._runes = Array.from(value);
-            this._isOptional = isOptional;
             this._parent = null;
             this._firstIndex = 0;
             this._lastIndex = 0;
@@ -476,8 +519,9 @@
             const ast = this.parse(cursor);
             return (ast === null || ast === void 0 ? void 0 : ast.value) === text;
         }
-        exec(text) {
+        exec(text, record = false) {
             const cursor = new Cursor(text);
+            record && cursor.startRecording();
             const ast = this.parse(cursor);
             return {
                 ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
@@ -485,20 +529,18 @@
             };
         }
         parse(cursor) {
+            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             const passed = this._tryToParse(cursor);
             if (passed) {
                 cursor.resolveError();
                 const node = this._createNode();
                 cursor.recordMatch(this, node);
+                cursor.endParse();
                 return node;
             }
-            if (!this._isOptional) {
-                cursor.recordErrorAt(this._firstIndex, this._endIndex, this);
-                return null;
-            }
-            cursor.resolveError();
-            cursor.moveTo(this._firstIndex);
+            cursor.recordErrorAt(this._firstIndex, this._endIndex, this);
+            cursor.endParse();
             return null;
         }
         _tryToParse(cursor) {
@@ -512,7 +554,7 @@
                     break;
                 }
                 if (i + 1 === literalRuneLength) {
-                    this._lastIndex = this._firstIndex + this._literal.length - 1;
+                    this._lastIndex = this._firstIndex + this._text.length - 1;
                     passed = true;
                     break;
                 }
@@ -525,14 +567,15 @@
             return passed;
         }
         _createNode() {
-            return new Node("literal", this._name, this._firstIndex, this._lastIndex, undefined, this._literal);
+            return new Node("literal", this._name, this._firstIndex, this._lastIndex, undefined, this._text);
         }
-        clone(name = this._name, isOptional = this._isOptional) {
-            const clone = new Literal(name, this._literal, isOptional);
+        clone(name = this._name) {
+            const clone = new Literal(name, this._text);
+            clone._id = this._id;
             return clone;
         }
         getTokens() {
-            return [this._literal];
+            return [this._text];
         }
         getTokensAfter(_lastMatched) {
             return [];
@@ -558,15 +601,25 @@
         find(_predicate) {
             return null;
         }
+        isEqual(pattern) {
+            return pattern.type === this.type && pattern._text === this._text;
+        }
     }
 
+    let idIndex$8 = 0;
     class Regex {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._type;
         }
         get name() {
             return this._name;
         }
+        get value() {
+            return this._originalRegexString;
+        }
         get parent() {
             return this._parent;
         }
@@ -576,18 +629,15 @@
         get children() {
             return [];
         }
-        get isOptional() {
-            return this._isOptional;
-        }
-        constructor(name, regex, isOptional = false) {
+        constructor(name, regex) {
             this._node = null;
             this._cursor = null;
             this._firstIndex = -1;
             this._substring = "";
             this._tokens = [];
+            this._id = `regex-${idIndex$8++}`;
             this._type = "regex";
             this._name = name;
-            this._isOptional = isOptional;
             this._parent = null;
             this._originalRegexString = regex;
             this._regex = new RegExp(`^${regex}`, "g");
@@ -609,8 +659,9 @@
             const ast = this.parse(cursor);
             return (ast === null || ast === void 0 ? void 0 : ast.value) === text;
         }
-        exec(text) {
+        exec(text, record = false) {
             const cursor = new Cursor(text);
+            record && cursor.startRecording();
             const ast = this.parse(cursor);
             return {
                 ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
@@ -618,9 +669,11 @@
             };
         }
         parse(cursor) {
+            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             this.resetState(cursor);
             this.tryToParse(cursor);
+            cursor.endParse();
             return this._node;
         }
         resetState(cursor) {
@@ -646,15 +699,14 @@
             cursor.recordMatch(this, this._node);
         }
         processError(cursor) {
-            if (!this._isOptional) {
-                cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
-            }
+            cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
             this._node = null;
         }
-        clone(name = this._name, isOptional = this._isOptional) {
-            const pattern = new Regex(name, this._originalRegexString, isOptional);
-            pattern._tokens = this._tokens.slice();
-            return pattern;
+        clone(name = this._name) {
+            const clone = new Regex(name, this._originalRegexString);
+            clone._tokens = this._tokens.slice();
+            clone._id = this._id;
+            return clone;
         }
         getTokens() {
             return this._tokens;
@@ -686,6 +738,9 @@
         setTokens(tokens) {
             this._tokens = tokens;
         }
+        isEqual(pattern) {
+            return pattern.type === this.type && pattern._originalRegexString === this._originalRegexString;
+        }
     }
 
     function findPattern(pattern, predicate) {
@@ -710,7 +765,11 @@
         }
     }
 
+    let idIndex$7 = 0;
     class Reference {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._type;
         }
@@ -726,14 +785,11 @@
         get children() {
             return this._children;
         }
-        get isOptional() {
-            return this._isOptional;
-        }
-        constructor(name, isOptional = false) {
+        constructor(name) {
+            this._id = `reference-${idIndex$7++}`;
             this._type = "reference";
             this._name = name;
             this._parent = null;
-            this._isOptional = isOptional;
             this._pattern = null;
             this._children = [];
         }
@@ -742,8 +798,9 @@
             const ast = this.parse(cursor);
             return (ast === null || ast === void 0 ? void 0 : ast.value) === text;
         }
-        exec(text) {
+        exec(text, record = false) {
             const cursor = new Cursor(text);
+            record && cursor.startRecording();
             const ast = this.parse(cursor);
             return {
                 ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
@@ -759,7 +816,7 @@
                 if (pattern === null) {
                     throw new Error(`Couldn't find '${this._name}' pattern within tree.`);
                 }
-                const clonedPattern = pattern.clone(this._name, this._isOptional);
+                const clonedPattern = pattern.clone();
                 clonedPattern.parent = this;
                 this._pattern = clonedPattern;
                 this._children = [this._pattern];
@@ -818,16 +875,25 @@
         find(_predicate) {
             return null;
         }
-        clone(name = this._name, isOptional = this._isOptional) {
-            return new Reference(name, isOptional);
+        clone(name = this._name) {
+            const clone = new Reference(name);
+            clone._id = this._id;
+            return clone;
+        }
+        isEqual(pattern) {
+            return pattern.type === this.type && pattern.name === this.name;
         }
     }
 
-    function clonePatterns(patterns, isOptional) {
-        return patterns.map(p => p.clone(p.name, isOptional));
+    function clonePatterns(patterns) {
+        return patterns.map(p => p.clone());
     }
 
-    class Or {
+    let idIndex$6 = 0;
+    class Options {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._type;
         }
@@ -843,20 +909,17 @@
         get children() {
             return this._children;
         }
-        get isOptional() {
-            return this._isOptional;
-        }
-        constructor(name, options, isOptional = false, isGreedy = false) {
+        constructor(name, options, isGreedy = false) {
             if (options.length === 0) {
                 throw new Error("Need at least one pattern with an 'or' pattern.");
             }
-            const children = clonePatterns(options, false);
+            const children = clonePatterns(options);
             this._assignChildrenToParent(children);
+            this._id = `or-${idIndex$6++}`;
             this._type = "or";
             this._name = name;
             this._parent = null;
             this._children = children;
-            this._isOptional = isOptional;
             this._firstIndex = 0;
             this._isGreedy = isGreedy;
         }
@@ -870,8 +933,9 @@
             const ast = this.parse(cursor);
             return (ast === null || ast === void 0 ? void 0 : ast.value) === text;
         }
-        exec(text) {
+        exec(text, record = false) {
             const cursor = new Cursor(text);
+            record && cursor.startRecording();
             const ast = this.parse(cursor);
             return {
                 ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
@@ -879,19 +943,17 @@
             };
         }
         parse(cursor) {
+            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             const node = this._tryToParse(cursor);
             if (node != null) {
                 cursor.moveTo(node.lastIndex);
                 cursor.resolveError();
+                cursor.endParse();
                 return node;
             }
-            if (!this._isOptional) {
-                cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
-                return null;
-            }
-            cursor.resolveError();
-            cursor.moveTo(this._firstIndex);
+            cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
+            cursor.endParse();
             return null;
         }
         _tryToParse(cursor) {
@@ -902,7 +964,7 @@
                 if (this._isGreedy) {
                     results.push(result);
                 }
-                if (!cursor.hasError && !this._isGreedy) {
+                if (result != null && !this._isGreedy) {
                     return result;
                 }
                 cursor.resolveError();
@@ -952,13 +1014,21 @@
         find(predicate) {
             return findPattern(this, predicate);
         }
-        clone(name = this._name, isOptional = this._isOptional) {
-            const or = new Or(name, this._children, isOptional, this._isGreedy);
+        clone(name = this._name) {
+            const or = new Options(name, this._children, this._isGreedy);
+            or._id = this._id;
             return or;
         }
+        isEqual(pattern) {
+            return pattern.type === this.type && this.children.every((c, index) => c.isEqual(pattern.children[index]));
+        }
     }
 
+    let idIndex$5 = 0;
     class FiniteRepeat {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._type;
         }
@@ -974,47 +1044,53 @@
         get children() {
             return this._children;
         }
-        get isOptional() {
-            return this._min === 0;
-        }
         get min() {
             return this._min;
         }
         get max() {
             return this._max;
         }
-        constructor(name, pattern, repeatAmount, options = {}) {
+        constructor(name, pattern, options = {}) {
+            this._id = `finite-repeat-${idIndex$5++}`;
             this._type = "finite-repeat";
             this._name = name;
             this._parent = null;
             this._children = [];
             this._hasDivider = options.divider != null;
-            this._min = options.min != null ? options.min : 1;
-            this._max = repeatAmount;
+            this._min = options.min != null ? Math.max(options.min, 1) : 1;
+            this._max = Math.max(this.min, options.max || this.min);
             this._trimDivider = options.trimDivider == null ? false : options.trimDivider;
-            for (let i = 0; i < repeatAmount; i++) {
-                this._children.push(pattern.clone(pattern.name));
-                if (options.divider != null && (i < repeatAmount - 1 || !this._trimDivider)) {
-                    this._children.push(options.divider.clone(options.divider.name, false));
+            for (let i = 0; i < this._max; i++) {
+                const child = pattern.clone();
+                child.parent = this;
+                this._children.push(child);
+                if (options.divider != null && (i < this._max - 1 || !this._trimDivider)) {
+                    const divider = options.divider.clone();
+                    divider.parent = this;
+                    this._children.push(divider);
                 }
             }
         }
         parse(cursor) {
+            cursor.startParseWith(this);
             const startIndex = cursor.index;
             const nodes = [];
             const modulo = this._hasDivider ? 2 : 1;
             let matchCount = 0;
             for (let i = 0; i < this._children.length; i++) {
                 const childPattern = this._children[i];
+                const runningIndex = cursor.index;
                 const node = childPattern.parse(cursor);
+                if (cursor.hasError) {
+                    break;
+                }
                 if (i % modulo === 0 && !cursor.hasError) {
                     matchCount++;
                 }
-                if (cursor.hasError) {
-                    cursor.resolveError();
-                    break;
+                if (node == null) {
+                    cursor.moveTo(runningIndex);
                 }
-                if (node != null) {
+                else {
                     nodes.push(node);
                     if (cursor.hasNext()) {
                         cursor.next();
@@ -1025,7 +1101,8 @@
                 }
             }
             if (this._trimDivider && this._hasDivider) {
-                if (cursor.leafMatch.pattern === this.children[1]) {
+                const isDividerLastMatch = cursor.leafMatch.pattern === this.children[1];
+                if (isDividerLastMatch) {
                     const node = nodes.pop();
                     cursor.moveTo(node.firstIndex);
                 }
@@ -1034,16 +1111,19 @@
                 const lastIndex = cursor.index;
                 cursor.moveTo(startIndex);
                 cursor.recordErrorAt(startIndex, lastIndex, this);
+                cursor.endParse();
                 return null;
             }
-            else if (nodes.length === 0) {
-                cursor.resolveError();
+            if (nodes.length === 0 && !cursor.hasError) {
                 cursor.moveTo(startIndex);
+                cursor.endParse();
                 return null;
             }
             const firstIndex = nodes[0].firstIndex;
             const lastIndex = nodes[nodes.length - 1].lastIndex;
+            cursor.resolveError();
             cursor.moveTo(lastIndex);
+            cursor.endParse();
             return new Node(this._type, this.name, firstIndex, lastIndex, nodes);
         }
         test(text) {
@@ -1051,29 +1131,26 @@
             const ast = this.parse(cursor);
             return (ast === null || ast === void 0 ? void 0 : ast.value) === text;
         }
-        exec(text) {
+        exec(text, record = false) {
             const cursor = new Cursor(text);
+            record && cursor.startRecording();
             const ast = this.parse(cursor);
             return {
                 ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
                 cursor
             };
         }
-        clone(name = this._name, isOptional) {
+        clone(name = this._name) {
             let min = this._min;
-            if (isOptional != null) {
-                if (isOptional) {
-                    min = 0;
-                }
-                else {
-                    min = Math.max(this._min, 1);
-                }
-            }
-            return new FiniteRepeat(name, this._children[0], this._max, {
+            let max = this._max;
+            const clone = new FiniteRepeat(name, this._children[0], {
                 divider: this._hasDivider ? this._children[1] : undefined,
                 min,
+                max,
                 trimDivider: this._trimDivider
             });
+            clone._id = this._id;
+            return clone;
         }
         getTokens() {
             return this._children[0].getTokens();
@@ -1121,9 +1198,16 @@
         find(predicate) {
             return findPattern(this, predicate);
         }
+        isEqual(pattern) {
+            return pattern.type === this.type && this.children.every((c, index) => c.isEqual(pattern.children[index]));
+        }
     }
 
+    let idIndex$4 = 0;
     class InfiniteRepeat {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._type;
         }
@@ -1139,23 +1223,21 @@
         get children() {
             return this._children;
         }
-        get isOptional() {
-            return this._min === 0;
-        }
         get min() {
             return this._min;
         }
         constructor(name, pattern, options = {}) {
-            const min = options.min != null ? options.min : 1;
+            const min = options.min != null ? Math.max(options.min, 1) : 1;
             const divider = options.divider;
             let children;
             if (divider != null) {
-                children = [pattern.clone(pattern.name, false), divider.clone(divider.name, false)];
+                children = [pattern.clone(), divider.clone()];
             }
             else {
-                children = [pattern.clone(pattern.name, false)];
+                children = [pattern.clone()];
             }
             this._assignChildrenToParent(children);
+            this._id = `infinite-repeat-${idIndex$4++}`;
             this._type = "infinite-repeat";
             this._name = name;
             this._min = min;
@@ -1177,8 +1259,9 @@
             const ast = this.parse(cursor);
             return (ast === null || ast === void 0 ? void 0 : ast.value) === text;
         }
-        exec(text) {
+        exec(text, record = false) {
             const cursor = new Cursor(text);
+            record && cursor.startRecording();
             const ast = this.parse(cursor);
             return {
                 ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
@@ -1186,6 +1269,7 @@
             };
         }
         parse(cursor) {
+            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             this._nodes = [];
             const passed = this._tryToParse(cursor);
@@ -1196,12 +1280,15 @@
                     cursor.moveTo(node.lastIndex);
                     cursor.recordMatch(this, node);
                 }
+                cursor.endParse();
                 return node;
             }
             if (this._min > 0) {
+                cursor.endParse();
                 return null;
             }
             cursor.resolveError();
+            cursor.endParse();
             return null;
         }
         _meetsMin() {
@@ -1215,8 +1302,12 @@
             let passed = false;
             while (true) {
                 const runningCursorIndex = cursor.index;
-                const repeatedNode = this._pattern.parse(cursor);
-                if (cursor.hasError) {
+                const repeatNode = this._pattern.parse(cursor);
+                const hasError = cursor.hasError;
+                const hasNoErrorAndNoResult = !cursor.hasError && repeatNode == null;
+                const hasDivider = this._divider != null;
+                const hasNoDivider = !hasDivider;
+                if (hasError) {
                     const lastValidNode = this._getLastValidNode();
                     if (lastValidNode != null) {
                         passed = true;
@@ -1229,8 +1320,12 @@
                     break;
                 }
                 else {
-                    if (repeatedNode != null) {
-                        this._nodes.push(repeatedNode);
+                    if (hasNoErrorAndNoResult && hasNoDivider) {
+                        // If we didn't match and didn't error we need to get out. Nothing different will happen.
+                        break;
+                    }
+                    if (repeatNode != null) {
+                        this._nodes.push(repeatNode);
                         if (!cursor.hasNext()) {
                             passed = true;
                             break;
@@ -1238,18 +1333,29 @@
                         cursor.next();
                     }
                     if (this._divider != null) {
+                        const dividerStartIndex = cursor.index;
                         const dividerNode = this._divider.parse(cursor);
                         if (cursor.hasError) {
                             passed = true;
                             break;
                         }
-                        else if (dividerNode != null) {
-                            this._nodes.push(dividerNode);
-                            if (!cursor.hasNext()) {
-                                passed = true;
-                                break;
+                        else {
+                            if (dividerNode == null) {
+                                cursor.moveTo(dividerStartIndex);
+                                if (dividerNode == null && repeatNode == null) {
+                                    // If neither the repeat pattern or divider pattern matched get out. 
+                                    passed = true;
+                                    break;
+                                }
+                            }
+                            else {
+                                this._nodes.push(dividerNode);
+                                if (!cursor.hasNext()) {
+                                    passed = true;
+                                    break;
+                                }
+                                cursor.next();
                             }
-                            cursor.next();
                         }
                     }
                 }
@@ -1273,10 +1379,10 @@
                 const dividerNode = this._nodes.pop();
                 cursor.moveTo(dividerNode.firstIndex);
             }
-            // if (this._nodes.length === 0) {
-            //   cursor.moveTo(this._firstIndex);
-            //   return null;
-            // }
+            if (this._nodes.length === 0) {
+                cursor.moveTo(this._firstIndex);
+                return null;
+            }
             const lastIndex = this._nodes[this._nodes.length - 1].lastIndex;
             cursor.moveTo(lastIndex);
             return new Node(this._type, this._name, this._firstIndex, lastIndex, this._nodes);
@@ -1345,25 +1451,26 @@
         find(predicate) {
             return findPattern(this, predicate);
         }
-        clone(name = this._name, isOptional) {
+        clone(name = this._name) {
             let min = this._min;
-            if (isOptional != null) {
-                if (isOptional) {
-                    min = 0;
-                }
-                else {
-                    min = Math.max(this._min, 1);
-                }
-            }
-            return new InfiniteRepeat(name, this._pattern, {
+            const clone = new InfiniteRepeat(name, this._pattern, {
                 divider: this._divider == null ? undefined : this._divider,
                 min: min,
                 trimDivider: this._trimDivider
             });
+            clone._id = this._id;
+            return clone;
+        }
+        isEqual(pattern) {
+            return pattern.type === this.type && this.children.every((c, index) => c.isEqual(pattern.children[index]));
         }
     }
 
+    let idIndex$3 = 0;
     class Repeat {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._repeatPattern.type;
         }
@@ -1379,15 +1486,13 @@
         get children() {
             return this._children;
         }
-        get isOptional() {
-            return this._repeatPattern.isOptional;
-        }
         constructor(name, pattern, options = {}) {
+            this._id = `repeat-${idIndex$3++}`;
             this._pattern = pattern;
             this._parent = null;
             this._options = Object.assign(Object.assign({}, options), { min: options.min == null ? 1 : options.min, max: options.max == null ? Infinity : options.max });
             if (this._options.max !== Infinity) {
-                this._repeatPattern = new FiniteRepeat(name, pattern, this._options.max, this._options);
+                this._repeatPattern = new FiniteRepeat(name, pattern, this._options);
             }
             else {
                 this._repeatPattern = new InfiniteRepeat(name, pattern, this._options);
@@ -1404,17 +1509,11 @@
         test(text) {
             return this._repeatPattern.test(text);
         }
-        clone(name = this.name, isOptional) {
+        clone(name = this.name) {
             let min = this._options.min;
-            if (isOptional != null) {
-                if (isOptional) {
-                    min = 0;
-                }
-                else {
-                    min = Math.max(this._options.min, 1);
-                }
-            }
-            return new Repeat(name, this._pattern, Object.assign(Object.assign({}, this._options), { min }));
+            const clone = new Repeat(name, this._pattern, Object.assign(Object.assign({}, this._options), { min }));
+            clone._id = this._id;
+            return clone;
         }
         getTokens() {
             return this._repeatPattern.getTokens();
@@ -1449,9 +1548,13 @@
         find(predicate) {
             return this._repeatPattern.find(predicate);
         }
+        isEqual(pattern) {
+            return pattern.type === this.type && this.children.every((c, index) => c.isEqual(pattern.children[index]));
+        }
     }
 
     const comment = new Regex("comment", "#[^\r\n]+");
+    comment.setTokens(["# "]);
 
     function filterOutNull(nodes) {
         const filteredNodes = [];
@@ -1463,7 +1566,11 @@
         return filteredNodes;
     }
 
-    class And {
+    let idIndex$2 = 0;
+    class Sequence {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._type;
         }
@@ -1479,18 +1586,15 @@
         get children() {
             return this._children;
         }
-        get isOptional() {
-            return this._isOptional;
-        }
-        constructor(name, sequence, isOptional = false) {
+        constructor(name, sequence) {
             if (sequence.length === 0) {
-                throw new Error("Need at least one pattern with an 'and' pattern.");
+                throw new Error("Need at least one pattern with a 'sequence' pattern.");
             }
             const children = clonePatterns(sequence);
             this._assignChildrenToParent(children);
-            this._type = "and";
+            this._id = `sequence-${idIndex$2++}`;
+            this._type = "sequence";
             this._name = name;
-            this._isOptional = isOptional;
             this._parent = null;
             this._children = children;
             this._firstIndex = -1;
@@ -1506,8 +1610,9 @@
             const ast = this.parse(cursor);
             return (ast === null || ast === void 0 ? void 0 : ast.value) === text;
         }
-        exec(text) {
+        exec(text, record = false) {
             const cursor = new Cursor(text);
+            record && cursor.startRecording();
             const ast = this.parse(cursor);
             return {
                 ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
@@ -1515,6 +1620,7 @@
             };
         }
         parse(cursor) {
+            cursor.startParseWith(this);
             this._firstIndex = cursor.index;
             this._nodes = [];
             const passed = this.tryToParse(cursor);
@@ -1523,11 +1629,10 @@
                 if (node !== null) {
                     cursor.recordMatch(this, node);
                 }
+                cursor.endParse();
                 return node;
             }
-            if (this._isOptional) {
-                cursor.resolveError();
-            }
+            cursor.endParse();
             return null;
         }
         tryToParse(cursor) {
@@ -1599,7 +1704,7 @@
             const length = this._children.length;
             for (let i = startOnIndex; i < length; i++) {
                 const pattern = this._children[i];
-                if (!pattern.isOptional) {
+                if (pattern.type !== "optional") {
                     return false;
                 }
             }
@@ -1609,13 +1714,13 @@
             const children = filterOutNull(this._nodes);
             const lastIndex = children[children.length - 1].lastIndex;
             cursor.moveTo(lastIndex);
-            return new Node("and", this._name, this._firstIndex, lastIndex, children);
+            return new Node("sequence", this._name, this._firstIndex, lastIndex, children);
         }
         getTokens() {
             const tokens = [];
             for (const child of this._children) {
                 tokens.push(...child.getTokens());
-                if (!child.isOptional) {
+                if (child.type !== "optional") {
                     break;
                 }
             }
@@ -1635,9 +1740,9 @@
         }
         getPatterns() {
             const patterns = [];
-            for (const pattern of this._children) {
-                patterns.push(...pattern.getPatterns());
-                if (!pattern.isOptional) {
+            for (const child of this._children) {
+                patterns.push(...child.getPatterns());
+                if (child.type !== "optional") {
                     break;
                 }
             }
@@ -1666,7 +1771,7 @@
             for (let i = nextSiblingIndex; i < this._children.length; i++) {
                 const child = this._children[i];
                 patterns.push(child);
-                if (!child.isOptional) {
+                if (child.type !== "optional") {
                     break;
                 }
                 // If we are on the last child and its options then ask for the next pattern from the parent.
@@ -1685,177 +1790,331 @@
         find(predicate) {
             return findPattern(this, predicate);
         }
-        clone(name = this._name, isOptional = this._isOptional) {
-            return new And(name, this._children, isOptional);
+        clone(name = this._name) {
+            const clone = new Sequence(name, this._children);
+            clone._id = this._id;
+            return clone;
+        }
+        isEqual(pattern) {
+            return pattern.type === this.type && this.children.every((c, index) => c.isEqual(pattern.children[index]));
         }
     }
 
     const literal = new Regex("literal", '"(?:\\\\.|[^"\\\\])*"');
+    literal.setTokens(["[LITERAL]"]);
 
     const tabs$1 = new Regex("tabs", "\\t+");
+    tabs$1.setTokens(["\t"]);
     const spaces$1 = new Regex("spaces", "[ ]+");
-    const newLine$1 = new Regex("new-line", "(\\r?\\n)+");
     spaces$1.setTokens([" "]);
-    tabs$1.setTokens(["\t"]);
+    const newLine$1 = new Regex("new-line", "(\\r?\\n)+");
     newLine$1.setTokens(["\n"]);
-    const lineSpaces$1 = new Repeat("line-spaces", new Or("line-space", [tabs$1, spaces$1]));
-    const allSpaces = new Regex("all-spaces", "\\s+", true);
+    const lineSpaces$1 = new Repeat("line-spaces", new Options("line-space", [tabs$1, spaces$1]));
+    const allSpaces = new Regex("all-spaces", "\\s+");
+    allSpaces.setTokens([" "]);
 
     const name$1 = new Regex("name", "[a-zA-Z_-]+[a-zA-Z0-9_-]*");
 
-    const optionalNot = new Literal("not", "!", true);
-    const optionalIsOptional = new Literal("is-optional", "?", true);
-    const patternName$1 = name$1.clone("pattern-name");
-    const pattern = new And("pattern", [
-        optionalNot,
-        patternName$1,
-        optionalIsOptional,
-    ]);
+    const regexLiteral = new Regex("regex-literal", "/(\\\\/|[^/\\n\\r])*/");
+    regexLiteral.setTokens(["[REGEX_EXPRESSION]"]);
 
-    const divider$1 = new Regex("and-divider", "\\s*[&]\\s*");
-    divider$1.setTokens([" & "]);
-    const andLiteral = new Repeat("and-literal", pattern, { divider: divider$1, min: 2, trimDivider: true });
+    const patternName$3 = name$1.clone("pattern-name");
+    const anonymousLiterals = new Options("anonymous-literals", [
+        literal,
+        regexLiteral,
+        patternName$3,
+        new Reference("repeat-literal"),
+    ]);
+    const anonymousWrappedLiterals = new Options("anonymous-wrapped-literals", [
+        new Reference("options-literal"),
+        new Reference("sequence-literal"),
+        new Reference("complex-anonymous-pattern")
+    ]);
 
-    const divider = new Regex("or-divider", "\\s*[|]\\s*");
-    divider.setTokens([" | "]);
-    const orLiteral = new Repeat("or-literal", name$1.clone("pattern-name"), { divider, min: 2, trimDivider: true });
+    let idIndex$1 = 0;
+    class Optional {
+        get id() {
+            return this._id;
+        }
+        get type() {
+            return this._type;
+        }
+        get name() {
+            return this._name;
+        }
+        get parent() {
+            return this._parent;
+        }
+        set parent(pattern) {
+            this._parent = pattern;
+        }
+        get children() {
+            return this._children;
+        }
+        constructor(name, pattern) {
+            this._id = `optional-${idIndex$1++}`;
+            this._type = "optional";
+            this._name = name;
+            this._parent = null;
+            this._children = [pattern.clone()];
+            this._children[0].parent = this;
+        }
+        test(text) {
+            const cursor = new Cursor(text);
+            this.parse(cursor);
+            return !cursor.hasError;
+        }
+        exec(text, record = false) {
+            const cursor = new Cursor(text);
+            record && cursor.startRecording();
+            const ast = this.parse(cursor);
+            return {
+                ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
+                cursor
+            };
+        }
+        parse(cursor) {
+            cursor.startParseWith(this);
+            const firstIndex = cursor.index;
+            const node = this._children[0].parse(cursor);
+            if (cursor.hasError) {
+                cursor.resolveError();
+                cursor.moveTo(firstIndex);
+                cursor.endParse();
+                return null;
+            }
+            else {
+                cursor.endParse();
+                return node;
+            }
+        }
+        clone(name = this._name) {
+            const optional = new Optional(name, this._children[0]);
+            optional._id = this._id;
+            return optional;
+        }
+        getTokens() {
+            return this._children[0].getTokens();
+        }
+        getTokensAfter(_childReference) {
+            const parent = this._parent;
+            if (parent != null) {
+                return parent.getTokensAfter(this);
+            }
+            return [];
+        }
+        getNextTokens() {
+            if (this.parent == null) {
+                return [];
+            }
+            return this.parent.getTokensAfter(this);
+        }
+        getPatterns() {
+            return this._children[0].getPatterns();
+        }
+        getPatternsAfter(_childReference) {
+            const parent = this._parent;
+            if (parent != null) {
+                return parent.getPatternsAfter(this);
+            }
+            return [];
+        }
+        getNextPatterns() {
+            if (this.parent == null) {
+                return [];
+            }
+            return this.parent.getPatternsAfter(this);
+        }
+        find(predicate) {
+            return predicate(this._children[0]) ? this._children[0] : null;
+        }
+        isEqual(pattern) {
+            return pattern.type === this.type && this.children.every((c, index) => c.isEqual(pattern.children[index]));
+        }
+    }
 
-    const regexLiteral = new Regex("regex-literal", "/(\\\\/|[^/\\n\\r])*/");
+    const inlinePatternOpenParen = new Literal("anonymous-pattern-open-paren", "(");
+    const inlinePatternCloseParen = new Literal("anonymous-pattern-close-paren", ")");
+    const optionalLineSpaces$3 = new Optional("optional-line-spaces", lineSpaces$1);
+    const complexAnonymousPattern = new Sequence("complex-anonymous-pattern", [
+        inlinePatternOpenParen,
+        optionalLineSpaces$3,
+        anonymousWrappedLiterals,
+        optionalLineSpaces$3,
+        inlinePatternCloseParen,
+    ]);
+    const anonymousPattern = new Options("anonymous-pattern", [
+        anonymousLiterals,
+        complexAnonymousPattern
+    ]);
 
-    const patternName = name$1.clone("pattern-name");
-    const optionalSpaces$2 = spaces$1.clone("optional-spaces", true);
-    const dividerPattern = name$1.clone("divider-pattern");
+    const optionalSpaces$3 = new Optional("optional-spaces", spaces$1);
     const openBracket$1 = new Literal("open-bracket", "{");
     const closeBracket$1 = new Literal("close-bracket", "}");
     const comma = new Literal("comma", ",");
     const integer = new Regex("integer", "([1-9][0-9]*)|0");
     integer.setTokens(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]);
-    const optionalInteger = integer.clone("integer", true);
-    const bounds = new And("bounds", [
+    const min = new Optional("optional-min", integer.clone("min"));
+    const max = new Optional("optional-max", integer.clone("max"));
+    const trimKeyword = new Literal("trim-keyword", "trim");
+    const trimFlag = new Optional("optional-trim-flag", new Sequence("trim-flag", [lineSpaces$1, trimKeyword]));
+    const bounds = new Sequence("bounds", [
         openBracket$1,
-        optionalSpaces$2,
-        optionalInteger.clone("min"),
-        optionalSpaces$2,
+        optionalSpaces$3,
+        min,
+        optionalSpaces$3,
         comma,
-        optionalSpaces$2,
-        optionalInteger.clone("max"),
-        optionalSpaces$2,
+        optionalSpaces$3,
+        max,
         closeBracket$1
     ]);
-    const exactCount = new And("exact-count", [
+    const exactCount = new Sequence("exact-count", [
         openBracket$1,
-        optionalSpaces$2,
+        optionalSpaces$3,
         integer,
-        optionalSpaces$2,
+        optionalSpaces$3,
         closeBracket$1,
     ]);
     const quantifierShorthand = new Regex("quantifier-shorthand", "\\*|\\+");
     quantifierShorthand.setTokens(["*", "+"]);
-    const quantifier = new Or("quantifier", [
+    const quantifier = new Options("quantifier", [
         quantifierShorthand,
         exactCount,
         bounds
     ]);
-    const optional = new Literal("is-optional", "?", true);
-    const trimDivider = new Literal("trim-divider", "-t");
-    const openParen = new Literal("open-paren", "(");
-    const closeParen = new Literal("close-paren", ")");
+    const openParen = new Literal("repeat-open-paren", "(");
+    const closeParen = new Literal("repeat-close-paren", ")");
     const dividerComma = new Regex("divider-comma", "\\s*,\\s*");
     dividerComma.setTokens([", "]);
-    const repeatLiteral = new And("repeat-literal", [
+    const patternName$2 = name$1.clone("pattern-name");
+    const patterns$3 = new Options("or-patterns", [patternName$2, anonymousPattern]);
+    const dividerPattern = patterns$3.clone("divider-pattern");
+    const dividerSection = new Sequence("divider-section", [dividerComma, dividerPattern, trimFlag]);
+    const optionalDividerSection = new Optional("optional-divider-section", dividerSection);
+    const repeatLiteral = new Sequence("repeat-literal", [
         openParen,
-        optionalSpaces$2,
-        patternName,
-        optional,
-        new And("optional-divider-section", [dividerComma, dividerPattern], true),
-        optionalSpaces$2,
+        optionalSpaces$3,
+        patterns$3,
+        optionalDividerSection,
+        optionalSpaces$3,
         closeParen,
-        new And("quantifier-section", [optionalSpaces$2, quantifier]),
-        new And("optional-trim-divider-section", [spaces$1, trimDivider], true)
+        new Sequence("quantifier-section", [quantifier]),
     ]);
 
-    const optionalSpaces$1 = spaces$1.clone("optional-spaces", true);
-    const assignOperator = new Literal("assign-operator", "=");
-    const statements = new Or("statements", [
+    const optionalNot = new Optional("optional-not", new Literal("not", "!"));
+    const optionalIsOptional$1 = new Optional("optional-is-optional", new Literal("is-optional", "?"));
+    const patternName$1 = name$1.clone("pattern-name");
+    const patterns$2 = new Options("and-patterns", [patternName$1, anonymousPattern]);
+    const pattern$1 = new Sequence("and-child-pattern", [
+        optionalNot,
+        patterns$2,
+        optionalIsOptional$1,
+    ]);
+    const divider$1 = new Regex("and-divider", "\\s*[+]\\s*");
+    divider$1.setTokens([" + "]);
+    const sequenceLiteral = new Repeat("sequence-literal", pattern$1, { divider: divider$1, min: 2, trimDivider: true });
+
+    const patternName = name$1.clone("pattern-name");
+    patternName.setTokens(["[PATTERN_NAME]"]);
+    const patterns$1 = new Options("or-patterns", [patternName, anonymousPattern]);
+    const defaultDivider = new Regex("default-divider", "\\s*[|]\\s*");
+    defaultDivider.setTokens(["|"]);
+    const greedyDivider = new Regex("greedy-divider", "\\s*[<][|][>]\\s*");
+    greedyDivider.setTokens(["<|>"]);
+    const divider = new Options("options-divider", [defaultDivider, greedyDivider]);
+    const optionsLiteral = new Repeat("options-literal", patterns$1, { divider, min: 2, trimDivider: true });
+
+    const aliasLiteral = name$1.clone("alias-literal");
+    aliasLiteral.setTokens(["[ALIAS_LITERAL]"]);
+    const optionalIsOptional = new Optional("optional-flag", new Literal("is-optional", "?"));
+    const configurableAnonymousPattern = new Sequence("configurable-anonymous-pattern", [anonymousPattern, optionalIsOptional]);
+    const pattern = new Options("pattern", [
         literal,
         regexLiteral,
-        orLiteral,
-        andLiteral,
         repeatLiteral,
-        name$1.clone("alias-literal"),
-    ]);
-    const assignStatement = new And("assign-statement", [
-        optionalSpaces$1,
+        aliasLiteral,
+        optionsLiteral,
+        sequenceLiteral,
+        configurableAnonymousPattern,
+    ], true);
+
+    const optionalSpaces$2 = new Optional("optional-spaces", spaces$1);
+    const assignOperator = new Literal("assign-operator", "=");
+    const assignStatement = new Sequence("assign-statement", [
+        optionalSpaces$2,
         name$1,
-        optionalSpaces$1,
+        optionalSpaces$2,
         assignOperator,
-        optionalSpaces$1,
-        statements
+        optionalSpaces$2,
+        pattern
     ]);
-    const statement = new Or("statement", [assignStatement, name$1.clone("export-name")]);
+    const statement = new Options("statement", [assignStatement, name$1.clone("export-name")]);
 
-    const bodyLineContent = new Or("body-line-content", [
+    const bodyLineContent = new Options("body-line-content", [
         comment,
         statement
     ]);
-    const bodyLine = new And("body-line", [
-        lineSpaces$1.clone("line-spaces", true),
+    const optionalLineSpaces$2 = new Optional("optional-line-spaces", lineSpaces$1);
+    const bodyLine = new Sequence("body-line", [
+        optionalLineSpaces$2,
         bodyLineContent,
-        lineSpaces$1.clone("line-spaces", true),
+        optionalLineSpaces$2,
     ]);
     const body = new Repeat("body", bodyLine, { divider: newLine$1, min: 0 });
 
-    const optionalSpaces = allSpaces.clone("optional-spaces", true);
-    const optionalLineSpaces = lineSpaces$1.clone("options-line-spaces", true);
+    const optionalSpaces$1 = new Optional("optional-spaces", allSpaces);
+    const optionalLineSpaces$1 = new Optional("options-line-spaces", lineSpaces$1);
     const importNameDivider = new Regex("import-name-divider", "(\\s+)?,(\\s+)?");
+    importNameDivider.setTokens([", "]);
+    const name = new Regex("import-name", "[^}\\s,]+");
+    name.setTokens(["[IMPORT_NAME]"]);
     const importKeyword = new Literal("import", "import");
     const useParamsKeyword = new Literal("use-params", "use params");
     const asKeyword = new Literal("as", "as");
     const fromKeyword = new Literal("from", "from");
     const openBracket = new Literal("open-bracket", "{");
     const closeBracket = new Literal("close-bracket", "}");
-    const name = new Regex("import-name", "[^}\\s,]+");
     const importNameAlias = name.clone("import-name-alias");
-    const importAlias = new And("import-alias", [name, lineSpaces$1, asKeyword, lineSpaces$1, importNameAlias]);
-    const importedNames = new Repeat("imported-names", new Or("import-names", [importAlias, name]), { divider: importNameDivider });
+    const importAlias = new Sequence("import-alias", [name, lineSpaces$1, asKeyword, lineSpaces$1, importNameAlias]);
+    const importedNames = new Repeat("imported-names", new Options("import-names", [importAlias, name]), { divider: importNameDivider });
     const paramName = name.clone("param-name");
     const paramNames = new Repeat("param-names", paramName, { divider: importNameDivider });
     const resource = literal.clone("resource");
-    const useParams = new And("import-params", [
+    const useParams = new Sequence("import-params", [
         useParamsKeyword,
-        optionalLineSpaces,
+        optionalLineSpaces$1,
         openBracket,
-        optionalSpaces,
+        optionalSpaces$1,
         paramNames,
-        optionalSpaces,
+        optionalSpaces$1,
         closeBracket
     ]);
     const withParamsKeyword = new Literal("with-params", "with params");
-    const withParamsStatement = new And("with-params-statement", [
+    const withParamsStatement = new Optional("optional-with-params-statement", new Sequence("with-params-statement", [
         withParamsKeyword,
-        optionalLineSpaces,
+        optionalLineSpaces$1,
         openBracket,
-        optionalSpaces,
+        optionalSpaces$1,
         body.clone("with-params-body"),
-        optionalSpaces,
+        optionalSpaces$1,
         closeBracket
-    ], true);
-    const importFromStatement = new And("import-from", [
+    ]));
+    const importFromStatement = new Sequence("import-from", [
         importKeyword,
-        optionalLineSpaces,
+        optionalLineSpaces$1,
         openBracket,
-        optionalSpaces,
+        optionalSpaces$1,
         importedNames,
-        optionalSpaces,
+        optionalSpaces$1,
         closeBracket,
-        optionalLineSpaces,
+        optionalLineSpaces$1,
         fromKeyword,
-        optionalLineSpaces,
+        optionalLineSpaces$1,
         resource,
-        optionalLineSpaces,
+        optionalLineSpaces$1,
         withParamsStatement
     ]);
-    const importStatement = new Or("import-statement", [
+    const importStatement = new Options("import-statement", [
         useParams,
         importFromStatement
     ]);
@@ -1866,26 +2125,32 @@
     spaces.setTokens([" "]);
     tabs.setTokens(["\t"]);
     newLine.setTokens(["\n"]);
-    const lineSpaces = new Repeat("line-spaces", new Or("line-space", [tabs, spaces]));
-    const headLineContent = new Or("head-line-content", [
+    const lineSpaces = new Repeat("line-spaces", new Options("line-space", [tabs, spaces]));
+    const optionalLineSpaces = new Optional("optional-line-spaces", lineSpaces);
+    const headLineContent = new Options("head-line-content", [
         comment,
         importStatement
     ]);
-    const headLine = new And("head-line-content", [
-        lineSpaces.clone("line-spaces", true),
+    const headLine = new Sequence("head-line-content", [
+        optionalLineSpaces,
         headLineContent,
-        lineSpaces.clone("line-spaces", true),
+        optionalLineSpaces,
     ]);
-    const head = new Repeat("head", headLine, { divider: newLine, min: 0 });
-    const grammar = new And("grammar", [
-        allSpaces,
+    const head = new Optional("optional-head", new Repeat("head", headLine, { divider: newLine }));
+    const optionalSpaces = new Optional("optional-spaces", allSpaces);
+    const grammar = new Sequence("grammar", [
+        optionalSpaces,
         head,
-        allSpaces,
+        optionalSpaces,
         body,
-        allSpaces
+        optionalSpaces
     ]);
 
+    let idIndex = 0;
     class Not {
+        get id() {
+            return this._id;
+        }
         get type() {
             return this._type;
         }
@@ -1905,10 +2170,11 @@
             return false;
         }
         constructor(name, pattern) {
+            this._id = `not-${idIndex++}`;
             this._type = "not";
             this._name = name;
             this._parent = null;
-            this._children = [pattern.clone(pattern.name, false)];
+            this._children = [pattern.clone()];
             this._children[0].parent = this;
         }
         test(text) {
@@ -1916,15 +2182,17 @@
             this.parse(cursor);
             return !cursor.hasError;
         }
-        exec(text) {
+        exec(text, record = false) {
             const cursor = new Cursor(text);
+            record && cursor.startRecording();
             const ast = this.parse(cursor);
             return {
-                ast,
+                ast: (ast === null || ast === void 0 ? void 0 : ast.value) === text ? ast : null,
                 cursor
             };
         }
         parse(cursor) {
+            cursor.startParseWith(this);
             const firstIndex = cursor.index;
             this._children[0].parse(cursor);
             if (cursor.hasError) {
@@ -1936,10 +2204,12 @@
                 cursor.resolveError();
                 cursor.recordErrorAt(firstIndex, firstIndex, this);
             }
+            cursor.endParse();
             return null;
         }
         clone(name = this._name) {
             const not = new Not(name, this._children[0]);
+            not._id = this._id;
             return not;
         }
         getTokens() {
@@ -1981,6 +2251,9 @@
         find(predicate) {
             return predicate(this._children[0]) ? this._children[0] : null;
         }
+        isEqual(pattern) {
+            return pattern.type === this.type && this.children.every((c, index) => c.isEqual(pattern.children[index]));
+        }
     }
 
     const defaultOptions = { greedyPatternNames: [], customTokens: {} };
@@ -2185,6 +2458,16 @@
         return furthestOptions;
     }
 
+    let anonymousIndexId = 0;
+    const patternNodes = {
+        "literal": true,
+        "regex-literal": true,
+        "options-literal": true,
+        "sequence-literal": true,
+        "repeat-literal": true,
+        "alias-literal": true,
+        "configurable-anonymous-pattern": true
+    };
     class ParseContext {
         constructor(params) {
             this.patternsByName = new Map();
@@ -2229,7 +2512,7 @@
                 const ast = this._tryToParse(expression);
                 yield this._resolveImports(ast);
                 this._buildPatterns(ast);
-                return this._parseContext.patternsByName;
+                return Object.fromEntries(this._parseContext.patternsByName);
             });
         }
         parseString(expression) {
@@ -2239,7 +2522,7 @@
                 throw new Error("Cannot use imports on parseString, use parse instead.");
             }
             this._buildPatterns(ast);
-            return this._parseContext.patternsByName;
+            return Object.fromEntries(this._parseContext.patternsByName);
         }
         _tryToParse(expression) {
             const { ast, cursor, options, isComplete } = this._autoComplete.suggestFor(expression);
@@ -2269,41 +2552,208 @@
             if (body == null) {
                 return;
             }
-            body.findAll(n => n.name === "assign-statement" || n.name === "export-name").forEach((n) => {
-                const typeNode = n.find(n => n.name.includes("literal"));
-                const type = n.name === "export-name" ? "export-name" : (typeNode === null || typeNode === void 0 ? void 0 : typeNode.name) || "unknown";
-                switch (type) {
+            body.findAll(n => n.name === "assign-statement").forEach((n) => {
+                const patternNode = n.children.find(n => patternNodes[n.name] != null);
+                if (patternNode == null) {
+                    return;
+                }
+                switch (patternNode.name) {
                     case "literal": {
-                        this._buildLiteral(n);
+                        this._saveLiteral(n);
                         break;
                     }
                     case "regex-literal": {
-                        this._buildRegex(n);
+                        this._saveRegex(n);
                         break;
                     }
-                    case "or-literal": {
-                        this._buildOr(n);
+                    case "options-literal": {
+                        this._saveOptions(n);
                         break;
                     }
-                    case "and-literal": {
-                        this._buildAnd(n);
+                    case "sequence-literal": {
+                        this._saveSequence(n);
                         break;
                     }
                     case "repeat-literal": {
-                        this._buildRepeat(n);
+                        this._saveRepeat(n);
                         break;
                     }
                     case "alias-literal": {
-                        this._buildAlias(n);
+                        this._saveAlias(n);
                         break;
                     }
-                    case "export-name": {
-                        const pattern = this._getPattern(n.value);
-                        this._parseContext.patternsByName.set(n.value, pattern);
+                    case "configurable-anonymous-pattern": {
+                        this._saveConfigurableAnonymous(n);
                         break;
                     }
                 }
             });
+            body.findAll(n => n.name === "export-name").forEach((n) => {
+                const pattern = this._getPattern(n.value).clone();
+                this._parseContext.patternsByName.set(n.value, pattern);
+            });
+        }
+        _saveLiteral(statementNode) {
+            const nameNode = statementNode.find(n => n.name === "name");
+            const literalNode = statementNode.find(n => n.name === "literal");
+            const name = nameNode.value;
+            const literal = this._buildLiteral(name, literalNode);
+            this._parseContext.patternsByName.set(name, literal);
+        }
+        _buildLiteral(name, node) {
+            return new Literal(name, this._resolveStringValue(node.value));
+        }
+        _resolveStringValue(value) {
+            return value.replace(/\\n/g, '\n')
+                .replace(/\\r/g, '\r')
+                .replace(/\\t/g, '\t')
+                .replace(/\\b/g, '\b')
+                .replace(/\\f/g, '\f')
+                .replace(/\\v/g, '\v')
+                .replace(/\\0/g, '\0')
+                .replace(/\\x([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
+                .replace(/\\u([0-9A-Fa-f]{4})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
+                .replace(/\\(.)/g, '$1').slice(1, -1);
+        }
+        _saveRegex(statementNode) {
+            const nameNode = statementNode.find(n => n.name === "name");
+            const regexNode = statementNode.find(n => n.name === "regex-literal");
+            const name = nameNode.value;
+            const regex = this._buildRegex(name, regexNode);
+            this._parseContext.patternsByName.set(name, regex);
+        }
+        _buildRegex(name, node) {
+            const value = node.value.slice(1, node.value.length - 1);
+            return new Regex(name, value);
+        }
+        _saveOptions(statementNode) {
+            const nameNode = statementNode.find(n => n.name === "name");
+            const name = nameNode.value;
+            const optionsNode = statementNode.find(n => n.name === "options-literal");
+            const options = this._buildOptions(name, optionsNode);
+            this._parseContext.patternsByName.set(name, options);
+        }
+        _buildOptions(name, node) {
+            const patternNodes = node.children.filter(n => n.name !== "default-divider" && n.name !== "greedy-divider");
+            const isGreedy = node.find(n => n.name === "greedy-divider") != null;
+            const patterns = patternNodes.map(n => this._buildPattern(n));
+            const or = new Options(name, patterns, isGreedy);
+            return or;
+        }
+        _buildPattern(node) {
+            const type = node.name;
+            const name = `anonymous-pattern-${anonymousIndexId++}`;
+            switch (type) {
+                case "pattern-name": {
+                    return this._getPattern(node.value).clone();
+                }
+                case "literal": {
+                    return this._buildLiteral(node.value.slice(1, -1), node);
+                }
+                case "regex-literal": {
+                    return this._buildRegex(node.value.slice(1, -1), node);
+                }
+                case "repeat-literal": {
+                    return this._buildRepeat(name, node);
+                }
+                case "options-literal": {
+                    return this._buildOptions(name, node);
+                }
+                case "sequence-literal": {
+                    return this._buildSequence(name, node);
+                }
+                case "complex-anonymous-pattern": {
+                    return this._buildComplexAnonymousPattern(node);
+                }
+            }
+            throw new Error(`Couldn't build node: ${node.name}.`);
+        }
+        _saveSequence(statementNode) {
+            const nameNode = statementNode.find(n => n.name === "name");
+            const name = nameNode.value;
+            const sequenceNode = statementNode.find(n => n.name === "sequence-literal");
+            const sequence = this._buildSequence(name, sequenceNode);
+            this._parseContext.patternsByName.set(name, sequence);
+        }
+        _buildSequence(name, node) {
+            const patternNodes = node.children.filter(n => n.name !== "and-divider");
+            const patterns = patternNodes.map(n => {
+                const patternNode = n.children[0].name === "not" ? n.children[1] : n.children[0];
+                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;
+                if (isNot) {
+                    return new Not(`not-${finalPattern.name}`, finalPattern);
+                }
+                return finalPattern;
+            });
+            return new Sequence(name, patterns);
+        }
+        _saveRepeat(statementNode) {
+            const nameNode = statementNode.find(n => n.name === "name");
+            const name = nameNode.value;
+            const repeatNode = statementNode.find(n => n.name === "repeat-literal");
+            const repeat = this._buildRepeat(name, repeatNode);
+            this._parseContext.patternsByName.set(name, repeat);
+        }
+        _buildRepeat(name, repeatNode) {
+            let isOptional = false;
+            const bounds = repeatNode.find(n => n.name === "bounds");
+            const exactCount = repeatNode.find(n => n.name === "exact-count");
+            const quantifier = repeatNode.find(n => n.name === "quantifier-shorthand");
+            const trimDivider = repeatNode.find(n => n.name === "trim-flag") != null;
+            const patterNode = repeatNode.children[1].type === "spaces" ? repeatNode.children[2] : repeatNode.children[1];
+            const pattern = this._buildPattern(patterNode);
+            const dividerSectionNode = repeatNode.find(n => n.name === "divider-section");
+            const options = {
+                min: 1,
+                max: Infinity
+            };
+            if (trimDivider) {
+                options.trimDivider = trimDivider;
+            }
+            if (dividerSectionNode != null) {
+                const dividerNode = dividerSectionNode.children[1];
+                options.divider = this._buildPattern(dividerNode);
+            }
+            if (bounds != null) {
+                const minNode = bounds.find(p => p.name === "min");
+                const maxNode = bounds.find(p => p.name === "max");
+                const min = minNode == null ? 0 : Number(minNode.value);
+                const max = maxNode == null ? Infinity : Number(maxNode.value);
+                options.min = min;
+                options.max = max;
+            }
+            else if (exactCount != null) {
+                const integerNode = exactCount.find(p => p.name === "integer");
+                const integer = Number(integerNode.value);
+                options.min = integer;
+                options.max = integer;
+            }
+            else if (quantifier != null) {
+                const type = quantifier.value;
+                if (type === "+") {
+                    options.min = 1;
+                    options.max = Infinity;
+                }
+                else {
+                    isOptional = true;
+                }
+            }
+            return isOptional ? new Optional(name, new Repeat(name, pattern, options)) : new Repeat(name, pattern, options);
+        }
+        _saveConfigurableAnonymous(node) {
+            const nameNode = node.find(n => n.name === "name");
+            const name = nameNode.value;
+            const anonymousNode = node.find(n => n.name === "complex-anonymous-pattern");
+            const isOptional = node.children[1] != null;
+            const anonymous = isOptional ? new Optional(name, this._buildPattern(anonymousNode)) : this._buildPattern(anonymousNode);
+            this._parseContext.patternsByName.set(name, anonymous);
+        }
+        _buildComplexAnonymousPattern(node) {
+            const wrappedNode = node.children[1].name === "line-spaces" ? node.children[2] : node.children[1];
+            return this._buildPattern(wrappedNode);
         }
         _resolveImports(ast) {
             return __awaiter(this, void 0, void 0, function* () {
@@ -2332,7 +2782,7 @@
                                 if (parseContext.importedPatternsByName.has(importName)) {
                                     throw new Error(`'${importName}' was already used within another import.`);
                                 }
-                                const pattern = patterns.get(importName);
+                                const pattern = patterns[importName];
                                 if (pattern == null) {
                                     throw new Error(`Couldn't find pattern with name: ${importName}, from import: ${resource}.`);
                                 }
@@ -2346,7 +2796,7 @@
                                 if (parseContext.importedPatternsByName.has(alias)) {
                                     throw new Error(`'${alias}' was already used within another import.`);
                                 }
-                                const pattern = patterns.get(importName);
+                                const pattern = patterns[importName];
                                 if (pattern == null) {
                                     throw new Error(`Couldn't find pattern with name: ${importName}, from import: ${resource}.`);
                                 }
@@ -2377,48 +2827,11 @@
                         resolveImport: this._resolveImport
                     });
                     const patterns = grammar.parseString(expression);
-                    params = Array.from(patterns.values());
+                    params = Array.from(Object.values(patterns));
                 }
             }
             return params;
         }
-        _buildLiteral(statementNode) {
-            const nameNode = statementNode.find(n => n.name === "name");
-            const literalNode = statementNode.find(n => n.name === "literal");
-            const name = nameNode.value;
-            const value = this._resolveStringValue(literalNode.value.slice(1, -1));
-            const literal = new Literal(name, value);
-            this._parseContext.patternsByName.set(name, literal);
-        }
-        _resolveStringValue(value) {
-            return value.replace(/\\n/g, '\n')
-                .replace(/\\r/g, '\r')
-                .replace(/\\t/g, '\t')
-                .replace(/\\b/g, '\b')
-                .replace(/\\f/g, '\f')
-                .replace(/\\v/g, '\v')
-                .replace(/\\0/g, '\0')
-                .replace(/\\x([0-9A-Fa-f]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
-                .replace(/\\u([0-9A-Fa-f]{4})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
-                .replace(/\\(.)/g, '$1');
-        }
-        _buildRegex(statementNode) {
-            const nameNode = statementNode.find(n => n.name === "name");
-            const regexNode = statementNode.find(n => n.name === "regex-literal");
-            const value = regexNode.value.slice(1, regexNode.value.length - 1);
-            const name = nameNode.value;
-            const regex = new Regex(name, value);
-            this._parseContext.patternsByName.set(name, regex);
-        }
-        _buildOr(statementNode) {
-            const nameNode = statementNode.find(n => n.name === "name");
-            const orNode = statementNode.find(n => n.name === "or-literal");
-            const patternNodes = orNode.children.filter(n => n.name === "pattern-name");
-            const name = nameNode.value;
-            const patterns = patternNodes.map(n => this._getPattern(n.value));
-            const or = new Or(name, patterns, false, true);
-            this._parseContext.patternsByName.set(name, or);
-        }
         _getPattern(name) {
             let pattern = this._parseContext.patternsByName.get(name);
             if (pattern == null) {
@@ -2432,82 +2845,12 @@
             }
             return pattern;
         }
-        _buildAnd(statementNode) {
-            const nameNode = statementNode.find(n => n.name === "name");
-            const andNode = statementNode.find(n => n.name === "and-literal");
-            const patternNodes = andNode.children.filter(n => n.name === "pattern");
-            const name = nameNode.value;
-            const patterns = patternNodes.map(n => {
-                const nameNode = n.find(n => n.name === "pattern-name");
-                const isNot = n.find(n => n.name === "not") != null;
-                const isOptional = n.find(n => n.name === "is-optional") != null;
-                const name = nameNode.value;
-                const pattern = this._getPattern(name);
-                if (isNot) {
-                    return new Not(`not-${name}`, pattern.clone(name, isOptional));
-                }
-                return pattern.clone(name, isOptional);
-            });
-            const and = new And(name, patterns);
-            this._parseContext.patternsByName.set(name, and);
-        }
-        _buildRepeat(statementNode) {
-            const nameNode = statementNode.find(n => n.name === "name");
-            const repeatNode = statementNode.find(n => n.name === "repeat-literal");
-            const patternNameNode = statementNode.find(n => n.name === "pattern-name");
-            const dividerNode = repeatNode.find(n => n.name === "divider-pattern");
-            const bounds = repeatNode.find(n => n.name === "bounds");
-            const exactCount = repeatNode.find(n => n.name === "exact-count");
-            const quantifier = repeatNode.find(n => n.name === "quantifier-shorthand");
-            const isPatternOptional = repeatNode.find(n => n.name === "is-optional") != null;
-            const trimDivider = repeatNode.find(n => n.name === "trim-divider") != null;
-            const name = nameNode.value;
-            const pattern = this._getPattern(patternNameNode.value);
-            const options = {
-                min: 1,
-                max: Infinity
-            };
-            if (trimDivider) {
-                options.trimDivider = trimDivider;
-            }
-            if (dividerNode != null) {
-                options.divider = this._getPattern(dividerNode.value);
-            }
-            if (bounds != null) {
-                const minNode = bounds.find(p => p.name === "min");
-                const maxNode = bounds.find(p => p.name === "max");
-                const min = minNode == null ? 0 : Number(minNode.value);
-                const max = maxNode == null ? Infinity : Number(maxNode.value);
-                options.min = min;
-                options.max = max;
-            }
-            else if (exactCount != null) {
-                const integerNode = exactCount.find(p => p.name === "integer");
-                const integer = Number(integerNode.value);
-                options.min = integer;
-                options.max = integer;
-            }
-            else if (quantifier != null) {
-                const type = quantifier.value;
-                if (type === "+") {
-                    options.min = 1;
-                    options.max = Infinity;
-                }
-                else {
-                    options.min = 0;
-                    options.max = Infinity;
-                }
-            }
-            const repeat = new Repeat(name, pattern.clone(pattern.name, isPatternOptional), options);
-            this._parseContext.patternsByName.set(name, repeat);
-        }
-        _buildAlias(statementNode) {
+        _saveAlias(statementNode) {
             const nameNode = statementNode.find(n => n.name === "name");
             const aliasNode = statementNode.find(n => n.name === "alias-literal");
             const aliasName = aliasNode.value;
             const name = nameNode.value;
-            const pattern = this._getPattern(aliasName);
-            const alias = pattern.clone(name);
+            const alias = this._getPattern(aliasName).clone(name);
             this._parseContext.patternsByName.set(name, alias);
         }
         static parse(expression, options) {
@@ -2524,7 +2867,30 @@
         }
     }
 
-    exports.And = And;
+    function arePatternsEqual(a, b) {
+        if (a === b) {
+            return true;
+        }
+        else if (a == null || b == null) {
+            return false;
+        }
+        return a.isEqual(b);
+    }
+
+    const kebabRegex = /-([a-z])/g; // Define the regex once
+    function kebabToCamelCase(str) {
+        return str.replace(kebabRegex, (_, char) => char.toUpperCase());
+    }
+    function patterns(strings, ...values) {
+        const combinedString = strings.reduce((result, str, i) => result + str + (values[i] || ''), '');
+        const result = {};
+        const patterns = Grammar.parseString(combinedString);
+        Object.keys(patterns).forEach(k => {
+            result[kebabToCamelCase(k)] = patterns[k];
+        });
+        return result;
+    }
+
     exports.AutoComplete = AutoComplete;
     exports.Cursor = Cursor;
     exports.CursorHistory = CursorHistory;
@@ -2532,12 +2898,16 @@
     exports.Literal = Literal;
     exports.Node = Node;
     exports.Not = Not;
-    exports.Or = Or;
+    exports.Optional = Optional;
+    exports.Options = Options;
     exports.ParseError = ParseError;
     exports.Reference = Reference;
     exports.Regex = Regex;
     exports.Repeat = Repeat;
+    exports.Sequence = Sequence;
+    exports.arePatternsEqual = arePatternsEqual;
     exports.grammar = grammar;
+    exports.patterns = patterns;
 
     Object.defineProperty(exports, '__esModule', { value: true });