@canvasengine/compiler 2.0.0-beta.15 → 2.0.0-beta.16

package/grammar.pegjs

@@ -254,7 +254,7 @@ textElement
     }
 
 forLoop
-  = _ "@for" _ "(" _ variableName:(tupleDestructuring / identifier) _ "of" _ iterable:identifier _ ")" _ "{" _ content:content _ "}" _ {
+  = _ "@for" _ "(" _ variableName:(tupleDestructuring / identifier) _ "of" _ iterable:iterable _ ")" _ "{" _ content:content _ "}" _ {
       return `loop(${iterable}, ${variableName} => ${content})`;
     }
 
@@ -283,7 +283,23 @@ variableName
   = [a-zA-Z_][a-zA-Z0-9_]* { return text(); }
 
 iterable
-  = [a-zA-Z_][a-zA-Z0-9_]* { return text(); }
+  = id:identifier "(" _ args:functionArgs? _ ")" { // Direct function call
+      return `${id}(${args || ''})`;
+    }
+  / first:identifier "." rest:dotFunctionChain { // Dot notation possibly with function call
+      return `${first}.${rest}`;
+    }
+  / id:identifier { return id; }
+
+dotFunctionChain
+  = segment:identifier "(" _ args:functionArgs? _ ")" rest:("." dotFunctionChain)? {
+      const restStr = rest ? `.${rest[1]}` : '';
+      return `${segment}(${args || ''})${restStr}`;
+    }
+  / segment:identifier rest:("." dotFunctionChain)? {
+      const restStr = rest ? `.${rest[1]}` : '';
+      return `${segment}${restStr}`;
+    }
 
 condition
   = functionCall

package/package.json

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

package/tests/compiler.spec.ts

@@ -316,6 +316,66 @@ describe("Loop", () => {
     );
   });
 
+  test("should compile loop with object", () => {
+    const input = `
+        @for (sprite of sprites.items) {
+            <Sprite />
+        }
+    `;
+    const output = parser.parse(input);
+    expect(output.replace(/\s+/g, "")).toBe(
+      `loop(sprites.items,sprite=>h(Sprite))`.replace(/\s+/g, "")
+    );
+  });
+
+  test("should compile loop with deep object", () => {
+    const input = `
+        @for (sprite of sprites.items.items) {
+            <Sprite />
+        }
+    `;
+    const output = parser.parse(input);
+    expect(output.replace(/\s+/g, "")).toBe(
+      `loop(sprites.items.items,sprite=>h(Sprite))`.replace(/\s+/g, "")
+    );
+  });
+
+  test("should compile loop with function", () => {
+    const input = `
+        @for (sprite of sprites()) {
+            <Sprite />
+        }
+    `;
+    const output = parser.parse(input);
+    expect(output.replace(/\s+/g, "")).toBe(
+      `loop(sprites(),sprite=>h(Sprite))`.replace(/\s+/g, "")
+    );
+  });
+
+  test("should compile loop with function and params", () => {
+    const input = `
+        @for (sprite of sprites(x, y)) {
+            <Sprite />
+        }
+    `;
+    const output = parser.parse(input);
+    expect(output.replace(/\s+/g, "")).toBe(
+      `loop(sprites(x,y),sprite=>h(Sprite))`.replace(/\s+/g, "")
+    );
+  });
+
+  test("should compile loop with object and function and params", () => {
+    const input = `
+        @for (sprite of sprites.items(x, y)) {
+            <Sprite />
+        }
+    `;
+    const output = parser.parse(input);
+    expect(output.replace(/\s+/g, "")).toBe(
+      `loop(sprites.items(x,y),sprite=>h(Sprite))`.replace(/\s+/g, "")
+    );
+  });
+
   test("should compile loop with destructuring", () => {
     const input = `
         @for ((sprite, index) of sprites) {