Improve the output of the nullable enum encode logic (#204)

Author: kevmoo

json_serializable/lib/src/type_helpers/enum_helper.dart

@@ -19,8 +19,10 @@ class EnumHelper extends TypeHelper {
       return null;
     }
 
-    return commonNullPrefix(
-        context.nullable, expression, "$expression.toString().split('.')[1]");
+    var nullableLiteral = context.nullable ? '?' : '';
+
+    return '$expression$nullableLiteral.toString()'
+        "$nullableLiteral.split('.')$nullableLiteral.last";
   }
 
   @override

json_serializable/test/default_value/default_value.checked.g.dart

@@ -75,7 +75,6 @@ abstract class _$DefaultValueSerializerMixin {
         'fieldListSimple': fieldListSimple,
         'fieldMapSimple': fieldMapSimple,
         'fieldMapListString': fieldMapListString,
-        'fieldEnum':
-            fieldEnum == null ? null : fieldEnum.toString().split('.')[1]
+        'fieldEnum': fieldEnum?.toString()?.split('.')?.last
       };
 }

json_serializable/test/default_value/default_value.g.dart

@@ -56,7 +56,6 @@ abstract class _$DefaultValueSerializerMixin {
         'fieldListSimple': fieldListSimple,
         'fieldMapSimple': fieldMapSimple,
         'fieldMapListString': fieldMapListString,
-        'fieldEnum':
-            fieldEnum == null ? null : fieldEnum.toString().split('.')[1]
+        'fieldEnum': fieldEnum?.toString()?.split('.')?.last
       };
 }

json_serializable/test/test_files/json_test_example.g.dart

@@ -37,10 +37,10 @@ abstract class _$PersonSerializerMixin {
         'middleName': middleName,
         'lastName': lastName,
         'dateOfBirth': dateOfBirth?.toIso8601String(),
-        r'$house': house == null ? null : house.toString().split('.')[1],
+        r'$house': house?.toString()?.split('.')?.last,
         'order': order,
-        'houseMap': houseMap?.map((k, e) =>
-            new MapEntry(k, e == null ? null : e.toString().split('.')[1]))
+        'houseMap': houseMap
+            ?.map((k, e) => new MapEntry(k, e?.toString()?.split('.')?.last))
       };
 }
 
@@ -66,7 +66,7 @@ abstract class _$OrderSerializerMixin {
   Map<String, dynamic> toJson() => <String, dynamic>{
         'count': count,
         'isRushed': isRushed,
-        'category': category.toString().split('.')[1],
+        'category': category.toString().split('.').last,
         'items': items,
         'platform': platform,
         'altPlatforms': altPlatforms

json_serializable/test/test_files/json_test_example.non_nullable.g.dart

@@ -33,10 +33,10 @@ abstract class _$PersonSerializerMixin {
         'middleName': middleName,
         'lastName': lastName,
         'dateOfBirth': dateOfBirth.toIso8601String(),
-        r'$house': house.toString().split('.')[1],
+        r'$house': house.toString().split('.').last,
         'order': order,
-        'houseMap':
-            houseMap.map((k, e) => new MapEntry(k, e.toString().split('.')[1]))
+        'houseMap': houseMap
+            .map((k, e) => new MapEntry(k, e.toString().split('.').last))
       };
 }
 
@@ -60,7 +60,7 @@ abstract class _$OrderSerializerMixin {
   Map<String, dynamic> toJson() => <String, dynamic>{
         'count': count,
         'isRushed': isRushed,
-        'category': category.toString().split('.')[1],
+        'category': category.toString().split('.').last,
         'items': items,
         'platform': platform,
         'altPlatforms': altPlatforms

json_serializable/test/test_files/json_test_example.non_nullable.wrapped.g.dart

@@ -59,12 +59,12 @@ class _$PersonJsonMapWrapper extends $JsonMapWrapper {
         case 'dateOfBirth':
           return _v.dateOfBirth.toIso8601String();
         case r'$house':
-          return _v.house.toString().split('.')[1];
+          return _v.house.toString().split('.').last;
         case 'order':
           return _v.order;
         case 'houseMap':
           return $wrapMap<String, House>(
-              _v.houseMap, (e) => e.toString().split('.')[1]);
+              _v.houseMap, (e) => e.toString().split('.').last);
       }
     }
     return null;
@@ -114,7 +114,7 @@ class _$OrderJsonMapWrapper extends $JsonMapWrapper {
         case 'isRushed':
           return _v.isRushed;
         case 'category':
-          return _v.category.toString().split('.')[1];
+          return _v.category.toString().split('.').last;
         case 'items':
           return _v.items;
         case 'platform':

json_serializable/test/test_files/json_test_example.wrapped.g.dart

@@ -63,12 +63,12 @@ class _$PersonJsonMapWrapper extends $JsonMapWrapper {
         case 'dateOfBirth':
           return _v.dateOfBirth?.toIso8601String();
         case r'$house':
-          return _v.house == null ? null : _v.house.toString().split('.')[1];
+          return _v.house?.toString()?.split('.')?.last;
         case 'order':
           return _v.order;
         case 'houseMap':
-          return $wrapMapHandleNull<String, House>(_v.houseMap,
-              (e) => e == null ? null : e.toString().split('.')[1]);
+          return $wrapMapHandleNull<String, House>(
+              _v.houseMap, (e) => e?.toString()?.split('.')?.last);
       }
     }
     return null;
@@ -120,7 +120,7 @@ class _$OrderJsonMapWrapper extends $JsonMapWrapper {
         case 'isRushed':
           return _v.isRushed;
         case 'category':
-          return _v.category.toString().split('.')[1];
+          return _v.category.toString().split('.').last;
         case 'items':
           return _v.items;
         case 'platform':

json_serializable/test/yaml/build_config.g.dart

@@ -83,10 +83,7 @@ abstract class _$BuilderSerializerMixin {
     writeNotNull('is_optional', isOptional);
     writeNotNull('auto_apply', autoApply == null ? null : _toJson(autoApply));
     writeNotNull(
-        'defaultEnumTest',
-        defaultEnumTest == null
-            ? null
-            : defaultEnumTest.toString().split('.')[1]);
+        'defaultEnumTest', defaultEnumTest?.toString()?.split('.')?.last);
     val['builder_factories'] = builderFactories;
     writeNotNull('applies_builders', appliesBuilders);
     writeNotNull('required_inputs', requiredInputs);