From 006e06f2bf35c079b2dd68d1edfc85aaf6ddbabf Mon Sep 17 00:00:00 2001 From: Martin Kamleithner Date: Sun, 29 Jan 2023 19:14:10 +0100 Subject: [PATCH 1/8] feat: allow distinguishing between null and absent values --- .../aliased_hero.data.gql.g.dart | 30 +- .../__generated__/aliased_hero.req.gql.g.dart | 8 +- .../__generated__/aliased_hero.var.gql.dart | 46 ++- .../__generated__/aliased_hero.var.gql.g.dart | 52 +-- .../hero_with_fragments.data.gql.g.dart | 75 ++++- .../hero_with_fragments.req.gql.g.dart | 8 +- .../hero_with_fragments.var.gql.dart | 159 ++++++++- .../hero_with_fragments.var.gql.g.dart | 151 +-------- ...terface_subtyped_fragments.data.gql.g.dart | 110 ++++-- ...nterface_subtyped_fragments.req.gql.g.dart | 8 +- ..._interface_subtyped_fragments.var.gql.dart | 175 +++++++++- ...nterface_subtyped_fragments.var.gql.g.dart | 138 +------- .../graphql/__generated__/schema.ast.gql.dart | 46 ++- .../__generated__/schema.schema.gql.dart | 235 ++++++++++++- .../__generated__/schema.schema.gql.g.dart | 312 ++++++++---------- .../__generated__/serializers.gql.dart | 18 +- .../__generated__/serializers.gql.g.dart | 9 +- .../lib/graphql/schema.graphql | 6 + .../hero_for_episode.data.gql.g.dart | 44 ++- .../hero_for_episode.req.gql.g.dart | 8 +- .../hero_for_episode.var.gql.dart | 88 ++++- .../hero_for_episode.var.gql.g.dart | 80 +---- .../hero_no_vars.data.gql.g.dart | 16 +- .../__generated__/hero_no_vars.req.gql.g.dart | 8 +- .../__generated__/hero_no_vars.var.gql.dart | 38 ++- .../__generated__/hero_no_vars.var.gql.g.dart | 26 +- .../review_with_date.data.gql.g.dart | 28 +- .../review_with_date.req.gql.g.dart | 8 +- .../review_with_date.var.gql.dart | 83 ++++- .../review_with_date.var.gql.g.dart | 99 +----- .../create_custom_field.ast.gql.dart | 37 +++ .../create_custom_field.data.gql.dart | 37 +++ .../create_custom_field.data.gql.g.dart | 174 ++++++++++ .../create_custom_field.req.gql.dart | 42 +++ .../create_custom_field.req.gql.g.dart | 180 ++++++++++ .../create_custom_field.var.gql.dart | 80 +++++ .../create_custom_field.var.gql.g.dart | 107 ++++++ .../create_review.data.gql.g.dart | 19 +- .../create_review.req.gql.g.dart | 8 +- .../__generated__/create_review.var.gql.dart | 67 +++- .../create_review.var.gql.g.dart | 73 +--- .../human_with_args.data.gql.g.dart | 16 +- .../human_with_args.req.gql.g.dart | 8 +- .../human_with_args.var.gql.dart | 46 ++- .../human_with_args.var.gql.g.dart | 52 +-- .../lib/variables/create_custom_field.graphql | 5 + codegen/end_to_end_test/pubspec.yaml | 35 ++ .../test/operation/variables_test.dart | 18 +- .../test/schema/input_test.dart | 29 +- .../test/schema/scalars_test.dart | 32 +- codegen/gql_build/README.md | 14 + codegen/gql_build/lib/src/schema_builder.dart | 35 +- .../gql_build/lib/src/serializer_builder.dart | 38 +-- codegen/gql_build/lib/src/utils/writer.dart | 13 +- codegen/gql_build/lib/src/var_builder.dart | 23 +- codegen/gql_build/pubspec.yaml | 35 ++ codegen/gql_code_builder/lib/schema.dart | 14 +- .../gql_code_builder/lib/src/built_class.dart | 4 +- codegen/gql_code_builder/lib/src/common.dart | 36 +- codegen/gql_code_builder/lib/src/schema.dart | 83 +++-- .../lib/src/schema/input.dart | 26 +- codegen/gql_code_builder/lib/var.dart | 267 +++++++++++++-- codegen/gql_code_builder/pubspec.yaml | 35 ++ examples/gql_example_build/pubspec.yaml | 35 ++ examples/gql_example_cli/pubspec.yaml | 35 ++ examples/gql_example_cli_github/pubspec.yaml | 35 ++ examples/gql_example_dio_link/pubspec.yaml | 35 ++ examples/gql_example_flutter/pubspec.yaml | 37 +++ .../gql_example_http_auth_link/pubspec.yaml | 35 ++ gql/pubspec.yaml | 35 ++ gql_pedantic/pubspec.yaml | 35 ++ links/gql_dedupe_link/pubspec.yaml | 35 ++ links/gql_dio_link/pubspec.yaml | 35 ++ links/gql_error_link/pubspec.yaml | 35 ++ links/gql_exec/lib/src/value.dart | 18 + links/gql_exec/lib/value.dart | 1 + links/gql_exec/pubspec.yaml | 35 ++ links/gql_http_link/lib/src/link.dart | 4 + links/gql_http_link/pubspec.yaml | 35 ++ links/gql_link/pubspec.yaml | 35 ++ links/gql_transform_link/pubspec.yaml | 35 ++ links/gql_websocket_link/pubspec.yaml | 35 ++ 82 files changed, 3248 insertions(+), 1137 deletions(-) create mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.ast.gql.dart create mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.dart create mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.g.dart create mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.dart create mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.g.dart create mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.dart create mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.g.dart create mode 100644 codegen/end_to_end_test/lib/variables/create_custom_field.graphql create mode 100644 links/gql_exec/lib/src/value.dart create mode 100644 links/gql_exec/lib/value.dart diff --git a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.data.gql.g.dart b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.data.gql.g.dart index ed85bfb5..6d82d8a2 100644 --- a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.data.gql.g.dart @@ -253,8 +253,12 @@ class _$GAliasedHeroData extends GAliasedHeroData { @override int get hashCode { - return $jf($jc($jc($jc(0, G__typename.hashCode), empireHero.hashCode), - jediHero.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, empireHero.hashCode); + _$hash = $jc(_$hash, jediHero.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -394,9 +398,13 @@ class _$GAliasedHeroData_empireHero extends GAliasedHeroData_empireHero { @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - from.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, from.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -542,9 +550,13 @@ class _$GAliasedHeroData_jediHero extends GAliasedHeroData_jediHero { @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - from.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, from.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -638,4 +650,4 @@ class GAliasedHeroData_jediHeroBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.req.gql.g.dart b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.req.gql.g.dart index 34ca12f5..3c44d30b 100644 --- a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.req.gql.g.dart @@ -90,7 +90,11 @@ class _$GAliasedHero extends GAliasedHero { @override int get hashCode { - return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -167,4 +171,4 @@ class GAliasedHeroBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.dart b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.dart index fa90a01c..bdaa5b89 100644 --- a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.dart +++ b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.dart @@ -19,8 +19,6 @@ abstract class GAliasedHeroVars _$GAliasedHeroVars; _i1.GEpisode get ep; - static Serializer get serializer => - _$gAliasedHeroVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GAliasedHeroVars.serializer, this, @@ -30,4 +28,48 @@ abstract class GAliasedHeroVars GAliasedHeroVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GAliasedHeroVarsSerializer(); +} + +class GAliasedHeroVarsSerializer + extends StructuredSerializer { + final String wireName = 'GAliasedHeroVars'; + + final Iterable types = const [GAliasedHeroVars, _$GAliasedHeroVars]; + + Iterable serialize( + Serializers serializers, + GAliasedHeroVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + result.add('ep'); + result.add(serializers.serialize(object.ep, + specifiedType: const FullType(_i1.GEpisode))); + return result; + } + + GAliasedHeroVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GAliasedHeroVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'ep': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; + builder.ep = fieldValue; + break; + } + } + return builder.build(); + } } diff --git a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.g.dart b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.g.dart index f40c47cc..eb6a4801 100644 --- a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.g.dart @@ -6,51 +6,6 @@ part of 'aliased_hero.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** -Serializer _$gAliasedHeroVarsSerializer = - new _$GAliasedHeroVarsSerializer(); - -class _$GAliasedHeroVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [GAliasedHeroVars, _$GAliasedHeroVars]; - @override - final String wireName = 'GAliasedHeroVars'; - - @override - Iterable serialize(Serializers serializers, GAliasedHeroVars object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'ep', - serializers.serialize(object.ep, - specifiedType: const FullType(_i1.GEpisode)), - ]; - - return result; - } - - @override - GAliasedHeroVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GAliasedHeroVarsBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'ep': - result.ep = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode))! as _i1.GEpisode; - break; - } - } - - return result.build(); - } -} - class _$GAliasedHeroVars extends GAliasedHeroVars { @override final _i1.GEpisode ep; @@ -79,7 +34,10 @@ class _$GAliasedHeroVars extends GAliasedHeroVars { @override int get hashCode { - return $jf($jc(0, ep.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, ep.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -132,4 +90,4 @@ class GAliasedHeroVarsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.data.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.data.gql.g.dart index 405b7551..b5005f79 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.data.gql.g.dart @@ -691,7 +691,11 @@ class _$GHeroWithFragmentsData extends GHeroWithFragmentsData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), hero.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, hero.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -819,10 +823,13 @@ class _$GHeroWithFragmentsData_hero extends GHeroWithFragmentsData_hero { @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), - friendsConnection.hashCode), - name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, friendsConnection.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -965,8 +972,12 @@ class _$GHeroWithFragmentsData_hero_friendsConnection @override int get hashCode { - return $jf($jc($jc($jc(0, G__typename.hashCode), totalCount.hashCode), - edges.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, totalCount.hashCode); + _$hash = $jc(_$hash, edges.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1108,7 +1119,11 @@ class _$GHeroWithFragmentsData_hero_friendsConnection_edges @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), node.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, node.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1247,7 +1262,11 @@ class _$GHeroWithFragmentsData_hero_friendsConnection_edges_node @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1355,7 +1374,11 @@ class _$GheroDataData extends GheroDataData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1469,9 +1492,13 @@ class _$GcomparisonFieldsData extends GcomparisonFieldsData { @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - friendsConnection.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, friendsConnection.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1610,8 +1637,12 @@ class _$GcomparisonFieldsData_friendsConnection @override int get hashCode { - return $jf($jc($jc($jc(0, G__typename.hashCode), totalCount.hashCode), - edges.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, totalCount.hashCode); + _$hash = $jc(_$hash, edges.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1745,7 +1776,11 @@ class _$GcomparisonFieldsData_friendsConnection_edges @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), node.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, node.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1879,7 +1914,11 @@ class _$GcomparisonFieldsData_friendsConnection_edges_node @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1950,4 +1989,4 @@ class GcomparisonFieldsData_friendsConnection_edges_nodeBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.req.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.req.gql.g.dart index 2c956ffb..075810ea 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.req.gql.g.dart @@ -96,7 +96,11 @@ class _$GHeroWithFragments extends GHeroWithFragments { @override int get hashCode { - return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -173,4 +177,4 @@ class GHeroWithFragmentsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.dart index 97d988ed..c592193e 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.dart @@ -5,7 +5,8 @@ import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i1; + as _i2; +import 'package:gql_exec/value.dart' as _i1; part 'hero_with_fragments.var.gql.g.dart'; @@ -17,18 +18,19 @@ abstract class GHeroWithFragmentsVars [Function(GHeroWithFragmentsVarsBuilder b) updates]) = _$GHeroWithFragmentsVars; - int? get first; - static Serializer get serializer => - _$gHeroWithFragmentsVarsSerializer; - Map toJson() => (_i1.serializers.serializeWith( + _i1.Value? get first; + Map toJson() => (_i2.serializers.serializeWith( GHeroWithFragmentsVars.serializer, this, ) as Map); static GHeroWithFragmentsVars? fromJson(Map json) => - _i1.serializers.deserializeWith( + _i2.serializers.deserializeWith( GHeroWithFragmentsVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GHeroWithFragmentsVarsSerializer(); } abstract class GheroDataVars @@ -38,16 +40,17 @@ abstract class GheroDataVars factory GheroDataVars([Function(GheroDataVarsBuilder b) updates]) = _$GheroDataVars; - static Serializer get serializer => _$gheroDataVarsSerializer; - Map toJson() => (_i1.serializers.serializeWith( + Map toJson() => (_i2.serializers.serializeWith( GheroDataVars.serializer, this, ) as Map); static GheroDataVars? fromJson(Map json) => - _i1.serializers.deserializeWith( + _i2.serializers.deserializeWith( GheroDataVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => GheroDataVarsSerializer(); } abstract class GcomparisonFieldsVars @@ -58,16 +61,144 @@ abstract class GcomparisonFieldsVars [Function(GcomparisonFieldsVarsBuilder b) updates]) = _$GcomparisonFieldsVars; - int? get first; - static Serializer get serializer => - _$gcomparisonFieldsVarsSerializer; - Map toJson() => (_i1.serializers.serializeWith( + _i1.Value? get first; + Map toJson() => (_i2.serializers.serializeWith( GcomparisonFieldsVars.serializer, this, ) as Map); static GcomparisonFieldsVars? fromJson(Map json) => - _i1.serializers.deserializeWith( + _i2.serializers.deserializeWith( GcomparisonFieldsVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GcomparisonFieldsVarsSerializer(); +} + +class GHeroWithFragmentsVarsSerializer + extends StructuredSerializer { + final String wireName = 'GHeroWithFragmentsVars'; + + final Iterable types = const [ + GHeroWithFragmentsVars, + _$GHeroWithFragmentsVars + ]; + + Iterable serialize( + Serializers serializers, + GHeroWithFragmentsVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + final _$firstvalue = object.first; + if (_$firstvalue != null) { + result.add('first'); + result.add(serializers.serialize(_$firstvalue!.value, + specifiedType: const FullType(int))); + } + return result; + } + + GHeroWithFragmentsVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GHeroWithFragmentsVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'first': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(int)) as int; + builder.first = _i1.Value(fieldValue); + break; + } + } + return builder.build(); + } +} + +class GheroDataVarsSerializer extends StructuredSerializer { + final String wireName = 'GheroDataVars'; + + final Iterable types = const [GheroDataVars, _$GheroDataVars]; + + Iterable serialize( + Serializers serializers, + GheroDataVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + return result; + } + + GheroDataVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GheroDataVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + + } + } + return builder.build(); + } +} + +class GcomparisonFieldsVarsSerializer + extends StructuredSerializer { + final String wireName = 'GcomparisonFieldsVars'; + + final Iterable types = const [ + GcomparisonFieldsVars, + _$GcomparisonFieldsVars + ]; + + Iterable serialize( + Serializers serializers, + GcomparisonFieldsVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + final _$firstvalue = object.first; + if (_$firstvalue != null) { + result.add('first'); + result.add(serializers.serialize(_$firstvalue!.value, + specifiedType: const FullType(int))); + } + return result; + } + + GcomparisonFieldsVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GcomparisonFieldsVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'first': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(int)) as int; + builder.first = _i1.Value(fieldValue); + break; + } + } + return builder.build(); + } } diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart index f1550823..08041e98 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart @@ -6,132 +6,9 @@ part of 'hero_with_fragments.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** -Serializer _$gHeroWithFragmentsVarsSerializer = - new _$GHeroWithFragmentsVarsSerializer(); -Serializer _$gheroDataVarsSerializer = - new _$GheroDataVarsSerializer(); -Serializer _$gcomparisonFieldsVarsSerializer = - new _$GcomparisonFieldsVarsSerializer(); - -class _$GHeroWithFragmentsVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GHeroWithFragmentsVars, - _$GHeroWithFragmentsVars - ]; - @override - final String wireName = 'GHeroWithFragmentsVars'; - - @override - Iterable serialize( - Serializers serializers, GHeroWithFragmentsVars object, - {FullType specifiedType = FullType.unspecified}) { - final result = []; - Object? value; - value = object.first; - if (value != null) { - result - ..add('first') - ..add(serializers.serialize(value, specifiedType: const FullType(int))); - } - return result; - } - - @override - GHeroWithFragmentsVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GHeroWithFragmentsVarsBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'first': - result.first = serializers.deserialize(value, - specifiedType: const FullType(int)) as int?; - break; - } - } - - return result.build(); - } -} - -class _$GheroDataVarsSerializer implements StructuredSerializer { - @override - final Iterable types = const [GheroDataVars, _$GheroDataVars]; - @override - final String wireName = 'GheroDataVars'; - - @override - Iterable serialize(Serializers serializers, GheroDataVars object, - {FullType specifiedType = FullType.unspecified}) { - return []; - } - - @override - GheroDataVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - return new GheroDataVarsBuilder().build(); - } -} - -class _$GcomparisonFieldsVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GcomparisonFieldsVars, - _$GcomparisonFieldsVars - ]; - @override - final String wireName = 'GcomparisonFieldsVars'; - - @override - Iterable serialize( - Serializers serializers, GcomparisonFieldsVars object, - {FullType specifiedType = FullType.unspecified}) { - final result = []; - Object? value; - value = object.first; - if (value != null) { - result - ..add('first') - ..add(serializers.serialize(value, specifiedType: const FullType(int))); - } - return result; - } - - @override - GcomparisonFieldsVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GcomparisonFieldsVarsBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'first': - result.first = serializers.deserialize(value, - specifiedType: const FullType(int)) as int?; - break; - } - } - - return result.build(); - } -} - class _$GHeroWithFragmentsVars extends GHeroWithFragmentsVars { @override - final int? first; + final _i1.Value? first; factory _$GHeroWithFragmentsVars( [void Function(GHeroWithFragmentsVarsBuilder)? updates]) => @@ -156,7 +33,10 @@ class _$GHeroWithFragmentsVars extends GHeroWithFragmentsVars { @override int get hashCode { - return $jf($jc(0, first.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, first.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -171,9 +51,9 @@ class GHeroWithFragmentsVarsBuilder implements Builder { _$GHeroWithFragmentsVars? _$v; - int? _first; - int? get first => _$this._first; - set first(int? first) => _$this._first = first; + _i1.Value? _first; + _i1.Value? get first => _$this._first; + set first(_i1.Value? first) => _$this._first = first; GHeroWithFragmentsVarsBuilder(); @@ -266,7 +146,7 @@ class GheroDataVarsBuilder class _$GcomparisonFieldsVars extends GcomparisonFieldsVars { @override - final int? first; + final _i1.Value? first; factory _$GcomparisonFieldsVars( [void Function(GcomparisonFieldsVarsBuilder)? updates]) => @@ -291,7 +171,10 @@ class _$GcomparisonFieldsVars extends GcomparisonFieldsVars { @override int get hashCode { - return $jf($jc(0, first.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, first.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -306,9 +189,9 @@ class GcomparisonFieldsVarsBuilder implements Builder { _$GcomparisonFieldsVars? _$v; - int? _first; - int? get first => _$this._first; - set first(int? first) => _$this._first = first; + _i1.Value? _first; + _i1.Value? get first => _$this._first; + set first(_i1.Value? first) => _$this._first = first; GcomparisonFieldsVarsBuilder(); @@ -342,4 +225,4 @@ class GcomparisonFieldsVarsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.data.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.data.gql.g.dart index c19d7668..20c08793 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.data.gql.g.dart @@ -919,7 +919,11 @@ class _$GHeroWithInterfaceSubTypedFragmentsData @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), hero.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, hero.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1052,8 +1056,12 @@ class _$GHeroWithInterfaceSubTypedFragmentsData_hero @override int get hashCode { - return $jf( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1173,8 +1181,12 @@ class _$GheroFieldsFragmentData__base extends GheroFieldsFragmentData__base { @override int get hashCode { - return $jf( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1302,10 +1314,14 @@ class _$GheroFieldsFragmentData__asHuman @override int get hashCode { - return $jf($jc( - $jc($jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - homePlanet.hashCode), - friends.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, homePlanet.hashCode); + _$hash = $jc(_$hash, friends.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1449,7 +1465,10 @@ class _$GheroFieldsFragmentData__asHuman_friends__base @override int get hashCode { - return $jf($jc(0, G__typename.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1569,9 +1588,13 @@ class _$GheroFieldsFragmentData__asHuman_friends__asDroid @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - primaryFunction.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, primaryFunction.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1715,9 +1738,13 @@ class _$GheroFieldsFragmentData__asHuman_friends__asHuman @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - homePlanet.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, homePlanet.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1853,9 +1880,13 @@ class _$GheroFieldsFragmentData__asDroid @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - primaryFunction.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, primaryFunction.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1976,8 +2007,12 @@ class _$GhumanFieldsFragmentData extends GhumanFieldsFragmentData { @override int get hashCode { - return $jf($jc($jc($jc(0, G__typename.hashCode), homePlanet.hashCode), - friends.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, homePlanet.hashCode); + _$hash = $jc(_$hash, friends.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -2099,7 +2134,10 @@ class _$GhumanFieldsFragmentData_friends__base @override int get hashCode { - return $jf($jc(0, G__typename.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -2212,9 +2250,13 @@ class _$GhumanFieldsFragmentData_friends__asDroid @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - primaryFunction.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, primaryFunction.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -2352,9 +2394,13 @@ class _$GhumanFieldsFragmentData_friends__asHuman @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), - homePlanet.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, homePlanet.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -2474,7 +2520,11 @@ class _$GdroidFieldsFragmentData extends GdroidFieldsFragmentData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), primaryFunction.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, primaryFunction.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -2539,4 +2589,4 @@ class GdroidFieldsFragmentDataBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.req.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.req.gql.g.dart index b33b976f..39a20488 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.req.gql.g.dart @@ -107,7 +107,11 @@ class _$GHeroWithInterfaceSubTypedFragments @override int get hashCode { - return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -190,4 +194,4 @@ class GHeroWithInterfaceSubTypedFragmentsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.dart index 5993ed7d..265403cb 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.dart @@ -22,8 +22,6 @@ abstract class GHeroWithInterfaceSubTypedFragmentsVars updates]) = _$GHeroWithInterfaceSubTypedFragmentsVars; _i1.GEpisode get episode; - static Serializer get serializer => - _$gHeroWithInterfaceSubTypedFragmentsVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GHeroWithInterfaceSubTypedFragmentsVars.serializer, this, @@ -34,6 +32,9 @@ abstract class GHeroWithInterfaceSubTypedFragmentsVars GHeroWithInterfaceSubTypedFragmentsVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GHeroWithInterfaceSubTypedFragmentsVarsSerializer(); } abstract class GheroFieldsFragmentVars @@ -44,8 +45,6 @@ abstract class GheroFieldsFragmentVars [Function(GheroFieldsFragmentVarsBuilder b) updates]) = _$GheroFieldsFragmentVars; - static Serializer get serializer => - _$gheroFieldsFragmentVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GheroFieldsFragmentVars.serializer, this, @@ -55,6 +54,9 @@ abstract class GheroFieldsFragmentVars GheroFieldsFragmentVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GheroFieldsFragmentVarsSerializer(); } abstract class GhumanFieldsFragmentVars @@ -66,8 +68,6 @@ abstract class GhumanFieldsFragmentVars [Function(GhumanFieldsFragmentVarsBuilder b) updates]) = _$GhumanFieldsFragmentVars; - static Serializer get serializer => - _$ghumanFieldsFragmentVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GhumanFieldsFragmentVars.serializer, this, @@ -77,6 +77,9 @@ abstract class GhumanFieldsFragmentVars GhumanFieldsFragmentVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GhumanFieldsFragmentVarsSerializer(); } abstract class GdroidFieldsFragmentVars @@ -88,8 +91,6 @@ abstract class GdroidFieldsFragmentVars [Function(GdroidFieldsFragmentVarsBuilder b) updates]) = _$GdroidFieldsFragmentVars; - static Serializer get serializer => - _$gdroidFieldsFragmentVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GdroidFieldsFragmentVars.serializer, this, @@ -99,4 +100,162 @@ abstract class GdroidFieldsFragmentVars GdroidFieldsFragmentVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GdroidFieldsFragmentVarsSerializer(); +} + +class GHeroWithInterfaceSubTypedFragmentsVarsSerializer + extends StructuredSerializer { + final String wireName = 'GHeroWithInterfaceSubTypedFragmentsVars'; + + final Iterable types = const [ + GHeroWithInterfaceSubTypedFragmentsVars, + _$GHeroWithInterfaceSubTypedFragmentsVars + ]; + + Iterable serialize( + Serializers serializers, + GHeroWithInterfaceSubTypedFragmentsVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + result.add('episode'); + result.add(serializers.serialize(object.episode, + specifiedType: const FullType(_i1.GEpisode))); + return result; + } + + GHeroWithInterfaceSubTypedFragmentsVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GHeroWithInterfaceSubTypedFragmentsVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'episode': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; + builder.episode = fieldValue; + break; + } + } + return builder.build(); + } +} + +class GheroFieldsFragmentVarsSerializer + extends StructuredSerializer { + final String wireName = 'GheroFieldsFragmentVars'; + + final Iterable types = const [ + GheroFieldsFragmentVars, + _$GheroFieldsFragmentVars + ]; + + Iterable serialize( + Serializers serializers, + GheroFieldsFragmentVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + return result; + } + + GheroFieldsFragmentVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GheroFieldsFragmentVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + + } + } + return builder.build(); + } +} + +class GhumanFieldsFragmentVarsSerializer + extends StructuredSerializer { + final String wireName = 'GhumanFieldsFragmentVars'; + + final Iterable types = const [ + GhumanFieldsFragmentVars, + _$GhumanFieldsFragmentVars + ]; + + Iterable serialize( + Serializers serializers, + GhumanFieldsFragmentVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + return result; + } + + GhumanFieldsFragmentVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GhumanFieldsFragmentVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + + } + } + return builder.build(); + } +} + +class GdroidFieldsFragmentVarsSerializer + extends StructuredSerializer { + final String wireName = 'GdroidFieldsFragmentVars'; + + final Iterable types = const [ + GdroidFieldsFragmentVars, + _$GdroidFieldsFragmentVars + ]; + + Iterable serialize( + Serializers serializers, + GdroidFieldsFragmentVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + return result; + } + + GdroidFieldsFragmentVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GdroidFieldsFragmentVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + + } + } + return builder.build(); + } } diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.g.dart index 039e22cd..0689f5b4 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.g.dart @@ -6,137 +6,6 @@ part of 'hero_with_interface_subtyped_fragments.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** -Serializer - _$gHeroWithInterfaceSubTypedFragmentsVarsSerializer = - new _$GHeroWithInterfaceSubTypedFragmentsVarsSerializer(); -Serializer _$gheroFieldsFragmentVarsSerializer = - new _$GheroFieldsFragmentVarsSerializer(); -Serializer _$ghumanFieldsFragmentVarsSerializer = - new _$GhumanFieldsFragmentVarsSerializer(); -Serializer _$gdroidFieldsFragmentVarsSerializer = - new _$GdroidFieldsFragmentVarsSerializer(); - -class _$GHeroWithInterfaceSubTypedFragmentsVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GHeroWithInterfaceSubTypedFragmentsVars, - _$GHeroWithInterfaceSubTypedFragmentsVars - ]; - @override - final String wireName = 'GHeroWithInterfaceSubTypedFragmentsVars'; - - @override - Iterable serialize( - Serializers serializers, GHeroWithInterfaceSubTypedFragmentsVars object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'episode', - serializers.serialize(object.episode, - specifiedType: const FullType(_i1.GEpisode)), - ]; - - return result; - } - - @override - GHeroWithInterfaceSubTypedFragmentsVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GHeroWithInterfaceSubTypedFragmentsVarsBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'episode': - result.episode = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode))! as _i1.GEpisode; - break; - } - } - - return result.build(); - } -} - -class _$GheroFieldsFragmentVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GheroFieldsFragmentVars, - _$GheroFieldsFragmentVars - ]; - @override - final String wireName = 'GheroFieldsFragmentVars'; - - @override - Iterable serialize( - Serializers serializers, GheroFieldsFragmentVars object, - {FullType specifiedType = FullType.unspecified}) { - return []; - } - - @override - GheroFieldsFragmentVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - return new GheroFieldsFragmentVarsBuilder().build(); - } -} - -class _$GhumanFieldsFragmentVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GhumanFieldsFragmentVars, - _$GhumanFieldsFragmentVars - ]; - @override - final String wireName = 'GhumanFieldsFragmentVars'; - - @override - Iterable serialize( - Serializers serializers, GhumanFieldsFragmentVars object, - {FullType specifiedType = FullType.unspecified}) { - return []; - } - - @override - GhumanFieldsFragmentVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - return new GhumanFieldsFragmentVarsBuilder().build(); - } -} - -class _$GdroidFieldsFragmentVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GdroidFieldsFragmentVars, - _$GdroidFieldsFragmentVars - ]; - @override - final String wireName = 'GdroidFieldsFragmentVars'; - - @override - Iterable serialize( - Serializers serializers, GdroidFieldsFragmentVars object, - {FullType specifiedType = FullType.unspecified}) { - return []; - } - - @override - GdroidFieldsFragmentVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - return new GdroidFieldsFragmentVarsBuilder().build(); - } -} - class _$GHeroWithInterfaceSubTypedFragmentsVars extends GHeroWithInterfaceSubTypedFragmentsVars { @override @@ -173,7 +42,10 @@ class _$GHeroWithInterfaceSubTypedFragmentsVars @override int get hashCode { - return $jf($jc(0, episode.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, episode.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -414,4 +286,4 @@ class GdroidFieldsFragmentVarsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/schema.ast.gql.dart b/codegen/end_to_end_test/lib/graphql/__generated__/schema.ast.gql.dart index 118f4e7a..6fe4a9a0 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/schema.ast.gql.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/schema.ast.gql.dart @@ -226,7 +226,26 @@ const Mutation = _i1.ObjectTypeDefinitionNode( name: _i1.NameNode(value: 'Review'), isNonNull: false, ), - ) + ), + _i1.FieldDefinitionNode( + name: _i1.NameNode(value: 'createCustomField'), + directives: [], + args: [ + _i1.InputValueDefinitionNode( + name: _i1.NameNode(value: 'input'), + directives: [], + type: _i1.NamedTypeNode( + name: _i1.NameNode(value: 'CustomFieldInput'), + isNonNull: true, + ), + defaultValue: null, + ) + ], + type: _i1.NamedTypeNode( + name: _i1.NameNode(value: 'CustomField'), + isNonNull: false, + ), + ), ], ); const Subscription = _i1.ObjectTypeDefinitionNode( @@ -815,6 +834,30 @@ const ReviewInput = _i1.InputObjectTypeDefinitionNode( ), ], ); +const CustomFieldInput = _i1.InputObjectTypeDefinitionNode( + name: _i1.NameNode(value: 'CustomFieldInput'), + directives: [], + fields: [ + _i1.InputValueDefinitionNode( + name: _i1.NameNode(value: 'id'), + directives: [], + type: _i1.NamedTypeNode( + name: _i1.NameNode(value: 'ID'), + isNonNull: true, + ), + defaultValue: null, + ), + _i1.InputValueDefinitionNode( + name: _i1.NameNode(value: 'customField'), + directives: [], + type: _i1.NamedTypeNode( + name: _i1.NameNode(value: 'CustomField'), + isNonNull: false, + ), + defaultValue: null, + ), + ], +); const ColorInput = _i1.InputObjectTypeDefinitionNode( name: _i1.NameNode(value: 'ColorInput'), directives: [], @@ -953,6 +996,7 @@ const document = _i1.DocumentNode(definitions: [ PageInfo, Review, ReviewInput, + CustomFieldInput, ColorInput, Starship, SearchResult, diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.dart b/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.dart index a84cdbf5..db2526ce 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.dart @@ -5,10 +5,12 @@ import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; +import 'package:end_to_end_test/custom_field.dart' as _i2; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i1; + as _i3; import 'package:gql_code_builder/src/serializers/default_scalar_serializer.dart' - as _i2; + as _i4; +import 'package:gql_exec/value.dart' as _i1; part 'schema.schema.gql.g.dart'; @@ -50,19 +52,171 @@ abstract class GReviewInput _$GReviewInput; int get stars; - String? get commentary; - GColorInput? get favorite_color; - BuiltList? get seenOn; - static Serializer get serializer => _$gReviewInputSerializer; - Map toJson() => (_i1.serializers.serializeWith( + _i1.Value? get commentary; + _i1.Value? get favorite_color; + _i1.Value>? get seenOn; + Map toJson() => (_i3.serializers.serializeWith( GReviewInput.serializer, this, ) as Map); static GReviewInput? fromJson(Map json) => - _i1.serializers.deserializeWith( + _i3.serializers.deserializeWith( GReviewInput.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => GReviewInputSerializer(); +} + +class GReviewInputSerializer extends StructuredSerializer { + final String wireName = 'GReviewInput'; + + final Iterable types = const [GReviewInput, _$GReviewInput]; + + Iterable serialize( + Serializers serializers, + GReviewInput object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + result.add('stars'); + result.add(serializers.serialize(object.stars, + specifiedType: const FullType(int))); + final _$commentaryvalue = object.commentary; + if (_$commentaryvalue != null) { + result.add('commentary'); + result.add(serializers.serialize(_$commentaryvalue!.value, + specifiedType: const FullType(String))); + } + final _$favorite_colorvalue = object.favorite_color; + if (_$favorite_colorvalue != null) { + result.add('favorite_color'); + result.add(serializers.serialize(_$favorite_colorvalue!.value, + specifiedType: const FullType(GColorInput))); + } + final _$seenOnvalue = object.seenOn; + if (_$seenOnvalue != null) { + result.add('seenOn'); + result.add(serializers.serialize(_$seenOnvalue!.value, + specifiedType: const FullType(BuiltList, [FullType(DateTime)]))); + } + return result; + } + + GReviewInput deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GReviewInputBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'stars': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(int)) as int; + builder.stars = fieldValue; + break; + case 'commentary': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + builder.commentary = _i1.Value(fieldValue); + break; + case 'favorite_color': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(GColorInput)) as GColorInput; + builder.favorite_color = _i1.Value(fieldValue); + break; + case 'seenOn': + var fieldValue = serializers.deserialize(value, + specifiedType: + const FullType(BuiltList, [FullType(DateTime)])) + as BuiltList; + builder.seenOn = _i1.Value(fieldValue); + break; + } + } + return builder.build(); + } +} + +abstract class GCustomFieldInput + implements Built { + GCustomFieldInput._(); + + factory GCustomFieldInput([Function(GCustomFieldInputBuilder b) updates]) = + _$GCustomFieldInput; + + String get id; + _i1.Value<_i2.CustomField>? get customField; + Map toJson() => (_i3.serializers.serializeWith( + GCustomFieldInput.serializer, + this, + ) as Map); + static GCustomFieldInput? fromJson(Map json) => + _i3.serializers.deserializeWith( + GCustomFieldInput.serializer, + json, + ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GCustomFieldInputSerializer(); +} + +class GCustomFieldInputSerializer + extends StructuredSerializer { + final String wireName = 'GCustomFieldInput'; + + final Iterable types = const [GCustomFieldInput, _$GCustomFieldInput]; + + Iterable serialize( + Serializers serializers, + GCustomFieldInput object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + result.add('id'); + result.add(serializers.serialize(object.id, + specifiedType: const FullType(String))); + final _$customFieldvalue = object.customField; + if (_$customFieldvalue != null) { + result.add('customField'); + result.add(serializers.serialize(_$customFieldvalue!.value, + specifiedType: const FullType(_i2.CustomField))); + } + return result; + } + + GCustomFieldInput deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GCustomFieldInputBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'id': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + builder.id = fieldValue; + break; + case 'customField': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i2.CustomField)) + as _i2.CustomField; + builder.customField = _i1.Value(fieldValue); + break; + } + } + return builder.build(); + } } abstract class GColorInput implements Built { @@ -73,16 +227,73 @@ abstract class GColorInput implements Built { int get red; int get green; int get blue; - static Serializer get serializer => _$gColorInputSerializer; - Map toJson() => (_i1.serializers.serializeWith( + Map toJson() => (_i3.serializers.serializeWith( GColorInput.serializer, this, ) as Map); static GColorInput? fromJson(Map json) => - _i1.serializers.deserializeWith( + _i3.serializers.deserializeWith( GColorInput.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => GColorInputSerializer(); +} + +class GColorInputSerializer extends StructuredSerializer { + final String wireName = 'GColorInput'; + + final Iterable types = const [GColorInput, _$GColorInput]; + + Iterable serialize( + Serializers serializers, + GColorInput object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + result.add('red'); + result.add( + serializers.serialize(object.red, specifiedType: const FullType(int))); + result.add('green'); + result.add(serializers.serialize(object.green, + specifiedType: const FullType(int))); + result.add('blue'); + result.add( + serializers.serialize(object.blue, specifiedType: const FullType(int))); + return result; + } + + GColorInput deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GColorInputBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'red': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(int)) as int; + builder.red = fieldValue; + break; + case 'green': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(int)) as int; + builder.green = fieldValue; + break; + case 'blue': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(int)) as int; + builder.blue = fieldValue; + break; + } + } + return builder.build(); + } } abstract class GISODate implements Built { @@ -94,7 +305,7 @@ abstract class GISODate implements Built { String get value; @BuiltValueSerializer(custom: true) static Serializer get serializer => - _i2.DefaultScalarSerializer( + _i4.DefaultScalarSerializer( (Object serialized) => GISODate((serialized as String?))); } diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.g.dart b/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.g.dart index 9a393483..c906df68 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.g.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.g.dart @@ -52,9 +52,6 @@ final BuiltSet _$gLengthUnitValues = Serializer _$gEpisodeSerializer = new _$GEpisodeSerializer(); Serializer _$gLengthUnitSerializer = new _$GLengthUnitSerializer(); -Serializer _$gReviewInputSerializer = - new _$GReviewInputSerializer(); -Serializer _$gColorInputSerializer = new _$GColorInputSerializer(); class _$GEpisodeSerializer implements PrimitiveSerializer { @override @@ -98,142 +95,15 @@ class _$GLengthUnitSerializer implements PrimitiveSerializer { _fromWire[serialized] ?? (serialized is String ? serialized : '')); } -class _$GReviewInputSerializer implements StructuredSerializer { - @override - final Iterable types = const [GReviewInput, _$GReviewInput]; - @override - final String wireName = 'GReviewInput'; - - @override - Iterable serialize(Serializers serializers, GReviewInput object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'stars', - serializers.serialize(object.stars, specifiedType: const FullType(int)), - ]; - Object? value; - value = object.commentary; - if (value != null) { - result - ..add('commentary') - ..add(serializers.serialize(value, - specifiedType: const FullType(String))); - } - value = object.favorite_color; - if (value != null) { - result - ..add('favorite_color') - ..add(serializers.serialize(value, - specifiedType: const FullType(GColorInput))); - } - value = object.seenOn; - if (value != null) { - result - ..add('seenOn') - ..add(serializers.serialize(value, - specifiedType: const FullType( - BuiltList, const [const FullType.nullable(DateTime)]))); - } - return result; - } - - @override - GReviewInput deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GReviewInputBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'stars': - result.stars = serializers.deserialize(value, - specifiedType: const FullType(int))! as int; - break; - case 'commentary': - result.commentary = serializers.deserialize(value, - specifiedType: const FullType(String)) as String?; - break; - case 'favorite_color': - result.favorite_color.replace(serializers.deserialize(value, - specifiedType: const FullType(GColorInput))! as GColorInput); - break; - case 'seenOn': - result.seenOn.replace(serializers.deserialize(value, - specifiedType: const FullType( - BuiltList, const [const FullType.nullable(DateTime)]))! - as BuiltList); - break; - } - } - - return result.build(); - } -} - -class _$GColorInputSerializer implements StructuredSerializer { - @override - final Iterable types = const [GColorInput, _$GColorInput]; - @override - final String wireName = 'GColorInput'; - - @override - Iterable serialize(Serializers serializers, GColorInput object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'red', - serializers.serialize(object.red, specifiedType: const FullType(int)), - 'green', - serializers.serialize(object.green, specifiedType: const FullType(int)), - 'blue', - serializers.serialize(object.blue, specifiedType: const FullType(int)), - ]; - - return result; - } - - @override - GColorInput deserialize(Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GColorInputBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'red': - result.red = serializers.deserialize(value, - specifiedType: const FullType(int))! as int; - break; - case 'green': - result.green = serializers.deserialize(value, - specifiedType: const FullType(int))! as int; - break; - case 'blue': - result.blue = serializers.deserialize(value, - specifiedType: const FullType(int))! as int; - break; - } - } - - return result.build(); - } -} - class _$GReviewInput extends GReviewInput { @override final int stars; @override - final String? commentary; + final _i1.Value? commentary; @override - final GColorInput? favorite_color; + final _i1.Value? favorite_color; @override - final BuiltList? seenOn; + final _i1.Value>? seenOn; factory _$GReviewInput([void Function(GReviewInputBuilder)? updates]) => (new GReviewInputBuilder()..update(updates))._build(); @@ -263,10 +133,13 @@ class _$GReviewInput extends GReviewInput { @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, stars.hashCode), commentary.hashCode), - favorite_color.hashCode), - seenOn.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, stars.hashCode); + _$hash = $jc(_$hash, commentary.hashCode); + _$hash = $jc(_$hash, favorite_color.hashCode); + _$hash = $jc(_$hash, seenOn.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -288,20 +161,20 @@ class GReviewInputBuilder int? get stars => _$this._stars; set stars(int? stars) => _$this._stars = stars; - String? _commentary; - String? get commentary => _$this._commentary; - set commentary(String? commentary) => _$this._commentary = commentary; + _i1.Value? _commentary; + _i1.Value? get commentary => _$this._commentary; + set commentary(_i1.Value? commentary) => + _$this._commentary = commentary; - GColorInputBuilder? _favorite_color; - GColorInputBuilder get favorite_color => - _$this._favorite_color ??= new GColorInputBuilder(); - set favorite_color(GColorInputBuilder? favorite_color) => + _i1.Value? _favorite_color; + _i1.Value? get favorite_color => _$this._favorite_color; + set favorite_color(_i1.Value? favorite_color) => _$this._favorite_color = favorite_color; - ListBuilder? _seenOn; - ListBuilder get seenOn => - _$this._seenOn ??= new ListBuilder(); - set seenOn(ListBuilder? seenOn) => _$this._seenOn = seenOn; + _i1.Value>? _seenOn; + _i1.Value>? get seenOn => _$this._seenOn; + set seenOn(_i1.Value>? seenOn) => + _$this._seenOn = seenOn; GReviewInputBuilder(); @@ -310,8 +183,8 @@ class GReviewInputBuilder if ($v != null) { _stars = $v.stars; _commentary = $v.commentary; - _favorite_color = $v.favorite_color?.toBuilder(); - _seenOn = $v.seenOn?.toBuilder(); + _favorite_color = $v.favorite_color; + _seenOn = $v.seenOn; _$v = null; } return this; @@ -332,28 +205,111 @@ class GReviewInputBuilder GReviewInput build() => _build(); _$GReviewInput _build() { - _$GReviewInput _$result; - try { - _$result = _$v ?? - new _$GReviewInput._( - stars: BuiltValueNullFieldError.checkNotNull( - stars, r'GReviewInput', 'stars'), - commentary: commentary, - favorite_color: _favorite_color?.build(), - seenOn: _seenOn?.build()); - } catch (_) { - late String _$failedField; - try { - _$failedField = 'favorite_color'; - _favorite_color?.build(); - _$failedField = 'seenOn'; - _seenOn?.build(); - } catch (e) { - throw new BuiltValueNestedFieldError( - r'GReviewInput', _$failedField, e.toString()); - } - rethrow; + final _$result = _$v ?? + new _$GReviewInput._( + stars: BuiltValueNullFieldError.checkNotNull( + stars, r'GReviewInput', 'stars'), + commentary: commentary, + favorite_color: favorite_color, + seenOn: seenOn); + replace(_$result); + return _$result; + } +} + +class _$GCustomFieldInput extends GCustomFieldInput { + @override + final String id; + @override + final _i1.Value<_i2.CustomField>? customField; + + factory _$GCustomFieldInput( + [void Function(GCustomFieldInputBuilder)? updates]) => + (new GCustomFieldInputBuilder()..update(updates))._build(); + + _$GCustomFieldInput._({required this.id, this.customField}) : super._() { + BuiltValueNullFieldError.checkNotNull(id, r'GCustomFieldInput', 'id'); + } + + @override + GCustomFieldInput rebuild(void Function(GCustomFieldInputBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + GCustomFieldInputBuilder toBuilder() => + new GCustomFieldInputBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is GCustomFieldInput && + id == other.id && + customField == other.customField; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, customField.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'GCustomFieldInput') + ..add('id', id) + ..add('customField', customField)) + .toString(); + } +} + +class GCustomFieldInputBuilder + implements Builder { + _$GCustomFieldInput? _$v; + + String? _id; + String? get id => _$this._id; + set id(String? id) => _$this._id = id; + + _i1.Value<_i2.CustomField>? _customField; + _i1.Value<_i2.CustomField>? get customField => _$this._customField; + set customField(_i1.Value<_i2.CustomField>? customField) => + _$this._customField = customField; + + GCustomFieldInputBuilder(); + + GCustomFieldInputBuilder get _$this { + final $v = _$v; + if ($v != null) { + _id = $v.id; + _customField = $v.customField; + _$v = null; } + return this; + } + + @override + void replace(GCustomFieldInput other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$GCustomFieldInput; + } + + @override + void update(void Function(GCustomFieldInputBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + GCustomFieldInput build() => _build(); + + _$GCustomFieldInput _build() { + final _$result = _$v ?? + new _$GCustomFieldInput._( + id: BuiltValueNullFieldError.checkNotNull( + id, r'GCustomFieldInput', 'id'), + customField: customField); replace(_$result); return _$result; } @@ -395,7 +351,12 @@ class _$GColorInput extends GColorInput { @override int get hashCode { - return $jf($jc($jc($jc(0, red.hashCode), green.hashCode), blue.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, red.hashCode); + _$hash = $jc(_$hash, green.hashCode); + _$hash = $jc(_$hash, blue.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -490,7 +451,10 @@ class _$GISODate extends GISODate { @override int get hashCode { - return $jf($jc(0, value.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, value.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -542,4 +506,4 @@ class GISODateBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.dart b/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.dart index 28626ae9..75eee6b9 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.dart @@ -57,7 +57,13 @@ import 'package:end_to_end_test/fragments/__generated__/hero_with_interface_subt GheroFieldsFragmentVars, GhumanFieldsFragmentVars; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart' - show GColorInput, GEpisode, GISODate, GLengthUnit, GReviewInput; + show + GColorInput, + GCustomFieldInput, + GEpisode, + GISODate, + GLengthUnit, + GReviewInput; import 'package:end_to_end_test/interfaces/__generated__/hero_for_episode.data.gql.dart' show GHeroForEpisodeData_hero, @@ -83,6 +89,12 @@ import 'package:end_to_end_test/scalars/__generated__/review_with_date.req.gql.d show GReviewWithDate; import 'package:end_to_end_test/scalars/__generated__/review_with_date.var.gql.dart' show GReviewWithDateVars; +import 'package:end_to_end_test/variables/__generated__/create_custom_field.data.gql.dart' + show GCreateCustomFieldData; +import 'package:end_to_end_test/variables/__generated__/create_custom_field.req.gql.dart' + show GCreateCustomField; +import 'package:end_to_end_test/variables/__generated__/create_custom_field.var.gql.dart' + show GCreateCustomFieldVars; import 'package:end_to_end_test/variables/__generated__/create_review.data.gql.dart' show GCreateReviewData, GCreateReviewData_createReview; import 'package:end_to_end_test/variables/__generated__/create_review.req.gql.dart' @@ -116,10 +128,14 @@ final SerializersBuilder _serializersBuilder = _$serializers.toBuilder() GAliasedHeroData_jediHero, GAliasedHeroVars, GColorInput, + GCreateCustomField, + GCreateCustomFieldData, + GCreateCustomFieldVars, GCreateReview, GCreateReviewData, GCreateReviewData_createReview, GCreateReviewVars, + GCustomFieldInput, GDroidFragmentData, GDroidFragmentVars, GEpisode, diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.g.dart b/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.g.dart index 4a6a2114..fe1d753a 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.g.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.g.dart @@ -13,10 +13,14 @@ Serializers _$serializers = (new Serializers().toBuilder() ..add(GAliasedHeroData_jediHero.serializer) ..add(GAliasedHeroVars.serializer) ..add(GColorInput.serializer) + ..add(GCreateCustomField.serializer) + ..add(GCreateCustomFieldData.serializer) + ..add(GCreateCustomFieldVars.serializer) ..add(GCreateReview.serializer) ..add(GCreateReviewData.serializer) ..add(GCreateReviewData_createReview.serializer) ..add(GCreateReviewVars.serializer) + ..add(GCustomFieldInput.serializer) ..add(GDroidFragmentData.serializer) ..add(GDroidFragmentVars.serializer) ..add(GEpisode.serializer) @@ -80,9 +84,6 @@ Serializers _$serializers = (new Serializers().toBuilder() ..addBuilderFactory( const FullType(BuiltList, const [const FullType(CustomField)]), () => new ListBuilder()) - ..addBuilderFactory( - const FullType(BuiltList, const [const FullType.nullable(DateTime)]), - () => new ListBuilder()) ..addBuilderFactory( const FullType(BuiltList, const [const FullType.nullable(GEpisode)]), () => new ListBuilder()) @@ -125,4 +126,4 @@ Serializers _$serializers = (new Serializers().toBuilder() () => new ListBuilder())) .build(); -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/graphql/schema.graphql b/codegen/end_to_end_test/lib/graphql/schema.graphql index c95faa8f..bcd72c20 100644 --- a/codegen/end_to_end_test/lib/graphql/schema.graphql +++ b/codegen/end_to_end_test/lib/graphql/schema.graphql @@ -23,6 +23,7 @@ type Query { # The mutation type, represents all updates we can make to our data type Mutation { createReview(episode: Episode, review: ReviewInput!, createdAt: Date): Review + createCustomField(input: CustomFieldInput!): CustomField } # The subscription type, represents all subscriptions we can make to our data @@ -157,6 +158,11 @@ input ReviewInput { seenOn: [Date] } +input CustomFieldInput { + id: ID! + customField: CustomField +} + # The input object sent when passing in a color input ColorInput { red: Int! diff --git a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.data.gql.g.dart b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.data.gql.g.dart index 3fa28c16..ee58bc38 100644 --- a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.data.gql.g.dart @@ -419,7 +419,11 @@ class _$GHeroForEpisodeData extends GHeroForEpisodeData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), hero.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, hero.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -523,8 +527,12 @@ class _$GHeroForEpisodeData_hero__base extends GHeroForEpisodeData_hero__base { @override int get hashCode { - return $jf($jc( - $jc($jc(0, G__typename.hashCode), name.hashCode), friends.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, friends.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -655,7 +663,11 @@ class _$GHeroForEpisodeData_hero__base_friends @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -772,9 +784,13 @@ class _$GHeroForEpisodeData_hero__asDroid @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), name.hashCode), friends.hashCode), - primaryFunction.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, friends.hashCode); + _$hash = $jc(_$hash, primaryFunction.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -915,7 +931,11 @@ class _$GHeroForEpisodeData_hero__asDroid_friends @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1019,7 +1039,11 @@ class _$GDroidFragmentData extends GDroidFragmentData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), primaryFunction.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, primaryFunction.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -1083,4 +1107,4 @@ class GDroidFragmentDataBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.req.gql.g.dart b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.req.gql.g.dart index 62c43d0e..fbeddc86 100644 --- a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.req.gql.g.dart @@ -93,7 +93,11 @@ class _$GHeroForEpisode extends GHeroForEpisode { @override int get hashCode { - return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -170,4 +174,4 @@ class GHeroForEpisodeBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.dart b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.dart index 940f6b8c..28c7d976 100644 --- a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.dart +++ b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.dart @@ -19,8 +19,6 @@ abstract class GHeroForEpisodeVars [Function(GHeroForEpisodeVarsBuilder b) updates]) = _$GHeroForEpisodeVars; _i1.GEpisode get ep; - static Serializer get serializer => - _$gHeroForEpisodeVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GHeroForEpisodeVars.serializer, this, @@ -30,6 +28,9 @@ abstract class GHeroForEpisodeVars GHeroForEpisodeVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GHeroForEpisodeVarsSerializer(); } abstract class GDroidFragmentVars @@ -39,8 +40,6 @@ abstract class GDroidFragmentVars factory GDroidFragmentVars([Function(GDroidFragmentVarsBuilder b) updates]) = _$GDroidFragmentVars; - static Serializer get serializer => - _$gDroidFragmentVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GDroidFragmentVars.serializer, this, @@ -50,4 +49,85 @@ abstract class GDroidFragmentVars GDroidFragmentVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GDroidFragmentVarsSerializer(); +} + +class GHeroForEpisodeVarsSerializer + extends StructuredSerializer { + final String wireName = 'GHeroForEpisodeVars'; + + final Iterable types = const [ + GHeroForEpisodeVars, + _$GHeroForEpisodeVars + ]; + + Iterable serialize( + Serializers serializers, + GHeroForEpisodeVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + result.add('ep'); + result.add(serializers.serialize(object.ep, + specifiedType: const FullType(_i1.GEpisode))); + return result; + } + + GHeroForEpisodeVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GHeroForEpisodeVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'ep': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; + builder.ep = fieldValue; + break; + } + } + return builder.build(); + } +} + +class GDroidFragmentVarsSerializer + extends StructuredSerializer { + final String wireName = 'GDroidFragmentVars'; + + final Iterable types = const [GDroidFragmentVars, _$GDroidFragmentVars]; + + Iterable serialize( + Serializers serializers, + GDroidFragmentVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + return result; + } + + GDroidFragmentVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GDroidFragmentVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + + } + } + return builder.build(); + } } diff --git a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.g.dart b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.g.dart index 89ab68f7..5ff1690c 100644 --- a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.g.dart @@ -6,79 +6,6 @@ part of 'hero_for_episode.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** -Serializer _$gHeroForEpisodeVarsSerializer = - new _$GHeroForEpisodeVarsSerializer(); -Serializer _$gDroidFragmentVarsSerializer = - new _$GDroidFragmentVarsSerializer(); - -class _$GHeroForEpisodeVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GHeroForEpisodeVars, - _$GHeroForEpisodeVars - ]; - @override - final String wireName = 'GHeroForEpisodeVars'; - - @override - Iterable serialize( - Serializers serializers, GHeroForEpisodeVars object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'ep', - serializers.serialize(object.ep, - specifiedType: const FullType(_i1.GEpisode)), - ]; - - return result; - } - - @override - GHeroForEpisodeVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GHeroForEpisodeVarsBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'ep': - result.ep = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode))! as _i1.GEpisode; - break; - } - } - - return result.build(); - } -} - -class _$GDroidFragmentVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [GDroidFragmentVars, _$GDroidFragmentVars]; - @override - final String wireName = 'GDroidFragmentVars'; - - @override - Iterable serialize( - Serializers serializers, GDroidFragmentVars object, - {FullType specifiedType = FullType.unspecified}) { - return []; - } - - @override - GDroidFragmentVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - return new GDroidFragmentVarsBuilder().build(); - } -} - class _$GHeroForEpisodeVars extends GHeroForEpisodeVars { @override final _i1.GEpisode ep; @@ -108,7 +35,10 @@ class _$GHeroForEpisodeVars extends GHeroForEpisodeVars { @override int get hashCode { - return $jf($jc(0, ep.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, ep.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -221,4 +151,4 @@ class GDroidFragmentVarsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.data.gql.g.dart b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.data.gql.g.dart index a98b4caf..849ff651 100644 --- a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.data.gql.g.dart @@ -155,7 +155,11 @@ class _$GHeroNoVarsData extends GHeroNoVarsData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), hero.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, hero.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -274,8 +278,12 @@ class _$GHeroNoVarsData_hero extends GHeroNoVarsData_hero { @override int get hashCode { - return $jf( - $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -347,4 +355,4 @@ class GHeroNoVarsData_heroBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.req.gql.g.dart b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.req.gql.g.dart index ac4dc32c..d42882c5 100644 --- a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.req.gql.g.dart @@ -88,7 +88,11 @@ class _$GHeroNoVars extends GHeroNoVars { @override int get hashCode { - return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -164,4 +168,4 @@ class GHeroNoVarsBuilder implements Builder { } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.dart b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.dart index 475a3655..ad0bc3cd 100644 --- a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.dart +++ b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.dart @@ -16,8 +16,6 @@ abstract class GHeroNoVarsVars factory GHeroNoVarsVars([Function(GHeroNoVarsVarsBuilder b) updates]) = _$GHeroNoVarsVars; - static Serializer get serializer => - _$gHeroNoVarsVarsSerializer; Map toJson() => (_i1.serializers.serializeWith( GHeroNoVarsVars.serializer, this, @@ -27,4 +25,40 @@ abstract class GHeroNoVarsVars GHeroNoVarsVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GHeroNoVarsVarsSerializer(); +} + +class GHeroNoVarsVarsSerializer extends StructuredSerializer { + final String wireName = 'GHeroNoVarsVars'; + + final Iterable types = const [GHeroNoVarsVars, _$GHeroNoVarsVars]; + + Iterable serialize( + Serializers serializers, + GHeroNoVarsVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + return result; + } + + GHeroNoVarsVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GHeroNoVarsVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + + } + } + return builder.build(); + } } diff --git a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.g.dart b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.g.dart index 4b0f9bbc..f5ef2947 100644 --- a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.g.dart @@ -6,30 +6,6 @@ part of 'hero_no_vars.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** -Serializer _$gHeroNoVarsVarsSerializer = - new _$GHeroNoVarsVarsSerializer(); - -class _$GHeroNoVarsVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [GHeroNoVarsVars, _$GHeroNoVarsVars]; - @override - final String wireName = 'GHeroNoVarsVars'; - - @override - Iterable serialize(Serializers serializers, GHeroNoVarsVars object, - {FullType specifiedType = FullType.unspecified}) { - return []; - } - - @override - GHeroNoVarsVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - return new GHeroNoVarsVarsBuilder().build(); - } -} - class _$GHeroNoVarsVars extends GHeroNoVarsVars { factory _$GHeroNoVarsVars([void Function(GHeroNoVarsVarsBuilder)? updates]) => (new GHeroNoVarsVarsBuilder()..update(updates))._build(); @@ -88,4 +64,4 @@ class GHeroNoVarsVarsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.data.gql.g.dart b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.data.gql.g.dart index 1d688b3b..dd131b05 100644 --- a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.data.gql.g.dart @@ -211,7 +211,11 @@ class _$GReviewWithDateData extends GReviewWithDateData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), createReview.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, createReview.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -353,16 +357,16 @@ class _$GReviewWithDateData_createReview @override int get hashCode { - return $jf($jc( - $jc( - $jc( - $jc( - $jc($jc($jc(0, G__typename.hashCode), episode.hashCode), - stars.hashCode), - commentary.hashCode), - createdAt.hashCode), - seenOn.hashCode), - custom.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, episode.hashCode); + _$hash = $jc(_$hash, stars.hashCode); + _$hash = $jc(_$hash, commentary.hashCode); + _$hash = $jc(_$hash, createdAt.hashCode); + _$hash = $jc(_$hash, seenOn.hashCode); + _$hash = $jc(_$hash, custom.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -480,4 +484,4 @@ class GReviewWithDateData_createReviewBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.req.gql.g.dart b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.req.gql.g.dart index 8243b548..91d79828 100644 --- a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.req.gql.g.dart @@ -93,7 +93,11 @@ class _$GReviewWithDate extends GReviewWithDate { @override int get hashCode { - return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -170,4 +174,4 @@ class GReviewWithDateBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.dart b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.dart index d4761993..59fecc54 100644 --- a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.dart +++ b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.dart @@ -7,7 +7,8 @@ import 'package:built_value/serializer.dart'; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart' as _i1; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i2; + as _i3; +import 'package:gql_exec/value.dart' as _i2; part 'review_with_date.var.gql.g.dart'; @@ -18,18 +19,86 @@ abstract class GReviewWithDateVars factory GReviewWithDateVars( [Function(GReviewWithDateVarsBuilder b) updates]) = _$GReviewWithDateVars; - _i1.GEpisode? get episode; + _i2.Value<_i1.GEpisode>? get episode; _i1.GReviewInput get review; - DateTime? get createdAt; - static Serializer get serializer => - _$gReviewWithDateVarsSerializer; - Map toJson() => (_i2.serializers.serializeWith( + _i2.Value? get createdAt; + Map toJson() => (_i3.serializers.serializeWith( GReviewWithDateVars.serializer, this, ) as Map); static GReviewWithDateVars? fromJson(Map json) => - _i2.serializers.deserializeWith( + _i3.serializers.deserializeWith( GReviewWithDateVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GReviewWithDateVarsSerializer(); +} + +class GReviewWithDateVarsSerializer + extends StructuredSerializer { + final String wireName = 'GReviewWithDateVars'; + + final Iterable types = const [ + GReviewWithDateVars, + _$GReviewWithDateVars + ]; + + Iterable serialize( + Serializers serializers, + GReviewWithDateVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + final _$episodevalue = object.episode; + if (_$episodevalue != null) { + result.add('episode'); + result.add(serializers.serialize(_$episodevalue!.value, + specifiedType: const FullType(_i1.GEpisode))); + } + result.add('review'); + result.add(serializers.serialize(object.review, + specifiedType: const FullType(_i1.GReviewInput))); + final _$createdAtvalue = object.createdAt; + if (_$createdAtvalue != null) { + result.add('createdAt'); + result.add(serializers.serialize(_$createdAtvalue!.value, + specifiedType: const FullType(DateTime))); + } + return result; + } + + GReviewWithDateVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GReviewWithDateVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'episode': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; + builder.episode = _i2.Value(fieldValue); + break; + case 'review': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i1.GReviewInput)) + as _i1.GReviewInput; + builder.review.replace(fieldValue); + break; + case 'createdAt': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(DateTime)) as DateTime; + builder.createdAt = _i2.Value(fieldValue); + break; + } + } + return builder.build(); + } } diff --git a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.g.dart b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.g.dart index b02235e2..a75571b1 100644 --- a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.g.dart @@ -6,85 +6,13 @@ part of 'review_with_date.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** -Serializer _$gReviewWithDateVarsSerializer = - new _$GReviewWithDateVarsSerializer(); - -class _$GReviewWithDateVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GReviewWithDateVars, - _$GReviewWithDateVars - ]; - @override - final String wireName = 'GReviewWithDateVars'; - - @override - Iterable serialize( - Serializers serializers, GReviewWithDateVars object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'review', - serializers.serialize(object.review, - specifiedType: const FullType(_i1.GReviewInput)), - ]; - Object? value; - value = object.episode; - if (value != null) { - result - ..add('episode') - ..add(serializers.serialize(value, - specifiedType: const FullType(_i1.GEpisode))); - } - value = object.createdAt; - if (value != null) { - result - ..add('createdAt') - ..add(serializers.serialize(value, - specifiedType: const FullType(DateTime))); - } - return result; - } - - @override - GReviewWithDateVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GReviewWithDateVarsBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'episode': - result.episode = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode?; - break; - case 'review': - result.review.replace(serializers.deserialize(value, - specifiedType: const FullType(_i1.GReviewInput))! - as _i1.GReviewInput); - break; - case 'createdAt': - result.createdAt = serializers.deserialize(value, - specifiedType: const FullType(DateTime)) as DateTime?; - break; - } - } - - return result.build(); - } -} - class _$GReviewWithDateVars extends GReviewWithDateVars { @override - final _i1.GEpisode? episode; + final _i2.Value<_i1.GEpisode>? episode; @override final _i1.GReviewInput review; @override - final DateTime? createdAt; + final _i2.Value? createdAt; factory _$GReviewWithDateVars( [void Function(GReviewWithDateVarsBuilder)? updates]) => @@ -116,8 +44,12 @@ class _$GReviewWithDateVars extends GReviewWithDateVars { @override int get hashCode { - return $jf($jc( - $jc($jc(0, episode.hashCode), review.hashCode), createdAt.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, episode.hashCode); + _$hash = $jc(_$hash, review.hashCode); + _$hash = $jc(_$hash, createdAt.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -134,18 +66,19 @@ class GReviewWithDateVarsBuilder implements Builder { _$GReviewWithDateVars? _$v; - _i1.GEpisode? _episode; - _i1.GEpisode? get episode => _$this._episode; - set episode(_i1.GEpisode? episode) => _$this._episode = episode; + _i2.Value<_i1.GEpisode>? _episode; + _i2.Value<_i1.GEpisode>? get episode => _$this._episode; + set episode(_i2.Value<_i1.GEpisode>? episode) => _$this._episode = episode; _i1.GReviewInputBuilder? _review; _i1.GReviewInputBuilder get review => _$this._review ??= new _i1.GReviewInputBuilder(); set review(_i1.GReviewInputBuilder? review) => _$this._review = review; - DateTime? _createdAt; - DateTime? get createdAt => _$this._createdAt; - set createdAt(DateTime? createdAt) => _$this._createdAt = createdAt; + _i2.Value? _createdAt; + _i2.Value? get createdAt => _$this._createdAt; + set createdAt(_i2.Value? createdAt) => + _$this._createdAt = createdAt; GReviewWithDateVarsBuilder(); @@ -196,4 +129,4 @@ class GReviewWithDateVarsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.ast.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.ast.gql.dart new file mode 100644 index 00000000..31da7675 --- /dev/null +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.ast.gql.dart @@ -0,0 +1,37 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint + +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:gql/ast.dart' as _i1; + +const CreateCustomField = _i1.OperationDefinitionNode( + type: _i1.OperationType.mutation, + name: _i1.NameNode(value: 'CreateCustomField'), + variableDefinitions: [ + _i1.VariableDefinitionNode( + variable: _i1.VariableNode(name: _i1.NameNode(value: 'input')), + type: _i1.NamedTypeNode( + name: _i1.NameNode(value: 'CustomFieldInput'), + isNonNull: true, + ), + defaultValue: _i1.DefaultValueNode(value: null), + directives: [], + ) + ], + directives: [], + selectionSet: _i1.SelectionSetNode(selections: [ + _i1.FieldNode( + name: _i1.NameNode(value: 'createCustomField'), + alias: null, + arguments: [ + _i1.ArgumentNode( + name: _i1.NameNode(value: 'input'), + value: _i1.VariableNode(name: _i1.NameNode(value: 'input')), + ) + ], + directives: [], + selectionSet: null, + ) + ]), +); +const document = _i1.DocumentNode(definitions: [CreateCustomField]); diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.dart new file mode 100644 index 00000000..38b35f22 --- /dev/null +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.dart @@ -0,0 +1,37 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint + +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; +import 'package:end_to_end_test/custom_field.dart' as _i1; +import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' + as _i2; + +part 'create_custom_field.data.gql.g.dart'; + +abstract class GCreateCustomFieldData + implements Built { + GCreateCustomFieldData._(); + + factory GCreateCustomFieldData( + [Function(GCreateCustomFieldDataBuilder b) updates]) = + _$GCreateCustomFieldData; + + static void _initializeBuilder(GCreateCustomFieldDataBuilder b) => + b..G__typename = 'Mutation'; + @BuiltValueField(wireName: '__typename') + String get G__typename; + _i1.CustomField? get createCustomField; + static Serializer get serializer => + _$gCreateCustomFieldDataSerializer; + Map toJson() => (_i2.serializers.serializeWith( + GCreateCustomFieldData.serializer, + this, + ) as Map); + static GCreateCustomFieldData? fromJson(Map json) => + _i2.serializers.deserializeWith( + GCreateCustomFieldData.serializer, + json, + ); +} diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.g.dart new file mode 100644 index 00000000..2b151a87 --- /dev/null +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.g.dart @@ -0,0 +1,174 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'create_custom_field.data.gql.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$gCreateCustomFieldDataSerializer = + new _$GCreateCustomFieldDataSerializer(); + +class _$GCreateCustomFieldDataSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GCreateCustomFieldData, + _$GCreateCustomFieldData + ]; + @override + final String wireName = 'GCreateCustomFieldData'; + + @override + Iterable serialize( + Serializers serializers, GCreateCustomFieldData object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + '__typename', + serializers.serialize(object.G__typename, + specifiedType: const FullType(String)), + ]; + Object? value; + value = object.createCustomField; + if (value != null) { + result + ..add('createCustomField') + ..add(serializers.serialize(value, + specifiedType: const FullType(_i1.CustomField))); + } + return result; + } + + @override + GCreateCustomFieldData deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GCreateCustomFieldDataBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case '__typename': + result.G__typename = serializers.deserialize(value, + specifiedType: const FullType(String))! as String; + break; + case 'createCustomField': + result.createCustomField = serializers.deserialize(value, + specifiedType: const FullType(_i1.CustomField)) + as _i1.CustomField?; + break; + } + } + + return result.build(); + } +} + +class _$GCreateCustomFieldData extends GCreateCustomFieldData { + @override + final String G__typename; + @override + final _i1.CustomField? createCustomField; + + factory _$GCreateCustomFieldData( + [void Function(GCreateCustomFieldDataBuilder)? updates]) => + (new GCreateCustomFieldDataBuilder()..update(updates))._build(); + + _$GCreateCustomFieldData._( + {required this.G__typename, this.createCustomField}) + : super._() { + BuiltValueNullFieldError.checkNotNull( + G__typename, r'GCreateCustomFieldData', 'G__typename'); + } + + @override + GCreateCustomFieldData rebuild( + void Function(GCreateCustomFieldDataBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + GCreateCustomFieldDataBuilder toBuilder() => + new GCreateCustomFieldDataBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is GCreateCustomFieldData && + G__typename == other.G__typename && + createCustomField == other.createCustomField; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, createCustomField.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'GCreateCustomFieldData') + ..add('G__typename', G__typename) + ..add('createCustomField', createCustomField)) + .toString(); + } +} + +class GCreateCustomFieldDataBuilder + implements Builder { + _$GCreateCustomFieldData? _$v; + + String? _G__typename; + String? get G__typename => _$this._G__typename; + set G__typename(String? G__typename) => _$this._G__typename = G__typename; + + _i1.CustomField? _createCustomField; + _i1.CustomField? get createCustomField => _$this._createCustomField; + set createCustomField(_i1.CustomField? createCustomField) => + _$this._createCustomField = createCustomField; + + GCreateCustomFieldDataBuilder() { + GCreateCustomFieldData._initializeBuilder(this); + } + + GCreateCustomFieldDataBuilder get _$this { + final $v = _$v; + if ($v != null) { + _G__typename = $v.G__typename; + _createCustomField = $v.createCustomField; + _$v = null; + } + return this; + } + + @override + void replace(GCreateCustomFieldData other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$GCreateCustomFieldData; + } + + @override + void update(void Function(GCreateCustomFieldDataBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + GCreateCustomFieldData build() => _build(); + + _$GCreateCustomFieldData _build() { + final _$result = _$v ?? + new _$GCreateCustomFieldData._( + G__typename: BuiltValueNullFieldError.checkNotNull( + G__typename, r'GCreateCustomFieldData', 'G__typename'), + createCustomField: createCustomField); + replace(_$result); + return _$result; + } +} + +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.dart new file mode 100644 index 00000000..14c9d9d5 --- /dev/null +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.dart @@ -0,0 +1,42 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint + +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; +import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' + as _i4; +import 'package:end_to_end_test/variables/__generated__/create_custom_field.ast.gql.dart' + as _i2; +import 'package:end_to_end_test/variables/__generated__/create_custom_field.var.gql.dart' + as _i3; +import 'package:gql_exec/gql_exec.dart' as _i1; + +part 'create_custom_field.req.gql.g.dart'; + +abstract class GCreateCustomField + implements Built { + GCreateCustomField._(); + + factory GCreateCustomField([Function(GCreateCustomFieldBuilder b) updates]) = + _$GCreateCustomField; + + static void _initializeBuilder(GCreateCustomFieldBuilder b) => b + ..operation = _i1.Operation( + document: _i2.document, + operationName: 'CreateCustomField', + ); + _i3.GCreateCustomFieldVars get vars; + _i1.Operation get operation; + static Serializer get serializer => + _$gCreateCustomFieldSerializer; + Map toJson() => (_i4.serializers.serializeWith( + GCreateCustomField.serializer, + this, + ) as Map); + static GCreateCustomField? fromJson(Map json) => + _i4.serializers.deserializeWith( + GCreateCustomField.serializer, + json, + ); +} diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.g.dart new file mode 100644 index 00000000..0ab4ab8f --- /dev/null +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.g.dart @@ -0,0 +1,180 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'create_custom_field.req.gql.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +Serializer _$gCreateCustomFieldSerializer = + new _$GCreateCustomFieldSerializer(); + +class _$GCreateCustomFieldSerializer + implements StructuredSerializer { + @override + final Iterable types = const [GCreateCustomField, _$GCreateCustomField]; + @override + final String wireName = 'GCreateCustomField'; + + @override + Iterable serialize( + Serializers serializers, GCreateCustomField object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'vars', + serializers.serialize(object.vars, + specifiedType: const FullType(_i3.GCreateCustomFieldVars)), + 'operation', + serializers.serialize(object.operation, + specifiedType: const FullType(_i1.Operation)), + ]; + + return result; + } + + @override + GCreateCustomField deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GCreateCustomFieldBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'vars': + result.vars.replace(serializers.deserialize(value, + specifiedType: const FullType(_i3.GCreateCustomFieldVars))! + as _i3.GCreateCustomFieldVars); + break; + case 'operation': + result.operation = serializers.deserialize(value, + specifiedType: const FullType(_i1.Operation))! as _i1.Operation; + break; + } + } + + return result.build(); + } +} + +class _$GCreateCustomField extends GCreateCustomField { + @override + final _i3.GCreateCustomFieldVars vars; + @override + final _i1.Operation operation; + + factory _$GCreateCustomField( + [void Function(GCreateCustomFieldBuilder)? updates]) => + (new GCreateCustomFieldBuilder()..update(updates))._build(); + + _$GCreateCustomField._({required this.vars, required this.operation}) + : super._() { + BuiltValueNullFieldError.checkNotNull(vars, r'GCreateCustomField', 'vars'); + BuiltValueNullFieldError.checkNotNull( + operation, r'GCreateCustomField', 'operation'); + } + + @override + GCreateCustomField rebuild( + void Function(GCreateCustomFieldBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + GCreateCustomFieldBuilder toBuilder() => + new GCreateCustomFieldBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is GCreateCustomField && + vars == other.vars && + operation == other.operation; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'GCreateCustomField') + ..add('vars', vars) + ..add('operation', operation)) + .toString(); + } +} + +class GCreateCustomFieldBuilder + implements Builder { + _$GCreateCustomField? _$v; + + _i3.GCreateCustomFieldVarsBuilder? _vars; + _i3.GCreateCustomFieldVarsBuilder get vars => + _$this._vars ??= new _i3.GCreateCustomFieldVarsBuilder(); + set vars(_i3.GCreateCustomFieldVarsBuilder? vars) => _$this._vars = vars; + + _i1.Operation? _operation; + _i1.Operation? get operation => _$this._operation; + set operation(_i1.Operation? operation) => _$this._operation = operation; + + GCreateCustomFieldBuilder() { + GCreateCustomField._initializeBuilder(this); + } + + GCreateCustomFieldBuilder get _$this { + final $v = _$v; + if ($v != null) { + _vars = $v.vars.toBuilder(); + _operation = $v.operation; + _$v = null; + } + return this; + } + + @override + void replace(GCreateCustomField other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$GCreateCustomField; + } + + @override + void update(void Function(GCreateCustomFieldBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + GCreateCustomField build() => _build(); + + _$GCreateCustomField _build() { + _$GCreateCustomField _$result; + try { + _$result = _$v ?? + new _$GCreateCustomField._( + vars: vars.build(), + operation: BuiltValueNullFieldError.checkNotNull( + operation, r'GCreateCustomField', 'operation')); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'vars'; + vars.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + r'GCreateCustomField', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.dart new file mode 100644 index 00000000..28185eed --- /dev/null +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.dart @@ -0,0 +1,80 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint + +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:built_value/built_value.dart'; +import 'package:built_value/serializer.dart'; +import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart' + as _i1; +import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' + as _i2; + +part 'create_custom_field.var.gql.g.dart'; + +abstract class GCreateCustomFieldVars + implements Built { + GCreateCustomFieldVars._(); + + factory GCreateCustomFieldVars( + [Function(GCreateCustomFieldVarsBuilder b) updates]) = + _$GCreateCustomFieldVars; + + _i1.GCustomFieldInput get input; + Map toJson() => (_i2.serializers.serializeWith( + GCreateCustomFieldVars.serializer, + this, + ) as Map); + static GCreateCustomFieldVars? fromJson(Map json) => + _i2.serializers.deserializeWith( + GCreateCustomFieldVars.serializer, + json, + ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GCreateCustomFieldVarsSerializer(); +} + +class GCreateCustomFieldVarsSerializer + extends StructuredSerializer { + final String wireName = 'GCreateCustomFieldVars'; + + final Iterable types = const [ + GCreateCustomFieldVars, + _$GCreateCustomFieldVars + ]; + + Iterable serialize( + Serializers serializers, + GCreateCustomFieldVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + result.add('input'); + result.add(serializers.serialize(object.input, + specifiedType: const FullType(_i1.GCustomFieldInput))); + return result; + } + + GCreateCustomFieldVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GCreateCustomFieldVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'input': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i1.GCustomFieldInput)) + as _i1.GCustomFieldInput; + builder.input.replace(fieldValue); + break; + } + } + return builder.build(); + } +} diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.g.dart new file mode 100644 index 00000000..a4582afc --- /dev/null +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.g.dart @@ -0,0 +1,107 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'create_custom_field.var.gql.dart'; + +// ************************************************************************** +// BuiltValueGenerator +// ************************************************************************** + +class _$GCreateCustomFieldVars extends GCreateCustomFieldVars { + @override + final _i1.GCustomFieldInput input; + + factory _$GCreateCustomFieldVars( + [void Function(GCreateCustomFieldVarsBuilder)? updates]) => + (new GCreateCustomFieldVarsBuilder()..update(updates))._build(); + + _$GCreateCustomFieldVars._({required this.input}) : super._() { + BuiltValueNullFieldError.checkNotNull( + input, r'GCreateCustomFieldVars', 'input'); + } + + @override + GCreateCustomFieldVars rebuild( + void Function(GCreateCustomFieldVarsBuilder) updates) => + (toBuilder()..update(updates)).build(); + + @override + GCreateCustomFieldVarsBuilder toBuilder() => + new GCreateCustomFieldVarsBuilder()..replace(this); + + @override + bool operator ==(Object other) { + if (identical(other, this)) return true; + return other is GCreateCustomFieldVars && input == other.input; + } + + @override + int get hashCode { + var _$hash = 0; + _$hash = $jc(_$hash, input.hashCode); + _$hash = $jf(_$hash); + return _$hash; + } + + @override + String toString() { + return (newBuiltValueToStringHelper(r'GCreateCustomFieldVars') + ..add('input', input)) + .toString(); + } +} + +class GCreateCustomFieldVarsBuilder + implements Builder { + _$GCreateCustomFieldVars? _$v; + + _i1.GCustomFieldInputBuilder? _input; + _i1.GCustomFieldInputBuilder get input => + _$this._input ??= new _i1.GCustomFieldInputBuilder(); + set input(_i1.GCustomFieldInputBuilder? input) => _$this._input = input; + + GCreateCustomFieldVarsBuilder(); + + GCreateCustomFieldVarsBuilder get _$this { + final $v = _$v; + if ($v != null) { + _input = $v.input.toBuilder(); + _$v = null; + } + return this; + } + + @override + void replace(GCreateCustomFieldVars other) { + ArgumentError.checkNotNull(other, 'other'); + _$v = other as _$GCreateCustomFieldVars; + } + + @override + void update(void Function(GCreateCustomFieldVarsBuilder)? updates) { + if (updates != null) updates(this); + } + + @override + GCreateCustomFieldVars build() => _build(); + + _$GCreateCustomFieldVars _build() { + _$GCreateCustomFieldVars _$result; + try { + _$result = _$v ?? new _$GCreateCustomFieldVars._(input: input.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'input'; + input.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + r'GCreateCustomFieldVars', _$failedField, e.toString()); + } + rethrow; + } + replace(_$result); + return _$result; + } +} + +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_review.data.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_review.data.gql.g.dart index bfa657d0..9a91b574 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_review.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_review.data.gql.g.dart @@ -175,7 +175,11 @@ class _$GCreateReviewData extends GCreateReviewData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), createReview.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, createReview.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -300,10 +304,13 @@ class _$GCreateReviewData_createReview extends GCreateReviewData_createReview { @override int get hashCode { - return $jf($jc( - $jc($jc($jc(0, G__typename.hashCode), episode.hashCode), - stars.hashCode), - commentary.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, episode.hashCode); + _$hash = $jc(_$hash, stars.hashCode); + _$hash = $jc(_$hash, commentary.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -383,4 +390,4 @@ class GCreateReviewData_createReviewBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_review.req.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_review.req.gql.g.dart index f3137423..a8262c04 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_review.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_review.req.gql.g.dart @@ -90,7 +90,11 @@ class _$GCreateReview extends GCreateReview { @override int get hashCode { - return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -167,4 +171,4 @@ class GCreateReviewBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.dart index 0448dd62..c1f5d3a1 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.dart @@ -7,7 +7,8 @@ import 'package:built_value/serializer.dart'; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart' as _i1; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i2; + as _i3; +import 'package:gql_exec/value.dart' as _i2; part 'create_review.var.gql.g.dart'; @@ -18,17 +19,71 @@ abstract class GCreateReviewVars factory GCreateReviewVars([Function(GCreateReviewVarsBuilder b) updates]) = _$GCreateReviewVars; - _i1.GEpisode? get episode; + _i2.Value<_i1.GEpisode>? get episode; _i1.GReviewInput get review; - static Serializer get serializer => - _$gCreateReviewVarsSerializer; - Map toJson() => (_i2.serializers.serializeWith( + Map toJson() => (_i3.serializers.serializeWith( GCreateReviewVars.serializer, this, ) as Map); static GCreateReviewVars? fromJson(Map json) => - _i2.serializers.deserializeWith( + _i3.serializers.deserializeWith( GCreateReviewVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GCreateReviewVarsSerializer(); +} + +class GCreateReviewVarsSerializer + extends StructuredSerializer { + final String wireName = 'GCreateReviewVars'; + + final Iterable types = const [GCreateReviewVars, _$GCreateReviewVars]; + + Iterable serialize( + Serializers serializers, + GCreateReviewVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + final _$episodevalue = object.episode; + if (_$episodevalue != null) { + result.add('episode'); + result.add(serializers.serialize(_$episodevalue!.value, + specifiedType: const FullType(_i1.GEpisode))); + } + result.add('review'); + result.add(serializers.serialize(object.review, + specifiedType: const FullType(_i1.GReviewInput))); + return result; + } + + GCreateReviewVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GCreateReviewVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'episode': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; + builder.episode = _i2.Value(fieldValue); + break; + case 'review': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(_i1.GReviewInput)) + as _i1.GReviewInput; + builder.review.replace(fieldValue); + break; + } + } + return builder.build(); + } } diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.g.dart index c697e3d7..6b8892bb 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.g.dart @@ -6,66 +6,9 @@ part of 'create_review.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** -Serializer _$gCreateReviewVarsSerializer = - new _$GCreateReviewVarsSerializer(); - -class _$GCreateReviewVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [GCreateReviewVars, _$GCreateReviewVars]; - @override - final String wireName = 'GCreateReviewVars'; - - @override - Iterable serialize(Serializers serializers, GCreateReviewVars object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'review', - serializers.serialize(object.review, - specifiedType: const FullType(_i1.GReviewInput)), - ]; - Object? value; - value = object.episode; - if (value != null) { - result - ..add('episode') - ..add(serializers.serialize(value, - specifiedType: const FullType(_i1.GEpisode))); - } - return result; - } - - @override - GCreateReviewVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GCreateReviewVarsBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'episode': - result.episode = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode?; - break; - case 'review': - result.review.replace(serializers.deserialize(value, - specifiedType: const FullType(_i1.GReviewInput))! - as _i1.GReviewInput); - break; - } - } - - return result.build(); - } -} - class _$GCreateReviewVars extends GCreateReviewVars { @override - final _i1.GEpisode? episode; + final _i2.Value<_i1.GEpisode>? episode; @override final _i1.GReviewInput review; @@ -96,7 +39,11 @@ class _$GCreateReviewVars extends GCreateReviewVars { @override int get hashCode { - return $jf($jc($jc(0, episode.hashCode), review.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, episode.hashCode); + _$hash = $jc(_$hash, review.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -112,9 +59,9 @@ class GCreateReviewVarsBuilder implements Builder { _$GCreateReviewVars? _$v; - _i1.GEpisode? _episode; - _i1.GEpisode? get episode => _$this._episode; - set episode(_i1.GEpisode? episode) => _$this._episode = episode; + _i2.Value<_i1.GEpisode>? _episode; + _i2.Value<_i1.GEpisode>? get episode => _$this._episode; + set episode(_i2.Value<_i1.GEpisode>? episode) => _$this._episode = episode; _i1.GReviewInputBuilder? _review; _i1.GReviewInputBuilder get review => @@ -168,4 +115,4 @@ class GCreateReviewVarsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.data.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.data.gql.g.dart index 45f31eee..4557ba55 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.data.gql.g.dart @@ -163,7 +163,11 @@ class _$GHumanWithArgsData extends GHumanWithArgsData { @override int get hashCode { - return $jf($jc($jc(0, G__typename.hashCode), human.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, human.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -281,8 +285,12 @@ class _$GHumanWithArgsData_human extends GHumanWithArgsData_human { @override int get hashCode { - return $jf( - $jc($jc($jc(0, G__typename.hashCode), name.hashCode), height.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, G__typename.hashCode); + _$hash = $jc(_$hash, name.hashCode); + _$hash = $jc(_$hash, height.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -354,4 +362,4 @@ class GHumanWithArgsData_humanBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.req.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.req.gql.g.dart index 438ef3b0..4b085286 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.req.gql.g.dart @@ -93,7 +93,11 @@ class _$GHumanWithArgs extends GHumanWithArgs { @override int get hashCode { - return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, vars.hashCode); + _$hash = $jc(_$hash, operation.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -170,4 +174,4 @@ class GHumanWithArgsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.dart index fc19fdec..403b0010 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.dart @@ -17,8 +17,6 @@ abstract class GHumanWithArgsVars _$GHumanWithArgsVars; String get id; - static Serializer get serializer => - _$gHumanWithArgsVarsSerializer; Map toJson() => (_i1.serializers.serializeWith( GHumanWithArgsVars.serializer, this, @@ -28,4 +26,48 @@ abstract class GHumanWithArgsVars GHumanWithArgsVars.serializer, json, ); + @BuiltValueSerializer(custom: true, serializeNulls: true) + static Serializer get serializer => + GHumanWithArgsVarsSerializer(); +} + +class GHumanWithArgsVarsSerializer + extends StructuredSerializer { + final String wireName = 'GHumanWithArgsVars'; + + final Iterable types = const [GHumanWithArgsVars, _$GHumanWithArgsVars]; + + Iterable serialize( + Serializers serializers, + GHumanWithArgsVars object, { + FullType specifiedType = FullType.unspecified, + }) { + final result = []; + result.add('id'); + result.add(serializers.serialize(object.id, + specifiedType: const FullType(String))); + return result; + } + + GHumanWithArgsVars deserialize( + Serializers serializers, + Iterable serialized, { + FullType specifiedType = FullType.unspecified, + }) { + final builder = GHumanWithArgsVarsBuilder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'id': + var fieldValue = serializers.deserialize(value, + specifiedType: const FullType(String)) as String; + builder.id = fieldValue; + break; + } + } + return builder.build(); + } } diff --git a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.g.dart index e36ddcb1..907174cc 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.g.dart @@ -6,51 +6,6 @@ part of 'human_with_args.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** -Serializer _$gHumanWithArgsVarsSerializer = - new _$GHumanWithArgsVarsSerializer(); - -class _$GHumanWithArgsVarsSerializer - implements StructuredSerializer { - @override - final Iterable types = const [GHumanWithArgsVars, _$GHumanWithArgsVars]; - @override - final String wireName = 'GHumanWithArgsVars'; - - @override - Iterable serialize( - Serializers serializers, GHumanWithArgsVars object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'id', - serializers.serialize(object.id, specifiedType: const FullType(String)), - ]; - - return result; - } - - @override - GHumanWithArgsVars deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GHumanWithArgsVarsBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'id': - result.id = serializers.deserialize(value, - specifiedType: const FullType(String))! as String; - break; - } - } - - return result.build(); - } -} - class _$GHumanWithArgsVars extends GHumanWithArgsVars { @override final String id; @@ -80,7 +35,10 @@ class _$GHumanWithArgsVars extends GHumanWithArgsVars { @override int get hashCode { - return $jf($jc(0, id.hashCode)); + var _$hash = 0; + _$hash = $jc(_$hash, id.hashCode); + _$hash = $jf(_$hash); + return _$hash; } @override @@ -133,4 +91,4 @@ class GHumanWithArgsVarsBuilder } } -// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas +// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/create_custom_field.graphql b/codegen/end_to_end_test/lib/variables/create_custom_field.graphql new file mode 100644 index 00000000..d323ef49 --- /dev/null +++ b/codegen/end_to_end_test/lib/variables/create_custom_field.graphql @@ -0,0 +1,5 @@ + + +mutation CreateCustomField($input: CustomFieldInput!) { + createCustomField(input: $input) +} \ No newline at end of file diff --git a/codegen/end_to_end_test/pubspec.yaml b/codegen/end_to_end_test/pubspec.yaml index a1fb6f80..c91a20df 100644 --- a/codegen/end_to_end_test/pubspec.yaml +++ b/codegen/end_to_end_test/pubspec.yaml @@ -15,3 +15,38 @@ dev_dependencies: build: ^2.0.0 build_runner: ^2.0.0 test: ^1.16.8 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_code_builder: + path: ../gql_code_builder + gql_build: + path: ../gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../../links/gql_dedupe_link diff --git a/codegen/end_to_end_test/test/operation/variables_test.dart b/codegen/end_to_end_test/test/operation/variables_test.dart index f0d0a9ea..3d5840ef 100644 --- a/codegen/end_to_end_test/test/operation/variables_test.dart +++ b/codegen/end_to_end_test/test/operation/variables_test.dart @@ -1,3 +1,4 @@ +import 'package:gql_exec/value.dart'; import "package:test/test.dart"; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; @@ -18,15 +19,14 @@ void main() { }); group("Complex Args", () { - final args = GCreateReviewVars( - (b) => b - ..episode = GEpisode.EMPIRE - ..review.stars = 5 - ..review.commentary = "this was amazing!!!" - ..review.favorite_color.blue = 255 - ..review.favorite_color.green = 120 - ..review.favorite_color.red = 80, - ); + final args = GCreateReviewVars((b) => b + ..episode = Value(GEpisode.EMPIRE) + ..review.stars = 5 + ..review.commentary = Value("this was amazing!!!") + ..review.favorite_color = Value(GColorInput((b) => b + ..blue = 255 + ..green = 120 + ..red = 80))); final json = { "episode": "EMPIRE", diff --git a/codegen/end_to_end_test/test/schema/input_test.dart b/codegen/end_to_end_test/test/schema/input_test.dart index 1d9bf6f6..3783c35e 100644 --- a/codegen/end_to_end_test/test/schema/input_test.dart +++ b/codegen/end_to_end_test/test/schema/input_test.dart @@ -1,3 +1,4 @@ +import 'package:gql_exec/value.dart'; import "package:test/test.dart"; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; @@ -5,24 +6,22 @@ import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; void main() { group("Inputs", () { test('can be instantiated', () { - GReviewInput( - (b) => b - ..stars = 4 - ..commentary = "This was a great movie!" - ..favorite_color.red = 225 - ..favorite_color.blue = 255 - ..favorite_color.green = 123, - ); + GReviewInput((b) => b + ..stars = 4 + ..commentary = Value("This was a great movie!") + ..favorite_color = Value(GColorInput((b) => b + ..red = 225 + ..blue = 255 + ..green = 123))); }); test('can be serialized and deserialized', () { - final input = GReviewInput( - (b) => b - ..stars = 4 - ..favorite_color.red = 225 - ..favorite_color.blue = 255 - ..favorite_color.green = 123, - ); + final input = GReviewInput((b) => b + ..stars = 4 + ..favorite_color = Value(GColorInput((b) => b + ..red = 225 + ..blue = 255 + ..green = 123))); final json = { "stars": 4, "favorite_color": { diff --git a/codegen/end_to_end_test/test/schema/scalars_test.dart b/codegen/end_to_end_test/test/schema/scalars_test.dart index 5224ac69..6eab24ad 100644 --- a/codegen/end_to_end_test/test/schema/scalars_test.dart +++ b/codegen/end_to_end_test/test/schema/scalars_test.dart @@ -1,3 +1,6 @@ +import 'package:built_collection/built_collection.dart'; +import 'package:built_value/built_value.dart'; +import 'package:gql_exec/value.dart'; import "package:test/test.dart"; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; @@ -47,21 +50,19 @@ void main() { final scalar = GISODate(isoString); test('correctly serializes and deserializes', () { - expect(serializers.deserializeWith(GISODate.serializer, isoString), - equals(scalar)); - expect(serializers.serializeWith(GISODate.serializer, scalar), - equals(isoString)); + expect(serializers.deserializeWith(GISODate.serializer, isoString), equals(scalar)); + expect(serializers.serializeWith(GISODate.serializer, scalar), equals(isoString)); }); }); group("Custom scalars in input types", () { - final input = GReviewInput( - (b) => b - ..stars = 4 - ..seenOn.add(DateTime.fromMillisecondsSinceEpoch(1591892597000)), - ); + final input = GReviewInput((b) => b + ..stars = 4 + ..seenOn = Value( + BuiltList([DateTime.fromMillisecondsSinceEpoch(1591892597000)]), + )); test('correctly overrides scalars in input types', () { - expect(input.seenOn!.first, TypeMatcher()); + expect(input.seenOn!.value!.first, TypeMatcher()); }); test('can be serialized and deserialized with custom serializer', () { @@ -78,11 +79,11 @@ void main() { final vars = GReviewWithDateVars( (b) => b ..review.stars = 4 - ..createdAt = DateTime.fromMillisecondsSinceEpoch(1591892597000), + ..createdAt = Value(DateTime.fromMillisecondsSinceEpoch(1591892597000)), ); test('correctly overrides scalars in variable types', () { - expect(vars.createdAt, TypeMatcher()); + expect(vars.createdAt!.value, TypeMatcher()); }); test('can be serialized and deserialized with custom serializer', () { @@ -101,11 +102,8 @@ void main() { final data = GReviewWithDateData( (b) => b ..createReview.stars = 1 - ..createReview - .seenOn - .add(DateTime.fromMillisecondsSinceEpoch(1591892597000)) - ..createReview.createdAt = - DateTime.fromMillisecondsSinceEpoch(1591892597000), + ..createReview.seenOn.add(DateTime.fromMillisecondsSinceEpoch(1591892597000)) + ..createReview.createdAt = DateTime.fromMillisecondsSinceEpoch(1591892597000), ); test('correctly overrides scalars in data types', () { diff --git a/codegen/gql_build/README.md b/codegen/gql_build/README.md index 86acaf98..7ce876c6 100644 --- a/codegen/gql_build/README.md +++ b/codegen/gql_build/README.md @@ -63,6 +63,20 @@ new enum values are added to the schema and the client has not updated to the ne `global_enum_fallbacks`: \[bool\] Add a generated fallback value for each enum value (except for ones that have a custom fallback value specified in the enum_fallbacks map). Defaults to false. +`when_extensions`: [Map\] whether to enable the `when`/`maybeWhen` extension on the generated data classes +from inline fragment spreads with type conditions. +Supported keys are `when` and `maybeWhen`, and the values are booleans indicating whether to enable +generation of the extension method not. + + +Example: + +```yaml +when_extensions: + when: true # enable the `when` extension method + maybeWhen: true # enable the `maybeWhen` extension method +``` + Example: ```yaml diff --git a/codegen/gql_build/lib/src/schema_builder.dart b/codegen/gql_build/lib/src/schema_builder.dart index b7054dd5..c7e2cfca 100644 --- a/codegen/gql_build/lib/src/schema_builder.dart +++ b/codegen/gql_build/lib/src/schema_builder.dart @@ -2,6 +2,7 @@ import "dart:async"; import "package:build/build.dart"; import "package:code_builder/code_builder.dart"; +import "package:gql_build/src/allocators/gql_allocator.dart"; import "package:gql_code_builder/schema.dart"; import "package:path/path.dart"; @@ -14,11 +15,7 @@ class SchemaBuilder implements Builder { final EnumFallbackConfig enumFallbackConfig; final bool generatePossibleTypesMap; - SchemaBuilder( - this.typeOverrides, - this.enumFallbackConfig, - this.generatePossibleTypesMap, - ); + SchemaBuilder(this.typeOverrides, this.enumFallbackConfig, this.generatePossibleTypesMap); @override Map> get buildExtensions => { @@ -29,24 +26,20 @@ class SchemaBuilder implements Builder { FutureOr build(BuildStep buildStep) async { final doc = await readDocument(buildStep); - final generatedPartUrl = buildStep.inputId - .changeExtension(generatedFileExtension(schemaExtension)) - .uri - .path; + final generatedPartUrl = + buildStep.inputId.changeExtension(generatedFileExtension(schemaExtension)).uri.path; - final library = buildSchemaLibrary( - doc, - basename(generatedPartUrl), - typeOverrides, - enumFallbackConfig, - generatePossibleTypesMap: generatePossibleTypesMap, - ); - - return writeDocument( - library, - buildStep, - schemaExtension, + final schemaUrl = outputAssetId(buildStep.inputId, schemaExtension).uri.toString(); + final allocator = GqlAllocator( + buildStep.inputId.uri.toString(), outputAssetId(buildStep.inputId, schemaExtension).uri.toString(), + schemaUrl, ); + + final library = buildSchemaLibrary( + doc, basename(generatedPartUrl), typeOverrides, enumFallbackConfig, + generatePossibleTypesMap: generatePossibleTypesMap, allocator: allocator); + + return writeDocument(library, buildStep, schemaExtension, schemaUrl, allocator); } } diff --git a/codegen/gql_build/lib/src/serializer_builder.dart b/codegen/gql_build/lib/src/serializer_builder.dart index 22028a04..b9d49762 100644 --- a/codegen/gql_build/lib/src/serializer_builder.dart +++ b/codegen/gql_build/lib/src/serializer_builder.dart @@ -29,10 +29,9 @@ class SerializerBuilder implements Builder { static final _generatedFiles = Glob("lib/**.gql.dart"); // create a path for the serializers output in same directory as schema - List get pathSegments => - outputAssetId(schemaId, serializerExtension).pathSegments - ..removeLast() - ..add("serializers.gql.dart"); + List get pathSegments => outputAssetId(schemaId, serializerExtension).pathSegments + ..removeLast() + ..add("serializers.gql.dart"); @override Map> get buildExtensions => { @@ -42,29 +41,32 @@ class SerializerBuilder implements Builder { @override FutureOr build(BuildStep buildStep) async { + final allocator = PickAllocator( + doNotPick: ["package:built_value/serializer.dart"], + include: [ + "package:built_collection/built_collection.dart", + ...typeOverrides.values.map((ref) => ref.url).whereType() + ], + ); + /// BuiltValue classes with serializers. These will be added automatically /// using `@SerializersFor`. - final builtClasses = - SplayTreeSet((a, b) => a.name.compareTo(b.name)); + final builtClasses = SplayTreeSet((a, b) => a.name.compareTo(b.name)); /// Non BuiltValue classes with serializers (i.e. inline fragment classes). /// These need to be added manually since `@SerializersFor` only recognizes /// BuiltValue classes. - final nonBuiltClasses = - SplayTreeSet((a, b) => a.name.compareTo(b.name)); + final nonBuiltClasses = SplayTreeSet((a, b) => a.name.compareTo(b.name)); final hasSerializer = (ClassElement c) => c.fields.any((field) => field.isStatic && field.name == "serializer" && field.type.element?.name == "Serializer" && - field.type.element?.source?.uri.toString() == - "package:built_value/serializer.dart"); + field.type.element?.source?.uri.toString() == "package:built_value/serializer.dart"); final isBuiltValue = (ClassElement c) => c.allSupertypes.any((interface) => - (interface.element.name == "Built" || - interface.element.name == "EnumClass") && - interface.element.source.uri.toString() == - "package:built_value/built_value.dart"); + (interface.element.name == "Built" || interface.element.name == "EnumClass") && + interface.element.source.uri.toString() == "package:built_value/built_value.dart"); await for (final input in buildStep.findAssets(_generatedFiles)) { final lib = await buildStep.resolver.libraryFor(input); @@ -102,13 +104,7 @@ class SerializerBuilder implements Builder { ); final _emitter = DartEmitter( - allocator: PickAllocator( - doNotPick: ["package:built_value/serializer.dart"], - include: [ - "package:built_collection/built_collection.dart", - ...typeOverrides.values.map((ref) => ref.url).whereType() - ], - ), + allocator: allocator, orderDirectives: true, useNullSafetySyntax: true, ); diff --git a/codegen/gql_build/lib/src/utils/writer.dart b/codegen/gql_build/lib/src/utils/writer.dart index a1285154..ba901931 100644 --- a/codegen/gql_build/lib/src/utils/writer.dart +++ b/codegen/gql_build/lib/src/utils/writer.dart @@ -14,18 +14,21 @@ Future writeDocument( BuildStep buildStep, String extension, [ String? schemaUrl, + Allocator? allocator, ]) { if (library.body.isEmpty) return Future.value(null); + allocator ??= GqlAllocator( + buildStep.inputId.uri.toString(), + outputAssetId(buildStep.inputId, extension).uri.toString(), + schemaUrl, + ); + final generatedAsset = outputAssetId(buildStep.inputId, extension); final genSrc = _dartfmt.format("${library.accept( DartEmitter( - allocator: GqlAllocator( - buildStep.inputId.uri.toString(), - generatedAsset.uri.toString(), - schemaUrl, - ), + allocator: allocator, orderDirectives: true, useNullSafetySyntax: true, ), diff --git a/codegen/gql_build/lib/src/var_builder.dart b/codegen/gql_build/lib/src/var_builder.dart index 74ba44dc..c6f9c4d0 100644 --- a/codegen/gql_build/lib/src/var_builder.dart +++ b/codegen/gql_build/lib/src/var_builder.dart @@ -2,6 +2,7 @@ import "dart:async"; import "package:build/build.dart"; import "package:code_builder/code_builder.dart"; +import "package:gql_build/src/allocators/gql_allocator.dart"; import "package:gql_code_builder/var.dart"; import "package:path/path.dart"; @@ -29,23 +30,25 @@ class VarBuilder implements Builder { final doc = await readDocument(buildStep); final schema = await readDocument(buildStep, schemaId); - final generatedPartUrl = buildStep.inputId - .changeExtension(generatedFileExtension(varExtension)) - .uri - .path; + final generatedPartUrl = + buildStep.inputId.changeExtension(generatedFileExtension(varExtension)).uri.path; - final library = buildVarLibrary( - doc, - addTypenames(schema), - basename(generatedPartUrl), - typeOverrides, + final schemaUrl = outputAssetId(schemaId, schemaExtension).uri.toString(); + final allocator = GqlAllocator( + buildStep.inputId.uri.toString(), + outputAssetId(buildStep.inputId, schemaExtension).uri.toString(), + schemaUrl, ); + final library = buildVarLibrary( + doc, addTypenames(schema), basename(generatedPartUrl), typeOverrides, allocator); + return writeDocument( library, buildStep, varExtension, - outputAssetId(schemaId, schemaExtension).uri.toString(), + schemaUrl, + allocator, ); } } diff --git a/codegen/gql_build/pubspec.yaml b/codegen/gql_build/pubspec.yaml index 17582bd3..3012d6cf 100644 --- a/codegen/gql_build/pubspec.yaml +++ b/codegen/gql_build/pubspec.yaml @@ -20,3 +20,38 @@ dependencies: dev_dependencies: build_test: ^2.0.0 gql_pedantic: ^1.0.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_code_builder: + path: ../gql_code_builder + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../../links/gql_dedupe_link + end_to_end_test: + path: ../end_to_end_test diff --git a/codegen/gql_code_builder/lib/schema.dart b/codegen/gql_code_builder/lib/schema.dart index 61a57957..71b22952 100644 --- a/codegen/gql_code_builder/lib/schema.dart +++ b/codegen/gql_code_builder/lib/schema.dart @@ -7,17 +7,14 @@ import "package:gql_code_builder/src/utils/possible_types.dart"; export "package:gql_code_builder/src/config/enum_fallback_config.dart"; -Library buildSchemaLibrary( - SourceNode schemaSource, - String partUrl, - Map typeOverrides, - EnumFallbackConfig enumFallbackConfig, { - bool generatePossibleTypesMap = false, -}) { +Library buildSchemaLibrary(SourceNode schemaSource, String partUrl, + Map typeOverrides, EnumFallbackConfig enumFallbackConfig, + {bool generatePossibleTypesMap = false, Allocator? allocator}) { final lib = buildSchema( schemaSource, typeOverrides, enumFallbackConfig, + allocator ?? Allocator(), ) as Library; final Code? possibleTypes; @@ -45,8 +42,7 @@ Code buildPossibleTypes(DocumentNode document) { // wrap the map in a literal for codegen final possibleTypesLiteral = literalMap(possibleTypesMap); // assign the literal to a const variable named "possibleTypes" - return declareConst("possibleTypesMap", - type: Reference("Map>")) + return declareConst("possibleTypesMap", type: Reference("Map>")) .assign(possibleTypesLiteral) .statement; } diff --git a/codegen/gql_code_builder/lib/src/built_class.dart b/codegen/gql_code_builder/lib/src/built_class.dart index 631ba97b..48f75e34 100644 --- a/codegen/gql_code_builder/lib/src/built_class.dart +++ b/codegen/gql_code_builder/lib/src/built_class.dart @@ -11,6 +11,7 @@ Class builtClass({ Map? initializers, Map superclassSelections = const {}, List methods = const [], + bool hasCustomSerializer = false, }) { final className = builtClassName(name); return Class( @@ -76,7 +77,8 @@ Class builtClass({ ).code, ), if (getters != null) ...getters, - // Serlialization methods + // Serialization methods + if(!hasCustomSerializer) buildSerializerGetter(className).rebuild( (b) => b..body = Code("_\$${toCamelCase(className)}Serializer"), ), diff --git a/codegen/gql_code_builder/lib/src/common.dart b/codegen/gql_code_builder/lib/src/common.dart index 7cbcd01a..ce9d5d4e 100644 --- a/codegen/gql_code_builder/lib/src/common.dart +++ b/codegen/gql_code_builder/lib/src/common.dart @@ -93,9 +93,6 @@ Reference _typeRef(TypeNode type, Map typeMap) { (b) => b ..url = ref.url ..symbol = ref.symbol - - /// TODO: remove `inList` check - /// https://github.com/google/built_value.dart/issues/1011#issuecomment-804843573 ..isNullable = !type.isNonNull, ); } else if (type is ListTypeNode) { @@ -180,6 +177,36 @@ Method buildGetter({ ); } +Method buildOptionalGetter({ + required NameNode nameNode, + required TypeNode typeNode, + required SourceNode schemaSource, + Map typeOverrides = const {}, + String? typeRefPrefix, + bool built = true, + bool isOverride = false, +}) { + final baseGetter = buildGetter( + nameNode: nameNode, + typeNode: typeNode, + schemaSource: schemaSource, + typeOverrides: typeOverrides, + typeRefPrefix: typeRefPrefix, + built: built, + isOverride: isOverride, + ); + + if (typeNode.isNonNull) return baseGetter; + + final optionalGetter = baseGetter.rebuild((b) => b + ..returns = TypeReference((b2) => b2 + ..isNullable = true + ..url = "package:gql_exec/value.dart" + ..symbol = "Value" + ..types.add((baseGetter.returns as TypeReference).rebuild((b3) => b3..isNullable = false)))); + return optionalGetter; +} + Method buildSerializerGetter(String className) => Method( (b) => b ..static = true @@ -236,6 +263,5 @@ Method buildFromJsonGetter(String className) => Method( ..lambda = true ..body = refer("serializers", "#serializer") .property("deserializeWith") - .call( - [refer(className).property("serializer"), refer("json")]).code, + .call([refer(className).property("serializer"), refer("json")]).code, ); diff --git a/codegen/gql_code_builder/lib/src/schema.dart b/codegen/gql_code_builder/lib/src/schema.dart index aa9eb78b..90307d4d 100644 --- a/codegen/gql_code_builder/lib/src/schema.dart +++ b/codegen/gql_code_builder/lib/src/schema.dart @@ -1,5 +1,6 @@ import "package:code_builder/code_builder.dart"; import "package:gql/ast.dart"; +import "package:gql_code_builder/var.dart"; import "./schema/enum.dart"; import "./schema/input.dart"; @@ -12,69 +13,65 @@ Spec? buildSchema( SourceNode schemaSource, Map typeOverrides, EnumFallbackConfig enumFallbackConfig, + Allocator allocator, ) => - schemaSource.document.accept( - _SchemaBuilderVisitor( - schemaSource, - typeOverrides, - enumFallbackConfig, - ), - ); + schemaSource.document + .accept( + _SchemaBuilderVisitor( + schemaSource, + typeOverrides, + enumFallbackConfig, + allocator, + ), + ) + ?.first; -class _SchemaBuilderVisitor extends SimpleVisitor { +class _SchemaBuilderVisitor extends SimpleVisitor?> { final SourceNode schemaSource; final Map typeOverrides; final EnumFallbackConfig enumFallbackConfig; + final Allocator allocator; _SchemaBuilderVisitor( - this.schemaSource, - this.typeOverrides, - this.enumFallbackConfig, - ); - - Spec? _acceptOne( - Node? node, - ) => - node != null ? node.accept(this) : literalNull; - - List _acceptMany( - List nodes, - ) => - nodes.map(_acceptOne).toList( - growable: false, - ); + this.schemaSource, this.typeOverrides, this.enumFallbackConfig, this.allocator); @override - Spec visitDocumentNode( + List visitDocumentNode( DocumentNode node, ) => - Library( - (b) => b.body.addAll( - _acceptMany(node.definitions).whereType(), - ), - ); + [ + Library( + (b) => b.body.addAll( + node.definitions.expand( + (node) => node.accept(this) ?? [], + ), + ), + ) + ]; @override - Spec visitInputObjectTypeDefinitionNode( + List visitInputObjectTypeDefinitionNode( InputObjectTypeDefinitionNode node, - ) => - buildInputClass( - node, - schemaSource, - typeOverrides, - ); + ) { + final inputClass = buildInputClass( + node, + schemaSource, + typeOverrides, + ); + final serializer = + nullAwareJsonSerializerClass(inputClass, allocator, schemaSource, typeOverrides); + return [inputClass, serializer]; + } @override - Spec? visitScalarTypeDefinitionNode( + List visitScalarTypeDefinitionNode( ScalarTypeDefinitionNode node, ) => - typeOverrides.containsKey(node.name.value) - ? null - : buildScalarClass(node); + typeOverrides.containsKey(node.name.value) ? [] : [buildScalarClass(node)]; @override - Spec visitEnumTypeDefinitionNode( + List visitEnumTypeDefinitionNode( EnumTypeDefinitionNode node, ) => - buildEnumClass(node, enumFallbackConfig); + [buildEnumClass(node, enumFallbackConfig)]; } diff --git a/codegen/gql_code_builder/lib/src/schema/input.dart b/codegen/gql_code_builder/lib/src/schema/input.dart index bce9faa7..b42997fb 100644 --- a/codegen/gql_code_builder/lib/src/schema/input.dart +++ b/codegen/gql_code_builder/lib/src/schema/input.dart @@ -1,5 +1,6 @@ import "package:code_builder/code_builder.dart"; import "package:gql/ast.dart"; +import "package:gql_code_builder/var.dart"; import "../../source.dart"; import "../built_class.dart"; @@ -8,17 +9,20 @@ import "../common.dart"; List buildInputClasses( SourceNode schemaSource, Map typeOverrides, + Allocator allocator, ) => schemaSource.document.definitions .whereType() - .map( - (InputObjectTypeDefinitionNode node) => buildInputClass( - node, - schemaSource, - typeOverrides, - ), - ) - .toList(); + .expand((InputObjectTypeDefinitionNode node) { + final inputClass = buildInputClass( + node, + schemaSource, + typeOverrides, + ); + final serializer = + nullAwareJsonSerializerClass(inputClass, allocator, schemaSource, typeOverrides); + return [inputClass, serializer]; + }).toList(); Class buildInputClass( InputObjectTypeDefinitionNode node, @@ -28,11 +32,15 @@ Class buildInputClass( builtClass( name: node.name.value, getters: node.fields.map( - (node) => buildGetter( + (node) => buildOptionalGetter( nameNode: node.name, typeNode: node.type, schemaSource: schemaSource, typeOverrides: typeOverrides, ), ), + hasCustomSerializer: true, + methods: [ + nullAwareJsonSerializerField(node, "G${node.name.value}"), + ], ); diff --git a/codegen/gql_code_builder/lib/var.dart b/codegen/gql_code_builder/lib/var.dart index 80f553c7..2e5ca1e1 100644 --- a/codegen/gql_code_builder/lib/var.dart +++ b/codegen/gql_code_builder/lib/var.dart @@ -1,4 +1,5 @@ import "package:code_builder/code_builder.dart"; +import "package:collection/collection.dart"; import "package:gql/ast.dart"; import "./source.dart"; @@ -11,34 +12,34 @@ Library buildVarLibrary( SourceNode schemaSource, String partUrl, Map typeOverrides, + Allocator allocator, ) { final operationVarClasses = docSource.document.definitions .whereType() - .map( - (op) => builtClass( - name: "${op.name!.value}Vars", - getters: op.variableDefinitions.map( - (node) => buildGetter( - nameNode: node.variable.name, - typeNode: node.type, - schemaSource: schemaSource, - typeOverrides: typeOverrides, - ), - ), - ), - ) + .map((op) => builtClass( + name: "${op.name!.value}Vars", + getters: op.variableDefinitions.map( + (node) => buildOptionalGetter( + nameNode: node.variable.name, + typeNode: node.type, + schemaSource: schemaSource, + typeOverrides: typeOverrides, + ), + ), + hasCustomSerializer: true, + methods: [ + nullAwareJsonSerializerField(op, "G${op.name!.value}Vars"), + ])) .toList(); Map _fragmentMap(SourceNode source) => { - for (var def - in source.document.definitions.whereType()) + for (var def in source.document.definitions.whereType()) def.name.value: def, for (var import in source.imports) ..._fragmentMap(import) }; - final fragmentVarClasses = docSource.document.definitions - .whereType() - .map((frag) { + final fragmentVarClasses = + docSource.document.definitions.whereType().map((frag) { final varTypes = fragmentVarTypes( fragment: frag, fragmentMap: _fragmentMap(docSource), @@ -47,13 +48,17 @@ Library buildVarLibrary( return builtClass( name: "${frag.name.value}Vars", getters: varTypes.entries.map( - (entry) => buildGetter( + (entry) => buildOptionalGetter( nameNode: entry.key, typeNode: entry.value, schemaSource: schemaSource, typeOverrides: typeOverrides, ), ), + hasCustomSerializer: true, + methods: [ + nullAwareJsonSerializerField(frag, "G${frag.name.value}Vars"), + ], ); }).toList(); @@ -63,6 +68,230 @@ Library buildVarLibrary( ..body.addAll([ ...operationVarClasses, ...fragmentVarClasses, + for (var op in operationVarClasses) + nullAwareJsonSerializerClass( + op, + allocator, + schemaSource, + typeOverrides, + ), + for (var frag in fragmentVarClasses) + nullAwareJsonSerializerClass( + frag, + allocator, + schemaSource, + typeOverrides, + ), ]), ); } + +Method nullAwareJsonSerializerField(Node op, String className) => Method((b) => b + ..annotations + .add(CodeExpression(Code("BuiltValueSerializer(custom: true, serializeNulls: true)"))) + ..static = true + ..type = MethodType.getter + ..lambda = true + ..returns = TypeReference((b2) => b2 + ..symbol = "Serializer" + ..url = "package:built_value/serializer.dart" + ..types.add(refer(className))) + ..name = "serializer" + ..body = Code("${className}Serializer()")); + +Class nullAwareJsonSerializerClass( + Class base, + Allocator allocator, + SourceNode schemaSource, + Map typeOverrides, +) => + Class((b) => b + ..name = "${base.name}Serializer" + ..extend = TypeReference((b) => b + ..symbol = "StructuredSerializer" + ..url = "package:built_value/serializer.dart" + ..types.add(refer(base.name))) + ..fields.addAll([ + Field( + (b) => b + ..name = "wireName" + ..modifier = FieldModifier.final$ + ..type = refer("String") + ..assignment = (literalString(base.name)).code, + ), + Field((b) => b + ..name = "types" + ..modifier = FieldModifier.final$ + ..type = TypeReference((b2) => b2..symbol = "Iterable") + ..assignment = Code("const [${base.name}, _\$${base.name}]")) + ]) + ..methods.addAll([ + Method((b) => b + ..name = "serialize" + ..returns = refer("Iterable") + ..requiredParameters.add(Parameter((b) => b + ..name = "serializers" + ..type = refer("Serializers", "package:built_value/serializer.dart"))) + ..requiredParameters.add(Parameter((b) => b + ..name = "object" + ..type = refer(base.name))) + ..optionalParameters.add(Parameter((b) => b + ..name = "specifiedType" + ..named = true + ..type = refer("FullType", "package:built_value/serializer.dart") + ..defaultTo = Code("FullType.unspecified"))) + ..body = _serializerBody(base, allocator, schemaSource, typeOverrides)), + Method((b) => b + ..name = "deserialize" + ..returns = refer(base.name) + ..requiredParameters.add(Parameter((b) => b + ..name = "serializers" + ..type = refer("Serializers", "package:built_value/serializer.dart"))) + ..requiredParameters.add(Parameter((b) => b + ..name = "serialized" + ..type = refer("Iterable"))) + ..optionalParameters.add(Parameter((b) => b + ..name = "specifiedType" + ..named = true + ..type = refer("FullType", "package:built_value/serializer.dart") + ..defaultTo = Code("FullType.unspecified"))) + ..body = _deserializerBody(base, allocator, schemaSource, typeOverrides)), + ])); + +Code _serializerBody(Class base, Allocator allocator, SourceNode schemaSource, + Map typeOverrides) { + final vars = []; + + for (final field + in base.methods.where((field) => !field.static && field.type == MethodType.getter)) { + final isOptionalValue = isValue(field.returns!); + final statements = []; + + if (isOptionalValue) { + final realType = (field.returns as TypeReference).types.first as TypeReference; + + final _valueVarName = "_\$${field.name}value"; + + statements.add(Code("final $_valueVarName = object.${field.name};")); + statements.add(Code("if ($_valueVarName != null) {")); + statements.add(Code("result.add('${_getWireName(field)}');")); + statements.add(Code( + "result.add(serializers.serialize($_valueVarName!.value, specifiedType: const ${_generateFullType(realType, allocator)}));")); + statements.add(Code("}")); + } else { + statements.add(Code("result.add('${_getWireName(field)}');")); + statements.add(Code( + "result.add(serializers.serialize(object.${field.name}, specifiedType: const ${_generateFullType(field.returns as TypeReference, allocator)}));")); + } + vars.add(Block.of(statements)); + } + + final body = Block.of([ + Code("final result = [];"), + ...vars, + Code("return result;"), + ]); + + return body; +} + +Code _deserializerBody(Class base, Allocator allocator, SourceNode schemaSource, + Map typeOverrides) => + Code("""final builder = ${base.name}Builder(); + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + ${_generateFieldDeserializers( + base, + allocator, + schemaSource, + typeOverrides, + )} + } + } + return builder.build(); + """); + +String _generateFieldDeserializers( + Class clazz, + Allocator allocator, + SourceNode schemaSource, + Map typeOverrides, +) => + clazz.methods.where((field) => field.type == MethodType.getter && !field.static).map((field) { + var type = field.returns!; + final isWrappedValue = isValue(type); + if (isWrappedValue) { + type = (type as TypeReference).types.first; + } + final fullType = _generateFullType(type as TypeReference, allocator); + + final typeDefNode = getTypeDefinitionNode(schemaSource.document, type.symbol.substring(1)); + + print(typeDefNode.runtimeType.toString() + " " + (typeDefNode?.name.value.toString() ?? "")); + + //TODO this feels flaky, find a better way + final isBuilder = type.url != null && + !isWrappedValue && + (typeDefNode is! ScalarTypeDefinitionNode && typeDefNode is! EnumTypeDefinitionNode); + + /// TODO check for wireName + + var base = """ +case '${_getWireName(field)}': + var fieldValue = serializers.deserialize( + value, specifiedType: const $fullType) as ${_generateTypeCast(type, allocator)};"""; + + if (isBuilder) { + base += """ + builder.${field.name}.replace(fieldValue); + """; + } else { + base += """ + builder.${field.name} = ${isWrappedValue ? "${allocator.allocate(_valueTypeRef)}(fieldValue)" : "fieldValue"}; + """; + } + + return base + + """ +break; +"""; + }).join(); + +Code _generateFullType(TypeReference ref, Allocator allocator) { + if (ref.types.isEmpty) { + return Code("FullType(${allocator.allocate(ref)})"); + } else { + return Code( + "FullType(${allocator.allocate(ref)}, [${ref.types.map((t) => _generateFullType(t as TypeReference, allocator)).join(",")}])"); + } +} + +String _generateTypeCast(TypeReference ref, Allocator allocator) { + if (ref.types.isEmpty) { + return allocator.allocate(ref); + } else { + return "${allocator.allocate(ref)}<${ref.types.map((t) => _generateTypeCast(t as TypeReference, allocator)).join(",")}>"; + } +} + +final _valueTypeRef = TypeReference((b) => b + ..symbol = "Value" + ..url = "package:gql_exec/value.dart"); + +bool isValue(Reference ref) { + if (ref is! TypeReference) return false; + + return ref.symbol == _valueTypeRef.symbol && ref.url == _valueTypeRef.url; +} + +String _getWireName(Method m) { + final annotation = + m.annotations.firstWhereOrNull((a) => a is InvokeExpression && a.name == "BuiltValueField") + as InvokeExpression?; + if (annotation == null) return m.name!; + return (annotation.namedArguments["wireName"] as LiteralExpression?)?.literal ?? m.name!; +} diff --git a/codegen/gql_code_builder/pubspec.yaml b/codegen/gql_code_builder/pubspec.yaml index 4f7e855a..1150c2d9 100644 --- a/codegen/gql_code_builder/pubspec.yaml +++ b/codegen/gql_code_builder/pubspec.yaml @@ -17,3 +17,38 @@ dev_dependencies: build_runner: ^2.1.0 gql_pedantic: ^1.0.2 test: ^1.16.8 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_build: + path: ../gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../../links/gql_dedupe_link + end_to_end_test: + path: ../end_to_end_test diff --git a/examples/gql_example_build/pubspec.yaml b/examples/gql_example_build/pubspec.yaml index 54cac320..f0e24baf 100644 --- a/examples/gql_example_build/pubspec.yaml +++ b/examples/gql_example_build/pubspec.yaml @@ -6,3 +6,38 @@ dev_dependencies: gql_build: ^0.7.0 gql_pedantic: ^1.0.2 test: ^1.0.0 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../gql_example_http_auth_link + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_dio_link: + path: ../gql_example_dio_link + gql_example_cli_github: + path: ../gql_example_cli_github + gql_example_cli: + path: ../gql_example_cli + gql_dedupe_link: + path: ../../links/gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/examples/gql_example_cli/pubspec.yaml b/examples/gql_example_cli/pubspec.yaml index 64075f49..26c96d5d 100644 --- a/examples/gql_example_cli/pubspec.yaml +++ b/examples/gql_example_cli/pubspec.yaml @@ -11,3 +11,38 @@ dev_dependencies: build_runner: ^2.0.0 gql_build: ^0.7.0 gql_pedantic: ^1.0.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../gql_example_http_auth_link + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_dio_link: + path: ../gql_example_dio_link + gql_example_cli_github: + path: ../gql_example_cli_github + gql_example_build: + path: ../gql_example_build + gql_dedupe_link: + path: ../../links/gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/examples/gql_example_cli_github/pubspec.yaml b/examples/gql_example_cli_github/pubspec.yaml index c2223123..7d0449d4 100644 --- a/examples/gql_example_cli_github/pubspec.yaml +++ b/examples/gql_example_cli_github/pubspec.yaml @@ -12,3 +12,38 @@ dev_dependencies: build_runner: ^2.0.0 gql_build: ^0.7.0 gql_pedantic: ^1.0.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../gql_example_http_auth_link + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_dio_link: + path: ../gql_example_dio_link + gql_example_cli: + path: ../gql_example_cli + gql_example_build: + path: ../gql_example_build + gql_dedupe_link: + path: ../../links/gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/examples/gql_example_dio_link/pubspec.yaml b/examples/gql_example_dio_link/pubspec.yaml index eb1dfbea..b3da1bc5 100644 --- a/examples/gql_example_dio_link/pubspec.yaml +++ b/examples/gql_example_dio_link/pubspec.yaml @@ -8,3 +8,38 @@ dependencies: gql_link: ^0.5.0 gql_exec: ^0.4.3 gql_dio_link: ^0.2.3 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../gql_example_http_auth_link + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_cli_github: + path: ../gql_example_cli_github + gql_example_cli: + path: ../gql_example_cli + gql_example_build: + path: ../gql_example_build + gql_dedupe_link: + path: ../../links/gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/examples/gql_example_flutter/pubspec.yaml b/examples/gql_example_flutter/pubspec.yaml index 67c2e247..2d2276e2 100644 --- a/examples/gql_example_flutter/pubspec.yaml +++ b/examples/gql_example_flutter/pubspec.yaml @@ -16,5 +16,42 @@ dev_dependencies: gql_build: ^0.7.0 flutter_test: sdk: flutter +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../gql_example_http_auth_link + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_dio_link: + path: ../gql_example_dio_link + gql_example_cli_github: + path: ../gql_example_cli_github + gql_example_cli: + path: ../gql_example_cli + gql_example_build: + path: ../gql_example_build + gql_dedupe_link: + path: ../../links/gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test flutter: uses-material-design: true diff --git a/examples/gql_example_http_auth_link/pubspec.yaml b/examples/gql_example_http_auth_link/pubspec.yaml index 366b56a6..5f159bd8 100644 --- a/examples/gql_example_http_auth_link/pubspec.yaml +++ b/examples/gql_example_http_auth_link/pubspec.yaml @@ -12,3 +12,38 @@ dependencies: dev_dependencies: gql_build: ^0.7.0 gql_pedantic: ^1.0.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../../links/gql_exec + gql_link: + path: ../../links/gql_link + gql_websocket_link: + path: ../../links/gql_websocket_link + gql_transform_link: + path: ../../links/gql_transform_link + gql_http_link: + path: ../../links/gql_http_link + gql_error_link: + path: ../../links/gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_dio_link: + path: ../../links/gql_dio_link + gql_example_dio_link: + path: ../gql_example_dio_link + gql_example_cli_github: + path: ../gql_example_cli_github + gql_example_cli: + path: ../gql_example_cli + gql_example_build: + path: ../gql_example_build + gql_dedupe_link: + path: ../../links/gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/gql/pubspec.yaml b/gql/pubspec.yaml index 0ba09aab..25e465f5 100644 --- a/gql/pubspec.yaml +++ b/gql/pubspec.yaml @@ -12,3 +12,38 @@ dependencies: dev_dependencies: gql_pedantic: ^1.0.2 test: ^1.16.2 +dependency_overrides: + gql_pedantic: + path: ../gql_pedantic + gql_exec: + path: ../links/gql_exec + gql_link: + path: ../links/gql_link + gql_websocket_link: + path: ../links/gql_websocket_link + gql_transform_link: + path: ../links/gql_transform_link + gql_http_link: + path: ../links/gql_http_link + gql_error_link: + path: ../links/gql_error_link + gql_code_builder: + path: ../codegen/gql_code_builder + gql_build: + path: ../codegen/gql_build + gql_example_http_auth_link: + path: ../examples/gql_example_http_auth_link + gql_dio_link: + path: ../links/gql_dio_link + gql_example_dio_link: + path: ../examples/gql_example_dio_link + gql_example_cli_github: + path: ../examples/gql_example_cli_github + gql_example_cli: + path: ../examples/gql_example_cli + gql_example_build: + path: ../examples/gql_example_build + gql_dedupe_link: + path: ../links/gql_dedupe_link + end_to_end_test: + path: ../codegen/end_to_end_test diff --git a/gql_pedantic/pubspec.yaml b/gql_pedantic/pubspec.yaml index 273b3751..46329e7b 100644 --- a/gql_pedantic/pubspec.yaml +++ b/gql_pedantic/pubspec.yaml @@ -4,3 +4,38 @@ description: Even more opinionated lint rules. repository: https://github.com/gql-dart/gql environment: sdk: '>=2.7.2 <3.0.0' +dependency_overrides: + gql: + path: ../gql + gql_exec: + path: ../links/gql_exec + gql_link: + path: ../links/gql_link + gql_websocket_link: + path: ../links/gql_websocket_link + gql_transform_link: + path: ../links/gql_transform_link + gql_http_link: + path: ../links/gql_http_link + gql_error_link: + path: ../links/gql_error_link + gql_code_builder: + path: ../codegen/gql_code_builder + gql_build: + path: ../codegen/gql_build + gql_example_http_auth_link: + path: ../examples/gql_example_http_auth_link + gql_dio_link: + path: ../links/gql_dio_link + gql_example_dio_link: + path: ../examples/gql_example_dio_link + gql_example_cli_github: + path: ../examples/gql_example_cli_github + gql_example_cli: + path: ../examples/gql_example_cli + gql_example_build: + path: ../examples/gql_example_build + gql_dedupe_link: + path: ../links/gql_dedupe_link + end_to_end_test: + path: ../codegen/end_to_end_test diff --git a/links/gql_dedupe_link/pubspec.yaml b/links/gql_dedupe_link/pubspec.yaml index 779d38e5..7e0d03f2 100644 --- a/links/gql_dedupe_link/pubspec.yaml +++ b/links/gql_dedupe_link/pubspec.yaml @@ -14,3 +14,38 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.0-nullsafety.7 test: ^1.16.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../gql_exec + gql_link: + path: ../gql_link + gql_websocket_link: + path: ../gql_websocket_link + gql_transform_link: + path: ../gql_transform_link + gql_http_link: + path: ../gql_http_link + gql_error_link: + path: ../gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/links/gql_dio_link/pubspec.yaml b/links/gql_dio_link/pubspec.yaml index 8618929e..f42a6ce0 100644 --- a/links/gql_dio_link/pubspec.yaml +++ b/links/gql_dio_link/pubspec.yaml @@ -18,3 +18,38 @@ dev_dependencies: http_parser: ^4.0.0 mockito: ^5.3.0 test: ^1.14.3 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../gql_exec + gql_link: + path: ../gql_link + gql_websocket_link: + path: ../gql_websocket_link + gql_transform_link: + path: ../gql_transform_link + gql_http_link: + path: ../gql_http_link + gql_error_link: + path: ../gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/links/gql_error_link/pubspec.yaml b/links/gql_error_link/pubspec.yaml index 9eb27d5d..c198982e 100644 --- a/links/gql_error_link/pubspec.yaml +++ b/links/gql_error_link/pubspec.yaml @@ -14,3 +14,38 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.0-nullsafety.7 test: ^1.16.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../gql_exec + gql_link: + path: ../gql_link + gql_websocket_link: + path: ../gql_websocket_link + gql_transform_link: + path: ../gql_transform_link + gql_http_link: + path: ../gql_http_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/links/gql_exec/lib/src/value.dart b/links/gql_exec/lib/src/value.dart new file mode 100644 index 00000000..0ab0b96a --- /dev/null +++ b/links/gql_exec/lib/src/value.dart @@ -0,0 +1,18 @@ +class Value { + final T? _value; + + T? get value => _value; + + /// Create a (present) value by wrapping the [value] provided. + const Value(T? value) : _value = value; + + const Value.ofNull() : _value = null; + + @override + bool operator ==(Object other) => + identical(this, other) || + other is Value && runtimeType == other.runtimeType && _value == other._value; + + @override + int get hashCode => _value.hashCode; +} diff --git a/links/gql_exec/lib/value.dart b/links/gql_exec/lib/value.dart new file mode 100644 index 00000000..4d086bbb --- /dev/null +++ b/links/gql_exec/lib/value.dart @@ -0,0 +1 @@ +export "package:gql_exec/src/value.dart"; diff --git a/links/gql_exec/pubspec.yaml b/links/gql_exec/pubspec.yaml index a9ec3dd0..efb82a39 100644 --- a/links/gql_exec/pubspec.yaml +++ b/links/gql_exec/pubspec.yaml @@ -11,3 +11,38 @@ dependencies: dev_dependencies: gql_pedantic: ^1.0.2 test: ^1.16.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_link: + path: ../gql_link + gql_websocket_link: + path: ../gql_websocket_link + gql_transform_link: + path: ../gql_transform_link + gql_http_link: + path: ../gql_http_link + gql_error_link: + path: ../gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/links/gql_http_link/lib/src/link.dart b/links/gql_http_link/lib/src/link.dart index 167aacdb..757bd582 100644 --- a/links/gql_http_link/lib/src/link.dart +++ b/links/gql_http_link/lib/src/link.dart @@ -53,6 +53,8 @@ class HttpLink extends Link { http.Client? _httpClient; + final bool followRedirects; + /// Construct the Link /// /// You can pass a [httpClient] to extend to customize the network request. @@ -64,6 +66,7 @@ class HttpLink extends Link { this.serializer = const RequestSerializer(), this.parser = const ResponseParser(), this.httpResponseDecoder = _defaultHttpResponseDecoder, + this.followRedirects = false, }) : uri = Uri.parse(uri) { _httpClient = httpClient ?? http.Client(); } @@ -188,6 +191,7 @@ class HttpLink extends Link { } return http.Request("POST", uri) ..body = httpBody + ..followRedirects = followRedirects ..headers.addAll(headers); } diff --git a/links/gql_http_link/pubspec.yaml b/links/gql_http_link/pubspec.yaml index 732ce577..cf9cbc65 100644 --- a/links/gql_http_link/pubspec.yaml +++ b/links/gql_http_link/pubspec.yaml @@ -17,3 +17,38 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.3.0 test: ^1.16.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../gql_exec + gql_link: + path: ../gql_link + gql_websocket_link: + path: ../gql_websocket_link + gql_transform_link: + path: ../gql_transform_link + gql_error_link: + path: ../gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/links/gql_link/pubspec.yaml b/links/gql_link/pubspec.yaml index 2ff02eef..601748fc 100644 --- a/links/gql_link/pubspec.yaml +++ b/links/gql_link/pubspec.yaml @@ -12,3 +12,38 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.16 test: ^1.16.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../gql_exec + gql_websocket_link: + path: ../gql_websocket_link + gql_transform_link: + path: ../gql_transform_link + gql_http_link: + path: ../gql_http_link + gql_error_link: + path: ../gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/links/gql_transform_link/pubspec.yaml b/links/gql_transform_link/pubspec.yaml index b958dd0c..9836b5be 100644 --- a/links/gql_transform_link/pubspec.yaml +++ b/links/gql_transform_link/pubspec.yaml @@ -12,3 +12,38 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.0-nullsafety.7 test: ^1.16.2 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../gql_exec + gql_link: + path: ../gql_link + gql_websocket_link: + path: ../gql_websocket_link + gql_http_link: + path: ../gql_http_link + gql_error_link: + path: ../gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test diff --git a/links/gql_websocket_link/pubspec.yaml b/links/gql_websocket_link/pubspec.yaml index dc1cc08e..365461fa 100644 --- a/links/gql_websocket_link/pubspec.yaml +++ b/links/gql_websocket_link/pubspec.yaml @@ -16,3 +16,38 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.0 test: ^1.16.6 +dependency_overrides: + gql_pedantic: + path: ../../gql_pedantic + gql: + path: ../../gql + gql_exec: + path: ../gql_exec + gql_link: + path: ../gql_link + gql_transform_link: + path: ../gql_transform_link + gql_http_link: + path: ../gql_http_link + gql_error_link: + path: ../gql_error_link + gql_code_builder: + path: ../../codegen/gql_code_builder + gql_build: + path: ../../codegen/gql_build + gql_example_http_auth_link: + path: ../../examples/gql_example_http_auth_link + gql_dio_link: + path: ../gql_dio_link + gql_example_dio_link: + path: ../../examples/gql_example_dio_link + gql_example_cli_github: + path: ../../examples/gql_example_cli_github + gql_example_cli: + path: ../../examples/gql_example_cli + gql_example_build: + path: ../../examples/gql_example_build + gql_dedupe_link: + path: ../gql_dedupe_link + end_to_end_test: + path: ../../codegen/end_to_end_test From e0b1ae432fe19706ebf67a98246765ed8c19de36 Mon Sep 17 00:00:00 2001 From: Martin Kamleithner Date: Sun, 29 Jan 2023 19:18:44 +0100 Subject: [PATCH 2/8] pubspec clean --- codegen/end_to_end_test/pubspec.yaml | 35 ------------------ codegen/gql_build/pubspec.yaml | 35 ------------------ codegen/gql_code_builder/pubspec.yaml | 35 ------------------ examples/gql_example_build/pubspec.yaml | 35 ------------------ examples/gql_example_cli/pubspec.yaml | 35 ------------------ examples/gql_example_cli_github/pubspec.yaml | 35 ------------------ examples/gql_example_dio_link/pubspec.yaml | 35 ------------------ examples/gql_example_flutter/pubspec.yaml | 37 ------------------- .../gql_example_http_auth_link/pubspec.yaml | 35 ------------------ gql/pubspec.yaml | 35 ------------------ gql_pedantic/pubspec.yaml | 35 ------------------ links/gql_dedupe_link/pubspec.yaml | 35 ------------------ links/gql_dio_link/pubspec.yaml | 35 ------------------ links/gql_error_link/pubspec.yaml | 35 ------------------ links/gql_exec/pubspec.yaml | 35 ------------------ links/gql_http_link/pubspec.yaml | 35 ------------------ links/gql_link/pubspec.yaml | 35 ------------------ links/gql_transform_link/pubspec.yaml | 35 ------------------ links/gql_websocket_link/pubspec.yaml | 35 ------------------ 19 files changed, 667 deletions(-) diff --git a/codegen/end_to_end_test/pubspec.yaml b/codegen/end_to_end_test/pubspec.yaml index c91a20df..a1fb6f80 100644 --- a/codegen/end_to_end_test/pubspec.yaml +++ b/codegen/end_to_end_test/pubspec.yaml @@ -15,38 +15,3 @@ dev_dependencies: build: ^2.0.0 build_runner: ^2.0.0 test: ^1.16.8 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_code_builder: - path: ../gql_code_builder - gql_build: - path: ../gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../../links/gql_dedupe_link diff --git a/codegen/gql_build/pubspec.yaml b/codegen/gql_build/pubspec.yaml index 3012d6cf..17582bd3 100644 --- a/codegen/gql_build/pubspec.yaml +++ b/codegen/gql_build/pubspec.yaml @@ -20,38 +20,3 @@ dependencies: dev_dependencies: build_test: ^2.0.0 gql_pedantic: ^1.0.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_code_builder: - path: ../gql_code_builder - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../../links/gql_dedupe_link - end_to_end_test: - path: ../end_to_end_test diff --git a/codegen/gql_code_builder/pubspec.yaml b/codegen/gql_code_builder/pubspec.yaml index 1150c2d9..4f7e855a 100644 --- a/codegen/gql_code_builder/pubspec.yaml +++ b/codegen/gql_code_builder/pubspec.yaml @@ -17,38 +17,3 @@ dev_dependencies: build_runner: ^2.1.0 gql_pedantic: ^1.0.2 test: ^1.16.8 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_build: - path: ../gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../../links/gql_dedupe_link - end_to_end_test: - path: ../end_to_end_test diff --git a/examples/gql_example_build/pubspec.yaml b/examples/gql_example_build/pubspec.yaml index f0e24baf..54cac320 100644 --- a/examples/gql_example_build/pubspec.yaml +++ b/examples/gql_example_build/pubspec.yaml @@ -6,38 +6,3 @@ dev_dependencies: gql_build: ^0.7.0 gql_pedantic: ^1.0.2 test: ^1.0.0 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../gql_example_http_auth_link - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_dio_link: - path: ../gql_example_dio_link - gql_example_cli_github: - path: ../gql_example_cli_github - gql_example_cli: - path: ../gql_example_cli - gql_dedupe_link: - path: ../../links/gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/examples/gql_example_cli/pubspec.yaml b/examples/gql_example_cli/pubspec.yaml index 26c96d5d..64075f49 100644 --- a/examples/gql_example_cli/pubspec.yaml +++ b/examples/gql_example_cli/pubspec.yaml @@ -11,38 +11,3 @@ dev_dependencies: build_runner: ^2.0.0 gql_build: ^0.7.0 gql_pedantic: ^1.0.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../gql_example_http_auth_link - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_dio_link: - path: ../gql_example_dio_link - gql_example_cli_github: - path: ../gql_example_cli_github - gql_example_build: - path: ../gql_example_build - gql_dedupe_link: - path: ../../links/gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/examples/gql_example_cli_github/pubspec.yaml b/examples/gql_example_cli_github/pubspec.yaml index 7d0449d4..c2223123 100644 --- a/examples/gql_example_cli_github/pubspec.yaml +++ b/examples/gql_example_cli_github/pubspec.yaml @@ -12,38 +12,3 @@ dev_dependencies: build_runner: ^2.0.0 gql_build: ^0.7.0 gql_pedantic: ^1.0.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../gql_example_http_auth_link - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_dio_link: - path: ../gql_example_dio_link - gql_example_cli: - path: ../gql_example_cli - gql_example_build: - path: ../gql_example_build - gql_dedupe_link: - path: ../../links/gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/examples/gql_example_dio_link/pubspec.yaml b/examples/gql_example_dio_link/pubspec.yaml index b3da1bc5..eb1dfbea 100644 --- a/examples/gql_example_dio_link/pubspec.yaml +++ b/examples/gql_example_dio_link/pubspec.yaml @@ -8,38 +8,3 @@ dependencies: gql_link: ^0.5.0 gql_exec: ^0.4.3 gql_dio_link: ^0.2.3 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../gql_example_http_auth_link - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_cli_github: - path: ../gql_example_cli_github - gql_example_cli: - path: ../gql_example_cli - gql_example_build: - path: ../gql_example_build - gql_dedupe_link: - path: ../../links/gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/examples/gql_example_flutter/pubspec.yaml b/examples/gql_example_flutter/pubspec.yaml index 2d2276e2..67c2e247 100644 --- a/examples/gql_example_flutter/pubspec.yaml +++ b/examples/gql_example_flutter/pubspec.yaml @@ -16,42 +16,5 @@ dev_dependencies: gql_build: ^0.7.0 flutter_test: sdk: flutter -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../gql_example_http_auth_link - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_dio_link: - path: ../gql_example_dio_link - gql_example_cli_github: - path: ../gql_example_cli_github - gql_example_cli: - path: ../gql_example_cli - gql_example_build: - path: ../gql_example_build - gql_dedupe_link: - path: ../../links/gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test flutter: uses-material-design: true diff --git a/examples/gql_example_http_auth_link/pubspec.yaml b/examples/gql_example_http_auth_link/pubspec.yaml index 5f159bd8..366b56a6 100644 --- a/examples/gql_example_http_auth_link/pubspec.yaml +++ b/examples/gql_example_http_auth_link/pubspec.yaml @@ -12,38 +12,3 @@ dependencies: dev_dependencies: gql_build: ^0.7.0 gql_pedantic: ^1.0.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../../links/gql_exec - gql_link: - path: ../../links/gql_link - gql_websocket_link: - path: ../../links/gql_websocket_link - gql_transform_link: - path: ../../links/gql_transform_link - gql_http_link: - path: ../../links/gql_http_link - gql_error_link: - path: ../../links/gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_dio_link: - path: ../../links/gql_dio_link - gql_example_dio_link: - path: ../gql_example_dio_link - gql_example_cli_github: - path: ../gql_example_cli_github - gql_example_cli: - path: ../gql_example_cli - gql_example_build: - path: ../gql_example_build - gql_dedupe_link: - path: ../../links/gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/gql/pubspec.yaml b/gql/pubspec.yaml index 25e465f5..0ba09aab 100644 --- a/gql/pubspec.yaml +++ b/gql/pubspec.yaml @@ -12,38 +12,3 @@ dependencies: dev_dependencies: gql_pedantic: ^1.0.2 test: ^1.16.2 -dependency_overrides: - gql_pedantic: - path: ../gql_pedantic - gql_exec: - path: ../links/gql_exec - gql_link: - path: ../links/gql_link - gql_websocket_link: - path: ../links/gql_websocket_link - gql_transform_link: - path: ../links/gql_transform_link - gql_http_link: - path: ../links/gql_http_link - gql_error_link: - path: ../links/gql_error_link - gql_code_builder: - path: ../codegen/gql_code_builder - gql_build: - path: ../codegen/gql_build - gql_example_http_auth_link: - path: ../examples/gql_example_http_auth_link - gql_dio_link: - path: ../links/gql_dio_link - gql_example_dio_link: - path: ../examples/gql_example_dio_link - gql_example_cli_github: - path: ../examples/gql_example_cli_github - gql_example_cli: - path: ../examples/gql_example_cli - gql_example_build: - path: ../examples/gql_example_build - gql_dedupe_link: - path: ../links/gql_dedupe_link - end_to_end_test: - path: ../codegen/end_to_end_test diff --git a/gql_pedantic/pubspec.yaml b/gql_pedantic/pubspec.yaml index 46329e7b..273b3751 100644 --- a/gql_pedantic/pubspec.yaml +++ b/gql_pedantic/pubspec.yaml @@ -4,38 +4,3 @@ description: Even more opinionated lint rules. repository: https://github.com/gql-dart/gql environment: sdk: '>=2.7.2 <3.0.0' -dependency_overrides: - gql: - path: ../gql - gql_exec: - path: ../links/gql_exec - gql_link: - path: ../links/gql_link - gql_websocket_link: - path: ../links/gql_websocket_link - gql_transform_link: - path: ../links/gql_transform_link - gql_http_link: - path: ../links/gql_http_link - gql_error_link: - path: ../links/gql_error_link - gql_code_builder: - path: ../codegen/gql_code_builder - gql_build: - path: ../codegen/gql_build - gql_example_http_auth_link: - path: ../examples/gql_example_http_auth_link - gql_dio_link: - path: ../links/gql_dio_link - gql_example_dio_link: - path: ../examples/gql_example_dio_link - gql_example_cli_github: - path: ../examples/gql_example_cli_github - gql_example_cli: - path: ../examples/gql_example_cli - gql_example_build: - path: ../examples/gql_example_build - gql_dedupe_link: - path: ../links/gql_dedupe_link - end_to_end_test: - path: ../codegen/end_to_end_test diff --git a/links/gql_dedupe_link/pubspec.yaml b/links/gql_dedupe_link/pubspec.yaml index 7e0d03f2..779d38e5 100644 --- a/links/gql_dedupe_link/pubspec.yaml +++ b/links/gql_dedupe_link/pubspec.yaml @@ -14,38 +14,3 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.0-nullsafety.7 test: ^1.16.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../gql_exec - gql_link: - path: ../gql_link - gql_websocket_link: - path: ../gql_websocket_link - gql_transform_link: - path: ../gql_transform_link - gql_http_link: - path: ../gql_http_link - gql_error_link: - path: ../gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/links/gql_dio_link/pubspec.yaml b/links/gql_dio_link/pubspec.yaml index f42a6ce0..8618929e 100644 --- a/links/gql_dio_link/pubspec.yaml +++ b/links/gql_dio_link/pubspec.yaml @@ -18,38 +18,3 @@ dev_dependencies: http_parser: ^4.0.0 mockito: ^5.3.0 test: ^1.14.3 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../gql_exec - gql_link: - path: ../gql_link - gql_websocket_link: - path: ../gql_websocket_link - gql_transform_link: - path: ../gql_transform_link - gql_http_link: - path: ../gql_http_link - gql_error_link: - path: ../gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/links/gql_error_link/pubspec.yaml b/links/gql_error_link/pubspec.yaml index c198982e..9eb27d5d 100644 --- a/links/gql_error_link/pubspec.yaml +++ b/links/gql_error_link/pubspec.yaml @@ -14,38 +14,3 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.0-nullsafety.7 test: ^1.16.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../gql_exec - gql_link: - path: ../gql_link - gql_websocket_link: - path: ../gql_websocket_link - gql_transform_link: - path: ../gql_transform_link - gql_http_link: - path: ../gql_http_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/links/gql_exec/pubspec.yaml b/links/gql_exec/pubspec.yaml index efb82a39..a9ec3dd0 100644 --- a/links/gql_exec/pubspec.yaml +++ b/links/gql_exec/pubspec.yaml @@ -11,38 +11,3 @@ dependencies: dev_dependencies: gql_pedantic: ^1.0.2 test: ^1.16.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_link: - path: ../gql_link - gql_websocket_link: - path: ../gql_websocket_link - gql_transform_link: - path: ../gql_transform_link - gql_http_link: - path: ../gql_http_link - gql_error_link: - path: ../gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/links/gql_http_link/pubspec.yaml b/links/gql_http_link/pubspec.yaml index cf9cbc65..732ce577 100644 --- a/links/gql_http_link/pubspec.yaml +++ b/links/gql_http_link/pubspec.yaml @@ -17,38 +17,3 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.3.0 test: ^1.16.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../gql_exec - gql_link: - path: ../gql_link - gql_websocket_link: - path: ../gql_websocket_link - gql_transform_link: - path: ../gql_transform_link - gql_error_link: - path: ../gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/links/gql_link/pubspec.yaml b/links/gql_link/pubspec.yaml index 601748fc..2ff02eef 100644 --- a/links/gql_link/pubspec.yaml +++ b/links/gql_link/pubspec.yaml @@ -12,38 +12,3 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.16 test: ^1.16.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../gql_exec - gql_websocket_link: - path: ../gql_websocket_link - gql_transform_link: - path: ../gql_transform_link - gql_http_link: - path: ../gql_http_link - gql_error_link: - path: ../gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/links/gql_transform_link/pubspec.yaml b/links/gql_transform_link/pubspec.yaml index 9836b5be..b958dd0c 100644 --- a/links/gql_transform_link/pubspec.yaml +++ b/links/gql_transform_link/pubspec.yaml @@ -12,38 +12,3 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.0-nullsafety.7 test: ^1.16.2 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../gql_exec - gql_link: - path: ../gql_link - gql_websocket_link: - path: ../gql_websocket_link - gql_http_link: - path: ../gql_http_link - gql_error_link: - path: ../gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test diff --git a/links/gql_websocket_link/pubspec.yaml b/links/gql_websocket_link/pubspec.yaml index 365461fa..dc1cc08e 100644 --- a/links/gql_websocket_link/pubspec.yaml +++ b/links/gql_websocket_link/pubspec.yaml @@ -16,38 +16,3 @@ dev_dependencies: gql_pedantic: ^1.0.2 mockito: ^5.0.0 test: ^1.16.6 -dependency_overrides: - gql_pedantic: - path: ../../gql_pedantic - gql: - path: ../../gql - gql_exec: - path: ../gql_exec - gql_link: - path: ../gql_link - gql_transform_link: - path: ../gql_transform_link - gql_http_link: - path: ../gql_http_link - gql_error_link: - path: ../gql_error_link - gql_code_builder: - path: ../../codegen/gql_code_builder - gql_build: - path: ../../codegen/gql_build - gql_example_http_auth_link: - path: ../../examples/gql_example_http_auth_link - gql_dio_link: - path: ../gql_dio_link - gql_example_dio_link: - path: ../../examples/gql_example_dio_link - gql_example_cli_github: - path: ../../examples/gql_example_cli_github - gql_example_cli: - path: ../../examples/gql_example_cli - gql_example_build: - path: ../../examples/gql_example_build - gql_dedupe_link: - path: ../gql_dedupe_link - end_to_end_test: - path: ../../codegen/end_to_end_test From a613a17686d6607c92943b6f76e3e99623ccafbf Mon Sep 17 00:00:00 2001 From: Martin Kamleithner Date: Sun, 29 Jan 2023 19:19:01 +0100 Subject: [PATCH 3/8] format --- .../test/schema/scalars_test.dart | 13 +++- codegen/gql_build/lib/src/schema_builder.dart | 18 +++-- .../gql_build/lib/src/serializer_builder.dart | 22 ++++-- codegen/gql_build/lib/src/var_builder.dart | 10 ++- codegen/gql_code_builder/lib/schema.dart | 3 +- .../gql_code_builder/lib/src/built_class.dart | 8 +- codegen/gql_code_builder/lib/src/common.dart | 6 +- codegen/gql_code_builder/lib/src/schema.dart | 12 +-- .../lib/src/schema/input.dart | 4 +- codegen/gql_code_builder/lib/var.dart | 76 +++++++++++-------- .../src/operation/definitions/selections.dart | 1 - links/gql_exec/lib/src/value.dart | 4 +- links/gql_link/lib/src/link.dart | 1 - 13 files changed, 109 insertions(+), 69 deletions(-) diff --git a/codegen/end_to_end_test/test/schema/scalars_test.dart b/codegen/end_to_end_test/test/schema/scalars_test.dart index 6eab24ad..bf7e70f7 100644 --- a/codegen/end_to_end_test/test/schema/scalars_test.dart +++ b/codegen/end_to_end_test/test/schema/scalars_test.dart @@ -50,8 +50,10 @@ void main() { final scalar = GISODate(isoString); test('correctly serializes and deserializes', () { - expect(serializers.deserializeWith(GISODate.serializer, isoString), equals(scalar)); - expect(serializers.serializeWith(GISODate.serializer, scalar), equals(isoString)); + expect(serializers.deserializeWith(GISODate.serializer, isoString), + equals(scalar)); + expect(serializers.serializeWith(GISODate.serializer, scalar), + equals(isoString)); }); }); @@ -102,8 +104,11 @@ void main() { final data = GReviewWithDateData( (b) => b ..createReview.stars = 1 - ..createReview.seenOn.add(DateTime.fromMillisecondsSinceEpoch(1591892597000)) - ..createReview.createdAt = DateTime.fromMillisecondsSinceEpoch(1591892597000), + ..createReview + .seenOn + .add(DateTime.fromMillisecondsSinceEpoch(1591892597000)) + ..createReview.createdAt = + DateTime.fromMillisecondsSinceEpoch(1591892597000), ); test('correctly overrides scalars in data types', () { diff --git a/codegen/gql_build/lib/src/schema_builder.dart b/codegen/gql_build/lib/src/schema_builder.dart index c7e2cfca..d85096f9 100644 --- a/codegen/gql_build/lib/src/schema_builder.dart +++ b/codegen/gql_build/lib/src/schema_builder.dart @@ -15,7 +15,8 @@ class SchemaBuilder implements Builder { final EnumFallbackConfig enumFallbackConfig; final bool generatePossibleTypesMap; - SchemaBuilder(this.typeOverrides, this.enumFallbackConfig, this.generatePossibleTypesMap); + SchemaBuilder(this.typeOverrides, this.enumFallbackConfig, + this.generatePossibleTypesMap); @override Map> get buildExtensions => { @@ -26,10 +27,13 @@ class SchemaBuilder implements Builder { FutureOr build(BuildStep buildStep) async { final doc = await readDocument(buildStep); - final generatedPartUrl = - buildStep.inputId.changeExtension(generatedFileExtension(schemaExtension)).uri.path; + final generatedPartUrl = buildStep.inputId + .changeExtension(generatedFileExtension(schemaExtension)) + .uri + .path; - final schemaUrl = outputAssetId(buildStep.inputId, schemaExtension).uri.toString(); + final schemaUrl = + outputAssetId(buildStep.inputId, schemaExtension).uri.toString(); final allocator = GqlAllocator( buildStep.inputId.uri.toString(), outputAssetId(buildStep.inputId, schemaExtension).uri.toString(), @@ -38,8 +42,10 @@ class SchemaBuilder implements Builder { final library = buildSchemaLibrary( doc, basename(generatedPartUrl), typeOverrides, enumFallbackConfig, - generatePossibleTypesMap: generatePossibleTypesMap, allocator: allocator); + generatePossibleTypesMap: generatePossibleTypesMap, + allocator: allocator); - return writeDocument(library, buildStep, schemaExtension, schemaUrl, allocator); + return writeDocument( + library, buildStep, schemaExtension, schemaUrl, allocator); } } diff --git a/codegen/gql_build/lib/src/serializer_builder.dart b/codegen/gql_build/lib/src/serializer_builder.dart index b9d49762..16d60280 100644 --- a/codegen/gql_build/lib/src/serializer_builder.dart +++ b/codegen/gql_build/lib/src/serializer_builder.dart @@ -29,9 +29,10 @@ class SerializerBuilder implements Builder { static final _generatedFiles = Glob("lib/**.gql.dart"); // create a path for the serializers output in same directory as schema - List get pathSegments => outputAssetId(schemaId, serializerExtension).pathSegments - ..removeLast() - ..add("serializers.gql.dart"); + List get pathSegments => + outputAssetId(schemaId, serializerExtension).pathSegments + ..removeLast() + ..add("serializers.gql.dart"); @override Map> get buildExtensions => { @@ -51,22 +52,27 @@ class SerializerBuilder implements Builder { /// BuiltValue classes with serializers. These will be added automatically /// using `@SerializersFor`. - final builtClasses = SplayTreeSet((a, b) => a.name.compareTo(b.name)); + final builtClasses = + SplayTreeSet((a, b) => a.name.compareTo(b.name)); /// Non BuiltValue classes with serializers (i.e. inline fragment classes). /// These need to be added manually since `@SerializersFor` only recognizes /// BuiltValue classes. - final nonBuiltClasses = SplayTreeSet((a, b) => a.name.compareTo(b.name)); + final nonBuiltClasses = + SplayTreeSet((a, b) => a.name.compareTo(b.name)); final hasSerializer = (ClassElement c) => c.fields.any((field) => field.isStatic && field.name == "serializer" && field.type.element?.name == "Serializer" && - field.type.element?.source?.uri.toString() == "package:built_value/serializer.dart"); + field.type.element?.source?.uri.toString() == + "package:built_value/serializer.dart"); final isBuiltValue = (ClassElement c) => c.allSupertypes.any((interface) => - (interface.element.name == "Built" || interface.element.name == "EnumClass") && - interface.element.source.uri.toString() == "package:built_value/built_value.dart"); + (interface.element.name == "Built" || + interface.element.name == "EnumClass") && + interface.element.source.uri.toString() == + "package:built_value/built_value.dart"); await for (final input in buildStep.findAssets(_generatedFiles)) { final lib = await buildStep.resolver.libraryFor(input); diff --git a/codegen/gql_build/lib/src/var_builder.dart b/codegen/gql_build/lib/src/var_builder.dart index c6f9c4d0..8733b6b5 100644 --- a/codegen/gql_build/lib/src/var_builder.dart +++ b/codegen/gql_build/lib/src/var_builder.dart @@ -30,8 +30,10 @@ class VarBuilder implements Builder { final doc = await readDocument(buildStep); final schema = await readDocument(buildStep, schemaId); - final generatedPartUrl = - buildStep.inputId.changeExtension(generatedFileExtension(varExtension)).uri.path; + final generatedPartUrl = buildStep.inputId + .changeExtension(generatedFileExtension(varExtension)) + .uri + .path; final schemaUrl = outputAssetId(schemaId, schemaExtension).uri.toString(); final allocator = GqlAllocator( @@ -40,8 +42,8 @@ class VarBuilder implements Builder { schemaUrl, ); - final library = buildVarLibrary( - doc, addTypenames(schema), basename(generatedPartUrl), typeOverrides, allocator); + final library = buildVarLibrary(doc, addTypenames(schema), + basename(generatedPartUrl), typeOverrides, allocator); return writeDocument( library, diff --git a/codegen/gql_code_builder/lib/schema.dart b/codegen/gql_code_builder/lib/schema.dart index 71b22952..99da105a 100644 --- a/codegen/gql_code_builder/lib/schema.dart +++ b/codegen/gql_code_builder/lib/schema.dart @@ -42,7 +42,8 @@ Code buildPossibleTypes(DocumentNode document) { // wrap the map in a literal for codegen final possibleTypesLiteral = literalMap(possibleTypesMap); // assign the literal to a const variable named "possibleTypes" - return declareConst("possibleTypesMap", type: Reference("Map>")) + return declareConst("possibleTypesMap", + type: Reference("Map>")) .assign(possibleTypesLiteral) .statement; } diff --git a/codegen/gql_code_builder/lib/src/built_class.dart b/codegen/gql_code_builder/lib/src/built_class.dart index 48f75e34..9b92906e 100644 --- a/codegen/gql_code_builder/lib/src/built_class.dart +++ b/codegen/gql_code_builder/lib/src/built_class.dart @@ -78,10 +78,10 @@ Class builtClass({ ), if (getters != null) ...getters, // Serialization methods - if(!hasCustomSerializer) - buildSerializerGetter(className).rebuild( - (b) => b..body = Code("_\$${toCamelCase(className)}Serializer"), - ), + if (!hasCustomSerializer) + buildSerializerGetter(className).rebuild( + (b) => b..body = Code("_\$${toCamelCase(className)}Serializer"), + ), buildToJsonGetter( className, isOverride: superclassSelections.isNotEmpty, diff --git a/codegen/gql_code_builder/lib/src/common.dart b/codegen/gql_code_builder/lib/src/common.dart index ce9d5d4e..41fafe63 100644 --- a/codegen/gql_code_builder/lib/src/common.dart +++ b/codegen/gql_code_builder/lib/src/common.dart @@ -203,7 +203,8 @@ Method buildOptionalGetter({ ..isNullable = true ..url = "package:gql_exec/value.dart" ..symbol = "Value" - ..types.add((baseGetter.returns as TypeReference).rebuild((b3) => b3..isNullable = false)))); + ..types.add((baseGetter.returns as TypeReference) + .rebuild((b3) => b3..isNullable = false)))); return optionalGetter; } @@ -263,5 +264,6 @@ Method buildFromJsonGetter(String className) => Method( ..lambda = true ..body = refer("serializers", "#serializer") .property("deserializeWith") - .call([refer(className).property("serializer"), refer("json")]).code, + .call( + [refer(className).property("serializer"), refer("json")]).code, ); diff --git a/codegen/gql_code_builder/lib/src/schema.dart b/codegen/gql_code_builder/lib/src/schema.dart index 90307d4d..0b9d5f23 100644 --- a/codegen/gql_code_builder/lib/src/schema.dart +++ b/codegen/gql_code_builder/lib/src/schema.dart @@ -32,8 +32,8 @@ class _SchemaBuilderVisitor extends SimpleVisitor?> { final EnumFallbackConfig enumFallbackConfig; final Allocator allocator; - _SchemaBuilderVisitor( - this.schemaSource, this.typeOverrides, this.enumFallbackConfig, this.allocator); + _SchemaBuilderVisitor(this.schemaSource, this.typeOverrides, + this.enumFallbackConfig, this.allocator); @override List visitDocumentNode( @@ -58,8 +58,8 @@ class _SchemaBuilderVisitor extends SimpleVisitor?> { schemaSource, typeOverrides, ); - final serializer = - nullAwareJsonSerializerClass(inputClass, allocator, schemaSource, typeOverrides); + final serializer = nullAwareJsonSerializerClass( + inputClass, allocator, schemaSource, typeOverrides); return [inputClass, serializer]; } @@ -67,7 +67,9 @@ class _SchemaBuilderVisitor extends SimpleVisitor?> { List visitScalarTypeDefinitionNode( ScalarTypeDefinitionNode node, ) => - typeOverrides.containsKey(node.name.value) ? [] : [buildScalarClass(node)]; + typeOverrides.containsKey(node.name.value) + ? [] + : [buildScalarClass(node)]; @override List visitEnumTypeDefinitionNode( diff --git a/codegen/gql_code_builder/lib/src/schema/input.dart b/codegen/gql_code_builder/lib/src/schema/input.dart index b42997fb..4ce965d8 100644 --- a/codegen/gql_code_builder/lib/src/schema/input.dart +++ b/codegen/gql_code_builder/lib/src/schema/input.dart @@ -19,8 +19,8 @@ List buildInputClasses( schemaSource, typeOverrides, ); - final serializer = - nullAwareJsonSerializerClass(inputClass, allocator, schemaSource, typeOverrides); + final serializer = nullAwareJsonSerializerClass( + inputClass, allocator, schemaSource, typeOverrides); return [inputClass, serializer]; }).toList(); diff --git a/codegen/gql_code_builder/lib/var.dart b/codegen/gql_code_builder/lib/var.dart index 2e5ca1e1..a8bb4a49 100644 --- a/codegen/gql_code_builder/lib/var.dart +++ b/codegen/gql_code_builder/lib/var.dart @@ -33,13 +33,15 @@ Library buildVarLibrary( .toList(); Map _fragmentMap(SourceNode source) => { - for (var def in source.document.definitions.whereType()) + for (var def + in source.document.definitions.whereType()) def.name.value: def, for (var import in source.imports) ..._fragmentMap(import) }; - final fragmentVarClasses = - docSource.document.definitions.whereType().map((frag) { + final fragmentVarClasses = docSource.document.definitions + .whereType() + .map((frag) { final varTypes = fragmentVarTypes( fragment: frag, fragmentMap: _fragmentMap(docSource), @@ -86,18 +88,19 @@ Library buildVarLibrary( ); } -Method nullAwareJsonSerializerField(Node op, String className) => Method((b) => b - ..annotations - .add(CodeExpression(Code("BuiltValueSerializer(custom: true, serializeNulls: true)"))) - ..static = true - ..type = MethodType.getter - ..lambda = true - ..returns = TypeReference((b2) => b2 - ..symbol = "Serializer" - ..url = "package:built_value/serializer.dart" - ..types.add(refer(className))) - ..name = "serializer" - ..body = Code("${className}Serializer()")); +Method nullAwareJsonSerializerField(Node op, String className) => + Method((b) => b + ..annotations.add(CodeExpression( + Code("BuiltValueSerializer(custom: true, serializeNulls: true)"))) + ..static = true + ..type = MethodType.getter + ..lambda = true + ..returns = TypeReference((b2) => b2 + ..symbol = "Serializer" + ..url = "package:built_value/serializer.dart" + ..types.add(refer(className))) + ..name = "serializer" + ..body = Code("${className}Serializer()")); Class nullAwareJsonSerializerClass( Class base, @@ -131,7 +134,8 @@ Class nullAwareJsonSerializerClass( ..returns = refer("Iterable") ..requiredParameters.add(Parameter((b) => b ..name = "serializers" - ..type = refer("Serializers", "package:built_value/serializer.dart"))) + ..type = + refer("Serializers", "package:built_value/serializer.dart"))) ..requiredParameters.add(Parameter((b) => b ..name = "object" ..type = refer(base.name))) @@ -140,13 +144,15 @@ Class nullAwareJsonSerializerClass( ..named = true ..type = refer("FullType", "package:built_value/serializer.dart") ..defaultTo = Code("FullType.unspecified"))) - ..body = _serializerBody(base, allocator, schemaSource, typeOverrides)), + ..body = + _serializerBody(base, allocator, schemaSource, typeOverrides)), Method((b) => b ..name = "deserialize" ..returns = refer(base.name) ..requiredParameters.add(Parameter((b) => b ..name = "serializers" - ..type = refer("Serializers", "package:built_value/serializer.dart"))) + ..type = + refer("Serializers", "package:built_value/serializer.dart"))) ..requiredParameters.add(Parameter((b) => b ..name = "serialized" ..type = refer("Iterable"))) @@ -155,20 +161,22 @@ Class nullAwareJsonSerializerClass( ..named = true ..type = refer("FullType", "package:built_value/serializer.dart") ..defaultTo = Code("FullType.unspecified"))) - ..body = _deserializerBody(base, allocator, schemaSource, typeOverrides)), + ..body = + _deserializerBody(base, allocator, schemaSource, typeOverrides)), ])); Code _serializerBody(Class base, Allocator allocator, SourceNode schemaSource, Map typeOverrides) { final vars = []; - for (final field - in base.methods.where((field) => !field.static && field.type == MethodType.getter)) { + for (final field in base.methods + .where((field) => !field.static && field.type == MethodType.getter)) { final isOptionalValue = isValue(field.returns!); final statements = []; if (isOptionalValue) { - final realType = (field.returns as TypeReference).types.first as TypeReference; + final realType = + (field.returns as TypeReference).types.first as TypeReference; final _valueVarName = "_\$${field.name}value"; @@ -221,7 +229,9 @@ String _generateFieldDeserializers( SourceNode schemaSource, Map typeOverrides, ) => - clazz.methods.where((field) => field.type == MethodType.getter && !field.static).map((field) { + clazz.methods + .where((field) => field.type == MethodType.getter && !field.static) + .map((field) { var type = field.returns!; final isWrappedValue = isValue(type); if (isWrappedValue) { @@ -229,14 +239,18 @@ String _generateFieldDeserializers( } final fullType = _generateFullType(type as TypeReference, allocator); - final typeDefNode = getTypeDefinitionNode(schemaSource.document, type.symbol.substring(1)); + final typeDefNode = getTypeDefinitionNode( + schemaSource.document, type.symbol.substring(1)); - print(typeDefNode.runtimeType.toString() + " " + (typeDefNode?.name.value.toString() ?? "")); + print(typeDefNode.runtimeType.toString() + + " " + + (typeDefNode?.name.value.toString() ?? "")); //TODO this feels flaky, find a better way final isBuilder = type.url != null && !isWrappedValue && - (typeDefNode is! ScalarTypeDefinitionNode && typeDefNode is! EnumTypeDefinitionNode); + (typeDefNode is! ScalarTypeDefinitionNode && + typeDefNode is! EnumTypeDefinitionNode); /// TODO check for wireName @@ -289,9 +303,11 @@ bool isValue(Reference ref) { } String _getWireName(Method m) { - final annotation = - m.annotations.firstWhereOrNull((a) => a is InvokeExpression && a.name == "BuiltValueField") - as InvokeExpression?; + final annotation = m.annotations.firstWhereOrNull( + (a) => a is InvokeExpression && a.name == "BuiltValueField") + as InvokeExpression?; if (annotation == null) return m.name!; - return (annotation.namedArguments["wireName"] as LiteralExpression?)?.literal ?? m.name!; + return (annotation.namedArguments["wireName"] as LiteralExpression?) + ?.literal ?? + m.name!; } diff --git a/gql/lib/src/operation/definitions/selections.dart b/gql/lib/src/operation/definitions/selections.dart index eab6af9e..451607aa 100644 --- a/gql/lib/src/operation/definitions/selections.dart +++ b/gql/lib/src/operation/definitions/selections.dart @@ -56,7 +56,6 @@ abstract class Selection extends ExecutableWithResolver { static Selection fromNode( SelectionNode astNode, [ - /// The [schemaType] of the containing element TypeDefinition? schemaType, GetExecutableType? getType, diff --git a/links/gql_exec/lib/src/value.dart b/links/gql_exec/lib/src/value.dart index 0ab0b96a..c4b49ba2 100644 --- a/links/gql_exec/lib/src/value.dart +++ b/links/gql_exec/lib/src/value.dart @@ -11,7 +11,9 @@ class Value { @override bool operator ==(Object other) => identical(this, other) || - other is Value && runtimeType == other.runtimeType && _value == other._value; + other is Value && + runtimeType == other.runtimeType && + _value == other._value; @override int get hashCode => _value.hashCode; diff --git a/links/gql_link/lib/src/link.dart b/links/gql_link/lib/src/link.dart index 2e1f355c..73af9085 100644 --- a/links/gql_link/lib/src/link.dart +++ b/links/gql_link/lib/src/link.dart @@ -89,7 +89,6 @@ abstract class Link { Stream request( /// An incoming [Request] Request request, [ - /// Function that invokes the [request] function of /// the next [Link] /// From 520c9792a27a7c6e43971f048f09d9389056f6bf Mon Sep 17 00:00:00 2001 From: Tobias Westergaard Kjeldsen Date: Tue, 30 May 2023 16:22:13 +0200 Subject: [PATCH 4/8] Introduce support for always serializing null fields --- codegen/gql_code_builder/lib/src/common.dart | 31 --------- .../lib/src/schema/input.dart | 2 +- codegen/gql_code_builder/lib/var.dart | 63 +++++++------------ 3 files changed, 25 insertions(+), 71 deletions(-) diff --git a/codegen/gql_code_builder/lib/src/common.dart b/codegen/gql_code_builder/lib/src/common.dart index 41fafe63..3df0ea8b 100644 --- a/codegen/gql_code_builder/lib/src/common.dart +++ b/codegen/gql_code_builder/lib/src/common.dart @@ -177,37 +177,6 @@ Method buildGetter({ ); } -Method buildOptionalGetter({ - required NameNode nameNode, - required TypeNode typeNode, - required SourceNode schemaSource, - Map typeOverrides = const {}, - String? typeRefPrefix, - bool built = true, - bool isOverride = false, -}) { - final baseGetter = buildGetter( - nameNode: nameNode, - typeNode: typeNode, - schemaSource: schemaSource, - typeOverrides: typeOverrides, - typeRefPrefix: typeRefPrefix, - built: built, - isOverride: isOverride, - ); - - if (typeNode.isNonNull) return baseGetter; - - final optionalGetter = baseGetter.rebuild((b) => b - ..returns = TypeReference((b2) => b2 - ..isNullable = true - ..url = "package:gql_exec/value.dart" - ..symbol = "Value" - ..types.add((baseGetter.returns as TypeReference) - .rebuild((b3) => b3..isNullable = false)))); - return optionalGetter; -} - Method buildSerializerGetter(String className) => Method( (b) => b ..static = true diff --git a/codegen/gql_code_builder/lib/src/schema/input.dart b/codegen/gql_code_builder/lib/src/schema/input.dart index 4ce965d8..7fff98d7 100644 --- a/codegen/gql_code_builder/lib/src/schema/input.dart +++ b/codegen/gql_code_builder/lib/src/schema/input.dart @@ -32,7 +32,7 @@ Class buildInputClass( builtClass( name: node.name.value, getters: node.fields.map( - (node) => buildOptionalGetter( + (node) => buildGetter( nameNode: node.name, typeNode: node.type, schemaSource: schemaSource, diff --git a/codegen/gql_code_builder/lib/var.dart b/codegen/gql_code_builder/lib/var.dart index a8bb4a49..13396672 100644 --- a/codegen/gql_code_builder/lib/var.dart +++ b/codegen/gql_code_builder/lib/var.dart @@ -12,14 +12,16 @@ Library buildVarLibrary( SourceNode schemaSource, String partUrl, Map typeOverrides, + bool serializeNulls, Allocator allocator, ) { final operationVarClasses = docSource.document.definitions .whereType() - .map((op) => builtClass( + .map((op) => serializeNulls + ? builtClass( name: "${op.name!.value}Vars", getters: op.variableDefinitions.map( - (node) => buildOptionalGetter( + (node) => buildGetter( nameNode: node.variable.name, typeNode: node.type, schemaSource: schemaSource, @@ -28,8 +30,19 @@ Library buildVarLibrary( ), hasCustomSerializer: true, methods: [ - nullAwareJsonSerializerField(op, "G${op.name!.value}Vars"), - ])) + nullAwareJsonSerializerField(op, "G${op.name!.value}Vars"), + ]) + : builtClass( + name: "${op.name!.value}Vars", + getters: op.variableDefinitions.map( + (node) => buildGetter( + nameNode: node.variable.name, + typeNode: node.type, + schemaSource: schemaSource, + typeOverrides: typeOverrides, + ), + ), + )) .toList(); Map _fragmentMap(SourceNode source) => { @@ -50,7 +63,7 @@ Library buildVarLibrary( return builtClass( name: "${frag.name.value}Vars", getters: varTypes.entries.map( - (entry) => buildOptionalGetter( + (entry) => buildGetter( nameNode: entry.key, typeNode: entry.value, schemaSource: schemaSource, @@ -171,26 +184,12 @@ Code _serializerBody(Class base, Allocator allocator, SourceNode schemaSource, for (final field in base.methods .where((field) => !field.static && field.type == MethodType.getter)) { - final isOptionalValue = isValue(field.returns!); final statements = []; - if (isOptionalValue) { - final realType = - (field.returns as TypeReference).types.first as TypeReference; + statements.add(Code("result.add('${_getWireName(field)}');")); + statements.add(Code( + "result.add(serializers.serialize(object.${field.name}, specifiedType: const ${_generateFullType(field.returns as TypeReference, allocator)}));")); - final _valueVarName = "_\$${field.name}value"; - - statements.add(Code("final $_valueVarName = object.${field.name};")); - statements.add(Code("if ($_valueVarName != null) {")); - statements.add(Code("result.add('${_getWireName(field)}');")); - statements.add(Code( - "result.add(serializers.serialize($_valueVarName!.value, specifiedType: const ${_generateFullType(realType, allocator)}));")); - statements.add(Code("}")); - } else { - statements.add(Code("result.add('${_getWireName(field)}');")); - statements.add(Code( - "result.add(serializers.serialize(object.${field.name}, specifiedType: const ${_generateFullType(field.returns as TypeReference, allocator)}));")); - } vars.add(Block.of(statements)); } @@ -232,11 +231,8 @@ String _generateFieldDeserializers( clazz.methods .where((field) => field.type == MethodType.getter && !field.static) .map((field) { - var type = field.returns!; - final isWrappedValue = isValue(type); - if (isWrappedValue) { - type = (type as TypeReference).types.first; - } + final type = field.returns!; + final fullType = _generateFullType(type as TypeReference, allocator); final typeDefNode = getTypeDefinitionNode( @@ -248,7 +244,6 @@ String _generateFieldDeserializers( //TODO this feels flaky, find a better way final isBuilder = type.url != null && - !isWrappedValue && (typeDefNode is! ScalarTypeDefinitionNode && typeDefNode is! EnumTypeDefinitionNode); @@ -265,7 +260,7 @@ case '${_getWireName(field)}': """; } else { base += """ - builder.${field.name} = ${isWrappedValue ? "${allocator.allocate(_valueTypeRef)}(fieldValue)" : "fieldValue"}; + builder.${field.name} = ${"fieldValue"}; """; } @@ -292,16 +287,6 @@ String _generateTypeCast(TypeReference ref, Allocator allocator) { } } -final _valueTypeRef = TypeReference((b) => b - ..symbol = "Value" - ..url = "package:gql_exec/value.dart"); - -bool isValue(Reference ref) { - if (ref is! TypeReference) return false; - - return ref.symbol == _valueTypeRef.symbol && ref.url == _valueTypeRef.url; -} - String _getWireName(Method m) { final annotation = m.annotations.firstWhereOrNull( (a) => a is InvokeExpression && a.name == "BuiltValueField") From 87e9b56c15bcc153de1531ab29096e534783e50b Mon Sep 17 00:00:00 2001 From: Tobias Westergaard Kjeldsen Date: Wed, 31 May 2023 14:07:43 +0200 Subject: [PATCH 5/8] Revert generated end_to_end_test --- .../aliased_hero.data.gql.g.dart | 30 +- .../__generated__/aliased_hero.req.gql.g.dart | 8 +- .../__generated__/aliased_hero.var.gql.dart | 46 +-- .../__generated__/aliased_hero.var.gql.g.dart | 52 ++- .../hero_with_fragments.data.gql.g.dart | 75 +---- .../hero_with_fragments.req.gql.g.dart | 8 +- .../hero_with_fragments.var.gql.dart | 159 +-------- .../hero_with_fragments.var.gql.g.dart | 151 ++++++++- ...terface_subtyped_fragments.data.gql.g.dart | 110 ++---- ...nterface_subtyped_fragments.req.gql.g.dart | 8 +- ..._interface_subtyped_fragments.var.gql.dart | 175 +--------- ...nterface_subtyped_fragments.var.gql.g.dart | 138 +++++++- .../graphql/__generated__/schema.ast.gql.dart | 46 +-- .../__generated__/schema.schema.gql.dart | 235 +------------ .../__generated__/schema.schema.gql.g.dart | 312 ++++++++++-------- .../__generated__/serializers.gql.dart | 18 +- .../__generated__/serializers.gql.g.dart | 9 +- .../lib/graphql/schema.graphql | 6 - .../hero_for_episode.data.gql.g.dart | 44 +-- .../hero_for_episode.req.gql.g.dart | 8 +- .../hero_for_episode.var.gql.dart | 88 +---- .../hero_for_episode.var.gql.g.dart | 80 ++++- .../hero_no_vars.data.gql.g.dart | 16 +- .../__generated__/hero_no_vars.req.gql.g.dart | 8 +- .../__generated__/hero_no_vars.var.gql.dart | 38 +-- .../__generated__/hero_no_vars.var.gql.g.dart | 26 +- .../review_with_date.data.gql.g.dart | 28 +- .../review_with_date.req.gql.g.dart | 8 +- .../review_with_date.var.gql.dart | 83 +---- .../review_with_date.var.gql.g.dart | 99 +++++- .../create_custom_field.ast.gql.dart | 37 --- .../create_custom_field.data.gql.dart | 37 --- .../create_custom_field.data.gql.g.dart | 174 ---------- .../create_custom_field.req.gql.dart | 42 --- .../create_custom_field.req.gql.g.dart | 180 ---------- .../create_custom_field.var.gql.dart | 80 ----- .../create_custom_field.var.gql.g.dart | 107 ------ .../create_review.data.gql.g.dart | 19 +- .../create_review.req.gql.g.dart | 8 +- .../__generated__/create_review.var.gql.dart | 67 +--- .../create_review.var.gql.g.dart | 73 +++- .../human_with_args.data.gql.g.dart | 16 +- .../human_with_args.req.gql.g.dart | 8 +- .../human_with_args.var.gql.dart | 46 +-- .../human_with_args.var.gql.g.dart | 52 ++- .../lib/variables/create_custom_field.graphql | 5 - .../test/operation/variables_test.dart | 27 +- .../test/schema/input_test.dart | 29 +- .../test/schema/scalars_test.dart | 30 +- 49 files changed, 992 insertions(+), 2157 deletions(-) delete mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.ast.gql.dart delete mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.dart delete mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.g.dart delete mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.dart delete mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.g.dart delete mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.dart delete mode 100644 codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.g.dart delete mode 100644 codegen/end_to_end_test/lib/variables/create_custom_field.graphql diff --git a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.data.gql.g.dart b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.data.gql.g.dart index 6d82d8a2..ed85bfb5 100644 --- a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.data.gql.g.dart @@ -253,12 +253,8 @@ class _$GAliasedHeroData extends GAliasedHeroData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, empireHero.hashCode); - _$hash = $jc(_$hash, jediHero.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc($jc(0, G__typename.hashCode), empireHero.hashCode), + jediHero.hashCode)); } @override @@ -398,13 +394,9 @@ class _$GAliasedHeroData_empireHero extends GAliasedHeroData_empireHero { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, from.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + from.hashCode)); } @override @@ -550,13 +542,9 @@ class _$GAliasedHeroData_jediHero extends GAliasedHeroData_jediHero { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, from.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + from.hashCode)); } @override @@ -650,4 +638,4 @@ class GAliasedHeroData_jediHeroBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.req.gql.g.dart b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.req.gql.g.dart index 3c44d30b..34ca12f5 100644 --- a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.req.gql.g.dart @@ -90,11 +90,7 @@ class _$GAliasedHero extends GAliasedHero { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); } @override @@ -171,4 +167,4 @@ class GAliasedHeroBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.dart b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.dart index bdaa5b89..fa90a01c 100644 --- a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.dart +++ b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.dart @@ -19,6 +19,8 @@ abstract class GAliasedHeroVars _$GAliasedHeroVars; _i1.GEpisode get ep; + static Serializer get serializer => + _$gAliasedHeroVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GAliasedHeroVars.serializer, this, @@ -28,48 +30,4 @@ abstract class GAliasedHeroVars GAliasedHeroVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GAliasedHeroVarsSerializer(); -} - -class GAliasedHeroVarsSerializer - extends StructuredSerializer { - final String wireName = 'GAliasedHeroVars'; - - final Iterable types = const [GAliasedHeroVars, _$GAliasedHeroVars]; - - Iterable serialize( - Serializers serializers, - GAliasedHeroVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - result.add('ep'); - result.add(serializers.serialize(object.ep, - specifiedType: const FullType(_i1.GEpisode))); - return result; - } - - GAliasedHeroVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GAliasedHeroVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'ep': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; - builder.ep = fieldValue; - break; - } - } - return builder.build(); - } } diff --git a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.g.dart b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.g.dart index eb6a4801..f40c47cc 100644 --- a/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/aliases/__generated__/aliased_hero.var.gql.g.dart @@ -6,6 +6,51 @@ part of 'aliased_hero.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** +Serializer _$gAliasedHeroVarsSerializer = + new _$GAliasedHeroVarsSerializer(); + +class _$GAliasedHeroVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [GAliasedHeroVars, _$GAliasedHeroVars]; + @override + final String wireName = 'GAliasedHeroVars'; + + @override + Iterable serialize(Serializers serializers, GAliasedHeroVars object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'ep', + serializers.serialize(object.ep, + specifiedType: const FullType(_i1.GEpisode)), + ]; + + return result; + } + + @override + GAliasedHeroVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GAliasedHeroVarsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'ep': + result.ep = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode))! as _i1.GEpisode; + break; + } + } + + return result.build(); + } +} + class _$GAliasedHeroVars extends GAliasedHeroVars { @override final _i1.GEpisode ep; @@ -34,10 +79,7 @@ class _$GAliasedHeroVars extends GAliasedHeroVars { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, ep.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, ep.hashCode)); } @override @@ -90,4 +132,4 @@ class GAliasedHeroVarsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.data.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.data.gql.g.dart index b5005f79..405b7551 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.data.gql.g.dart @@ -691,11 +691,7 @@ class _$GHeroWithFragmentsData extends GHeroWithFragmentsData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, hero.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), hero.hashCode)); } @override @@ -823,13 +819,10 @@ class _$GHeroWithFragmentsData_hero extends GHeroWithFragmentsData_hero { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, friendsConnection.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), + friendsConnection.hashCode), + name.hashCode)); } @override @@ -972,12 +965,8 @@ class _$GHeroWithFragmentsData_hero_friendsConnection @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, totalCount.hashCode); - _$hash = $jc(_$hash, edges.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc($jc(0, G__typename.hashCode), totalCount.hashCode), + edges.hashCode)); } @override @@ -1119,11 +1108,7 @@ class _$GHeroWithFragmentsData_hero_friendsConnection_edges @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, node.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), node.hashCode)); } @override @@ -1262,11 +1247,7 @@ class _$GHeroWithFragmentsData_hero_friendsConnection_edges_node @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); } @override @@ -1374,11 +1355,7 @@ class _$GheroDataData extends GheroDataData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); } @override @@ -1492,13 +1469,9 @@ class _$GcomparisonFieldsData extends GcomparisonFieldsData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, friendsConnection.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + friendsConnection.hashCode)); } @override @@ -1637,12 +1610,8 @@ class _$GcomparisonFieldsData_friendsConnection @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, totalCount.hashCode); - _$hash = $jc(_$hash, edges.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc($jc(0, G__typename.hashCode), totalCount.hashCode), + edges.hashCode)); } @override @@ -1776,11 +1745,7 @@ class _$GcomparisonFieldsData_friendsConnection_edges @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, node.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), node.hashCode)); } @override @@ -1914,11 +1879,7 @@ class _$GcomparisonFieldsData_friendsConnection_edges_node @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); } @override @@ -1989,4 +1950,4 @@ class GcomparisonFieldsData_friendsConnection_edges_nodeBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.req.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.req.gql.g.dart index 075810ea..2c956ffb 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.req.gql.g.dart @@ -96,11 +96,7 @@ class _$GHeroWithFragments extends GHeroWithFragments { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); } @override @@ -177,4 +173,4 @@ class GHeroWithFragmentsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.dart index c592193e..97d988ed 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.dart @@ -5,8 +5,7 @@ import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i2; -import 'package:gql_exec/value.dart' as _i1; + as _i1; part 'hero_with_fragments.var.gql.g.dart'; @@ -18,19 +17,18 @@ abstract class GHeroWithFragmentsVars [Function(GHeroWithFragmentsVarsBuilder b) updates]) = _$GHeroWithFragmentsVars; - _i1.Value? get first; - Map toJson() => (_i2.serializers.serializeWith( + int? get first; + static Serializer get serializer => + _$gHeroWithFragmentsVarsSerializer; + Map toJson() => (_i1.serializers.serializeWith( GHeroWithFragmentsVars.serializer, this, ) as Map); static GHeroWithFragmentsVars? fromJson(Map json) => - _i2.serializers.deserializeWith( + _i1.serializers.deserializeWith( GHeroWithFragmentsVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GHeroWithFragmentsVarsSerializer(); } abstract class GheroDataVars @@ -40,17 +38,16 @@ abstract class GheroDataVars factory GheroDataVars([Function(GheroDataVarsBuilder b) updates]) = _$GheroDataVars; - Map toJson() => (_i2.serializers.serializeWith( + static Serializer get serializer => _$gheroDataVarsSerializer; + Map toJson() => (_i1.serializers.serializeWith( GheroDataVars.serializer, this, ) as Map); static GheroDataVars? fromJson(Map json) => - _i2.serializers.deserializeWith( + _i1.serializers.deserializeWith( GheroDataVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => GheroDataVarsSerializer(); } abstract class GcomparisonFieldsVars @@ -61,144 +58,16 @@ abstract class GcomparisonFieldsVars [Function(GcomparisonFieldsVarsBuilder b) updates]) = _$GcomparisonFieldsVars; - _i1.Value? get first; - Map toJson() => (_i2.serializers.serializeWith( + int? get first; + static Serializer get serializer => + _$gcomparisonFieldsVarsSerializer; + Map toJson() => (_i1.serializers.serializeWith( GcomparisonFieldsVars.serializer, this, ) as Map); static GcomparisonFieldsVars? fromJson(Map json) => - _i2.serializers.deserializeWith( + _i1.serializers.deserializeWith( GcomparisonFieldsVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GcomparisonFieldsVarsSerializer(); -} - -class GHeroWithFragmentsVarsSerializer - extends StructuredSerializer { - final String wireName = 'GHeroWithFragmentsVars'; - - final Iterable types = const [ - GHeroWithFragmentsVars, - _$GHeroWithFragmentsVars - ]; - - Iterable serialize( - Serializers serializers, - GHeroWithFragmentsVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - final _$firstvalue = object.first; - if (_$firstvalue != null) { - result.add('first'); - result.add(serializers.serialize(_$firstvalue!.value, - specifiedType: const FullType(int))); - } - return result; - } - - GHeroWithFragmentsVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GHeroWithFragmentsVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'first': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; - builder.first = _i1.Value(fieldValue); - break; - } - } - return builder.build(); - } -} - -class GheroDataVarsSerializer extends StructuredSerializer { - final String wireName = 'GheroDataVars'; - - final Iterable types = const [GheroDataVars, _$GheroDataVars]; - - Iterable serialize( - Serializers serializers, - GheroDataVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - return result; - } - - GheroDataVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GheroDataVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - - } - } - return builder.build(); - } -} - -class GcomparisonFieldsVarsSerializer - extends StructuredSerializer { - final String wireName = 'GcomparisonFieldsVars'; - - final Iterable types = const [ - GcomparisonFieldsVars, - _$GcomparisonFieldsVars - ]; - - Iterable serialize( - Serializers serializers, - GcomparisonFieldsVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - final _$firstvalue = object.first; - if (_$firstvalue != null) { - result.add('first'); - result.add(serializers.serialize(_$firstvalue!.value, - specifiedType: const FullType(int))); - } - return result; - } - - GcomparisonFieldsVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GcomparisonFieldsVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'first': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; - builder.first = _i1.Value(fieldValue); - break; - } - } - return builder.build(); - } } diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart index 08041e98..f1550823 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart @@ -6,9 +6,132 @@ part of 'hero_with_fragments.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** +Serializer _$gHeroWithFragmentsVarsSerializer = + new _$GHeroWithFragmentsVarsSerializer(); +Serializer _$gheroDataVarsSerializer = + new _$GheroDataVarsSerializer(); +Serializer _$gcomparisonFieldsVarsSerializer = + new _$GcomparisonFieldsVarsSerializer(); + +class _$GHeroWithFragmentsVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GHeroWithFragmentsVars, + _$GHeroWithFragmentsVars + ]; + @override + final String wireName = 'GHeroWithFragmentsVars'; + + @override + Iterable serialize( + Serializers serializers, GHeroWithFragmentsVars object, + {FullType specifiedType = FullType.unspecified}) { + final result = []; + Object? value; + value = object.first; + if (value != null) { + result + ..add('first') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + return result; + } + + @override + GHeroWithFragmentsVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GHeroWithFragmentsVarsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'first': + result.first = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + } + } + + return result.build(); + } +} + +class _$GheroDataVarsSerializer implements StructuredSerializer { + @override + final Iterable types = const [GheroDataVars, _$GheroDataVars]; + @override + final String wireName = 'GheroDataVars'; + + @override + Iterable serialize(Serializers serializers, GheroDataVars object, + {FullType specifiedType = FullType.unspecified}) { + return []; + } + + @override + GheroDataVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + return new GheroDataVarsBuilder().build(); + } +} + +class _$GcomparisonFieldsVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GcomparisonFieldsVars, + _$GcomparisonFieldsVars + ]; + @override + final String wireName = 'GcomparisonFieldsVars'; + + @override + Iterable serialize( + Serializers serializers, GcomparisonFieldsVars object, + {FullType specifiedType = FullType.unspecified}) { + final result = []; + Object? value; + value = object.first; + if (value != null) { + result + ..add('first') + ..add(serializers.serialize(value, specifiedType: const FullType(int))); + } + return result; + } + + @override + GcomparisonFieldsVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GcomparisonFieldsVarsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'first': + result.first = serializers.deserialize(value, + specifiedType: const FullType(int)) as int?; + break; + } + } + + return result.build(); + } +} + class _$GHeroWithFragmentsVars extends GHeroWithFragmentsVars { @override - final _i1.Value? first; + final int? first; factory _$GHeroWithFragmentsVars( [void Function(GHeroWithFragmentsVarsBuilder)? updates]) => @@ -33,10 +156,7 @@ class _$GHeroWithFragmentsVars extends GHeroWithFragmentsVars { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, first.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, first.hashCode)); } @override @@ -51,9 +171,9 @@ class GHeroWithFragmentsVarsBuilder implements Builder { _$GHeroWithFragmentsVars? _$v; - _i1.Value? _first; - _i1.Value? get first => _$this._first; - set first(_i1.Value? first) => _$this._first = first; + int? _first; + int? get first => _$this._first; + set first(int? first) => _$this._first = first; GHeroWithFragmentsVarsBuilder(); @@ -146,7 +266,7 @@ class GheroDataVarsBuilder class _$GcomparisonFieldsVars extends GcomparisonFieldsVars { @override - final _i1.Value? first; + final int? first; factory _$GcomparisonFieldsVars( [void Function(GcomparisonFieldsVarsBuilder)? updates]) => @@ -171,10 +291,7 @@ class _$GcomparisonFieldsVars extends GcomparisonFieldsVars { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, first.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, first.hashCode)); } @override @@ -189,9 +306,9 @@ class GcomparisonFieldsVarsBuilder implements Builder { _$GcomparisonFieldsVars? _$v; - _i1.Value? _first; - _i1.Value? get first => _$this._first; - set first(_i1.Value? first) => _$this._first = first; + int? _first; + int? get first => _$this._first; + set first(int? first) => _$this._first = first; GcomparisonFieldsVarsBuilder(); @@ -225,4 +342,4 @@ class GcomparisonFieldsVarsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.data.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.data.gql.g.dart index 20c08793..c19d7668 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.data.gql.g.dart @@ -919,11 +919,7 @@ class _$GHeroWithInterfaceSubTypedFragmentsData @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, hero.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), hero.hashCode)); } @override @@ -1056,12 +1052,8 @@ class _$GHeroWithInterfaceSubTypedFragmentsData_hero @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode)); } @override @@ -1181,12 +1173,8 @@ class _$GheroFieldsFragmentData__base extends GheroFieldsFragmentData__base { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode)); } @override @@ -1314,14 +1302,10 @@ class _$GheroFieldsFragmentData__asHuman @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, homePlanet.hashCode); - _$hash = $jc(_$hash, friends.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + homePlanet.hashCode), + friends.hashCode)); } @override @@ -1465,10 +1449,7 @@ class _$GheroFieldsFragmentData__asHuman_friends__base @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, G__typename.hashCode)); } @override @@ -1588,13 +1569,9 @@ class _$GheroFieldsFragmentData__asHuman_friends__asDroid @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, primaryFunction.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + primaryFunction.hashCode)); } @override @@ -1738,13 +1715,9 @@ class _$GheroFieldsFragmentData__asHuman_friends__asHuman @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, homePlanet.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + homePlanet.hashCode)); } @override @@ -1880,13 +1853,9 @@ class _$GheroFieldsFragmentData__asDroid @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, primaryFunction.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + primaryFunction.hashCode)); } @override @@ -2007,12 +1976,8 @@ class _$GhumanFieldsFragmentData extends GhumanFieldsFragmentData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, homePlanet.hashCode); - _$hash = $jc(_$hash, friends.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc($jc(0, G__typename.hashCode), homePlanet.hashCode), + friends.hashCode)); } @override @@ -2134,10 +2099,7 @@ class _$GhumanFieldsFragmentData_friends__base @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, G__typename.hashCode)); } @override @@ -2250,13 +2212,9 @@ class _$GhumanFieldsFragmentData_friends__asDroid @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, primaryFunction.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + primaryFunction.hashCode)); } @override @@ -2394,13 +2352,9 @@ class _$GhumanFieldsFragmentData_friends__asHuman @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, homePlanet.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode), + homePlanet.hashCode)); } @override @@ -2520,11 +2474,7 @@ class _$GdroidFieldsFragmentData extends GdroidFieldsFragmentData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, primaryFunction.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), primaryFunction.hashCode)); } @override @@ -2589,4 +2539,4 @@ class GdroidFieldsFragmentDataBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.req.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.req.gql.g.dart index 39a20488..b33b976f 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.req.gql.g.dart @@ -107,11 +107,7 @@ class _$GHeroWithInterfaceSubTypedFragments @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); } @override @@ -194,4 +190,4 @@ class GHeroWithInterfaceSubTypedFragmentsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.dart index 265403cb..5993ed7d 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.dart @@ -22,6 +22,8 @@ abstract class GHeroWithInterfaceSubTypedFragmentsVars updates]) = _$GHeroWithInterfaceSubTypedFragmentsVars; _i1.GEpisode get episode; + static Serializer get serializer => + _$gHeroWithInterfaceSubTypedFragmentsVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GHeroWithInterfaceSubTypedFragmentsVars.serializer, this, @@ -32,9 +34,6 @@ abstract class GHeroWithInterfaceSubTypedFragmentsVars GHeroWithInterfaceSubTypedFragmentsVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GHeroWithInterfaceSubTypedFragmentsVarsSerializer(); } abstract class GheroFieldsFragmentVars @@ -45,6 +44,8 @@ abstract class GheroFieldsFragmentVars [Function(GheroFieldsFragmentVarsBuilder b) updates]) = _$GheroFieldsFragmentVars; + static Serializer get serializer => + _$gheroFieldsFragmentVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GheroFieldsFragmentVars.serializer, this, @@ -54,9 +55,6 @@ abstract class GheroFieldsFragmentVars GheroFieldsFragmentVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GheroFieldsFragmentVarsSerializer(); } abstract class GhumanFieldsFragmentVars @@ -68,6 +66,8 @@ abstract class GhumanFieldsFragmentVars [Function(GhumanFieldsFragmentVarsBuilder b) updates]) = _$GhumanFieldsFragmentVars; + static Serializer get serializer => + _$ghumanFieldsFragmentVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GhumanFieldsFragmentVars.serializer, this, @@ -77,9 +77,6 @@ abstract class GhumanFieldsFragmentVars GhumanFieldsFragmentVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GhumanFieldsFragmentVarsSerializer(); } abstract class GdroidFieldsFragmentVars @@ -91,6 +88,8 @@ abstract class GdroidFieldsFragmentVars [Function(GdroidFieldsFragmentVarsBuilder b) updates]) = _$GdroidFieldsFragmentVars; + static Serializer get serializer => + _$gdroidFieldsFragmentVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GdroidFieldsFragmentVars.serializer, this, @@ -100,162 +99,4 @@ abstract class GdroidFieldsFragmentVars GdroidFieldsFragmentVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GdroidFieldsFragmentVarsSerializer(); -} - -class GHeroWithInterfaceSubTypedFragmentsVarsSerializer - extends StructuredSerializer { - final String wireName = 'GHeroWithInterfaceSubTypedFragmentsVars'; - - final Iterable types = const [ - GHeroWithInterfaceSubTypedFragmentsVars, - _$GHeroWithInterfaceSubTypedFragmentsVars - ]; - - Iterable serialize( - Serializers serializers, - GHeroWithInterfaceSubTypedFragmentsVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - result.add('episode'); - result.add(serializers.serialize(object.episode, - specifiedType: const FullType(_i1.GEpisode))); - return result; - } - - GHeroWithInterfaceSubTypedFragmentsVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GHeroWithInterfaceSubTypedFragmentsVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'episode': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; - builder.episode = fieldValue; - break; - } - } - return builder.build(); - } -} - -class GheroFieldsFragmentVarsSerializer - extends StructuredSerializer { - final String wireName = 'GheroFieldsFragmentVars'; - - final Iterable types = const [ - GheroFieldsFragmentVars, - _$GheroFieldsFragmentVars - ]; - - Iterable serialize( - Serializers serializers, - GheroFieldsFragmentVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - return result; - } - - GheroFieldsFragmentVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GheroFieldsFragmentVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - - } - } - return builder.build(); - } -} - -class GhumanFieldsFragmentVarsSerializer - extends StructuredSerializer { - final String wireName = 'GhumanFieldsFragmentVars'; - - final Iterable types = const [ - GhumanFieldsFragmentVars, - _$GhumanFieldsFragmentVars - ]; - - Iterable serialize( - Serializers serializers, - GhumanFieldsFragmentVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - return result; - } - - GhumanFieldsFragmentVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GhumanFieldsFragmentVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - - } - } - return builder.build(); - } -} - -class GdroidFieldsFragmentVarsSerializer - extends StructuredSerializer { - final String wireName = 'GdroidFieldsFragmentVars'; - - final Iterable types = const [ - GdroidFieldsFragmentVars, - _$GdroidFieldsFragmentVars - ]; - - Iterable serialize( - Serializers serializers, - GdroidFieldsFragmentVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - return result; - } - - GdroidFieldsFragmentVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GdroidFieldsFragmentVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - - } - } - return builder.build(); - } } diff --git a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.g.dart b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.g.dart index 0689f5b4..039e22cd 100644 --- a/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/fragments/__generated__/hero_with_interface_subtyped_fragments.var.gql.g.dart @@ -6,6 +6,137 @@ part of 'hero_with_interface_subtyped_fragments.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** +Serializer + _$gHeroWithInterfaceSubTypedFragmentsVarsSerializer = + new _$GHeroWithInterfaceSubTypedFragmentsVarsSerializer(); +Serializer _$gheroFieldsFragmentVarsSerializer = + new _$GheroFieldsFragmentVarsSerializer(); +Serializer _$ghumanFieldsFragmentVarsSerializer = + new _$GhumanFieldsFragmentVarsSerializer(); +Serializer _$gdroidFieldsFragmentVarsSerializer = + new _$GdroidFieldsFragmentVarsSerializer(); + +class _$GHeroWithInterfaceSubTypedFragmentsVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GHeroWithInterfaceSubTypedFragmentsVars, + _$GHeroWithInterfaceSubTypedFragmentsVars + ]; + @override + final String wireName = 'GHeroWithInterfaceSubTypedFragmentsVars'; + + @override + Iterable serialize( + Serializers serializers, GHeroWithInterfaceSubTypedFragmentsVars object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'episode', + serializers.serialize(object.episode, + specifiedType: const FullType(_i1.GEpisode)), + ]; + + return result; + } + + @override + GHeroWithInterfaceSubTypedFragmentsVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GHeroWithInterfaceSubTypedFragmentsVarsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'episode': + result.episode = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode))! as _i1.GEpisode; + break; + } + } + + return result.build(); + } +} + +class _$GheroFieldsFragmentVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GheroFieldsFragmentVars, + _$GheroFieldsFragmentVars + ]; + @override + final String wireName = 'GheroFieldsFragmentVars'; + + @override + Iterable serialize( + Serializers serializers, GheroFieldsFragmentVars object, + {FullType specifiedType = FullType.unspecified}) { + return []; + } + + @override + GheroFieldsFragmentVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + return new GheroFieldsFragmentVarsBuilder().build(); + } +} + +class _$GhumanFieldsFragmentVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GhumanFieldsFragmentVars, + _$GhumanFieldsFragmentVars + ]; + @override + final String wireName = 'GhumanFieldsFragmentVars'; + + @override + Iterable serialize( + Serializers serializers, GhumanFieldsFragmentVars object, + {FullType specifiedType = FullType.unspecified}) { + return []; + } + + @override + GhumanFieldsFragmentVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + return new GhumanFieldsFragmentVarsBuilder().build(); + } +} + +class _$GdroidFieldsFragmentVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GdroidFieldsFragmentVars, + _$GdroidFieldsFragmentVars + ]; + @override + final String wireName = 'GdroidFieldsFragmentVars'; + + @override + Iterable serialize( + Serializers serializers, GdroidFieldsFragmentVars object, + {FullType specifiedType = FullType.unspecified}) { + return []; + } + + @override + GdroidFieldsFragmentVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + return new GdroidFieldsFragmentVarsBuilder().build(); + } +} + class _$GHeroWithInterfaceSubTypedFragmentsVars extends GHeroWithInterfaceSubTypedFragmentsVars { @override @@ -42,10 +173,7 @@ class _$GHeroWithInterfaceSubTypedFragmentsVars @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, episode.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, episode.hashCode)); } @override @@ -286,4 +414,4 @@ class GdroidFieldsFragmentVarsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/schema.ast.gql.dart b/codegen/end_to_end_test/lib/graphql/__generated__/schema.ast.gql.dart index 6fe4a9a0..118f4e7a 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/schema.ast.gql.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/schema.ast.gql.dart @@ -226,26 +226,7 @@ const Mutation = _i1.ObjectTypeDefinitionNode( name: _i1.NameNode(value: 'Review'), isNonNull: false, ), - ), - _i1.FieldDefinitionNode( - name: _i1.NameNode(value: 'createCustomField'), - directives: [], - args: [ - _i1.InputValueDefinitionNode( - name: _i1.NameNode(value: 'input'), - directives: [], - type: _i1.NamedTypeNode( - name: _i1.NameNode(value: 'CustomFieldInput'), - isNonNull: true, - ), - defaultValue: null, - ) - ], - type: _i1.NamedTypeNode( - name: _i1.NameNode(value: 'CustomField'), - isNonNull: false, - ), - ), + ) ], ); const Subscription = _i1.ObjectTypeDefinitionNode( @@ -834,30 +815,6 @@ const ReviewInput = _i1.InputObjectTypeDefinitionNode( ), ], ); -const CustomFieldInput = _i1.InputObjectTypeDefinitionNode( - name: _i1.NameNode(value: 'CustomFieldInput'), - directives: [], - fields: [ - _i1.InputValueDefinitionNode( - name: _i1.NameNode(value: 'id'), - directives: [], - type: _i1.NamedTypeNode( - name: _i1.NameNode(value: 'ID'), - isNonNull: true, - ), - defaultValue: null, - ), - _i1.InputValueDefinitionNode( - name: _i1.NameNode(value: 'customField'), - directives: [], - type: _i1.NamedTypeNode( - name: _i1.NameNode(value: 'CustomField'), - isNonNull: false, - ), - defaultValue: null, - ), - ], -); const ColorInput = _i1.InputObjectTypeDefinitionNode( name: _i1.NameNode(value: 'ColorInput'), directives: [], @@ -996,7 +953,6 @@ const document = _i1.DocumentNode(definitions: [ PageInfo, Review, ReviewInput, - CustomFieldInput, ColorInput, Starship, SearchResult, diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.dart b/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.dart index db2526ce..a84cdbf5 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.dart @@ -5,12 +5,10 @@ import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; -import 'package:end_to_end_test/custom_field.dart' as _i2; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i3; + as _i1; import 'package:gql_code_builder/src/serializers/default_scalar_serializer.dart' - as _i4; -import 'package:gql_exec/value.dart' as _i1; + as _i2; part 'schema.schema.gql.g.dart'; @@ -52,171 +50,19 @@ abstract class GReviewInput _$GReviewInput; int get stars; - _i1.Value? get commentary; - _i1.Value? get favorite_color; - _i1.Value>? get seenOn; - Map toJson() => (_i3.serializers.serializeWith( + String? get commentary; + GColorInput? get favorite_color; + BuiltList? get seenOn; + static Serializer get serializer => _$gReviewInputSerializer; + Map toJson() => (_i1.serializers.serializeWith( GReviewInput.serializer, this, ) as Map); static GReviewInput? fromJson(Map json) => - _i3.serializers.deserializeWith( + _i1.serializers.deserializeWith( GReviewInput.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => GReviewInputSerializer(); -} - -class GReviewInputSerializer extends StructuredSerializer { - final String wireName = 'GReviewInput'; - - final Iterable types = const [GReviewInput, _$GReviewInput]; - - Iterable serialize( - Serializers serializers, - GReviewInput object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - result.add('stars'); - result.add(serializers.serialize(object.stars, - specifiedType: const FullType(int))); - final _$commentaryvalue = object.commentary; - if (_$commentaryvalue != null) { - result.add('commentary'); - result.add(serializers.serialize(_$commentaryvalue!.value, - specifiedType: const FullType(String))); - } - final _$favorite_colorvalue = object.favorite_color; - if (_$favorite_colorvalue != null) { - result.add('favorite_color'); - result.add(serializers.serialize(_$favorite_colorvalue!.value, - specifiedType: const FullType(GColorInput))); - } - final _$seenOnvalue = object.seenOn; - if (_$seenOnvalue != null) { - result.add('seenOn'); - result.add(serializers.serialize(_$seenOnvalue!.value, - specifiedType: const FullType(BuiltList, [FullType(DateTime)]))); - } - return result; - } - - GReviewInput deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GReviewInputBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'stars': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; - builder.stars = fieldValue; - break; - case 'commentary': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - builder.commentary = _i1.Value(fieldValue); - break; - case 'favorite_color': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(GColorInput)) as GColorInput; - builder.favorite_color = _i1.Value(fieldValue); - break; - case 'seenOn': - var fieldValue = serializers.deserialize(value, - specifiedType: - const FullType(BuiltList, [FullType(DateTime)])) - as BuiltList; - builder.seenOn = _i1.Value(fieldValue); - break; - } - } - return builder.build(); - } -} - -abstract class GCustomFieldInput - implements Built { - GCustomFieldInput._(); - - factory GCustomFieldInput([Function(GCustomFieldInputBuilder b) updates]) = - _$GCustomFieldInput; - - String get id; - _i1.Value<_i2.CustomField>? get customField; - Map toJson() => (_i3.serializers.serializeWith( - GCustomFieldInput.serializer, - this, - ) as Map); - static GCustomFieldInput? fromJson(Map json) => - _i3.serializers.deserializeWith( - GCustomFieldInput.serializer, - json, - ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GCustomFieldInputSerializer(); -} - -class GCustomFieldInputSerializer - extends StructuredSerializer { - final String wireName = 'GCustomFieldInput'; - - final Iterable types = const [GCustomFieldInput, _$GCustomFieldInput]; - - Iterable serialize( - Serializers serializers, - GCustomFieldInput object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - result.add('id'); - result.add(serializers.serialize(object.id, - specifiedType: const FullType(String))); - final _$customFieldvalue = object.customField; - if (_$customFieldvalue != null) { - result.add('customField'); - result.add(serializers.serialize(_$customFieldvalue!.value, - specifiedType: const FullType(_i2.CustomField))); - } - return result; - } - - GCustomFieldInput deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GCustomFieldInputBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'id': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - builder.id = fieldValue; - break; - case 'customField': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i2.CustomField)) - as _i2.CustomField; - builder.customField = _i1.Value(fieldValue); - break; - } - } - return builder.build(); - } } abstract class GColorInput implements Built { @@ -227,73 +73,16 @@ abstract class GColorInput implements Built { int get red; int get green; int get blue; - Map toJson() => (_i3.serializers.serializeWith( + static Serializer get serializer => _$gColorInputSerializer; + Map toJson() => (_i1.serializers.serializeWith( GColorInput.serializer, this, ) as Map); static GColorInput? fromJson(Map json) => - _i3.serializers.deserializeWith( + _i1.serializers.deserializeWith( GColorInput.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => GColorInputSerializer(); -} - -class GColorInputSerializer extends StructuredSerializer { - final String wireName = 'GColorInput'; - - final Iterable types = const [GColorInput, _$GColorInput]; - - Iterable serialize( - Serializers serializers, - GColorInput object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - result.add('red'); - result.add( - serializers.serialize(object.red, specifiedType: const FullType(int))); - result.add('green'); - result.add(serializers.serialize(object.green, - specifiedType: const FullType(int))); - result.add('blue'); - result.add( - serializers.serialize(object.blue, specifiedType: const FullType(int))); - return result; - } - - GColorInput deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GColorInputBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'red': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; - builder.red = fieldValue; - break; - case 'green': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; - builder.green = fieldValue; - break; - case 'blue': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(int)) as int; - builder.blue = fieldValue; - break; - } - } - return builder.build(); - } } abstract class GISODate implements Built { @@ -305,7 +94,7 @@ abstract class GISODate implements Built { String get value; @BuiltValueSerializer(custom: true) static Serializer get serializer => - _i4.DefaultScalarSerializer( + _i2.DefaultScalarSerializer( (Object serialized) => GISODate((serialized as String?))); } diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.g.dart b/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.g.dart index c906df68..9a393483 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.g.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/schema.schema.gql.g.dart @@ -52,6 +52,9 @@ final BuiltSet _$gLengthUnitValues = Serializer _$gEpisodeSerializer = new _$GEpisodeSerializer(); Serializer _$gLengthUnitSerializer = new _$GLengthUnitSerializer(); +Serializer _$gReviewInputSerializer = + new _$GReviewInputSerializer(); +Serializer _$gColorInputSerializer = new _$GColorInputSerializer(); class _$GEpisodeSerializer implements PrimitiveSerializer { @override @@ -95,15 +98,142 @@ class _$GLengthUnitSerializer implements PrimitiveSerializer { _fromWire[serialized] ?? (serialized is String ? serialized : '')); } +class _$GReviewInputSerializer implements StructuredSerializer { + @override + final Iterable types = const [GReviewInput, _$GReviewInput]; + @override + final String wireName = 'GReviewInput'; + + @override + Iterable serialize(Serializers serializers, GReviewInput object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'stars', + serializers.serialize(object.stars, specifiedType: const FullType(int)), + ]; + Object? value; + value = object.commentary; + if (value != null) { + result + ..add('commentary') + ..add(serializers.serialize(value, + specifiedType: const FullType(String))); + } + value = object.favorite_color; + if (value != null) { + result + ..add('favorite_color') + ..add(serializers.serialize(value, + specifiedType: const FullType(GColorInput))); + } + value = object.seenOn; + if (value != null) { + result + ..add('seenOn') + ..add(serializers.serialize(value, + specifiedType: const FullType( + BuiltList, const [const FullType.nullable(DateTime)]))); + } + return result; + } + + @override + GReviewInput deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GReviewInputBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'stars': + result.stars = serializers.deserialize(value, + specifiedType: const FullType(int))! as int; + break; + case 'commentary': + result.commentary = serializers.deserialize(value, + specifiedType: const FullType(String)) as String?; + break; + case 'favorite_color': + result.favorite_color.replace(serializers.deserialize(value, + specifiedType: const FullType(GColorInput))! as GColorInput); + break; + case 'seenOn': + result.seenOn.replace(serializers.deserialize(value, + specifiedType: const FullType( + BuiltList, const [const FullType.nullable(DateTime)]))! + as BuiltList); + break; + } + } + + return result.build(); + } +} + +class _$GColorInputSerializer implements StructuredSerializer { + @override + final Iterable types = const [GColorInput, _$GColorInput]; + @override + final String wireName = 'GColorInput'; + + @override + Iterable serialize(Serializers serializers, GColorInput object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'red', + serializers.serialize(object.red, specifiedType: const FullType(int)), + 'green', + serializers.serialize(object.green, specifiedType: const FullType(int)), + 'blue', + serializers.serialize(object.blue, specifiedType: const FullType(int)), + ]; + + return result; + } + + @override + GColorInput deserialize(Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GColorInputBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'red': + result.red = serializers.deserialize(value, + specifiedType: const FullType(int))! as int; + break; + case 'green': + result.green = serializers.deserialize(value, + specifiedType: const FullType(int))! as int; + break; + case 'blue': + result.blue = serializers.deserialize(value, + specifiedType: const FullType(int))! as int; + break; + } + } + + return result.build(); + } +} + class _$GReviewInput extends GReviewInput { @override final int stars; @override - final _i1.Value? commentary; + final String? commentary; @override - final _i1.Value? favorite_color; + final GColorInput? favorite_color; @override - final _i1.Value>? seenOn; + final BuiltList? seenOn; factory _$GReviewInput([void Function(GReviewInputBuilder)? updates]) => (new GReviewInputBuilder()..update(updates))._build(); @@ -133,13 +263,10 @@ class _$GReviewInput extends GReviewInput { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, stars.hashCode); - _$hash = $jc(_$hash, commentary.hashCode); - _$hash = $jc(_$hash, favorite_color.hashCode); - _$hash = $jc(_$hash, seenOn.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, stars.hashCode), commentary.hashCode), + favorite_color.hashCode), + seenOn.hashCode)); } @override @@ -161,20 +288,20 @@ class GReviewInputBuilder int? get stars => _$this._stars; set stars(int? stars) => _$this._stars = stars; - _i1.Value? _commentary; - _i1.Value? get commentary => _$this._commentary; - set commentary(_i1.Value? commentary) => - _$this._commentary = commentary; + String? _commentary; + String? get commentary => _$this._commentary; + set commentary(String? commentary) => _$this._commentary = commentary; - _i1.Value? _favorite_color; - _i1.Value? get favorite_color => _$this._favorite_color; - set favorite_color(_i1.Value? favorite_color) => + GColorInputBuilder? _favorite_color; + GColorInputBuilder get favorite_color => + _$this._favorite_color ??= new GColorInputBuilder(); + set favorite_color(GColorInputBuilder? favorite_color) => _$this._favorite_color = favorite_color; - _i1.Value>? _seenOn; - _i1.Value>? get seenOn => _$this._seenOn; - set seenOn(_i1.Value>? seenOn) => - _$this._seenOn = seenOn; + ListBuilder? _seenOn; + ListBuilder get seenOn => + _$this._seenOn ??= new ListBuilder(); + set seenOn(ListBuilder? seenOn) => _$this._seenOn = seenOn; GReviewInputBuilder(); @@ -183,8 +310,8 @@ class GReviewInputBuilder if ($v != null) { _stars = $v.stars; _commentary = $v.commentary; - _favorite_color = $v.favorite_color; - _seenOn = $v.seenOn; + _favorite_color = $v.favorite_color?.toBuilder(); + _seenOn = $v.seenOn?.toBuilder(); _$v = null; } return this; @@ -205,111 +332,28 @@ class GReviewInputBuilder GReviewInput build() => _build(); _$GReviewInput _build() { - final _$result = _$v ?? - new _$GReviewInput._( - stars: BuiltValueNullFieldError.checkNotNull( - stars, r'GReviewInput', 'stars'), - commentary: commentary, - favorite_color: favorite_color, - seenOn: seenOn); - replace(_$result); - return _$result; - } -} - -class _$GCustomFieldInput extends GCustomFieldInput { - @override - final String id; - @override - final _i1.Value<_i2.CustomField>? customField; - - factory _$GCustomFieldInput( - [void Function(GCustomFieldInputBuilder)? updates]) => - (new GCustomFieldInputBuilder()..update(updates))._build(); - - _$GCustomFieldInput._({required this.id, this.customField}) : super._() { - BuiltValueNullFieldError.checkNotNull(id, r'GCustomFieldInput', 'id'); - } - - @override - GCustomFieldInput rebuild(void Function(GCustomFieldInputBuilder) updates) => - (toBuilder()..update(updates)).build(); - - @override - GCustomFieldInputBuilder toBuilder() => - new GCustomFieldInputBuilder()..replace(this); - - @override - bool operator ==(Object other) { - if (identical(other, this)) return true; - return other is GCustomFieldInput && - id == other.id && - customField == other.customField; - } - - @override - int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, customField.hashCode); - _$hash = $jf(_$hash); - return _$hash; - } - - @override - String toString() { - return (newBuiltValueToStringHelper(r'GCustomFieldInput') - ..add('id', id) - ..add('customField', customField)) - .toString(); - } -} - -class GCustomFieldInputBuilder - implements Builder { - _$GCustomFieldInput? _$v; - - String? _id; - String? get id => _$this._id; - set id(String? id) => _$this._id = id; - - _i1.Value<_i2.CustomField>? _customField; - _i1.Value<_i2.CustomField>? get customField => _$this._customField; - set customField(_i1.Value<_i2.CustomField>? customField) => - _$this._customField = customField; - - GCustomFieldInputBuilder(); - - GCustomFieldInputBuilder get _$this { - final $v = _$v; - if ($v != null) { - _id = $v.id; - _customField = $v.customField; - _$v = null; + _$GReviewInput _$result; + try { + _$result = _$v ?? + new _$GReviewInput._( + stars: BuiltValueNullFieldError.checkNotNull( + stars, r'GReviewInput', 'stars'), + commentary: commentary, + favorite_color: _favorite_color?.build(), + seenOn: _seenOn?.build()); + } catch (_) { + late String _$failedField; + try { + _$failedField = 'favorite_color'; + _favorite_color?.build(); + _$failedField = 'seenOn'; + _seenOn?.build(); + } catch (e) { + throw new BuiltValueNestedFieldError( + r'GReviewInput', _$failedField, e.toString()); + } + rethrow; } - return this; - } - - @override - void replace(GCustomFieldInput other) { - ArgumentError.checkNotNull(other, 'other'); - _$v = other as _$GCustomFieldInput; - } - - @override - void update(void Function(GCustomFieldInputBuilder)? updates) { - if (updates != null) updates(this); - } - - @override - GCustomFieldInput build() => _build(); - - _$GCustomFieldInput _build() { - final _$result = _$v ?? - new _$GCustomFieldInput._( - id: BuiltValueNullFieldError.checkNotNull( - id, r'GCustomFieldInput', 'id'), - customField: customField); replace(_$result); return _$result; } @@ -351,12 +395,7 @@ class _$GColorInput extends GColorInput { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, red.hashCode); - _$hash = $jc(_$hash, green.hashCode); - _$hash = $jc(_$hash, blue.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc($jc(0, red.hashCode), green.hashCode), blue.hashCode)); } @override @@ -451,10 +490,7 @@ class _$GISODate extends GISODate { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, value.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, value.hashCode)); } @override @@ -506,4 +542,4 @@ class GISODateBuilder implements Builder { } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.dart b/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.dart index 75eee6b9..28626ae9 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.dart @@ -57,13 +57,7 @@ import 'package:end_to_end_test/fragments/__generated__/hero_with_interface_subt GheroFieldsFragmentVars, GhumanFieldsFragmentVars; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart' - show - GColorInput, - GCustomFieldInput, - GEpisode, - GISODate, - GLengthUnit, - GReviewInput; + show GColorInput, GEpisode, GISODate, GLengthUnit, GReviewInput; import 'package:end_to_end_test/interfaces/__generated__/hero_for_episode.data.gql.dart' show GHeroForEpisodeData_hero, @@ -89,12 +83,6 @@ import 'package:end_to_end_test/scalars/__generated__/review_with_date.req.gql.d show GReviewWithDate; import 'package:end_to_end_test/scalars/__generated__/review_with_date.var.gql.dart' show GReviewWithDateVars; -import 'package:end_to_end_test/variables/__generated__/create_custom_field.data.gql.dart' - show GCreateCustomFieldData; -import 'package:end_to_end_test/variables/__generated__/create_custom_field.req.gql.dart' - show GCreateCustomField; -import 'package:end_to_end_test/variables/__generated__/create_custom_field.var.gql.dart' - show GCreateCustomFieldVars; import 'package:end_to_end_test/variables/__generated__/create_review.data.gql.dart' show GCreateReviewData, GCreateReviewData_createReview; import 'package:end_to_end_test/variables/__generated__/create_review.req.gql.dart' @@ -128,14 +116,10 @@ final SerializersBuilder _serializersBuilder = _$serializers.toBuilder() GAliasedHeroData_jediHero, GAliasedHeroVars, GColorInput, - GCreateCustomField, - GCreateCustomFieldData, - GCreateCustomFieldVars, GCreateReview, GCreateReviewData, GCreateReviewData_createReview, GCreateReviewVars, - GCustomFieldInput, GDroidFragmentData, GDroidFragmentVars, GEpisode, diff --git a/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.g.dart b/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.g.dart index fe1d753a..4a6a2114 100644 --- a/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.g.dart +++ b/codegen/end_to_end_test/lib/graphql/__generated__/serializers.gql.g.dart @@ -13,14 +13,10 @@ Serializers _$serializers = (new Serializers().toBuilder() ..add(GAliasedHeroData_jediHero.serializer) ..add(GAliasedHeroVars.serializer) ..add(GColorInput.serializer) - ..add(GCreateCustomField.serializer) - ..add(GCreateCustomFieldData.serializer) - ..add(GCreateCustomFieldVars.serializer) ..add(GCreateReview.serializer) ..add(GCreateReviewData.serializer) ..add(GCreateReviewData_createReview.serializer) ..add(GCreateReviewVars.serializer) - ..add(GCustomFieldInput.serializer) ..add(GDroidFragmentData.serializer) ..add(GDroidFragmentVars.serializer) ..add(GEpisode.serializer) @@ -84,6 +80,9 @@ Serializers _$serializers = (new Serializers().toBuilder() ..addBuilderFactory( const FullType(BuiltList, const [const FullType(CustomField)]), () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType.nullable(DateTime)]), + () => new ListBuilder()) ..addBuilderFactory( const FullType(BuiltList, const [const FullType.nullable(GEpisode)]), () => new ListBuilder()) @@ -126,4 +125,4 @@ Serializers _$serializers = (new Serializers().toBuilder() () => new ListBuilder())) .build(); -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/graphql/schema.graphql b/codegen/end_to_end_test/lib/graphql/schema.graphql index bcd72c20..c95faa8f 100644 --- a/codegen/end_to_end_test/lib/graphql/schema.graphql +++ b/codegen/end_to_end_test/lib/graphql/schema.graphql @@ -23,7 +23,6 @@ type Query { # The mutation type, represents all updates we can make to our data type Mutation { createReview(episode: Episode, review: ReviewInput!, createdAt: Date): Review - createCustomField(input: CustomFieldInput!): CustomField } # The subscription type, represents all subscriptions we can make to our data @@ -158,11 +157,6 @@ input ReviewInput { seenOn: [Date] } -input CustomFieldInput { - id: ID! - customField: CustomField -} - # The input object sent when passing in a color input ColorInput { red: Int! diff --git a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.data.gql.g.dart b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.data.gql.g.dart index ee58bc38..3fa28c16 100644 --- a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.data.gql.g.dart @@ -419,11 +419,7 @@ class _$GHeroForEpisodeData extends GHeroForEpisodeData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, hero.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), hero.hashCode)); } @override @@ -527,12 +523,8 @@ class _$GHeroForEpisodeData_hero__base extends GHeroForEpisodeData_hero__base { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, friends.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc(0, G__typename.hashCode), name.hashCode), friends.hashCode)); } @override @@ -663,11 +655,7 @@ class _$GHeroForEpisodeData_hero__base_friends @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); } @override @@ -784,13 +772,9 @@ class _$GHeroForEpisodeData_hero__asDroid @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, friends.hashCode); - _$hash = $jc(_$hash, primaryFunction.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), name.hashCode), friends.hashCode), + primaryFunction.hashCode)); } @override @@ -931,11 +915,7 @@ class _$GHeroForEpisodeData_hero__asDroid_friends @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), name.hashCode)); } @override @@ -1039,11 +1019,7 @@ class _$GDroidFragmentData extends GDroidFragmentData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, primaryFunction.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), primaryFunction.hashCode)); } @override @@ -1107,4 +1083,4 @@ class GDroidFragmentDataBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.req.gql.g.dart b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.req.gql.g.dart index fbeddc86..62c43d0e 100644 --- a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.req.gql.g.dart @@ -93,11 +93,7 @@ class _$GHeroForEpisode extends GHeroForEpisode { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); } @override @@ -174,4 +170,4 @@ class GHeroForEpisodeBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.dart b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.dart index 28c7d976..940f6b8c 100644 --- a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.dart +++ b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.dart @@ -19,6 +19,8 @@ abstract class GHeroForEpisodeVars [Function(GHeroForEpisodeVarsBuilder b) updates]) = _$GHeroForEpisodeVars; _i1.GEpisode get ep; + static Serializer get serializer => + _$gHeroForEpisodeVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GHeroForEpisodeVars.serializer, this, @@ -28,9 +30,6 @@ abstract class GHeroForEpisodeVars GHeroForEpisodeVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GHeroForEpisodeVarsSerializer(); } abstract class GDroidFragmentVars @@ -40,6 +39,8 @@ abstract class GDroidFragmentVars factory GDroidFragmentVars([Function(GDroidFragmentVarsBuilder b) updates]) = _$GDroidFragmentVars; + static Serializer get serializer => + _$gDroidFragmentVarsSerializer; Map toJson() => (_i2.serializers.serializeWith( GDroidFragmentVars.serializer, this, @@ -49,85 +50,4 @@ abstract class GDroidFragmentVars GDroidFragmentVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GDroidFragmentVarsSerializer(); -} - -class GHeroForEpisodeVarsSerializer - extends StructuredSerializer { - final String wireName = 'GHeroForEpisodeVars'; - - final Iterable types = const [ - GHeroForEpisodeVars, - _$GHeroForEpisodeVars - ]; - - Iterable serialize( - Serializers serializers, - GHeroForEpisodeVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - result.add('ep'); - result.add(serializers.serialize(object.ep, - specifiedType: const FullType(_i1.GEpisode))); - return result; - } - - GHeroForEpisodeVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GHeroForEpisodeVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'ep': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; - builder.ep = fieldValue; - break; - } - } - return builder.build(); - } -} - -class GDroidFragmentVarsSerializer - extends StructuredSerializer { - final String wireName = 'GDroidFragmentVars'; - - final Iterable types = const [GDroidFragmentVars, _$GDroidFragmentVars]; - - Iterable serialize( - Serializers serializers, - GDroidFragmentVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - return result; - } - - GDroidFragmentVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GDroidFragmentVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - - } - } - return builder.build(); - } } diff --git a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.g.dart b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.g.dart index 5ff1690c..89ab68f7 100644 --- a/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/interfaces/__generated__/hero_for_episode.var.gql.g.dart @@ -6,6 +6,79 @@ part of 'hero_for_episode.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** +Serializer _$gHeroForEpisodeVarsSerializer = + new _$GHeroForEpisodeVarsSerializer(); +Serializer _$gDroidFragmentVarsSerializer = + new _$GDroidFragmentVarsSerializer(); + +class _$GHeroForEpisodeVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GHeroForEpisodeVars, + _$GHeroForEpisodeVars + ]; + @override + final String wireName = 'GHeroForEpisodeVars'; + + @override + Iterable serialize( + Serializers serializers, GHeroForEpisodeVars object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'ep', + serializers.serialize(object.ep, + specifiedType: const FullType(_i1.GEpisode)), + ]; + + return result; + } + + @override + GHeroForEpisodeVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GHeroForEpisodeVarsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'ep': + result.ep = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode))! as _i1.GEpisode; + break; + } + } + + return result.build(); + } +} + +class _$GDroidFragmentVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [GDroidFragmentVars, _$GDroidFragmentVars]; + @override + final String wireName = 'GDroidFragmentVars'; + + @override + Iterable serialize( + Serializers serializers, GDroidFragmentVars object, + {FullType specifiedType = FullType.unspecified}) { + return []; + } + + @override + GDroidFragmentVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + return new GDroidFragmentVarsBuilder().build(); + } +} + class _$GHeroForEpisodeVars extends GHeroForEpisodeVars { @override final _i1.GEpisode ep; @@ -35,10 +108,7 @@ class _$GHeroForEpisodeVars extends GHeroForEpisodeVars { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, ep.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, ep.hashCode)); } @override @@ -151,4 +221,4 @@ class GDroidFragmentVarsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.data.gql.g.dart b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.data.gql.g.dart index 849ff651..a98b4caf 100644 --- a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.data.gql.g.dart @@ -155,11 +155,7 @@ class _$GHeroNoVarsData extends GHeroNoVarsData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, hero.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), hero.hashCode)); } @override @@ -278,12 +274,8 @@ class _$GHeroNoVarsData_hero extends GHeroNoVarsData_hero { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf( + $jc($jc($jc(0, G__typename.hashCode), id.hashCode), name.hashCode)); } @override @@ -355,4 +347,4 @@ class GHeroNoVarsData_heroBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.req.gql.g.dart b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.req.gql.g.dart index d42882c5..ac4dc32c 100644 --- a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.req.gql.g.dart @@ -88,11 +88,7 @@ class _$GHeroNoVars extends GHeroNoVars { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); } @override @@ -168,4 +164,4 @@ class GHeroNoVarsBuilder implements Builder { } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.dart b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.dart index ad0bc3cd..475a3655 100644 --- a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.dart +++ b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.dart @@ -16,6 +16,8 @@ abstract class GHeroNoVarsVars factory GHeroNoVarsVars([Function(GHeroNoVarsVarsBuilder b) updates]) = _$GHeroNoVarsVars; + static Serializer get serializer => + _$gHeroNoVarsVarsSerializer; Map toJson() => (_i1.serializers.serializeWith( GHeroNoVarsVars.serializer, this, @@ -25,40 +27,4 @@ abstract class GHeroNoVarsVars GHeroNoVarsVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GHeroNoVarsVarsSerializer(); -} - -class GHeroNoVarsVarsSerializer extends StructuredSerializer { - final String wireName = 'GHeroNoVarsVars'; - - final Iterable types = const [GHeroNoVarsVars, _$GHeroNoVarsVars]; - - Iterable serialize( - Serializers serializers, - GHeroNoVarsVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - return result; - } - - GHeroNoVarsVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GHeroNoVarsVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - - } - } - return builder.build(); - } } diff --git a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.g.dart b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.g.dart index f5ef2947..4b0f9bbc 100644 --- a/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/no_vars/__generated__/hero_no_vars.var.gql.g.dart @@ -6,6 +6,30 @@ part of 'hero_no_vars.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** +Serializer _$gHeroNoVarsVarsSerializer = + new _$GHeroNoVarsVarsSerializer(); + +class _$GHeroNoVarsVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [GHeroNoVarsVars, _$GHeroNoVarsVars]; + @override + final String wireName = 'GHeroNoVarsVars'; + + @override + Iterable serialize(Serializers serializers, GHeroNoVarsVars object, + {FullType specifiedType = FullType.unspecified}) { + return []; + } + + @override + GHeroNoVarsVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + return new GHeroNoVarsVarsBuilder().build(); + } +} + class _$GHeroNoVarsVars extends GHeroNoVarsVars { factory _$GHeroNoVarsVars([void Function(GHeroNoVarsVarsBuilder)? updates]) => (new GHeroNoVarsVarsBuilder()..update(updates))._build(); @@ -64,4 +88,4 @@ class GHeroNoVarsVarsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.data.gql.g.dart b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.data.gql.g.dart index dd131b05..1d688b3b 100644 --- a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.data.gql.g.dart @@ -211,11 +211,7 @@ class _$GReviewWithDateData extends GReviewWithDateData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, createReview.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), createReview.hashCode)); } @override @@ -357,16 +353,16 @@ class _$GReviewWithDateData_createReview @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, episode.hashCode); - _$hash = $jc(_$hash, stars.hashCode); - _$hash = $jc(_$hash, commentary.hashCode); - _$hash = $jc(_$hash, createdAt.hashCode); - _$hash = $jc(_$hash, seenOn.hashCode); - _$hash = $jc(_$hash, custom.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc( + $jc( + $jc( + $jc($jc($jc(0, G__typename.hashCode), episode.hashCode), + stars.hashCode), + commentary.hashCode), + createdAt.hashCode), + seenOn.hashCode), + custom.hashCode)); } @override @@ -484,4 +480,4 @@ class GReviewWithDateData_createReviewBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.req.gql.g.dart b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.req.gql.g.dart index 91d79828..8243b548 100644 --- a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.req.gql.g.dart @@ -93,11 +93,7 @@ class _$GReviewWithDate extends GReviewWithDate { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); } @override @@ -174,4 +170,4 @@ class GReviewWithDateBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.dart b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.dart index 59fecc54..d4761993 100644 --- a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.dart +++ b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.dart @@ -7,8 +7,7 @@ import 'package:built_value/serializer.dart'; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart' as _i1; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i3; -import 'package:gql_exec/value.dart' as _i2; + as _i2; part 'review_with_date.var.gql.g.dart'; @@ -19,86 +18,18 @@ abstract class GReviewWithDateVars factory GReviewWithDateVars( [Function(GReviewWithDateVarsBuilder b) updates]) = _$GReviewWithDateVars; - _i2.Value<_i1.GEpisode>? get episode; + _i1.GEpisode? get episode; _i1.GReviewInput get review; - _i2.Value? get createdAt; - Map toJson() => (_i3.serializers.serializeWith( + DateTime? get createdAt; + static Serializer get serializer => + _$gReviewWithDateVarsSerializer; + Map toJson() => (_i2.serializers.serializeWith( GReviewWithDateVars.serializer, this, ) as Map); static GReviewWithDateVars? fromJson(Map json) => - _i3.serializers.deserializeWith( + _i2.serializers.deserializeWith( GReviewWithDateVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GReviewWithDateVarsSerializer(); -} - -class GReviewWithDateVarsSerializer - extends StructuredSerializer { - final String wireName = 'GReviewWithDateVars'; - - final Iterable types = const [ - GReviewWithDateVars, - _$GReviewWithDateVars - ]; - - Iterable serialize( - Serializers serializers, - GReviewWithDateVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - final _$episodevalue = object.episode; - if (_$episodevalue != null) { - result.add('episode'); - result.add(serializers.serialize(_$episodevalue!.value, - specifiedType: const FullType(_i1.GEpisode))); - } - result.add('review'); - result.add(serializers.serialize(object.review, - specifiedType: const FullType(_i1.GReviewInput))); - final _$createdAtvalue = object.createdAt; - if (_$createdAtvalue != null) { - result.add('createdAt'); - result.add(serializers.serialize(_$createdAtvalue!.value, - specifiedType: const FullType(DateTime))); - } - return result; - } - - GReviewWithDateVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GReviewWithDateVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'episode': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; - builder.episode = _i2.Value(fieldValue); - break; - case 'review': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i1.GReviewInput)) - as _i1.GReviewInput; - builder.review.replace(fieldValue); - break; - case 'createdAt': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(DateTime)) as DateTime; - builder.createdAt = _i2.Value(fieldValue); - break; - } - } - return builder.build(); - } } diff --git a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.g.dart b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.g.dart index a75571b1..b02235e2 100644 --- a/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/scalars/__generated__/review_with_date.var.gql.g.dart @@ -6,13 +6,85 @@ part of 'review_with_date.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** +Serializer _$gReviewWithDateVarsSerializer = + new _$GReviewWithDateVarsSerializer(); + +class _$GReviewWithDateVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [ + GReviewWithDateVars, + _$GReviewWithDateVars + ]; + @override + final String wireName = 'GReviewWithDateVars'; + + @override + Iterable serialize( + Serializers serializers, GReviewWithDateVars object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'review', + serializers.serialize(object.review, + specifiedType: const FullType(_i1.GReviewInput)), + ]; + Object? value; + value = object.episode; + if (value != null) { + result + ..add('episode') + ..add(serializers.serialize(value, + specifiedType: const FullType(_i1.GEpisode))); + } + value = object.createdAt; + if (value != null) { + result + ..add('createdAt') + ..add(serializers.serialize(value, + specifiedType: const FullType(DateTime))); + } + return result; + } + + @override + GReviewWithDateVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GReviewWithDateVarsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'episode': + result.episode = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode?; + break; + case 'review': + result.review.replace(serializers.deserialize(value, + specifiedType: const FullType(_i1.GReviewInput))! + as _i1.GReviewInput); + break; + case 'createdAt': + result.createdAt = serializers.deserialize(value, + specifiedType: const FullType(DateTime)) as DateTime?; + break; + } + } + + return result.build(); + } +} + class _$GReviewWithDateVars extends GReviewWithDateVars { @override - final _i2.Value<_i1.GEpisode>? episode; + final _i1.GEpisode? episode; @override final _i1.GReviewInput review; @override - final _i2.Value? createdAt; + final DateTime? createdAt; factory _$GReviewWithDateVars( [void Function(GReviewWithDateVarsBuilder)? updates]) => @@ -44,12 +116,8 @@ class _$GReviewWithDateVars extends GReviewWithDateVars { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, episode.hashCode); - _$hash = $jc(_$hash, review.hashCode); - _$hash = $jc(_$hash, createdAt.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc(0, episode.hashCode), review.hashCode), createdAt.hashCode)); } @override @@ -66,19 +134,18 @@ class GReviewWithDateVarsBuilder implements Builder { _$GReviewWithDateVars? _$v; - _i2.Value<_i1.GEpisode>? _episode; - _i2.Value<_i1.GEpisode>? get episode => _$this._episode; - set episode(_i2.Value<_i1.GEpisode>? episode) => _$this._episode = episode; + _i1.GEpisode? _episode; + _i1.GEpisode? get episode => _$this._episode; + set episode(_i1.GEpisode? episode) => _$this._episode = episode; _i1.GReviewInputBuilder? _review; _i1.GReviewInputBuilder get review => _$this._review ??= new _i1.GReviewInputBuilder(); set review(_i1.GReviewInputBuilder? review) => _$this._review = review; - _i2.Value? _createdAt; - _i2.Value? get createdAt => _$this._createdAt; - set createdAt(_i2.Value? createdAt) => - _$this._createdAt = createdAt; + DateTime? _createdAt; + DateTime? get createdAt => _$this._createdAt; + set createdAt(DateTime? createdAt) => _$this._createdAt = createdAt; GReviewWithDateVarsBuilder(); @@ -129,4 +196,4 @@ class GReviewWithDateVarsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.ast.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.ast.gql.dart deleted file mode 100644 index 31da7675..00000000 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.ast.gql.dart +++ /dev/null @@ -1,37 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: type=lint - -// ignore_for_file: no_leading_underscores_for_library_prefixes -import 'package:gql/ast.dart' as _i1; - -const CreateCustomField = _i1.OperationDefinitionNode( - type: _i1.OperationType.mutation, - name: _i1.NameNode(value: 'CreateCustomField'), - variableDefinitions: [ - _i1.VariableDefinitionNode( - variable: _i1.VariableNode(name: _i1.NameNode(value: 'input')), - type: _i1.NamedTypeNode( - name: _i1.NameNode(value: 'CustomFieldInput'), - isNonNull: true, - ), - defaultValue: _i1.DefaultValueNode(value: null), - directives: [], - ) - ], - directives: [], - selectionSet: _i1.SelectionSetNode(selections: [ - _i1.FieldNode( - name: _i1.NameNode(value: 'createCustomField'), - alias: null, - arguments: [ - _i1.ArgumentNode( - name: _i1.NameNode(value: 'input'), - value: _i1.VariableNode(name: _i1.NameNode(value: 'input')), - ) - ], - directives: [], - selectionSet: null, - ) - ]), -); -const document = _i1.DocumentNode(definitions: [CreateCustomField]); diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.dart deleted file mode 100644 index 38b35f22..00000000 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.dart +++ /dev/null @@ -1,37 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: type=lint - -// ignore_for_file: no_leading_underscores_for_library_prefixes -import 'package:built_value/built_value.dart'; -import 'package:built_value/serializer.dart'; -import 'package:end_to_end_test/custom_field.dart' as _i1; -import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i2; - -part 'create_custom_field.data.gql.g.dart'; - -abstract class GCreateCustomFieldData - implements Built { - GCreateCustomFieldData._(); - - factory GCreateCustomFieldData( - [Function(GCreateCustomFieldDataBuilder b) updates]) = - _$GCreateCustomFieldData; - - static void _initializeBuilder(GCreateCustomFieldDataBuilder b) => - b..G__typename = 'Mutation'; - @BuiltValueField(wireName: '__typename') - String get G__typename; - _i1.CustomField? get createCustomField; - static Serializer get serializer => - _$gCreateCustomFieldDataSerializer; - Map toJson() => (_i2.serializers.serializeWith( - GCreateCustomFieldData.serializer, - this, - ) as Map); - static GCreateCustomFieldData? fromJson(Map json) => - _i2.serializers.deserializeWith( - GCreateCustomFieldData.serializer, - json, - ); -} diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.g.dart deleted file mode 100644 index 2b151a87..00000000 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.data.gql.g.dart +++ /dev/null @@ -1,174 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'create_custom_field.data.gql.dart'; - -// ************************************************************************** -// BuiltValueGenerator -// ************************************************************************** - -Serializer _$gCreateCustomFieldDataSerializer = - new _$GCreateCustomFieldDataSerializer(); - -class _$GCreateCustomFieldDataSerializer - implements StructuredSerializer { - @override - final Iterable types = const [ - GCreateCustomFieldData, - _$GCreateCustomFieldData - ]; - @override - final String wireName = 'GCreateCustomFieldData'; - - @override - Iterable serialize( - Serializers serializers, GCreateCustomFieldData object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - '__typename', - serializers.serialize(object.G__typename, - specifiedType: const FullType(String)), - ]; - Object? value; - value = object.createCustomField; - if (value != null) { - result - ..add('createCustomField') - ..add(serializers.serialize(value, - specifiedType: const FullType(_i1.CustomField))); - } - return result; - } - - @override - GCreateCustomFieldData deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GCreateCustomFieldDataBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case '__typename': - result.G__typename = serializers.deserialize(value, - specifiedType: const FullType(String))! as String; - break; - case 'createCustomField': - result.createCustomField = serializers.deserialize(value, - specifiedType: const FullType(_i1.CustomField)) - as _i1.CustomField?; - break; - } - } - - return result.build(); - } -} - -class _$GCreateCustomFieldData extends GCreateCustomFieldData { - @override - final String G__typename; - @override - final _i1.CustomField? createCustomField; - - factory _$GCreateCustomFieldData( - [void Function(GCreateCustomFieldDataBuilder)? updates]) => - (new GCreateCustomFieldDataBuilder()..update(updates))._build(); - - _$GCreateCustomFieldData._( - {required this.G__typename, this.createCustomField}) - : super._() { - BuiltValueNullFieldError.checkNotNull( - G__typename, r'GCreateCustomFieldData', 'G__typename'); - } - - @override - GCreateCustomFieldData rebuild( - void Function(GCreateCustomFieldDataBuilder) updates) => - (toBuilder()..update(updates)).build(); - - @override - GCreateCustomFieldDataBuilder toBuilder() => - new GCreateCustomFieldDataBuilder()..replace(this); - - @override - bool operator ==(Object other) { - if (identical(other, this)) return true; - return other is GCreateCustomFieldData && - G__typename == other.G__typename && - createCustomField == other.createCustomField; - } - - @override - int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, createCustomField.hashCode); - _$hash = $jf(_$hash); - return _$hash; - } - - @override - String toString() { - return (newBuiltValueToStringHelper(r'GCreateCustomFieldData') - ..add('G__typename', G__typename) - ..add('createCustomField', createCustomField)) - .toString(); - } -} - -class GCreateCustomFieldDataBuilder - implements Builder { - _$GCreateCustomFieldData? _$v; - - String? _G__typename; - String? get G__typename => _$this._G__typename; - set G__typename(String? G__typename) => _$this._G__typename = G__typename; - - _i1.CustomField? _createCustomField; - _i1.CustomField? get createCustomField => _$this._createCustomField; - set createCustomField(_i1.CustomField? createCustomField) => - _$this._createCustomField = createCustomField; - - GCreateCustomFieldDataBuilder() { - GCreateCustomFieldData._initializeBuilder(this); - } - - GCreateCustomFieldDataBuilder get _$this { - final $v = _$v; - if ($v != null) { - _G__typename = $v.G__typename; - _createCustomField = $v.createCustomField; - _$v = null; - } - return this; - } - - @override - void replace(GCreateCustomFieldData other) { - ArgumentError.checkNotNull(other, 'other'); - _$v = other as _$GCreateCustomFieldData; - } - - @override - void update(void Function(GCreateCustomFieldDataBuilder)? updates) { - if (updates != null) updates(this); - } - - @override - GCreateCustomFieldData build() => _build(); - - _$GCreateCustomFieldData _build() { - final _$result = _$v ?? - new _$GCreateCustomFieldData._( - G__typename: BuiltValueNullFieldError.checkNotNull( - G__typename, r'GCreateCustomFieldData', 'G__typename'), - createCustomField: createCustomField); - replace(_$result); - return _$result; - } -} - -// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.dart deleted file mode 100644 index 14c9d9d5..00000000 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.dart +++ /dev/null @@ -1,42 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: type=lint - -// ignore_for_file: no_leading_underscores_for_library_prefixes -import 'package:built_value/built_value.dart'; -import 'package:built_value/serializer.dart'; -import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i4; -import 'package:end_to_end_test/variables/__generated__/create_custom_field.ast.gql.dart' - as _i2; -import 'package:end_to_end_test/variables/__generated__/create_custom_field.var.gql.dart' - as _i3; -import 'package:gql_exec/gql_exec.dart' as _i1; - -part 'create_custom_field.req.gql.g.dart'; - -abstract class GCreateCustomField - implements Built { - GCreateCustomField._(); - - factory GCreateCustomField([Function(GCreateCustomFieldBuilder b) updates]) = - _$GCreateCustomField; - - static void _initializeBuilder(GCreateCustomFieldBuilder b) => b - ..operation = _i1.Operation( - document: _i2.document, - operationName: 'CreateCustomField', - ); - _i3.GCreateCustomFieldVars get vars; - _i1.Operation get operation; - static Serializer get serializer => - _$gCreateCustomFieldSerializer; - Map toJson() => (_i4.serializers.serializeWith( - GCreateCustomField.serializer, - this, - ) as Map); - static GCreateCustomField? fromJson(Map json) => - _i4.serializers.deserializeWith( - GCreateCustomField.serializer, - json, - ); -} diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.g.dart deleted file mode 100644 index 0ab4ab8f..00000000 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.req.gql.g.dart +++ /dev/null @@ -1,180 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'create_custom_field.req.gql.dart'; - -// ************************************************************************** -// BuiltValueGenerator -// ************************************************************************** - -Serializer _$gCreateCustomFieldSerializer = - new _$GCreateCustomFieldSerializer(); - -class _$GCreateCustomFieldSerializer - implements StructuredSerializer { - @override - final Iterable types = const [GCreateCustomField, _$GCreateCustomField]; - @override - final String wireName = 'GCreateCustomField'; - - @override - Iterable serialize( - Serializers serializers, GCreateCustomField object, - {FullType specifiedType = FullType.unspecified}) { - final result = [ - 'vars', - serializers.serialize(object.vars, - specifiedType: const FullType(_i3.GCreateCustomFieldVars)), - 'operation', - serializers.serialize(object.operation, - specifiedType: const FullType(_i1.Operation)), - ]; - - return result; - } - - @override - GCreateCustomField deserialize( - Serializers serializers, Iterable serialized, - {FullType specifiedType = FullType.unspecified}) { - final result = new GCreateCustomFieldBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'vars': - result.vars.replace(serializers.deserialize(value, - specifiedType: const FullType(_i3.GCreateCustomFieldVars))! - as _i3.GCreateCustomFieldVars); - break; - case 'operation': - result.operation = serializers.deserialize(value, - specifiedType: const FullType(_i1.Operation))! as _i1.Operation; - break; - } - } - - return result.build(); - } -} - -class _$GCreateCustomField extends GCreateCustomField { - @override - final _i3.GCreateCustomFieldVars vars; - @override - final _i1.Operation operation; - - factory _$GCreateCustomField( - [void Function(GCreateCustomFieldBuilder)? updates]) => - (new GCreateCustomFieldBuilder()..update(updates))._build(); - - _$GCreateCustomField._({required this.vars, required this.operation}) - : super._() { - BuiltValueNullFieldError.checkNotNull(vars, r'GCreateCustomField', 'vars'); - BuiltValueNullFieldError.checkNotNull( - operation, r'GCreateCustomField', 'operation'); - } - - @override - GCreateCustomField rebuild( - void Function(GCreateCustomFieldBuilder) updates) => - (toBuilder()..update(updates)).build(); - - @override - GCreateCustomFieldBuilder toBuilder() => - new GCreateCustomFieldBuilder()..replace(this); - - @override - bool operator ==(Object other) { - if (identical(other, this)) return true; - return other is GCreateCustomField && - vars == other.vars && - operation == other.operation; - } - - @override - int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; - } - - @override - String toString() { - return (newBuiltValueToStringHelper(r'GCreateCustomField') - ..add('vars', vars) - ..add('operation', operation)) - .toString(); - } -} - -class GCreateCustomFieldBuilder - implements Builder { - _$GCreateCustomField? _$v; - - _i3.GCreateCustomFieldVarsBuilder? _vars; - _i3.GCreateCustomFieldVarsBuilder get vars => - _$this._vars ??= new _i3.GCreateCustomFieldVarsBuilder(); - set vars(_i3.GCreateCustomFieldVarsBuilder? vars) => _$this._vars = vars; - - _i1.Operation? _operation; - _i1.Operation? get operation => _$this._operation; - set operation(_i1.Operation? operation) => _$this._operation = operation; - - GCreateCustomFieldBuilder() { - GCreateCustomField._initializeBuilder(this); - } - - GCreateCustomFieldBuilder get _$this { - final $v = _$v; - if ($v != null) { - _vars = $v.vars.toBuilder(); - _operation = $v.operation; - _$v = null; - } - return this; - } - - @override - void replace(GCreateCustomField other) { - ArgumentError.checkNotNull(other, 'other'); - _$v = other as _$GCreateCustomField; - } - - @override - void update(void Function(GCreateCustomFieldBuilder)? updates) { - if (updates != null) updates(this); - } - - @override - GCreateCustomField build() => _build(); - - _$GCreateCustomField _build() { - _$GCreateCustomField _$result; - try { - _$result = _$v ?? - new _$GCreateCustomField._( - vars: vars.build(), - operation: BuiltValueNullFieldError.checkNotNull( - operation, r'GCreateCustomField', 'operation')); - } catch (_) { - late String _$failedField; - try { - _$failedField = 'vars'; - vars.build(); - } catch (e) { - throw new BuiltValueNestedFieldError( - r'GCreateCustomField', _$failedField, e.toString()); - } - rethrow; - } - replace(_$result); - return _$result; - } -} - -// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.dart deleted file mode 100644 index 28185eed..00000000 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.dart +++ /dev/null @@ -1,80 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND -// ignore_for_file: type=lint - -// ignore_for_file: no_leading_underscores_for_library_prefixes -import 'package:built_value/built_value.dart'; -import 'package:built_value/serializer.dart'; -import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart' - as _i1; -import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i2; - -part 'create_custom_field.var.gql.g.dart'; - -abstract class GCreateCustomFieldVars - implements Built { - GCreateCustomFieldVars._(); - - factory GCreateCustomFieldVars( - [Function(GCreateCustomFieldVarsBuilder b) updates]) = - _$GCreateCustomFieldVars; - - _i1.GCustomFieldInput get input; - Map toJson() => (_i2.serializers.serializeWith( - GCreateCustomFieldVars.serializer, - this, - ) as Map); - static GCreateCustomFieldVars? fromJson(Map json) => - _i2.serializers.deserializeWith( - GCreateCustomFieldVars.serializer, - json, - ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GCreateCustomFieldVarsSerializer(); -} - -class GCreateCustomFieldVarsSerializer - extends StructuredSerializer { - final String wireName = 'GCreateCustomFieldVars'; - - final Iterable types = const [ - GCreateCustomFieldVars, - _$GCreateCustomFieldVars - ]; - - Iterable serialize( - Serializers serializers, - GCreateCustomFieldVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - result.add('input'); - result.add(serializers.serialize(object.input, - specifiedType: const FullType(_i1.GCustomFieldInput))); - return result; - } - - GCreateCustomFieldVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GCreateCustomFieldVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'input': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i1.GCustomFieldInput)) - as _i1.GCustomFieldInput; - builder.input.replace(fieldValue); - break; - } - } - return builder.build(); - } -} diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.g.dart deleted file mode 100644 index a4582afc..00000000 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_custom_field.var.gql.g.dart +++ /dev/null @@ -1,107 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'create_custom_field.var.gql.dart'; - -// ************************************************************************** -// BuiltValueGenerator -// ************************************************************************** - -class _$GCreateCustomFieldVars extends GCreateCustomFieldVars { - @override - final _i1.GCustomFieldInput input; - - factory _$GCreateCustomFieldVars( - [void Function(GCreateCustomFieldVarsBuilder)? updates]) => - (new GCreateCustomFieldVarsBuilder()..update(updates))._build(); - - _$GCreateCustomFieldVars._({required this.input}) : super._() { - BuiltValueNullFieldError.checkNotNull( - input, r'GCreateCustomFieldVars', 'input'); - } - - @override - GCreateCustomFieldVars rebuild( - void Function(GCreateCustomFieldVarsBuilder) updates) => - (toBuilder()..update(updates)).build(); - - @override - GCreateCustomFieldVarsBuilder toBuilder() => - new GCreateCustomFieldVarsBuilder()..replace(this); - - @override - bool operator ==(Object other) { - if (identical(other, this)) return true; - return other is GCreateCustomFieldVars && input == other.input; - } - - @override - int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, input.hashCode); - _$hash = $jf(_$hash); - return _$hash; - } - - @override - String toString() { - return (newBuiltValueToStringHelper(r'GCreateCustomFieldVars') - ..add('input', input)) - .toString(); - } -} - -class GCreateCustomFieldVarsBuilder - implements Builder { - _$GCreateCustomFieldVars? _$v; - - _i1.GCustomFieldInputBuilder? _input; - _i1.GCustomFieldInputBuilder get input => - _$this._input ??= new _i1.GCustomFieldInputBuilder(); - set input(_i1.GCustomFieldInputBuilder? input) => _$this._input = input; - - GCreateCustomFieldVarsBuilder(); - - GCreateCustomFieldVarsBuilder get _$this { - final $v = _$v; - if ($v != null) { - _input = $v.input.toBuilder(); - _$v = null; - } - return this; - } - - @override - void replace(GCreateCustomFieldVars other) { - ArgumentError.checkNotNull(other, 'other'); - _$v = other as _$GCreateCustomFieldVars; - } - - @override - void update(void Function(GCreateCustomFieldVarsBuilder)? updates) { - if (updates != null) updates(this); - } - - @override - GCreateCustomFieldVars build() => _build(); - - _$GCreateCustomFieldVars _build() { - _$GCreateCustomFieldVars _$result; - try { - _$result = _$v ?? new _$GCreateCustomFieldVars._(input: input.build()); - } catch (_) { - late String _$failedField; - try { - _$failedField = 'input'; - input.build(); - } catch (e) { - throw new BuiltValueNestedFieldError( - r'GCreateCustomFieldVars', _$failedField, e.toString()); - } - rethrow; - } - replace(_$result); - return _$result; - } -} - -// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_review.data.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_review.data.gql.g.dart index 9a91b574..bfa657d0 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_review.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_review.data.gql.g.dart @@ -175,11 +175,7 @@ class _$GCreateReviewData extends GCreateReviewData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, createReview.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), createReview.hashCode)); } @override @@ -304,13 +300,10 @@ class _$GCreateReviewData_createReview extends GCreateReviewData_createReview { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, episode.hashCode); - _$hash = $jc(_$hash, stars.hashCode); - _$hash = $jc(_$hash, commentary.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc( + $jc($jc($jc(0, G__typename.hashCode), episode.hashCode), + stars.hashCode), + commentary.hashCode)); } @override @@ -390,4 +383,4 @@ class GCreateReviewData_createReviewBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_review.req.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_review.req.gql.g.dart index a8262c04..f3137423 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_review.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_review.req.gql.g.dart @@ -90,11 +90,7 @@ class _$GCreateReview extends GCreateReview { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); } @override @@ -171,4 +167,4 @@ class GCreateReviewBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.dart index c1f5d3a1..0448dd62 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.dart @@ -7,8 +7,7 @@ import 'package:built_value/serializer.dart'; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart' as _i1; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart' - as _i3; -import 'package:gql_exec/value.dart' as _i2; + as _i2; part 'create_review.var.gql.g.dart'; @@ -19,71 +18,17 @@ abstract class GCreateReviewVars factory GCreateReviewVars([Function(GCreateReviewVarsBuilder b) updates]) = _$GCreateReviewVars; - _i2.Value<_i1.GEpisode>? get episode; + _i1.GEpisode? get episode; _i1.GReviewInput get review; - Map toJson() => (_i3.serializers.serializeWith( + static Serializer get serializer => + _$gCreateReviewVarsSerializer; + Map toJson() => (_i2.serializers.serializeWith( GCreateReviewVars.serializer, this, ) as Map); static GCreateReviewVars? fromJson(Map json) => - _i3.serializers.deserializeWith( + _i2.serializers.deserializeWith( GCreateReviewVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GCreateReviewVarsSerializer(); -} - -class GCreateReviewVarsSerializer - extends StructuredSerializer { - final String wireName = 'GCreateReviewVars'; - - final Iterable types = const [GCreateReviewVars, _$GCreateReviewVars]; - - Iterable serialize( - Serializers serializers, - GCreateReviewVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - final _$episodevalue = object.episode; - if (_$episodevalue != null) { - result.add('episode'); - result.add(serializers.serialize(_$episodevalue!.value, - specifiedType: const FullType(_i1.GEpisode))); - } - result.add('review'); - result.add(serializers.serialize(object.review, - specifiedType: const FullType(_i1.GReviewInput))); - return result; - } - - GCreateReviewVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GCreateReviewVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'episode': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode; - builder.episode = _i2.Value(fieldValue); - break; - case 'review': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(_i1.GReviewInput)) - as _i1.GReviewInput; - builder.review.replace(fieldValue); - break; - } - } - return builder.build(); - } } diff --git a/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.g.dart index 6b8892bb..c697e3d7 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/create_review.var.gql.g.dart @@ -6,9 +6,66 @@ part of 'create_review.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** +Serializer _$gCreateReviewVarsSerializer = + new _$GCreateReviewVarsSerializer(); + +class _$GCreateReviewVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [GCreateReviewVars, _$GCreateReviewVars]; + @override + final String wireName = 'GCreateReviewVars'; + + @override + Iterable serialize(Serializers serializers, GCreateReviewVars object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'review', + serializers.serialize(object.review, + specifiedType: const FullType(_i1.GReviewInput)), + ]; + Object? value; + value = object.episode; + if (value != null) { + result + ..add('episode') + ..add(serializers.serialize(value, + specifiedType: const FullType(_i1.GEpisode))); + } + return result; + } + + @override + GCreateReviewVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GCreateReviewVarsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'episode': + result.episode = serializers.deserialize(value, + specifiedType: const FullType(_i1.GEpisode)) as _i1.GEpisode?; + break; + case 'review': + result.review.replace(serializers.deserialize(value, + specifiedType: const FullType(_i1.GReviewInput))! + as _i1.GReviewInput); + break; + } + } + + return result.build(); + } +} + class _$GCreateReviewVars extends GCreateReviewVars { @override - final _i2.Value<_i1.GEpisode>? episode; + final _i1.GEpisode? episode; @override final _i1.GReviewInput review; @@ -39,11 +96,7 @@ class _$GCreateReviewVars extends GCreateReviewVars { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, episode.hashCode); - _$hash = $jc(_$hash, review.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, episode.hashCode), review.hashCode)); } @override @@ -59,9 +112,9 @@ class GCreateReviewVarsBuilder implements Builder { _$GCreateReviewVars? _$v; - _i2.Value<_i1.GEpisode>? _episode; - _i2.Value<_i1.GEpisode>? get episode => _$this._episode; - set episode(_i2.Value<_i1.GEpisode>? episode) => _$this._episode = episode; + _i1.GEpisode? _episode; + _i1.GEpisode? get episode => _$this._episode; + set episode(_i1.GEpisode? episode) => _$this._episode = episode; _i1.GReviewInputBuilder? _review; _i1.GReviewInputBuilder get review => @@ -115,4 +168,4 @@ class GCreateReviewVarsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.data.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.data.gql.g.dart index 4557ba55..45f31eee 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.data.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.data.gql.g.dart @@ -163,11 +163,7 @@ class _$GHumanWithArgsData extends GHumanWithArgsData { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, human.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, G__typename.hashCode), human.hashCode)); } @override @@ -285,12 +281,8 @@ class _$GHumanWithArgsData_human extends GHumanWithArgsData_human { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, G__typename.hashCode); - _$hash = $jc(_$hash, name.hashCode); - _$hash = $jc(_$hash, height.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf( + $jc($jc($jc(0, G__typename.hashCode), name.hashCode), height.hashCode)); } @override @@ -362,4 +354,4 @@ class GHumanWithArgsData_humanBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.req.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.req.gql.g.dart index 4b085286..438ef3b0 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.req.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.req.gql.g.dart @@ -93,11 +93,7 @@ class _$GHumanWithArgs extends GHumanWithArgs { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, vars.hashCode); - _$hash = $jc(_$hash, operation.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc($jc(0, vars.hashCode), operation.hashCode)); } @override @@ -174,4 +170,4 @@ class GHumanWithArgsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.dart b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.dart index 403b0010..fc19fdec 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.dart @@ -17,6 +17,8 @@ abstract class GHumanWithArgsVars _$GHumanWithArgsVars; String get id; + static Serializer get serializer => + _$gHumanWithArgsVarsSerializer; Map toJson() => (_i1.serializers.serializeWith( GHumanWithArgsVars.serializer, this, @@ -26,48 +28,4 @@ abstract class GHumanWithArgsVars GHumanWithArgsVars.serializer, json, ); - @BuiltValueSerializer(custom: true, serializeNulls: true) - static Serializer get serializer => - GHumanWithArgsVarsSerializer(); -} - -class GHumanWithArgsVarsSerializer - extends StructuredSerializer { - final String wireName = 'GHumanWithArgsVars'; - - final Iterable types = const [GHumanWithArgsVars, _$GHumanWithArgsVars]; - - Iterable serialize( - Serializers serializers, - GHumanWithArgsVars object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - result.add('id'); - result.add(serializers.serialize(object.id, - specifiedType: const FullType(String))); - return result; - } - - GHumanWithArgsVars deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final builder = GHumanWithArgsVarsBuilder(); - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'id': - var fieldValue = serializers.deserialize(value, - specifiedType: const FullType(String)) as String; - builder.id = fieldValue; - break; - } - } - return builder.build(); - } } diff --git a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.g.dart b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.g.dart index 907174cc..e36ddcb1 100644 --- a/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.g.dart +++ b/codegen/end_to_end_test/lib/variables/__generated__/human_with_args.var.gql.g.dart @@ -6,6 +6,51 @@ part of 'human_with_args.var.gql.dart'; // BuiltValueGenerator // ************************************************************************** +Serializer _$gHumanWithArgsVarsSerializer = + new _$GHumanWithArgsVarsSerializer(); + +class _$GHumanWithArgsVarsSerializer + implements StructuredSerializer { + @override + final Iterable types = const [GHumanWithArgsVars, _$GHumanWithArgsVars]; + @override + final String wireName = 'GHumanWithArgsVars'; + + @override + Iterable serialize( + Serializers serializers, GHumanWithArgsVars object, + {FullType specifiedType = FullType.unspecified}) { + final result = [ + 'id', + serializers.serialize(object.id, specifiedType: const FullType(String)), + ]; + + return result; + } + + @override + GHumanWithArgsVars deserialize( + Serializers serializers, Iterable serialized, + {FullType specifiedType = FullType.unspecified}) { + final result = new GHumanWithArgsVarsBuilder(); + + final iterator = serialized.iterator; + while (iterator.moveNext()) { + final key = iterator.current! as String; + iterator.moveNext(); + final Object? value = iterator.current; + switch (key) { + case 'id': + result.id = serializers.deserialize(value, + specifiedType: const FullType(String))! as String; + break; + } + } + + return result.build(); + } +} + class _$GHumanWithArgsVars extends GHumanWithArgsVars { @override final String id; @@ -35,10 +80,7 @@ class _$GHumanWithArgsVars extends GHumanWithArgsVars { @override int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, id.hashCode); - _$hash = $jf(_$hash); - return _$hash; + return $jf($jc(0, id.hashCode)); } @override @@ -91,4 +133,4 @@ class GHumanWithArgsVarsBuilder } } -// ignore_for_file: deprecated_member_use_from_same_package,type=lint +// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,no_leading_underscores_for_local_identifiers,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new,unnecessary_lambdas diff --git a/codegen/end_to_end_test/lib/variables/create_custom_field.graphql b/codegen/end_to_end_test/lib/variables/create_custom_field.graphql deleted file mode 100644 index d323ef49..00000000 --- a/codegen/end_to_end_test/lib/variables/create_custom_field.graphql +++ /dev/null @@ -1,5 +0,0 @@ - - -mutation CreateCustomField($input: CustomFieldInput!) { - createCustomField(input: $input) -} \ No newline at end of file diff --git a/codegen/end_to_end_test/test/operation/variables_test.dart b/codegen/end_to_end_test/test/operation/variables_test.dart index 3d5840ef..4b10acbf 100644 --- a/codegen/end_to_end_test/test/operation/variables_test.dart +++ b/codegen/end_to_end_test/test/operation/variables_test.dart @@ -1,12 +1,8 @@ -import 'package:gql_exec/value.dart'; -import "package:test/test.dart"; - import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; -import 'package:end_to_end_test/variables/__generated__/human_with_args.var.gql.dart'; import 'package:end_to_end_test/variables/__generated__/create_review.var.gql.dart'; - -void main() { - group("Basic Args", () { +import 'package:end_to_end_test/variables/__generated__/human_with_args.var.gql.dart'; +import 'package:gql_exec/value.dart'; +import "package:test/test.dart" () { final args = GHumanWithArgsVars((b) => b..id = "123"); final json = { "id": "123", @@ -19,14 +15,15 @@ void main() { }); group("Complex Args", () { - final args = GCreateReviewVars((b) => b - ..episode = Value(GEpisode.EMPIRE) - ..review.stars = 5 - ..review.commentary = Value("this was amazing!!!") - ..review.favorite_color = Value(GColorInput((b) => b - ..blue = 255 - ..green = 120 - ..red = 80))); + final args = GCreateReviewVars( + (b) => b + ..episode = GEpisode.EMPIRE + ..review.stars = 5 + ..review.commentary = "this was amazing!!!" + ..review.favorite_color.blue = 255 + ..review.favorite_color.green = 120 + ..review.favorite_color.red = 80, + ); final json = { "episode": "EMPIRE", diff --git a/codegen/end_to_end_test/test/schema/input_test.dart b/codegen/end_to_end_test/test/schema/input_test.dart index 3783c35e..1d9bf6f6 100644 --- a/codegen/end_to_end_test/test/schema/input_test.dart +++ b/codegen/end_to_end_test/test/schema/input_test.dart @@ -1,4 +1,3 @@ -import 'package:gql_exec/value.dart'; import "package:test/test.dart"; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; @@ -6,22 +5,24 @@ import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; void main() { group("Inputs", () { test('can be instantiated', () { - GReviewInput((b) => b - ..stars = 4 - ..commentary = Value("This was a great movie!") - ..favorite_color = Value(GColorInput((b) => b - ..red = 225 - ..blue = 255 - ..green = 123))); + GReviewInput( + (b) => b + ..stars = 4 + ..commentary = "This was a great movie!" + ..favorite_color.red = 225 + ..favorite_color.blue = 255 + ..favorite_color.green = 123, + ); }); test('can be serialized and deserialized', () { - final input = GReviewInput((b) => b - ..stars = 4 - ..favorite_color = Value(GColorInput((b) => b - ..red = 225 - ..blue = 255 - ..green = 123))); + final input = GReviewInput( + (b) => b + ..stars = 4 + ..favorite_color.red = 225 + ..favorite_color.blue = 255 + ..favorite_color.green = 123, + ); final json = { "stars": 4, "favorite_color": { diff --git a/codegen/end_to_end_test/test/schema/scalars_test.dart b/codegen/end_to_end_test/test/schema/scalars_test.dart index bf7e70f7..e2a9e433 100644 --- a/codegen/end_to_end_test/test/schema/scalars_test.dart +++ b/codegen/end_to_end_test/test/schema/scalars_test.dart @@ -1,19 +1,13 @@ import 'package:built_collection/built_collection.dart'; import 'package:built_value/built_value.dart'; -import 'package:gql_exec/value.dart'; -import "package:test/test.dart"; - +import 'package:end_to_end_test/custom_field.dart'; +import 'package:end_to_end_test/custom_field_serializer.dart'; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart'; import 'package:end_to_end_test/scalars/__generated__/review_with_date.data.gql.dart'; import 'package:end_to_end_test/scalars/__generated__/review_with_date.var.gql.dart'; -import 'package:end_to_end_test/custom_field.dart'; -import 'package:end_to_end_test/custom_field_serializer.dart'; - -void main() { - group("Custom scalars from non-standard dart types", () { - final customField = CustomField('hi', 4.5, { - 'subfield': ['some', 'substrings'] +import 'package:gql_exec/value.dart'; +import "package:test/test.dart": ['some', 'substrings'] }); test('correctly serializes and deserializes', () { @@ -58,13 +52,13 @@ void main() { }); group("Custom scalars in input types", () { - final input = GReviewInput((b) => b - ..stars = 4 - ..seenOn = Value( - BuiltList([DateTime.fromMillisecondsSinceEpoch(1591892597000)]), - )); + final input = GReviewInput( + (b) => b + ..stars = 4 + ..seenOn.add(DateTime.fromMillisecondsSinceEpoch(1591892597000)), + ); test('correctly overrides scalars in input types', () { - expect(input.seenOn!.value!.first, TypeMatcher()); + expect(input.seenOn!.first, TypeMatcher()); }); test('can be serialized and deserialized with custom serializer', () { @@ -81,11 +75,11 @@ void main() { final vars = GReviewWithDateVars( (b) => b ..review.stars = 4 - ..createdAt = Value(DateTime.fromMillisecondsSinceEpoch(1591892597000)), + ..createdAt = DateTime.fromMillisecondsSinceEpoch(1591892597000), ); test('correctly overrides scalars in variable types', () { - expect(vars.createdAt!.value, TypeMatcher()); + expect(vars.createdAt, TypeMatcher()); }); test('can be serialized and deserialized with custom serializer', () { From 5549c28bd5deb68aa8c646dd283c2885701813e4 Mon Sep 17 00:00:00 2001 From: Tobias Westergaard Kjeldsen Date: Wed, 31 May 2023 14:20:52 +0200 Subject: [PATCH 6/8] Revert unneeded stuff --- .../test/operation/variables_test.dart | 6 ++++-- .../test/schema/input_test.dart | 7 ++----- .../test/schema/scalars_test.dart | 13 ++++-------- links/gql_exec/lib/src/value.dart | 20 ------------------- links/gql_http_link/lib/src/link.dart | 4 ---- 5 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 links/gql_exec/lib/src/value.dart diff --git a/codegen/end_to_end_test/test/operation/variables_test.dart b/codegen/end_to_end_test/test/operation/variables_test.dart index 4b10acbf..e3227c6d 100644 --- a/codegen/end_to_end_test/test/operation/variables_test.dart +++ b/codegen/end_to_end_test/test/operation/variables_test.dart @@ -1,8 +1,10 @@ import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; import 'package:end_to_end_test/variables/__generated__/create_review.var.gql.dart'; import 'package:end_to_end_test/variables/__generated__/human_with_args.var.gql.dart'; -import 'package:gql_exec/value.dart'; -import "package:test/test.dart" () { +import "package:test/test.dart"; + +void main() { + group("Basic Args", () { final args = GHumanWithArgsVars((b) => b..id = "123"); final json = { "id": "123", diff --git a/codegen/end_to_end_test/test/schema/input_test.dart b/codegen/end_to_end_test/test/schema/input_test.dart index 1d9bf6f6..74b9ecef 100644 --- a/codegen/end_to_end_test/test/schema/input_test.dart +++ b/codegen/end_to_end_test/test/schema/input_test.dart @@ -1,9 +1,6 @@ -import "package:test/test.dart"; - import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; - -void main() { - group("Inputs", () { +import 'package:gql_exec/value.dart'; +import "package:test/test.dart" test('can be instantiated', () { GReviewInput( (b) => b diff --git a/codegen/end_to_end_test/test/schema/scalars_test.dart b/codegen/end_to_end_test/test/schema/scalars_test.dart index e2a9e433..dc7570f2 100644 --- a/codegen/end_to_end_test/test/schema/scalars_test.dart +++ b/codegen/end_to_end_test/test/schema/scalars_test.dart @@ -44,10 +44,8 @@ import "package:test/test.dart": ['some', 'substrings'] final scalar = GISODate(isoString); test('correctly serializes and deserializes', () { - expect(serializers.deserializeWith(GISODate.serializer, isoString), - equals(scalar)); - expect(serializers.serializeWith(GISODate.serializer, scalar), - equals(isoString)); + expect(serializers.deserializeWith(GISODate.serializer, isoString), equals(scalar)); + expect(serializers.serializeWith(GISODate.serializer, scalar), equals(isoString)); }); }); @@ -98,11 +96,8 @@ import "package:test/test.dart": ['some', 'substrings'] final data = GReviewWithDateData( (b) => b ..createReview.stars = 1 - ..createReview - .seenOn - .add(DateTime.fromMillisecondsSinceEpoch(1591892597000)) - ..createReview.createdAt = - DateTime.fromMillisecondsSinceEpoch(1591892597000), + ..createReview.seenOn.add(DateTime.fromMillisecondsSinceEpoch(1591892597000)) + ..createReview.createdAt = DateTime.fromMillisecondsSinceEpoch(1591892597000), ); test('correctly overrides scalars in data types', () { diff --git a/links/gql_exec/lib/src/value.dart b/links/gql_exec/lib/src/value.dart deleted file mode 100644 index c4b49ba2..00000000 --- a/links/gql_exec/lib/src/value.dart +++ /dev/null @@ -1,20 +0,0 @@ -class Value { - final T? _value; - - T? get value => _value; - - /// Create a (present) value by wrapping the [value] provided. - const Value(T? value) : _value = value; - - const Value.ofNull() : _value = null; - - @override - bool operator ==(Object other) => - identical(this, other) || - other is Value && - runtimeType == other.runtimeType && - _value == other._value; - - @override - int get hashCode => _value.hashCode; -} diff --git a/links/gql_http_link/lib/src/link.dart b/links/gql_http_link/lib/src/link.dart index 757bd582..167aacdb 100644 --- a/links/gql_http_link/lib/src/link.dart +++ b/links/gql_http_link/lib/src/link.dart @@ -53,8 +53,6 @@ class HttpLink extends Link { http.Client? _httpClient; - final bool followRedirects; - /// Construct the Link /// /// You can pass a [httpClient] to extend to customize the network request. @@ -66,7 +64,6 @@ class HttpLink extends Link { this.serializer = const RequestSerializer(), this.parser = const ResponseParser(), this.httpResponseDecoder = _defaultHttpResponseDecoder, - this.followRedirects = false, }) : uri = Uri.parse(uri) { _httpClient = httpClient ?? http.Client(); } @@ -191,7 +188,6 @@ class HttpLink extends Link { } return http.Request("POST", uri) ..body = httpBody - ..followRedirects = followRedirects ..headers.addAll(headers); } From 977833eb51e1b564b90134c3ca6083a661db008f Mon Sep 17 00:00:00 2001 From: Tobias Westergaard Kjeldsen Date: Wed, 31 May 2023 14:23:07 +0200 Subject: [PATCH 7/8] Revert unneeded stuff --- .../test/schema/input_test.dart | 6 +++-- .../test/schema/scalars_test.dart | 23 ++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/codegen/end_to_end_test/test/schema/input_test.dart b/codegen/end_to_end_test/test/schema/input_test.dart index 74b9ecef..9dcb1d7c 100644 --- a/codegen/end_to_end_test/test/schema/input_test.dart +++ b/codegen/end_to_end_test/test/schema/input_test.dart @@ -1,6 +1,8 @@ import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; -import 'package:gql_exec/value.dart'; -import "package:test/test.dart" +import "package:test/test.dart"; + +void main() { + group("Inputs", () { test('can be instantiated', () { GReviewInput( (b) => b diff --git a/codegen/end_to_end_test/test/schema/scalars_test.dart b/codegen/end_to_end_test/test/schema/scalars_test.dart index dc7570f2..5a18b244 100644 --- a/codegen/end_to_end_test/test/schema/scalars_test.dart +++ b/codegen/end_to_end_test/test/schema/scalars_test.dart @@ -1,13 +1,15 @@ -import 'package:built_collection/built_collection.dart'; -import 'package:built_value/built_value.dart'; import 'package:end_to_end_test/custom_field.dart'; import 'package:end_to_end_test/custom_field_serializer.dart'; import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart'; import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart'; import 'package:end_to_end_test/scalars/__generated__/review_with_date.data.gql.dart'; import 'package:end_to_end_test/scalars/__generated__/review_with_date.var.gql.dart'; -import 'package:gql_exec/value.dart'; -import "package:test/test.dart": ['some', 'substrings'] +import "package:test/test.dart"; + +void main() { + group("Custom scalars from non-standard dart types", () { + final customField = CustomField('hi', 4.5, { + 'subfield': ['some', 'substrings'] }); test('correctly serializes and deserializes', () { @@ -44,8 +46,10 @@ import "package:test/test.dart": ['some', 'substrings'] final scalar = GISODate(isoString); test('correctly serializes and deserializes', () { - expect(serializers.deserializeWith(GISODate.serializer, isoString), equals(scalar)); - expect(serializers.serializeWith(GISODate.serializer, scalar), equals(isoString)); + expect(serializers.deserializeWith(GISODate.serializer, isoString), + equals(scalar)); + expect(serializers.serializeWith(GISODate.serializer, scalar), + equals(isoString)); }); }); @@ -96,8 +100,11 @@ import "package:test/test.dart": ['some', 'substrings'] final data = GReviewWithDateData( (b) => b ..createReview.stars = 1 - ..createReview.seenOn.add(DateTime.fromMillisecondsSinceEpoch(1591892597000)) - ..createReview.createdAt = DateTime.fromMillisecondsSinceEpoch(1591892597000), + ..createReview + .seenOn + .add(DateTime.fromMillisecondsSinceEpoch(1591892597000)) + ..createReview.createdAt = + DateTime.fromMillisecondsSinceEpoch(1591892597000), ); test('correctly overrides scalars in data types', () { From d032f11515291bfbe84bbb762d335b428bce7704 Mon Sep 17 00:00:00 2001 From: Tobias Westergaard Kjeldsen Date: Wed, 31 May 2023 14:28:54 +0200 Subject: [PATCH 8/8] Removed value.dart --- links/gql_exec/lib/value.dart | 1 - 1 file changed, 1 deletion(-) delete mode 100644 links/gql_exec/lib/value.dart diff --git a/links/gql_exec/lib/value.dart b/links/gql_exec/lib/value.dart deleted file mode 100644 index 4d086bbb..00000000 --- a/links/gql_exec/lib/value.dart +++ /dev/null @@ -1 +0,0 @@ -export "package:gql_exec/src/value.dart";