add typedef for MappableFields

packages/dart_mappable/lib/src/mappers/interface_mapper.dart

@@ -100,14 +100,16 @@ class DecodingData<T extends Object> {
   V dec<V>(Field f) => f.decode(value, context);
 }
 
+typedef MappableFields<T extends Object> = Map<Symbol, Field<T, dynamic>>;
+
 /// The common mapper interface for class and record mappers.
 ///
 /// See also [ClassMapperBase] and [RecordMapper].
 abstract class InterfaceMapperBase<T extends Object> extends MapperBase<T> {
   const InterfaceMapperBase();
 
   /// The set of fields this interface defines.
-  Map<Symbol, Field<T, dynamic>> get fields;
+  MappableFields<T> get fields;
 
   /// Whether to ignore null values when encoding the fields of this interface.
   bool get ignoreNull => false;

packages/dart_mappable/test/copy_with/collection_copy_with_test.mapper.dart

@@ -28,7 +28,7 @@ class AMapper extends ClassMapperBase<A> {
       Field('items', _$items, arg: _arg$items);
 
   @override
-  final Map<Symbol, Field<A, dynamic>> fields = const {
+  final MappableFields<A> fields = const {
     #items: _f$items,
   };
 
@@ -133,7 +133,7 @@ class BMapper extends ClassMapperBase<B> {
       Field('items', _$items, arg: _arg$items);
 
   @override
-  final Map<Symbol, Field<B, dynamic>> fields = const {
+  final MappableFields<B> fields = const {
     #items: _f$items,
   };
 

packages/dart_mappable/test/copy_with/copy_with_data_test.mapper.dart

@@ -27,7 +27,7 @@ class AMapper extends ClassMapperBase<A> {
   static const Field<A, B> _f$b = Field('b', _$b);
 
   @override
-  final Map<Symbol, Field<A, dynamic>> fields = const {
+  final MappableFields<A> fields = const {
     #a: _f$a,
     #b: _f$b,
   };
@@ -129,7 +129,7 @@ class BMapper extends ClassMapperBase<B> {
   static const Field<B, int> _f$b = Field('b', _$b);
 
   @override
-  final Map<Symbol, Field<B, dynamic>> fields = const {
+  final MappableFields<B> fields = const {
     #a: _f$a,
     #b: _f$b,
   };

packages/dart_mappable/test/copy_with/copy_with_generic_poly_test.mapper.dart

@@ -29,7 +29,7 @@ class AMapper extends ClassMapperBase<A> {
   static const Field<A, C> _f$value = Field('value', _$value, arg: _arg$value);
 
   @override
-  final Map<Symbol, Field<A, dynamic>> fields = const {
+  final MappableFields<A> fields = const {
     #value: _f$value,
   };
 
@@ -130,7 +130,7 @@ class CMapper extends ClassMapperBase<C> {
   static const Field<C, String> _f$data = Field('data', _$data);
 
   @override
-  final Map<Symbol, Field<C, dynamic>> fields = const {
+  final MappableFields<C> fields = const {
     #data: _f$data,
   };
 
@@ -182,7 +182,7 @@ class BMapper extends ClassMapperBase<B> {
   static const Field<B, D> _f$value = Field('value', _$value);
 
   @override
-  final Map<Symbol, Field<B, dynamic>> fields = const {
+  final MappableFields<B> fields = const {
     #value: _f$value,
   };
 
@@ -284,7 +284,7 @@ class DMapper extends ClassMapperBase<D> {
   static const Field<D, String> _f$data = Field('data', _$data);
 
   @override
-  final Map<Symbol, Field<D, dynamic>> fields = const {
+  final MappableFields<D> fields = const {
     #data: _f$data,
   };
 

packages/dart_mappable/test/copy_with/copy_with_subtype_test.mapper.dart

@@ -26,7 +26,7 @@ class AnimalMapper extends ClassMapperBase<Animal> {
   static const Field<Animal, String> _f$name = Field('name', _$name);
 
   @override
-  final Map<Symbol, Field<Animal, dynamic>> fields = const {
+  final MappableFields<Animal> fields = const {
     #name: _f$name,
   };
 
@@ -70,7 +70,7 @@ class CatMapper extends SubClassMapperBase<Cat> {
   static const Field<Cat, String> _f$color = Field('color', _$color);
 
   @override
-  final Map<Symbol, Field<Cat, dynamic>> fields = const {
+  final MappableFields<Cat> fields = const {
     #name: _f$name,
     #color: _f$color,
   };
@@ -148,7 +148,7 @@ class DogMapper extends SubClassMapperBase<Dog> {
   static const Field<Dog, String> _f$name = Field('name', _$name);
 
   @override
-  final Map<Symbol, Field<Dog, dynamic>> fields = const {
+  final MappableFields<Dog> fields = const {
     #name: _f$name,
   };
 
@@ -224,7 +224,7 @@ class ZooMapper extends ClassMapperBase<Zoo> {
   static const Field<Zoo, Animal> _f$animal = Field('animal', _$animal);
 
   @override
-  final Map<Symbol, Field<Zoo, dynamic>> fields = const {
+  final MappableFields<Zoo> fields = const {
     #animal: _f$animal,
   };
 
@@ -295,7 +295,7 @@ class AMapper extends ClassMapperBase<A> {
   Function get typeFactory => <T>(f) => f<A<T>>();
 
   @override
-  final Map<Symbol, Field<A, dynamic>> fields = const {};
+  final MappableFields<A> fields = const {};
 
   static A<T> _instantiate<T>(DecodingData data) {
     return A();
@@ -387,7 +387,7 @@ class CMapper extends ClassMapperBase<C> {
   Function get typeFactory => <T>(f) => f<C<T>>();
 
   @override
-  final Map<Symbol, Field<C, dynamic>> fields = const {};
+  final MappableFields<C> fields = const {};
 
   static C<T> _instantiate<T>(DecodingData data) {
     return C();
@@ -483,7 +483,7 @@ class BMapper extends ClassMapperBase<B> {
   static const Field<B, A<dynamic>> _f$a = Field('a', _$a);
 
   @override
-  final Map<Symbol, Field<B, dynamic>> fields = const {
+  final MappableFields<B> fields = const {
     #list: _f$list,
     #a: _f$a,
   };

packages/dart_mappable/test/copy_with/copy_with_test.mapper.dart

@@ -27,7 +27,7 @@ class PersonMapper extends ClassMapperBase<Person> {
   static const Field<Person, Car> _f$car = Field('car', _$car);
 
   @override
-  final Map<Symbol, Field<Person, dynamic>> fields = const {
+  final MappableFields<Person> fields = const {
     #name: _f$name,
     #car: _f$car,
   };
@@ -132,7 +132,7 @@ class CarMapper extends ClassMapperBase<Car> {
   static const Field<Car, String> _f$model = Field('model', _$model);
 
   @override
-  final Map<Symbol, Field<Car, dynamic>> fields = const {
+  final MappableFields<Car> fields = const {
     #brand: _f$brand,
     #model: _f$model,
   };
@@ -233,7 +233,7 @@ class BrandMapper extends ClassMapperBase<Brand> {
   static const Field<Brand, dynamic> _f$name = Field('name', _$name);
 
   @override
-  final Map<Symbol, Field<Brand, dynamic>> fields = const {
+  final MappableFields<Brand> fields = const {
     #name: _f$name,
   };
 
@@ -334,7 +334,7 @@ class DealershipMapper extends ClassMapperBase<Dealership> {
       Field('salesRep', _$salesRep);
 
   @override
-  final Map<Symbol, Field<Dealership, dynamic>> fields = const {
+  final MappableFields<Dealership> fields = const {
     #cars: _f$cars,
     #salesRep: _f$salesRep,
   };
@@ -461,7 +461,7 @@ class ItemListMapper extends ClassMapperBase<ItemList> {
       Field('items', _$items, arg: _arg$items);
 
   @override
-  final Map<Symbol, Field<ItemList, dynamic>> fields = const {
+  final MappableFields<ItemList> fields = const {
     #items: _f$items,
   };
 
@@ -516,7 +516,7 @@ class BrandListMapper extends SubClassMapperBase<BrandList> {
       Field('items', _$items, key: 'brands');
 
   @override
-  final Map<Symbol, Field<BrandList, dynamic>> fields = const {
+  final MappableFields<BrandList> fields = const {
     #items: _f$items,
   };
 
@@ -645,7 +645,7 @@ class NamedItemListMapper extends SubClassMapperBase<NamedItemList> {
       Field('items', _$items, arg: _arg$items);
 
   @override
-  final Map<Symbol, Field<NamedItemList, dynamic>> fields = const {
+  final MappableFields<NamedItemList> fields = const {
     #name: _f$name,
     #items: _f$items,
   };
@@ -777,7 +777,7 @@ class KeyedItemListMapper extends SubClassMapperBase<KeyedItemList> {
       Field('items', _$items, arg: _arg$items);
 
   @override
-  final Map<Symbol, Field<KeyedItemList, dynamic>> fields = const {
+  final MappableFields<KeyedItemList> fields = const {
     #key: _f$key,
     #items: _f$items,
   };
@@ -914,7 +914,7 @@ class ComparableItemListMapper extends SubClassMapperBase<ComparableItemList> {
       Field('items', _$items, arg: _arg$items);
 
   @override
-  final Map<Symbol, Field<ComparableItemList, dynamic>> fields = const {
+  final MappableFields<ComparableItemList> fields = const {
     #items: _f$items,
   };
 

packages/dart_mappable/test/copy_with/interface_copy_with.mapper.dart

@@ -25,7 +25,7 @@ class AMapper extends ClassMapperBase<A> {
   static const Field<A, num> _f$a = Field('a', _$a);
 
   @override
-  final Map<Symbol, Field<A, dynamic>> fields = const {
+  final MappableFields<A> fields = const {
     #a: _f$a,
   };
 
@@ -120,7 +120,7 @@ class BMapper extends ClassMapperBase<B> {
   static const Field<B, String> _f$b = Field('b', _$b);
 
   @override
-  final Map<Symbol, Field<B, dynamic>> fields = const {
+  final MappableFields<B> fields = const {
     #b: _f$b,
   };
 
@@ -217,7 +217,7 @@ class CMapper extends ClassMapperBase<C> {
   static const Field<C, String> _f$b = Field('b', _$b);
 
   @override
-  final Map<Symbol, Field<C, dynamic>> fields = const {
+  final MappableFields<C> fields = const {
     #a: _f$a,
     #b: _f$b,
   };

packages/dart_mappable/test/copy_with/retype_copy_with.mapper.dart

@@ -28,7 +28,7 @@ class AMapper extends ClassMapperBase<A> {
   static const Field<A, V> _f$v2 = Field('v2', _$v2);
 
   @override
-  final Map<Symbol, Field<A, dynamic>> fields = const {
+  final MappableFields<A> fields = const {
     #v: _f$v,
     #v2: _f$v2,
   };
@@ -132,7 +132,7 @@ class VMapper extends ClassMapperBase<V> {
   static const Field<V, int> _f$v = Field('v', _$v);
 
   @override
-  final Map<Symbol, Field<V, dynamic>> fields = const {
+  final MappableFields<V> fields = const {
     #v: _f$v,
   };
 
@@ -232,7 +232,7 @@ class BMapper extends ClassMapperBase<B> {
   static const Field<B, W> _f$v2 = Field('v2', _$v2, arg: _arg$v2);
 
   @override
-  final Map<Symbol, Field<B, dynamic>> fields = const {
+  final MappableFields<B> fields = const {
     #v: _f$v,
     #v2: _f$v2,
   };
@@ -341,7 +341,7 @@ class WMapper extends ClassMapperBase<W> {
   static const Field<W, int> _f$v = Field('v', _$v);
 
   @override
-  final Map<Symbol, Field<W, dynamic>> fields = const {
+  final MappableFields<W> fields = const {
     #v: _f$v,
   };
 

packages/dart_mappable/test/core/equality_test.mapper.dart

@@ -25,7 +25,7 @@ class SetWrapperMapper extends ClassMapperBase<SetWrapper> {
       Field('values', _$values);
 
   @override
-  final Map<Symbol, Field<SetWrapper, dynamic>> fields = const {
+  final MappableFields<SetWrapper> fields = const {
     #values: _f$values,
   };
 
@@ -130,7 +130,7 @@ class ListWrapperMapper extends ClassMapperBase<ListWrapper> {
       Field('values', _$values);
 
   @override
-  final Map<Symbol, Field<ListWrapper, dynamic>> fields = const {
+  final MappableFields<ListWrapper> fields = const {
     #values: _f$values,
   };
 
@@ -240,7 +240,7 @@ class MapWrapperMapper extends ClassMapperBase<MapWrapper> {
       Field('values', _$values);
 
   @override
-  final Map<Symbol, Field<MapWrapper, dynamic>> fields = const {
+  final MappableFields<MapWrapper> fields = const {
     #values: _f$values,
   };
 

packages/dart_mappable/test/custom_mapper/custom_mapper_test.mapper.dart

@@ -28,7 +28,7 @@ class TestObjMapper extends ClassMapperBase<TestObj> {
       Field('unmappedProps', _$unmappedProps);
 
   @override
-  final Map<Symbol, Field<TestObj, dynamic>> fields = const {
+  final MappableFields<TestObj> fields = const {
     #x: _f$x,
     #unmappedProps: _f$unmappedProps,
   };

packages/dart_mappable/test/enums/enum_map_test.mapper.dart

@@ -76,7 +76,7 @@ class ClassAMapper extends ClassMapperBase<ClassA> {
       Field('someVariable', _$someVariable);
 
   @override
-  final Map<Symbol, Field<ClassA, dynamic>> fields = const {
+  final MappableFields<ClassA> fields = const {
     #someVariable: _f$someVariable,
   };
 

packages/dart_mappable/test/external_types/external_types_test.mapper.dart

@@ -25,7 +25,7 @@ class PersonMapper extends ClassMapperBase<Person> {
       Field('firstName', _$firstName, key: 'first_name');
 
   @override
-  final Map<Symbol, Field<Person, dynamic>> fields = const {
+  final MappableFields<Person> fields = const {
     #firstName: _f$firstName,
   };
 
@@ -122,7 +122,7 @@ class CakeMapper extends ClassMapperBase<f.Cake> {
   static const Field<f.Cake, String> _f$type = Field('type', _$type);
 
   @override
-  final Map<Symbol, Field<f.Cake, dynamic>> fields = const {
+  final MappableFields<f.Cake> fields = const {
     #type: _f$type,
   };
 
@@ -202,7 +202,7 @@ class Person2Mapper extends ClassMapperBase<m.Person> {
       Field('firstName', _$firstName, key: 'first_name');
 
   @override
-  final Map<Symbol, Field<m.Person, dynamic>> fields = const {
+  final MappableFields<m.Person> fields = const {
     #firstName: _f$firstName,
   };
 
@@ -286,7 +286,7 @@ class AnimalMapper extends ClassMapperBase<o.Animal> {
   static const Field<o.Animal, String> _f$color = Field('color', _$color);
 
   @override
-  final Map<Symbol, Field<o.Animal, dynamic>> fields = const {
+  final MappableFields<o.Animal> fields = const {
     #color: _f$color,
   };
 
@@ -345,7 +345,7 @@ class PetMapper extends SubClassMapperBase<o.Pet> {
   static const Field<o.Pet, String> _f$color = Field('color', _$color);
 
   @override
-  final Map<Symbol, Field<o.Pet, dynamic>> fields = const {
+  final MappableFields<o.Pet> fields = const {
     #owner: _f$owner,
     #color: _f$color,
   };

packages/dart_mappable/test/external_types/unknown_interface.mapper.dart

@@ -71,7 +71,7 @@ class DSOpacityDataMapper extends ClassMapperBase<DSOpacityData> {
       Field('fallback', _$fallback, opt: true, def: 0.0);
 
   @override
-  final Map<Symbol, Field<DSOpacityData, dynamic>> fields = const {
+  final MappableFields<DSOpacityData> fields = const {
     #data: _f$data,
     #fallback: _f$fallback,
   };