diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885dfd17..dea91038 100644
--- 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
index 66f51eb5..e3119190 100644
--- a/lib/generator/print_helpers.dart
+++ b/lib/generator/print_helpers.dart
@@ -98,6 +98,7 @@ Spec classDefinitionToSpec(
       ? Method(
           (m) => m
             ..name = 'toJson'
+            ..annotations.add(CodeExpression(Code('override')))
             ..returns = refer('Map<String, dynamic>')
             ..body = Code(_toJsonBody(definition)),
         )
@@ -105,6 +106,7 @@ Spec classDefinitionToSpec(
           (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
index 9aae746c..9ce3f315 100644
--- 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
index ddfeb7eb..221beb32 100644
--- 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
index 503a7dc6..5eb2ffcf 100644
--- 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
index e5a82b89..cd8a97be 100644
--- 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
index 2faa6c14..83602f7e 100644
--- 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
index dcbfe6dc..b275b9cc 100644
--- 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
index ca0454dd..20d1f55e 100644
--- 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
index a13eba19..66e3f40b 100644
--- 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
index 85d23b46..a8396e86 100644
--- 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
index 7363a119..fcca6ac2 100644
--- 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
index 43d69821..6c197110 100644
--- 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
index 4bd9dc04..d72ac136 100644
--- 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);
 }
 ''';
diff --git a/test/query_generator/deprecated/deprecated_input_object_field_test.dart b/test/query_generator/deprecated/deprecated_input_object_field_test.dart
index 2c04ffbc..c5ce744e 100644
--- a/test/query_generator/deprecated/deprecated_input_object_field_test.dart
+++ b/test/query_generator/deprecated/deprecated_input_object_field_test.dart
@@ -120,6 +120,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() =>
       _$Custom$MutationRoot$MutationResponseToJson(this);
 }
@@ -135,6 +136,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [mut];
+  @override
   Map<String, dynamic> toJson() => _$Custom$MutationRootToJson(this);
 }
 
@@ -151,6 +153,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s, d];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
diff --git a/test/query_generator/deprecated/deprecated_interface_field_test.dart b/test/query_generator/deprecated/deprecated_interface_field_test.dart
index 88d974d9..c9d0a8f3 100644
--- a/test/query_generator/deprecated/deprecated_interface_field_test.dart
+++ b/test/query_generator/deprecated/deprecated_interface_field_test.dart
@@ -186,6 +186,7 @@ class Custom$Query$Node$User extends Custom$Query$Node
 
   @override
   List<Object?> get props => [id, username];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Query$Node$UserToJson(this);
 }
 
@@ -200,6 +201,7 @@ class Custom$Query$Node$ChatMessage$User extends JsonSerializable
 
   @override
   List<Object?> get props => [id, username];
+  @override
   Map<String, dynamic> toJson() =>
       _$Custom$Query$Node$ChatMessage$UserToJson(this);
 }
@@ -218,6 +220,7 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node
 
   @override
   List<Object?> get props => [message, user];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Query$Node$ChatMessageToJson(this);
 }
 
@@ -243,6 +246,7 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [id, deprecatedField];
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'User':
@@ -266,6 +270,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [nodeById];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryToJson(this);
 }
 ''';
diff --git a/test/query_generator/enums/enum_duplication_test.dart b/test/query_generator/enums/enum_duplication_test.dart
index 56f41b4f..9da091be 100644
--- a/test/query_generator/enums/enum_duplication_test.dart
+++ b/test/query_generator/enums/enum_duplication_test.dart
@@ -156,6 +156,7 @@ class Custom$Query$Q extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [e];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Query$QToJson(this);
 }
 
@@ -170,6 +171,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryToJson(this);
 }
 
@@ -185,6 +187,7 @@ class CustomList$Query$QList extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [e];
+  @override
   Map<String, dynamic> toJson() => _$CustomList$Query$QListToJson(this);
 }
 
@@ -199,6 +202,7 @@ class CustomList$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [qList];
+  @override
   Map<String, dynamic> toJson() => _$CustomList$QueryToJson(this);
 }
 
diff --git a/test/query_generator/enums/enum_list_test.dart b/test/query_generator/enums/enum_list_test.dart
index 9497129a..f5232b36 100644
--- a/test/query_generator/enums/enum_list_test.dart
+++ b/test/query_generator/enums/enum_list_test.dart
@@ -105,6 +105,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [le];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$QueryResponseToJson(this);
 }
 
