Merge pull request #184 from schultek/fix/seri-eq

fix serialization equality
schultek · Apr 2, 2024 · 2014308 · 2014308
2 parents a7b5978 + e58ba2a
commit 2014308
Show file tree

Hide file tree

Showing 57 changed files with 1,474 additions and 574 deletions.
diff --git a/examples/fic_mappable/lib/main.mapper.dart b/examples/fic_mappable/lib/main.mapper.dart
@@ -63,9 +63,7 @@ mixin AMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            AMapper.ensureInitialized().isValueEqual(this as A, other));
+    return AMapper.ensureInitialized().equalsValue(this as A, other);
   }
 
   @override
@@ -158,9 +156,7 @@ mixin BMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            BMapper.ensureInitialized().isValueEqual(this as B, other));
+    return BMapper.ensureInitialized().equalsValue(this as B, other);
   }
 
   @override

diff --git a/examples/package_comparison/lib/comparisons/basic.mapper.dart b/examples/package_comparison/lib/comparisons/basic.mapper.dart
@@ -64,10 +64,8 @@ mixin PersonCMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            PersonCMapper.ensureInitialized()
-                .isValueEqual(this as PersonC, other));
+    return PersonCMapper.ensureInitialized()
+        .equalsValue(this as PersonC, other);
   }
 
   @override

diff --git a/examples/package_comparison/lib/comparisons/generic.mapper.dart b/examples/package_comparison/lib/comparisons/generic.mapper.dart
@@ -66,10 +66,7 @@ mixin BoxCMappable<T> {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            BoxCMapper.ensureInitialized()
-                .isValueEqual(this as BoxC<T>, other));
+    return BoxCMapper.ensureInitialized().equalsValue(this as BoxC<T>, other);
   }
 
   @override
@@ -166,10 +163,8 @@ mixin ContentCMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            ContentCMapper.ensureInitialized()
-                .isValueEqual(this as ContentC, other));
+    return ContentCMapper.ensureInitialized()
+        .equalsValue(this as ContentC, other);
   }
 
   @override

diff --git a/examples/package_comparison/lib/comparisons/polymorph.mapper.dart b/examples/package_comparison/lib/comparisons/polymorph.mapper.dart
@@ -126,9 +126,7 @@ mixin CatBMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            CatBMapper.ensureInitialized().isValueEqual(this as CatB, other));
+    return CatBMapper.ensureInitialized().equalsValue(this as CatB, other);
   }
 
   @override
@@ -234,9 +232,7 @@ mixin DogBMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            DogBMapper.ensureInitialized().isValueEqual(this as DogB, other));
+    return DogBMapper.ensureInitialized().equalsValue(this as DogB, other);
   }
 
   @override

diff --git a/examples/package_comparison/lib/comparisons/renaming.mapper.dart b/examples/package_comparison/lib/comparisons/renaming.mapper.dart
@@ -70,10 +70,8 @@ mixin PersonBMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            PersonBMapper.ensureInitialized()
-                .isValueEqual(this as PersonB, other));
+    return PersonBMapper.ensureInitialized()
+        .equalsValue(this as PersonB, other);
   }
 
   @override

diff --git a/examples/polymorph_copywith/lib/models/cat.mapper.dart b/examples/polymorph_copywith/lib/models/cat.mapper.dart
@@ -127,9 +127,7 @@ mixin CatMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            CatMapper.ensureInitialized().isValueEqual(this as Cat, other));
+    return CatMapper.ensureInitialized().equalsValue(this as Cat, other);
   }
 
   @override

diff --git a/examples/polymorph_copywith/lib/models/dog.mapper.dart b/examples/polymorph_copywith/lib/models/dog.mapper.dart
@@ -77,9 +77,7 @@ mixin DogMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            DogMapper.ensureInitialized().isValueEqual(this as Dog, other));
+    return DogMapper.ensureInitialized().equalsValue(this as Dog, other);
   }
 
   @override

diff --git a/examples/polymorph_copywith/lib/models/person.mapper.dart b/examples/polymorph_copywith/lib/models/person.mapper.dart
@@ -62,10 +62,7 @@ mixin PersonMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            PersonMapper.ensureInitialized()
-                .isValueEqual(this as Person, other));
+    return PersonMapper.ensureInitialized().equalsValue(this as Person, other);
   }
 
   @override

diff --git a/examples/polymorph_copywith/lib/models/zoo.mapper.dart b/examples/polymorph_copywith/lib/models/zoo.mapper.dart
@@ -67,9 +67,7 @@ mixin ZooMappable<T extends Animal> {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            ZooMapper.ensureInitialized().isValueEqual(this as Zoo<T>, other));
+    return ZooMapper.ensureInitialized().equalsValue(this as Zoo<T>, other);
   }
 
   @override

diff --git a/packages/dart_mappable/example/lib/main.mapper.dart b/packages/dart_mappable/example/lib/main.mapper.dart
@@ -121,10 +121,7 @@ mixin PersonMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            PersonMapper.ensureInitialized()
-                .isValueEqual(this as Person, other));
+    return PersonMapper.ensureInitialized().equalsValue(this as Person, other);
   }
 
   @override
@@ -230,9 +227,7 @@ mixin CarMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            CarMapper.ensureInitialized().isValueEqual(this as Car, other));
+    return CarMapper.ensureInitialized().equalsValue(this as Car, other);
   }
 
   @override
