diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c1353db..6bcd0113 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 7.0.0-beta.17
+
+- example indentaion fix
+
 ## 7.0.0-beta.16
 
 - lazy canonical visitors
diff --git a/example/github/lib/graphql/search_repositories.graphql.dart b/example/github/lib/graphql/search_repositories.graphql.dart
index 3aecc329..5625da5d 100644
--- a/example/github/lib/graphql/search_repositories.graphql.dart
+++ b/example/github/lib/graphql/search_repositories.graphql.dart
@@ -24,6 +24,7 @@ class SearchRepositories$Query$SearchResultItemConnection$SearchResultItem$Repos
   @override
   List<Object?> get props => [name];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$SearchRepositories$Query$SearchResultItemConnection$SearchResultItem$RepositoryToJson(
           this);
@@ -52,6 +53,7 @@ class SearchRepositories$Query$SearchResultItemConnection$SearchResultItem
   @override
   List<Object?> get props => [$$typename];
 
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'Repository':
@@ -80,6 +82,7 @@ class SearchRepositories$Query$SearchResultItemConnection
   @override
   List<Object?> get props => [nodes];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$SearchRepositories$Query$SearchResultItemConnectionToJson(this);
 }
@@ -96,6 +99,7 @@ class SearchRepositories$Query extends JsonSerializable with EquatableMixin {
   @override
   List<Object?> get props => [search];
 
+  @override
   Map<String, dynamic> toJson() => _$SearchRepositories$QueryToJson(this);
 }
 
diff --git a/example/github/pubspec.lock b/example/github/pubspec.lock
index 1a1e381f..3590525b 100644
--- a/example/github/pubspec.lock
+++ b/example/github/pubspec.lock
@@ -28,7 +28,7 @@ packages:
       path: "../.."
       relative: true
     source: path
-    version: "7.0.0-beta.13"
+    version: "7.0.0-beta.17"
   async:
     dependency: transitive
     description:
diff --git a/example/graphbrainz/build.yaml b/example/graphbrainz/build.yaml
index 57c5eed0..788289b5 100644
--- a/example/graphbrainz/build.yaml
+++ b/example/graphbrainz/build.yaml
@@ -12,26 +12,26 @@ targets:
           custom_parser_import: 'package:graphbrainz_example/coercers.dart'
           scalar_mapping:
             - graphql_type: Date
-            dart_type: DateTime
-            use_custom_parser: true
-          - graphql_type: Time
-            dart_type: DateTime
-            use_custom_parser: true
-          - graphql_type: DiscID
-            dart_type: String
-          - graphql_type: MBID
-            dart_type: String
-          - graphql_type: ASIN
-            dart_type: String
-          - graphql_type: IPI
-            dart_type: String
-          - graphql_type: ISNI
-            dart_type: String
-          - graphql_type: ISRC
-            dart_type: String
-          - graphql_type: URLString
-            dart_type: String
-          - graphql_type: Degrees
-            dart_type: double
-          - graphql_type: Locale
-            dart_type: String
+              dart_type: DateTime
+              use_custom_parser: true
+            - graphql_type: Time
+              dart_type: DateTime
+              use_custom_parser: true
+            - graphql_type: DiscID
+              dart_type: String
+            - graphql_type: MBID
+              dart_type: String
+            - graphql_type: ASIN
+              dart_type: String
+            - graphql_type: IPI
+              dart_type: String
+            - graphql_type: ISNI
+              dart_type: String
+            - graphql_type: ISRC
+              dart_type: String
+            - graphql_type: URLString
+              dart_type: String
+            - graphql_type: Degrees
+              dart_type: double
+            - graphql_type: Locale
+              dart_type: String
diff --git a/example/graphbrainz/lib/queries/ed_sheeran.query.graphql.dart b/example/graphbrainz/lib/queries/ed_sheeran.query.graphql.dart
index 71cdecf4..16fc6dec 100644
--- a/example/graphbrainz/lib/queries/ed_sheeran.query.graphql.dart
+++ b/example/graphbrainz/lib/queries/ed_sheeran.query.graphql.dart
@@ -5,12 +5,11 @@ import 'package:artemis/artemis.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:equatable/equatable.dart';
 import 'package:gql/ast.dart';