@@ -119,6 +120,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 
diff --git a/test/query_generator/enums/filter_enum_test.dart b/test/query_generator/enums/filter_enum_test.dart
index 8e273ab9..af915900 100644
--- a/test/query_generator/enums/filter_enum_test.dart
+++ b/test/query_generator/enums/filter_enum_test.dart
@@ -171,6 +171,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [e];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$QueryResponseToJson(this);
 }
 
@@ -185,6 +186,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 
@@ -199,6 +201,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [e];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
diff --git a/test/query_generator/enums/input_enum_list_test.dart b/test/query_generator/enums/input_enum_list_test.dart
index d9a116b3..b3a4d2d0 100644
--- a/test/query_generator/enums/input_enum_list_test.dart
+++ b/test/query_generator/enums/input_enum_list_test.dart
@@ -137,6 +137,7 @@ class BrowseArticles$Query$Article extends JsonSerializable
 
   @override
   List<Object?> get props => [id, title, articleType];
+  @override
   Map<String, dynamic> toJson() => _$BrowseArticles$Query$ArticleToJson(this);
 }
 
@@ -151,6 +152,7 @@ class BrowseArticles$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [articles];
+  @override
   Map<String, dynamic> toJson() => _$BrowseArticles$QueryToJson(this);
 }
 
diff --git a/test/query_generator/enums/input_enum_test.dart b/test/query_generator/enums/input_enum_test.dart
index 39804e8d..c5aed1f6 100644
--- a/test/query_generator/enums/input_enum_test.dart
+++ b/test/query_generator/enums/input_enum_test.dart
@@ -170,6 +170,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [s, my, other];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$QueryResponseToJson(this);
 }
 
@@ -184,6 +185,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 
@@ -198,6 +200,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [e];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
diff --git a/test/query_generator/enums/kw_prefix_test.dart b/test/query_generator/enums/kw_prefix_test.dart
index 9a350814..2399f61c 100644
--- a/test/query_generator/enums/kw_prefix_test.dart
+++ b/test/query_generator/enums/kw_prefix_test.dart
@@ -137,6 +137,7 @@ class SearchArticles$Query$Article extends JsonSerializable
 
   @override
   List<Object?> get props => [id, title];
+  @override
   Map<String, dynamic> toJson() => _$SearchArticles$Query$ArticleToJson(this);
 }
 
@@ -151,6 +152,7 @@ class SearchArticles$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [articles];
+  @override
   Map<String, dynamic> toJson() => _$SearchArticles$QueryToJson(this);
 }
 
@@ -168,6 +170,7 @@ class ArticleTitleWhereConditions extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [kw$operator, value];
+  @override
   Map<String, dynamic> toJson() => _$ArticleTitleWhereConditionsToJson(this);
 }
 
diff --git a/test/query_generator/enums/query_enum_test.dart b/test/query_generator/enums/query_enum_test.dart
index 4a4e60d6..7c05b22e 100644
--- a/test/query_generator/enums/query_enum_test.dart
+++ b/test/query_generator/enums/query_enum_test.dart
@@ -107,6 +107,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [e];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRoot$QueryResponseToJson(this);
 }
 
@@ -121,6 +122,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [q];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 
diff --git a/test/query_generator/forwarder_test.dart b/test/query_generator/forwarder_test.dart
index 0b909c96..58a23504 100644
--- a/test/query_generator/forwarder_test.dart
+++ b/test/query_generator/forwarder_test.dart
@@ -86,6 +86,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [a];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
 }
 ''';
diff --git a/test/query_generator/fragments/fragment_duplication_test.dart b/test/query_generator/fragments/fragment_duplication_test.dart
index 4c8e1b58..99c476ce 100644
--- a/test/query_generator/fragments/fragment_duplication_test.dart
+++ b/test/query_generator/fragments/fragment_duplication_test.dart
@@ -241,6 +241,7 @@ class PokemonData$Query$Pokemon extends JsonSerializable
 
   @override
   List<Object?> get props => [id, evolution, number, name];
+  @override
   Map<String, dynamic> toJson() => _$PokemonData$Query$PokemonToJson(this);
 }
 
@@ -255,6 +256,7 @@ class PokemonData$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [pokemon];
+  @override
   Map<String, dynamic> toJson() => _$PokemonData$QueryToJson(this);
 }
 
@@ -268,6 +270,7 @@ class PokemonMixin$Evolution extends JsonSerializable
 
   @override
   List<Object?> get props => [name];
+  @override
   Map<String, dynamic> toJson() => _$PokemonMixin$EvolutionToJson(this);
 }
 
@@ -282,6 +285,7 @@ class AllPokemonsData$Query$AllPokemons extends JsonSerializable
 
   @override
   List<Object?> get props => [id, evolution, number, name];
+  @override
   Map<String, dynamic> toJson() =>
       _$AllPokemonsData$Query$AllPokemonsToJson(this);
 }
@@ -297,6 +301,7 @@ class AllPokemonsData$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [allPokemons];
+  @override
   Map<String, dynamic> toJson() => _$AllPokemonsData$QueryToJson(this);
 }
 ''';
