Merge pull request #258 from ANVLCO/feat/json-serializable

Allow for auto generated response and inputs to extend JsonSerializable
comigor · Feb 1, 2021 · 912bb04 · 912bb04
2 parents 3aca1cd + 199d4cc
commit 912bb04
Show file tree

Hide file tree

Showing 48 changed files with 196 additions and 151 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 6.20.1-beta.1
+- Allow for auto generated response and inputs to extend JsonSerializable
+
 ## 6.19.3-beta.1
 - bugfix of append typename - common fragments
 

diff --git a/lib/generator/print_helpers.dart b/lib/generator/print_helpers.dart
@@ -134,7 +134,7 @@ Spec classDefinitionToSpec(
       ..methods.add(_propsMethod('[${props.join(',')}]'))
       ..extend = definition.extension != null
           ? refer(definition.extension.namePrintable)
-          : null
+          : refer('JsonSerializable')
       ..implements.addAll(definition.implementations.map((i) => refer(i)))
       ..constructors.add(Constructor((b) {
         if (definition.isInput) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: artemis
-version: 6.19.3-beta.1
+version: 6.20.1-beta.1
 
 description: Build dart types from GraphQL schemas and queries (using Introspection Query).
 homepage: https://github.com/comigor/artemis

diff --git a/test/generator/print_helpers_test.dart b/test/generator/print_helpers_test.dart
@@ -150,7 +150,7 @@ void main() {
       final str = specToString(classDefinitionToSpec(definition, [], []));
 
       expect(str, '''@JsonSerializable(explicitToJson: true)
-class AClass with EquatableMixin {
+class AClass extends JsonSerializable with EquatableMixin {
   AClass();
 
   factory AClass.fromJson(Map<String, dynamic> json) => _\$AClassFromJson(json);
@@ -199,7 +199,7 @@ class AClass extends AnotherClass with EquatableMixin {
       final str = specToString(classDefinitionToSpec(definition, [], []));
 
       expect(str, r'''@JsonSerializable(explicitToJson: true)
-class AClass with EquatableMixin {
+class AClass extends JsonSerializable with EquatableMixin {
   AClass();
 
   factory AClass.fromJson(Map<String, dynamic> json) {
@@ -243,7 +243,7 @@ class AClass with EquatableMixin {
       final str = specToString(classDefinitionToSpec(definition, [], []));
 
       expect(str, '''@JsonSerializable(explicitToJson: true)
-class AClass with EquatableMixin {
+class AClass extends JsonSerializable with EquatableMixin {
   AClass();
 
   factory AClass.fromJson(Map<String, dynamic> json) => _\$AClassFromJson(json);
@@ -284,7 +284,7 @@ class AClass with EquatableMixin {
       final str = specToString(classDefinitionToSpec(definition, [], []));
 
       expect(str, '''@JsonSerializable(explicitToJson: true)
-class AClass with EquatableMixin {
+class AClass extends JsonSerializable with EquatableMixin {
   AClass();
 
   factory AClass.fromJson(Map<String, dynamic> json) => _\$AClassFromJson(json);
@@ -327,7 +327,7 @@ class AClass with EquatableMixin {
       ], []));
 
       expect(str, '''@JsonSerializable(explicitToJson: true)
-class AClass with EquatableMixin, FragmentMixin {
+class AClass extends JsonSerializable with EquatableMixin, FragmentMixin {
   AClass();
 
   factory AClass.fromJson(Map<String, dynamic> json) => _\$AClassFromJson(json);
@@ -358,7 +358,7 @@ class AClass with EquatableMixin, FragmentMixin {
       final str = specToString(classDefinitionToSpec(definition, [], []));
 
       expect(str, '''@JsonSerializable(explicitToJson: true)
-class AClass with EquatableMixin {
+class AClass extends JsonSerializable with EquatableMixin {
   AClass({this.name, @required this.anotherName});
 
   factory AClass.fromJson(Map<String, dynamic> json) => _\$AClassFromJson(json);
@@ -686,7 +686,7 @@ import 'package:gql/ast.dart';
 part 'test_query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class AClass with EquatableMixin {
+class AClass extends JsonSerializable with EquatableMixin {
   AClass();
 
   factory AClass.fromJson(Map<String, dynamic> json) => _\$AClassFromJson(json);

diff --git a/test/query_generator/aliases/alias_on_leaves_test.dart b/test/query_generator/aliases/alias_on_leaves_test.dart
@@ -110,7 +110,8 @@ import 'package:gql/ast.dart';
 part 'query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class SomeQuery$Response$SomeObject with EquatableMixin {
+class SomeQuery$Response$SomeObject extends JsonSerializable
+    with EquatableMixin {
   SomeQuery$Response$SomeObject();
 
   factory SomeQuery$Response$SomeObject.fromJson(Map<String, dynamic> json) =>
@@ -125,7 +126,7 @@ class SomeQuery$Response$SomeObject with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class SomeQuery$Response with EquatableMixin {
+class SomeQuery$Response extends JsonSerializable with EquatableMixin {
   SomeQuery$Response();
 
   factory SomeQuery$Response.fromJson(Map<String, dynamic> json) =>

diff --git a/test/query_generator/aliases/alias_on_object_test.dart b/test/query_generator/aliases/alias_on_object_test.dart
@@ -112,7 +112,8 @@ import 'package:gql/ast.dart';
 part 'query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class SomeQuery$QueryResponse$SomeObject with EquatableMixin {
+class SomeQuery$QueryResponse$SomeObject extends JsonSerializable
+    with EquatableMixin {
   SomeQuery$QueryResponse$SomeObject();
 
   factory SomeQuery$QueryResponse$SomeObject.fromJson(
@@ -128,7 +129,8 @@ class SomeQuery$QueryResponse$SomeObject with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class SomeQuery$QueryResponse$AnotherObject with EquatableMixin {
+class SomeQuery$QueryResponse$AnotherObject extends JsonSerializable
+    with EquatableMixin {
   SomeQuery$QueryResponse$AnotherObject();
 
   factory SomeQuery$QueryResponse$AnotherObject.fromJson(
@@ -144,7 +146,7 @@ class SomeQuery$QueryResponse$AnotherObject with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class SomeQuery$QueryResponse with EquatableMixin {
+class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin {
   SomeQuery$QueryResponse();
 
   factory SomeQuery$QueryResponse.fromJson(Map<String, dynamic> json) =>

diff --git a/test/query_generator/append_type_name_test.dart b/test/query_generator/append_type_name_test.dart
@@ -90,7 +90,7 @@ import 'package:gql/ast.dart';
 part 'query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot$Q with EquatableMixin {
+class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin {
   Custom$QueryRoot$Q();
 
   factory Custom$QueryRoot$Q.fromJson(Map<String, dynamic> json) =>
@@ -107,7 +107,7 @@ class Custom$QueryRoot$Q with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot with EquatableMixin {
+class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
   Custom$QueryRoot();
 
   factory Custom$QueryRoot.fromJson(Map<String, dynamic> json) =>
@@ -206,7 +206,7 @@ import 'package:gql/ast.dart';
 part 'query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot$Q with EquatableMixin {
+class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin {
   Custom$QueryRoot$Q();
 
   factory Custom$QueryRoot$Q.fromJson(Map<String, dynamic> json) =>
@@ -223,7 +223,7 @@ class Custom$QueryRoot$Q with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot with EquatableMixin {
+class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
   Custom$QueryRoot();
 
   factory Custom$QueryRoot.fromJson(Map<String, dynamic> json) =>
@@ -341,7 +341,8 @@ mixin QueryResponseMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot$Q with EquatableMixin, QueryResponseMixin {
+class Custom$QueryRoot$Q extends JsonSerializable
+    with EquatableMixin, QueryResponseMixin {
   Custom$QueryRoot$Q();
 
   factory Custom$QueryRoot$Q.fromJson(Map<String, dynamic> json) =>
@@ -356,7 +357,7 @@ class Custom$QueryRoot$Q with EquatableMixin, QueryResponseMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot with EquatableMixin {
+class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
   Custom$QueryRoot();
 
   factory Custom$QueryRoot.fromJson(Map<String, dynamic> json) =>
@@ -538,7 +539,7 @@ class Custom$QueryRoot$Q$TypeB extends Custom$QueryRoot$Q with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot$Q with EquatableMixin {
+class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin {
   Custom$QueryRoot$Q();
 
   factory Custom$QueryRoot$Q.fromJson(Map<String, dynamic> json) {
@@ -570,7 +571,7 @@ class Custom$QueryRoot$Q with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot with EquatableMixin {
+class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
   Custom$QueryRoot();
 
   factory Custom$QueryRoot.fromJson(Map<String, dynamic> json) =>
@@ -685,7 +686,8 @@ mixin QueryResponseMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot$QueryResponse with EquatableMixin, QueryResponseMixin {
+class Custom$QueryRoot$QueryResponse extends JsonSerializable
+    with EquatableMixin, QueryResponseMixin {
   Custom$QueryRoot$QueryResponse();
 
   factory Custom$QueryRoot$QueryResponse.fromJson(Map<String, dynamic> json) =>
@@ -700,7 +702,7 @@ class Custom$QueryRoot$QueryResponse with EquatableMixin, QueryResponseMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class Custom$QueryRoot with EquatableMixin {
+class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
   Custom$QueryRoot();
 
   factory Custom$QueryRoot.fromJson(Map<String, dynamic> json) =>

diff --git a/test/query_generator/ast_schema/field_not_found_mutation_test.dart b/test/query_generator/ast_schema/field_not_found_mutation_test.dart
@@ -141,7 +141,8 @@ import 'package:gql/ast.dart';
 part 'query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class CreateThing$MutationRoot$CreateThingResponse$Thing with EquatableMixin {
+class CreateThing$MutationRoot$CreateThingResponse$Thing
+    extends JsonSerializable with EquatableMixin {
   CreateThing$MutationRoot$CreateThingResponse$Thing();
 
   factory CreateThing$MutationRoot$CreateThingResponse$Thing.fromJson(
@@ -159,7 +160,8 @@ class CreateThing$MutationRoot$CreateThingResponse$Thing with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class CreateThing$MutationRoot$CreateThingResponse with EquatableMixin {
+class CreateThing$MutationRoot$CreateThingResponse extends JsonSerializable
+    with EquatableMixin {
   CreateThing$MutationRoot$CreateThingResponse();
 
   factory CreateThing$MutationRoot$CreateThingResponse.fromJson(
@@ -175,7 +177,7 @@ class CreateThing$MutationRoot$CreateThingResponse with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class CreateThing$MutationRoot with EquatableMixin {
+class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin {
   CreateThing$MutationRoot();
 
   factory CreateThing$MutationRoot.fromJson(Map<String, dynamic> json) =>
@@ -189,7 +191,7 @@ class CreateThing$MutationRoot with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class CreateThingInput with EquatableMixin {
+class CreateThingInput extends JsonSerializable with EquatableMixin {
   CreateThingInput({@required this.clientId, this.message});
 
   factory CreateThingInput.fromJson(Map<String, dynamic> json) =>

diff --git a/test/query_generator/ast_schema/input_types_test.dart b/test/query_generator/ast_schema/input_types_test.dart
@@ -163,7 +163,8 @@ import 'package:gql/ast.dart';
 part 'query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class CreateThing$MutationRoot$CreateThingResponse$Thing with EquatableMixin {
+class CreateThing$MutationRoot$CreateThingResponse$Thing
+    extends JsonSerializable with EquatableMixin {
   CreateThing$MutationRoot$CreateThingResponse$Thing();
 
   factory CreateThing$MutationRoot$CreateThingResponse$Thing.fromJson(
@@ -181,7 +182,8 @@ class CreateThing$MutationRoot$CreateThingResponse$Thing with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class CreateThing$MutationRoot$CreateThingResponse with EquatableMixin {
+class CreateThing$MutationRoot$CreateThingResponse extends JsonSerializable
+    with EquatableMixin {
   CreateThing$MutationRoot$CreateThingResponse();
 
   factory CreateThing$MutationRoot$CreateThingResponse.fromJson(
@@ -197,7 +199,7 @@ class CreateThing$MutationRoot$CreateThingResponse with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class CreateThing$MutationRoot with EquatableMixin {
+class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin {
   CreateThing$MutationRoot();
 
   factory CreateThing$MutationRoot.fromJson(Map<String, dynamic> json) =>
@@ -211,7 +213,7 @@ class CreateThing$MutationRoot with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class OtherObjectInput with EquatableMixin {
+class OtherObjectInput extends JsonSerializable with EquatableMixin {
   OtherObjectInput({@required this.id});
 
   factory OtherObjectInput.fromJson(Map<String, dynamic> json) =>
@@ -225,7 +227,7 @@ class OtherObjectInput with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class CreateThingInput with EquatableMixin {
+class CreateThingInput extends JsonSerializable with EquatableMixin {
   CreateThingInput({@required this.clientId, this.message, this.shares});
 
   factory CreateThingInput.fromJson(Map<String, dynamic> json) =>

diff --git a/test/query_generator/ast_schema/missing_schema_test.dart b/test/query_generator/ast_schema/missing_schema_test.dart
@@ -60,7 +60,7 @@ import 'package:gql/ast.dart';
 part 'query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class Query$Query with EquatableMixin {
+class Query$Query extends JsonSerializable with EquatableMixin {
   Query$Query();
 
   factory Query$Query.fromJson(Map<String, dynamic> json) =>

diff --git a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart
@@ -309,7 +309,8 @@ import 'package:gql/ast.dart';
 part 'outputA.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class BrowseArticles$Query$Articles with EquatableMixin {
+class BrowseArticles$Query$Articles extends JsonSerializable
+    with EquatableMixin {
   BrowseArticles$Query$Articles();
 
   factory BrowseArticles$Query$Articles.fromJson(Map<String, dynamic> json) =>
@@ -328,7 +329,7 @@ class BrowseArticles$Query$Articles with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class BrowseArticles$Query with EquatableMixin {
+class BrowseArticles$Query extends JsonSerializable with EquatableMixin {
   BrowseArticles$Query();
 
   factory BrowseArticles$Query.fromJson(Map<String, dynamic> json) =>
@@ -410,7 +411,8 @@ import 'package:gql/ast.dart';
 part 'outputB.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class BrowseRepositories$Query$Repositories with EquatableMixin {
+class BrowseRepositories$Query$Repositories extends JsonSerializable
+    with EquatableMixin {
   BrowseRepositories$Query$Repositories();
 
   factory BrowseRepositories$Query$Repositories.fromJson(
@@ -434,7 +436,7 @@ class BrowseRepositories$Query$Repositories with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class BrowseRepositories$Query with EquatableMixin {
+class BrowseRepositories$Query extends JsonSerializable with EquatableMixin {
   BrowseRepositories$Query();
 
   factory BrowseRepositories$Query.fromJson(Map<String, dynamic> json) =>
@@ -448,7 +450,7 @@ class BrowseRepositories$Query with EquatableMixin {
 }
 
 @JsonSerializable(explicitToJson: true)
-class NotificationOptionInput with EquatableMixin {
+class NotificationOptionInput extends JsonSerializable with EquatableMixin {
   NotificationOptionInput({this.type, this.enabled});
 
   factory NotificationOptionInput.fromJson(Map<String, dynamic> json) =>

diff --git a/test/query_generator/deprecated/deprecated_enum_value_test.dart b/test/query_generator/deprecated/deprecated_enum_value_test.dart
@@ -96,7 +96,7 @@ import 'package:gql/ast.dart';
 part 'query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-class SomeQuery$QueryResponse with EquatableMixin {
+class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin {
   SomeQuery$QueryResponse();
 
   factory SomeQuery$QueryResponse.fromJson(Map<String, dynamic> json) =>