@canvasengine/compiler 2.0.0-beta.18 → 2.0.0-beta.19

package/grammar.pegjs

@@ -298,9 +298,17 @@ ifCondition "if condition"
     }
 
 tagName "tag name"
-  = segments:([a-zA-Z][a-zA-Z0-9]* ("." [a-zA-Z][a-zA-Z0-9]*)*) { 
-    return text();
-  }
+  = tagExpression
+
+tagExpression "tag expression"
+  = first:tagPart rest:("." tagPart)* {
+      return text();
+    }
+
+tagPart "tag part"
+  = name:[a-zA-Z][a-zA-Z0-9]* args:("(" functionArgs? ")")? {
+      return text();
+    }
 
 attributeName "attribute name"
   = [a-zA-Z][a-zA-Z0-9-]* { return text(); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canvasengine/compiler",
-  "version": "2.0.0-beta.18",
+  "version": "2.0.0-beta.19",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/compiler.spec.ts

@@ -51,11 +51,49 @@ describe("Compiler", () => {
     expect(output).toBe(`h(Canvas)`);
   });
 
-  test("should compile component with dot notation", () => {
-    const input = `<MyComp.test />`;
-    const output = parser.parse(input);
-    expect(output).toBe(`h(MyComp.test)`);
-  });
+  describe("Dot notation", () => {
+    test("should compile component with dot notation", () => {
+      const input = `<MyComp.test />`;
+      const output = parser.parse(input);
+      expect(output).toBe(`h(MyComp.test)`);
+    });
+  
+    test("object function call", () => {
+      const input = `<MyComp.test() />`;
+      const output = parser.parse(input);
+      expect(output).toBe(`h(MyComp.test())`);
+    });
+  
+    test("function call with return object", () => {
+      const input = `<MyComp().test />`;
+      const output = parser.parse(input);
+      expect(output).toBe(`h(MyComp().test)`);
+    });
+
+    test("function call with return object and params", () => {
+      const input = `<MyComp().test(x, y) />`;
+      const output = parser.parse(input);
+      expect(output).toBe(`h(MyComp().test(x, y))`);
+    });
+
+    test("function call and params with return object and", () => {
+      const input = `<MyComp(x, y).test />`;
+      const output = parser.parse(input);
+      expect(output).toBe(`h(MyComp(x, y).test)`);
+    });
+  
+    test("function call", () => {
+      const input = `<MyComp() />`;
+      const output = parser.parse(input);
+      expect(output).toBe(`h(MyComp())`);
+    });
+  
+    test("function call and params", () => {
+      const input = `<MyComp(x, y) />`;
+      const output = parser.parse(input);
+      expect(output).toBe(`h(MyComp(x, y))`);
+    });
+  })
 
   test("should compile component with dynamic attribute", () => {
     const input = `<Canvas width={x} />`;