diff --git a/test/query_generator/fragments/fragment_glob_test.dart b/test/query_generator/fragments/fragment_glob_test.dart
index 5469cecd..b59e0933 100644
--- a/test/query_generator/fragments/fragment_glob_test.dart
+++ b/test/query_generator/fragments/fragment_glob_test.dart
@@ -221,6 +221,7 @@ class Query$Query$Pokemon$Pokemon extends JsonSerializable
 
   @override
   List<Object?> get props => [id, weight, attacks];
+  @override
   Map<String, dynamic> toJson() => _$Query$Query$Pokemon$PokemonToJson(this);
 }
 
@@ -236,6 +237,7 @@ class Query$Query$Pokemon extends JsonSerializable
 
   @override
   List<Object?> get props => [id, weight, attacks, evolutions];
+  @override
   Map<String, dynamic> toJson() => _$Query$Query$PokemonToJson(this);
 }
 
@@ -250,6 +252,7 @@ class Query$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [pokemon];
+  @override
   Map<String, dynamic> toJson() => _$Query$QueryToJson(this);
 }
 
@@ -263,6 +266,7 @@ class PokemonMixin$PokemonDimension extends JsonSerializable
 
   @override
   List<Object?> get props => [minimum];
+  @override
   Map<String, dynamic> toJson() => _$PokemonMixin$PokemonDimensionToJson(this);
 }
 
@@ -276,6 +280,7 @@ class PokemonMixin$PokemonAttack extends JsonSerializable
 
   @override
   List<Object?> get props => [special];
+  @override
   Map<String, dynamic> toJson() => _$PokemonMixin$PokemonAttackToJson(this);
 }
 
@@ -289,6 +294,7 @@ class PokemonAttackMixin$Attack extends JsonSerializable
 
   @override
   List<Object?> get props => [name];
+  @override
   Map<String, dynamic> toJson() => _$PokemonAttackMixin$AttackToJson(this);
 }
 
diff --git a/test/query_generator/fragments/fragment_multiple_queries_test.dart b/test/query_generator/fragments/fragment_multiple_queries_test.dart
index 6cffc871..935f9a42 100644
--- a/test/query_generator/fragments/fragment_multiple_queries_test.dart
+++ b/test/query_generator/fragments/fragment_multiple_queries_test.dart
@@ -202,6 +202,7 @@ class GetPokemon$Query$Pokemon extends JsonSerializable
 
   @override
   List<Object?> get props => [number, name];
+  @override
   Map<String, dynamic> toJson() => _$GetPokemon$Query$PokemonToJson(this);
 }
 
@@ -216,6 +217,7 @@ class GetPokemon$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [pokemon];
+  @override
   Map<String, dynamic> toJson() => _$GetPokemon$QueryToJson(this);
 }
 
@@ -229,6 +231,7 @@ class GetAllPokemons$Query$Pokemon extends JsonSerializable
 
   @override
   List<Object?> get props => [number, name];
+  @override
   Map<String, dynamic> toJson() => _$GetAllPokemons$Query$PokemonToJson(this);
 }
 
@@ -243,6 +246,7 @@ class GetAllPokemons$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [pokemons];
+  @override
   Map<String, dynamic> toJson() => _$GetAllPokemons$QueryToJson(this);
 }
 
diff --git a/test/query_generator/fragments/fragment_on_fragments_test.dart b/test/query_generator/fragments/fragment_on_fragments_test.dart
index 012d8b2d..0f50e90b 100644
--- a/test/query_generator/fragments/fragment_on_fragments_test.dart
+++ b/test/query_generator/fragments/fragment_on_fragments_test.dart
@@ -160,6 +160,7 @@ class Query$Query$Pokemon extends JsonSerializable
 
   @override
   List<Object?> get props => [id, evolution, number, name];
+  @override
   Map<String, dynamic> toJson() => _$Query$Query$PokemonToJson(this);
 }
 
@@ -174,6 +175,7 @@ class Query$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [pokemon];
+  @override
   Map<String, dynamic> toJson() => _$Query$QueryToJson(this);
 }
 
