Merge pull request #321 from comigor/fix_177

Fix #177
comigor · Jun 10, 2021 · 795aa7f · 795aa7f
2 parents 7681014 + 9d43e69
commit 795aa7f
Show file tree

Hide file tree

Showing 53 changed files with 181 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 7.0.0-beta.13
+
+- fix for https://github.com/comigor/artemis/issues/177
+
 ## 7.0.0-beta.12
 
 - package update

diff --git a/lib/generator/print_helpers.dart b/lib/generator/print_helpers.dart
@@ -98,13 +98,15 @@ Spec classDefinitionToSpec(
       ? Method(
           (m) => m
             ..name = 'toJson'
+            ..annotations.add(CodeExpression(Code('override')))
             ..returns = refer('Map<String, dynamic>')
             ..body = Code(_toJsonBody(definition)),
         )
       : Method(
           (m) => m
             ..name = 'toJson'
             ..lambda = true
+            ..annotations.add(CodeExpression(Code('override')))
             ..returns = refer('Map<String, dynamic>')
             ..body = Code('_\$${definition.name.namePrintable}ToJson(this)'),
         );

diff --git a/lib/schema/graphql_response.dart b/lib/schema/graphql_response.dart
@@ -1,9 +1,7 @@
 import 'package:gql_exec/gql_exec.dart';
-import 'package:meta/meta.dart';
 
 /// Encapsulates a GraphQL query/mutation response from server, with typed
 /// input and responses, and errors.
-@immutable
 class GraphQLResponse<T> {
   /// The typed data of this response.
   final T? data;

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: artemis
-version: 7.0.0-beta.12
+version: 7.0.0-beta.13
 
 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
@@ -149,6 +149,7 @@ class AClass extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [];
+  @override
   Map<String, dynamic> toJson() => _\$AClassToJson(this);
 }
 ''');
@@ -170,6 +171,7 @@ class AClass extends AnotherClass with EquatableMixin {
 
   @override
   List<Object?> get props => [];
+  @override
   Map<String, dynamic> toJson() => _\$AClassToJson(this);
 }
 ''');
@@ -207,6 +209,7 @@ class AClass extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [];
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'ASubClass':
@@ -246,6 +249,7 @@ class AClass extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [name, anotherName];
+  @override
   Map<String, dynamic> toJson() => _\$AClassToJson(this);
 }
 ''');
@@ -295,6 +299,7 @@ class AClass extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [name, name, name, name];
+  @override
   Map<String, dynamic> toJson() => _\$AClassToJson(this);
 }
 ''');
@@ -326,6 +331,7 @@ class AClass extends JsonSerializable with EquatableMixin, FragmentMixin {
 
   @override
   List<Object?> get props => [name];
+  @override
   Map<String, dynamic> toJson() => _\$AClassToJson(this);
 }
 ''');
@@ -360,6 +366,7 @@ class AClass extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [name, anotherName];
+  @override
   Map<String, dynamic> toJson() => _\$AClassToJson(this);
 }
 ''');
@@ -682,6 +689,7 @@ class AClass extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [];
+  @override
   Map<String, dynamic> toJson() => _\$AClassToJson(this);
 }
 

diff --git a/test/query_generator/aliases/alias_on_leaves_test.dart b/test/query_generator/aliases/alias_on_leaves_test.dart
@@ -118,6 +118,7 @@ class SomeQuery$Response$SomeObject extends JsonSerializable
 
   @override
   List<Object?> get props => [thisIsAnEnum];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$Response$SomeObjectToJson(this);
 }
 
@@ -134,6 +135,7 @@ class SomeQuery$Response extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [thisIsAString, o];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$ResponseToJson(this);
 }
 

diff --git a/test/query_generator/aliases/alias_on_object_test.dart b/test/query_generator/aliases/alias_on_object_test.dart
@@ -120,6 +120,7 @@ class SomeQuery$QueryResponse$SomeObject extends JsonSerializable
 
   @override
   List<Object?> get props => [st];
+  @override
   Map<String, dynamic> toJson() =>
       _$SomeQuery$QueryResponse$SomeObjectToJson(this);
 }
@@ -137,6 +138,7 @@ class SomeQuery$QueryResponse$AnotherObject extends JsonSerializable
 
   @override
   List<Object?> get props => [str];
+  @override
   Map<String, dynamic> toJson() =>
       _$SomeQuery$QueryResponse$AnotherObjectToJson(this);
 }
@@ -156,6 +158,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s, o, anotherObject];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryResponseToJson(this);
 }
 ''';
diff --git a/test/query_generator/append_type_name_test.dart b/test/query_generator/append_type_name_test.dart
@@ -94,6 +94,7 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [e, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$QToJson(this);
 }
 
@@ -111,6 +112,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 ''',
@@ -207,6 +209,7 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [e, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$QToJson(this);
 }
 
