Fix serialization when built_value builder is fully generated.

Author: davidmorgan

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.3
+
+- Fix serialization when built_value builder is fully generated.
+
 ## 0.1.2
 
 - Fix issue with BuiltMap deserialization.

built_json/pubspec.yaml

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

built_json_generator/lib/src/source_field.dart

@@ -5,11 +5,20 @@
 library built_json_generator.source_field;
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:built_value/built_value.dart';
 
 part 'source_field.g.dart';
 
+BuiltSet<String> _builtCollectionNames = new BuiltSet<String>([
+  'BuiltList',
+  'BuiltListMultimap',
+  'BuiltMap',
+  'BuiltSet',
+  'BuiltSetMultimap',
+]);
+
 abstract class SourceField implements Built<SourceField, SourceFieldBuilder> {
   static final BuiltMap<String, String> typesWithBuilder =
       new BuiltMap<String, String>({
@@ -43,8 +52,13 @@ abstract class SourceField implements Built<SourceField, SourceFieldBuilder> {
           (metadata) => metadata.constantValue.toStringValue() == 'nullable');
       result.name = fieldElement.displayName;
       result.type = fieldElement.getter.returnType.displayName;
-      result.builderFieldUsesNestedBuilder = builderFieldElement != null &&
-          fieldElement.getter.returnType.displayName !=
+
+      // If the builder is present, check it to determine whether a nested
+      // builder is needed. Otherwise, use the same logic as built_value when
+      // it decides whether to use a nested builder.
+      result.builderFieldUsesNestedBuilder = builderFieldElement == null
+          ? _needsNestedBuilder(fieldElement.getter.returnType)
+          : fieldElement.getter.returnType.displayName !=
               builderFieldElement.getter.returnType.displayName;
     }
 
@@ -87,6 +101,25 @@ abstract class SourceField implements Built<SourceField, SourceFieldBuilder> {
             .substring(genericsStart + 1)
             .substring(0, name.length - genericsStart - 2);
   }
+
+  // These three methods are copied from built_value to match the behaviour
+  // when a builder is not explicitly defined.
+  // TODO(davidmorgan): dedupe.
+  static bool _needsNestedBuilder(DartType type) {
+    return _isBuiltValue(type) || _isBuiltCollection(type);
+  }
+
+  static bool _isBuiltValue(DartType type) {
+    if (type.element is! ClassElement) return false;
+    return (type.element as ClassElement)
+        .allSupertypes
+        .any((interfaceType) => interfaceType.name == 'Built');
+  }
+
+  static bool _isBuiltCollection(DartType type) {
+    return _builtCollectionNames
+        .any((name) => type.displayName.startsWith('${name}<'));
+  }
 }
 
 abstract class SourceFieldBuilder

built_json_generator/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_json_generator
-version: 0.1.2
+version: 0.1.3
 description: >
   JSON serialization for Built Collections, Built Values and Enum Classes.
   This library is the dev dependency.
@@ -14,7 +14,9 @@ dependencies:
   analyzer: '>=0.27.1 <0.28.0'
   build: '^0.3.0'
   built_collection: '^1.0.1'
-  built_json: '^0.1.2'
+  #built_json: '^0.1.3'
+  built_json:
+    path: ../built_json
   source_gen: '>=0.5.0 <0.6.0'
   quiver: '>=0.21.0 <0.22.0'
 

example/lib/collections.g.dart

@@ -29,14 +29,3 @@ abstract class CompoundValue
   CompoundValue._();
   factory CompoundValue([updates(CompoundValueBuilder b)]) = _$CompoundValue;
 }
-
-/// Builder class for [CompoundValue].
-abstract class CompoundValueBuilder
-    implements Builder<CompoundValue, CompoundValueBuilder> {
-  ValueBuilder aValue = new ValueBuilder();
-  HasInt aHasInt;
-  TestEnum aTestEnum;
-
-  CompoundValueBuilder._();
-  factory CompoundValueBuilder() = _$CompoundValueBuilder;
-}

example/lib/compound_value.dart

@@ -25,29 +25,8 @@ abstract class Value implements Built<Value, ValueBuilder>, HasInt {
   String get aString;
   @nullable String get anotherString;
   @nullable Object get anObject;
-  int get aDefaultInt;
   BuiltList<int> get listOfInt;
 
-  int get youCanWriteDerivedGetters => anInt + aDefaultInt;
-
   Value._();
   factory Value([updates(ValueBuilder b)]) = _$Value;
 }
-
-/// Builder class for [Value].
-abstract class ValueBuilder implements Builder<Value, ValueBuilder> {
-  int anInt;
-  String aString;
-  @nullable String anotherString;
-  @nullable Object anObject;
-  int aDefaultInt = 7;
-  ListBuilder<int> listOfInt = new ListBuilder<int>();
-
-  ValueBuilder._();
-  factory ValueBuilder() = _$ValueBuilder;
-
-  set youCanWriteExtraSetters(int value) {
-    anInt = value;
-    aDefaultInt = value;
-  }
-}