Mustachio: Add support for Iterable types in Property, some fixes (#2447)

Author: srawlins

lib/src/generator/templates.renderers.dart

@@ -23,7 +23,7 @@ abstract class RendererBase<T> {
   /// Returns the [Property] on this renderer named [name].
   ///
   /// If no property named [name] exists for this renderer, `null` is returned.
-  Property getProperty(String key);
+  Property<T> getProperty(String key);
 
   /// Resolves [names] into one or more field accesses, returning the result as
   /// a String.
@@ -97,10 +97,20 @@ class Property<T> {
   /// object [context].
   final bool /*!*/ Function(T context) /*?*/ getBool;
 
-  // TODO(srawlins): Add functions for rendering Iterable properties and other
-  // properties.
+  final bool /*!*/ Function(T) /*?*/ isEmptyIterable;
 
-  Property({@required this.getValue, this.getProperties, this.getBool});
+  final String /*!*/ Function(
+          T, RendererBase<T>, List<MustachioNode> /*!*/) /*?*/
+      renderIterable;
+
+  // TODO(srawlins): Add functions for rendering other properties.
+
+  Property(
+      {@required this.getValue,
+      this.getProperties,
+      this.getBool,
+      this.isEmptyIterable,
+      this.renderIterable});
 }
 
 /// An error indicating that a renderer failed to resolve a key.

lib/src/mustachio/renderer_base.dart

@@ -77,6 +77,7 @@ abstract class FooBase {
 class Foo extends FooBase {
   String s1 = "s1";
   bool b1 = false;
+  List<int> l1 = [1, 2, 3];
 }
 class Bar {}
 ''');
@@ -119,29 +120,50 @@ class Bar {}
     });
 
     test('with a property map', () {
-      expect(generatedContent,
-          contains('static Map<String, Property> propertyMap() => {'));
+      expect(
+          generatedContent,
+          contains(
+              'static Map<String, Property<CT_>> propertyMap<CT_ extends Foo>() => {'));
     });
 
     test('with a property map with a String property', () {
       expect(generatedContent, contains('''
         's1': Property(
-          getValue: (Object c) => (c as Foo).s1,
+          getValue: (CT_ c) => c.s1,
           getProperties: _Renderer_String.propertyMap,
         ),
 '''));
     });
 
     test('with a property map which references the superclass', () {
-      expect(generatedContent, contains('..._Renderer_FooBase.propertyMap(),'));
+      expect(generatedContent,
+          contains('..._Renderer_FooBase.propertyMap<CT_>(),'));
     });
 
     test('with a property map with a bool property', () {
       expect(generatedContent, contains('''
         'b1': Property(
-          getValue: (Object c) => (c as Foo).b1,
+          getValue: (CT_ c) => c.b1,
           getProperties: _Renderer_bool.propertyMap,
-          getBool: (Object c) => (c as Foo).b1 == true,
+          getBool: (CT_ c) => c.b1 == true,
+        ),
+'''));
+    });
+
+    test('with a property map with an Iterable property', () {
+      expect(generatedContent, contains('''
+        'l1': Property(
+          getValue: (CT_ c) => c.l1,
+          getProperties: _Renderer_List.propertyMap,
+          isEmptyIterable: (CT_ c) => c.l1?.isEmpty ?? true,
+          renderIterable:
+              (CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
+            var buffer = StringBuffer();
+            for (var e in c.l1) {
+              buffer.write(_render_int(e, ast, parent: r));
+            }
+            return buffer.toString();
+          },
         ),
 '''));
     });
@@ -202,15 +224,15 @@ import 'package:mustachio/annotations.dart';
     test(
         'with a property map which references the superclass with a type '
         'variable', () {
-      expect(
-          generatedContent, contains('..._Renderer_FooBase.propertyMap<T>(),'));
+      expect(generatedContent,
+          contains('..._Renderer_FooBase.propertyMap<T, CT_>(),'));
     });
 
     test(
         'with a property map which references the superclass with an interface '
         'type', () {
       expect(generatedContent,
-          contains('..._Renderer_BarBase.propertyMap<int>(),'));
+          contains('..._Renderer_BarBase.propertyMap<int, CT_>(),'));
     });
   });
 

test/mustachio/builder_test.dart

@@ -4,6 +4,7 @@ library dartdoc.testing.foo;
 import 'package:dartdoc/src/mustachio/annotations.dart';
 
 class Foo {
-  String s1 = 's1';
-  bool b1 = true;
+  String s1;
+  bool b1;
+  List<int> l1;
 }