Merge pull request #224 from davidmorgan/really-support-mixins

Pick up field declarations from mixins

Author: davidmorgan

CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## 4.0.1 (unreleased)
+## 4.1.0 (unreleased)
 
 - Improved annotation handling for corner cases.
+- Pick up field declarations from mixins as well as interfaces.
 
 ## 4.0.0
 

built_value_generator/lib/src/fields.dart

@@ -4,6 +4,7 @@
 
 import 'dart:collection';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:built_collection/built_collection.dart';
 
 /// Gets fields, including from interfaces.
@@ -15,8 +16,10 @@ BuiltList<FieldElement> collectFields(ClassElement element) {
   // Add fields from this class before interfaces, so they're added to the set
   // first below. Re-added fields from interfaces are ignored.
   fields.addAll(element.fields);
-  element.interfaces
-      .forEach((interface) => fields.addAll(collectFields(interface.element)));
+
+  new Set<InterfaceType>.from(element.interfaces)
+    ..addAll(element.mixins)
+    ..forEach((interface) => fields.addAll(collectFields(interface.element)));
 
 // Overridden fields have multiple declarations, so deduplicate by adding
 // to a set that compares on field name.

end_to_end_test/lib/polymorphism.dart

@@ -36,6 +36,16 @@ abstract class Fish extends Object
   Fish._();
 }
 
+// Fields should come via mixins with no need for interfaces.
+abstract class Robot extends Object
+    with Swimmer, Walker
+    implements Built<Robot, RobotBuilder> {
+  static Serializer<Robot> get serializer => _$robotSerializer;
+
+  factory Robot([updates(RobotBuilder b)]) = _$Robot;
+  Robot._();
+}
+
 abstract class Walker {
   int get legs;
 

end_to_end_test/lib/polymorphism.g.dart

@@ -33,6 +33,7 @@ part 'serializers.g.dart';
   NamedFactoryValue,
   NestedGenericContainer,
   PrimitivesValue,
+  Robot,
   SecondTestEnum,
   SimpleValue,
   StandardJsonValue,

end_to_end_test/lib/serializers.dart

@@ -29,6 +29,27 @@ void main() {
     });
   });
 
+  group('Robot', () {
+    final data = new Robot((b) => b
+      ..legs = 4
+      ..fins = 3);
+    final serialized = [
+      'Robot',
+      'fins',
+      3,
+      'legs',
+      4,
+    ];
+
+    test('can be serialized', () {
+      expect(serializers.serialize(data), serialized);
+    });
+
+    test('can be deserialized', () {
+      expect(serializers.deserialize(serialized), data);
+    });
+  });
+
   group('HasField', () {
     final data = new BuiltList<HasField<dynamic>>([
       new HasString((b) => b..field = 'hello'),

end_to_end_test/lib/serializers.g.dart

@@ -46,6 +46,30 @@ void main() {
     });
   });
 
+  group('Robot', () {
+    test('can be instantiated', () {
+      new Robot((b) => b
+        ..legs = 0
+        ..fins = 2);
+    });
+
+    test('has method from mixin', () {
+      expect(
+          new Robot((b) => b
+            ..legs = 0
+            ..fins = 2).canWalk,
+          false);
+    });
+
+    test('has method from second mixin', () {
+      expect(
+          new Robot((b) => b
+            ..legs = 0
+            ..fins = 2).canSwim,
+          true);
+    });
+  });
+
   group('Animal', () {
     test('can be used as an interface, including builder', () {
       final animals = [