Merge pull request #2 from davidmorgan/minor-fixes

Allow static fields in value class. Allow custom setters in builder.

Author: davidmorgan

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.3
+
+- Allow static fields in value class.
+- Allow custom setters in builder.
+
 ## 0.0.2
 
 - Fix error message for missing builder class.

built_value/pubspec.yaml

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

built_value_generator/lib/built_value_generator.dart

@@ -130,8 +130,9 @@ class BuiltValueGenerator extends Generator {
   List<FieldElement> getFields(ClassElement classElement) {
     final result = <FieldElement>[];
     for (final field in classElement.fields) {
-      if (!field.isStatic && field.getter.isAbstract ||
-          field.getter.isSynthetic) result.add(field);
+      if (!field.isStatic &&
+          (field.getter.isAbstract || field.getter.isSynthetic)) result
+          .add(field);
     }
     return result;
   }
@@ -142,7 +143,7 @@ class BuiltValueGenerator extends Generator {
       return result;
     }
     for (final field in classElement.fields) {
-      if (!field.isStatic) result.add(field);
+      if (!field.isStatic && field.getter != null) result.add(field);
     }
     return result;
   }

built_value_generator/pubspec.yaml

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

example/lib/compound_value.g.dart

@@ -15,12 +15,16 @@ part 'value.g.dart';
 /// fields declared as abstract getters. Finally, it must have a particular
 /// constructor and factory, as shown here.
 abstract class Value implements Built<Value, ValueBuilder> {
+  static final int youCanHaveStaticFields = 3;
+
   int get anInt;
   String get aString;
   @nullable Object get anObject;
   int get aDefaultInt;
   BuiltList<int> get listOfInt;
 
+  int get youCanWriteDerivedGetters => anInt + aDefaultInt;
+
   Value._();
   factory Value([updates(ValueBuilder b)]) = _$Value;
 }
@@ -41,4 +45,9 @@ abstract class ValueBuilder implements Builder<Value, ValueBuilder> {
 
   ValueBuilder._();
   factory ValueBuilder() = _$ValueBuilder;
+
+  set youCanWriteExtraSetters(int value) {
+    anInt = value;
+    aDefaultInt = value;
+  }
 }

example/lib/value.dart

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