Merge pull request #24 from davidmorgan/fix-null-serialization

Fix serialization of null @nullable fields: omit them entirely.

Author: davidmorgan

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.0.6
+
+- Fix serialization of null @nullable fields: omit them entirely.
+
 ## 0.0.5
 
 - Add PrimitiveSerializer and StructuredSerializer interfaces.

built_json/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_json
-version: 0.0.5
+version: 0.0.6
 description: >
   JSON serialization for Built Collections, Built Values and Enum Classes.
   This library is the runtime dependency.

built_json_generator/lib/src/source_class.dart

@@ -84,7 +84,9 @@ class _\$${name}Serializer implements StructuredSerializer<$name> {
   @override
   Iterable serialize(Serializers serializers, $name object,
       {FullType specifiedType: FullType.unspecified}) {
-    return [${_generateFieldSerializers()}];
+    final result = [${_generateRequiredFieldSerializers()}];
+    ${_generateNullableFieldSerializers()}
+    return result;
   }
 
   @override
@@ -137,14 +139,27 @@ class _\$${name}Serializer implements PrimitiveSerializer<$name> {
     }
   }
 
-  String _generateFieldSerializers() {
+  String _generateRequiredFieldSerializers() {
     return fields
+        .where((field) => !field.isNullable)
         .map((field) => "'${field.name}', "
             "serializers.serialize(object.${field.name}, "
             "specifiedType: ${field.generateFullType()}),")
         .join('');
   }
 
+  String _generateNullableFieldSerializers() {
+    return fields
+        .where((field) => field.isNullable)
+        .map((field) => '''
+    if (object.${field.name} != null) {
+      result.add('${field.name}');
+      result.add(serializers.serialize(
+          object.${field.name}, specifiedType: ${field.generateFullType()}));
+    }
+''').join('');
+  }
+
   String _generateFieldDeserializers() {
     return fields.map((field) {
       if (field.builderFieldUsesNestedBuilder) {

built_json_generator/lib/src/source_class.g.dart

@@ -19,6 +19,7 @@ abstract class SourceField implements Built<SourceField, SourceFieldBuilder> {
   });
 
   bool get isSerializable;
+  bool get isNullable;
   String get name;
   String get type;
   bool get builderFieldUsesNestedBuilder;
@@ -38,6 +39,9 @@ abstract class SourceField implements Built<SourceField, SourceFieldBuilder> {
     result.isSerializable = isSerializable;
 
     if (isSerializable) {
+      result.isNullable =
+          fieldElement.getter.metadata.any((metadata) => metadata.constantValue
+              .toStringValue() == 'nullable');
       result.name = fieldElement.displayName;
       result.type = fieldElement.getter.returnType.displayName;
       result.builderFieldUsesNestedBuilder = builderFieldElement != null &&
@@ -97,6 +101,7 @@ abstract class SourceField implements Built<SourceField, SourceFieldBuilder> {
 abstract class SourceFieldBuilder
     implements Builder<SourceField, SourceFieldBuilder> {
   bool isSerializable;
+  bool isNullable = false;
   String name = '';
   String type = '';
   bool builderFieldUsesNestedBuilder = false;

built_json_generator/lib/src/source_field.dart

@@ -1,5 +1,5 @@
 name: built_json_generator
-version: 0.0.5
+version: 0.0.6
 description: >
   JSON serialization for Built Collections, Built Values and Enum Classes.
   This library is the dev dependency.
@@ -13,7 +13,7 @@ environment:
 dependencies:
   analyzer: '>=0.27.1 <0.28.0'
   built_collection: '^1.0.1'
-  built_json: '^0.0.5'
+  built_json: '^0.0.6'
   source_gen: '>=0.4.3 <0.5.0'
   quiver: '>=0.21.0 <0.22.0'