@@ -187,6 +189,7 @@ class PokemonMixin$Pokemon extends JsonSerializable
 
   @override
   List<Object?> get props => [name];
+  @override
   Map<String, dynamic> toJson() => _$PokemonMixin$PokemonToJson(this);
 }
 ''';
diff --git a/test/query_generator/fragments/fragments_multiple_test.dart b/test/query_generator/fragments/fragments_multiple_test.dart
index 1a6d026f..88d904ba 100644
--- a/test/query_generator/fragments/fragments_multiple_test.dart
+++ b/test/query_generator/fragments/fragments_multiple_test.dart
@@ -246,6 +246,7 @@ class VoyagesData$Query$VoyageList$VoyageDetails$Voyage extends JsonSerializable
 
   @override
   List<Object?> get props => [dateFrom, dateTo, id, voyageNumber];
+  @override
   Map<String, dynamic> toJson() =>
       _$VoyagesData$Query$VoyageList$VoyageDetails$VoyageToJson(this);
 }
@@ -265,6 +266,7 @@ class VoyagesData$Query$VoyageList$VoyageDetails extends JsonSerializable
 
   @override
   List<Object?> get props => [numberOfReports, voyage];
+  @override
   Map<String, dynamic> toJson() =>
       _$VoyagesData$Query$VoyageList$VoyageDetailsToJson(this);
 }
@@ -281,6 +283,7 @@ class VoyagesData$Query$VoyageList extends JsonSerializable
 
   @override
   List<Object?> get props => [voyages];
+  @override
   Map<String, dynamic> toJson() => _$VoyagesData$Query$VoyageListToJson(this);
 }
 
@@ -295,6 +298,7 @@ class VoyagesData$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [voyages];
+  @override
   Map<String, dynamic> toJson() => _$VoyagesData$QueryToJson(this);
 }
 
@@ -311,6 +315,7 @@ class PaginationInput extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [limit, offset];
+  @override
   Map<String, dynamic> toJson() => _$PaginationInputToJson(this);
 }
 
diff --git a/test/query_generator/fragments/fragments_test.dart b/test/query_generator/fragments/fragments_test.dart
index 626b9156..14b70084 100644
--- a/test/query_generator/fragments/fragments_test.dart
+++ b/test/query_generator/fragments/fragments_test.dart
@@ -86,6 +86,7 @@ class SomeQuery$SomeObject extends JsonSerializable
 
   @override
   List<Object?> get props => [s, i];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$SomeObjectToJson(this);
 }
 ''';
diff --git a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart
index 5812c611..af2621db 100644
--- a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart
+++ b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart
@@ -139,6 +139,7 @@ class SomeObject extends JsonSerializable with EquatableMixin, MyFragmentMixin {
 
   @override
   List<Object?> get props => [s, i];
+  @override
   Map<String, dynamic> toJson() => _$SomeObjectToJson(this);
 }
 
@@ -153,6 +154,7 @@ class MoreData extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [someObject];
+  @override
   Map<String, dynamic> toJson() => _$MoreDataToJson(this);
 }
 
@@ -169,6 +171,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [someObject, moreData];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryResponseToJson(this);
 }
 ''';
diff --git a/test/query_generator/interfaces/interface_fragment_glob_test.dart b/test/query_generator/interfaces/interface_fragment_glob_test.dart
index 86e7e0bf..b51dfa74 100644
--- a/test/query_generator/interfaces/interface_fragment_glob_test.dart
+++ b/test/query_generator/interfaces/interface_fragment_glob_test.dart
@@ -191,6 +191,7 @@ class Custom$Query$NodeById$User extends Custom$Query$NodeById
 
   @override
   List<Object?> get props => [id, username];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Query$NodeById$UserToJson(this);
 }
 
@@ -205,6 +206,7 @@ class Custom$Query$NodeById$ChatMessage$User extends JsonSerializable
 
   @override
   List<Object?> get props => [id, username];
+  @override
   Map<String, dynamic> toJson() =>
       _$Custom$Query$NodeById$ChatMessage$UserToJson(this);
 }
@@ -224,6 +226,7 @@ class Custom$Query$NodeById$ChatMessage extends Custom$Query$NodeById
 
   @override
   List<Object?> get props => [message, user];
+  @override
   Map<String, dynamic> toJson() =>
       _$Custom$Query$NodeById$ChatMessageToJson(this);
 }
@@ -250,6 +253,7 @@ class Custom$Query$NodeById extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [id, $$typename];
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'User':
@@ -273,6 +277,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [nodeById];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryToJson(this);
 }
 ''';
