Merge pull request #314 from davidmorgan/fix-polymorphism

Fix serialization when using polymorphism with StandardJsonPlugin.

Author: davidmorgan

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.5.3
+
+- Fix serialization when using polymorphism with StandardJsonPlugin.
+
 ## 4.5.2
 
 - Allow built_collection 3.0.0.

benchmark/pubspec.yaml

@@ -12,12 +12,16 @@ environment:
 dependencies:
   browser: any
   built_collection: '>=2.0.0 <4.0.0'
-  built_value: ^4.5.2
+# built_value: ^4.5.2
+  built_value:
+    path: ../built_value
 
 dev_dependencies:
   build: ^0.11.1
   build_runner: ^0.6.0
-  built_value_generator: ^4.5.2
+# built_value_generator: ^4.5.2
+  built_value_generator:
+    path: ../built_value_generator
   source_gen: ^0.7.0
   quiver: '>=0.21.0 <0.28.0'
   test: any

built_value/lib/src/built_json_serializers.dart

@@ -99,14 +99,15 @@ class BuiltJsonSerializers implements Serializers {
       transformedObject =
           plugin.beforeDeserialize(transformedObject, specifiedType);
     }
-    var result = _deserialize(transformedObject, specifiedType);
+    var result = _deserialize(object, transformedObject, specifiedType);
     for (final plugin in _plugins) {
       result = plugin.afterDeserialize(result, specifiedType);
     }
     return result;
   }
 
-  Object _deserialize(Object object, FullType specifiedType) {
+  Object _deserialize(
+      Object objectBeforePlugins, Object object, FullType specifiedType) {
     if (specifiedType.isUnspecified) {
       final String wireName = (object as List).first as String;
 
@@ -128,7 +129,7 @@ class BuiltJsonSerializers implements Serializers {
       if (serializer == null) {
         if (object is List && object.first is String) {
           // Might be an interface; try resolving using the type on the wire.
-          return deserialize(object);
+          return deserialize(objectBeforePlugins);
         } else {
           throw new StateError("No serializer for '${specifiedType.root}'.");
         }

built_value_generator/pubspec.yaml

@@ -14,7 +14,9 @@ dependencies:
   analyzer: '>=0.29.0 <0.31.0'
   build: ^0.11.1
   built_collection: '>=2.0.0 <4.0.0'
-  built_value: ^4.5.2
+# built_value: ^4.5.2
+  built_value:
+    path: ../built_value
   source_gen: ^0.7.0
   quiver: '>=0.21.0 <0.28.0'
 

built_value_test/pubspec.yaml

@@ -11,7 +11,9 @@ environment:
   sdk: '>=1.8.0 <2.0.0'
 
 dependencies:
-  built_value: ^4.5.2
+# built_value: ^4.5.2
+  built_value:
+    path: ../built_value
   built_collection: '>=2.0.0 <4.0.0'
   collection: ^1.0.0
   quiver: '>=0.21.0 <0.28.0'
@@ -20,5 +22,7 @@ dependencies:
 dev_dependencies:
   build: ^0.11.1
   build_runner: ^0.6.0
-  built_value_generator: ^4.5.2
+# built_value_generator: ^4.5.2
+  built_value_generator:
+    path: ../built_value_generator
   source_gen: ^0.7.0

chat_example/pubspec.yaml

@@ -12,7 +12,9 @@ environment:
 dependencies:
   browser: ^0.10.0
   built_collection: '>=2.0.0 <4.0.0'
-  built_value: ^4.5.2
+# built_value: ^4.5.2
+  built_value:
+    path: ../built_value
   shelf: ^0.6.0
   shelf_proxy: ^0.1.0
   shelf_web_socket: ^0.2.1
@@ -21,6 +23,8 @@ dependencies:
 dev_dependencies:
   build: ^0.11.1
   build_runner: ^0.6.0
-  built_value_generator: ^4.5.2
+# built_value_generator: ^4.5.2
+  built_value_generator:
+    path: ../built_value_generator
   source_gen: ^0.7.0
   test: any

end_to_end_test/lib/polymorphism.dart

@@ -1,5 +1,6 @@
 library polymorphism;
 
+import 'package:built_collection/built_collection.dart';
 import 'package:built_value/built_value.dart';
 import 'package:built_value/serializer.dart';
 
@@ -59,7 +60,10 @@ abstract class Swimmer {
 }
 
 abstract class Cage implements Built<Cage, CageBuilder> {
+  static Serializer<Cage> get serializer => _$cageSerializer;
+
   Animal get inhabitant;
+  BuiltList<Animal> get otherInhabitants;
 
   factory Cage([updates(CageBuilder b)]) = _$Cage;
   Cage._();

end_to_end_test/lib/polymorphism.g.dart

@@ -21,12 +21,14 @@ part 'serializers.g.dart';
 @SerializersFor(const [
   BoundGenericValue,
   Cat,
+  Cage,
   CollectionGenericValue,
   Collections,
   CompoundValue,
   CompoundValueNoNesting,
   EnumWithInt,
   FieldDiscoveryValue,
+  Fish,
   GenericContainer,
   GenericValue,
   HasDouble,