clarity-pattern-parser 10.2.13 → 10.2.14

package/dist/patterns/Context.d.ts

@@ -10,6 +10,7 @@ export declare class Context implements Pattern {
     private _children;
     private _pattern;
     private _patterns;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/ExpressionPattern.d.ts

@@ -18,6 +18,7 @@ export declare class ExpressionPattern implements Pattern {
     private _binaryAssociation;
     private _precedenceMap;
     private _binaryNames;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/FiniteRepeat.d.ts

@@ -18,6 +18,7 @@ export declare class FiniteRepeat implements Pattern {
     private _min;
     private _max;
     private _trimDivider;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/InfiniteRepeat.d.ts

@@ -19,6 +19,7 @@ export declare class InfiniteRepeat implements Pattern {
     private _firstIndex;
     private _min;
     private _trimDivider;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/Literal.d.ts

@@ -12,6 +12,7 @@ export declare class Literal implements Pattern {
     private _firstIndex;
     private _lastIndex;
     private _endIndex;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/Not.d.ts

@@ -8,6 +8,7 @@ export declare class Not implements Pattern {
     private _name;
     private _parent;
     private _children;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/Optional.d.ts

@@ -8,6 +8,7 @@ export declare class Optional implements Pattern {
     private _name;
     private _parent;
     private _children;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/Options.d.ts

@@ -10,6 +10,7 @@ export declare class Options implements Pattern {
     private _children;
     private _isGreedy;
     private _firstIndex;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/Pattern.d.ts

@@ -5,6 +5,7 @@ export interface Pattern {
     id: string;
     type: string;
     name: string;
+    shouldCompactAst: boolean;
     parent: Pattern | null;
     children: Pattern[];
     parse(cursor: Cursor): Node | null;

package/dist/patterns/Reference.d.ts

@@ -10,6 +10,7 @@ export declare class Reference implements Pattern {
     private _cachedPattern;
     private _pattern;
     private _children;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/Regex.d.ts

@@ -14,6 +14,7 @@ export declare class Regex implements Pattern {
     private _firstIndex;
     private _substring;
     private _tokens;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/Repeat.d.ts

@@ -15,6 +15,7 @@ export declare class Repeat implements Pattern {
     private _pattern;
     private _options;
     private _children;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/dist/patterns/Sequence.d.ts

@@ -9,6 +9,7 @@ export declare class Sequence implements Pattern {
     private _children;
     private _nodes;
     private _firstIndex;
+    shouldCompactAst: boolean;
     get id(): string;
     get type(): string;
     get name(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-pattern-parser",
-  "version": "10.2.13",
+  "version": "10.2.14",
   "description": "Parsing Library for Typescript and Javascript.",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",

package/src/ast/Node.ts

@@ -309,6 +309,11 @@ export class Node {
     return length;
   }
 
+  compact(){
+    this._value = this.toString();
+    this._children.length = 0;
+  }
+
   toString(): string {
     if (this._children.length === 0) {
       return this._value;

package/src/patterns/Context.ts

@@ -14,6 +14,8 @@ export class Context implements Pattern {
     private _pattern: Pattern;
     private _patterns: Record<string, Pattern>;
 
+    shouldCompactAst = false;
+
     get id(): string {
         return this._id;
     }
@@ -76,6 +78,7 @@ export class Context implements Pattern {
     clone(name = this._name): Pattern {
         const clone = new Context(name, this._pattern, Object.values(this._patterns));
         clone._id = this._id;
+        clone.shouldCompactAst = this.shouldCompactAst;
         return clone;
     }
 

package/src/patterns/ExpressionPattern.ts

@@ -35,6 +35,8 @@ export class ExpressionPattern implements Pattern {
     private _precedenceMap: Record<string, number>;
     private _binaryNames: string[];
 
+    shouldCompactAst = false;
+
     get id(): string {
         return this._id;
     }
@@ -514,6 +516,7 @@ export class ExpressionPattern implements Pattern {
     clone(name = this._name): Pattern {
         const clone = new ExpressionPattern(name, this._originalPatterns);
         clone._id = this._id;
+        clone.shouldCompactAst = this.shouldCompactAst;
         return clone;
     }
 

package/src/patterns/FiniteRepeat.ts

@@ -24,6 +24,8 @@ export class FiniteRepeat implements Pattern {
     private _max: number;
     private _trimDivider: boolean;
 
+    shouldCompactAst = false;
+
     get id() {
         return this._id;
     }
@@ -140,7 +142,13 @@ export class FiniteRepeat implements Pattern {
         cursor.resolveError();
         cursor.moveTo(lastIndex);
 
-        return new Node(this._type, this.name, firstIndex, lastIndex, nodes);
+        const node = new Node(this._type, this.name, firstIndex, lastIndex, nodes);
+
+        if (this.shouldCompactAst) {
+            node.compact();
+        }
+
+        return node;
     }
 
     test(text: string): boolean {
@@ -178,6 +186,7 @@ export class FiniteRepeat implements Pattern {
         );
 
         clone._id = this._id;
+        clone.shouldCompactAst = this.shouldCompactAst;
 
         return clone;
     }

package/src/patterns/InfiniteRepeat.ts

@@ -26,6 +26,8 @@ export class InfiniteRepeat implements Pattern {
   private _min: number;
   private _trimDivider: boolean;
 
+  shouldCompactAst = false;
+
   get id(): string {
     return this._id;
   }
@@ -118,6 +120,10 @@ export class InfiniteRepeat implements Pattern {
       if (node != null) {
         cursor.moveTo(node.lastIndex);
         cursor.recordMatch(this, node);
+
+        if (this.shouldCompactAst) {
+          node.compact();
+        }
       }
 
       return node;
@@ -352,6 +358,7 @@ export class InfiniteRepeat implements Pattern {
     );
 
     clone._id = this._id;
+    clone.shouldCompactAst = this.shouldCompactAst;
 
     return clone;
   }

package/src/patterns/Literal.ts

@@ -16,6 +16,8 @@ export class Literal implements Pattern {
   private _lastIndex: number;
   private _endIndex: number;
 
+  shouldCompactAst = false;
+
   get id(): string {
     return this._id;
   }
@@ -141,6 +143,7 @@ export class Literal implements Pattern {
   clone(name = this._name): Pattern {
     const clone = new Literal(name, this._token);
     clone._id = this._id;
+    clone.shouldCompactAst = this.shouldCompactAst;
     return clone;
   }
 

package/src/patterns/Not.ts

@@ -12,6 +12,8 @@ export class Not implements Pattern {
   private _parent: Pattern | null;
   private _children: Pattern[];
 
+  shouldCompactAst = false;
+
   get id(): string {
     return this._id;
   }

package/src/patterns/Optional.ts

@@ -12,6 +12,8 @@ export class Optional implements Pattern {
   private _parent: Pattern | null;
   private _children: Pattern[];
 
+  shouldCompactAst = false;
+
   get id(): string {
     return this._id;
   }
@@ -74,15 +76,20 @@ export class Optional implements Pattern {
 
       return null;
     } else {
+      if (node != null && this.shouldCompactAst) {
+        node.compact();
+      }
+
       return node;
     }
 
   }
 
   clone(name = this._name): Pattern {
-    const optional = new Optional(name, this._children[0]);
-    optional._id = this._id;
-    return optional;
+    const clone = new Optional(name, this._children[0]);
+    clone._id = this._id;
+    clone.shouldCompactAst = this.shouldCompactAst;
+    return clone;
   }
 
   getTokens(): string[] {

package/src/patterns/Options.ts

@@ -23,6 +23,8 @@ export class Options implements Pattern {
   private _isGreedy: boolean;
   private _firstIndex: number;
 
+  shouldCompactAst = false;
+
   get id(): string {
     return this._id;
   }
@@ -102,6 +104,11 @@ export class Options implements Pattern {
     if (node != null) {
       cursor.moveTo(node.lastIndex);
       cursor.resolveError();
+
+      if (this.shouldCompactAst) {
+        node.compact();
+      }
+
       return node;
     }
 
@@ -202,9 +209,10 @@ export class Options implements Pattern {
   }
 
   clone(name = this._name): Pattern {
-    const or = new Options(name, this._children, this._isGreedy);
-    or._id = this._id;
-    return or;
+    const clone = new Options(name, this._children, this._isGreedy);
+    clone._id = this._id;
+    clone.shouldCompactAst = this.shouldCompactAst;
+    return clone;
   }
 
   isEqual(pattern: Options): boolean {

package/src/patterns/Pattern.ts

@@ -6,6 +6,7 @@ export interface Pattern {
   id: string;
   type: string;
   name: string;
+  shouldCompactAst: boolean;
   parent: Pattern | null;
   children: Pattern[];
 

package/src/patterns/Reference.ts

@@ -16,6 +16,8 @@ export class Reference implements Pattern {
   private _pattern: Pattern | null;
   private _children: Pattern[];
 
+  shouldCompactAst = false;
+
   get id(): string {
     return this._id;
   }
@@ -196,6 +198,7 @@ export class Reference implements Pattern {
   clone(name = this._name): Pattern {
     const clone = new Reference(name);
     clone._id = this._id;
+    clone.shouldCompactAst = this.shouldCompactAst;
 
     // Optimize future clones, by caching the pattern we already found.
     if (this._pattern != null) {

package/src/patterns/Regex.ts

@@ -18,6 +18,8 @@ export class Regex implements Pattern {
   private _substring = "";
   private _tokens: string[] = [];
 
+  shouldCompactAst = false;
+
   get id(): string {
     return this._id;
   }
@@ -30,7 +32,7 @@ export class Regex implements Pattern {
     return this._name;
   }
 
-  get regex(): string{
+  get regex(): string {
     return this._originalRegexString;
   }
 
@@ -145,8 +147,9 @@ export class Regex implements Pattern {
   clone(name = this._name) {
     const clone = new Regex(name, this._originalRegexString);
     clone._tokens = this._tokens.slice();
-
     clone._id = this._id;
+    clone.shouldCompactAst = this.shouldCompactAst;
+    
     return clone;
   }
 

package/src/patterns/Repeat.ts

@@ -28,6 +28,8 @@ export class Repeat implements Pattern {
     private _options: InternalRepeatOptions;
     private _children: Pattern[];
 
+    shouldCompactAst = false;
+
     get id() {
         return this._id;
     }
@@ -76,6 +78,7 @@ export class Repeat implements Pattern {
             this._repeatPattern = new InfiniteRepeat(name, pattern, this._options);
         }
 
+        this._repeatPattern.shouldCompactAst = this.shouldCompactAst;
         this._children = [this._repeatPattern];
         this._repeatPattern.parent = this;
     }
@@ -97,6 +100,7 @@ export class Repeat implements Pattern {
         const clone = new Repeat(name, this._pattern, { ...this._options, min });
 
         clone._id = this._id;
+        clone.shouldCompactAst = this.shouldCompactAst;
         return clone;
     }
 

package/src/patterns/RightAssociatedPattern.ts

@@ -12,6 +12,8 @@ export class RightAssociatedPattern implements Pattern {
     private _parent: Pattern | null;
     private _children: Pattern[];
 
+    shouldCompactAst = false;
+
     get id(): string {
         return this._id;
     }

package/src/patterns/Sequence.ts

@@ -19,6 +19,8 @@ export class Sequence implements Pattern {
   private _nodes: (Node | null)[];
   private _firstIndex: number;
 
+  shouldCompactAst = false;
+
   get id(): string {
     return this._id;
   }
@@ -100,6 +102,10 @@ export class Sequence implements Pattern {
 
       if (node !== null) {
         cursor.recordMatch(this, node);
+
+        if (this.shouldCompactAst) {
+          node.compact();
+        }
       }
 
       return node;
@@ -323,6 +329,7 @@ export class Sequence implements Pattern {
   clone(name = this._name): Pattern {
     const clone = new Sequence(name, this._children);
     clone._id = this._id;
+    clone.shouldCompactAst = this.shouldCompactAst;
 
     return clone;
   }