diff --git a/test/query_generator/interfaces/interface_possible_types_test.dart b/test/query_generator/interfaces/interface_possible_types_test.dart
index c6719e12..a2094601 100644
--- a/test/query_generator/interfaces/interface_possible_types_test.dart
+++ b/test/query_generator/interfaces/interface_possible_types_test.dart
@@ -156,6 +156,7 @@ class Custom$Query$Node$User extends Custom$Query$Node with EquatableMixin {
 
   @override
   List<Object?> get props => [username];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Query$Node$UserToJson(this);
 }
 
@@ -171,6 +172,7 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node
 
   @override
   List<Object?> get props => [message];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Query$Node$ChatMessageToJson(this);
 }
 
@@ -196,6 +198,7 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [id, $$typename];
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'User':
@@ -219,6 +222,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [nodeById];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryToJson(this);
 }
 ''';
diff --git a/test/query_generator/interfaces/interface_test.dart b/test/query_generator/interfaces/interface_test.dart
index 945f8a7b..76c1aa35 100644
--- a/test/query_generator/interfaces/interface_test.dart
+++ b/test/query_generator/interfaces/interface_test.dart
@@ -182,6 +182,7 @@ class Custom$Query$Node$User extends Custom$Query$Node
 
   @override
   List<Object?> get props => [id, username];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Query$Node$UserToJson(this);
 }
 
@@ -196,6 +197,7 @@ class Custom$Query$Node$ChatMessage$User extends JsonSerializable
 
   @override
   List<Object?> get props => [id, username];
+  @override
   Map<String, dynamic> toJson() =>
       _$Custom$Query$Node$ChatMessage$UserToJson(this);
 }
@@ -214,6 +216,7 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node
 
   @override
   List<Object?> get props => [message, user];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Query$Node$ChatMessageToJson(this);
 }
 
@@ -239,6 +242,7 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [id, $$typename];
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'User':
@@ -262,6 +266,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [nodeById];
+  @override
   Map<String, dynamic> toJson() => _$Custom$QueryToJson(this);
 }
 ''';
diff --git a/test/query_generator/multiple_operations_per_file_test.dart b/test/query_generator/multiple_operations_per_file_test.dart
index 16b4e20f..5162f492 100644
--- a/test/query_generator/multiple_operations_per_file_test.dart
+++ b/test/query_generator/multiple_operations_per_file_test.dart
@@ -179,6 +179,7 @@ class MutData$Mutation$MutationResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() =>
       _$MutData$Mutation$MutationResponseToJson(this);
 }
@@ -194,6 +195,7 @@ class MutData$Mutation extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [mut];
+  @override
   Map<String, dynamic> toJson() => _$MutData$MutationToJson(this);
 }
 
@@ -207,6 +209,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
@@ -225,6 +228,7 @@ class QueData$Query$QueryResponse extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s, i, list];
+  @override
   Map<String, dynamic> toJson() => _$QueData$Query$QueryResponseToJson(this);
 }
 
@@ -239,6 +243,7 @@ class QueData$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [que];
+  @override
   Map<String, dynamic> toJson() => _$QueData$QueryToJson(this);
 }
 
diff --git a/test/query_generator/multiple_queries_test.dart b/test/query_generator/multiple_queries_test.dart
index b0a41481..4e3caf9f 100644
--- a/test/query_generator/multiple_queries_test.dart
+++ b/test/query_generator/multiple_queries_test.dart
@@ -94,6 +94,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s, i];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$SomeObjectToJson(this);
 }
 
