Cleanup (#189)

* rename test class to 'KitchenSink'
* JSON: rename helper function
* Remove single-use helper

Author: kevmoo

lib/generators/json_serializable_generator.dart

@@ -237,10 +237,10 @@ class JsonSerializableGenerator
       {ParameterElement ctorParam}) {
     name = _fieldToJsonMapKey(name, field);
     var result = "json['$name']";
-    return _writeAccessToVar(result, field.type, ctorParam: ctorParam);
+    return _writeAccessToJsonValue(result, field.type, ctorParam: ctorParam);
   }
 
-  String _writeAccessToVar(String varExpression, DartType searchType,
+  String _writeAccessToJsonValue(String varExpression, DartType searchType,
       {ParameterElement ctorParam, int depth: 0}) {
     if (ctorParam != null) {
       searchType = ctorParam.type as InterfaceType;
@@ -258,16 +258,16 @@ class JsonSerializableGenerator
           _getIterableGenericType(searchType as InterfaceType);
 
       var itemVal = "v$depth";
-      var itemSubVal =
-          _writeAccessToVar(itemVal, iterableGenericType, depth: depth + 1);
+      var itemSubVal = _writeAccessToJsonValue(itemVal, iterableGenericType,
+          depth: depth + 1);
 
       // If `itemSubVal` is the same, then we don't need to do anything fancy
       if (itemVal == itemSubVal) {
         return varExpression;
       }
 
       var output = "($varExpression as List)?.map(($itemVal) => "
-          "${_writeAccessToVar(itemVal, iterableGenericType, depth: depth+1)}"
+          "${_writeAccessToJsonValue(itemVal, iterableGenericType, depth: depth+1)}"
           ")";
 
       if (_coreListChecker.isAssignableFromType(searchType)) {
@@ -310,10 +310,10 @@ DartType _getImplementationType(DartType type, TypeChecker checker) {
   if (checker.isExactlyType(type)) return type;
 
   if (type is InterfaceType) {
-    var tests = [type.interfaces, type.mixins]
+    var match = [type.interfaces, type.mixins]
         .expand((e) => e)
-        .map((type) => _getImplementationType(type, checker));
-    var match = _firstNotNull(tests);
+        .map((type) => _getImplementationType(type, checker))
+        .firstWhere((value) => value != null, orElse: () => null);
 
     if (match != null) return match;
 
@@ -324,9 +324,6 @@ DartType _getImplementationType(DartType type, TypeChecker checker) {
   return null;
 }
 
-T _firstNotNull<T>(Iterable<T> values) =>
-    values.firstWhere((value) => value != null, orElse: () => null);
-
 final _coreIterableChecker = const TypeChecker.fromUrl('dart:core#Iterable');
 
 final _coreListChecker = const TypeChecker.fromUrl('dart:core#List');

pubspec.yaml

@@ -1,5 +1,5 @@
 name: source_gen
-version: 0.5.9
+version: 0.5.10-dev
 author: Dart Team <[email protected]>
 description: Automated source code generation for Dart.
 homepage: https://github.com/dart-lang/source_gen

test/test_files/json_test_example.dart

@@ -12,11 +12,11 @@ import 'package:source_gen/generators/json_serializable.dart';
 part 'json_test_example.g.dart';
 
 @JsonSerializable()
-class ListGenericTests extends Object with _$ListGenericTestsSerializerMixin {
-  ListGenericTests();
+class KitchenSink extends Object with _$KitchenSinkSerializerMixin {
+  KitchenSink();
 
-  factory ListGenericTests.fromJson(Map<String, Object> json) =>
-      _$ListGenericTestsFromJson(json);
+  factory KitchenSink.fromJson(Map<String, Object> json) =>
+      _$KitchenSinkFromJson(json);
 
   Iterable iterable;
   Iterable<dynamic> dynamicIterable;