## 1.0.4

- Relaxed dependency versions - Fixed bug for abstract class json serialize & deserialize ## 1.0.3 - Relaxed analyzer requiremenst to 6.0.0 ## 1.0.2 - Added jsonserialization annotation dependency included in morphy ## 1.0.1 - Added jsonserialization dependency included in morphy
atreeon · Nov 30, 2023 · 5089751 · 5089751
1 parent 0f04a2b
commit 5089751
Show file tree

Hide file tree

Showing 31 changed files with 476 additions and 169 deletions.
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -8,11 +8,13 @@ dependency_overrides:
     path: ../morphy_annotation
 
 dependencies:
+  json_serializable: ^6.7.1
   meta: any
-
   morphy:
     path: ../morphy
 
+#  morphy: ^1.0.1
+
 dev_dependencies:
   build_runner: ^2.4.6
   test: ^1.24.8

diff --git a/example/test/ex21_custom_constructors_test.dart b/example/test/ex21_custom_constructors_test.dart
@@ -15,23 +15,23 @@ part 'ex21_custom_constructors_test.morphy.dart';
 //In this example class A has an underscore thereby hiding its default constructor.
 //Instead we create a function called A_DifferentConstructor.
 
-@morphy
-abstract class $A_ {
+@Morphy(privateConstructor: true)
+abstract class $A {
   String get a;
 }
 
 void main() {
   test("0 default value", () {
-    var a = A_._(a: "my default value");
+    var a = A._(a: "my default value");
     expect(a.a, "my default value");
   });
 
   test("1 default value", () {
-    var a = A_DifferentConstructor();
+    var a = A_Factory();
     expect(a.a, "my default value");
   });
 }
 
-A_ A_DifferentConstructor() {
-  return A_._(a: "my default value");
+A A_Factory() {
+  return A._(a: "my default value");
 }
diff --git a/example/test/ex21_custom_constructors_test.morphy.dart b/example/test/ex21_custom_constructors_test.morphy.dart
@@ -7,27 +7,27 @@ part of 'ex21_custom_constructors_test.dart';
 // **************************************************************************
 
 ///
-class A_ extends $A_ {
+class A extends $A {
   final String a;
 
   ///
-  A_._({
+  A._({
     required this.a,
   });
-  String toString() => "(A_-a:${a.toString()})";
+  String toString() => "(A-a:${a.toString()})";
   int get hashCode => hashObjects([a.hashCode]);
   bool operator ==(Object other) =>
       identical(this, other) ||
-      other is A_ && runtimeType == other.runtimeType && a == other.a;
-  A_ copyWith_A_({
+      other is A && runtimeType == other.runtimeType && a == other.a;
+  A copyWith_A({
     Opt<String>? a,
   }) {
-    return A_._(
+    return A._(
       a: a == null ? this.a as String : a.value as String,
     );
   }
 }
 
-extension $A__changeTo_E on $A_ {}
+extension $A_changeTo_E on $A {}
 
-enum A_$ { a }
+enum A$ { a }
diff --git a/example/test/ex46_json_test.dart b/example/test/ex46_json_test.dart
@@ -1,6 +1,5 @@
 // ignore_for_file: unnecessary_cast
 
-import 'package:json_annotation/json_annotation.dart';
 import 'package:test/test.dart';
 import 'package:morphy/morphy.dart';
 

diff --git a/example/test/ex46_json_test.g.dart b/example/test/ex46_json_test.g.dart
diff --git a/example/test/ex46_json_test.morphy.dart b/example/test/ex46_json_test.morphy.dart
@@ -8,7 +8,9 @@ part of 'ex46_json_test.dart';
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class Pet extends $Pet {
   final String kind;
 
@@ -45,8 +47,8 @@ class Pet extends $Pet {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 

diff --git a/example/test/ex47_json_inheritance_test.morphy.dart b/example/test/ex47_json_inheritance_test.morphy.dart
@@ -8,7 +8,9 @@ part of 'ex47_json_inheritance_test.dart';
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class A extends $A {
   final String id;
 
@@ -54,8 +56,8 @@ class A extends $A {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 
@@ -98,7 +100,9 @@ enum A$ { id }
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class B extends $B implements A {
   final String id;
 
@@ -147,8 +151,8 @@ class B extends $B implements A {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 
@@ -173,7 +177,9 @@ enum B$ { id }
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class C extends $C implements A {
   final String id;
   final List<int> items;
@@ -230,8 +236,8 @@ class C extends $C implements A {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 

diff --git a/example/test/ex48_json_with_subtype_test.morphy.dart b/example/test/ex48_json_with_subtype_test.morphy.dart
@@ -9,7 +9,9 @@ part of 'ex48_json_with_subtype_test.dart';
 /// Every subtype needs to also implement toJson & fromJson
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class A extends $A {
   final String id;
   final X x;
@@ -60,8 +62,8 @@ class A extends $A {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 
@@ -82,7 +84,9 @@ enum A$ { id, x, xs }
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class X extends $X {
   final List<int> items;
 
@@ -121,8 +125,8 @@ class X extends $X {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 

diff --git a/example/test/ex50_json_inheritance_generic_test.morphy.dart b/example/test/ex50_json_inheritance_generic_test.morphy.dart
@@ -8,7 +8,9 @@ part of 'ex50_json_inheritance_generic_test.dart';
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class A extends $A {
   final String id;
 
@@ -45,8 +47,8 @@ class A extends $A {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 
@@ -79,7 +81,10 @@ class B_Generics_Sing {
   B_Generics_Sing._internal() {}
 }
 
-@JsonSerializable(explicitToJson: true, genericArgumentFactories: true)
+@JsonSerializable(
+  explicitToJson: true,
+  genericArgumentFactories: true,
+)
 class B<T> extends $B<T> implements A {
   final String id;
   final T blah;
@@ -139,8 +144,8 @@ class B<T> extends $B<T> implements A {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 
@@ -162,7 +167,9 @@ enum B$ { id, blah }
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class X extends $X {
   final String xyz;
 
@@ -199,8 +206,8 @@ class X extends $X {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 

diff --git a/example/test/ex51_json_inheritance_generic_from_test.morphy.dart b/example/test/ex51_json_inheritance_generic_from_test.morphy.dart
@@ -8,7 +8,9 @@ part of 'ex51_json_inheritance_generic_from_test.dart';
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class A extends $A {
   final String id;
 
@@ -52,8 +54,8 @@ class A extends $A {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 
@@ -96,7 +98,10 @@ class B_Generics_Sing {
   B_Generics_Sing._internal() {}
 }
 
-@JsonSerializable(explicitToJson: true, genericArgumentFactories: true)
+@JsonSerializable(
+  explicitToJson: true,
+  genericArgumentFactories: true,
+)
 class B<T> extends $B<T> implements A {
   final String id;
   final T blah;
@@ -156,8 +161,8 @@ class B<T> extends $B<T> implements A {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }
 
@@ -179,7 +184,9 @@ enum B$ { id, blah }
 
 ///
 
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(
+  explicitToJson: true,
+)
 class X extends $X {
   final String xyz;
 
@@ -216,8 +223,8 @@ class X extends $X {
   // ignore: unused_field
   Map<Type, Object? Function(Never)> _fns = {};
 
-  Map<String, dynamic> toJson_2(Map<Type, Object? Function(Never)> fns) {
-    this._fns = fns;
+  Map<String, dynamic> toJson_2([Map<Type, Object? Function(Never)>? fns]) {
+    this._fns = fns ?? {};
     return toJson();
   }