Merge pull request Workiva#34 from davidmarne/fix_thunk_and_repatch_generic_generation

Fix thunk and repatch generic generation

Author: davidmarne

lib/generator.dart

@@ -39,9 +39,9 @@ String _generateActions(ClassElement element) {
   var initializerCode = '''
 class _\$${element.name} extends ${element.name}{
   factory _\$${element.name}() => new _\$${element.name}._();
-  
+
   _\$${element.name}._() : super._();
-  
+
   $defaultFunctionDeclaration;
 }''';
 
@@ -105,7 +105,44 @@ String _getActionDispatcherGenericType(FieldElement e) {
       typeArgument.typeArguments.every((ta) => ta.name == 'dynamic')) {
     return typeArgument.name;
   }
-  return '${typeArgument.name}<${typeArgument.typeArguments.join(',')}>';
+
+  final typeArguments =
+      typeArgument.typeArguments.map((ta) => ta.toString()).toList();
+
+  // hack for thunks/repatches or any other type argument list where
+  // any given argument is a Built and the proceding is a Builder
+  // and the builder is dynamic in the typeArguments list becauses it is
+  // yet to be generated. This is complex and a bit awkward but
+  // it is written this way to be very careful not to make any unintended
+  // changes the the typeArguments list.
+  final boundParams = typeArgument.typeParameters.map((e) => e.bound);
+  for (int i = 0; i < boundParams.length; i++) {
+    // get the bound param at this spot
+    final b = boundParams.elementAt(i);
+
+    // if it is a Built and there is another argument after it
+    // check if it is supposed to be a Builder
+    if (b != null &&
+        b.name.startsWith('Built') &&
+        i != boundParams.length - 1) {
+      final next = boundParams.elementAt(i + 1);
+      if (next != null &&
+          next.name.startsWith('Builder') &&
+          typeArguments.elementAt(i + 1) == 'dynamic') {
+        log.info(
+            "replacing unresolved builder name ${typeArguments.elementAt(i)}Builder");
+        // if it is a builder replace typeArguments at this location as
+        // the Built's name + Builder
+        typeArguments.replaceRange(
+          i + 1,
+          i + 2,
+          ['${typeArguments.elementAt(i)}Builder'],
+        );
+      }
+    }
+  }
+
+  return '${typeArgument.name}<${typeArguments.join(',')}>';
 }
 
 String _appendCode(String before, String newCode) =>

pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_redux
-version: 6.1.0
+version: 6.1.1
 description:
   A state management library written in dart that enforces immutability
 authors:

test/unit/redux_test.dart

@@ -208,8 +208,10 @@ main() {
 
     test('ActionDispatcher<SomeTypeDef>', () async {
       setup();
-      store.actions.foo((MiddlewareApi api) {
-        (api.actions as BaseCounterActions).incrementOne();
+      store.actions.thunkDispatcher(
+          (MiddlewareApi<BaseCounter, BaseCounterBuilder, BaseCounterActions>
+              api) {
+        api.actions.incrementOne();
       });
       var stateChange = await store.stream.first;
       expect(stateChange.prev.count, 1);

test/unit/test_counter.dart

@@ -10,15 +10,18 @@ part 'test_counter.g.dart';
 
 /// Used to test code generation when the generic type of an action is a
 /// `typedef`
-typedef dynamic FooTypedef(MiddlewareApi api);
+typedef dynamic ThunkTypedef<V extends Built<V, B>, B extends Builder<V, B>,
+    A extends ReduxActions>(MiddlewareApi<V, B, A> api);
 
 // BaseCounter
 
 abstract class BaseCounterActions extends ReduxActions {
   ActionDispatcher<int> increment;
   ActionDispatcher<int> decrement;
   ActionDispatcher<Null> incrementOne;
-  ActionDispatcher<FooTypedef> foo;
+  ActionDispatcher<
+          ThunkTypedef<BaseCounter, BaseCounterBuilder, BaseCounterActions>>
+      thunkDispatcher;
   ActionDispatcher<List<int>> genericAction1;
   ActionDispatcher<Map<String, List<int>>> genericAction2;
   ActionDispatcher<int> appendToNestedList;
@@ -86,7 +89,9 @@ abstract class NestedCounterActions extends ReduxActions {
   ActionDispatcher<int> increment;
   ActionDispatcher<int> decrement;
   ActionDispatcher<Null> incrementOne;
-  ActionDispatcher<FooTypedef> fooTypedef;
+  ActionDispatcher<
+          ThunkTypedef<BaseCounter, BaseCounterBuilder, BaseCounterActions>>
+      thunkDispatcher;
 
   NestedCounterActions._();
   factory NestedCounterActions() => new _$NestedCounterActions();
@@ -148,7 +153,7 @@ NextActionHandler fooTypedefMiddleware(
         MiddlewareApi<BaseCounter, BaseCounterBuilder, BaseCounterActions>
             api) =>
     (ActionHandler next) => (Action a) {
-          if (a.payload is FooTypedef) {
+          if (a.payload is ThunkTypedef) {
             a.payload(api);
           }