clarity-pattern-parser 9.2.1 → 9.2.3

package/package.json

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

package/src/grammar/Grammar.test.ts

@@ -380,7 +380,9 @@ describe("Grammar", () => {
         `;
         const expression = `
         import { first-name } from "first-name.cpat"
-        import { space } from "space.cpat" with params { custom-space = "  " }
+        import { space } from "space.cpat" with params {
+          custom-space = "  "
+        }
         last-name = "Doe"
         full-name = first-name + space + last-name
         `;

package/src/grammar/Grammar.ts

@@ -131,13 +131,15 @@ export class Grammar {
     }
 
     private _buildPatterns(ast: Node) {
-        const body = ast.find(n => n.name === "body");
+        const body = ast.find(n => n.name === "body" && n.findAncester(n => n.name === "head") == null);
 
         if (body == null) {
             return;
         }
 
-        body.findAll(n => n.name === "assign-statement").forEach((n) => {
+        const statements = body.findAll(n => n.name === "assign-statement");
+
+        statements.forEach((n) => {
             const patternNode = n.children.find(n => patternNodes[n.name] != null);
 
             if (patternNode == null) {
@@ -449,7 +451,7 @@ export class Grammar {
         const paramsStatement = importStatement.find(n => n.name === "with-params-statement");
 
         if (paramsStatement != null) {
-            const statements = paramsStatement.find(n => n.name === "with-params-body");
+            const statements = paramsStatement.find(n => n.name === "body");
 
             if (statements != null) {
                 const expression = statements.toString();

package/src/grammar/patterns/body.ts

@@ -8,7 +8,8 @@ import { Optional } from "../../patterns/Optional";
 
 const bodyLineContent = new Options("body-line-content", [
     comment,
-    statement
+    statement,
+    lineSpaces
 ]);
 
 const optionalLineSpaces = new Optional("optional-line-spaces", lineSpaces);
@@ -19,4 +20,4 @@ const bodyLine = new Sequence("body-line", [
     optionalLineSpaces,
 ]);
 
-export const body = new Optional("optional-body", new Repeat("body", bodyLine, {divider: newLine}));
+export const body = new Optional("optional-body", new Repeat("body", bodyLine, { divider: newLine }));

package/src/grammar/patterns/import.ts

@@ -47,7 +47,7 @@ const withParamsStatement = new Optional("optional-with-params-statement", new S
     optionalLineSpaces,
     openBracket,
     optionalSpaces,
-    body.clone("with-params-body"),
+    body,
     optionalSpaces,
     closeBracket
 ]));

package/src/grammar/patterns.test.ts

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

package/src/patterns/Options.test.ts

@@ -43,7 +43,7 @@ describe("Options", () => {
         cursor.next();
 
         result = a.parse(cursor);
-        expected = new Node("or", "a-b", 0, 0, [
+        expected = new Node("options", "a-b", 0, 0, [
             new Node("literal", "b", 0, 0, [], "B")
         ], "B");
     });
@@ -76,7 +76,7 @@ describe("Options", () => {
     test("Properties", () => {
         const a = new Options("a", [new Literal("a", "A")]);
 
-        expect(a.type).toBe("or");
+        expect(a.type).toBe("options");
         expect(a.name).toBe("a");
         expect(a.parent).toBeNull();
         expect(a.children[0].name).toBe("a");

package/src/patterns/Options.ts

@@ -48,8 +48,8 @@ export class Options implements Pattern {
     const children = clonePatterns(options);
     this._assignChildrenToParent(children);
 
-    this._id = `or-${idIndex++}`;
-    this._type = "or";
+    this._id = `options-${idIndex++}`;
+    this._type = "options";
     this._name = name;
     this._parent = null;
     this._children = children;