_type_info_key is back as a parameter

sestegra · May 21, 2016 · 3f287de · 3f287de
1 parent 93fb739
commit 3f287de
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/example/serializer_example.dart b/example/serializer_example.dart
@@ -30,8 +30,8 @@ class ModelC extends Serialize {
   ModelC([this.name, this.password, this.age]);
 }
 
-main() async {
-  await initSerializer();
+main() {
+  initSerializer(type_info_key: '@dart_type');
 
   ModelA a = new ModelA("toto", 15);
   ModelB b = new ModelB("Paris", "France");
@@ -44,6 +44,6 @@ main() async {
   print(Serializer.toJson(a));
   print(Serializer.toMap(a));
 
-  ModelA A = Serializer.fromJson(Serializer.toJson(a), ModelA);
+  ModelA A = Serializer.fromJson(Serializer.toJson(a));
   print(Serializer.toJson(A));
 }
diff --git a/lib/src/api.dart b/lib/src/api.dart
@@ -46,7 +46,8 @@ abstract class Serializer {
 /**
  * Init the Serializer by mapping every class annotated with @serializable
  */
-initSerializer() {
+initSerializer({String type_info_key}) {
+  _type_info_key = type_info_key;
   for (ClassMirror classMirror in serializable.annotatedClasses) {
     if (classMirror != null
         && classMirror.simpleName != null

diff --git a/lib/src/convert.dart b/lib/src/convert.dart
@@ -75,6 +75,10 @@ Object _fromMap(Map map, [Type type = Map, List<Type> mapOf]) {
     return null;
   }
 
+  if (_type_info_key != null && map.containsKey(_type_info_key)) {
+    type = _decodeType(map.remove(_type_info_key));
+  }
+
   // Only Map
   if (type == Map) {
     Type embedType = mapOf != null ? mapOf[1] : null;
@@ -179,6 +183,10 @@ Map _toMap(Object obj) {
   ClassMirror cm = mir.type;
   Map data = new Map();
 
+  if (_type_info_key != null) {
+    data[_type_info_key] = obj.runtimeType.toString();
+  }
+
   while (cm != null
       && cm.superclass != null
       && Serializer.classes.containsKey(cm.simpleName)) {

diff --git a/lib/src/serializer_base.dart b/lib/src/serializer_base.dart
@@ -11,6 +11,8 @@ import "package:reflectable/reflectable.dart";
 part "api.dart";
 part "convert.dart";
 
+String _type_info_key;
+
 class Serializable extends Reflectable {
   const Serializable()
       : super.fromList(const [