Release 2.2.14

mapper/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.14
+
+* bump dependencies to latest
+* Fix #227 Deserializing error: Unable to instantiate class. Improved error message
+
 ## 2.2.13
 
 * bump dependencies to latest

mapper/example/example.mapper.g.dart

@@ -1,4 +1,4 @@
-// This file has been generated by the dart_json_mapper v2.2.10
+// This file has been generated by the dart_json_mapper v2.2.14
 // https://github.com/k-paxian/dart-json-mapper
 // @dart = 2.12
 import 'example.dart' as x0 show Car, Person, Color;
@@ -7,7 +7,6 @@ import 'package:dart_json_mapper/src/identifier_casing.dart' as x2 show CaseStyl
 import 'package:dart_json_mapper/src/model/index.dart' as x1 show ConversionDirection;
 // This file has been generated by the reflectable package.
 // https://github.com/dart-lang/reflectable.
-
 import 'dart:core';
 import 'example.dart' as prefix1;
 import 'package:dart_json_mapper/src/model/annotations.dart' as prefix0;

mapper/lib/src/errors.dart

@@ -124,6 +124,7 @@ class _MissingTypeForDeserializationErrorImpl extends JsonMapperError
 
 abstract class CannotCreateInstanceError extends JsonMapperError {
   factory CannotCreateInstanceError(
+      TypeError typeError,
       ClassInfo classInfo,
       Iterable<String> positionalNullArguments,
       Map<Symbol, dynamic> namedNullArguments) = _CannotCreateInstanceErrorImpl;
@@ -132,25 +133,31 @@ abstract class CannotCreateInstanceError extends JsonMapperError {
 class _CannotCreateInstanceErrorImpl extends JsonMapperError
     implements CannotCreateInstanceError {
   final ClassInfo _classInfo;
+  final TypeError _typeError;
   final Iterable<String> _positionalNullArguments;
   final Map<Symbol, dynamic> _namedNullArguments;
 
   _CannotCreateInstanceErrorImpl(
+      TypeError typeError,
       ClassInfo classInfo,
       Iterable<String> positionalNullArguments,
       Map<Symbol, dynamic> namedNullArguments)
       : _classInfo = classInfo,
+        _typeError = typeError,
         _positionalNullArguments = positionalNullArguments,
         _namedNullArguments = namedNullArguments;
 
   @override
-  String toString() => [
-        "Unable to instantiate class '${_classInfo.classMirror.simpleName}'",
-        _positionalNullArguments.isEmpty
-            ? null
-            : '  with null positional arguments [${_positionalNullArguments.join(', ')}]',
-        _namedNullArguments.keys.isEmpty
-            ? null
-            : '  with null named arguments [${_namedNullArguments.keys.join(', ')}]'
-      ].where((element) => element != null).join('\n');
+  String toString() =>
+      _typeError.toString().startsWith("type 'Null' is not a subtype of type")
+          ? [
+              "Unable to instantiate class '${_classInfo.classMirror.simpleName}'",
+              _positionalNullArguments.isEmpty
+                  ? null
+                  : '  with null positional arguments [${_positionalNullArguments.join(', ')}]',
+              _namedNullArguments.keys.isEmpty
+                  ? null
+                  : '  with null named arguments [${_namedNullArguments.keys.join(', ')}]'
+            ].where((element) => element != null).join('\n')
+          : _typeError.toString();
 }

mapper/lib/src/mapper.dart

@@ -979,14 +979,14 @@ class JsonMapper {
                       .constructorName,
                   positionalArguments,
                   namedArguments));
-    } on TypeError {
+    } on TypeError catch (typeError) {
       final positionalNullArguments = positionalArgumentNames.where((element) =>
           positionalArguments[positionalArgumentNames.indexOf(element)] ==
           null);
       final namedNullArguments = Map<Symbol, dynamic>.from(namedArguments);
       namedNullArguments.removeWhere((key, value) => value != null);
       throw CannotCreateInstanceError(
-          classInfo, positionalNullArguments, namedNullArguments);
+          typeError, classInfo, positionalNullArguments, namedNullArguments);
     }
 
     final im = _safeGetInstanceMirror(objectInstance)!;

mapper/pubspec.yaml

@@ -1,19 +1,19 @@
 name: dart_json_mapper
-version: 2.2.13
+version: 2.2.14
 description: >
   This package allows programmers to annotate Dart objects in order to
   serialize / deserialize them from / to JSON.
 homepage: https://github.com/k-paxian/dart-json-mapper
 environment:
   sdk: '>=2.17.0 <4.0.0'
 dependencies:
-  analyzer: ^6.5.0
+  analyzer: ^6.7.0
   build: ^2.4.1
   build_config: ^1.1.1
   intl: ^0.19.0
-  meta: ^1.15.0
+  meta: ^1.16.0
   path: ^1.8.3
-  reflectable: ^4.0.9
+  reflectable: ^4.0.10
   collection: ^1.18.0
   pubspec_parse: ^1.3.0
 dev_dependencies:

perf-test/pubspec.yaml

@@ -18,6 +18,7 @@ dependencies:
   unit_testing:
   starlink:
 dev_dependencies:
+  reflectable:
   json_serializable:
   built_value_generator:
   lints:

perf-test/test/unit/_test.mapper.g.dart

@@ -1,4 +1,4 @@
-// This file has been generated by the dart_json_mapper v2.2.10
+// This file has been generated by the dart_json_mapper v2.2.14
 // https://github.com/k-paxian/dart-json-mapper
 // @dart = 2.12
 import 'package:dart_json_mapper/dart_json_mapper.dart' show JsonMapper, JsonMapperAdapter, SerializationOptions, DeserializationOptions, typeOf;
@@ -20,7 +20,6 @@ import 'test.tuple.dart' as x14 show Tuple, ConcreteClass;
 import 'test.value.decorators.dart' as x15 show NavbarTab, NavbarConfig, NoticeItem, NoticeList, TestChain, Customer, ServiceOrderItemModel, ServiceOrderModel, Item, ListOfLists, ListOfListsWithConstructor;
 // This file has been generated by the reflectable package.
 // https://github.com/dart-lang/reflectable.
-
 import 'dart:core';
 import 'dart:typed_data' as prefix24;
 import 'package:dart_json_mapper/src/identifier_casing.dart' as prefix22;

perf-test/test/unit/test.errors.dart

@@ -150,7 +150,7 @@ void testErrorHandling() {
       expect(catchError(() => JsonMapper.serialize(car)), null);
     });
 
-    test('Unable to create instance of class error handling', () {
+    test('Unable to create instance of class error handling - null arguments', () {
       // given
       final json = '{"name":"James"}';
 
@@ -166,6 +166,21 @@ void testErrorHandling() {
       expect(error, TypeMatcher<CannotCreateInstanceError>());
     });
 
+    test('Unable to create instance of class error handling', () {
+      // given
+      final json = '{"name":["James"],"age":{}}';
+
+      // when
+      final error =
+      catchError(() => JsonMapper.deserialize<PartialPerson>(json));
+
+      // then
+      expect(
+          error.toString(),
+          'type \'_Map<String, dynamic>\' is not a subtype of type \'int\'');
+      expect(error, TypeMatcher<CannotCreateInstanceError>());
+    });
+
     test('Allow using same object same level during serialization', () {
       final device = Device();
       final us = UserSettings([device, device]);