Mustachio: Fix multi-name keys and other bugs encountered so far. (#2452)

Mustachio: Fix multi-name keys and other bugs encountered so far.

Author: srawlins

lib/src/generator/templates.renderers.dart

@@ -37,24 +37,21 @@ abstract class RendererBase<T> {
     }
     var property = getProperty(names.first);
     if (property != null) {
-      var value = property.getValue(context);
-      for (var name in names.skip(1)) {
-        if (property.getProperties().containsKey(name)) {
-          property = property.getProperties()[name];
-          value = property.getValue(value);
-        } else {
-          throw MustachioResolutionError(
-              'Failed to resolve ${names.join('.')} as a property '
-              'on ${context.runtimeType}');
-        }
+      try {
+        return property.renderVariable(context, property, [...names.skip(1)]);
+      } on MustachioResolutionError {
+        // The error thrown by [Property.renderVariable] does not have all of
+        // the names required for a decent error. We throw a new error here.
+        throw MustachioResolutionError(
+            'Failed to resolve $names as a property chain on any types in the '
+            'current context');
       }
-      return value.toString();
     } else if (parent != null) {
       return parent.getFields(names);
     } else {
       throw MustachioResolutionError(
-          'Failed to resolve ${names.first} as a property '
-          'on any types in the current context');
+          'Failed to resolve ${names.first} as a property on any types in the '
+          'current context');
     }
   }
 
@@ -126,9 +123,8 @@ class Property<T> {
   /// Gets the value of this property on the object [context].
   final Object /*?*/ Function(T context) /*!*/ getValue;
 
-  /// Gets the property map of the type of this property.
-  final Map<String /*!*/, Property<Object> /*!*/ >
-      Function() /*?*/ getProperties;
+  final String /*!*/ Function(
+      T, Property<T>, List<String> /*!*/) /*?*/ renderVariable;
 
   /// Gets the bool value (true or false, never null) of this property on the
   /// object [context].
@@ -145,11 +141,9 @@ class Property<T> {
   final String /*!*/ Function(
       T, RendererBase<T>, List<MustachioNode> /*!*/) /*?*/ renderValue;
 
-  // TODO(srawlins): Add functions for rendering other properties.
-
   Property(
       {@required this.getValue,
-      this.getProperties,
+      this.renderVariable,
       this.getBool,
       this.isEmptyIterable,
       this.renderIterable,
@@ -161,5 +155,5 @@ class Property<T> {
 class MustachioResolutionError extends Error {
   String message;
 
-  MustachioResolutionError(this.message);
+  MustachioResolutionError([this.message]);
 }

lib/src/mustachio/renderer_base.dart

@@ -135,7 +135,18 @@ class Bar {}
       expect(generatedContent, contains('''
         'b1': Property(
           getValue: (CT_ c) => c.b1,
-          getProperties: _Renderer_bool.propertyMap,
+          renderVariable:
+              (CT_ c, Property<CT_> self, List<String> remainingNames) {
+            if (remainingNames.isEmpty) return self.getValue(c).toString();
+            var name = remainingNames.first;
+            if (_Renderer_bool.propertyMap().containsKey(name)) {
+              var nextProperty = _Renderer_bool.propertyMap()[name];
+              return nextProperty.renderVariable(
+                  self.getValue(c), nextProperty, [...remainingNames.skip(1)]);
+            } else {
+              throw MustachioResolutionError();
+            }
+          },
           getBool: (CT_ c) => c.b1 == true,
         ),
 '''));
@@ -145,7 +156,18 @@ class Bar {}
       expect(generatedContent, contains('''
         'l1': Property(
           getValue: (CT_ c) => c.l1,
-          getProperties: _Renderer_List.propertyMap,
+          renderVariable:
+              (CT_ c, Property<CT_> self, List<String> remainingNames) {
+            if (remainingNames.isEmpty) return self.getValue(c).toString();
+            var name = remainingNames.first;
+            if (_Renderer_List.propertyMap().containsKey(name)) {
+              var nextProperty = _Renderer_List.propertyMap()[name];
+              return nextProperty.renderVariable(
+                  self.getValue(c), nextProperty, [...remainingNames.skip(1)]);
+            } else {
+              throw MustachioResolutionError();
+            }
+          },
           isEmptyIterable: (CT_ c) => c.l1?.isEmpty ?? true,
           renderIterable:
               (CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
@@ -163,7 +185,18 @@ class Bar {}
       expect(generatedContent, contains('''
         's1': Property(
           getValue: (CT_ c) => c.s1,
-          getProperties: _Renderer_String.propertyMap,
+          renderVariable:
+              (CT_ c, Property<CT_> self, List<String> remainingNames) {
+            if (remainingNames.isEmpty) return self.getValue(c).toString();
+            var name = remainingNames.first;
+            if (_Renderer_String.propertyMap().containsKey(name)) {
+              var nextProperty = _Renderer_String.propertyMap()[name];
+              return nextProperty.renderVariable(
+                  self.getValue(c), nextProperty, [...remainingNames.skip(1)]);
+            } else {
+              throw MustachioResolutionError();
+            }
+          },
           isNullValue: (CT_ c) => c.s1 == null,
           renderValue: (CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
             return _render_String(c.s1, ast, parent: r);

test/mustachio/builder_test.dart

@@ -1,4 +1,5 @@
 @Renderer(#renderFoo, Context<Foo>())
+@Renderer(#renderBar, Context<Bar>())
 library dartdoc.testing.foo;
 
 import 'package:dartdoc/src/mustachio/annotations.dart';
@@ -8,3 +9,8 @@ class Foo {
   bool b1;
   List<int> l1;
 }
+
+class Bar {
+  Foo foo;
+  String s2;
+}