Release 2.2.9

Improve web platform support #13
k-paxian · Jan 29, 2023 · 64f9785 · 64f9785
1 parent 4edf5cc
commit 64f9785
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 13 deletions.
diff --git a/mapper/CHANGELOG.md b/mapper/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.9
+
+* Improve web platform support #13
+
 ## 2.2.8
 
 * Improve class instance creation error handling #211

diff --git a/mapper/lib/src/mapper.dart b/mapper/lib/src/mapper.dart
@@ -763,11 +763,6 @@ class JsonMapper {
 
   Map<Symbol, dynamic> _getNamedArguments(
       ClassMirror cm, JsonMap jsonMap, DeserializationContext context) {
-    if (kIsWeb) {
-      // No named arguments in JS :(
-      return <Symbol, dynamic>{};
-    }
-
     final result = <Symbol, dynamic>{};
 
     _enumerateConstructorParameters(

diff --git a/mapper/lib/src/model/type_info.dart b/mapper/lib/src/model/type_info.dart
@@ -62,7 +62,9 @@ class DefaultTypeInfoDecorator implements ITypeInfoDecorator {
       typeInfo.typeName == 'BigInt' || typeInfo.typeName == '_BigIntImpl';
 
   bool isRegExp(TypeInfo typeInfo) =>
-      typeInfo.typeName == 'RegExp' || typeInfo.typeName == '_RegExp';
+      typeInfo.typeName == 'JSSyntaxRegExp' ||
+      typeInfo.typeName == 'RegExp' ||
+      typeInfo.typeName == '_RegExp';
 
   bool isUri(TypeInfo typeInfo) =>
       typeInfo.typeName == 'Uri' ||
@@ -108,11 +110,14 @@ class DefaultTypeInfoDecorator implements ITypeInfoDecorator {
     typeInfo.isDynamic = typeName == 'dynamic';
     typeInfo.isList = typeName.startsWith('_GrowableList<') ||
         typeName.startsWith('List<') ||
+        typeName.startsWith('JSArray<') ||
         isUnmodifiableListView(typeInfo) ||
         isCastList(typeInfo);
     typeInfo.isSet = typeName.startsWith('Set<') || isHashSet(typeInfo);
     typeInfo.isMap = typeName == '_JsonMap' ||
         typeName.startsWith('Map<') ||
+        typeName.startsWith('IdentityMap<') ||
+        typeName.startsWith('LinkedMap<') ||
         isHashMap(typeInfo) ||
         isLinkedHashMap(typeInfo) ||
         isUnmodifiableMapView(typeInfo);

diff --git a/mapper/pubspec.yaml b/mapper/pubspec.yaml
@@ -1,5 +1,5 @@
 name: dart_json_mapper
-version: 2.2.8
+version: 2.2.9
 description: >
   This package allows programmers to annotate Dart objects in order to
   serialize / deserialize them from / to JSON.

diff --git a/perf-test/build.yaml b/perf-test/build.yaml
@@ -1,6 +1,9 @@
 targets:
   $default:
     builders:
+      build_web_compilers:entrypoint:
+        generate_for:
+          - test/unit/*.dart
       dart_json_mapper:
         options:
           iterables: List, Set

diff --git a/perf-test/pubspec.yaml b/perf-test/pubspec.yaml
@@ -24,6 +24,7 @@ dev_dependencies:
   path:
   build_runner:
   build_test:
+  build_web_compilers:
   test:
 dependency_overrides:
   unit_testing:

diff --git a/perf-test/test/unit/_test.mapper.g.dart b/perf-test/test/unit/_test.mapper.g.dart
@@ -1,4 +1,4 @@
-// This file has been generated by the dart_json_mapper v2.2.7+5
+// This file has been generated by the dart_json_mapper v2.2.8
 // 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;

diff --git a/perf-test/test/unit/test.collections.dart b/perf-test/test/unit/test.collections.dart
@@ -93,7 +93,7 @@ void testCollections() {
       final target = JsonMapper.deserialize<HashMap<String, int>>(json)!;
 
       // then
-      expect(json, '{"c":3,"a":1,"b":2}');
+      expect(json, kIsWeb ? '{"a":1,"b":2,"c":3}' : '{"c":3,"a":1,"b":2}');
 
       expect(target, TypeMatcher<HashMap<String, int>>());
       expect(target.containsKey('a'), true);

diff --git a/perf-test/test/unit/test.converters.dart b/perf-test/test/unit/test.converters.dart
@@ -261,7 +261,9 @@ void testConverters() {
       expect(json, '"$source"');
       expect(target.pattern, instance.pattern);
       expect(target, TypeMatcher<RegExp>());
-      expect(target, instance);
+      if (!kIsWeb) {
+        expect(target, instance);
+      }
     });
 
     test('UriConverter', () {

diff --git a/perf-test/test/unit/test.default.value.dart b/perf-test/test/unit/test.default.value.dart
@@ -112,12 +112,29 @@ void testDefaultValue() {
       final target = JsonMapper.serialize(instance,
           SerializationOptions(indent: '', processAnnotatedMembersOnly: true));
       // then
-      expect(target,
-          '{"cropArea":{"top":0.0,"left":1.0,"right":1.0,"bottom":0.0},"id":1}');
+      expect(
+          target,
+          kIsWeb
+              ? '{"cropArea":{"top":0,"left":1,"right":1,"bottom":0},"id":1}'
+              : '{"cropArea":{"top":0.0,"left":1.0,"right":1.0,"bottom":0.0},"id":1}');
     });
 
     test('Serialize Immutable class with DefaultValue provided', () {
       // given
+      final immutableJsonWeb = '''{
+ "cropArea": {
+  "top": 0,
+  "left": 1,
+  "right": 1,
+  "bottom": 0
+ },
+ "id": 1,
+ "name": "Bob",
+ "car": {
+  "modelName": "Audi",
+  "color": "green"
+ }
+}''';
       final immutableJson = '''{
  "cropArea": {
   "top": 0.0,
@@ -147,7 +164,7 @@ void testDefaultValue() {
       final target = JsonMapper.deserialize<ImmutableDefault>(json)!;
 
       // then
-      expect(targetJson, immutableJson);
+      expect(targetJson, kIsWeb ? immutableJsonWeb : immutableJson);
 
       expect(target.id, 1);
       expect(target.cropArea, TypeMatcher<CropArea>());