@@ -108,6 +109,7 @@ class AnotherQuery$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$AnotherQuery$SomeObjectToJson(this);
 }
 ''';
diff --git a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart
index 69bdc576..197f4e0e 100644
--- a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart
+++ b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart
@@ -142,6 +142,7 @@ class SomeQuery$QueryRoot$SomeObject extends JsonSerializable
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryRoot$SomeObjectToJson(this);
 }
 
@@ -156,6 +157,7 @@ class SomeQuery$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [o];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryRootToJson(this);
 }
 
@@ -177,6 +179,7 @@ class ComplexInput extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s, e, ls, i];
+  @override
   Map<String, dynamic> toJson() => _$ComplexInputToJson(this);
 }
 
diff --git a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart
index 6ba9565a..46bf281e 100644
--- a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart
+++ b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart
@@ -157,6 +157,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() =>
       _$Custom$MutationRoot$MutationResponseToJson(this);
 }
@@ -172,6 +173,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [mut];
+  @override
   Map<String, dynamic> toJson() => _$Custom$MutationRootToJson(this);
 }
 
@@ -193,6 +195,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [id, idNullabe];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
diff --git a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart
index c5724396..fa40a287 100644
--- a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart
+++ b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart
@@ -133,6 +133,7 @@ class SomeQuery$QueryRoot$SomeObject extends JsonSerializable
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryRoot$SomeObjectToJson(this);
 }
 
@@ -147,6 +148,7 @@ class SomeQuery$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [o];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryRootToJson(this);
 }
 
@@ -160,6 +162,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
@@ -174,6 +177,7 @@ class SubInput extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$SubInputToJson(this);
 }
 
diff --git a/test/query_generator/mutations_and_inputs/input_duplication_test.dart b/test/query_generator/mutations_and_inputs/input_duplication_test.dart
index 2dee86f8..bce82871 100644
--- a/test/query_generator/mutations_and_inputs/input_duplication_test.dart
+++ b/test/query_generator/mutations_and_inputs/input_duplication_test.dart
@@ -171,6 +171,7 @@ class Custom$Mutation$Mut extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$Custom$Mutation$MutToJson(this);
 }
 
@@ -185,6 +186,7 @@ class Custom$Mutation extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [mut];
+  @override
   Map<String, dynamic> toJson() => _$Custom$MutationToJson(this);
 }
 
@@ -198,6 +200,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
@@ -212,6 +215,7 @@ class CustomList$Mutation$MutList extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$CustomList$Mutation$MutListToJson(this);
 }
 
@@ -226,6 +230,7 @@ class CustomList$Mutation extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [mutList];
+  @override
   Map<String, dynamic> toJson() => _$CustomList$MutationToJson(this);
 }
 
diff --git a/test/query_generator/mutations_and_inputs/mutations_test.dart b/test/query_generator/mutations_and_inputs/mutations_test.dart
index 4c081f33..63f0a547 100644
--- a/test/query_generator/mutations_and_inputs/mutations_test.dart
+++ b/test/query_generator/mutations_and_inputs/mutations_test.dart
@@ -183,6 +183,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() =>
       _$Custom$MutationRoot$MutationResponseToJson(this);
 }
@@ -198,6 +199,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [mut];
+  @override
   Map<String, dynamic> toJson() => _$Custom$MutationRootToJson(this);
 }
 
@@ -211,6 +213,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
@@ -228,6 +231,7 @@ class $custom$MutationRoot$$MutationResponse extends JsonSerializable
 
   @override
   List<Object?> get props => [$s];
+  @override
   Map<String, dynamic> toJson() =>
       _$$custom$MutationRoot$$MutationResponseToJson(this);
 }
@@ -244,6 +248,7 @@ class $custom$MutationRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [$mut];
+  @override
   Map<String, dynamic> toJson() => _$$custom$MutationRootToJson(this);
 }
 
@@ -258,6 +263,7 @@ class $Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [$s];
+  @override
   Map<String, dynamic> toJson() => _$$InputToJson(this);
 }
 
diff --git a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart
index 1619e7c4..63d88931 100644
--- a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart
+++ b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart
@@ -118,6 +118,7 @@ class SomeQuery$Query$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$Query$SomeObjectToJson(this);
 }
 
@@ -132,6 +133,7 @@ class SomeQuery$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [someQuery];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryToJson(this);
 }
 
diff --git a/test/query_generator/mutations_and_inputs/recursive_input_test.dart b/test/query_generator/mutations_and_inputs/recursive_input_test.dart
index 62acfc82..1908658a 100644
--- a/test/query_generator/mutations_and_inputs/recursive_input_test.dart
+++ b/test/query_generator/mutations_and_inputs/recursive_input_test.dart
@@ -93,6 +93,7 @@ class Custom$Mutation extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [mut];
+  @override
   Map<String, dynamic> toJson() => _$Custom$MutationToJson(this);
 }
 
@@ -108,6 +109,7 @@ class Input extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [and, or];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 ''';
diff --git a/test/query_generator/naming/casing_conversion_test.dart b/test/query_generator/naming/casing_conversion_test.dart
index ac25b38f..23870937 100644
--- a/test/query_generator/naming/casing_conversion_test.dart
+++ b/test/query_generator/naming/casing_conversion_test.dart
@@ -232,6 +232,7 @@ class SomeObject extends JsonSerializable with EquatableMixin {
         screamingSnakeCaseField,
         e
       ];
