clarity-pattern-parser 8.1.7 → 8.2.1

package/dist/index.esm.js

@@ -1,14 +1,4 @@
 class Node {
-    constructor(type, name, firstIndex, lastIndex, children = [], value = "") {
-        this._type = type;
-        this._name = name;
-        this._firstIndex = firstIndex;
-        this._lastIndex = lastIndex;
-        this._parent = null;
-        this._children = children;
-        this._value = value;
-        this._children.forEach(c => c._parent = this);
-    }
     get type() {
         return this._type;
     }
@@ -39,6 +29,16 @@ class Node {
     get value() {
         return this.toString();
     }
+    constructor(type, name, firstIndex, lastIndex, children = [], value = "") {
+        this._type = type;
+        this._name = name;
+        this._firstIndex = firstIndex;
+        this._lastIndex = lastIndex;
+        this._parent = null;
+        this._children = children;
+        this._value = value;
+        this._children.forEach(c => c._parent = this);
+    }
     removeChild(node) {
         const index = this._children.indexOf(node);
         if (index > -1) {
@@ -279,12 +279,6 @@ class CursorHistory {
 }
 
 class Cursor {
-    constructor(text) {
-        this._text = text;
-        this._index = 0;
-        this._length = text.length;
-        this._history = new CursorHistory();
-    }
     get text() {
         return this._text;
     }
@@ -327,6 +321,12 @@ class Cursor {
     get currentChar() {
         return this._text[this._index];
     }
+    constructor(text) {
+        this._text = text;
+        this._index = 0;
+        this._length = text.length;
+        this._history = new CursorHistory();
+    }
     hasNext() {
         return this._index + 1 < this._length;
     }
@@ -378,20 +378,6 @@ class Cursor {
 }
 
 class Literal {
-    constructor(name, value, isOptional = false) {
-        if (value.length === 0) {
-            throw new Error("Value Cannot be empty.");
-        }
-        this._type = "literal";
-        this._name = name;
-        this._literal = value;
-        this._runes = Array.from(value);
-        this._isOptional = isOptional;
-        this._parent = null;
-        this._firstIndex = 0;
-        this._lastIndex = 0;
-        this._endIndex = 0;
-    }
     get type() {
         return this._type;
     }
@@ -410,6 +396,20 @@ class Literal {
     get isOptional() {
         return this._isOptional;
     }
+    constructor(name, value, isOptional = false) {
+        if (value.length === 0) {
+            throw new Error("Value Cannot be empty.");
+        }
+        this._type = "literal";
+        this._name = name;
+        this._literal = value;
+        this._runes = Array.from(value);
+        this._isOptional = isOptional;
+        this._parent = null;
+        this._firstIndex = 0;
+        this._lastIndex = 0;
+        this._endIndex = 0;
+    }
     test(text) {
         const cursor = new Cursor(text);
         const ast = this.parse(cursor);
@@ -500,20 +500,6 @@ class Literal {
 }
 
 class Regex {
-    constructor(name, regex, isOptional = false) {
-        this._node = null;
-        this._cursor = null;
-        this._firstIndex = -1;
-        this._substring = "";
-        this._tokens = [];
-        this._type = "regex";
-        this._name = name;
-        this._isOptional = isOptional;
-        this._parent = null;
-        this._originalRegexString = regex;
-        this._regex = new RegExp(`^${regex}`, "g");
-        this.assertArguments();
-    }
     get type() {
         return this._type;
     }
@@ -532,6 +518,20 @@ class Regex {
     get isOptional() {
         return this._isOptional;
     }
+    constructor(name, regex, isOptional = false) {
+        this._node = null;
+        this._cursor = null;
+        this._firstIndex = -1;
+        this._substring = "";
+        this._tokens = [];
+        this._type = "regex";
+        this._name = name;
+        this._isOptional = isOptional;
+        this._parent = null;
+        this._originalRegexString = regex;
+        this._regex = new RegExp(`^${regex}`, "g");
+        this.assertArguments();
+    }
     assertArguments() {
         if (this._originalRegexString.length < 1) {
             throw new Error("Invalid Arguments: The regex string argument needs to be at least one character long.");
@@ -650,14 +650,6 @@ function findPattern(pattern, predicate) {
 }
 
 class Reference {
-    constructor(name, isOptional = false) {
-        this._type = "reference";
-        this._name = name;
-        this._parent = null;
-        this._isOptional = isOptional;
-        this._pattern = null;
-        this._children = [];
-    }
     get type() {
         return this._type;
     }
@@ -676,6 +668,14 @@ class Reference {
     get isOptional() {
         return this._isOptional;
     }
+    constructor(name, isOptional = false) {
+        this._type = "reference";
+        this._name = name;
+        this._parent = null;
+        this._isOptional = isOptional;
+        this._pattern = null;
+        this._children = [];
+    }
     test(text) {
         const cursor = new Cursor(text);
         const ast = this.parse(cursor);
@@ -767,19 +767,6 @@ function clonePatterns(patterns, isOptional) {
 }
 
 class Or {
-    constructor(name, options, isOptional = false) {
-        if (options.length === 0) {
-            throw new Error("Need at least one pattern with an 'or' pattern.");
-        }
-        const children = clonePatterns(options, false);
-        this._assignChildrenToParent(children);
-        this._type = "or";
-        this._name = name;
-        this._parent = null;
-        this._children = children;
-        this._isOptional = isOptional;
-        this._firstIndex = 0;
-    }
     get type() {
         return this._type;
     }
@@ -798,6 +785,20 @@ class Or {
     get isOptional() {
         return this._isOptional;
     }
+    constructor(name, options, isOptional = false, isGreedy = false) {
+        if (options.length === 0) {
+            throw new Error("Need at least one pattern with an 'or' pattern.");
+        }
+        const children = clonePatterns(options, false);
+        this._assignChildrenToParent(children);
+        this._type = "or";
+        this._name = name;
+        this._parent = null;
+        this._children = children;
+        this._isOptional = isOptional;
+        this._firstIndex = 0;
+        this._isGreedy = isGreedy;
+    }
     _assignChildrenToParent(children) {
         for (const child of children) {
             child.parent = this;
@@ -820,6 +821,7 @@ class Or {
         this._firstIndex = cursor.index;
         const node = this._tryToParse(cursor);
         if (node != null) {
+            cursor.moveTo(node.lastIndex);
             cursor.resolveError();
             return node;
         }
@@ -832,15 +834,21 @@ class Or {
         return null;
     }
     _tryToParse(cursor) {
+        const results = [];
         for (const pattern of this._children) {
             cursor.moveTo(this._firstIndex);
             const result = pattern.parse(cursor);
-            if (!cursor.hasError) {
+            if (this._isGreedy) {
+                results.push(result);
+            }
+            if (!cursor.hasError && !this._isGreedy) {
                 return result;
             }
             cursor.resolveError();
         }
-        return null;
+        const nonNullResults = results.filter(r => r != null);
+        nonNullResults.sort((a, b) => b.endIndex - a.endIndex);
+        return nonNullResults[0] || null;
     }
     getTokens() {
         const tokens = [];
@@ -884,28 +892,12 @@ class Or {
         return findPattern(this, predicate);
     }
     clone(name = this._name, isOptional = this._isOptional) {
-        const or = new Or(name, this._children, isOptional);
+        const or = new Or(name, this._children, isOptional, this._isGreedy);
         return or;
     }
 }
 
 class FiniteRepeat {
-    constructor(name, pattern, repeatAmount, options = {}) {
-        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._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));
-            }
-        }
-    }
     get type() {
         return this._type;
     }
@@ -930,6 +922,22 @@ class FiniteRepeat {
     get max() {
         return this._max;
     }
+    constructor(name, pattern, repeatAmount, options = {}) {
+        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._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));
+            }
+        }
+    }
     parse(cursor) {
         const startIndex = cursor.index;
         const nodes = [];
@@ -1054,6 +1062,27 @@ class FiniteRepeat {
 }
 
 class InfiniteRepeat {
+    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;
+    }
+    get isOptional() {
+        return this._min === 0;
+    }
+    get min() {
+        return this._min;
+    }
     constructor(name, pattern, options = {}) {
         const min = options.min != null ? options.min : 1;
         const divider = options.divider;
@@ -1076,27 +1105,6 @@ class InfiniteRepeat {
         this._nodes = [];
         this._trimDivider = options.trimDivider == null ? false : options.trimDivider;
     }
-    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;
-    }
-    get isOptional() {
-        return this._min === 0;
-    }
-    get min() {
-        return this._min;
-    }
     _assignChildrenToParent(children) {
         for (const child of children) {
             child.parent = this;
@@ -1290,19 +1298,6 @@ class InfiniteRepeat {
 }
 
 class Repeat {
-    constructor(name, pattern, options = {}) {
-        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);
-        }
-        else {
-            this._repeatPattern = new InfiniteRepeat(name, pattern, this._options);
-        }
-        this._children = [this._repeatPattern];
-        this._repeatPattern.parent = this;
-    }
     get type() {
         return this._repeatPattern.type;
     }
@@ -1321,6 +1316,19 @@ class Repeat {
     get isOptional() {
         return this._repeatPattern.isOptional;
     }
+    constructor(name, pattern, options = {}) {
+        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);
+        }
+        else {
+            this._repeatPattern = new InfiniteRepeat(name, pattern, this._options);
+        }
+        this._children = [this._repeatPattern];
+        this._repeatPattern.parent = this;
+    }
     parse(cursor) {
         return this._repeatPattern.parse(cursor);
     }
@@ -1390,20 +1398,6 @@ function filterOutNull(nodes) {
 }
 
 class And {
-    constructor(name, sequence, isOptional = false) {
-        if (sequence.length === 0) {
-            throw new Error("Need at least one pattern with an 'and' pattern.");
-        }
-        const children = clonePatterns(sequence);
-        this._assignChildrenToParent(children);
-        this._type = "and";
-        this._name = name;
-        this._isOptional = isOptional;
-        this._parent = null;
-        this._children = children;
-        this._firstIndex = -1;
-        this._nodes = [];
-    }
     get type() {
         return this._type;
     }
@@ -1422,6 +1416,20 @@ class And {
     get isOptional() {
         return this._isOptional;
     }
+    constructor(name, sequence, isOptional = false) {
+        if (sequence.length === 0) {
+            throw new Error("Need at least one pattern with an 'and' pattern.");
+        }
+        const children = clonePatterns(sequence);
+        this._assignChildrenToParent(children);
+        this._type = "and";
+        this._name = name;
+        this._isOptional = isOptional;
+        this._parent = null;
+        this._children = children;
+        this._firstIndex = -1;
+        this._nodes = [];
+    }
     _assignChildrenToParent(children) {
         for (const child of children) {
             child.parent = this;
@@ -1738,13 +1746,6 @@ const line = new Or("line", [
 const grammar = new Repeat("grammar", line, { divider: newLine });
 
 class Not {
-    constructor(name, pattern) {
-        this._type = "not";
-        this._name = name;
-        this._parent = null;
-        this._children = [pattern.clone(pattern.name, false)];
-        this._children[0].parent = this;
-    }
     get type() {
         return this._type;
     }
@@ -1763,6 +1764,13 @@ class Not {
     get isOptional() {
         return false;
     }
+    constructor(name, pattern) {
+        this._type = "not";
+        this._name = name;
+        this._parent = null;
+        this._children = [pattern.clone(pattern.name, false)];
+        this._children[0].parent = this;
+    }
     test(text) {
         const cursor = new Cursor(text);
         this.parse(cursor);
@@ -2127,10 +2135,10 @@ class Grammar {
     _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 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);
+        const or = new Or(name, patterns, false, true);
         this._parseContext.patternsByName.set(name, or);
     }
     _getPattern(name) {
@@ -2143,7 +2151,7 @@ class Grammar {
     _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 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");
@@ -2162,7 +2170,7 @@ class Grammar {
     _buildRepeat(statementNode) {
         const nameNode = statementNode.find(n => n.name === "name");
         const repeatNode = statementNode.find(n => n.name === "repeat-literal");
-        const patternNode = repeatNode.find(n => n.name == "pattern");
+        const patternNode = repeatNode.find(n => n.name === "pattern");
         const patternNameNode = patternNode.find(n => n.name === "pattern-name");
         const dividerNode = repeatNode.find(n => n.name === "divider-pattern");
         const bounds = repeatNode.find(n => n.name === "bounds");