Merge pull request #11 from google/version-constraints-null-builders

Support @nullable for fields using builders. Fix constraints for source_gen.

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.4
+
+- Support @nullable for fields using builders.
+- Fix constraints for source_gen.
+
 ## 0.0.3
 
 - Allow static fields in value class.

built_value/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value
-version: 0.0.3
+version: 0.0.4
 description: >
   Value types with builders. This library is the runtime dependency.
 authors:

built_value_generator/lib/built_value_generator.dart

@@ -304,7 +304,7 @@ class BuiltValueGenerator extends Generator {
     result.writeln('void replace(${className} other) {');
     result.writeln((fieldNames.map((name) {
       return buildableFieldNames.contains(name)
-          ? 'super.$name = other.$name.toBuilder();'
+          ? 'super.$name = other.$name?.toBuilder();'
           : 'super.$name = other.$name;';
     })).join('\n'));
     result.writeln('}');
@@ -316,7 +316,7 @@ class BuiltValueGenerator extends Generator {
       final fieldName = field.displayName;
 
       return buildableFieldNames.contains(fieldName)
-          ? '$fieldName: $fieldName.build()'
+          ? '$fieldName: $fieldName?.build()'
           : '$fieldName: $fieldName';
     }).join(', '));
     result.write(');');

built_value_generator/pubspec.yaml

@@ -1,5 +1,5 @@
 name: built_value_generator
-version: 0.0.3
+version: 0.0.4
 description: >
   Value types with builders. This library is the dev dependency.
 authors:
@@ -12,8 +12,8 @@ environment:
 dependencies:
   analyzer: '>=0.26.1 <1.0.0'
   built_collection: '^1.0.0'
-  built_value: '^0.0.3'
-  source_gen: '>=0.4.3 <1.0.0'
+  built_value: '^0.0.4'
+  source_gen: '>=0.4.3 <0.5.0'
   quiver: '>=0.21.0 <0.22.0'
 
 dev_dependencies:

example/lib/value.dart

@@ -24,6 +24,7 @@ abstract class Value implements Built<Value, ValueBuilder> {
   @nullable Object get anObject;
   int get aDefaultInt;
   BuiltList<int> get listOfInt;
+  @nullable BuiltSet<String> get setOfString;
 
   int get youCanWriteDerivedGetters => anInt + aDefaultInt;
 
@@ -46,6 +47,7 @@ abstract class ValueBuilder implements Builder<Value, ValueBuilder> {
   @nullable Object anObject;
   int aDefaultInt = 7;
   ListBuilder<int> listOfInt = new ListBuilder<int>();
+  @nullable SetBuilder<String> setOfString;
 
   ValueBuilder._();
   factory ValueBuilder() = _$ValueBuilder;

example/pubspec.yaml

@@ -1,5 +1,5 @@
 name: example
-version: 0.0.3
+version: 0.0.4
 description: >
   Just an example, not for publishing.
 authors:
@@ -11,8 +11,10 @@ environment:
 
 dependencies:
   built_collection: '^1.0.0'
-  built_value: '^0.0.3'
+  built_value: '^0.0.4'
 
 dev_dependencies:
-  built_value_generator: '^0.0.3'
+#  built_value_generator: '^0.0.3'
+  built_value_generator:
+    path: ../built_value_generator
   test: any

example/test/value_test.dart

@@ -2,6 +2,7 @@
 // All rights reserved. Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+import 'package:built_collection/built_collection.dart';
 import 'package:example/value.dart';
 import 'package:test/test.dart';
 
@@ -71,6 +72,14 @@ void main() {
       expect(value.listOfInt, [1, 2, 3]);
     });
 
+    test('nullable builders can be updated', () {
+      final value = new Value((b) => b
+        ..anInt = 1
+        ..aString = 'two'
+        ..setOfString = new SetBuilder<String>(['1', '2', '3']));
+      expect(value.setOfString, ['1', '2', '3']);
+    });
+
     test('compares equal when equal', () {
       final value1 = new Value((b) => b
         ..anInt = 0
@@ -122,6 +131,7 @@ aString=
 anObject=null
 aDefaultInt=7
 listOfInt=[]
+setOfString=null
 }''');
     });
   });