@@ -333,9 +328,7 @@ mixin BoxMappable<T> {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            BoxMapper.ensureInitialized().isValueEqual(this as Box<T>, other));
+    return BoxMapper.ensureInitialized().equalsValue(this as Box<T>, other);
   }
 
   @override
@@ -431,10 +424,8 @@ mixin ConfettiMappable {
 
   @override
   bool operator ==(Object other) {
-    return identical(this, other) ||
-        (runtimeType == other.runtimeType &&
-            ConfettiMapper.ensureInitialized()
-                .isValueEqual(this as Confetti, other));
+    return ConfettiMapper.ensureInitialized()
+        .equalsValue(this as Confetti, other);
   }
 
   @override

diff --git a/packages/dart_mappable/lib/dart_mappable.dart b/packages/dart_mappable/lib/dart_mappable.dart
@@ -13,7 +13,6 @@ export 'src/hooks/string_hooks.dart';
 export 'src/hooks/unmapped_properties_hook.dart';
 export 'src/mapper_container.dart';
 export 'src/mapper_exception.dart';
-export 'src/mapper_utils.dart' show MapperUtils;
 export 'src/mappers/class_mapper.dart';
 export 'src/mappers/default_mappers.dart';
 export 'src/mappers/interface_mapper.dart';

diff --git a/packages/dart_mappable/lib/src/mapper_container.dart b/packages/dart_mappable/lib/src/mapper_container.dart
@@ -429,7 +429,7 @@ class _MapperContainerBase implements MapperContainer, TypeProvider {
     }
     var mapper = _mapperFor(value);
     if (mapper != null) {
-      return mapper.isValueEqual(value, other, this);
+      return mapper.equalsValue(value, other, this);
     } else {
       return value == other;
     }

diff --git a/packages/dart_mappable/lib/src/mapper_utils.dart b/packages/dart_mappable/lib/src/mapper_utils.dart
@@ -1,9 +1,6 @@
-import 'package:type_plus/type_plus.dart';
-
 import 'annotations.dart';
 import 'mapper_container.dart';
 import 'mapper_exception.dart';
-import 'mappers/mapper_base.dart';
 import 'mappers/mapping_context.dart';
 
 /// {@nodoc}
@@ -19,14 +16,12 @@ extension DecodingUtil on DecodingContext {
         value = hook.beforeDecode(value);
       }
 
-      if (value is! T) {
-        if (value != null) {
-          value = container.fromValue<T>(value, options);
-        } else {
-          throw MapperException.missingParameter(key);
-        }
+      if (value == null && value is! T) {
+        throw MapperException.missingParameter(key);
       }
 
+      value = container.fromValue<T>(value, options);
+
       if (hook != null) {
         value = hook.afterDecode(value);
       }
@@ -78,67 +73,3 @@ extension TypeCheck<T> on T {
     }
   }
 }
-
-extension MapperUtils<T extends Object> on MapperBase<T> {
-  bool isValueEqual(T? value, Object? other, [MapperContainer? container]) {
-    if (value == null) {
-      return other == null;
-    }
-    try {
-      if (!isFor(other)) return false;
-      var context = MappingContext(
-        container: container,
-        args: () => value.runtimeType.args
-            .map((t) => t == UnresolvedType ? dynamic : t)
-            .toList(),
-      );
-      return equals(value, other as T, context);
-    } catch (e, stacktrace) {
-      Error.throwWithStackTrace(
-        MapperException.chain(MapperMethod.equals, '[$value]', e),
-        stacktrace,
-      );
-    }
-  }
-
-  int hashValue(T? value, [MapperContainer? container]) {
-    if (value == null) {
-      return value.hashCode;
-    }
-    try {
-      var context = MappingContext(
-        container: container,
-        args: () => value.runtimeType.args
-            .map((t) => t == UnresolvedType ? dynamic : t)
-            .toList(),
-      );
-      return hash(value, context);
-    } catch (e, stacktrace) {
-      Error.throwWithStackTrace(
-        MapperException.chain(MapperMethod.hash, '[$value]', e),
-        stacktrace,
-      );
-    }
-  }
-
-  String stringifyValue(T? value, [MapperContainer? container]) {
-    if (value == null) {
-      return value.toString();
-    }
-    try {
-      var context = MappingContext(
-        container: container,
-        args: () => value.runtimeType.args
-            .map((t) => t == UnresolvedType ? dynamic : t)
-            .toList(),
-      );
-      return stringify(value, context);
-    } catch (e, stacktrace) {
-      Error.throwWithStackTrace(
-        MapperException.chain(MapperMethod.stringify,
-            '(Instance of \'${value.runtimeType}\')', e),
-        stacktrace,
-      );
-    }
-  }
-}
diff --git a/packages/dart_mappable/lib/src/mappers/class_mapper.dart b/packages/dart_mappable/lib/src/mappers/class_mapper.dart
@@ -224,6 +224,9 @@ abstract class ClassMapperBase<T extends Object>
 
   @override
   bool equals(T value, T other, MappingContext context) {
+    if (value.runtimeType.base != other.runtimeType.base) {
+      return false;
+    }
     return _members.every((f) {
       return context.container.isEqual(f.get(value), f.get(other));
     });