@@ -224,6 +227,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 ''',
@@ -337,6 +341,7 @@ class Custom$QueryRoot$Q extends JsonSerializable
 
   @override
   List<Object?> get props => [e, $$typename, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$QToJson(this);
 }
 
@@ -354,6 +359,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 ''',
@@ -495,6 +501,7 @@ class Custom$QueryRoot$Q$TypeA extends Custom$QueryRoot$Q with EquatableMixin {
 
   @override
   List<Object?> get props => [a, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$Q$TypeAToJson(this);
 }
 
@@ -513,6 +520,7 @@ class Custom$QueryRoot$Q$TypeB extends Custom$QueryRoot$Q with EquatableMixin {
 
   @override
   List<Object?> get props => [b, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$Q$TypeBToJson(this);
 }
 
@@ -536,6 +544,7 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [$$typename];
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'TypeA':
@@ -562,6 +571,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 ''',
@@ -672,6 +682,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [e, $$typename, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$QueryResponseToJson(this);
 }
 
@@ -689,6 +700,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q, $$typename];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 

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
@@ -146,6 +146,7 @@ class CreateThing$MutationRoot$CreateThingResponse$Thing
 
   @override
   List<Object?> get props => [id, message];
+  @override
   Map<String, dynamic> toJson() =>
       _$CreateThing$MutationRoot$CreateThingResponse$ThingToJson(this);
 }
@@ -163,6 +164,7 @@ class CreateThing$MutationRoot$CreateThingResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [thing];
+  @override
   Map<String, dynamic> toJson() =>
       _$CreateThing$MutationRoot$CreateThingResponseToJson(this);
 }
@@ -178,6 +180,7 @@ class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [createThing];
+  @override
   Map<String, dynamic> toJson() => _$CreateThing$MutationRootToJson(this);
 }
 
@@ -194,6 +197,7 @@ class CreateThingInput extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [clientId, message];
+  @override
   Map<String, dynamic> toJson() => _$CreateThingInputToJson(this);
 }
 ''';
diff --git a/test/query_generator/ast_schema/input_types_test.dart b/test/query_generator/ast_schema/input_types_test.dart
@@ -169,6 +169,7 @@ class CreateThing$MutationRoot$CreateThingResponse$Thing
 
   @override
   List<Object?> get props => [id, message];
+  @override
   Map<String, dynamic> toJson() =>
       _$CreateThing$MutationRoot$CreateThingResponse$ThingToJson(this);
 }
@@ -186,6 +187,7 @@ class CreateThing$MutationRoot$CreateThingResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [thing];
+  @override
   Map<String, dynamic> toJson() =>
       _$CreateThing$MutationRoot$CreateThingResponseToJson(this);
 }
@@ -201,6 +203,7 @@ class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [createThing];
+  @override
   Map<String, dynamic> toJson() => _$CreateThing$MutationRootToJson(this);
 }
 
@@ -215,6 +218,7 @@ class OtherObjectInput extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [id];
+  @override
   Map<String, dynamic> toJson() => _$OtherObjectInputToJson(this);
 }
 
@@ -233,6 +237,7 @@ class CreateThingInput extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [clientId, message, shares];
+  @override
   Map<String, dynamic> toJson() => _$CreateThingInputToJson(this);
 }
 ''';
diff --git a/test/query_generator/ast_schema/missing_schema_test.dart b/test/query_generator/ast_schema/missing_schema_test.dart
@@ -68,6 +68,7 @@ class Query$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [a];
+  @override
   Map<String, dynamic> toJson() => _$Query$QueryToJson(this);
 }
 ''';
diff --git a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart
@@ -318,6 +318,7 @@ class BrowseArticles$Query$Articles extends JsonSerializable
 
   @override
   List<Object?> get props => [id, title, articleType];
+  @override
   Map<String, dynamic> toJson() => _$BrowseArticles$Query$ArticlesToJson(this);
 }
 
@@ -332,6 +333,7 @@ class BrowseArticles$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [articles];
+  @override
   Map<String, dynamic> toJson() => _$BrowseArticles$QueryToJson(this);
 }
 
@@ -426,6 +428,7 @@ class BrowseRepositories$Query$Repositories extends JsonSerializable
 
   @override
   List<Object?> get props => [id, title, privacy, status];
+  @override
   Map<String, dynamic> toJson() =>
       _$BrowseRepositories$Query$RepositoriesToJson(this);
 }
@@ -441,6 +444,7 @@ class BrowseRepositories$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [repositories];
+  @override
   Map<String, dynamic> toJson() => _$BrowseRepositories$QueryToJson(this);
 }
 
@@ -458,6 +462,7 @@ class NotificationOptionInput extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [type, enabled];
+  @override
   Map<String, dynamic> toJson() => _$NotificationOptionInputToJson(this);
 }
 

diff --git a/test/query_generator/deprecated/deprecated_enum_value_test.dart b/test/query_generator/deprecated/deprecated_enum_value_test.dart
@@ -106,6 +106,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [someValue];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryResponseToJson(this);
 }
 

diff --git a/test/query_generator/deprecated/deprecated_field_test.dart b/test/query_generator/deprecated/deprecated_field_test.dart
@@ -132,6 +132,7 @@ class SomeQuery$QueryResponse$DeprecatedObject extends JsonSerializable
 
   @override
   List<Object?> get props => [someField, deprecatedField];
+  @override
   Map<String, dynamic> toJson() =>
       _$SomeQuery$QueryResponse$DeprecatedObjectToJson(this);
 }
@@ -152,6 +153,7 @@ class SomeQuery$QueryResponse$SomeObject extends JsonSerializable
 
   @override
   List<Object?> get props => [someField, deprecatedField];
+  @override
   Map<String, dynamic> toJson() =>
       _$SomeQuery$QueryResponse$SomeObjectToJson(this);
 }
@@ -170,6 +172,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [deprecatedObject, someObjects];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryResponseToJson(this);
 }
 ''';