unnamed builder + other named props

Author: waseemdev

package.json

@@ -3,7 +3,7 @@
 	"displayName": "XML Layout for Flutter",
 	"description": "XML Layout for Flutter. Brings Angular's style to Flutter!",
 	"publisher": "WaseemDev",
-	"version": "0.0.25",
+	"version": "0.0.26",
 	"icon": "images/logo.png",
 	"repository": {
 		"type": "github",

src/property-handlers/builder.test.ts

@@ -554,4 +554,30 @@ suite("Builder Tests", function () {
         const generated = generateWidget(xml);
         assertEqual(generated, expected);
     });
+    
+
+    test("builder without name, with other named properties (unnamed should become first)", function() {
+        const xml = `
+    <SliverChildBuilderDelegate childCount="4">
+      <builder data="index, item of ctrl.products" params="context, index" nocheck>
+          <Container />  
+      </builder>
+    </SliverChildBuilderDelegate>
+`;
+        
+        const expected = `
+        SliverChildBuilderDelegate(
+          (context, index) {
+            final item = ctrl.products == null || ctrl.products.length <= index || ctrl.products.length == 0 ? null : ctrl.products[index];
+            return Container(
+    
+            );
+          },
+          childCount: 4,
+        )
+`;
+
+        const generated = generateWidget(xml);
+        assertEqual(generated, expected);
+    });
 });

src/property-handlers/builder.ts

@@ -156,18 +156,32 @@ export class BuilderHandler extends CustomPropertyHandler {
         const originalWidget = widget.wrappedWidgets[0];
         const buildersData: any[] = tempData.buildersData;
         let code = '';
+        
+        // generate builders code (builder that have no names)
+        let codes = buildersData.filter(a => !a.builderName).map(data => this.generateBuilderCode(data, generateChildWidgetCode, tabsLevel));
+        code += codes.join(',\n');
+
+        if (codes.length) {
+            code += ',\n';
+        }
 
         // generate other user-defined properties
-        originalWidget.properties.sort(sortProperties)
+        let propCode = originalWidget.properties.sort(sortProperties)
             .filter(a => !a.skipGeneratingCode && ['children', 'builder'].indexOf(a.name) === -1)
-            .forEach(p => {
-                code += generatePropertyCode(originalWidget, p, tabsLevel) + `,\n`;
-            });
+            .map(p => {
+                return generatePropertyCode(originalWidget, p, tabsLevel);
+            })
+            .join(`,\n`);
+        code += propCode;
 
-        // generate builders code
-        let codes = buildersData.map(data => this.generateBuilderCode(data, generateChildWidgetCode, tabsLevel));
-        code += codes.join(',\n');
+        // generate builders code (builder that have names)
+        let codes2 = buildersData.filter(a => !!a.builderName).map(data => this.generateBuilderCode(data, generateChildWidgetCode, tabsLevel));
 
+        if (propCode.length && codes2.length) {
+            code += ',\n';
+        }
+        code += codes2.join(',\n');
+
         return code;
     }