clarity-pattern-parser 10.2.14 → 10.3.1

package/dist/index.js

@@ -165,7 +165,6 @@ class Node {
     walkBreadthFirst(callback) {
         const queue = [this];
         while (queue.length > 0) {
-            // biome-ignore lint/style/noNonNullAssertion: This will never be undefined.
             const current = queue.shift();
             callback(current);
             queue.push(...current.children);
@@ -1597,6 +1596,13 @@ class InfiniteRepeat {
 
 let idIndex$3 = 0;
 class Repeat {
+    get shouldCompactAst() {
+        return this._shouldCompactAst;
+    }
+    set shouldCompactAst(value) {
+        this._shouldCompactAst = value;
+        this._repeatPattern.shouldCompactAst = value;
+    }
     get id() {
         return this._id;
     }
@@ -1622,10 +1628,10 @@ class Repeat {
         return this._options.max;
     }
     constructor(name, pattern, options = {}) {
-        this.shouldCompactAst = false;
         this._id = `repeat-${idIndex$3++}`;
         this._pattern = pattern;
         this._parent = null;
+        this._shouldCompactAst = false;
         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);
@@ -1633,7 +1639,6 @@ class Repeat {
         else {
             this._repeatPattern = new InfiniteRepeat(name, pattern, this._options);
         }
-        this._repeatPattern.shouldCompactAst = this.shouldCompactAst;
         this._children = [this._repeatPattern];
         this._repeatPattern.parent = this;
     }
@@ -2196,13 +2201,17 @@ const pattern = new Options("pattern", [
 
 const optionalSpaces$2 = new Optional("optional-spaces", spaces$1);
 const assignOperator = new Literal("assign-operator", "=");
+const compact = new Literal("compact", "compact");
+const compactModifier = new Sequence("compact-modifier", [lineSpaces$1, compact]);
+const optionalCompactModifier = new Optional("optional-compact-modifier", compactModifier);
 const assignStatement = new Sequence("assign-statement", [
     optionalSpaces$2,
     name$1,
     optionalSpaces$2,
     assignOperator,
     optionalSpaces$2,
-    pattern
+    pattern,
+    optionalCompactModifier
 ]);
 const statement = new Options("statement", [assignStatement, name$1.clone("export-name")]);
 
@@ -2790,6 +2799,7 @@ class ExpressionPattern {
         this._binaryAssociation = [];
         this._precedenceMap = {};
         this._originalPatterns = patterns;
+        this._shouldCompactPatternsMap = {};
         this._patterns = this._organizePatterns(patterns);
         if (this._unaryPatterns.length === 0) {
             throw new Error("Need at least one operand pattern with an 'expression' pattern.");
@@ -2798,6 +2808,7 @@ class ExpressionPattern {
     _organizePatterns(patterns) {
         const finalPatterns = [];
         patterns.forEach((pattern) => {
+            this._shouldCompactPatternsMap[pattern.name] = pattern.shouldCompactAst;
             if (this._isBinary(pattern)) {
                 const binaryName = this._extractName(pattern);
                 const clone = this._extractDelimiter(pattern).clone();
@@ -2886,7 +2897,6 @@ class ExpressionPattern {
             lastChild.name === this.name;
     }
     parse(cursor) {
-        // This is a cache to help with speed
         this._firstIndex = cursor.index;
         depthCache.incrementDepth(this._id, this._firstIndex);
         this._firstIndex = cursor.index;
@@ -2895,11 +2905,31 @@ class ExpressionPattern {
         if (node != null) {
             cursor.moveTo(node.lastIndex);
             cursor.resolveError();
+            this._compactResult(node);
             return node;
         }
         cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
         return null;
     }
+    _compactResult(node) {
+        if (node == null) {
+            return;
+        }
+        if (this.shouldCompactAst) {
+            node.compact();
+            return;
+        }
+        // This could be really expensive with large trees. So we optimize with these checks,
+        // as well as use breadth first as to not recompact nodes over and over again. 
+        const isCompactingNeeded = Object.values(this._shouldCompactPatternsMap).some(p => p);
+        if (isCompactingNeeded) {
+            node.walkBreadthFirst(n => {
+                if (this._shouldCompactPatternsMap[n.name]) {
+                    n.compact();
+                }
+            });
+        }
+    }
     _tryToParse(cursor) {
         if (depthCache.getDepth(this._id, this._firstIndex) > 2) {
             cursor.recordErrorAt(this._firstIndex, this._firstIndex, this);
@@ -2964,7 +2994,9 @@ class ExpressionPattern {
                             }
                             break outer;
                         }
-                        break;
+                        onIndex = cursor.index;
+                        i = -1;
+                        continue;
                     }
                 }
                 cursor.resolveError();
@@ -3321,9 +3353,13 @@ class Grammar {
     }
     _saveOptions(statementNode) {
         const nameNode = statementNode.find(n => n.name === "name");
+        const shouldCompactAst = statementNode.find(n => n.name === "compact");
         const name = nameNode.value;
         const optionsNode = statementNode.find(n => n.name === "options-literal");
         const options = this._buildOptions(name, optionsNode);
+        if (shouldCompactAst != null) {
+            options.shouldCompactAst = true;
+        }
         this._parseContext.patternsByName.set(name, options);
     }
     _buildOptions(name, node) {
@@ -3383,9 +3419,13 @@ class Grammar {
     }
     _saveSequence(statementNode) {
         const nameNode = statementNode.find(n => n.name === "name");
+        const shouldCompactAst = statementNode.find(n => n.name === "compact");
         const name = nameNode.value;
         const sequenceNode = statementNode.find(n => n.name === "sequence-literal");
         const sequence = this._buildSequence(name, sequenceNode);
+        if (shouldCompactAst != null) {
+            sequence.shouldCompactAst = true;
+        }
         this._parseContext.patternsByName.set(name, sequence);
     }
     _buildSequence(name, node) {
@@ -3405,9 +3445,13 @@ class Grammar {
     }
     _saveRepeat(statementNode) {
         const nameNode = statementNode.find(n => n.name === "name");
+        const shouldCompactAst = statementNode.find(n => n.name === "compact");
         const name = nameNode.value;
         const repeatNode = statementNode.find(n => n.name === "repeat-literal");
         const repeat = this._buildRepeat(name, repeatNode);
+        if (shouldCompactAst != null) {
+            repeat.shouldCompactAst = true;
+        }
         this._parseContext.patternsByName.set(name, repeat);
     }
     _buildRepeat(name, repeatNode) {
@@ -3560,10 +3604,14 @@ class Grammar {
     }
     _saveAlias(statementNode) {
         const nameNode = statementNode.find(n => n.name === "name");
+        const shouldCompactAst = statementNode.find(n => n.name === "compact");
         const aliasNode = statementNode.find(n => n.name === "alias-literal");
         const aliasName = aliasNode.value;
         const name = nameNode.value;
         const alias = this._getPattern(aliasName).clone(name);
+        if (shouldCompactAst != null) {
+            alias.shouldCompactAst = true;
+        }
         this._parseContext.patternsByName.set(name, alias);
     }
     static parse(expression, options) {