+  @override
   Map<String, dynamic> toJson() => _$SomeObjectToJson(this);
 }
 
@@ -246,6 +247,7 @@ class SomeQuery$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [query];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$QueryToJson(this);
 }
 
@@ -282,6 +284,7 @@ class Input extends JsonSerializable with EquatableMixin {
         screamingSnakeCaseField,
         e
       ];
+  @override
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
diff --git a/test/query_generator/naming/simple_naming_test.dart b/test/query_generator/naming/simple_naming_test.dart
index be9ddf61..8fc64aaa 100644
--- a/test/query_generator/naming/simple_naming_test.dart
+++ b/test/query_generator/naming/simple_naming_test.dart
@@ -119,6 +119,7 @@ class ClientEventItem extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [type];
+  @override
   Map<String, dynamic> toJson() => _$ClientEventItemToJson(this);
 }
 
@@ -133,6 +134,7 @@ class ClientEventPage extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [items];
+  @override
   Map<String, dynamic> toJson() => _$ClientEventPageToJson(this);
 }
 
@@ -147,6 +149,7 @@ class ClientEventsData$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [clientEvents];
+  @override
   Map<String, dynamic> toJson() => _$ClientEventsData$QueryToJson(this);
 }
 
diff --git a/test/query_generator/nnbd_test.dart b/test/query_generator/nnbd_test.dart
index 885ce2cf..9a102ac6 100644
--- a/test/query_generator/nnbd_test.dart
+++ b/test/query_generator/nnbd_test.dart
@@ -94,6 +94,7 @@ class Query$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [nonNullAndSelected, nullableAndSelected];
+  @override
   Map<String, dynamic> toJson() => _$Query$QueryToJson(this);
 }
 ''';
@@ -194,6 +195,7 @@ class Query$Query extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [i, inn, li, linn, lnni, lnninn, matrix, matrixnn];
+  @override
   Map<String, dynamic> toJson() => _$Query$QueryToJson(this);
 }
 ''';
diff --git a/test/query_generator/query_generator_test.dart b/test/query_generator/query_generator_test.dart
index c85a4dee..b4e9c90d 100644
--- a/test/query_generator/query_generator_test.dart
+++ b/test/query_generator/query_generator_test.dart
@@ -65,6 +65,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s, i];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$SomeObjectToJson(this);
 }
 ''',
@@ -182,6 +183,7 @@ class SomeQuery$Result$SomeObject$AnotherObject extends JsonSerializable
 
   @override
   List<Object?> get props => [str];
+  @override
   Map<String, dynamic> toJson() =>
       _$SomeQuery$Result$SomeObject$AnotherObjectToJson(this);
 }
@@ -199,6 +201,7 @@ class SomeQuery$Result$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [st, ob];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$Result$SomeObjectToJson(this);
 }
 
@@ -215,6 +218,7 @@ class SomeQuery$Result extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [s, o];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$ResultToJson(this);
 }
 ''',
diff --git a/test/query_generator/scalars/custom_scalars_test.dart b/test/query_generator/scalars/custom_scalars_test.dart
index 26465f2f..f47f8548 100644
--- a/test/query_generator/scalars/custom_scalars_test.dart
+++ b/test/query_generator/scalars/custom_scalars_test.dart
@@ -194,6 +194,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [a];
+  @override
   Map<String, dynamic> toJson() => _$Query$SomeObjectToJson(this);
 }
 ''';
@@ -222,6 +223,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [a];
+  @override
   Map<String, dynamic> toJson() => _$Query$SomeObjectToJson(this);
 }
 ''';
@@ -251,6 +253,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [a];
+  @override
   Map<String, dynamic> toJson() => _$Query$SomeObjectToJson(this);
 }
 ''';
diff --git a/test/query_generator/scalars/scalars_test.dart b/test/query_generator/scalars/scalars_test.dart
index 081b5d47..c9d5fd7d 100644
--- a/test/query_generator/scalars/scalars_test.dart
+++ b/test/query_generator/scalars/scalars_test.dart
@@ -126,6 +126,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [i, f, s, b, id];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$SomeObjectToJson(this);
 }
 ''';
