clarity-pattern-parser 9.2.3 → 9.2.5

package/package.json

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

package/src/ast/Node.test.ts

@@ -307,16 +307,12 @@ describe("Node", () => {
             type: "parent",
             name: "parent",
             value: "AB",
-            firstIndex: 0,
-            lastIndex: 0,
             startIndex: 0,
             endIndex: 1,
             children: [{
                 type: "a",
                 name: "a",
                 value: "A",
-                firstIndex: 0,
-                lastIndex: 0,
                 startIndex: 0,
                 endIndex: 1,
                 children: [],
@@ -324,8 +320,6 @@ describe("Node", () => {
                 type: "b",
                 name: "b",
                 value: "B",
-                firstIndex: 0,
-                lastIndex: 0,
                 startIndex: 0,
                 endIndex: 1,
                 children: [],

package/src/ast/Node.ts

@@ -1,8 +1,6 @@
 export interface CycleFreeNode {
   type: string;
   name: string;
-  firstIndex: number;
-  lastIndex: number;
   startIndex: number;
   endIndex: number;
   value: string;
@@ -269,12 +267,10 @@ export class Node {
       type: this._type,
       name: this._name,
       value: this.toString(),
-      firstIndex: this._firstIndex,
-      lastIndex: this._lastIndex,
       startIndex: this.startIndex,
       endIndex: this.endIndex,
       children: this._children.map(c => c.toCycleFreeObject()),
-    }
+    };
   }
 
   toJson(space?: number): string {

package/src/grammar/Grammar.test.ts

@@ -499,4 +499,15 @@ describe("Grammar", () => {
 
         expect(arePatternsEqual(patterns["complex-expression"], expected)).toBeTruthy();
     });
+
+    test("Grammar With Spaces", ()=>{
+        const expression = `
+        john = "John"
+            
+        jane = "Jane"
+        `;
+        const patterns = Grammar.parseString(expression);
+        expect(patterns.john).not.toBeNull(); 
+        expect(patterns.jane).not.toBeNull(); 
+    });
 });

package/src/grammar/patterns/body.ts

@@ -8,15 +8,14 @@ import { Optional } from "../../patterns/Optional";
 
 const bodyLineContent = new Options("body-line-content", [
     comment,
-    statement,
-    lineSpaces
+    statement
 ]);
 
 const optionalLineSpaces = new Optional("optional-line-spaces", lineSpaces);
 
 const bodyLine = new Sequence("body-line", [
     optionalLineSpaces,
-    bodyLineContent,
+    new Optional("optional-body-line-content", bodyLineContent),
     optionalLineSpaces,
 ]);
 

package/src/grammar/patterns.test.ts

@@ -28,7 +28,7 @@ describe("Patterns String Template Literal", ()=>{
         debugger;
         const result = body.exec(`
         <div>
-            <span></span>
+            <div></div>
             <div></div>    
         </div>
         `, true);