strong mode fixes

Author: kevmoo

.analysis_options

@@ -0,0 +1,3 @@
+analyzer:
+# Not enabling this yet – need a fix in Mockito
+# strong-mode: true

example/example.dart

@@ -42,7 +42,7 @@ class Item {
 
   Item();
 
-  factory Item.fromJson(Map<String, Object> json) => _$ItemFromJson(json);
+  factory Item.fromJson(json) => _$ItemFromJson(json);
 }
 
 @JsonLiteral('data.json')

example/example.g.dart

@@ -34,11 +34,11 @@ class JsonSerializableGenerator
 
     // Get all of the fields that need to be assigned
     // TODO: support overriding the field set with an annotation option
-    var fields =
-        classElement.fields.fold(<String, FieldElement>{}, (map, field) {
+    var fields = classElement.fields.fold(<String, FieldElement>{},
+        (Map<String, FieldElement> map, field) {
       map[field.name] = field;
       return map;
-    }) as Map<String, FieldElement>;
+    });
 
     // Get the constructor to use for the factory
 
@@ -231,7 +231,7 @@ String _writeAccessToVar(String varExpression, DartType searchType,
 
     var itemVal = "v$depth";
 
-    var output = "$varExpression?.map(($itemVal) =>"
+    var output = "($varExpression as List)?.map(($itemVal) =>"
         "${_writeAccessToVar(itemVal, iterableGenericType, depth: depth+1)}"
         ")";
 
@@ -268,7 +268,8 @@ DartType _getIterableGenericType(InterfaceTypeImpl type) {
 
 bool _implementsDartList(DartType type) => _typeTest(type, _isDartList) != null;
 
-DartType _typeTest(DartType type, bool tester(DartType)) {
+ParameterizedType _typeTest(
+    ParameterizedType type, bool tester(ParameterizedType type)) {
   if (tester(type)) return type;
 
   if (type is InterfaceType) {

lib/generators/json_serializable_generator.dart

@@ -30,8 +30,10 @@ dynamic instantiateAnnotation(ElementAnnotationImpl annotation) {
   var element = annotation.element;
 
   if (element is PropertyAccessorElementImpl) {
-    var initializer = element.variable.computeNode().initializer
-        as InstanceCreationExpression;
+    var initializer = ((element as PropertyAccessorElementImpl)
+            .variable
+            .computeNode() as VariableDeclaration)
+        .initializer as InstanceCreationExpression;
     element = initializer.staticElement;
   }
 
@@ -145,7 +147,7 @@ dynamic _createFromConstructor(
       // field assigned in the object. Then we can take the field value and
       // set it as the argument value
       var initializer = ctor.constantInitializers.singleWhere((ci) {
-        var expression = ci.expression;
+        var expression = (ci as ConstructorFieldInitializer).expression;
         if (expression is SimpleIdentifier) {
           return expression.name == paramName;
         }

lib/src/annotation.dart

@@ -88,10 +88,10 @@ void main() {
   });
 }
 
-void _roundTripObject(object, factory(json)) {
+void _roundTripObject(object, factory(Map<String, dynamic> json)) {
   var json = _loudEncode(object);
 
-  var person2 = factory(JSON.decode(json));
+  var person2 = factory(JSON.decode(json) as Map<String, dynamic>);
 
   expect(person2, equals(object));
 

test/json_serializable_integration_test.dart

@@ -18,7 +18,7 @@ class Person extends Object with _$PersonSerializerMixin {
 
   Person(this.firstName, this.lastName, {this.middleName, this.dateOfBirth});
 
-  factory Person.fromJson(json) => _$PersonFromJson(json);
+  factory Person.fromJson(Map json) => _$PersonFromJson(json);
 
   bool operator ==(other) =>
       other is Person &&
@@ -34,7 +34,7 @@ class Order extends Object with _$OrderSerializerMixin {
   bool isRushed;
   final UnmodifiableListView<Item> items;
 
-  int get price => items.fold(0, (item, total) => item.price + total);
+  int get price => items.fold(0, (total, item) => item.price + total);
 
   Order([Iterable<Item> items])
       : this.items = new UnmodifiableListView<Item>(
@@ -57,7 +57,7 @@ class Item extends Object with _$ItemSerializerMixin {
 
   Item([this.price]);
 
-  factory Item.fromJson(Map<String, Object> json) => _$ItemFromJson(json);
+  factory Item.fromJson(json) => _$ItemFromJson(json);
 
   bool operator ==(other) =>
       other is Item &&