diff --git a/test/query_generator/scalars/unused_custom_scalars_test.dart b/test/query_generator/scalars/unused_custom_scalars_test.dart
index 0485d15e..3e84dfdb 100644
--- a/test/query_generator/scalars/unused_custom_scalars_test.dart
+++ b/test/query_generator/scalars/unused_custom_scalars_test.dart
@@ -78,6 +78,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [a];
+  @override
   Map<String, dynamic> toJson() => _$Query$SomeObjectToJson(this);
 }
 ''';
diff --git a/test/query_generator/subscription_test.dart b/test/query_generator/subscription_test.dart
index e6c32a03..5cc4e0e6 100644
--- a/test/query_generator/subscription_test.dart
+++ b/test/query_generator/subscription_test.dart
@@ -154,6 +154,7 @@ class NewUserSub$Subscription$User extends JsonSerializable
 
   @override
   List<Object?> get props => [firstName, lastName, userType];
+  @override
   Map<String, dynamic> toJson() => _$NewUserSub$Subscription$UserToJson(this);
 }
 
@@ -168,6 +169,7 @@ class NewUserSub$Subscription extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [newUser];
+  @override
   Map<String, dynamic> toJson() => _$NewUserSub$SubscriptionToJson(this);
 }
 
diff --git a/test/query_generator/union/union_types_test.dart b/test/query_generator/union/union_types_test.dart
index 7eafdcc0..a548d8ce 100644
--- a/test/query_generator/union/union_types_test.dart
+++ b/test/query_generator/union/union_types_test.dart
@@ -241,6 +241,7 @@ class SomeQuery$SomeObject$SomeUnion$TypeA
 
   @override
   List<Object?> get props => [a, $, $a, $aA, $aA_, $new, $$typename];
+  @override
   Map<String, dynamic> toJson() =>
       _$SomeQuery$SomeObject$SomeUnion$TypeAToJson(this);
 }
@@ -280,6 +281,7 @@ class SomeQuery$SomeObject$SomeUnion$TypeB
 
   @override
   List<Object?> get props => [b, $, $b, $bB, $bB_, kw$new, kw$IN, $$typename];
+  @override
   Map<String, dynamic> toJson() =>
       _$SomeQuery$SomeObject$SomeUnion$TypeBToJson(this);
 }
@@ -305,6 +307,7 @@ class SomeQuery$SomeObject$SomeUnion extends JsonSerializable
 
   @override
   List<Object?> get props => [$$typename];
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'TypeA':
@@ -328,6 +331,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [o];
+  @override
   Map<String, dynamic> toJson() => _$SomeQuery$SomeObjectToJson(this);
 }
 ''';
diff --git a/test/query_generator/union/union_with_nested_types_test.dart b/test/query_generator/union/union_with_nested_types_test.dart
index 2cce7ebc..7d8c3f58 100644
--- a/test/query_generator/union/union_with_nested_types_test.dart
+++ b/test/query_generator/union/union_with_nested_types_test.dart
@@ -219,6 +219,7 @@ class CheckoutById$QueryRoot$Node$Checkout$CheckoutLineItemConnection$CheckoutLi
 
   @override
   List<Object?> get props => [id];
+  @override
   Map<String, dynamic> toJson() =>
       _$CheckoutById$QueryRoot$Node$Checkout$CheckoutLineItemConnection$CheckoutLineItemEdge$ImageConnectionToJson(
           this);
@@ -239,6 +240,7 @@ class CheckoutById$QueryRoot$Node$Checkout$CheckoutLineItemConnection$CheckoutLi
 
   @override
   List<Object?> get props => [edges];
+  @override
   Map<String, dynamic> toJson() =>
       _$CheckoutById$QueryRoot$Node$Checkout$CheckoutLineItemConnection$CheckoutLineItemEdgeToJson(
           this);
@@ -262,6 +264,7 @@ class CheckoutById$QueryRoot$Node$Checkout$CheckoutLineItemConnection
 
   @override
   List<Object?> get props => [id, edges];
+  @override
   Map<String, dynamic> toJson() =>
       _$CheckoutById$QueryRoot$Node$Checkout$CheckoutLineItemConnectionToJson(
           this);
@@ -283,6 +286,7 @@ class CheckoutById$QueryRoot$Node$Checkout extends CheckoutById$QueryRoot$Node
 
   @override
   List<Object?> get props => [id, lineItems];
+  @override
   Map<String, dynamic> toJson() =>
       _$CheckoutById$QueryRoot$Node$CheckoutToJson(this);
 }
@@ -305,6 +309,7 @@ class CheckoutById$QueryRoot$Node extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [$$typename];
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'Checkout':
@@ -326,6 +331,7 @@ class CheckoutById$QueryRoot extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [node];
+  @override
   Map<String, dynamic> toJson() => _$CheckoutById$QueryRootToJson(this);
 }
 ''';