-
 part 'ed_sheeran.query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class EdSheeran$Query$Node$Artist$ReleaseConnection$Release
-    extends EdSheeran$Query$Node$Artist$ReleaseConnection with EquatableMixin {
+    extends JsonSerializable with EquatableMixin {
   EdSheeran$Query$Node$Artist$ReleaseConnection$Release();
 
   factory EdSheeran$Query$Node$Artist$ReleaseConnection$Release.fromJson(
@@ -25,13 +24,14 @@ class EdSheeran$Query$Node$Artist$ReleaseConnection$Release
   @override
   List<Object?> get props => [id, status];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$EdSheeran$Query$Node$Artist$ReleaseConnection$ReleaseToJson(this);
 }
 
 @JsonSerializable(explicitToJson: true)
-class EdSheeran$Query$Node$Artist$ReleaseConnection
-    extends EdSheeran$Query$Node$Artist with EquatableMixin {
+class EdSheeran$Query$Node$Artist$ReleaseConnection extends JsonSerializable
+    with EquatableMixin {
   EdSheeran$Query$Node$Artist$ReleaseConnection();
 
   factory EdSheeran$Query$Node$Artist$ReleaseConnection.fromJson(
@@ -43,12 +43,13 @@ class EdSheeran$Query$Node$Artist$ReleaseConnection
   @override
   List<Object?> get props => [nodes];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$EdSheeran$Query$Node$Artist$ReleaseConnectionToJson(this);
 }
 
 @JsonSerializable(explicitToJson: true)
-class EdSheeran$Query$Node$Artist$LifeSpan extends EdSheeran$Query$Node$Artist
+class EdSheeran$Query$Node$Artist$LifeSpan extends JsonSerializable
     with EquatableMixin {
   EdSheeran$Query$Node$Artist$LifeSpan();
 
@@ -61,13 +62,14 @@ class EdSheeran$Query$Node$Artist$LifeSpan extends EdSheeran$Query$Node$Artist
   @override
   List<Object?> get props => [begin];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$EdSheeran$Query$Node$Artist$LifeSpanToJson(this);
 }
 
 @JsonSerializable(explicitToJson: true)
-class EdSheeran$Query$Node$Artist$SpotifyArtist
-    extends EdSheeran$Query$Node$Artist with EquatableMixin {
+class EdSheeran$Query$Node$Artist$SpotifyArtist extends JsonSerializable
+    with EquatableMixin {
   EdSheeran$Query$Node$Artist$SpotifyArtist();
 
   factory EdSheeran$Query$Node$Artist$SpotifyArtist.fromJson(
@@ -79,6 +81,7 @@ class EdSheeran$Query$Node$Artist$SpotifyArtist
   @override
   List<Object?> get props => [href];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$EdSheeran$Query$Node$Artist$SpotifyArtistToJson(this);
 }
@@ -104,6 +107,7 @@ class EdSheeran$Query$Node$Artist extends EdSheeran$Query$Node
   @override
   List<Object?> get props => [mbid, name, releases, lifeSpan, spotify];
 
+  @override
   Map<String, dynamic> toJson() => _$EdSheeran$Query$Node$ArtistToJson(this);
 }
 
@@ -128,6 +132,7 @@ class EdSheeran$Query$Node extends JsonSerializable with EquatableMixin {
   @override
   List<Object?> get props => [$$typename, id];
 
+  @override
   Map<String, dynamic> toJson() {
     switch ($$typename) {
       case r'Artist':
@@ -150,6 +155,7 @@ class EdSheeran$Query extends JsonSerializable with EquatableMixin {
   @override
   List<Object?> get props => [node];
 
+  @override
   Map<String, dynamic> toJson() => _$EdSheeran$QueryToJson(this);
 }
 
@@ -165,7 +171,6 @@ enum ReleaseStatus {
   @JsonValue('ARTEMIS_UNKNOWN')
   artemisUnknown,
 }
-
 final ED_SHEERAN_QUERY_DOCUMENT = DocumentNode(definitions: [
   OperationDefinitionNode(
       type: OperationType.query,
@@ -284,7 +289,6 @@ class EdSheeranQuery extends GraphQLQuery<EdSheeran$Query, JsonSerializable> {
 
   @override
   List<Object?> get props => [document, operationName];
-
   @override
   EdSheeran$Query parse(Map<String, dynamic> json) =>
       EdSheeran$Query.fromJson(json);
diff --git a/example/graphbrainz/lib/queries/ed_sheeran.query.graphql.g.dart b/example/graphbrainz/lib/queries/ed_sheeran.query.graphql.g.dart
index 85e45beb..c7d05078 100644
--- a/example/graphbrainz/lib/queries/ed_sheeran.query.graphql.g.dart
+++ b/example/graphbrainz/lib/queries/ed_sheeran.query.graphql.g.dart
@@ -11,27 +11,6 @@ EdSheeran$Query$Node$Artist$ReleaseConnection$Release
     _$EdSheeran$Query$Node$Artist$ReleaseConnection$ReleaseFromJson(
         Map<String, dynamic> json) {
   return EdSheeran$Query$Node$Artist$ReleaseConnection$Release()
-    ..$$typename = json['__typename'] as String?
-    ..mbid = json['mbid'] as String
-    ..name = json['name'] as String?
-    ..releases = json['releases'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$ReleaseConnection.fromJson(
-            json['releases'] as Map<String, dynamic>)
-    ..lifeSpan = json['lifeSpan'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$LifeSpan.fromJson(
-            json['lifeSpan'] as Map<String, dynamic>)
-    ..spotify = json['spotify'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$SpotifyArtist.fromJson(
-            json['spotify'] as Map<String, dynamic>)
-    ..nodes = (json['nodes'] as List<dynamic>?)
-        ?.map((e) => e == null
-            ? null
-            : EdSheeran$Query$Node$Artist$ReleaseConnection$Release.fromJson(
-                e as Map<String, dynamic>))
-        .toList()
     ..id = json['id'] as String
     ..status = _$enumDecodeNullable(_$ReleaseStatusEnumMap, json['status'],
         unknownValue: ReleaseStatus.artemisUnknown);
@@ -41,13 +20,6 @@ Map<String, dynamic>
     _$EdSheeran$Query$Node$Artist$ReleaseConnection$ReleaseToJson(
             EdSheeran$Query$Node$Artist$ReleaseConnection$Release instance) =>
         <String, dynamic>{
-          '__typename': instance.$$typename,
-          'mbid': instance.mbid,
-          'name': instance.name,
-          'releases': instance.releases?.toJson(),
-          'lifeSpan': instance.lifeSpan?.toJson(),
-          'spotify': instance.spotify?.toJson(),
-          'nodes': instance.nodes?.map((e) => e?.toJson()).toList(),
           'id': instance.id,
           'status': _$ReleaseStatusEnumMap[instance.status],
         };
@@ -101,22 +73,6 @@ EdSheeran$Query$Node$Artist$ReleaseConnection
     _$EdSheeran$Query$Node$Artist$ReleaseConnectionFromJson(
         Map<String, dynamic> json) {
   return EdSheeran$Query$Node$Artist$ReleaseConnection()
-    ..$$typename = json['__typename'] as String?
-    ..id = json['id'] as String
-    ..mbid = json['mbid'] as String
-    ..name = json['name'] as String?
-    ..releases = json['releases'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$ReleaseConnection.fromJson(
-            json['releases'] as Map<String, dynamic>)
-    ..lifeSpan = json['lifeSpan'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$LifeSpan.fromJson(
-            json['lifeSpan'] as Map<String, dynamic>)
-    ..spotify = json['spotify'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$SpotifyArtist.fromJson(
-            json['spotify'] as Map<String, dynamic>)
     ..nodes = (json['nodes'] as List<dynamic>?)
         ?.map((e) => e == null
             ? null
@@ -128,35 +84,12 @@ EdSheeran$Query$Node$Artist$ReleaseConnection
 Map<String, dynamic> _$EdSheeran$Query$Node$Artist$ReleaseConnectionToJson(
         EdSheeran$Query$Node$Artist$ReleaseConnection instance) =>
     <String, dynamic>{
-      '__typename': instance.$$typename,
-      'id': instance.id,
-      'mbid': instance.mbid,
-      'name': instance.name,
-      'releases': instance.releases?.toJson(),
-      'lifeSpan': instance.lifeSpan?.toJson(),
-      'spotify': instance.spotify?.toJson(),
       'nodes': instance.nodes?.map((e) => e?.toJson()).toList(),
     };
 
 EdSheeran$Query$Node$Artist$LifeSpan
     _$EdSheeran$Query$Node$Artist$LifeSpanFromJson(Map<String, dynamic> json) {
   return EdSheeran$Query$Node$Artist$LifeSpan()
-    ..$$typename = json['__typename'] as String?
-    ..id = json['id'] as String
-    ..mbid = json['mbid'] as String
-    ..name = json['name'] as String?
-    ..releases = json['releases'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$ReleaseConnection.fromJson(
-            json['releases'] as Map<String, dynamic>)
-    ..lifeSpan = json['lifeSpan'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$LifeSpan.fromJson(
-            json['lifeSpan'] as Map<String, dynamic>)
-    ..spotify = json['spotify'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$SpotifyArtist.fromJson(
-            json['spotify'] as Map<String, dynamic>)
     ..begin =
         json['begin'] == null ? null : DateTime.parse(json['begin'] as String);
 }
@@ -164,13 +97,6 @@ EdSheeran$Query$Node$Artist$LifeSpan
 Map<String, dynamic> _$EdSheeran$Query$Node$Artist$LifeSpanToJson(
         EdSheeran$Query$Node$Artist$LifeSpan instance) =>
     <String, dynamic>{
-      '__typename': instance.$$typename,
-      'id': instance.id,
-      'mbid': instance.mbid,
-      'name': instance.name,
-      'releases': instance.releases?.toJson(),
-      'lifeSpan': instance.lifeSpan?.toJson(),
-      'spotify': instance.spotify?.toJson(),
       'begin': instance.begin?.toIso8601String(),
     };
 
@@ -178,35 +104,12 @@ EdSheeran$Query$Node$Artist$SpotifyArtist
     _$EdSheeran$Query$Node$Artist$SpotifyArtistFromJson(
         Map<String, dynamic> json) {
   return EdSheeran$Query$Node$Artist$SpotifyArtist()
-    ..$$typename = json['__typename'] as String?
-    ..id = json['id'] as String
-    ..mbid = json['mbid'] as String
-    ..name = json['name'] as String?
-    ..releases = json['releases'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$ReleaseConnection.fromJson(
-            json['releases'] as Map<String, dynamic>)
-    ..lifeSpan = json['lifeSpan'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$LifeSpan.fromJson(
-            json['lifeSpan'] as Map<String, dynamic>)
-    ..spotify = json['spotify'] == null
-        ? null
-        : EdSheeran$Query$Node$Artist$SpotifyArtist.fromJson(
-            json['spotify'] as Map<String, dynamic>)
     ..href = json['href'] as String;
 }
 
 Map<String, dynamic> _$EdSheeran$Query$Node$Artist$SpotifyArtistToJson(
         EdSheeran$Query$Node$Artist$SpotifyArtist instance) =>
     <String, dynamic>{
-      '__typename': instance.$$typename,
-      'id': instance.id,
-      'mbid': instance.mbid,
-      'name': instance.name,
-      'releases': instance.releases?.toJson(),
-      'lifeSpan': instance.lifeSpan?.toJson(),
-      'spotify': instance.spotify?.toJson(),
       'href': instance.href,
     };
 
diff --git a/example/graphbrainz/pubspec.lock b/example/graphbrainz/pubspec.lock
index 1bd9a16b..f00f6827 100644
--- a/example/graphbrainz/pubspec.lock
+++ b/example/graphbrainz/pubspec.lock
@@ -28,7 +28,7 @@ packages:
       path: "../.."
       relative: true
     source: path
-    version: "7.0.0-beta.13"
+    version: "7.0.0-beta.16"
   async:
     dependency: transitive
     description:
diff --git a/example/graphbrainz/pubspec.yaml b/example/graphbrainz/pubspec.yaml
index 3d92a751..e95c3dbf 100644
--- a/example/graphbrainz/pubspec.yaml
+++ b/example/graphbrainz/pubspec.yaml
@@ -8,12 +8,12 @@ environment:
   sdk: '>=2.0.0 <3.0.0'
 
 dependencies:
-  http: ^0.13.1
+  http: ^0.13.3
   intl: ^0.17.0
 
 dev_dependencies:
-  test: ^1.16.8
+  test: ^1.17.8
   build_runner: ^2.0.4
-  json_serializable: ^4.1.0
+  json_serializable: ^4.1.3
   artemis:
     path: ../../.
diff --git a/example/hasura/lib/graphql/messages_with_users.graphql.dart b/example/hasura/lib/graphql/messages_with_users.graphql.dart
index 875d7f99..05bc4c2f 100644
--- a/example/hasura/lib/graphql/messages_with_users.graphql.dart
+++ b/example/hasura/lib/graphql/messages_with_users.graphql.dart
@@ -22,7 +22,7 @@ class MessagesWithUsers$SubscriptionRoot$Messages$Profile
 
   @override
   List<Object?> get props => [id, name];
-
+  @override
   Map<String, dynamic> toJson() =>
       _$MessagesWithUsers$SubscriptionRoot$Messages$ProfileToJson(this);
 }
@@ -45,6 +45,7 @@ class MessagesWithUsers$SubscriptionRoot$Messages extends JsonSerializable
   @override
   List<Object?> get props => [id, message, profile];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$MessagesWithUsers$SubscriptionRoot$MessagesToJson(this);
 }
@@ -63,6 +64,7 @@ class MessagesWithUsers$SubscriptionRoot extends JsonSerializable
   @override
   List<Object?> get props => [messages];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$MessagesWithUsers$SubscriptionRootToJson(this);
 }
@@ -127,7 +129,6 @@ class MessagesWithUsersSubscription
 
   @override
   List<Object?> get props => [document, operationName];
-
   @override
   MessagesWithUsers$SubscriptionRoot parse(Map<String, dynamic> json) =>
       MessagesWithUsers$SubscriptionRoot.fromJson(json);
diff --git a/example/hasura/pubspec.lock b/example/hasura/pubspec.lock
index 531ba784..a631eeb4 100644
--- a/example/hasura/pubspec.lock
+++ b/example/hasura/pubspec.lock
@@ -28,7 +28,7 @@ packages:
       path: "../.."
       relative: true
     source: path
-    version: "7.0.0-beta.13"
+    version: "7.0.0-beta.17"
   async:
     dependency: transitive
     description:
@@ -490,21 +490,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.16.8"
+    version: "1.17.8"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.1"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.19"
+    version: "0.3.28"
   timing:
     dependency: transitive
     description:
diff --git a/example/hasura/pubspec.yaml b/example/hasura/pubspec.yaml
index 124fe2ad..80990b67 100644
--- a/example/hasura/pubspec.yaml
+++ b/example/hasura/pubspec.yaml
@@ -8,12 +8,12 @@ environment:
   sdk: ">=2.0.0 <3.0.0"
 
 dependencies:
-  http: ^0.13.1
+  http: ^0.13.3
   gql_websocket_link: ^0.3.0-nullsafety.1
 
 dev_dependencies:
-  test: ^1.16.8
+  test: ^1.17.8
   build_runner: ^2.0.4
-  json_serializable: ^4.1.0
+  json_serializable: ^4.1.3
   artemis:
     path: ../../.
diff --git a/example/pokemon/build.yaml b/example/pokemon/build.yaml
index 5d6bc4a0..0919dcef 100644
--- a/example/pokemon/build.yaml
+++ b/example/pokemon/build.yaml
@@ -12,9 +12,6 @@ targets:
             - schema: pokemon.schema.graphql
               queries_glob: graphql/simple_query.query.graphql
               output: lib/graphql/simple_query.dart
-            - schema: pokemon.schema.graphql
-              queries_glob: graphql/complex_query.query.graphql
-              output: lib/graphql/complex_query.dart
             - schema: pokemon.schema.graphql
               queries_glob: graphql/big_query.query.graphql
               output: lib/graphql/big_query.dart
diff --git a/example/pokemon/lib/graphql/big_query.graphql.dart b/example/pokemon/lib/graphql/big_query.graphql.dart
index 84292eb7..bbf76dc6 100644
--- a/example/pokemon/lib/graphql/big_query.graphql.dart
+++ b/example/pokemon/lib/graphql/big_query.graphql.dart
@@ -5,7 +5,6 @@ import 'package:artemis/artemis.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:equatable/equatable.dart';
 import 'package:gql/ast.dart';
-
 part 'big_query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
@@ -21,7 +20,7 @@ class BigQuery$Query$Charmander extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [number, types];
-
+  @override
   Map<String, dynamic> toJson() => _$BigQuery$Query$CharmanderToJson(this);
 }
 
@@ -41,6 +40,7 @@ class BigQuery$Query$Pokemon$Evolutions extends JsonSerializable
   @override
   List<Object?> get props => [number, name];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$BigQuery$Query$Pokemon$EvolutionsToJson(this);
 }
@@ -63,6 +63,7 @@ class BigQuery$Query$Pokemon extends JsonSerializable with EquatableMixin {
   @override
   List<Object?> get props => [number, name, types, evolutions];
 
+  @override
   Map<String, dynamic> toJson() => _$BigQuery$Query$PokemonToJson(this);
 }
 
@@ -80,6 +81,7 @@ class BigQuery$Query extends JsonSerializable with EquatableMixin {
   @override
   List<Object?> get props => [charmander, pokemons];
 
+  @override
   Map<String, dynamic> toJson() => _$BigQuery$QueryToJson(this);
 }
 
@@ -95,7 +97,6 @@ class BigQueryArguments extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [quantity];
-
   @override
   Map<String, dynamic> toJson() => _$BigQueryArgumentsToJson(this);
 }
@@ -201,7 +202,6 @@ class BigQueryQuery extends GraphQLQuery<BigQuery$Query, BigQueryArguments> {
 
   @override
   List<Object?> get props => [document, operationName, variables];
-
   @override
   BigQuery$Query parse(Map<String, dynamic> json) =>
       BigQuery$Query.fromJson(json);
diff --git a/example/pokemon/lib/graphql/fragment_query.graphql.dart b/example/pokemon/lib/graphql/fragment_query.graphql.dart
index bd31bf56..4cc8c34b 100644
--- a/example/pokemon/lib/graphql/fragment_query.graphql.dart
+++ b/example/pokemon/lib/graphql/fragment_query.graphql.dart
@@ -5,7 +5,6 @@ import 'package:artemis/artemis.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:equatable/equatable.dart';
 import 'package:gql/ast.dart';
-
 part 'fragment_query.graphql.g.dart';
 
 mixin PokemonPartsMixin {
@@ -24,7 +23,7 @@ class FragmentQuery$Query$Charmander extends JsonSerializable
 
   @override
   List<Object?> get props => [number, name, types];
-
+  @override
   Map<String, dynamic> toJson() => _$FragmentQuery$Query$CharmanderToJson(this);
 }
 
@@ -40,6 +39,7 @@ class FragmentQuery$Query$Pokemon$Evolutions extends JsonSerializable
   @override
   List<Object?> get props => [number, name, types];
 
+  @override
   Map<String, dynamic> toJson() =>
       _$FragmentQuery$Query$Pokemon$EvolutionsToJson(this);
 }
@@ -57,6 +57,7 @@ class FragmentQuery$Query$Pokemon extends JsonSerializable
   @override
   List<Object?> get props => [number, name, types, evolutions];
 
+  @override
   Map<String, dynamic> toJson() => _$FragmentQuery$Query$PokemonToJson(this);
 }
 
@@ -74,6 +75,7 @@ class FragmentQuery$Query extends JsonSerializable with EquatableMixin {
   @override
   List<Object?> get props => [charmander, pokemons];
 
+  @override
   Map<String, dynamic> toJson() => _$FragmentQuery$QueryToJson(this);
 }
 
@@ -89,7 +91,6 @@ class FragmentQueryArguments extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [quantity];
-
   @override
   Map<String, dynamic> toJson() => _$FragmentQueryArgumentsToJson(this);
 }
@@ -186,7 +187,6 @@ class FragmentQueryQuery
 
   @override
   List<Object?> get props => [document, operationName, variables];
-
   @override
   FragmentQuery$Query parse(Map<String, dynamic> json) =>
       FragmentQuery$Query.fromJson(json);
diff --git a/example/pokemon/lib/graphql/fragments_glob.graphql.dart b/example/pokemon/lib/graphql/fragments_glob.graphql.dart
index a57d4a20..f3fd82d5 100644
--- a/example/pokemon/lib/graphql/fragments_glob.graphql.dart
+++ b/example/pokemon/lib/graphql/fragments_glob.graphql.dart
@@ -5,7 +5,6 @@ import 'package:artemis/artemis.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:equatable/equatable.dart';
 import 'package:gql/ast.dart';
-
 part 'fragments_glob.graphql.g.dart';
 
 mixin PokemonMixin {
@@ -34,7 +33,7 @@ class FragmentsGlob$Query$Pokemon$Pokemon extends JsonSerializable
 
   @override
   List<Object?> get props => [id, weight, attacks];
-
+  @override
   Map<String, dynamic> toJson() =>
       _$FragmentsGlob$Query$Pokemon$PokemonToJson(this);
 }
@@ -52,6 +51,7 @@ class FragmentsGlob$Query$Pokemon extends JsonSerializable
   @override
   List<Object?> get props => [id, weight, attacks, evolutions];
 
+  @override
   Map<String, dynamic> toJson() => _$FragmentsGlob$Query$PokemonToJson(this);
 }
 
@@ -67,6 +67,7 @@ class FragmentsGlob$Query extends JsonSerializable with EquatableMixin {
   @override
   List<Object?> get props => [pokemon];
 
+  @override
   Map<String, dynamic> toJson() => _$FragmentsGlob$QueryToJson(this);
 }
 
@@ -81,6 +82,7 @@ class PokemonMixin$PokemonDimension extends JsonSerializable
   @override
   List<Object?> get props => [minimum];
 
+  @override
   Map<String, dynamic> toJson() => _$PokemonMixin$PokemonDimensionToJson(this);
 }
 
@@ -95,6 +97,7 @@ class PokemonMixin$PokemonAttack extends JsonSerializable
   @override
   List<Object?> get props => [special];
 
+  @override
   Map<String, dynamic> toJson() => _$PokemonMixin$PokemonAttackToJson(this);
 }
 
@@ -109,6 +112,7 @@ class PokemonAttackMixin$Attack extends JsonSerializable
   @override
   List<Object?> get props => [name];
 
+  @override
   Map<String, dynamic> toJson() => _$PokemonAttackMixin$AttackToJson(this);
 }
 
@@ -232,7 +236,6 @@ class FragmentsGlobQuery
 
   @override
   List<Object?> get props => [document, operationName];
-
   @override
   FragmentsGlob$Query parse(Map<String, dynamic> json) =>
       FragmentsGlob$Query.fromJson(json);
diff --git a/example/pokemon/lib/graphql/simple_query.graphql.dart b/example/pokemon/lib/graphql/simple_query.graphql.dart
index a5d4330c..5d8c1ac2 100644
--- a/example/pokemon/lib/graphql/simple_query.graphql.dart
+++ b/example/pokemon/lib/graphql/simple_query.graphql.dart
@@ -5,7 +5,6 @@ import 'package:artemis/artemis.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:equatable/equatable.dart';
 import 'package:gql/ast.dart';
-
 part 'simple_query.graphql.g.dart';
 
 @JsonSerializable(explicitToJson: true)
@@ -21,7 +20,7 @@ class SimpleQuery$Query$Pokemon extends JsonSerializable with EquatableMixin {
 
   @override
   List<Object?> get props => [number, types];
-
+  @override
   Map<String, dynamic> toJson() => _$SimpleQuery$Query$PokemonToJson(this);
 }
 
@@ -37,6 +36,7 @@ class SimpleQuery$Query extends JsonSerializable with EquatableMixin {
   @override
   List<Object?> get props => [pokemon];
 
+  @override
   Map<String, dynamic> toJson() => _$SimpleQuery$QueryToJson(this);
 }
 
@@ -85,7 +85,6 @@ class SimpleQueryQuery
 
   @override
   List<Object?> get props => [document, operationName];
-
   @override
   SimpleQuery$Query parse(Map<String, dynamic> json) =>
       SimpleQuery$Query.fromJson(json);
diff --git a/example/pokemon/pubspec.lock b/example/pokemon/pubspec.lock
index 1a1e381f..cd36909c 100644
--- a/example/pokemon/pubspec.lock
+++ b/example/pokemon/pubspec.lock
@@ -28,7 +28,7 @@ packages:
       path: "../.."
       relative: true
     source: path
-    version: "7.0.0-beta.13"
+    version: "7.0.0-beta.17"
   async:
     dependency: transitive
     description:
@@ -476,21 +476,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.16.8"
+    version: "1.17.8"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.1"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.19"
+    version: "0.3.28"
   timing:
     dependency: transitive
     description:
diff --git a/example/pokemon/pubspec.yaml b/example/pokemon/pubspec.yaml
index 17a6b111..2e9673a4 100644
--- a/example/pokemon/pubspec.yaml
+++ b/example/pokemon/pubspec.yaml
@@ -8,11 +8,11 @@ environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
-  http: ^0.13.1
+  http: ^0.13.3
 
 dev_dependencies:
-  test: ^1.16.8
+  test: ^1.17.8
   build_runner: ^2.0.4
-  json_serializable: ^4.1.0
+  json_serializable: ^4.1.3
   artemis:
     path: ../../.
diff --git a/pubspec.yaml b/pubspec.yaml
index 6ea4fe06..9caf655d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: artemis
-version: 7.0.0-beta.16
+version: 7.0.0-beta.17
 
 description: Build dart types from GraphQL schemas and queries (using Introspection Query).
 homepage: https://github.com/comigor/artemis