From a91ff5ea178bb1571d43998567c5ee642469c8ba Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 10 Mar 2021 10:29:38 -0300 Subject: [PATCH 01/31] Add nnbd to options --- lib/schema/options.dart | 5 +++++ lib/schema/options.g2.dart | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/schema/options.dart b/lib/schema/options.dart index d96bbc8a..980ba754 100644 --- a/lib/schema/options.dart +++ b/lib/schema/options.dart @@ -30,6 +30,10 @@ class GeneratorOptions { @JsonKey(defaultValue: []) final List ignoreForFile; + /// If artemis should generate nnbd code + @JsonKey(defaultValue: false) + final bool nnbd; + /// Instantiate generator options. GeneratorOptions({ this.generateHelpers = true, @@ -37,6 +41,7 @@ class GeneratorOptions { this.fragmentsGlob, this.schemaMapping = const [], this.ignoreForFile = const [], + this.nnbd = false, }); /// Build options from a JSON map. diff --git a/lib/schema/options.g2.dart b/lib/schema/options.g2.dart index ec18d1a9..e7f0aed4 100644 --- a/lib/schema/options.g2.dart +++ b/lib/schema/options.g2.dart @@ -1,6 +1,5 @@ -// @dart = 2.8 - // GENERATED CODE - DO NOT MODIFY BY HAND +// @dart=2.8 part of 'options.dart'; @@ -28,10 +27,10 @@ GeneratorOptions _$GeneratorOptionsFromJson(Map json) { ))) ?.toList() ?? [], - ignoreForFile: (json['ignore_for_file'] as List) - ?.map((e) => e == null ? null : e as String) - ?.toList() ?? - [], + ignoreForFile: + (json['ignore_for_file'] as List)?.map((e) => e as String)?.toList() ?? + [], + nnbd: json['nnbd'] as bool ?? false, ); } @@ -42,6 +41,7 @@ Map _$GeneratorOptionsToJson(GeneratorOptions instance) => 'fragments_glob': instance.fragmentsGlob, 'schema_mapping': instance.schemaMapping, 'ignore_for_file': instance.ignoreForFile, + 'nnbd': instance.nnbd, }; DartType _$DartTypeFromJson(Map json) { @@ -89,6 +89,7 @@ Map _$SchemaMapToJson(SchemaMap instance) => { 'schema': instance.schema, 'queries_glob': instance.queriesGlob, 'type_name_field': instance.typeNameField, + 'append_type_name': instance.appendTypeName, 'naming_scheme': _$NamingSchemeEnumMap[instance.namingScheme], }; From f27e5a01868dc07c9e5ed12d680e6f45d28d3393 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 10 Mar 2021 12:52:29 -0300 Subject: [PATCH 02/31] Bump needed deps and create a nnbd test --- pubspec.yaml | 7 ++- test/query_generator/nnbd_test.dart | 87 +++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 test/query_generator/nnbd_test.dart diff --git a/pubspec.yaml b/pubspec.yaml index a0eed0ed..9ba23fe8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,6 +5,7 @@ description: Build dart types from GraphQL schemas and queries (using Introspect homepage: https://github.com/comigor/artemis environment: + # sdk: ">=2.12.0 <3.0.0" sdk: ">=2.8.0 <3.0.0" dependencies: @@ -13,7 +14,7 @@ dependencies: code_builder: ^3.5.0 collection: ^1.14.13 dart_style: ^1.3.10 - equatable: ^1.2.5 + equatable: ^2.0.0 glob: ^1.2.0 gql_code_gen: ^0.1.5 gql_dedupe_link: ^1.0.10 @@ -22,7 +23,7 @@ dependencies: gql_link: ^0.3.1-alpha gql: ^0.12.4 http: ^0.12.2 - json_annotation: ^3.1.1 + json_annotation: ^4.0.0 meta: ^1.2.4 path: ^1.7.0 recase: ^3.0.1 @@ -33,7 +34,7 @@ dev_dependencies: args: ^1.6.0 build_runner: ^1.10.11 build_test: ^1.3.2 - json_serializable: ^3.5.1 + json_serializable: ^4.0.2 build_resolvers: ^1.5.1 pedantic: ^1.9.2 test: ^1.15.7 diff --git a/test/query_generator/nnbd_test.dart b/test/query_generator/nnbd_test.dart new file mode 100644 index 00000000..0e235623 --- /dev/null +++ b/test/query_generator/nnbd_test.dart @@ -0,0 +1,87 @@ +// @dart = 2.8 + +import 'package:artemis/builder.dart'; +import 'package:artemis/generator/data/data.dart'; +import 'package:build/build.dart'; +import 'package:build_test/build_test.dart'; +import 'package:test/test.dart'; + +import '../helpers.dart'; + +void main() { + group('On nnbd', () { + test( + 'A simple query yields simple nnbd classes', + () async => testGenerator( + query: 'query { nonNullAndSelected, nullableAndSelected }', + schema: r''' + type Query { + nonNullAndSelected: String! + nonNullAndNotSelected: String! + nullableAndSelected: String + nullableAndNotSelected: String + } + ''', + libraryDefinition: libraryDefinition, + generatedFile: output, + generateHelpers: false, + builderOptionsMap: { + 'nnbd': true, + }, + ), + ); + }); +} + +final libraryDefinition = + LibraryDefinition(basename: r'query.graphql', queries: [ + QueryDefinition( + name: QueryName(name: r'Query$_Query'), + operationName: r'query', + classes: [ + ClassDefinition( + name: ClassName(name: r'Query$_Query'), + properties: [ + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r'nonNullAndSelected'), + isNonNull: true, + isResolveType: false), + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r'nullableAndSelected'), + isNonNull: false, + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: TypeName(name: r'__typename'), + isInput: false) + ], + generateHelpers: false, + suffix: r'Query') +]); + +const output = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 + +import 'package:json_annotation/json_annotation.dart'; +import 'package:equatable/equatable.dart'; +import 'package:gql/ast.dart'; +part 'query.graphql.g.dart'; + +@JsonSerializable(explicitToJson: true) +class Query$Query extends JsonSerializable with EquatableMixin { + Query$Query(); + + factory Query$Query.fromJson(Map json) => + _$Query$QueryFromJson(json); + + late String nonNullAndSelected; + + String? nullableAndSelected; + + @override + List get props => [nonNullAndSelected, nullableAndSelected]; + Map toJson() => _$Query$QueryToJson(this); +} +'''; From 1b17d2247f9a9a2aeef27b8fd25bc86067391c1b Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Sun, 14 Mar 2021 00:35:53 +0000 Subject: [PATCH 03/31] merge --- lib/generator/print_helpers.dart | 52 +++++++++++++++++--------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/lib/generator/print_helpers.dart b/lib/generator/print_helpers.dart index f3e71e8b..86bed935 100644 --- a/lib/generator/print_helpers.dart +++ b/lib/generator/print_helpers.dart @@ -57,7 +57,7 @@ String _toJsonBody(ClassDefinition definition) { Method _propsMethod(String body) { return Method((m) => m ..type = MethodType.getter - ..returns = refer('List') + ..returns = refer('List') ..annotations.add(CodeExpression(Code('override'))) ..name = 'props' ..lambda = true @@ -147,11 +147,8 @@ Spec classDefinitionToSpec( p ..name = property.name.namePrintable ..named = true - ..toThis = true; - - if (property.isNonNull) { - p.annotations.add(refer('required')); - } + ..toThis = true + ..required = property.isNonNull; }, ), )); @@ -166,14 +163,23 @@ Spec classDefinitionToSpec( p.annotations.add('override'); } - final field = Field( - (f) => f + final field = Field((f) { + f ..name = p.name.namePrintable - ..type = refer(p.type.namePrintable) + // TODO: remove this workaround when code_builder includes late field modifier: + // https://github.com/dart-lang/code_builder/pull/310 + ..type = refer( + '${p.isNonNull ? 'late ' : ''} ${p.type.namePrintable}${p.isNonNull ? '' : '?'}') ..annotations.addAll( p.annotations.map((e) => CodeExpression(Code(e))), - ), - ); + ); + + if (p.isNonNull) { + // TODO: apply this fix when code_builder includes late field modifier: + // https://github.com/dart-lang/code_builder/pull/310 + // f.modifier = FieldModifier.late$; + } + }); return field; })), ); @@ -212,11 +218,8 @@ Spec generateArgumentClassSpec(QueryDefinition definition) { p ..name = input.name.namePrintable ..named = true - ..toThis = true; - - if (input.isNonNull) { - p.annotations.add(refer('required')); - } + ..toThis = true + ..required = input.isNonNull; }, ), )), @@ -344,14 +347,14 @@ Spec generateLibrarySpec(LibraryDefinition definition) { // inserts import of meta package only if there is at least one non nullable input // see this link for details https://github.com/dart-lang/sdk/issues/4188#issuecomment-240322222 - if (hasNonNullableInput(definition.queries)) { - importDirectives.insertAll( - 0, - [ - Directive.import('package:meta/meta.dart'), - ], - ); - } + // if (hasNonNullableInput(definition.queries)) { + // importDirectives.insertAll( + // 0, + // [ + // Directive.import('package:meta/meta.dart'), + // ], + // ); + // } importDirectives.addAll(definition.customImports .map((customImport) => Directive.import(customImport))); @@ -406,6 +409,7 @@ void writeLibraryDefinitionToBuffer( LibraryDefinition definition, ) { buffer.writeln('// GENERATED CODE - DO NOT MODIFY BY HAND'); + buffer.writeln('// @dart = 2.12'); if (ignoreForFile != null && ignoreForFile.isNotEmpty) { buffer.writeln( '// ignore_for_file: ${Set.from(ignoreForFile).join(', ')}', From e36245a9c527e2a9960e7230d31366a12b8aacd6 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Tue, 16 Mar 2021 16:10:49 -0300 Subject: [PATCH 04/31] Add nullability to TypeName, and create ListOfTypeName class --- lib/generator/data/class_property.dart | 40 ++++++++++++++++++++++++-- lib/generator/data/definition.dart | 2 +- lib/generator/graphql_helpers.dart | 17 +++++++---- lib/generator/helpers.dart | 20 ------------- lib/generator/print_helpers.dart | 17 ++--------- 5 files changed, 53 insertions(+), 43 deletions(-) diff --git a/lib/generator/data/class_property.dart b/lib/generator/data/class_property.dart index c4805a9a..3c1a590a 100644 --- a/lib/generator/data/class_property.dart +++ b/lib/generator/data/class_property.dart @@ -18,6 +18,7 @@ class ClassProperty extends Definition with DataPrinter { final List annotations; /// Whether this parameter is required + @Deprecated('Use [type.isNonNull] instead') final bool isNonNull; /// Whether this parameter corresponds to the __resolveType (or equivalent) @@ -85,18 +86,53 @@ const _camelCaseTypes = {'bool', 'double', 'int'}; /// Type name class TypeName extends Name with DataPrinter { /// Instantiate a type name definition. - TypeName({String name}) : super(name: name); + TypeName({ + String name, + this.isNonNull = false, + }) : super(name: name); + + /// If this type is non-null + final bool isNonNull; @override Map get namedProps => { 'name': name, + if (isNonNull) 'isNonNull': true, }; + @override + List get props => [name, isNonNull]; + @override String normalize(String name) { final normalized = super.normalize(name); if (_camelCaseTypes.contains(normalized)) return normalized; - return ReCase(normalized).pascalCase; + return '${ReCase(normalized).pascalCase}${isNonNull ? '' : '?'}'; } } + +/// Type name +class ListOfTypeName extends TypeName with DataPrinter { + /// Instantiate a type name definition. + ListOfTypeName({ + this.typeName, + this.listIsNonNull = true, + }) : super(name: typeName.name, isNonNull: typeName.isNonNull); + + /// Internal type name + final TypeName typeName; + + /// If this list type is non-null + final bool listIsNonNull; + + @override + Map get namedProps => { + 'typeName': typeName, + 'listIsNonNull': listIsNonNull, + }; + + @override + String normalize(String name) => + 'List<${typeName.namePrintable}>${listIsNonNull ? '' : '?'}'; +} diff --git a/lib/generator/data/definition.dart b/lib/generator/data/definition.dart index b0e4c4a0..82fe952f 100644 --- a/lib/generator/data/definition.dart +++ b/lib/generator/data/definition.dart @@ -26,7 +26,7 @@ abstract class Name extends Equatable with DataPrinter { String get namePrintable => normalize(name); /// type name safe to use for dart - String get dartTypeSafe => namePrintable.replaceAll(RegExp(r'[<>]'), ''); + String get dartTypeSafe => namePrintable.replaceAll(RegExp(r'[<>?]'), ''); /// Name normalization function String normalize(String name) => normalizeName(name); diff --git a/lib/generator/graphql_helpers.dart b/lib/generator/graphql_helpers.dart index b2f0f3fb..ea99ca85 100644 --- a/lib/generator/graphql_helpers.dart +++ b/lib/generator/graphql_helpers.dart @@ -51,28 +51,33 @@ TypeName buildTypeName( if (type is ScalarTypeDefinitionNode) { final scalar = getSingleScalarMap(options, node.name.value); return TypeName( - name: dartType ? scalar.dartType.name : scalar.graphQLType); + name: dartType ? scalar.dartType.name : scalar.graphQLType, + isNonNull: node.isNonNull, + ); } if (type is EnumTypeDefinitionNode || type is InputObjectTypeDefinitionNode) { - return TypeName(name: type.name.value); + return TypeName(name: type.name.value, isNonNull: node.isNonNull); } if (replaceLeafWith != null) { - return TypeName(name: replaceLeafWith.name); + return TypeName(name: replaceLeafWith.name, isNonNull: node.isNonNull); } else { - return TypeName(name: type.name.value); + return TypeName(name: type.name.value, isNonNull: node.isNonNull); } } - return TypeName(name: node.name.value); + return TypeName(name: node.name.value, isNonNull: node.isNonNull); } if (node is ListTypeNode) { final typeName = buildTypeName(node.type, options, dartType: dartType, replaceLeafWith: replaceLeafWith, schema: schema); - return TypeName(name: 'List<${typeName.namePrintable}>'); + return ListOfTypeName( + typeName: typeName, + listIsNonNull: node.isNonNull, + ); } throw Exception('Unable to build type name'); diff --git a/lib/generator/helpers.dart b/lib/generator/helpers.dart index c89af3cd..5f272dea 100644 --- a/lib/generator/helpers.dart +++ b/lib/generator/helpers.dart @@ -133,26 +133,6 @@ extension ExtensionsOnIterable on Iterable { _removeDuplicatedBy(this, fn); } -/// Checks if the passed queries contain either: -/// - A [ClassDefinition] that's an input object with at least one non nullable -/// property. -/// - A [QueryInput] which is non nullable. -bool hasNonNullableInput(Iterable queries) { - for (final query in queries) { - for (final clazz in query.classes.whereType()) { - if (clazz.isInput && clazz.properties.any((p) => p.isNonNull)) { - return true; - } - } - - if (query.inputs.any((i) => i.isNonNull)) { - return true; - } - } - - return false; -} - /// Check if [obj] has value (isn't null or empty). bool hasValue(Object obj) { if (obj is Iterable) { diff --git a/lib/generator/print_helpers.dart b/lib/generator/print_helpers.dart index 86bed935..c8bc6385 100644 --- a/lib/generator/print_helpers.dart +++ b/lib/generator/print_helpers.dart @@ -148,7 +148,7 @@ Spec classDefinitionToSpec( ..name = property.name.namePrintable ..named = true ..toThis = true - ..required = property.isNonNull; + ..required = property.type.isNonNull; }, ), )); @@ -169,12 +169,12 @@ Spec classDefinitionToSpec( // TODO: remove this workaround when code_builder includes late field modifier: // https://github.com/dart-lang/code_builder/pull/310 ..type = refer( - '${p.isNonNull ? 'late ' : ''} ${p.type.namePrintable}${p.isNonNull ? '' : '?'}') + '${p.type.isNonNull ? 'late ' : ''} ${p.type.namePrintable}') ..annotations.addAll( p.annotations.map((e) => CodeExpression(Code(e))), ); - if (p.isNonNull) { + if (p.type.isNonNull) { // TODO: apply this fix when code_builder includes late field modifier: // https://github.com/dart-lang/code_builder/pull/310 // f.modifier = FieldModifier.late$; @@ -345,17 +345,6 @@ Spec generateLibrarySpec(LibraryDefinition definition) { ); } - // inserts import of meta package only if there is at least one non nullable input - // see this link for details https://github.com/dart-lang/sdk/issues/4188#issuecomment-240322222 - // if (hasNonNullableInput(definition.queries)) { - // importDirectives.insertAll( - // 0, - // [ - // Directive.import('package:meta/meta.dart'), - // ], - // ); - // } - importDirectives.addAll(definition.customImports .map((customImport) => Directive.import(customImport))); From 0fec540f36c1e8a667c3e79b628cb1eda695ebcc Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Sat, 13 Mar 2021 19:08:31 -0300 Subject: [PATCH 05/31] Fix some tests --- test/query_generator/subscription_test.dart | 13 ++++--- test/query_generator/union_types_test.dart | 43 +++++++++++---------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/test/query_generator/subscription_test.dart b/test/query_generator/subscription_test.dart index 4de1e5be..ed3d3d10 100644 --- a/test/query_generator/subscription_test.dart +++ b/test/query_generator/subscription_test.dart @@ -135,6 +135,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -149,15 +150,15 @@ class NewUserSub$Subscription$User extends JsonSerializable factory NewUserSub$Subscription$User.fromJson(Map json) => _$NewUserSub$Subscription$UserFromJson(json); - String firstName; + late String firstName; - String lastName; + late String lastName; @JsonKey(unknownEnumValue: UserType.artemisUnknown) - UserType userType; + late UserType userType; @override - List get props => [firstName, lastName, userType]; + List get props => [firstName, lastName, userType]; Map toJson() => _$NewUserSub$Subscription$UserToJson(this); } @@ -168,10 +169,10 @@ class NewUserSub$Subscription extends JsonSerializable with EquatableMixin { factory NewUserSub$Subscription.fromJson(Map json) => _$NewUserSub$SubscriptionFromJson(json); - NewUserSub$Subscription$User newUser; + late NewUserSub$Subscription$User newUser; @override - List get props => [newUser]; + List get props => [newUser]; Map toJson() => _$NewUserSub$SubscriptionToJson(this); } diff --git a/test/query_generator/union_types_test.dart b/test/query_generator/union_types_test.dart index fb5958dc..7b607142 100644 --- a/test/query_generator/union_types_test.dart +++ b/test/query_generator/union_types_test.dart @@ -223,6 +223,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -238,29 +239,29 @@ class SomeQuery$SomeObject$SomeUnion$TypeA Map json) => _$SomeQuery$SomeObject$SomeUnion$TypeAFromJson(json); - int a; + int? a; @JsonKey(name: '_') - String $; + String? $; @JsonKey(name: '_a') - String $a; + String? $a; @JsonKey(name: '_a_a') - String $aA; + String? $aA; @JsonKey(name: '_a_a_') - String $aA_; + String? $aA_; @JsonKey(name: '_new') - String $new; + String? $new; @JsonKey(name: '__typename') @override - String $$typename; + String? $$typename; @override - List get props => [a, $, $a, $aA, $aA_, $new, $$typename]; + List get props => [a, $, $a, $aA, $aA_, $new, $$typename]; Map toJson() => _$SomeQuery$SomeObject$SomeUnion$TypeAToJson(this); } @@ -274,32 +275,32 @@ class SomeQuery$SomeObject$SomeUnion$TypeB Map json) => _$SomeQuery$SomeObject$SomeUnion$TypeBFromJson(json); - int b; + int? b; @JsonKey(name: '_') - String $; + String? $; @JsonKey(name: '_b') - String $b; + String? $b; @JsonKey(name: '_b_b') - String $bB; + String? $bB; @JsonKey(name: '_b_b_') - String $bB_; + String? $bB_; @JsonKey(name: 'new') - String kw$new; + String? kw$new; @JsonKey(name: 'IN') - String kw$IN; + String? kw$IN; @JsonKey(name: '__typename') @override - String $$typename; + String? $$typename; @override - List get props => [b, $, $b, $bB, $bB_, kw$new, kw$IN, $$typename]; + List get props => [b, $, $b, $bB, $bB_, kw$new, kw$IN, $$typename]; Map toJson() => _$SomeQuery$SomeObject$SomeUnion$TypeBToJson(this); } @@ -321,10 +322,10 @@ class SomeQuery$SomeObject$SomeUnion extends JsonSerializable } @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override - List get props => [$$typename]; + List get props => [$$typename]; Map toJson() { switch ($$typename) { case r'TypeA': @@ -344,10 +345,10 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { factory SomeQuery$SomeObject.fromJson(Map json) => _$SomeQuery$SomeObjectFromJson(json); - SomeQuery$SomeObject$SomeUnion o; + SomeQuery$SomeObject$SomeUnion? o; @override - List get props => [o]; + List get props => [o]; Map toJson() => _$SomeQuery$SomeObjectToJson(this); } '''; From b36cc323a9cbee3a49fff617fc917c5b61903f57 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Sat, 13 Mar 2021 19:08:54 -0300 Subject: [PATCH 06/31] WIP: separate (and improve) a test --- .../non_nullable_list_inputs_test.dart | 235 ++++++++++++++++++ .../query_generator/query_generator_test.dart | 69 ++--- 2 files changed, 272 insertions(+), 32 deletions(-) create mode 100644 test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart diff --git a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart new file mode 100644 index 00000000..ec88dab1 --- /dev/null +++ b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart @@ -0,0 +1,235 @@ +// @dart = 2.8 + +import 'package:artemis/builder.dart'; +import 'package:artemis/generator/data/data.dart'; +import 'package:build/build.dart'; +import 'package:build_test/build_test.dart'; +import 'package:test/test.dart'; + +import '../../helpers.dart'; + +void main() { + group('On query generation', () { + test( + 'Non-nullability on inputs (considering lists)', + () async => testGenerator( + query: r''' + query some_query($i: Int, $inn: Int!, $li: [Int], $linn: [Int!], $lnni: [Int]!, $lnninn: [Int!]!) { + someQuery(i: $i, inn: $inn, li: $li, linn: $linn, lnni: $lnni, lnninn: $lnninn) { + s + } + } + ''', + schema: r''' + type Query { + someQuery(i: Int, inn: Int!, li: [Int], linn: [Int!], lnni: [Int]!, lnninn: [Int!]!): SomeObject + } + + type SomeObject { + s: String + } + ''', + libraryDefinition: + LibraryDefinition(basename: r'query.graphql', queries: [ + QueryDefinition( + name: QueryName(name: r'SomeQuery$_Query'), + operationName: r'some_query', + classes: [ + ClassDefinition( + name: ClassName(name: r'SomeQuery$_Query$_SomeObject'), + properties: [ + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r's'), + isNonNull: false, + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: TypeName(name: r'__typename'), + isInput: false), + ClassDefinition( + name: ClassName(name: r'SomeQuery$_Query'), + properties: [ + ClassProperty( + type: TypeName( + name: r'SomeQuery$_Query$_SomeObject'), + name: ClassPropertyName(name: r'someQuery'), + isNonNull: false, + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: TypeName(name: r'__typename'), + isInput: false) + ], + inputs: [ + QueryInput( + type: TypeName(name: r'int'), + name: QueryInputName(name: r'i'), + isNonNull: false), + QueryInput( + type: TypeName(name: r'int'), + name: QueryInputName(name: r'inn'), + isNonNull: true), + QueryInput( + type: TypeName(name: r'List'), + name: QueryInputName(name: r'li'), + isNonNull: false), + QueryInput( + type: TypeName(name: r'List'), + name: QueryInputName(name: r'linn'), + isNonNull: false), + QueryInput( + type: TypeName(name: r'List'), + name: QueryInputName(name: r'lnni'), + isNonNull: true), + QueryInput( + type: TypeName(name: r'List'), + name: QueryInputName(name: r'lnninn'), + isNonNull: true) + ], + generateHelpers: true, + suffix: r'Query') + ]), + generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 + +import 'package:artemis/artemis.dart'; +import 'package:json_annotation/json_annotation.dart'; +import 'package:equatable/equatable.dart'; +import 'package:gql/ast.dart'; +part 'query.graphql.g.dart'; + +@JsonSerializable(explicitToJson: true) +class SomeQuery$Query$SomeObject extends JsonSerializable with EquatableMixin { + SomeQuery$Query$SomeObject(); + + factory SomeQuery$Query$SomeObject.fromJson(Map json) => + _$SomeQuery$Query$SomeObjectFromJson(json); + + String? s; + + int? i; + + List? list; + + @override + List get props => [s, i, list]; + Map toJson() => _$SomeQuery$Query$SomeObjectToJson(this); +} + +@JsonSerializable(explicitToJson: true) +class SomeQuery$Query extends JsonSerializable with EquatableMixin { + SomeQuery$Query(); + + factory SomeQuery$Query.fromJson(Map json) => + _$SomeQuery$QueryFromJson(json); + + SomeQuery$Query$SomeObject? someQuery; + + @override + List get props => [someQuery]; + Map toJson() => _$SomeQuery$QueryToJson(this); +} + +@JsonSerializable(explicitToJson: true) +class SomeQueryArguments extends JsonSerializable with EquatableMixin { + SomeQueryArguments({required this.intsNonNullable, this.stringNullable}); + + @override + factory SomeQueryArguments.fromJson(Map json) => + _$SomeQueryArgumentsFromJson(json); + + final List intsNonNullable; + + final String? stringNullable; + + @override + List get props => [intsNonNullable, stringNullable]; + @override + Map toJson() => _$SomeQueryArgumentsToJson(this); +} + +class SomeQueryQuery extends GraphQLQuery { + SomeQueryQuery({this.variables}); + + @override + final DocumentNode document = DocumentNode(definitions: [ + OperationDefinitionNode( + type: OperationType.query, + name: NameNode(value: 'some_query'), + variableDefinitions: [ + VariableDefinitionNode( + variable: VariableNode(name: NameNode(value: 'intsNonNullable')), + type: ListTypeNode( + type: NamedTypeNode( + name: NameNode(value: 'Int'), isNonNull: false), + isNonNull: true), + defaultValue: DefaultValueNode(value: null), + directives: []), + VariableDefinitionNode( + variable: VariableNode(name: NameNode(value: 'stringNullable')), + type: NamedTypeNode( + name: NameNode(value: 'String'), isNonNull: false), + defaultValue: DefaultValueNode(value: null), + directives: []) + ], + directives: [], + selectionSet: SelectionSetNode(selections: [ + FieldNode( + name: NameNode(value: 'someQuery'), + alias: null, + arguments: [ + ArgumentNode( + name: NameNode(value: 'intsNonNullable'), + value: + VariableNode(name: NameNode(value: 'intsNonNullable'))), + ArgumentNode( + name: NameNode(value: 'stringNullable'), + value: + VariableNode(name: NameNode(value: 'stringNullable'))) + ], + directives: [], + selectionSet: SelectionSetNode(selections: [ + FieldNode( + name: NameNode(value: 's'), + alias: null, + arguments: [], + directives: [], + selectionSet: null), + FieldNode( + name: NameNode(value: 'i'), + alias: null, + arguments: [], + directives: [], + selectionSet: null), + FieldNode( + name: NameNode(value: 'list'), + alias: null, + arguments: [ + ArgumentNode( + name: NameNode(value: 'intsNonNullable'), + value: VariableNode( + name: NameNode(value: 'intsNonNullable'))) + ], + directives: [], + selectionSet: null) + ])) + ])) + ]); + + @override + final String operationName = 'some_query'; + + @override + final SomeQueryArguments variables; + + @override + List get props => [document, operationName, variables]; + @override + SomeQuery$Query parse(Map json) => + SomeQuery$Query.fromJson(json); +} +''', + generateHelpers: true)); + }); +} diff --git a/test/query_generator/query_generator_test.dart b/test/query_generator/query_generator_test.dart index 32c13ebe..00d1f224 100644 --- a/test/query_generator/query_generator_test.dart +++ b/test/query_generator/query_generator_test.dart @@ -64,6 +64,7 @@ void main() { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -77,12 +78,12 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { factory SomeQuery$SomeObject.fromJson(Map json) => _$SomeQuery$SomeObjectFromJson(json); - String s; + String? s; - int i; + int? i; @override - List get props => [s, i]; + List get props => [s, i]; Map toJson() => _$SomeQuery$SomeObjectToJson(this); } ''', @@ -112,7 +113,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { type SomeObject { s: String i: Int - list(intsNonNullable: [Int]!): [Int]! + list(intsNonNullable: [Int]!): [Int] } ''', libraryDefinition: @@ -171,8 +172,8 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -186,14 +187,14 @@ class SomeQuery$Query$SomeObject extends JsonSerializable with EquatableMixin { factory SomeQuery$Query$SomeObject.fromJson(Map json) => _$SomeQuery$Query$SomeObjectFromJson(json); - String s; + String? s; - int i; + int? i; - List list; + List? list; @override - List get props => [s, i, list]; + List get props => [s, i, list]; Map toJson() => _$SomeQuery$Query$SomeObjectToJson(this); } @@ -204,27 +205,27 @@ class SomeQuery$Query extends JsonSerializable with EquatableMixin { factory SomeQuery$Query.fromJson(Map json) => _$SomeQuery$QueryFromJson(json); - SomeQuery$Query$SomeObject someQuery; + SomeQuery$Query$SomeObject? someQuery; @override - List get props => [someQuery]; + List get props => [someQuery]; Map toJson() => _$SomeQuery$QueryToJson(this); } @JsonSerializable(explicitToJson: true) class SomeQueryArguments extends JsonSerializable with EquatableMixin { - SomeQueryArguments({@required this.intsNonNullable, this.stringNullable}); + SomeQueryArguments({required this.intsNonNullable, this.stringNullable}); @override factory SomeQueryArguments.fromJson(Map json) => _$SomeQueryArgumentsFromJson(json); - final List intsNonNullable; + final List intsNonNullable; - final String stringNullable; + final String? stringNullable; @override - List get props => [intsNonNullable, stringNullable]; + List get props => [intsNonNullable, stringNullable]; @override Map toJson() => _$SomeQueryArgumentsToJson(this); } @@ -304,7 +305,7 @@ class SomeQueryQuery extends GraphQLQuery { final SomeQueryArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override SomeQuery$Query parse(Map json) => SomeQuery$Query.fromJson(json); @@ -407,6 +408,7 @@ class SomeQueryQuery extends GraphQLQuery { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -422,10 +424,10 @@ class SomeQuery$Result$SomeObject$AnotherObject extends JsonSerializable Map json) => _$SomeQuery$Result$SomeObject$AnotherObjectFromJson(json); - String str; + String? str; @override - List get props => [str]; + List get props => [str]; Map toJson() => _$SomeQuery$Result$SomeObject$AnotherObjectToJson(this); } @@ -437,12 +439,12 @@ class SomeQuery$Result$SomeObject extends JsonSerializable with EquatableMixin { factory SomeQuery$Result$SomeObject.fromJson(Map json) => _$SomeQuery$Result$SomeObjectFromJson(json); - String st; + String? st; - List ob; + List? ob; @override - List get props => [st, ob]; + List get props => [st, ob]; Map toJson() => _$SomeQuery$Result$SomeObjectToJson(this); } @@ -453,12 +455,12 @@ class SomeQuery$Result extends JsonSerializable with EquatableMixin { factory SomeQuery$Result.fromJson(Map json) => _$SomeQuery$ResultFromJson(json); - String s; + String? s; - SomeQuery$Result$SomeObject o; + SomeQuery$Result$SomeObject? o; @override - List get props => [s, o]; + List get props => [s, o]; Map toJson() => _$SomeQuery$ResultToJson(this); } ''', @@ -506,6 +508,7 @@ class SomeQuery$Result extends JsonSerializable with EquatableMixin { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -519,12 +522,12 @@ class SomeQuery$Result extends JsonSerializable with EquatableMixin { factory SomeQuery$Result.fromJson(Map json) => _$SomeQuery$ResultFromJson(json); - String firstName; + String? firstName; - String lastName; + String? lastName; @override - List get props => [firstName, lastName]; + List get props => [firstName, lastName]; Map toJson() => _$SomeQuery$ResultToJson(this); } ''', @@ -592,6 +595,7 @@ class SomeQuery$Result extends JsonSerializable with EquatableMixin { r'package:decimal/decimal.dart' ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -606,12 +610,12 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { factory SomeQuery$SomeObject.fromJson(Map json) => _$SomeQuery$SomeObjectFromJson(json); - Decimal bigDecimal; + Decimal? bigDecimal; - DateTime dateTime; + DateTime? dateTime; @override - List get props => [bigDecimal, dateTime]; + List get props => [bigDecimal, dateTime]; Map toJson() => _$SomeQuery$SomeObjectToJson(this); } ''', @@ -655,6 +659,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -670,10 +675,10 @@ class PascalCasingQuery$PascalCasingQuery extends JsonSerializable Map json) => _$PascalCasingQuery$PascalCasingQueryFromJson(json); - String s; + String? s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$PascalCasingQuery$PascalCasingQueryToJson(this); } From 2094d000874ed9509d7c266c5cd1dd2e66dc0769 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Sat, 13 Mar 2021 19:09:07 -0300 Subject: [PATCH 07/31] WIP: Replace all --- test/generator/print_helpers_test.dart | 26 +++++++++---------- .../aliases/alias_on_leaves_test.dart | 4 +-- .../aliases/alias_on_object_test.dart | 6 ++--- .../append_type_name_test.dart | 26 +++++++++---------- .../field_not_found_mutation_test.dart | 9 +++---- .../ast_schema/input_types_test.dart | 11 ++++---- .../ast_schema/missing_schema_test.dart | 2 +- .../multiple_schema_mappint_test.dart | 17 ++++++------ .../deprecated_enum_value_test.dart | 2 +- .../deprecated/deprecated_field_test.dart | 6 ++--- .../deprecated_input_object_field_test.dart | 11 ++++---- .../deprecated_interface_field_test.dart | 11 ++++---- .../enums/enum_duplication_test.dart | 8 +++--- .../query_generator/enums/enum_list_test.dart | 4 +-- .../enums/filter_enum_test.dart | 7 +++-- .../enums/input_enum_list_test.dart | 8 +++--- .../enums/input_enum_test.dart | 11 ++++---- .../query_generator/enums/kw_prefix_test.dart | 6 ++--- .../enums/query_enum_test.dart | 4 +-- test/query_generator/forwarder_test.dart | 2 +- .../fragments/fragment_duplication_test.dart | 10 +++---- .../fragments/fragment_glob_test.dart | 14 +++++----- .../fragments/fragment_on_fragments_test.dart | 6 ++--- .../fragments/fragments_multiple_test.dart | 15 +++++------ .../fragments/fragments_test.dart | 2 +- ...iple_references_on_simple_naming_test.dart | 6 ++--- .../interface_fragment_glob_test.dart | 11 ++++---- .../interface_possible_types_test.dart | 9 +++---- .../interfaces/interface_test.dart | 11 ++++---- .../multiple_operations_per_file_test.dart | 19 +++++++------- .../multiple_queries_test.dart | 4 +-- .../complex_input_objects_test.dart | 11 ++++---- .../custom_scalars_on_input_objects_test.dart | 11 ++++---- .../filter_input_objects_test.dart | 13 +++++----- .../input_duplication_test.dart | 19 +++++++------- .../mutations_and_inputs/mutations_test.dart | 21 +++++++-------- .../recursive_input_test.dart | 5 ++-- .../naming/casing_conversion_test.dart | 11 ++++---- .../naming/simple_naming_test.dart | 8 +++--- .../scalars/custom_scalars_test.dart | 6 ++--- .../query_generator/scalars/scalars_test.dart | 2 +- .../scalars/unused_custom_scalars_test.dart | 2 +- 42 files changed, 189 insertions(+), 208 deletions(-) diff --git a/test/generator/print_helpers_test.dart b/test/generator/print_helpers_test.dart index c5ceeab8..b044476e 100644 --- a/test/generator/print_helpers_test.dart +++ b/test/generator/print_helpers_test.dart @@ -156,7 +156,7 @@ class AClass extends JsonSerializable with EquatableMixin { factory AClass.fromJson(Map json) => _\$AClassFromJson(json); @override - List get props => []; + List get props => []; Map toJson() => _\$AClassToJson(this); } '''); @@ -177,7 +177,7 @@ class AClass extends AnotherClass with EquatableMixin { factory AClass.fromJson(Map json) => _\$AClassFromJson(json); @override - List get props => []; + List get props => []; Map toJson() => _\$AClassToJson(this); } '''); @@ -214,7 +214,7 @@ class AClass extends JsonSerializable with EquatableMixin { } @override - List get props => []; + List get props => []; Map toJson() { switch ($$typename) { case r'ASubClass': @@ -253,7 +253,7 @@ class AClass extends JsonSerializable with EquatableMixin { AnotherType anotherName; @override - List get props => [name, anotherName]; + List get props => [name, anotherName]; Map toJson() => _\$AClassToJson(this); } '''); @@ -302,7 +302,7 @@ class AClass extends JsonSerializable with EquatableMixin { AllAtOnce name; @override - List get props => [name, name, name, name]; + List get props => [name, name, name, name]; Map toJson() => _\$AClassToJson(this); } '''); @@ -333,7 +333,7 @@ class AClass extends JsonSerializable with EquatableMixin, FragmentMixin { factory AClass.fromJson(Map json) => _\$AClassFromJson(json); @override - List get props => [name]; + List get props => [name]; Map toJson() => _\$AClassToJson(this); } '''); @@ -368,7 +368,7 @@ class AClass extends JsonSerializable with EquatableMixin { AnotherType anotherName; @override - List get props => [name, anotherName]; + List get props => [name, anotherName]; Map toJson() => _\$AClassToJson(this); } '''); @@ -503,7 +503,7 @@ class TestQueryQuery extends GraphQLQuery { final String operationName = 'test_query'; @override - List get props => [document, operationName]; + List get props => [document, operationName]; @override TestQuery parse(Map json) => TestQuery.fromJson(json); } @@ -549,7 +549,7 @@ class TestQueryArguments extends JsonSerializable with EquatableMixin { final Type name; @override - List get props => [name]; + List get props => [name]; @override Map toJson() => _\$TestQueryArgumentsToJson(this); } @@ -574,7 +574,7 @@ class TestQueryQuery extends GraphQLQuery { final TestQueryArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override TestQuery parse(Map json) => TestQuery.fromJson(json); } @@ -606,7 +606,7 @@ class TestQueryArguments extends JsonSerializable with EquatableMixin { final Type name; @override - List get props => [name]; + List get props => [name]; @override Map toJson() => _\$TestQueryArgumentsToJson(this); } @@ -649,7 +649,7 @@ class TestQueryArguments extends JsonSerializable with EquatableMixin { final TestQueryArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override TestQuery parse(Map json) => TestQuery.fromJson(json); } @@ -692,7 +692,7 @@ class AClass extends JsonSerializable with EquatableMixin { factory AClass.fromJson(Map json) => _\$AClassFromJson(json); @override - List get props => []; + List get props => []; Map toJson() => _\$AClassToJson(this); } diff --git a/test/query_generator/aliases/alias_on_leaves_test.dart b/test/query_generator/aliases/alias_on_leaves_test.dart index 0f84e45c..172257ba 100644 --- a/test/query_generator/aliases/alias_on_leaves_test.dart +++ b/test/query_generator/aliases/alias_on_leaves_test.dart @@ -121,7 +121,7 @@ class SomeQuery$Response$SomeObject extends JsonSerializable MyEnum thisIsAnEnum; @override - List get props => [thisIsAnEnum]; + List get props => [thisIsAnEnum]; Map toJson() => _$SomeQuery$Response$SomeObjectToJson(this); } @@ -137,7 +137,7 @@ class SomeQuery$Response extends JsonSerializable with EquatableMixin { SomeQuery$Response$SomeObject o; @override - List get props => [thisIsAString, o]; + List get props => [thisIsAString, o]; Map toJson() => _$SomeQuery$ResponseToJson(this); } diff --git a/test/query_generator/aliases/alias_on_object_test.dart b/test/query_generator/aliases/alias_on_object_test.dart index aefd2bfe..9aab8a1b 100644 --- a/test/query_generator/aliases/alias_on_object_test.dart +++ b/test/query_generator/aliases/alias_on_object_test.dart @@ -123,7 +123,7 @@ class SomeQuery$QueryResponse$SomeObject extends JsonSerializable String st; @override - List get props => [st]; + List get props => [st]; Map toJson() => _$SomeQuery$QueryResponse$SomeObjectToJson(this); } @@ -140,7 +140,7 @@ class SomeQuery$QueryResponse$AnotherObject extends JsonSerializable String str; @override - List get props => [str]; + List get props => [str]; Map toJson() => _$SomeQuery$QueryResponse$AnotherObjectToJson(this); } @@ -159,7 +159,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin { List anotherObject; @override - List get props => [s, o, anotherObject]; + List get props => [s, o, anotherObject]; Map toJson() => _$SomeQuery$QueryResponseToJson(this); } '''; diff --git a/test/query_generator/append_type_name_test.dart b/test/query_generator/append_type_name_test.dart index d860b3af..92acebcb 100644 --- a/test/query_generator/append_type_name_test.dart +++ b/test/query_generator/append_type_name_test.dart @@ -102,7 +102,7 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [e, $$typename]; + List get props => [e, $$typename]; Map toJson() => _$Custom$QueryRoot$QToJson(this); } @@ -119,7 +119,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [q, $$typename]; + List get props => [q, $$typename]; Map toJson() => _$Custom$QueryRootToJson(this); } ''', @@ -218,7 +218,7 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [e, $$typename]; + List get props => [e, $$typename]; Map toJson() => _$Custom$QueryRoot$QToJson(this); } @@ -235,7 +235,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [q, $$typename]; + List get props => [q, $$typename]; Map toJson() => _$Custom$QueryRootToJson(this); } ''', @@ -352,7 +352,7 @@ class Custom$QueryRoot$Q extends JsonSerializable String $$typename; @override - List get props => [e, $$typename, $$typename]; + List get props => [e, $$typename, $$typename]; Map toJson() => _$Custom$QueryRoot$QToJson(this); } @@ -369,7 +369,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [q, $$typename]; + List get props => [q, $$typename]; Map toJson() => _$Custom$QueryRootToJson(this); } ''', @@ -516,7 +516,7 @@ class Custom$QueryRoot$Q$TypeA extends Custom$QueryRoot$Q with EquatableMixin { String $$typename; @override - List get props => [a, $$typename]; + List get props => [a, $$typename]; Map toJson() => _$Custom$QueryRoot$Q$TypeAToJson(this); } @@ -534,7 +534,7 @@ class Custom$QueryRoot$Q$TypeB extends Custom$QueryRoot$Q with EquatableMixin { String $$typename; @override - List get props => [b, $$typename]; + List get props => [b, $$typename]; Map toJson() => _$Custom$QueryRoot$Q$TypeBToJson(this); } @@ -557,7 +557,7 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [$$typename]; + List get props => [$$typename]; Map toJson() { switch ($$typename) { case r'TypeA': @@ -583,7 +583,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [q, $$typename]; + List get props => [q, $$typename]; Map toJson() => _$Custom$QueryRootToJson(this); } ''', @@ -697,7 +697,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable String $$typename; @override - List get props => [e, $$typename, $$typename]; + List get props => [e, $$typename, $$typename]; Map toJson() => _$Custom$QueryRoot$QueryResponseToJson(this); } @@ -714,7 +714,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [q, $$typename]; + List get props => [q, $$typename]; Map toJson() => _$Custom$QueryRootToJson(this); } @@ -777,7 +777,7 @@ class CustomQuery extends GraphQLQuery { final String operationName = 'custom'; @override - List get props => [document, operationName]; + List get props => [document, operationName]; @override Custom$QueryRoot parse(Map json) => Custom$QueryRoot.fromJson(json); diff --git a/test/query_generator/ast_schema/field_not_found_mutation_test.dart b/test/query_generator/ast_schema/field_not_found_mutation_test.dart index 87b68c89..7dbafcaf 100644 --- a/test/query_generator/ast_schema/field_not_found_mutation_test.dart +++ b/test/query_generator/ast_schema/field_not_found_mutation_test.dart @@ -134,7 +134,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; import 'package:gql/ast.dart'; @@ -154,7 +153,7 @@ class CreateThing$MutationRoot$CreateThingResponse$Thing String message; @override - List get props => [id, message]; + List get props => [id, message]; Map toJson() => _$CreateThing$MutationRoot$CreateThingResponse$ThingToJson(this); } @@ -171,7 +170,7 @@ class CreateThing$MutationRoot$CreateThingResponse extends JsonSerializable CreateThing$MutationRoot$CreateThingResponse$Thing thing; @override - List get props => [thing]; + List get props => [thing]; Map toJson() => _$CreateThing$MutationRoot$CreateThingResponseToJson(this); } @@ -186,7 +185,7 @@ class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin { CreateThing$MutationRoot$CreateThingResponse createThing; @override - List get props => [createThing]; + List get props => [createThing]; Map toJson() => _$CreateThing$MutationRootToJson(this); } @@ -202,7 +201,7 @@ class CreateThingInput extends JsonSerializable with EquatableMixin { String message; @override - List get props => [clientId, message]; + List get props => [clientId, message]; Map toJson() => _$CreateThingInputToJson(this); } '''; diff --git a/test/query_generator/ast_schema/input_types_test.dart b/test/query_generator/ast_schema/input_types_test.dart index 47489911..b89d0f33 100644 --- a/test/query_generator/ast_schema/input_types_test.dart +++ b/test/query_generator/ast_schema/input_types_test.dart @@ -156,7 +156,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; import 'package:gql/ast.dart'; @@ -176,7 +175,7 @@ class CreateThing$MutationRoot$CreateThingResponse$Thing String message; @override - List get props => [id, message]; + List get props => [id, message]; Map toJson() => _$CreateThing$MutationRoot$CreateThingResponse$ThingToJson(this); } @@ -193,7 +192,7 @@ class CreateThing$MutationRoot$CreateThingResponse extends JsonSerializable CreateThing$MutationRoot$CreateThingResponse$Thing thing; @override - List get props => [thing]; + List get props => [thing]; Map toJson() => _$CreateThing$MutationRoot$CreateThingResponseToJson(this); } @@ -208,7 +207,7 @@ class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin { CreateThing$MutationRoot$CreateThingResponse createThing; @override - List get props => [createThing]; + List get props => [createThing]; Map toJson() => _$CreateThing$MutationRootToJson(this); } @@ -222,7 +221,7 @@ class OtherObjectInput extends JsonSerializable with EquatableMixin { String id; @override - List get props => [id]; + List get props => [id]; Map toJson() => _$OtherObjectInputToJson(this); } @@ -240,7 +239,7 @@ class CreateThingInput extends JsonSerializable with EquatableMixin { List shares; @override - List get props => [clientId, message, shares]; + List get props => [clientId, message, shares]; Map toJson() => _$CreateThingInputToJson(this); } '''; diff --git a/test/query_generator/ast_schema/missing_schema_test.dart b/test/query_generator/ast_schema/missing_schema_test.dart index f5e50aac..149c30cc 100644 --- a/test/query_generator/ast_schema/missing_schema_test.dart +++ b/test/query_generator/ast_schema/missing_schema_test.dart @@ -69,7 +69,7 @@ class Query$Query extends JsonSerializable with EquatableMixin { String a; @override - List get props => [a]; + List get props => [a]; Map toJson() => _$Query$QueryToJson(this); } '''; diff --git a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart index 5a23aafc..793987ed 100644 --- a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart +++ b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart @@ -6,7 +6,6 @@ import 'package:artemis/generator/data/data.dart'; import 'package:artemis/generator/data/enum_value_definition.dart'; import 'package:build_test/build_test.dart'; import 'package:logging/logging.dart'; -import 'package:meta/meta.dart'; import 'package:test/test.dart'; import 'package:collection/collection.dart'; @@ -324,7 +323,7 @@ class BrowseArticles$Query$Articles extends JsonSerializable ArticleType articleType; @override - List get props => [id, title, articleType]; + List get props => [id, title, articleType]; Map toJson() => _$BrowseArticles$Query$ArticlesToJson(this); } @@ -338,7 +337,7 @@ class BrowseArticles$Query extends JsonSerializable with EquatableMixin { List articles; @override - List get props => [articles]; + List get props => [articles]; Map toJson() => _$BrowseArticles$QueryToJson(this); } @@ -395,7 +394,7 @@ class BrowseArticlesQuery final String operationName = 'BrowseArticles'; @override - List get props => [document, operationName]; + List get props => [document, operationName]; @override BrowseArticles$Query parse(Map json) => BrowseArticles$Query.fromJson(json); @@ -430,7 +429,7 @@ class BrowseRepositories$Query$Repositories extends JsonSerializable Status status; @override - List get props => [id, title, privacy, status]; + List get props => [id, title, privacy, status]; Map toJson() => _$BrowseRepositories$Query$RepositoriesToJson(this); } @@ -445,7 +444,7 @@ class BrowseRepositories$Query extends JsonSerializable with EquatableMixin { List repositories; @override - List get props => [repositories]; + List get props => [repositories]; Map toJson() => _$BrowseRepositories$QueryToJson(this); } @@ -462,7 +461,7 @@ class NotificationOptionInput extends JsonSerializable with EquatableMixin { bool enabled; @override - List get props => [type, enabled]; + List get props => [type, enabled]; Map toJson() => _$NotificationOptionInputToJson(this); } @@ -506,7 +505,7 @@ class BrowseRepositoriesArguments extends JsonSerializable with EquatableMixin { final List notificationTypes; @override - List get props => [notificationTypes]; + List get props => [notificationTypes]; @override Map toJson() => _$BrowseRepositoriesArgumentsToJson(this); } @@ -580,7 +579,7 @@ class BrowseRepositoriesQuery extends GraphQLQuery get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override BrowseRepositories$Query parse(Map json) => BrowseRepositories$Query.fromJson(json); diff --git a/test/query_generator/deprecated/deprecated_enum_value_test.dart b/test/query_generator/deprecated/deprecated_enum_value_test.dart index ff23bdfb..c541efd6 100644 --- a/test/query_generator/deprecated/deprecated_enum_value_test.dart +++ b/test/query_generator/deprecated/deprecated_enum_value_test.dart @@ -106,7 +106,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin { StarWarsMovies someValue; @override - List get props => [someValue]; + List get props => [someValue]; Map toJson() => _$SomeQuery$QueryResponseToJson(this); } diff --git a/test/query_generator/deprecated/deprecated_field_test.dart b/test/query_generator/deprecated/deprecated_field_test.dart index eeb452e8..6aa86217 100644 --- a/test/query_generator/deprecated/deprecated_field_test.dart +++ b/test/query_generator/deprecated/deprecated_field_test.dart @@ -139,7 +139,7 @@ class SomeQuery$QueryResponse$DeprecatedObject extends JsonSerializable String deprecatedField; @override - List get props => [someField, deprecatedField]; + List get props => [someField, deprecatedField]; Map toJson() => _$SomeQuery$QueryResponse$DeprecatedObjectToJson(this); } @@ -159,7 +159,7 @@ class SomeQuery$QueryResponse$SomeObject extends JsonSerializable String deprecatedField; @override - List get props => [someField, deprecatedField]; + List get props => [someField, deprecatedField]; Map toJson() => _$SomeQuery$QueryResponse$SomeObjectToJson(this); } @@ -177,7 +177,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin { List someObjects; @override - List get props => [deprecatedObject, someObjects]; + List get props => [deprecatedObject, someObjects]; Map toJson() => _$SomeQuery$QueryResponseToJson(this); } '''; diff --git a/test/query_generator/deprecated/deprecated_input_object_field_test.dart b/test/query_generator/deprecated/deprecated_input_object_field_test.dart index 4d306f10..bb51fdb0 100644 --- a/test/query_generator/deprecated/deprecated_input_object_field_test.dart +++ b/test/query_generator/deprecated/deprecated_input_object_field_test.dart @@ -115,7 +115,6 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -134,7 +133,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$Custom$MutationRoot$MutationResponseToJson(this); } @@ -149,7 +148,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { Custom$MutationRoot$MutationResponse mut; @override - List get props => [mut]; + List get props => [mut]; Map toJson() => _$Custom$MutationRootToJson(this); } @@ -165,7 +164,7 @@ class Input extends JsonSerializable with EquatableMixin { String d; @override - List get props => [s, d]; + List get props => [s, d]; Map toJson() => _$InputToJson(this); } @@ -180,7 +179,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { final Input input; @override - List get props => [input]; + List get props => [input]; @override Map toJson() => _$CustomArgumentsToJson(this); } @@ -231,7 +230,7 @@ class CustomMutation final CustomArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override Custom$MutationRoot parse(Map json) => Custom$MutationRoot.fromJson(json); diff --git a/test/query_generator/deprecated/deprecated_interface_field_test.dart b/test/query_generator/deprecated/deprecated_interface_field_test.dart index 3285f1be..6ea89e73 100644 --- a/test/query_generator/deprecated/deprecated_interface_field_test.dart +++ b/test/query_generator/deprecated/deprecated_interface_field_test.dart @@ -192,7 +192,6 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; import 'package:gql/ast.dart'; @@ -212,7 +211,7 @@ class Custom$Query$Node$User extends Custom$Query$Node _$Custom$Query$Node$UserFromJson(json); @override - List get props => [id, username]; + List get props => [id, username]; Map toJson() => _$Custom$Query$Node$UserToJson(this); } @@ -226,7 +225,7 @@ class Custom$Query$Node$ChatMessage$User extends Custom$Query$Node$ChatMessage _$Custom$Query$Node$ChatMessage$UserFromJson(json); @override - List get props => [id, username]; + List get props => [id, username]; Map toJson() => _$Custom$Query$Node$ChatMessage$UserToJson(this); } @@ -244,7 +243,7 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node Custom$Query$Node$ChatMessage$User user; @override - List get props => [message, user]; + List get props => [message, user]; Map toJson() => _$Custom$Query$Node$ChatMessageToJson(this); } @@ -269,7 +268,7 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin { String deprecatedField; @override - List get props => [id, deprecatedField]; + List get props => [id, deprecatedField]; Map toJson() { switch ($$typename) { case r'User': @@ -292,7 +291,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { Custom$Query$Node nodeById; @override - List get props => [nodeById]; + List get props => [nodeById]; Map toJson() => _$Custom$QueryToJson(this); } '''; diff --git a/test/query_generator/enums/enum_duplication_test.dart b/test/query_generator/enums/enum_duplication_test.dart index 73e1442d..16f17dda 100644 --- a/test/query_generator/enums/enum_duplication_test.dart +++ b/test/query_generator/enums/enum_duplication_test.dart @@ -172,7 +172,7 @@ class Custom$Query$Q extends JsonSerializable with EquatableMixin { MyEnum e; @override - List get props => [e]; + List get props => [e]; Map toJson() => _$Custom$Query$QToJson(this); } @@ -186,7 +186,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { Custom$Query$Q q; @override - List get props => [q]; + List get props => [q]; Map toJson() => _$Custom$QueryToJson(this); } @@ -201,7 +201,7 @@ class CustomList$Query$QList extends JsonSerializable with EquatableMixin { MyEnum e; @override - List get props => [e]; + List get props => [e]; Map toJson() => _$CustomList$Query$QListToJson(this); } @@ -215,7 +215,7 @@ class CustomList$Query extends JsonSerializable with EquatableMixin { List qList; @override - List get props => [qList]; + List get props => [qList]; Map toJson() => _$CustomList$QueryToJson(this); } diff --git a/test/query_generator/enums/enum_list_test.dart b/test/query_generator/enums/enum_list_test.dart index 874c6894..02ba7a45 100644 --- a/test/query_generator/enums/enum_list_test.dart +++ b/test/query_generator/enums/enum_list_test.dart @@ -113,7 +113,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable List le; @override - List get props => [le]; + List get props => [le]; Map toJson() => _$Custom$QueryRoot$QueryResponseToJson(this); } @@ -127,7 +127,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { Custom$QueryRoot$QueryResponse q; @override - List get props => [q]; + List get props => [q]; Map toJson() => _$Custom$QueryRootToJson(this); } diff --git a/test/query_generator/enums/filter_enum_test.dart b/test/query_generator/enums/filter_enum_test.dart index 651b758a..8eae9fe7 100644 --- a/test/query_generator/enums/filter_enum_test.dart +++ b/test/query_generator/enums/filter_enum_test.dart @@ -159,7 +159,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; import 'package:gql/ast.dart'; @@ -177,7 +176,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable MyEnum e; @override - List get props => [e]; + List get props => [e]; Map toJson() => _$Custom$QueryRoot$QueryResponseToJson(this); } @@ -191,7 +190,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { Custom$QueryRoot$QueryResponse q; @override - List get props => [q]; + List get props => [q]; Map toJson() => _$Custom$QueryRootToJson(this); } @@ -205,7 +204,7 @@ class Input extends JsonSerializable with EquatableMixin { $InputInputEnum e; @override - List get props => [e]; + List get props => [e]; Map toJson() => _$InputToJson(this); } diff --git a/test/query_generator/enums/input_enum_list_test.dart b/test/query_generator/enums/input_enum_list_test.dart index 20770c41..0213a5b9 100644 --- a/test/query_generator/enums/input_enum_list_test.dart +++ b/test/query_generator/enums/input_enum_list_test.dart @@ -136,7 +136,7 @@ class BrowseArticles$Query$Article extends JsonSerializable ArticleType articleType; @override - List get props => [id, title, articleType]; + List get props => [id, title, articleType]; Map toJson() => _$BrowseArticles$Query$ArticleToJson(this); } @@ -150,7 +150,7 @@ class BrowseArticles$Query extends JsonSerializable with EquatableMixin { List articles; @override - List get props => [articles]; + List get props => [articles]; Map toJson() => _$BrowseArticles$QueryToJson(this); } @@ -175,7 +175,7 @@ class BrowseArticlesArguments extends JsonSerializable with EquatableMixin { final List article_type_in; @override - List get props => [article_type_in]; + List get props => [article_type_in]; @override Map toJson() => _$BrowseArticlesArgumentsToJson(this); } @@ -241,7 +241,7 @@ class BrowseArticlesQuery final BrowseArticlesArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override BrowseArticles$Query parse(Map json) => BrowseArticles$Query.fromJson(json); diff --git a/test/query_generator/enums/input_enum_test.dart b/test/query_generator/enums/input_enum_test.dart index 4135cb0e..72a5f7fb 100644 --- a/test/query_generator/enums/input_enum_test.dart +++ b/test/query_generator/enums/input_enum_test.dart @@ -155,7 +155,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -179,7 +178,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable OtherEnum other; @override - List get props => [s, my, other]; + List get props => [s, my, other]; Map toJson() => _$Custom$QueryRoot$QueryResponseToJson(this); } @@ -193,7 +192,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { Custom$QueryRoot$QueryResponse q; @override - List get props => [q]; + List get props => [q]; Map toJson() => _$Custom$QueryRootToJson(this); } @@ -207,7 +206,7 @@ class Input extends JsonSerializable with EquatableMixin { MyEnum e; @override - List get props => [e]; + List get props => [e]; Map toJson() => _$InputToJson(this); } @@ -245,7 +244,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { final OtherEnum o; @override - List get props => [$id, input, o]; + List get props => [$id, input, o]; @override Map toJson() => _$CustomArgumentsToJson(this); } @@ -324,7 +323,7 @@ class CustomQuery extends GraphQLQuery { final CustomArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override Custom$QueryRoot parse(Map json) => Custom$QueryRoot.fromJson(json); diff --git a/test/query_generator/enums/kw_prefix_test.dart b/test/query_generator/enums/kw_prefix_test.dart index 41ce082c..a6e89913 100644 --- a/test/query_generator/enums/kw_prefix_test.dart +++ b/test/query_generator/enums/kw_prefix_test.dart @@ -139,7 +139,7 @@ class SearchArticles$Query$Article extends JsonSerializable String title; @override - List get props => [id, title]; + List get props => [id, title]; Map toJson() => _$SearchArticles$Query$ArticleToJson(this); } @@ -153,7 +153,7 @@ class SearchArticles$Query extends JsonSerializable with EquatableMixin { List articles; @override - List get props => [articles]; + List get props => [articles]; Map toJson() => _$SearchArticles$QueryToJson(this); } @@ -170,7 +170,7 @@ class ArticleTitleWhereConditions extends JsonSerializable with EquatableMixin { String value; @override - List get props => [kw$operator, value]; + List get props => [kw$operator, value]; Map toJson() => _$ArticleTitleWhereConditionsToJson(this); } diff --git a/test/query_generator/enums/query_enum_test.dart b/test/query_generator/enums/query_enum_test.dart index fe6883d3..d921defb 100644 --- a/test/query_generator/enums/query_enum_test.dart +++ b/test/query_generator/enums/query_enum_test.dart @@ -109,7 +109,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable MyEnum e; @override - List get props => [e]; + List get props => [e]; Map toJson() => _$Custom$QueryRoot$QueryResponseToJson(this); } @@ -123,7 +123,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { Custom$QueryRoot$QueryResponse q; @override - List get props => [q]; + List get props => [q]; Map toJson() => _$Custom$QueryRootToJson(this); } diff --git a/test/query_generator/forwarder_test.dart b/test/query_generator/forwarder_test.dart index 8ffbb638..2d4ee7ca 100644 --- a/test/query_generator/forwarder_test.dart +++ b/test/query_generator/forwarder_test.dart @@ -87,7 +87,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { String a; @override - List get props => [a]; + List get props => [a]; Map toJson() => _$Custom$QueryRootToJson(this); } '''; diff --git a/test/query_generator/fragments/fragment_duplication_test.dart b/test/query_generator/fragments/fragment_duplication_test.dart index af284612..04909ec0 100644 --- a/test/query_generator/fragments/fragment_duplication_test.dart +++ b/test/query_generator/fragments/fragment_duplication_test.dart @@ -251,7 +251,7 @@ class PokemonData$Query$Pokemon extends JsonSerializable _$PokemonData$Query$PokemonFromJson(json); @override - List get props => [id, evolution, number, name]; + List get props => [id, evolution, number, name]; Map toJson() => _$PokemonData$Query$PokemonToJson(this); } @@ -265,7 +265,7 @@ class PokemonData$Query extends JsonSerializable with EquatableMixin { PokemonData$Query$Pokemon pokemon; @override - List get props => [pokemon]; + List get props => [pokemon]; Map toJson() => _$PokemonData$QueryToJson(this); } @@ -278,7 +278,7 @@ class PokemonMixin$Evolution extends JsonSerializable _$PokemonMixin$EvolutionFromJson(json); @override - List get props => [name]; + List get props => [name]; Map toJson() => _$PokemonMixin$EvolutionToJson(this); } @@ -292,7 +292,7 @@ class AllPokemonsData$Query$AllPokemons extends JsonSerializable _$AllPokemonsData$Query$AllPokemonsFromJson(json); @override - List get props => [id, evolution, number, name]; + List get props => [id, evolution, number, name]; Map toJson() => _$AllPokemonsData$Query$AllPokemonsToJson(this); } @@ -307,7 +307,7 @@ class AllPokemonsData$Query extends JsonSerializable with EquatableMixin { List allPokemons; @override - List get props => [allPokemons]; + List get props => [allPokemons]; Map toJson() => _$AllPokemonsData$QueryToJson(this); } '''; diff --git a/test/query_generator/fragments/fragment_glob_test.dart b/test/query_generator/fragments/fragment_glob_test.dart index 1caaee3c..0263f759 100644 --- a/test/query_generator/fragments/fragment_glob_test.dart +++ b/test/query_generator/fragments/fragment_glob_test.dart @@ -224,7 +224,7 @@ class Query$Query$Pokemon$Pokemon extends JsonSerializable _$Query$Query$Pokemon$PokemonFromJson(json); @override - List get props => [id, weight, attacks]; + List get props => [id, weight, attacks]; Map toJson() => _$Query$Query$Pokemon$PokemonToJson(this); } @@ -239,7 +239,7 @@ class Query$Query$Pokemon extends JsonSerializable List evolutions; @override - List get props => [id, weight, attacks, evolutions]; + List get props => [id, weight, attacks, evolutions]; Map toJson() => _$Query$Query$PokemonToJson(this); } @@ -253,7 +253,7 @@ class Query$Query extends JsonSerializable with EquatableMixin { Query$Query$Pokemon pokemon; @override - List get props => [pokemon]; + List get props => [pokemon]; Map toJson() => _$Query$QueryToJson(this); } @@ -266,7 +266,7 @@ class PokemonMixin$PokemonDimension extends JsonSerializable _$PokemonMixin$PokemonDimensionFromJson(json); @override - List get props => [minimum]; + List get props => [minimum]; Map toJson() => _$PokemonMixin$PokemonDimensionToJson(this); } @@ -279,7 +279,7 @@ class PokemonMixin$PokemonAttack extends JsonSerializable _$PokemonMixin$PokemonAttackFromJson(json); @override - List get props => [special]; + List get props => [special]; Map toJson() => _$PokemonMixin$PokemonAttackToJson(this); } @@ -292,7 +292,7 @@ class PokemonAttackMixin$Attack extends JsonSerializable _$PokemonAttackMixin$AttackFromJson(json); @override - List get props => [name]; + List get props => [name]; Map toJson() => _$PokemonAttackMixin$AttackToJson(this); } @@ -413,7 +413,7 @@ class QueryQuery extends GraphQLQuery { final String operationName = 'query'; @override - List get props => [document, operationName]; + List get props => [document, operationName]; @override Query$Query parse(Map json) => Query$Query.fromJson(json); } diff --git a/test/query_generator/fragments/fragment_on_fragments_test.dart b/test/query_generator/fragments/fragment_on_fragments_test.dart index 1e722d7e..2a991359 100644 --- a/test/query_generator/fragments/fragment_on_fragments_test.dart +++ b/test/query_generator/fragments/fragment_on_fragments_test.dart @@ -166,7 +166,7 @@ class Query$Query$Pokemon extends JsonSerializable _$Query$Query$PokemonFromJson(json); @override - List get props => [id, evolution, number, name]; + List get props => [id, evolution, number, name]; Map toJson() => _$Query$Query$PokemonToJson(this); } @@ -180,7 +180,7 @@ class Query$Query extends JsonSerializable with EquatableMixin { Query$Query$Pokemon pokemon; @override - List get props => [pokemon]; + List get props => [pokemon]; Map toJson() => _$Query$QueryToJson(this); } @@ -193,7 +193,7 @@ class PokemonMixin$Pokemon extends JsonSerializable _$PokemonMixin$PokemonFromJson(json); @override - List get props => [name]; + List get props => [name]; Map toJson() => _$PokemonMixin$PokemonToJson(this); } '''; diff --git a/test/query_generator/fragments/fragments_multiple_test.dart b/test/query_generator/fragments/fragments_multiple_test.dart index 606d0d62..dbfec50c 100644 --- a/test/query_generator/fragments/fragments_multiple_test.dart +++ b/test/query_generator/fragments/fragments_multiple_test.dart @@ -223,7 +223,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -256,7 +255,7 @@ class VoyagesData$Query$VoyageList$VoyageDetails$Voyage extends JsonSerializable String voyageNumber; @override - List get props => [dateFrom, dateTo, id, voyageNumber]; + List get props => [dateFrom, dateTo, id, voyageNumber]; Map toJson() => _$VoyagesData$Query$VoyageList$VoyageDetails$VoyageToJson(this); } @@ -275,7 +274,7 @@ class VoyagesData$Query$VoyageList$VoyageDetails extends JsonSerializable VoyagesData$Query$VoyageList$VoyageDetails$Voyage voyage; @override - List get props => [numberOfReports, voyage]; + List get props => [numberOfReports, voyage]; Map toJson() => _$VoyagesData$Query$VoyageList$VoyageDetailsToJson(this); } @@ -291,7 +290,7 @@ class VoyagesData$Query$VoyageList extends JsonSerializable List voyages; @override - List get props => [voyages]; + List get props => [voyages]; Map toJson() => _$VoyagesData$Query$VoyageListToJson(this); } @@ -305,7 +304,7 @@ class VoyagesData$Query extends JsonSerializable with EquatableMixin { VoyagesData$Query$VoyageList voyages; @override - List get props => [voyages]; + List get props => [voyages]; Map toJson() => _$VoyagesData$QueryToJson(this); } @@ -321,7 +320,7 @@ class PaginationInput extends JsonSerializable with EquatableMixin { int offset; @override - List get props => [limit, offset]; + List get props => [limit, offset]; Map toJson() => _$PaginationInputToJson(this); } @@ -336,7 +335,7 @@ class VoyagesDataArguments extends JsonSerializable with EquatableMixin { final PaginationInput input; @override - List get props => [input]; + List get props => [input]; @override Map toJson() => _$VoyagesDataArgumentsToJson(this); } @@ -459,7 +458,7 @@ class VoyagesDataQuery final VoyagesDataArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override VoyagesData$Query parse(Map json) => VoyagesData$Query.fromJson(json); diff --git a/test/query_generator/fragments/fragments_test.dart b/test/query_generator/fragments/fragments_test.dart index d67abb73..2ce6b862 100644 --- a/test/query_generator/fragments/fragments_test.dart +++ b/test/query_generator/fragments/fragments_test.dart @@ -88,7 +88,7 @@ class SomeQuery$SomeObject extends JsonSerializable _$SomeQuery$SomeObjectFromJson(json); @override - List get props => [s, i]; + List get props => [s, i]; Map toJson() => _$SomeQuery$SomeObjectToJson(this); } '''; diff --git a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart index 3178a653..6d0bc47c 100644 --- a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart +++ b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart @@ -144,7 +144,7 @@ class SomeObject extends JsonSerializable with EquatableMixin, MyFragmentMixin { _$SomeObjectFromJson(json); @override - List get props => [s, i]; + List get props => [s, i]; Map toJson() => _$SomeObjectToJson(this); } @@ -158,7 +158,7 @@ class MoreData extends JsonSerializable with EquatableMixin { SomeObject someObject; @override - List get props => [someObject]; + List get props => [someObject]; Map toJson() => _$MoreDataToJson(this); } @@ -174,7 +174,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin { MoreData moreData; @override - List get props => [someObject, moreData]; + List get props => [someObject, moreData]; Map toJson() => _$SomeQuery$QueryResponseToJson(this); } '''; diff --git a/test/query_generator/interfaces/interface_fragment_glob_test.dart b/test/query_generator/interfaces/interface_fragment_glob_test.dart index 63c0c067..8530a9c9 100644 --- a/test/query_generator/interfaces/interface_fragment_glob_test.dart +++ b/test/query_generator/interfaces/interface_fragment_glob_test.dart @@ -180,7 +180,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; import 'package:gql/ast.dart'; @@ -200,7 +199,7 @@ class Custom$Query$NodeById$User extends Custom$Query$NodeById _$Custom$Query$NodeById$UserFromJson(json); @override - List get props => [id, username]; + List get props => [id, username]; Map toJson() => _$Custom$Query$NodeById$UserToJson(this); } @@ -215,7 +214,7 @@ class Custom$Query$NodeById$ChatMessage$User _$Custom$Query$NodeById$ChatMessage$UserFromJson(json); @override - List get props => [id, username]; + List get props => [id, username]; Map toJson() => _$Custom$Query$NodeById$ChatMessage$UserToJson(this); } @@ -234,7 +233,7 @@ class Custom$Query$NodeById$ChatMessage extends Custom$Query$NodeById Custom$Query$NodeById$ChatMessage$User user; @override - List get props => [message, user]; + List get props => [message, user]; Map toJson() => _$Custom$Query$NodeById$ChatMessageToJson(this); } @@ -260,7 +259,7 @@ class Custom$Query$NodeById extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [id, $$typename]; + List get props => [id, $$typename]; Map toJson() { switch ($$typename) { case r'User': @@ -283,7 +282,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { Custom$Query$NodeById nodeById; @override - List get props => [nodeById]; + List get props => [nodeById]; Map toJson() => _$Custom$QueryToJson(this); } '''; diff --git a/test/query_generator/interfaces/interface_possible_types_test.dart b/test/query_generator/interfaces/interface_possible_types_test.dart index 0776c71c..8c5fde3e 100644 --- a/test/query_generator/interfaces/interface_possible_types_test.dart +++ b/test/query_generator/interfaces/interface_possible_types_test.dart @@ -147,7 +147,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; import 'package:gql/ast.dart'; @@ -163,7 +162,7 @@ class Custom$Query$Node$User extends Custom$Query$Node with EquatableMixin { String username; @override - List get props => [username]; + List get props => [username]; Map toJson() => _$Custom$Query$Node$UserToJson(this); } @@ -178,7 +177,7 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node String message; @override - List get props => [message]; + List get props => [message]; Map toJson() => _$Custom$Query$Node$ChatMessageToJson(this); } @@ -203,7 +202,7 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [id, $$typename]; + List get props => [id, $$typename]; Map toJson() { switch ($$typename) { case r'User': @@ -226,7 +225,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { Custom$Query$Node nodeById; @override - List get props => [nodeById]; + List get props => [nodeById]; Map toJson() => _$Custom$QueryToJson(this); } '''; diff --git a/test/query_generator/interfaces/interface_test.dart b/test/query_generator/interfaces/interface_test.dart index acfada54..3ca3b91a 100644 --- a/test/query_generator/interfaces/interface_test.dart +++ b/test/query_generator/interfaces/interface_test.dart @@ -171,7 +171,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; import 'package:gql/ast.dart'; @@ -191,7 +190,7 @@ class Custom$Query$Node$User extends Custom$Query$Node _$Custom$Query$Node$UserFromJson(json); @override - List get props => [id, username]; + List get props => [id, username]; Map toJson() => _$Custom$Query$Node$UserToJson(this); } @@ -205,7 +204,7 @@ class Custom$Query$Node$ChatMessage$User extends Custom$Query$Node$ChatMessage _$Custom$Query$Node$ChatMessage$UserFromJson(json); @override - List get props => [id, username]; + List get props => [id, username]; Map toJson() => _$Custom$Query$Node$ChatMessage$UserToJson(this); } @@ -223,7 +222,7 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node Custom$Query$Node$ChatMessage$User user; @override - List get props => [message, user]; + List get props => [message, user]; Map toJson() => _$Custom$Query$Node$ChatMessageToJson(this); } @@ -248,7 +247,7 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin { String $$typename; @override - List get props => [id, $$typename]; + List get props => [id, $$typename]; Map toJson() { switch ($$typename) { case r'User': @@ -271,7 +270,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { Custom$Query$Node nodeById; @override - List get props => [nodeById]; + List get props => [nodeById]; Map toJson() => _$Custom$QueryToJson(this); } '''; diff --git a/test/query_generator/multiple_operations_per_file_test.dart b/test/query_generator/multiple_operations_per_file_test.dart index 1370bc3a..db7d436a 100644 --- a/test/query_generator/multiple_operations_per_file_test.dart +++ b/test/query_generator/multiple_operations_per_file_test.dart @@ -169,7 +169,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -188,7 +187,7 @@ class MutData$Mutation$MutationResponse extends JsonSerializable String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$MutData$Mutation$MutationResponseToJson(this); } @@ -203,7 +202,7 @@ class MutData$Mutation extends JsonSerializable with EquatableMixin { MutData$Mutation$MutationResponse mut; @override - List get props => [mut]; + List get props => [mut]; Map toJson() => _$MutData$MutationToJson(this); } @@ -216,7 +215,7 @@ class Input extends JsonSerializable with EquatableMixin { String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$InputToJson(this); } @@ -234,7 +233,7 @@ class QueData$Query$QueryResponse extends JsonSerializable with EquatableMixin { List list; @override - List get props => [s, i, list]; + List get props => [s, i, list]; Map toJson() => _$QueData$Query$QueryResponseToJson(this); } @@ -248,7 +247,7 @@ class QueData$Query extends JsonSerializable with EquatableMixin { QueData$Query$QueryResponse que; @override - List get props => [que]; + List get props => [que]; Map toJson() => _$QueData$QueryToJson(this); } @@ -263,7 +262,7 @@ class MutDataArguments extends JsonSerializable with EquatableMixin { final Input input; @override - List get props => [input]; + List get props => [input]; @override Map toJson() => _$MutDataArgumentsToJson(this); } @@ -374,7 +373,7 @@ class MutDataMutation extends GraphQLQuery { final MutDataArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override MutData$Mutation parse(Map json) => MutData$Mutation.fromJson(json); @@ -393,7 +392,7 @@ class QueDataArguments extends JsonSerializable with EquatableMixin { final String stringNullable; @override - List get props => [intsNonNullable, stringNullable]; + List get props => [intsNonNullable, stringNullable]; @override Map toJson() => _$QueDataArgumentsToJson(this); } @@ -504,7 +503,7 @@ class QueDataQuery extends GraphQLQuery { final QueDataArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override QueData$Query parse(Map json) => QueData$Query.fromJson(json); diff --git a/test/query_generator/multiple_queries_test.dart b/test/query_generator/multiple_queries_test.dart index b200ebe8..1255921d 100644 --- a/test/query_generator/multiple_queries_test.dart +++ b/test/query_generator/multiple_queries_test.dart @@ -97,7 +97,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { int i; @override - List get props => [s, i]; + List get props => [s, i]; Map toJson() => _$SomeQuery$SomeObjectToJson(this); } @@ -111,7 +111,7 @@ class AnotherQuery$SomeObject extends JsonSerializable with EquatableMixin { String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$AnotherQuery$SomeObjectToJson(this); } '''; diff --git a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart index b1ceeadb..ccbbf659 100644 --- a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart @@ -134,7 +134,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -152,7 +151,7 @@ class SomeQuery$QueryRoot$SomeObject extends JsonSerializable String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$SomeQuery$QueryRoot$SomeObjectToJson(this); } @@ -166,7 +165,7 @@ class SomeQuery$QueryRoot extends JsonSerializable with EquatableMixin { SomeQuery$QueryRoot$SomeObject o; @override - List get props => [o]; + List get props => [o]; Map toJson() => _$SomeQuery$QueryRootToJson(this); } @@ -187,7 +186,7 @@ class ComplexInput extends JsonSerializable with EquatableMixin { List> i; @override - List get props => [s, e, ls, i]; + List get props => [s, e, ls, i]; Map toJson() => _$ComplexInputToJson(this); } @@ -211,7 +210,7 @@ class SomeQueryArguments extends JsonSerializable with EquatableMixin { final ComplexInput filter; @override - List get props => [filter]; + List get props => [filter]; @override Map toJson() => _$SomeQueryArgumentsToJson(this); } @@ -262,7 +261,7 @@ class SomeQueryQuery final SomeQueryArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override SomeQuery$QueryRoot parse(Map json) => SomeQuery$QueryRoot.fromJson(json); diff --git a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart index bd8444e3..b17ac92b 100644 --- a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart @@ -134,7 +134,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -155,7 +154,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$Custom$MutationRoot$MutationResponseToJson(this); } @@ -170,7 +169,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { Custom$MutationRoot$MutationResponse mut; @override - List get props => [mut]; + List get props => [mut]; Map toJson() => _$Custom$MutationRootToJson(this); } @@ -186,7 +185,7 @@ class Input extends JsonSerializable with EquatableMixin { MyUuid id; @override - List get props => [id]; + List get props => [id]; Map toJson() => _$InputToJson(this); } @@ -211,7 +210,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { final List listIds; @override - List get props => [input, previousId, listIds]; + List get props => [input, previousId, listIds]; @override Map toJson() => _$CustomArgumentsToJson(this); } @@ -282,7 +281,7 @@ class CustomMutation final CustomArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override Custom$MutationRoot parse(Map json) => Custom$MutationRoot.fromJson(json); diff --git a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart index d151bbd7..e67c4cbf 100644 --- a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart @@ -121,7 +121,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -139,7 +138,7 @@ class SomeQuery$QueryRoot$SomeObject extends JsonSerializable String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$SomeQuery$QueryRoot$SomeObjectToJson(this); } @@ -153,7 +152,7 @@ class SomeQuery$QueryRoot extends JsonSerializable with EquatableMixin { SomeQuery$QueryRoot$SomeObject o; @override - List get props => [o]; + List get props => [o]; Map toJson() => _$SomeQuery$QueryRootToJson(this); } @@ -166,7 +165,7 @@ class Input extends JsonSerializable with EquatableMixin { SubInput s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$InputToJson(this); } @@ -180,7 +179,7 @@ class SubInput extends JsonSerializable with EquatableMixin { String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$SubInputToJson(this); } @@ -195,7 +194,7 @@ class SomeQueryArguments extends JsonSerializable with EquatableMixin { final Input input; @override - List get props => [input]; + List get props => [input]; @override Map toJson() => _$SomeQueryArgumentsToJson(this); } @@ -246,7 +245,7 @@ class SomeQueryQuery final SomeQueryArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override SomeQuery$QueryRoot parse(Map json) => SomeQuery$QueryRoot.fromJson(json); diff --git a/test/query_generator/mutations_and_inputs/input_duplication_test.dart b/test/query_generator/mutations_and_inputs/input_duplication_test.dart index 3ec53274..b10d64d9 100644 --- a/test/query_generator/mutations_and_inputs/input_duplication_test.dart +++ b/test/query_generator/mutations_and_inputs/input_duplication_test.dart @@ -161,7 +161,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -178,7 +177,7 @@ class Custom$Mutation$Mut extends JsonSerializable with EquatableMixin { String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$Custom$Mutation$MutToJson(this); } @@ -192,7 +191,7 @@ class Custom$Mutation extends JsonSerializable with EquatableMixin { Custom$Mutation$Mut mut; @override - List get props => [mut]; + List get props => [mut]; Map toJson() => _$Custom$MutationToJson(this); } @@ -205,7 +204,7 @@ class Input extends JsonSerializable with EquatableMixin { String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$InputToJson(this); } @@ -219,7 +218,7 @@ class CustomList$Mutation$MutList extends JsonSerializable with EquatableMixin { String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$CustomList$Mutation$MutListToJson(this); } @@ -233,7 +232,7 @@ class CustomList$Mutation extends JsonSerializable with EquatableMixin { CustomList$Mutation$MutList mutList; @override - List get props => [mutList]; + List get props => [mutList]; Map toJson() => _$CustomList$MutationToJson(this); } @@ -248,7 +247,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { final Input input; @override - List get props => [input]; + List get props => [input]; @override Map toJson() => _$CustomArgumentsToJson(this); } @@ -298,7 +297,7 @@ class CustomMutation extends GraphQLQuery { final CustomArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override Custom$Mutation parse(Map json) => Custom$Mutation.fromJson(json); @@ -315,7 +314,7 @@ class CustomListArguments extends JsonSerializable with EquatableMixin { final List input; @override - List get props => [input]; + List get props => [input]; @override Map toJson() => _$CustomListArgumentsToJson(this); } @@ -368,7 +367,7 @@ class CustomListMutation final CustomListArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override CustomList$Mutation parse(Map json) => CustomList$Mutation.fromJson(json); diff --git a/test/query_generator/mutations_and_inputs/mutations_test.dart b/test/query_generator/mutations_and_inputs/mutations_test.dart index e6c42cca..1668caed 100644 --- a/test/query_generator/mutations_and_inputs/mutations_test.dart +++ b/test/query_generator/mutations_and_inputs/mutations_test.dart @@ -173,7 +173,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -192,7 +191,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$Custom$MutationRoot$MutationResponseToJson(this); } @@ -207,7 +206,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { Custom$MutationRoot$MutationResponse mut; @override - List get props => [mut]; + List get props => [mut]; Map toJson() => _$Custom$MutationRootToJson(this); } @@ -220,7 +219,7 @@ class Input extends JsonSerializable with EquatableMixin { String s; @override - List get props => [s]; + List get props => [s]; Map toJson() => _$InputToJson(this); } @@ -237,7 +236,7 @@ class $custom$MutationRoot$$MutationResponse extends JsonSerializable String $s; @override - List get props => [$s]; + List get props => [$s]; Map toJson() => _$$custom$MutationRoot$$MutationResponseToJson(this); } @@ -253,7 +252,7 @@ class $custom$MutationRoot extends JsonSerializable with EquatableMixin { $custom$MutationRoot$$MutationResponse $mut; @override - List get props => [$mut]; + List get props => [$mut]; Map toJson() => _$$custom$MutationRootToJson(this); } @@ -267,7 +266,7 @@ class $Input extends JsonSerializable with EquatableMixin { String $s; @override - List get props => [$s]; + List get props => [$s]; Map toJson() => _$$InputToJson(this); } @@ -282,7 +281,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { final Input input; @override - List get props => [input]; + List get props => [input]; @override Map toJson() => _$CustomArgumentsToJson(this); } @@ -333,7 +332,7 @@ class CustomMutation final CustomArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override Custom$MutationRoot parse(Map json) => Custom$MutationRoot.fromJson(json); @@ -350,7 +349,7 @@ class $customArguments extends JsonSerializable with EquatableMixin { final $Input input; @override - List get props => [input]; + List get props => [input]; @override Map toJson() => _$$customArgumentsToJson(this); } @@ -401,7 +400,7 @@ class $customMutation final $customArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override $custom$MutationRoot parse(Map json) => $custom$MutationRoot.fromJson(json); diff --git a/test/query_generator/mutations_and_inputs/recursive_input_test.dart b/test/query_generator/mutations_and_inputs/recursive_input_test.dart index b4a41346..81f8be65 100644 --- a/test/query_generator/mutations_and_inputs/recursive_input_test.dart +++ b/test/query_generator/mutations_and_inputs/recursive_input_test.dart @@ -82,7 +82,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; import 'package:gql/ast.dart'; @@ -98,7 +97,7 @@ class Custom$Mutation extends JsonSerializable with EquatableMixin { String mut; @override - List get props => [mut]; + List get props => [mut]; Map toJson() => _$Custom$MutationToJson(this); } @@ -113,7 +112,7 @@ class Input extends JsonSerializable with EquatableMixin { Input or; @override - List get props => [and, or]; + List get props => [and, or]; Map toJson() => _$InputToJson(this); } '''; diff --git a/test/query_generator/naming/casing_conversion_test.dart b/test/query_generator/naming/casing_conversion_test.dart index b4ec79a6..71aca88c 100644 --- a/test/query_generator/naming/casing_conversion_test.dart +++ b/test/query_generator/naming/casing_conversion_test.dart @@ -210,7 +210,6 @@ final LibraryDefinition libraryDefinition = const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND -import 'package:meta/meta.dart'; import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -239,7 +238,7 @@ class SomeObject extends JsonSerializable with EquatableMixin { MyEnum e; @override - List get props => [ + List get props => [ camelCaseField, pascalCaseField, snakeCaseField, @@ -259,7 +258,7 @@ class SomeQuery$Query extends JsonSerializable with EquatableMixin { SomeObject query; @override - List get props => [query]; + List get props => [query]; Map toJson() => _$SomeQuery$QueryToJson(this); } @@ -289,7 +288,7 @@ class Input extends JsonSerializable with EquatableMixin { MyEnum e; @override - List get props => [ + List get props => [ camelCaseField, pascalCaseField, snakeCaseField, @@ -323,7 +322,7 @@ class SomeQueryArguments extends JsonSerializable with EquatableMixin { final Input filter; @override - List get props => [filter]; + List get props => [filter]; @override Map toJson() => _$SomeQueryArgumentsToJson(this); } @@ -397,7 +396,7 @@ class SomeQueryQuery extends GraphQLQuery { final SomeQueryArguments variables; @override - List get props => [document, operationName, variables]; + List get props => [document, operationName, variables]; @override SomeQuery$Query parse(Map json) => SomeQuery$Query.fromJson(json); diff --git a/test/query_generator/naming/simple_naming_test.dart b/test/query_generator/naming/simple_naming_test.dart index 04a78009..08af17aa 100644 --- a/test/query_generator/naming/simple_naming_test.dart +++ b/test/query_generator/naming/simple_naming_test.dart @@ -120,7 +120,7 @@ class ClientEventItem extends JsonSerializable with EquatableMixin { int type; @override - List get props => [type]; + List get props => [type]; Map toJson() => _$ClientEventItemToJson(this); } @@ -134,7 +134,7 @@ class ClientEventPage extends JsonSerializable with EquatableMixin { List items; @override - List get props => [items]; + List get props => [items]; Map toJson() => _$ClientEventPageToJson(this); } @@ -148,7 +148,7 @@ class ClientEventsData$Query extends JsonSerializable with EquatableMixin { ClientEventPage clientEvents; @override - List get props => [clientEvents]; + List get props => [clientEvents]; Map toJson() => _$ClientEventsData$QueryToJson(this); } @@ -191,7 +191,7 @@ class ClientEventsDataQuery final String operationName = 'ClientEventsData'; @override - List get props => [document, operationName]; + List get props => [document, operationName]; @override ClientEventsData$Query parse(Map json) => ClientEventsData$Query.fromJson(json); diff --git a/test/query_generator/scalars/custom_scalars_test.dart b/test/query_generator/scalars/custom_scalars_test.dart index 5094685c..9b82a6be 100644 --- a/test/query_generator/scalars/custom_scalars_test.dart +++ b/test/query_generator/scalars/custom_scalars_test.dart @@ -197,7 +197,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { String a; @override - List get props => [a]; + List get props => [a]; Map toJson() => _$Query$SomeObjectToJson(this); } '''; @@ -224,7 +224,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { MyDartUuid a; @override - List get props => [a]; + List get props => [a]; Map toJson() => _$Query$SomeObjectToJson(this); } '''; @@ -252,7 +252,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { MyUuid a; @override - List get props => [a]; + List get props => [a]; Map toJson() => _$Query$SomeObjectToJson(this); } '''; diff --git a/test/query_generator/scalars/scalars_test.dart b/test/query_generator/scalars/scalars_test.dart index 0acb47be..6afa9d3b 100644 --- a/test/query_generator/scalars/scalars_test.dart +++ b/test/query_generator/scalars/scalars_test.dart @@ -131,7 +131,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { String id; @override - List get props => [i, f, s, b, id]; + List get props => [i, f, s, b, id]; Map toJson() => _$SomeQuery$SomeObjectToJson(this); } '''; diff --git a/test/query_generator/scalars/unused_custom_scalars_test.dart b/test/query_generator/scalars/unused_custom_scalars_test.dart index 05c342b7..685e7bad 100644 --- a/test/query_generator/scalars/unused_custom_scalars_test.dart +++ b/test/query_generator/scalars/unused_custom_scalars_test.dart @@ -79,7 +79,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { String a; @override - List get props => [a]; + List get props => [a]; Map toJson() => _$Query$SomeObjectToJson(this); } '''; From bc311adb884e61138fcb70933137e337f22ddcc2 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Tue, 16 Mar 2021 16:24:13 -0300 Subject: [PATCH 08/31] typeNameField should be a ClassPropertyName --- lib/generator/data/class_definition.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/generator/data/class_definition.dart b/lib/generator/data/class_definition.dart index e9021eb7..d9c05921 100644 --- a/lib/generator/data/class_definition.dart +++ b/lib/generator/data/class_definition.dart @@ -27,7 +27,7 @@ class ClassDefinition extends Definition with DataPrinter { final Map factoryPossibilities; /// The field name used to resolve this class type. - final TypeName typeNameField; + final ClassPropertyName typeNameField; /// Whether this is an input object or not. final bool isInput; @@ -40,10 +40,10 @@ class ClassDefinition extends Definition with DataPrinter { this.implementations = const [], this.mixins = const [], this.factoryPossibilities = const {}, - TypeName typeNameField, + ClassPropertyName typeNameField, this.isInput = false, }) : assert(hasValue(name)), - typeNameField = typeNameField ?? TypeName(name: '__typename'), + typeNameField = typeNameField ?? ClassPropertyName(name: '__typename'), super(name: name); @override From 12db70ac088efe4afcc2b9a7a18f8086007b3cf9 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Tue, 16 Mar 2021 16:24:33 -0300 Subject: [PATCH 09/31] Fix print_helpers_test with latest changes --- test/generator/print_helpers_test.dart | 43 +++++++++++++++----------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/test/generator/print_helpers_test.dart b/test/generator/print_helpers_test.dart index b044476e..3b589d0e 100644 --- a/test/generator/print_helpers_test.dart +++ b/test/generator/print_helpers_test.dart @@ -119,11 +119,11 @@ void main() { final str = specToString(fragmentClassDefinitionToSpec(definition)); expect(str, '''mixin FragmentMixin { - Type name; + Type? name; @override - Type name; + Type? name; @Test - Type name; + Type? name; } '''); }); @@ -193,7 +193,7 @@ class AClass extends AnotherClass with EquatableMixin { 'ASubClass': ClassName(name: 'ASubClass'), 'BSubClass': ClassName(name: 'BSubClass'), }, - typeNameField: TypeName(name: '__typename'), + typeNameField: ClassPropertyName(name: '__typename'), ); final str = specToString(classDefinitionToSpec(definition, [], [])); @@ -248,9 +248,9 @@ class AClass extends JsonSerializable with EquatableMixin { factory AClass.fromJson(Map json) => _\$AClassFromJson(json); - Type name; + Type? name; - AnotherType anotherName; + AnotherType? anotherName; @override List get props => [name, anotherName]; @@ -289,17 +289,17 @@ class AClass extends JsonSerializable with EquatableMixin { factory AClass.fromJson(Map json) => _\$AClassFromJson(json); - Type name; + Type? name; @Hey() - AnnotatedProperty name; + AnnotatedProperty? name; @override - OverridenProperty name; + OverridenProperty? name; @override @Ho() - AllAtOnce name; + AllAtOnce? name; @override List get props => [name, name, name, name]; @@ -348,9 +348,8 @@ class AClass extends JsonSerializable with EquatableMixin, FragmentMixin { type: TypeName(name: 'Type'), name: ClassPropertyName(name: 'name')), ClassProperty( - type: TypeName(name: 'AnotherType'), - name: ClassPropertyName(name: 'anotherName'), - isNonNull: true), + type: TypeName(name: 'AnotherType', isNonNull: true), + name: ClassPropertyName(name: 'anotherName')), ], isInput: true, ); @@ -359,13 +358,13 @@ class AClass extends JsonSerializable with EquatableMixin, FragmentMixin { expect(str, '''@JsonSerializable(explicitToJson: true) class AClass extends JsonSerializable with EquatableMixin { - AClass({this.name, @required this.anotherName}); + AClass({this.name, required this.anotherName}); factory AClass.fromJson(Map json) => _\$AClassFromJson(json); - Type name; + Type? name; - AnotherType anotherName; + late AnotherType anotherName; @override List get props => [name, anotherName]; @@ -435,6 +434,7 @@ class AClass extends JsonSerializable with EquatableMixin { writeLibraryDefinitionToBuffer(buffer, ignoreForFile, definition); expect(buffer.toString(), '''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -452,6 +452,7 @@ part 'test_query.graphql.g.dart'; writeLibraryDefinitionToBuffer(buffer, ignoreForFile, definition); expect(buffer.toString(), '''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -479,6 +480,7 @@ part 'test_query.graphql.g.dart'; writeLibraryDefinitionToBuffer(buffer, ignoreForFile, definition); expect(buffer.toString(), '''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -531,6 +533,7 @@ class TestQueryQuery extends GraphQLQuery { writeLibraryDefinitionToBuffer(buffer, ignoreForFile, definition); expect(buffer.toString(), '''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -546,7 +549,7 @@ class TestQueryArguments extends JsonSerializable with EquatableMixin { factory TestQueryArguments.fromJson(Map json) => _\$TestQueryArgumentsFromJson(json); - final Type name; + final Type? name; @override List get props => [name]; @@ -603,7 +606,7 @@ class TestQueryArguments extends JsonSerializable with EquatableMixin { factory TestQueryArguments.fromJson(Map json) => _\$TestQueryArgumentsFromJson(json); - final Type name; + final Type? name; @override List get props => [name]; @@ -679,6 +682,7 @@ class TestQueryArguments extends JsonSerializable with EquatableMixin { writeLibraryDefinitionToBuffer(buffer, ignoreForFile, definition); expect(buffer.toString(), '''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -712,6 +716,7 @@ enum SomeEnum { writeLibraryDefinitionToBuffer(buffer, ignoreForFile, definition); expect(buffer.toString(), '''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -728,6 +733,7 @@ part 'test_query.graphql.g.dart'; writeLibraryDefinitionToBuffer(buffer, ignoreForFile, definition); expect(buffer.toString(), '''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -745,6 +751,7 @@ part 'test_query.graphql.g.dart'; writeLibraryDefinitionToBuffer(buffer, ignoreForFile, definition); expect(buffer.toString(), '''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 // ignore_for_file: my_rule_1, my_rule_2 import 'package:json_annotation/json_annotation.dart'; From 692d3800257f14fdf16c0a6770a0aed636062b6f Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Tue, 16 Mar 2021 16:33:53 -0300 Subject: [PATCH 10/31] Change all typeNameField to ClassPropertyName --- .../aliases/alias_on_leaves_test.dart | 4 ++-- .../aliases/alias_on_object_test.dart | 6 ++--- .../append_type_name_test.dart | 24 +++++++++---------- .../field_not_found_mutation_test.dart | 8 +++---- .../ast_schema/input_types_test.dart | 10 ++++---- .../ast_schema/missing_schema_test.dart | 2 +- .../multiple_schema_mappint_test.dart | 10 ++++---- .../deprecated_enum_value_test.dart | 2 +- .../deprecated/deprecated_field_test.dart | 6 ++--- .../deprecated_input_object_field_test.dart | 6 ++--- .../deprecated_interface_field_test.dart | 10 ++++---- .../enums/enum_duplication_test.dart | 8 +++---- .../query_generator/enums/enum_list_test.dart | 4 ++-- .../enums/filter_enum_test.dart | 6 ++--- .../enums/input_enum_list_test.dart | 4 ++-- .../enums/input_enum_test.dart | 6 ++--- .../query_generator/enums/kw_prefix_test.dart | 6 ++--- .../enums/query_enum_test.dart | 4 ++-- test/query_generator/forwarder_test.dart | 2 +- .../fragments/fragment_duplication_test.dart | 12 +++++----- .../fragments/fragment_glob_test.dart | 12 +++++----- .../fragments/fragment_on_fragments_test.dart | 6 ++--- .../fragments/fragments_multiple_test.dart | 10 ++++---- .../fragments/fragments_test.dart | 2 +- ...iple_references_on_simple_naming_test.dart | 8 +++---- .../interface_fragment_glob_test.dart | 10 ++++---- .../interface_possible_types_test.dart | 8 +++---- .../interfaces/interface_test.dart | 10 ++++---- .../multiple_operations_per_file_test.dart | 10 ++++---- .../multiple_queries_test.dart | 4 ++-- .../complex_input_objects_test.dart | 6 ++--- .../custom_scalars_on_input_objects_test.dart | 6 ++--- .../filter_input_objects_test.dart | 8 +++---- .../input_duplication_test.dart | 12 +++++----- .../mutations_and_inputs/mutations_test.dart | 12 +++++----- .../non_nullable_list_inputs_test.dart | 4 ++-- .../recursive_input_test.dart | 4 ++-- .../naming/casing_conversion_test.dart | 6 ++--- .../naming/simple_naming_test.dart | 6 ++--- test/query_generator/nnbd_test.dart | 2 +- .../query_generator/query_generator_test.dart | 18 +++++++------- .../scalars/custom_scalars_test.dart | 6 ++--- .../query_generator/scalars/scalars_test.dart | 2 +- .../scalars/unused_custom_scalars_test.dart | 2 +- test/query_generator/subscription_test.dart | 4 ++-- test/query_generator/union_types_test.dart | 8 +++---- 46 files changed, 163 insertions(+), 163 deletions(-) diff --git a/test/query_generator/aliases/alias_on_leaves_test.dart b/test/query_generator/aliases/alias_on_leaves_test.dart index 172257ba..ebde6887 100644 --- a/test/query_generator/aliases/alias_on_leaves_test.dart +++ b/test/query_generator/aliases/alias_on_leaves_test.dart @@ -78,7 +78,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_Response'), @@ -95,7 +95,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/aliases/alias_on_object_test.dart b/test/query_generator/aliases/alias_on_object_test.dart index 9aab8a1b..9f3908a0 100644 --- a/test/query_generator/aliases/alias_on_object_test.dart +++ b/test/query_generator/aliases/alias_on_object_test.dart @@ -62,7 +62,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_QueryResponse$_anotherObject'), @@ -74,7 +74,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_QueryResponse'), @@ -97,7 +97,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/append_type_name_test.dart b/test/query_generator/append_type_name_test.dart index 92acebcb..742ca845 100644 --- a/test/query_generator/append_type_name_test.dart +++ b/test/query_generator/append_type_name_test.dart @@ -58,7 +58,7 @@ void main() { isResolveType: true) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -76,7 +76,7 @@ void main() { isResolveType: true) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -174,7 +174,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { isResolveType: true) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -192,7 +192,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { isResolveType: true) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -288,7 +288,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ], mixins: [FragmentName(name: r'QueryResponseMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -306,7 +306,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { isResolveType: true) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'QueryResponseMixin'), @@ -434,7 +434,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ], extension: ClassName(name: r'Custom$_QueryRoot$_q'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot$_q$_typeB'), @@ -453,7 +453,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ], extension: ClassName(name: r'Custom$_QueryRoot$_q'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot$_q'), @@ -471,7 +471,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { r'TypeB': ClassName(name: r'Custom$_QueryRoot$_q$_TypeB') }, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -489,7 +489,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { isResolveType: true) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -631,7 +631,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ], mixins: [FragmentName(name: r'QueryResponseMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -650,7 +650,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { isResolveType: true) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'QueryResponseMixin'), diff --git a/test/query_generator/ast_schema/field_not_found_mutation_test.dart b/test/query_generator/ast_schema/field_not_found_mutation_test.dart index 7dbafcaf..cec6ede0 100644 --- a/test/query_generator/ast_schema/field_not_found_mutation_test.dart +++ b/test/query_generator/ast_schema/field_not_found_mutation_test.dart @@ -74,7 +74,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName( @@ -89,7 +89,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'CreateThing$_MutationRoot'), @@ -102,7 +102,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'CreateThingInput'), @@ -119,7 +119,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/ast_schema/input_types_test.dart b/test/query_generator/ast_schema/input_types_test.dart index b89d0f33..776acfca 100644 --- a/test/query_generator/ast_schema/input_types_test.dart +++ b/test/query_generator/ast_schema/input_types_test.dart @@ -79,7 +79,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName( @@ -94,7 +94,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'CreateThing$_MutationRoot'), @@ -107,7 +107,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'OtherObjectInput'), @@ -119,7 +119,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true), ClassDefinition( name: ClassName(name: r'CreateThingInput'), @@ -141,7 +141,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/ast_schema/missing_schema_test.dart b/test/query_generator/ast_schema/missing_schema_test.dart index 149c30cc..b5063edf 100644 --- a/test/query_generator/ast_schema/missing_schema_test.dart +++ b/test/query_generator/ast_schema/missing_schema_test.dart @@ -45,7 +45,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart index 793987ed..43db828b 100644 --- a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart +++ b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart @@ -180,7 +180,7 @@ final LibraryDefinition libraryDefinitionA = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'BrowseArticles$_Query'), @@ -192,7 +192,7 @@ final LibraryDefinition libraryDefinitionA = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: true, @@ -253,7 +253,7 @@ final libraryDefinitionB = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'BrowseRepositories$_Query'), @@ -266,7 +266,7 @@ final libraryDefinitionB = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'NotificationOptionInput'), @@ -286,7 +286,7 @@ final libraryDefinitionB = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/deprecated/deprecated_enum_value_test.dart b/test/query_generator/deprecated/deprecated_enum_value_test.dart index c541efd6..cd6f5f8c 100644 --- a/test/query_generator/deprecated/deprecated_enum_value_test.dart +++ b/test/query_generator/deprecated/deprecated_enum_value_test.dart @@ -81,7 +81,7 @@ final LibraryDefinition libraryDefinition = ]) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/deprecated/deprecated_field_test.dart b/test/query_generator/deprecated/deprecated_field_test.dart index 6aa86217..8e313585 100644 --- a/test/query_generator/deprecated/deprecated_field_test.dart +++ b/test/query_generator/deprecated/deprecated_field_test.dart @@ -70,7 +70,7 @@ final LibraryDefinition libraryDefinition = ), ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), ClassDefinition( @@ -89,7 +89,7 @@ final LibraryDefinition libraryDefinition = ), ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), ClassDefinition( @@ -109,7 +109,7 @@ final LibraryDefinition libraryDefinition = ) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ) ], diff --git a/test/query_generator/deprecated/deprecated_input_object_field_test.dart b/test/query_generator/deprecated/deprecated_input_object_field_test.dart index bb51fdb0..9a5c3e78 100644 --- a/test/query_generator/deprecated/deprecated_input_object_field_test.dart +++ b/test/query_generator/deprecated/deprecated_input_object_field_test.dart @@ -62,7 +62,7 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( ), ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), ClassDefinition( @@ -75,7 +75,7 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( ), ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), ClassDefinition( @@ -96,7 +96,7 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( ), ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true, ), ], diff --git a/test/query_generator/deprecated/deprecated_interface_field_test.dart b/test/query_generator/deprecated/deprecated_interface_field_test.dart index 6ea89e73..251dfd8d 100644 --- a/test/query_generator/deprecated/deprecated_interface_field_test.dart +++ b/test/query_generator/deprecated/deprecated_interface_field_test.dart @@ -85,7 +85,7 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( extension: ClassName(name: r'Custom$_Query$_Node'), mixins: [FragmentName(name: r'UserFragMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), ClassDefinition( @@ -93,7 +93,7 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( extension: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), mixins: [FragmentName(name: r'UserFragMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), ClassDefinition( @@ -114,7 +114,7 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( ], extension: ClassName(name: r'Custom$_Query$_Node'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), ClassDefinition( @@ -140,7 +140,7 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( r'User': ClassName(name: r'Custom$_Query$_Node$_User'), r'ChatMessage': ClassName(name: r'Custom$_Query$_Node$_ChatMessage') }, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), ClassDefinition( @@ -154,7 +154,7 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( ), ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false, ), FragmentClassDefinition( diff --git a/test/query_generator/enums/enum_duplication_test.dart b/test/query_generator/enums/enum_duplication_test.dart index 16f17dda..bd339837 100644 --- a/test/query_generator/enums/enum_duplication_test.dart +++ b/test/query_generator/enums/enum_duplication_test.dart @@ -89,7 +89,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query'), @@ -101,7 +101,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -135,7 +135,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'CustomList$_Query'), @@ -147,7 +147,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/enums/enum_list_test.dart b/test/query_generator/enums/enum_list_test.dart index 02ba7a45..e39a884a 100644 --- a/test/query_generator/enums/enum_list_test.dart +++ b/test/query_generator/enums/enum_list_test.dart @@ -75,7 +75,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -87,7 +87,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/enums/filter_enum_test.dart b/test/query_generator/enums/filter_enum_test.dart index 8eae9fe7..177691e8 100644 --- a/test/query_generator/enums/filter_enum_test.dart +++ b/test/query_generator/enums/filter_enum_test.dart @@ -110,7 +110,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -122,7 +122,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -137,7 +137,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/enums/input_enum_list_test.dart b/test/query_generator/enums/input_enum_list_test.dart index 0213a5b9..d23d972f 100644 --- a/test/query_generator/enums/input_enum_list_test.dart +++ b/test/query_generator/enums/input_enum_list_test.dart @@ -84,7 +84,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'BrowseArticles$_Query'), @@ -96,7 +96,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], inputs: [ diff --git a/test/query_generator/enums/input_enum_test.dart b/test/query_generator/enums/input_enum_test.dart index 72a5f7fb..47d85110 100644 --- a/test/query_generator/enums/input_enum_test.dart +++ b/test/query_generator/enums/input_enum_test.dart @@ -101,7 +101,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -113,7 +113,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -128,7 +128,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/enums/kw_prefix_test.dart b/test/query_generator/enums/kw_prefix_test.dart index a6e89913..95717c0e 100644 --- a/test/query_generator/enums/kw_prefix_test.dart +++ b/test/query_generator/enums/kw_prefix_test.dart @@ -74,7 +74,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SearchArticles$_Query'), @@ -86,7 +86,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'ArticleTitleWhereConditions'), @@ -106,7 +106,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/enums/query_enum_test.dart b/test/query_generator/enums/query_enum_test.dart index d921defb..35c75cf3 100644 --- a/test/query_generator/enums/query_enum_test.dart +++ b/test/query_generator/enums/query_enum_test.dart @@ -71,7 +71,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot'), @@ -83,7 +83,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/forwarder_test.dart b/test/query_generator/forwarder_test.dart index 2d4ee7ca..58eb8387 100644 --- a/test/query_generator/forwarder_test.dart +++ b/test/query_generator/forwarder_test.dart @@ -63,7 +63,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/fragments/fragment_duplication_test.dart b/test/query_generator/fragments/fragment_duplication_test.dart index 04909ec0..4aa85cb0 100644 --- a/test/query_generator/fragments/fragment_duplication_test.dart +++ b/test/query_generator/fragments/fragment_duplication_test.dart @@ -89,7 +89,7 @@ final LibraryDefinition libraryDefinition = FragmentName(name: r'PokemonPartsMixin') ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'PokemonData$_Query'), @@ -101,13 +101,13 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'PokemonMixin$_evolution'), mixins: [FragmentName(name: r'PokemonNameMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'PokemonMixin'), @@ -160,7 +160,7 @@ final LibraryDefinition libraryDefinition = FragmentName(name: r'PokemonPartsMixin') ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'AllPokemonsData$_Query'), @@ -173,13 +173,13 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'PokemonMixin$_evolution'), mixins: [FragmentName(name: r'PokemonNameMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'PokemonMixin'), diff --git a/test/query_generator/fragments/fragment_glob_test.dart b/test/query_generator/fragments/fragment_glob_test.dart index 0263f759..db628fb3 100644 --- a/test/query_generator/fragments/fragment_glob_test.dart +++ b/test/query_generator/fragments/fragment_glob_test.dart @@ -96,7 +96,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Query$_Query$_Pokemon$_Pokemon'), mixins: [FragmentName(name: r'PokemonMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Query$_Query$_Pokemon'), @@ -109,7 +109,7 @@ final LibraryDefinition libraryDefinition = ], mixins: [FragmentName(name: r'PokemonMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Query$_Query'), @@ -121,19 +121,19 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'PokemonMixin$_PokemonDimension'), mixins: [FragmentName(name: r'WeightMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'PokemonMixin$_PokemonAttack'), mixins: [FragmentName(name: r'PokemonAttackMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'PokemonMixin'), @@ -167,7 +167,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'PokemonAttackMixin$_Attack'), mixins: [FragmentName(name: r'AttackMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'PokemonAttackMixin'), diff --git a/test/query_generator/fragments/fragment_on_fragments_test.dart b/test/query_generator/fragments/fragment_on_fragments_test.dart index 2a991359..0d0eecac 100644 --- a/test/query_generator/fragments/fragment_on_fragments_test.dart +++ b/test/query_generator/fragments/fragment_on_fragments_test.dart @@ -76,7 +76,7 @@ final LibraryDefinition libraryDefinition = FragmentName(name: r'PokemonPartsMixin') ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Query$_Query'), @@ -88,13 +88,13 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'PokemonMixin$_Pokemon'), mixins: [FragmentName(name: r'PokemonNameMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'PokemonMixin'), diff --git a/test/query_generator/fragments/fragments_multiple_test.dart b/test/query_generator/fragments/fragments_multiple_test.dart index dbfec50c..525c89fe 100644 --- a/test/query_generator/fragments/fragments_multiple_test.dart +++ b/test/query_generator/fragments/fragments_multiple_test.dart @@ -145,7 +145,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName( @@ -165,7 +165,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'VoyagesData$_Query$_VoyageList'), @@ -179,7 +179,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'VoyagesData$_Query'), @@ -191,7 +191,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'PaginationInput'), @@ -208,7 +208,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/fragments/fragments_test.dart b/test/query_generator/fragments/fragments_test.dart index 2ce6b862..7979ae92 100644 --- a/test/query_generator/fragments/fragments_test.dart +++ b/test/query_generator/fragments/fragments_test.dart @@ -60,7 +60,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_SomeObject'), mixins: [FragmentName(name: r'MyFragmentMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart index 6d0bc47c..eb6aa253 100644 --- a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart +++ b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart @@ -82,13 +82,13 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeObject'), mixins: [FragmentName(name: r'MyFragmentMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeObject'), mixins: [FragmentName(name: r'MyFragmentMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'MoreData'), @@ -100,7 +100,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_QueryResponse'), @@ -117,7 +117,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/interfaces/interface_fragment_glob_test.dart b/test/query_generator/interfaces/interface_fragment_glob_test.dart index 8530a9c9..89f8e1fd 100644 --- a/test/query_generator/interfaces/interface_fragment_glob_test.dart +++ b/test/query_generator/interfaces/interface_fragment_glob_test.dart @@ -90,7 +90,7 @@ final LibraryDefinition libraryDefinition = extension: ClassName(name: r'Custom$_Query$_nodeById'), mixins: [FragmentName(name: r'UserFragMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: @@ -98,7 +98,7 @@ final LibraryDefinition libraryDefinition = extension: ClassName(name: r'Custom$_Query$_nodeById$_chatMessage'), mixins: [FragmentName(name: r'UserFragMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query$_nodeById$_chatMessage'), @@ -117,7 +117,7 @@ final LibraryDefinition libraryDefinition = ], extension: ClassName(name: r'Custom$_Query$_nodeById'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query$_nodeById'), @@ -139,7 +139,7 @@ final LibraryDefinition libraryDefinition = r'ChatMessage': ClassName(name: r'Custom$_Query$_nodeById$_ChatMessage') }, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query'), @@ -151,7 +151,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'UserFragMixin'), diff --git a/test/query_generator/interfaces/interface_possible_types_test.dart b/test/query_generator/interfaces/interface_possible_types_test.dart index 8c5fde3e..a47081d4 100644 --- a/test/query_generator/interfaces/interface_possible_types_test.dart +++ b/test/query_generator/interfaces/interface_possible_types_test.dart @@ -85,7 +85,7 @@ final LibraryDefinition libraryDefinition = ], extension: ClassName(name: r'Custom$_Query$_Node'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), @@ -98,7 +98,7 @@ final LibraryDefinition libraryDefinition = ], extension: ClassName(name: r'Custom$_Query$_Node'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query$_Node'), @@ -120,7 +120,7 @@ final LibraryDefinition libraryDefinition = r'ChatMessage': ClassName(name: r'Custom$_Query$_Node$_ChatMessage') }, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query'), @@ -132,7 +132,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], inputs: [ diff --git a/test/query_generator/interfaces/interface_test.dart b/test/query_generator/interfaces/interface_test.dart index 3ca3b91a..c1903f23 100644 --- a/test/query_generator/interfaces/interface_test.dart +++ b/test/query_generator/interfaces/interface_test.dart @@ -82,14 +82,14 @@ final LibraryDefinition libraryDefinition = extension: ClassName(name: r'Custom$_Query$_Node'), mixins: [FragmentName(name: r'UserFragMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage$_User'), extension: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), mixins: [FragmentName(name: r'UserFragMixin')], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), @@ -108,7 +108,7 @@ final LibraryDefinition libraryDefinition = ], extension: ClassName(name: r'Custom$_Query$_Node'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query$_Node'), @@ -130,7 +130,7 @@ final LibraryDefinition libraryDefinition = r'ChatMessage': ClassName(name: r'Custom$_Query$_Node$_ChatMessage') }, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Query'), @@ -142,7 +142,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), FragmentClassDefinition( name: FragmentName(name: r'UserFragMixin'), diff --git a/test/query_generator/multiple_operations_per_file_test.dart b/test/query_generator/multiple_operations_per_file_test.dart index db7d436a..47faa9da 100644 --- a/test/query_generator/multiple_operations_per_file_test.dart +++ b/test/query_generator/multiple_operations_per_file_test.dart @@ -79,7 +79,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'MutData$_Mutation'), @@ -91,7 +91,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -103,7 +103,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ @@ -138,7 +138,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'QueData$_Query'), @@ -150,7 +150,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], inputs: [ diff --git a/test/query_generator/multiple_queries_test.dart b/test/query_generator/multiple_queries_test.dart index 1255921d..b716acd0 100644 --- a/test/query_generator/multiple_queries_test.dart +++ b/test/query_generator/multiple_queries_test.dart @@ -52,7 +52,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -71,7 +71,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart index ccbbf659..ab534ce6 100644 --- a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart @@ -77,7 +77,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_QueryRoot'), @@ -89,7 +89,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'ComplexInput'), @@ -119,7 +119,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart index b17ac92b..bfae43d2 100644 --- a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart @@ -74,7 +74,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_MutationRoot'), @@ -87,7 +87,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -102,7 +102,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart index e67c4cbf..fbcbe170 100644 --- a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart @@ -70,7 +70,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_QueryRoot'), @@ -82,7 +82,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -94,7 +94,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true), ClassDefinition( name: ClassName(name: r'SubInput'), @@ -106,7 +106,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/mutations_and_inputs/input_duplication_test.dart b/test/query_generator/mutations_and_inputs/input_duplication_test.dart index b10d64d9..9d016175 100644 --- a/test/query_generator/mutations_and_inputs/input_duplication_test.dart +++ b/test/query_generator/mutations_and_inputs/input_duplication_test.dart @@ -73,7 +73,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_Mutation'), @@ -85,7 +85,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -97,7 +97,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ @@ -122,7 +122,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'CustomList$_Mutation'), @@ -134,7 +134,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -146,7 +146,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/mutations_and_inputs/mutations_test.dart b/test/query_generator/mutations_and_inputs/mutations_test.dart index 1668caed..fabbb9d3 100644 --- a/test/query_generator/mutations_and_inputs/mutations_test.dart +++ b/test/query_generator/mutations_and_inputs/mutations_test.dart @@ -80,7 +80,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Custom$_MutationRoot'), @@ -93,7 +93,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -105,7 +105,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ @@ -131,7 +131,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'$custom$_MutationRoot'), @@ -145,7 +145,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'_Input'), @@ -158,7 +158,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart index ec88dab1..8ff56c31 100644 --- a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart +++ b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart @@ -45,7 +45,7 @@ void main() { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_Query'), @@ -58,7 +58,7 @@ void main() { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], inputs: [ diff --git a/test/query_generator/mutations_and_inputs/recursive_input_test.dart b/test/query_generator/mutations_and_inputs/recursive_input_test.dart index 81f8be65..fce6e30d 100644 --- a/test/query_generator/mutations_and_inputs/recursive_input_test.dart +++ b/test/query_generator/mutations_and_inputs/recursive_input_test.dart @@ -50,7 +50,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -67,7 +67,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/naming/casing_conversion_test.dart b/test/query_generator/naming/casing_conversion_test.dart index 71aca88c..9b455efa 100644 --- a/test/query_generator/naming/casing_conversion_test.dart +++ b/test/query_generator/naming/casing_conversion_test.dart @@ -143,7 +143,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_Query'), @@ -155,7 +155,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'Input'), @@ -195,7 +195,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: true) ], inputs: [ diff --git a/test/query_generator/naming/simple_naming_test.dart b/test/query_generator/naming/simple_naming_test.dart index 08af17aa..501530a7 100644 --- a/test/query_generator/naming/simple_naming_test.dart +++ b/test/query_generator/naming/simple_naming_test.dart @@ -71,7 +71,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'ClientEventPage'), @@ -83,7 +83,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'ClientEventsData$_Query'), @@ -95,7 +95,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: true, diff --git a/test/query_generator/nnbd_test.dart b/test/query_generator/nnbd_test.dart index 0e235623..9e4ac5b1 100644 --- a/test/query_generator/nnbd_test.dart +++ b/test/query_generator/nnbd_test.dart @@ -54,7 +54,7 @@ final libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/query_generator_test.dart b/test/query_generator/query_generator_test.dart index 00d1f224..1ee5ab6f 100644 --- a/test/query_generator/query_generator_test.dart +++ b/test/query_generator/query_generator_test.dart @@ -57,7 +57,7 @@ void main() { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -142,7 +142,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_Query'), @@ -155,7 +155,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], inputs: [ @@ -364,7 +364,7 @@ class SomeQueryQuery extends GraphQLQuery { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_Result$_SomeObject'), @@ -383,7 +383,7 @@ class SomeQueryQuery extends GraphQLQuery { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_Result'), @@ -401,7 +401,7 @@ class SomeQueryQuery extends GraphQLQuery { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -501,7 +501,7 @@ class SomeQuery$Result extends JsonSerializable with EquatableMixin { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -586,7 +586,7 @@ class SomeQuery$Result extends JsonSerializable with EquatableMixin { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -652,7 +652,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: '__typename'), + typeNameField: ClassPropertyName(name: '__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/scalars/custom_scalars_test.dart b/test/query_generator/scalars/custom_scalars_test.dart index 9b82a6be..ef87ce59 100644 --- a/test/query_generator/scalars/custom_scalars_test.dart +++ b/test/query_generator/scalars/custom_scalars_test.dart @@ -116,7 +116,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -142,7 +142,7 @@ final LibraryDefinition libraryDefinitionWithCustomParserFns = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, @@ -170,7 +170,7 @@ final LibraryDefinition libraryDefinitionWithCustomImports = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/scalars/scalars_test.dart b/test/query_generator/scalars/scalars_test.dart index 6afa9d3b..d6e62a25 100644 --- a/test/query_generator/scalars/scalars_test.dart +++ b/test/query_generator/scalars/scalars_test.dart @@ -99,7 +99,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/scalars/unused_custom_scalars_test.dart b/test/query_generator/scalars/unused_custom_scalars_test.dart index 685e7bad..8ca389f7 100644 --- a/test/query_generator/scalars/unused_custom_scalars_test.dart +++ b/test/query_generator/scalars/unused_custom_scalars_test.dart @@ -55,7 +55,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/subscription_test.dart b/test/query_generator/subscription_test.dart index ed3d3d10..69e44fba 100644 --- a/test/query_generator/subscription_test.dart +++ b/test/query_generator/subscription_test.dart @@ -115,7 +115,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'NewUserSub$_Subscription'), @@ -127,7 +127,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, diff --git a/test/query_generator/union_types_test.dart b/test/query_generator/union_types_test.dart index 7b607142..38462261 100644 --- a/test/query_generator/union_types_test.dart +++ b/test/query_generator/union_types_test.dart @@ -130,7 +130,7 @@ final LibraryDefinition libraryDefinition = ], extension: ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion$_TypeB'), @@ -185,7 +185,7 @@ final LibraryDefinition libraryDefinition = ], extension: ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion'), factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion'), @@ -203,7 +203,7 @@ final LibraryDefinition libraryDefinition = r'TypeB': ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion$_TypeB') }, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false), ClassDefinition( name: ClassName(name: r'SomeQuery$_SomeObject'), @@ -215,7 +215,7 @@ final LibraryDefinition libraryDefinition = isResolveType: false) ], factoryPossibilities: {}, - typeNameField: TypeName(name: r'__typename'), + typeNameField: ClassPropertyName(name: r'__typename'), isInput: false) ], generateHelpers: false, From 510768f0139d796b6c7181081ec6ff3bbb0a0400 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Tue, 16 Mar 2021 17:44:21 -0300 Subject: [PATCH 11/31] Make sure inputs are working --- lib/generator.dart | 1 - lib/generator/data/class_definition.dart | 2 +- lib/generator/data/class_property.dart | 23 +- .../data/fragment_class_definition.dart | 2 +- lib/generator/data/query_definition.dart | 2 +- lib/generator/data/query_input.dart | 5 - lib/generator/graphql_helpers.dart | 2 +- lib/generator/print_helpers.dart | 25 ++- lib/visitor/generator_visitor.dart | 1 - .../non_nullable_list_inputs_test.dart | 196 ++++++++++++------ 10 files changed, 167 insertions(+), 92 deletions(-) diff --git a/lib/generator.dart b/lib/generator.dart index ba261155..c0d1c763 100644 --- a/lib/generator.dart +++ b/lib/generator.dart @@ -395,6 +395,5 @@ Make sure your query is correct and your schema is updated.'''); type: dartTypeName, name: name, annotations: annotations, - isNonNull: fieldType.isNonNull, ); } diff --git a/lib/generator/data/class_definition.dart b/lib/generator/data/class_definition.dart index d9c05921..99866576 100644 --- a/lib/generator/data/class_definition.dart +++ b/lib/generator/data/class_definition.dart @@ -66,7 +66,7 @@ class ClassName extends Name with DataPrinter { /// Generate class name from hierarchical path factory ClassName.fromPath({List path}) { - return ClassName(name: path.map((e) => e.namePrintable).join(r'$_')); + return ClassName(name: path.map((e) => e.dartTypeSafe).join(r'$_')); } @override diff --git a/lib/generator/data/class_property.dart b/lib/generator/data/class_property.dart index 3c1a590a..44583c67 100644 --- a/lib/generator/data/class_property.dart +++ b/lib/generator/data/class_property.dart @@ -17,10 +17,6 @@ class ClassProperty extends Definition with DataPrinter { /// Some other custom annotation. final List annotations; - /// Whether this parameter is required - @Deprecated('Use [type.isNonNull] instead') - final bool isNonNull; - /// Whether this parameter corresponds to the __resolveType (or equivalent) final bool isResolveType; @@ -28,7 +24,6 @@ class ClassProperty extends Definition with DataPrinter { ClassProperty({ @required this.type, this.annotations = const [], - this.isNonNull = false, this.isResolveType = false, @required this.name, }) : assert(hasValue(type) && hasValue(name)), @@ -42,14 +37,12 @@ class ClassProperty extends Definition with DataPrinter { TypeName type, ClassPropertyName name, List annotations, - bool isNonNull, bool isResolveType, }) => ClassProperty( type: type ?? this.type, name: name ?? this.name, annotations: annotations ?? this.annotations, - isNonNull: isNonNull ?? this.isNonNull, isResolveType: isResolveType ?? this.isResolveType, ); @@ -58,7 +51,6 @@ class ClassProperty extends Definition with DataPrinter { 'type': type, 'name': name, 'annotations': annotations, - 'isNonNull': isNonNull, 'isResolveType': isResolveType, }; } @@ -106,7 +98,9 @@ class TypeName extends Name with DataPrinter { @override String normalize(String name) { final normalized = super.normalize(name); - if (_camelCaseTypes.contains(normalized)) return normalized; + if (_camelCaseTypes.contains(normalized)) { + return '$normalized${isNonNull ? '' : '?'}'; + } return '${ReCase(normalized).pascalCase}${isNonNull ? '' : '?'}'; } @@ -117,22 +111,23 @@ class ListOfTypeName extends TypeName with DataPrinter { /// Instantiate a type name definition. ListOfTypeName({ this.typeName, - this.listIsNonNull = true, - }) : super(name: typeName.name, isNonNull: typeName.isNonNull); + this.isNonNull = true, + }) : super(name: typeName.name, isNonNull: isNonNull); /// Internal type name final TypeName typeName; /// If this list type is non-null - final bool listIsNonNull; + @override + final bool isNonNull; @override Map get namedProps => { 'typeName': typeName, - 'listIsNonNull': listIsNonNull, + 'isNonNull': isNonNull, }; @override String normalize(String name) => - 'List<${typeName.namePrintable}>${listIsNonNull ? '' : '?'}'; + 'List<${typeName.namePrintable}>${isNonNull ? '' : '?'}'; } diff --git a/lib/generator/data/fragment_class_definition.dart b/lib/generator/data/fragment_class_definition.dart index b5c9b5d6..fd988768 100644 --- a/lib/generator/data/fragment_class_definition.dart +++ b/lib/generator/data/fragment_class_definition.dart @@ -36,7 +36,7 @@ class FragmentName extends Name with DataPrinter { /// Generate class name from hierarchical path factory FragmentName.fromPath({List path}) { - return FragmentName(name: path.map((e) => e.namePrintable).join(r'$_')); + return FragmentName(name: path.map((e) => e.dartTypeSafe).join(r'$_')); } @override diff --git a/lib/generator/data/query_definition.dart b/lib/generator/data/query_definition.dart index 09e81fa2..550d6995 100644 --- a/lib/generator/data/query_definition.dart +++ b/lib/generator/data/query_definition.dart @@ -62,7 +62,7 @@ class QueryName extends Name with DataPrinter { /// Generate class name from hierarchical path factory QueryName.fromPath({List path}) { - return QueryName(name: path.map((e) => e.namePrintable).join(r'$_')); + return QueryName(name: path.map((e) => e.dartTypeSafe).join(r'$_')); } @override diff --git a/lib/generator/data/query_input.dart b/lib/generator/data/query_input.dart index 3273c5e5..38d15467 100644 --- a/lib/generator/data/query_input.dart +++ b/lib/generator/data/query_input.dart @@ -14,16 +14,12 @@ class QueryInput extends Definition with DataPrinter { /// The input type. final TypeName type; - /// Whether this parameter is required - final bool isNonNull; - /// Some other custom annotation. final List annotations; /// Instantiate an input parameter. QueryInput({ @required this.type, - this.isNonNull = false, this.annotations = const [], this.name, }) : assert(hasValue(type) && hasValue(name)), @@ -33,7 +29,6 @@ class QueryInput extends Definition with DataPrinter { Map get namedProps => { 'type': type, 'name': name, - 'isNonNull': isNonNull, 'annotations': annotations, }; } diff --git a/lib/generator/graphql_helpers.dart b/lib/generator/graphql_helpers.dart index ea99ca85..2ecc0765 100644 --- a/lib/generator/graphql_helpers.dart +++ b/lib/generator/graphql_helpers.dart @@ -76,7 +76,7 @@ TypeName buildTypeName( dartType: dartType, replaceLeafWith: replaceLeafWith, schema: schema); return ListOfTypeName( typeName: typeName, - listIsNonNull: node.isNonNull, + isNonNull: node.isNonNull, ); } diff --git a/lib/generator/print_helpers.dart b/lib/generator/print_helpers.dart index c8bc6385..2cac4091 100644 --- a/lib/generator/print_helpers.dart +++ b/lib/generator/print_helpers.dart @@ -219,7 +219,7 @@ Spec generateArgumentClassSpec(QueryDefinition definition) { ..name = input.name.namePrintable ..named = true ..toThis = true - ..required = input.isNonNull; + ..required = input.type.isNonNull; }, ), )), @@ -247,12 +247,20 @@ Spec generateArgumentClassSpec(QueryDefinition definition) { )) ..fields.addAll(definition.inputs.map( (p) => Field( - (f) => f - ..name = p.name.namePrintable - ..type = refer(p.type.namePrintable) - ..modifier = FieldModifier.final$ - ..annotations - .addAll(p.annotations.map((e) => CodeExpression(Code(e)))), + (f) { + f + ..name = p.name.namePrintable + // TODO: remove this workaround when code_builder includes late field modifier: + // https://github.com/dart-lang/code_builder/pull/310 + ..type = refer( + '${p.type.isNonNull ? 'late ' : ''} ${p.type.namePrintable}') + ..annotations + .addAll(p.annotations.map((e) => CodeExpression(Code(e)))); + + if (!p.type.isNonNull) { + f.modifier = FieldModifier.final$; + } + }, ), )), ); @@ -271,7 +279,8 @@ Spec generateQueryClassSpec(QueryDefinition definition) { (p) => p ..name = 'variables' ..toThis = true - ..named = true, + ..named = true + ..required = true, ))); final fields = [ diff --git a/lib/visitor/generator_visitor.dart b/lib/visitor/generator_visitor.dart index 70a73c4d..c27403ea 100644 --- a/lib/visitor/generator_visitor.dart +++ b/lib/visitor/generator_visitor.dart @@ -214,7 +214,6 @@ class GeneratorVisitor extends RecursiveVisitor { context.inputsClasses.add(QueryInput( type: dartTypeName, name: inputName, - isNonNull: node.type.isNonNull, annotations: annotations, )); } diff --git a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart index 8ff56c31..69a61344 100644 --- a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart +++ b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart @@ -14,15 +14,15 @@ void main() { 'Non-nullability on inputs (considering lists)', () async => testGenerator( query: r''' - query some_query($i: Int, $inn: Int!, $li: [Int], $linn: [Int!], $lnni: [Int]!, $lnninn: [Int!]!) { - someQuery(i: $i, inn: $inn, li: $li, linn: $linn, lnni: $lnni, lnninn: $lnninn) { + query some_query($i: Int, $inn: Int!, $li: [Int], $linn: [Int!], $lnni: [Int]!, $lnninn: [Int!]!, $matrix: [[Int]], $matrixnn: [[Int!]!]!) { + someQuery(i: $i, inn: $inn, li: $li, linn: $linn, lnni: $lnni, lnninn: $lnninn, matrix: $matrix, matrixnn: $matrixnn) { s } } ''', schema: r''' type Query { - someQuery(i: Int, inn: Int!, li: [Int], linn: [Int!], lnni: [Int]!, lnninn: [Int!]!): SomeObject + someQuery(i: Int, inn: Int!, li: [Int], linn: [Int!], lnni: [Int]!, lnninn: [Int!]!, matrix: [[Int]], matrixnn: [[Int!]!]!): SomeObject } type SomeObject { @@ -41,7 +41,6 @@ void main() { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -54,7 +53,6 @@ void main() { type: TypeName( name: r'SomeQuery$_Query$_SomeObject'), name: ClassPropertyName(name: r'someQuery'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -64,28 +62,43 @@ void main() { inputs: [ QueryInput( type: TypeName(name: r'int'), - name: QueryInputName(name: r'i'), - isNonNull: false), + name: QueryInputName(name: r'i')), QueryInput( - type: TypeName(name: r'int'), - name: QueryInputName(name: r'inn'), - isNonNull: true), + type: TypeName(name: r'int', isNonNull: true), + name: QueryInputName(name: r'inn')), + QueryInput( + type: ListOfTypeName( + typeName: TypeName(name: r'int'), isNonNull: false), + name: QueryInputName(name: r'li')), QueryInput( - type: TypeName(name: r'List'), - name: QueryInputName(name: r'li'), - isNonNull: false), + type: ListOfTypeName( + typeName: TypeName(name: r'int', isNonNull: true), + isNonNull: false), + name: QueryInputName(name: r'linn')), QueryInput( - type: TypeName(name: r'List'), - name: QueryInputName(name: r'linn'), - isNonNull: false), + type: ListOfTypeName( + typeName: TypeName(name: r'int'), isNonNull: true), + name: QueryInputName(name: r'lnni')), QueryInput( - type: TypeName(name: r'List'), - name: QueryInputName(name: r'lnni'), - isNonNull: true), + type: ListOfTypeName( + typeName: TypeName(name: r'int', isNonNull: true), + isNonNull: true), + name: QueryInputName(name: r'lnninn')), QueryInput( - type: TypeName(name: r'List'), - name: QueryInputName(name: r'lnninn'), - isNonNull: true) + type: ListOfTypeName( + typeName: ListOfTypeName( + typeName: TypeName(name: r'int'), + isNonNull: false), + isNonNull: false), + name: QueryInputName(name: r'matrix')), + QueryInput( + type: ListOfTypeName( + typeName: ListOfTypeName( + typeName: + TypeName(name: r'int', isNonNull: true), + isNonNull: true), + isNonNull: true), + name: QueryInputName(name: r'matrixnn')) ], generateHelpers: true, suffix: r'Query') @@ -108,12 +121,8 @@ class SomeQuery$Query$SomeObject extends JsonSerializable with EquatableMixin { String? s; - int? i; - - List? list; - @override - List get props => [s, i, list]; + List get props => [s]; Map toJson() => _$SomeQuery$Query$SomeObjectToJson(this); } @@ -133,24 +142,44 @@ class SomeQuery$Query extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class SomeQueryArguments extends JsonSerializable with EquatableMixin { - SomeQueryArguments({required this.intsNonNullable, this.stringNullable}); + SomeQueryArguments( + {this.i, + required this.inn, + this.li, + this.linn, + required this.lnni, + required this.lnninn, + this.matrix, + required this.matrixnn}); @override factory SomeQueryArguments.fromJson(Map json) => _$SomeQueryArgumentsFromJson(json); - final List intsNonNullable; + final int? i; + + late int inn; + + final List? li; - final String? stringNullable; + final List? linn; + + late List lnni; + + late List lnninn; + + final List?>? matrix; + + late List> matrixnn; @override - List get props => [intsNonNullable, stringNullable]; + List get props => [i, inn, li, linn, lnni, lnninn, matrix, matrixnn]; @override Map toJson() => _$SomeQueryArgumentsToJson(this); } class SomeQueryQuery extends GraphQLQuery { - SomeQueryQuery({this.variables}); + SomeQueryQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -159,7 +188,35 @@ class SomeQueryQuery extends GraphQLQuery { name: NameNode(value: 'some_query'), variableDefinitions: [ VariableDefinitionNode( - variable: VariableNode(name: NameNode(value: 'intsNonNullable')), + variable: VariableNode(name: NameNode(value: 'i')), + type: + NamedTypeNode(name: NameNode(value: 'Int'), isNonNull: false), + defaultValue: DefaultValueNode(value: null), + directives: []), + VariableDefinitionNode( + variable: VariableNode(name: NameNode(value: 'inn')), + type: + NamedTypeNode(name: NameNode(value: 'Int'), isNonNull: true), + defaultValue: DefaultValueNode(value: null), + directives: []), + VariableDefinitionNode( + variable: VariableNode(name: NameNode(value: 'li')), + type: ListTypeNode( + type: NamedTypeNode( + name: NameNode(value: 'Int'), isNonNull: false), + isNonNull: false), + defaultValue: DefaultValueNode(value: null), + directives: []), + VariableDefinitionNode( + variable: VariableNode(name: NameNode(value: 'linn')), + type: ListTypeNode( + type: NamedTypeNode( + name: NameNode(value: 'Int'), isNonNull: true), + isNonNull: false), + defaultValue: DefaultValueNode(value: null), + directives: []), + VariableDefinitionNode( + variable: VariableNode(name: NameNode(value: 'lnni')), type: ListTypeNode( type: NamedTypeNode( name: NameNode(value: 'Int'), isNonNull: false), @@ -167,9 +224,31 @@ class SomeQueryQuery extends GraphQLQuery { defaultValue: DefaultValueNode(value: null), directives: []), VariableDefinitionNode( - variable: VariableNode(name: NameNode(value: 'stringNullable')), - type: NamedTypeNode( - name: NameNode(value: 'String'), isNonNull: false), + variable: VariableNode(name: NameNode(value: 'lnninn')), + type: ListTypeNode( + type: NamedTypeNode( + name: NameNode(value: 'Int'), isNonNull: true), + isNonNull: true), + defaultValue: DefaultValueNode(value: null), + directives: []), + VariableDefinitionNode( + variable: VariableNode(name: NameNode(value: 'matrix')), + type: ListTypeNode( + type: ListTypeNode( + type: NamedTypeNode( + name: NameNode(value: 'Int'), isNonNull: false), + isNonNull: false), + isNonNull: false), + defaultValue: DefaultValueNode(value: null), + directives: []), + VariableDefinitionNode( + variable: VariableNode(name: NameNode(value: 'matrixnn')), + type: ListTypeNode( + type: ListTypeNode( + type: NamedTypeNode( + name: NameNode(value: 'Int'), isNonNull: true), + isNonNull: true), + isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], @@ -180,13 +259,29 @@ class SomeQueryQuery extends GraphQLQuery { alias: null, arguments: [ ArgumentNode( - name: NameNode(value: 'intsNonNullable'), - value: - VariableNode(name: NameNode(value: 'intsNonNullable'))), + name: NameNode(value: 'i'), + value: VariableNode(name: NameNode(value: 'i'))), + ArgumentNode( + name: NameNode(value: 'inn'), + value: VariableNode(name: NameNode(value: 'inn'))), ArgumentNode( - name: NameNode(value: 'stringNullable'), - value: - VariableNode(name: NameNode(value: 'stringNullable'))) + name: NameNode(value: 'li'), + value: VariableNode(name: NameNode(value: 'li'))), + ArgumentNode( + name: NameNode(value: 'linn'), + value: VariableNode(name: NameNode(value: 'linn'))), + ArgumentNode( + name: NameNode(value: 'lnni'), + value: VariableNode(name: NameNode(value: 'lnni'))), + ArgumentNode( + name: NameNode(value: 'lnninn'), + value: VariableNode(name: NameNode(value: 'lnninn'))), + ArgumentNode( + name: NameNode(value: 'matrix'), + value: VariableNode(name: NameNode(value: 'matrix'))), + ArgumentNode( + name: NameNode(value: 'matrixnn'), + value: VariableNode(name: NameNode(value: 'matrixnn'))) ], directives: [], selectionSet: SelectionSetNode(selections: [ @@ -195,23 +290,6 @@ class SomeQueryQuery extends GraphQLQuery { alias: null, arguments: [], directives: [], - selectionSet: null), - FieldNode( - name: NameNode(value: 'i'), - alias: null, - arguments: [], - directives: [], - selectionSet: null), - FieldNode( - name: NameNode(value: 'list'), - alias: null, - arguments: [ - ArgumentNode( - name: NameNode(value: 'intsNonNullable'), - value: VariableNode( - name: NameNode(value: 'intsNonNullable'))) - ], - directives: [], selectionSet: null) ])) ])) From 49bce0585444504a2f4235ebc926d19cba4b36ac Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 16:22:46 -0300 Subject: [PATCH 12/31] Fix helpers tests --- test/generator/helpers_test.dart | 66 -------------------------- test/generator/print_helpers_test.dart | 4 +- 2 files changed, 2 insertions(+), 68 deletions(-) diff --git a/test/generator/helpers_test.dart b/test/generator/helpers_test.dart index 498d96de..1b6825b3 100644 --- a/test/generator/helpers_test.dart +++ b/test/generator/helpers_test.dart @@ -105,70 +105,4 @@ void main() { ])); }); }); - - group('On hasNonNullableInput helper', () { - test('It will return `false` on empty input', () { - var result = hasNonNullableInput([]); - - expect(result, false); - }); - - test('It will return `true` if at least one query input is non nullable', - () { - var input = [ - QueryDefinition( - operationName: 'some_query', - name: QueryName(name: 'some_query'), - document: parseString('query some_query {}'), - inputs: [ - QueryInput( - type: TypeName(name: 'Type'), - name: QueryInputName(name: 'name'), - isNonNull: true) - ], - ), - QueryDefinition( - name: QueryName(name: 'another_query'), - operationName: 'another_query', - document: parseString('query another_query {}'), - inputs: [ - QueryInput( - type: TypeName(name: 'Type'), - name: QueryInputName(name: 'name')) - ], - ), - ]; - var result = hasNonNullableInput(input); - - expect(result, true); - }); - - test('It will return `false` if there is no non nullable inputs', () { - var input = [ - QueryDefinition( - name: QueryName(name: 'some_query'), - operationName: 'some_query', - document: parseString('query some_query {}'), - inputs: [ - QueryInput( - type: TypeName(name: 'Type'), - name: QueryInputName(name: 'name')) - ], - ), - QueryDefinition( - name: QueryName(name: 'another_query'), - operationName: 'another_query', - document: parseString('query another_query {}'), - inputs: [ - QueryInput( - type: TypeName(name: 'Type'), - name: QueryInputName(name: 'name')) - ], - ), - ]; - var result = hasNonNullableInput(input); - - expect(result, false); - }); - }); } diff --git a/test/generator/print_helpers_test.dart b/test/generator/print_helpers_test.dart index 3b589d0e..578acd4c 100644 --- a/test/generator/print_helpers_test.dart +++ b/test/generator/print_helpers_test.dart @@ -558,7 +558,7 @@ class TestQueryArguments extends JsonSerializable with EquatableMixin { } class TestQueryQuery extends GraphQLQuery { - TestQueryQuery({this.variables}); + TestQueryQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -633,7 +633,7 @@ class TestQueryArguments extends JsonSerializable with EquatableMixin { expect(str, '''class TestQueryQuery extends GraphQLQuery { - TestQueryQuery({this.variables}); + TestQueryQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ From 2f4b315d4778e3dd173be5fb9c40f6f5c85831f7 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 16:42:42 -0300 Subject: [PATCH 13/31] Fix some and add non-null list test for fields --- test/query_generator/nnbd_test.dart | 131 ++++++++++++++++++-- test/query_generator/subscription_test.dart | 13 +- test/query_generator/union_types_test.dart | 17 --- 3 files changed, 129 insertions(+), 32 deletions(-) diff --git a/test/query_generator/nnbd_test.dart b/test/query_generator/nnbd_test.dart index 9e4ac5b1..1a4d968a 100644 --- a/test/query_generator/nnbd_test.dart +++ b/test/query_generator/nnbd_test.dart @@ -11,7 +11,7 @@ import '../helpers.dart'; void main() { group('On nnbd', () { test( - 'A simple query yields simple nnbd classes', + 'On field selection', () async => testGenerator( query: 'query { nonNullAndSelected, nullableAndSelected }', schema: r''' @@ -25,12 +25,31 @@ void main() { libraryDefinition: libraryDefinition, generatedFile: output, generateHelpers: false, - builderOptionsMap: { - 'nnbd': true, - }, ), ); }); + + test( + 'On lists and nullability', + () async => testGenerator( + query: 'query { i, inn, li, linn, lnni, lnninn, matrix, matrixnn }', + schema: r''' + type Query { + i: Int + inn: Int! + li: [Int] + linn: [Int!] + lnni: [Int]! + lnninn: [Int!]! + matrix: [[Int]] + matrixnn: [[Int!]!]! + } + ''', + libraryDefinition: listsLibraryDefinition, + generatedFile: listsOutput, + generateHelpers: false, + ), + ); } final libraryDefinition = @@ -43,14 +62,12 @@ final libraryDefinition = name: ClassName(name: r'Query$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'nonNullAndSelected'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'nullableAndSelected'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -85,3 +102,103 @@ class Query$Query extends JsonSerializable with EquatableMixin { Map toJson() => _$Query$QueryToJson(this); } '''; + +final listsLibraryDefinition = + LibraryDefinition(basename: r'query.graphql', queries: [ + QueryDefinition( + name: QueryName(name: r'Query$_Query'), + operationName: r'query', + classes: [ + ClassDefinition( + name: ClassName(name: r'Query$_Query'), + properties: [ + ClassProperty( + type: TypeName(name: r'int'), + name: ClassPropertyName(name: r'i'), + isResolveType: false), + ClassProperty( + type: TypeName(name: r'int', isNonNull: true), + name: ClassPropertyName(name: r'inn'), + isResolveType: false), + ClassProperty( + type: ListOfTypeName( + typeName: TypeName(name: r'int'), isNonNull: false), + name: ClassPropertyName(name: r'li'), + isResolveType: false), + ClassProperty( + type: ListOfTypeName( + typeName: TypeName(name: r'int', isNonNull: true), + isNonNull: false), + name: ClassPropertyName(name: r'linn'), + isResolveType: false), + ClassProperty( + type: ListOfTypeName( + typeName: TypeName(name: r'int'), isNonNull: true), + name: ClassPropertyName(name: r'lnni'), + isResolveType: false), + ClassProperty( + type: ListOfTypeName( + typeName: TypeName(name: r'int', isNonNull: true), + isNonNull: true), + name: ClassPropertyName(name: r'lnninn'), + isResolveType: false), + ClassProperty( + type: ListOfTypeName( + typeName: ListOfTypeName( + typeName: TypeName(name: r'int'), isNonNull: false), + isNonNull: false), + name: ClassPropertyName(name: r'matrix'), + isResolveType: false), + ClassProperty( + type: ListOfTypeName( + typeName: ListOfTypeName( + typeName: TypeName(name: r'int', isNonNull: true), + isNonNull: true), + isNonNull: true), + name: ClassPropertyName(name: r'matrixnn'), + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false) + ], + generateHelpers: false, + suffix: r'Query') +]); + +const listsOutput = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 + +import 'package:json_annotation/json_annotation.dart'; +import 'package:equatable/equatable.dart'; +import 'package:gql/ast.dart'; +part 'query.graphql.g.dart'; + +@JsonSerializable(explicitToJson: true) +class Query$Query extends JsonSerializable with EquatableMixin { + Query$Query(); + + factory Query$Query.fromJson(Map json) => + _$Query$QueryFromJson(json); + + int? i; + + late int inn; + + List? li; + + List? linn; + + late List lnni; + + late List lnninn; + + List?>? matrix; + + late List> matrixnn; + + @override + List get props => [i, inn, li, linn, lnni, lnninn, matrix, matrixnn]; + Map toJson() => _$Query$QueryToJson(this); +} +'''; diff --git a/test/query_generator/subscription_test.dart b/test/query_generator/subscription_test.dart index 69e44fba..c07fffd6 100644 --- a/test/query_generator/subscription_test.dart +++ b/test/query_generator/subscription_test.dart @@ -96,22 +96,19 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'NewUserSub$_Subscription$_User'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'firstName'), - isNonNull: true, isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'lastName'), - isNonNull: true, isResolveType: false), ClassProperty( - type: TypeName(name: r'UserType'), + type: TypeName(name: r'UserType', isNonNull: true), name: ClassPropertyName(name: r'userType'), annotations: [ r'JsonKey(unknownEnumValue: UserType.artemisUnknown)' ], - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -121,9 +118,9 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'NewUserSub$_Subscription'), properties: [ ClassProperty( - type: TypeName(name: r'NewUserSub$_Subscription$_User'), + type: TypeName( + name: r'NewUserSub$_Subscription$_User', isNonNull: true), name: ClassPropertyName(name: r'newUser'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/union_types_test.dart b/test/query_generator/union_types_test.dart index 38462261..eebe005f 100644 --- a/test/query_generator/union_types_test.dart +++ b/test/query_generator/union_types_test.dart @@ -89,43 +89,36 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'a'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_'), annotations: [r'''JsonKey(name: '_')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_a'), annotations: [r'''JsonKey(name: '_a')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_a_a'), annotations: [r'''JsonKey(name: '_a_a')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_a_a_'), annotations: [r'''JsonKey(name: '_a_a_')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_new'), annotations: [r'''JsonKey(name: '_new')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], extension: ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion'), @@ -138,49 +131,41 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'b'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_'), annotations: [r'''JsonKey(name: '_')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_b'), annotations: [r'''JsonKey(name: '_b')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_b_b'), annotations: [r'''JsonKey(name: '_b_b')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_b_b_'), annotations: [r'''JsonKey(name: '_b_b_')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'new'), annotations: [r'''JsonKey(name: 'new')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'IN'), annotations: [r'''JsonKey(name: 'IN')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], extension: ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion'), @@ -194,7 +179,6 @@ final LibraryDefinition libraryDefinition = type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: { @@ -211,7 +195,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'SomeQuery$_SomeObject$_SomeUnion'), name: ClassPropertyName(name: r'o'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, From 5a896a0d6b6ffa56a8c9a9df5e076bb654094240 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:09:28 -0300 Subject: [PATCH 14/31] Batch remove all isNonNull's --- test/query_generator/aliases/alias_on_leaves_test.dart | 1 - test/query_generator/aliases/alias_on_object_test.dart | 1 - test/query_generator/append_type_name_test.dart | 2 +- .../ast_schema/field_not_found_mutation_test.dart | 6 +++--- test/query_generator/ast_schema/input_types_test.dart | 6 +++--- test/query_generator/ast_schema/missing_schema_test.dart | 1 - .../ast_schema/multiple_schema_mappint_test.dart | 2 +- .../deprecated/deprecated_enum_value_test.dart | 2 +- test/query_generator/deprecated/deprecated_field_test.dart | 1 - .../deprecated/deprecated_input_object_field_test.dart | 2 +- .../deprecated/deprecated_interface_field_test.dart | 1 - test/query_generator/enums/enum_duplication_test.dart | 1 - test/query_generator/enums/enum_list_test.dart | 1 - test/query_generator/enums/filter_enum_test.dart | 6 +++--- test/query_generator/enums/input_enum_list_test.dart | 2 +- test/query_generator/enums/input_enum_test.dart | 2 +- test/query_generator/enums/kw_prefix_test.dart | 6 +++--- test/query_generator/enums/query_enum_test.dart | 1 - test/query_generator/forwarder_test.dart | 1 - .../fragments/fragment_duplication_test.dart | 1 - test/query_generator/fragments/fragment_glob_test.dart | 2 +- .../fragments/fragment_on_fragments_test.dart | 1 - test/query_generator/fragments/fragments_multiple_test.dart | 2 +- test/query_generator/fragments/fragments_test.dart | 1 - .../multiple_references_on_simple_naming_test.dart | 1 - .../interfaces/interface_fragment_glob_test.dart | 6 +++--- .../interfaces/interface_possible_types_test.dart | 6 +++--- test/query_generator/interfaces/interface_test.dart | 6 +++--- test/query_generator/multiple_operations_per_file_test.dart | 2 +- test/query_generator/multiple_queries_test.dart | 1 - .../mutations_and_inputs/complex_input_objects_test.dart | 2 +- .../custom_scalars_on_input_objects_test.dart | 2 +- .../mutations_and_inputs/filter_input_objects_test.dart | 2 +- .../mutations_and_inputs/input_duplication_test.dart | 2 +- .../mutations_and_inputs/mutations_test.dart | 2 +- .../mutations_and_inputs/non_nullable_list_inputs_test.dart | 2 +- .../mutations_and_inputs/recursive_input_test.dart | 6 +++--- test/query_generator/naming/casing_conversion_test.dart | 2 +- test/query_generator/naming/simple_naming_test.dart | 1 - test/query_generator/query_generator_test.dart | 1 - test/query_generator/scalars/custom_scalars_test.dart | 1 - test/query_generator/scalars/scalars_test.dart | 1 - .../query_generator/scalars/unused_custom_scalars_test.dart | 1 - 43 files changed, 40 insertions(+), 59 deletions(-) diff --git a/test/query_generator/aliases/alias_on_leaves_test.dart b/test/query_generator/aliases/alias_on_leaves_test.dart index ebde6887..8933f247 100644 --- a/test/query_generator/aliases/alias_on_leaves_test.dart +++ b/test/query_generator/aliases/alias_on_leaves_test.dart @@ -91,7 +91,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'SomeQuery$_Response$_SomeObject'), name: ClassPropertyName(name: r'o'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/aliases/alias_on_object_test.dart b/test/query_generator/aliases/alias_on_object_test.dart index 9f3908a0..b2374d00 100644 --- a/test/query_generator/aliases/alias_on_object_test.dart +++ b/test/query_generator/aliases/alias_on_object_test.dart @@ -93,7 +93,6 @@ final LibraryDefinition libraryDefinition = type: TypeName( name: r'List'), name: ClassPropertyName(name: r'anotherObject'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/append_type_name_test.dart b/test/query_generator/append_type_name_test.dart index 742ca845..17f3fa4f 100644 --- a/test/query_generator/append_type_name_test.dart +++ b/test/query_generator/append_type_name_test.dart @@ -755,7 +755,7 @@ class CustomQuery extends GraphQLQuery { name: NameNode(value: 'QueryResponse'), typeCondition: TypeConditionNode( on: NamedTypeNode( - name: NameNode(value: 'QueryResponse'), isNonNull: false)), + name: NameNode(value: 'QueryResponse'), )), directives: [], selectionSet: SelectionSetNode(selections: [ FieldNode( diff --git a/test/query_generator/ast_schema/field_not_found_mutation_test.dart b/test/query_generator/ast_schema/field_not_found_mutation_test.dart index cec6ede0..120621c4 100644 --- a/test/query_generator/ast_schema/field_not_found_mutation_test.dart +++ b/test/query_generator/ast_schema/field_not_found_mutation_test.dart @@ -124,9 +124,9 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'CreateThingInput'), - name: QueryInputName(name: r'createThingInput'), - isNonNull: false) + type: TypeName(name: r'CreateThingInput'), + name: QueryInputName(name: r'createThingInput'), + ) ], generateHelpers: false, suffix: r'Mutation') diff --git a/test/query_generator/ast_schema/input_types_test.dart b/test/query_generator/ast_schema/input_types_test.dart index 776acfca..da851451 100644 --- a/test/query_generator/ast_schema/input_types_test.dart +++ b/test/query_generator/ast_schema/input_types_test.dart @@ -146,9 +146,9 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'CreateThingInput'), - name: QueryInputName(name: r'createThingInput'), - isNonNull: false) + type: TypeName(name: r'CreateThingInput'), + name: QueryInputName(name: r'createThingInput'), + ) ], generateHelpers: false, suffix: r'Mutation') diff --git a/test/query_generator/ast_schema/missing_schema_test.dart b/test/query_generator/ast_schema/missing_schema_test.dart index b5063edf..4bfc16c5 100644 --- a/test/query_generator/ast_schema/missing_schema_test.dart +++ b/test/query_generator/ast_schema/missing_schema_test.dart @@ -41,7 +41,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'a'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart index 43db828b..728b4a4a 100644 --- a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart +++ b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart @@ -527,7 +527,7 @@ class BrowseRepositoriesQuery extends GraphQLQuery'), name: ClassPropertyName(name: r'someObjects'), - isNonNull: false, ) ], factoryPossibilities: {}, diff --git a/test/query_generator/deprecated/deprecated_input_object_field_test.dart b/test/query_generator/deprecated/deprecated_input_object_field_test.dart index 9a5c3e78..ec05cc3e 100644 --- a/test/query_generator/deprecated/deprecated_input_object_field_test.dart +++ b/test/query_generator/deprecated/deprecated_input_object_field_test.dart @@ -197,7 +197,7 @@ class CustomMutation VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'input')), type: NamedTypeNode( - name: NameNode(value: 'Input'), isNonNull: true), + name: NameNode(value: 'Input'), ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/deprecated/deprecated_interface_field_test.dart b/test/query_generator/deprecated/deprecated_interface_field_test.dart index 251dfd8d..5efd5c3e 100644 --- a/test/query_generator/deprecated/deprecated_interface_field_test.dart +++ b/test/query_generator/deprecated/deprecated_interface_field_test.dart @@ -181,7 +181,6 @@ final LibraryDefinition libraryDefinition = LibraryDefinition( QueryInput( type: TypeName(name: r'String'), name: QueryInputName(name: r'id'), - isNonNull: true, ), ], generateHelpers: false, diff --git a/test/query_generator/enums/enum_duplication_test.dart b/test/query_generator/enums/enum_duplication_test.dart index bd339837..3e95d079 100644 --- a/test/query_generator/enums/enum_duplication_test.dart +++ b/test/query_generator/enums/enum_duplication_test.dart @@ -143,7 +143,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'List'), name: ClassPropertyName(name: r'qList'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/enums/enum_list_test.dart b/test/query_generator/enums/enum_list_test.dart index e39a884a..ad928800 100644 --- a/test/query_generator/enums/enum_list_test.dart +++ b/test/query_generator/enums/enum_list_test.dart @@ -83,7 +83,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Custom$_QueryRoot$_QueryResponse'), name: ClassPropertyName(name: r'q'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/enums/filter_enum_test.dart b/test/query_generator/enums/filter_enum_test.dart index 177691e8..f501a90c 100644 --- a/test/query_generator/enums/filter_enum_test.dart +++ b/test/query_generator/enums/filter_enum_test.dart @@ -149,9 +149,9 @@ final LibraryDefinition libraryDefinition = r'JsonKey(unknownEnumValue: InputEnum.artemisUnknown)' ]), QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'i'), - isNonNull: true) + type: TypeName(name: r'Input'), + name: QueryInputName(name: r'i'), + ) ], generateHelpers: false, suffix: r'Query') diff --git a/test/query_generator/enums/input_enum_list_test.dart b/test/query_generator/enums/input_enum_list_test.dart index d23d972f..388a3112 100644 --- a/test/query_generator/enums/input_enum_list_test.dart +++ b/test/query_generator/enums/input_enum_list_test.dart @@ -195,7 +195,7 @@ class BrowseArticlesQuery type: ListTypeNode( type: NamedTypeNode( name: NameNode(value: 'ArticleType'), isNonNull: true), - isNonNull: false), + ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/enums/input_enum_test.dart b/test/query_generator/enums/input_enum_test.dart index 47d85110..220c8b20 100644 --- a/test/query_generator/enums/input_enum_test.dart +++ b/test/query_generator/enums/input_enum_test.dart @@ -272,7 +272,7 @@ class CustomQuery extends GraphQLQuery { VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'o')), type: NamedTypeNode( - name: NameNode(value: 'OtherEnum'), isNonNull: true), + name: NameNode(value: 'OtherEnum'), ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/enums/kw_prefix_test.dart b/test/query_generator/enums/kw_prefix_test.dart index 95717c0e..5a4fef78 100644 --- a/test/query_generator/enums/kw_prefix_test.dart +++ b/test/query_generator/enums/kw_prefix_test.dart @@ -111,9 +111,9 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'ArticleTitleWhereConditions'), - name: QueryInputName(name: r'titleWhere'), - isNonNull: false) + type: TypeName(name: r'ArticleTitleWhereConditions'), + name: QueryInputName(name: r'titleWhere'), + ) ], generateHelpers: false, suffix: r'Query') diff --git a/test/query_generator/enums/query_enum_test.dart b/test/query_generator/enums/query_enum_test.dart index 35c75cf3..6260f954 100644 --- a/test/query_generator/enums/query_enum_test.dart +++ b/test/query_generator/enums/query_enum_test.dart @@ -79,7 +79,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Custom$_QueryRoot$_QueryResponse'), name: ClassPropertyName(name: r'q'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/forwarder_test.dart b/test/query_generator/forwarder_test.dart index 58eb8387..3f2659a3 100644 --- a/test/query_generator/forwarder_test.dart +++ b/test/query_generator/forwarder_test.dart @@ -59,7 +59,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'a'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/fragments/fragment_duplication_test.dart b/test/query_generator/fragments/fragment_duplication_test.dart index 4aa85cb0..86c8499e 100644 --- a/test/query_generator/fragments/fragment_duplication_test.dart +++ b/test/query_generator/fragments/fragment_duplication_test.dart @@ -215,7 +215,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'name'), - isNonNull: false, isResolveType: false) ]) ], diff --git a/test/query_generator/fragments/fragment_glob_test.dart b/test/query_generator/fragments/fragment_glob_test.dart index db628fb3..e09272b7 100644 --- a/test/query_generator/fragments/fragment_glob_test.dart +++ b/test/query_generator/fragments/fragment_glob_test.dart @@ -397,7 +397,7 @@ class QueryQuery extends GraphQLQuery { name: NameNode(value: 'attack'), typeCondition: TypeConditionNode( on: NamedTypeNode( - name: NameNode(value: 'Attack'), isNonNull: false)), + name: NameNode(value: 'Attack'), )), directives: [], selectionSet: SelectionSetNode(selections: [ FieldNode( diff --git a/test/query_generator/fragments/fragment_on_fragments_test.dart b/test/query_generator/fragments/fragment_on_fragments_test.dart index 0d0eecac..b93ddcd0 100644 --- a/test/query_generator/fragments/fragment_on_fragments_test.dart +++ b/test/query_generator/fragments/fragment_on_fragments_test.dart @@ -130,7 +130,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'name'), - isNonNull: false, isResolveType: false) ]) ], diff --git a/test/query_generator/fragments/fragments_multiple_test.dart b/test/query_generator/fragments/fragments_multiple_test.dart index 525c89fe..f0bc098b 100644 --- a/test/query_generator/fragments/fragments_multiple_test.dart +++ b/test/query_generator/fragments/fragments_multiple_test.dart @@ -387,7 +387,7 @@ class VoyagesDataQuery VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'input')), type: NamedTypeNode( - name: NameNode(value: 'PaginationInput'), isNonNull: true), + name: NameNode(value: 'PaginationInput'), ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/fragments/fragments_test.dart b/test/query_generator/fragments/fragments_test.dart index 7979ae92..46da8b3d 100644 --- a/test/query_generator/fragments/fragments_test.dart +++ b/test/query_generator/fragments/fragments_test.dart @@ -53,7 +53,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'i'), - isNonNull: false, isResolveType: false) ]), ClassDefinition( diff --git a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart index eb6aa253..dcca96c1 100644 --- a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart +++ b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart @@ -113,7 +113,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'MoreData'), name: ClassPropertyName(name: r'moreData'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/interfaces/interface_fragment_glob_test.dart b/test/query_generator/interfaces/interface_fragment_glob_test.dart index 89f8e1fd..0c59b97f 100644 --- a/test/query_generator/interfaces/interface_fragment_glob_test.dart +++ b/test/query_generator/interfaces/interface_fragment_glob_test.dart @@ -170,9 +170,9 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'String'), - name: QueryInputName(name: r'id'), - isNonNull: true) + type: TypeName(name: r'String'), + name: QueryInputName(name: r'id'), + ) ], generateHelpers: false, suffix: r'Query') diff --git a/test/query_generator/interfaces/interface_possible_types_test.dart b/test/query_generator/interfaces/interface_possible_types_test.dart index a47081d4..f828c801 100644 --- a/test/query_generator/interfaces/interface_possible_types_test.dart +++ b/test/query_generator/interfaces/interface_possible_types_test.dart @@ -137,9 +137,9 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'String'), - name: QueryInputName(name: r'id'), - isNonNull: true) + type: TypeName(name: r'String'), + name: QueryInputName(name: r'id'), + ) ], generateHelpers: false, suffix: r'Query') diff --git a/test/query_generator/interfaces/interface_test.dart b/test/query_generator/interfaces/interface_test.dart index c1903f23..f1777bd7 100644 --- a/test/query_generator/interfaces/interface_test.dart +++ b/test/query_generator/interfaces/interface_test.dart @@ -161,9 +161,9 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'String'), - name: QueryInputName(name: r'id'), - isNonNull: true) + type: TypeName(name: r'String'), + name: QueryInputName(name: r'id'), + ) ], generateHelpers: false, suffix: r'Query') diff --git a/test/query_generator/multiple_operations_per_file_test.dart b/test/query_generator/multiple_operations_per_file_test.dart index 47faa9da..0533090e 100644 --- a/test/query_generator/multiple_operations_per_file_test.dart +++ b/test/query_generator/multiple_operations_per_file_test.dart @@ -448,7 +448,7 @@ class QueDataQuery extends GraphQLQuery { VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'stringNullable')), type: NamedTypeNode( - name: NameNode(value: 'String'), isNonNull: false), + name: NameNode(value: 'String'), ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/multiple_queries_test.dart b/test/query_generator/multiple_queries_test.dart index b716acd0..660db695 100644 --- a/test/query_generator/multiple_queries_test.dart +++ b/test/query_generator/multiple_queries_test.dart @@ -67,7 +67,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart index ab534ce6..7e694b63 100644 --- a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart @@ -228,7 +228,7 @@ class SomeQueryQuery VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'filter')), type: NamedTypeNode( - name: NameNode(value: 'ComplexInput'), isNonNull: true), + name: NameNode(value: 'ComplexInput'), ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart index bfae43d2..d47dff58 100644 --- a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart @@ -242,7 +242,7 @@ class CustomMutation type: ListTypeNode( type: NamedTypeNode( name: NameNode(value: 'MyUuid'), isNonNull: false), - isNonNull: false), + ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart index fbcbe170..7d711907 100644 --- a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart @@ -212,7 +212,7 @@ class SomeQueryQuery VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'input')), type: NamedTypeNode( - name: NameNode(value: 'Input'), isNonNull: true), + name: NameNode(value: 'Input'), ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/input_duplication_test.dart b/test/query_generator/mutations_and_inputs/input_duplication_test.dart index 9d016175..ed66f1b5 100644 --- a/test/query_generator/mutations_and_inputs/input_duplication_test.dart +++ b/test/query_generator/mutations_and_inputs/input_duplication_test.dart @@ -334,7 +334,7 @@ class CustomListMutation type: ListTypeNode( type: NamedTypeNode( name: NameNode(value: 'Input'), isNonNull: true), - isNonNull: true), + ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/mutations_test.dart b/test/query_generator/mutations_and_inputs/mutations_test.dart index fabbb9d3..0d3c3b54 100644 --- a/test/query_generator/mutations_and_inputs/mutations_test.dart +++ b/test/query_generator/mutations_and_inputs/mutations_test.dart @@ -367,7 +367,7 @@ class $customMutation VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'input')), type: NamedTypeNode( - name: NameNode(value: '_Input'), isNonNull: true), + name: NameNode(value: '_Input'), ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart index 69a61344..e66ad2e7 100644 --- a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart +++ b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart @@ -248,7 +248,7 @@ class SomeQueryQuery extends GraphQLQuery { type: NamedTypeNode( name: NameNode(value: 'Int'), isNonNull: true), isNonNull: true), - isNonNull: true), + ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/recursive_input_test.dart b/test/query_generator/mutations_and_inputs/recursive_input_test.dart index fce6e30d..564d8f68 100644 --- a/test/query_generator/mutations_and_inputs/recursive_input_test.dart +++ b/test/query_generator/mutations_and_inputs/recursive_input_test.dart @@ -72,9 +72,9 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - isNonNull: true) + type: TypeName(name: r'Input'), + name: QueryInputName(name: r'input'), + ) ], generateHelpers: false, suffix: r'Mutation') diff --git a/test/query_generator/naming/casing_conversion_test.dart b/test/query_generator/naming/casing_conversion_test.dart index 9b455efa..3e010cdc 100644 --- a/test/query_generator/naming/casing_conversion_test.dart +++ b/test/query_generator/naming/casing_conversion_test.dart @@ -339,7 +339,7 @@ class SomeQueryQuery extends GraphQLQuery { VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'filter')), type: NamedTypeNode( - name: NameNode(value: 'Input'), isNonNull: true), + name: NameNode(value: 'Input'), ), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/naming/simple_naming_test.dart b/test/query_generator/naming/simple_naming_test.dart index 501530a7..2c5bf59b 100644 --- a/test/query_generator/naming/simple_naming_test.dart +++ b/test/query_generator/naming/simple_naming_test.dart @@ -91,7 +91,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'ClientEventPage'), name: ClassPropertyName(name: r'clientEvents'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/query_generator_test.dart b/test/query_generator/query_generator_test.dart index 1ee5ab6f..572b2a6e 100644 --- a/test/query_generator/query_generator_test.dart +++ b/test/query_generator/query_generator_test.dart @@ -648,7 +648,6 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/scalars/custom_scalars_test.dart b/test/query_generator/scalars/custom_scalars_test.dart index ef87ce59..a6d63b35 100644 --- a/test/query_generator/scalars/custom_scalars_test.dart +++ b/test/query_generator/scalars/custom_scalars_test.dart @@ -166,7 +166,6 @@ final LibraryDefinition libraryDefinitionWithCustomImports = annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid)' ], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/scalars/scalars_test.dart b/test/query_generator/scalars/scalars_test.dart index d6e62a25..abb6ee1d 100644 --- a/test/query_generator/scalars/scalars_test.dart +++ b/test/query_generator/scalars/scalars_test.dart @@ -95,7 +95,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/scalars/unused_custom_scalars_test.dart b/test/query_generator/scalars/unused_custom_scalars_test.dart index 8ca389f7..50bfdf39 100644 --- a/test/query_generator/scalars/unused_custom_scalars_test.dart +++ b/test/query_generator/scalars/unused_custom_scalars_test.dart @@ -51,7 +51,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'a'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, From 08740a3d7e522d084d131e8ff36b633b4bd51e41 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:15:38 -0300 Subject: [PATCH 15/31] Remove some tests I'm sure are duplicated somewhere --- .../query_generator/query_generator_test.dart | 449 ------------------ 1 file changed, 449 deletions(-) diff --git a/test/query_generator/query_generator_test.dart b/test/query_generator/query_generator_test.dart index 572b2a6e..8e524f53 100644 --- a/test/query_generator/query_generator_test.dart +++ b/test/query_generator/query_generator_test.dart @@ -48,12 +48,10 @@ void main() { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'i'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -89,230 +87,6 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { ''', generateHelpers: false)); - test( - 'A simple query with list input', - () async => testGenerator( - query: r''' - query some_query($intsNonNullable: [Int]!, $stringNullable: String) { - someQuery(intsNonNullable: $intsNonNullable, stringNullable: $stringNullable) { - s - i - list(intsNonNullable: $intsNonNullable) - } - } - ''', - schema: r''' - schema { - query: Query - } - - type Query { - someQuery(intsNonNullable: [Int]!, stringNullable: String): SomeObject - } - - type SomeObject { - s: String - i: Int - list(intsNonNullable: [Int]!): [Int] - } - ''', - libraryDefinition: - LibraryDefinition(basename: r'query.graphql', queries: [ - QueryDefinition( - name: QueryName(name: r'SomeQuery$_Query'), - operationName: r'some_query', - classes: [ - ClassDefinition( - name: ClassName(name: r'SomeQuery$_Query$_SomeObject'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r's'), - isNonNull: false, - isResolveType: false), - ClassProperty( - type: TypeName(name: r'int'), - name: ClassPropertyName(name: r'i'), - isNonNull: false, - isResolveType: false), - ClassProperty( - type: TypeName(name: r'List'), - name: ClassPropertyName(name: r'list'), - isNonNull: true, - isResolveType: false) - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false), - ClassDefinition( - name: ClassName(name: r'SomeQuery$_Query'), - properties: [ - ClassProperty( - type: TypeName( - name: r'SomeQuery$_Query$_SomeObject'), - name: ClassPropertyName(name: r'someQuery'), - isNonNull: false, - isResolveType: false) - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false) - ], - inputs: [ - QueryInput( - type: TypeName(name: r'List'), - name: QueryInputName(name: r'intsNonNullable'), - isNonNull: true), - QueryInput( - type: TypeName(name: r'String'), - name: QueryInputName(name: r'stringNullable'), - isNonNull: false) - ], - generateHelpers: true, - suffix: r'Query') - ]), - generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND -// @dart = 2.12 - -import 'package:artemis/artemis.dart'; -import 'package:json_annotation/json_annotation.dart'; -import 'package:equatable/equatable.dart'; -import 'package:gql/ast.dart'; -part 'query.graphql.g.dart'; - -@JsonSerializable(explicitToJson: true) -class SomeQuery$Query$SomeObject extends JsonSerializable with EquatableMixin { - SomeQuery$Query$SomeObject(); - - factory SomeQuery$Query$SomeObject.fromJson(Map json) => - _$SomeQuery$Query$SomeObjectFromJson(json); - - String? s; - - int? i; - - List? list; - - @override - List get props => [s, i, list]; - Map toJson() => _$SomeQuery$Query$SomeObjectToJson(this); -} - -@JsonSerializable(explicitToJson: true) -class SomeQuery$Query extends JsonSerializable with EquatableMixin { - SomeQuery$Query(); - - factory SomeQuery$Query.fromJson(Map json) => - _$SomeQuery$QueryFromJson(json); - - SomeQuery$Query$SomeObject? someQuery; - - @override - List get props => [someQuery]; - Map toJson() => _$SomeQuery$QueryToJson(this); -} - -@JsonSerializable(explicitToJson: true) -class SomeQueryArguments extends JsonSerializable with EquatableMixin { - SomeQueryArguments({required this.intsNonNullable, this.stringNullable}); - - @override - factory SomeQueryArguments.fromJson(Map json) => - _$SomeQueryArgumentsFromJson(json); - - final List intsNonNullable; - - final String? stringNullable; - - @override - List get props => [intsNonNullable, stringNullable]; - @override - Map toJson() => _$SomeQueryArgumentsToJson(this); -} - -class SomeQueryQuery extends GraphQLQuery { - SomeQueryQuery({this.variables}); - - @override - final DocumentNode document = DocumentNode(definitions: [ - OperationDefinitionNode( - type: OperationType.query, - name: NameNode(value: 'some_query'), - variableDefinitions: [ - VariableDefinitionNode( - variable: VariableNode(name: NameNode(value: 'intsNonNullable')), - type: ListTypeNode( - type: NamedTypeNode( - name: NameNode(value: 'Int'), isNonNull: false), - isNonNull: true), - defaultValue: DefaultValueNode(value: null), - directives: []), - VariableDefinitionNode( - variable: VariableNode(name: NameNode(value: 'stringNullable')), - type: NamedTypeNode( - name: NameNode(value: 'String'), isNonNull: false), - defaultValue: DefaultValueNode(value: null), - directives: []) - ], - directives: [], - selectionSet: SelectionSetNode(selections: [ - FieldNode( - name: NameNode(value: 'someQuery'), - alias: null, - arguments: [ - ArgumentNode( - name: NameNode(value: 'intsNonNullable'), - value: - VariableNode(name: NameNode(value: 'intsNonNullable'))), - ArgumentNode( - name: NameNode(value: 'stringNullable'), - value: - VariableNode(name: NameNode(value: 'stringNullable'))) - ], - directives: [], - selectionSet: SelectionSetNode(selections: [ - FieldNode( - name: NameNode(value: 's'), - alias: null, - arguments: [], - directives: [], - selectionSet: null), - FieldNode( - name: NameNode(value: 'i'), - alias: null, - arguments: [], - directives: [], - selectionSet: null), - FieldNode( - name: NameNode(value: 'list'), - alias: null, - arguments: [ - ArgumentNode( - name: NameNode(value: 'intsNonNullable'), - value: VariableNode( - name: NameNode(value: 'intsNonNullable'))) - ], - directives: [], - selectionSet: null) - ])) - ])) - ]); - - @override - final String operationName = 'some_query'; - - @override - final SomeQueryArguments variables; - - @override - List get props => [document, operationName, variables]; - @override - SomeQuery$Query parse(Map json) => - SomeQuery$Query.fromJson(json); -} -''', - generateHelpers: true)); - test( 'The selection from query can nest', () async => testGenerator( @@ -360,7 +134,6 @@ class SomeQueryQuery extends GraphQLQuery { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'str'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -372,14 +145,12 @@ class SomeQueryQuery extends GraphQLQuery { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'st'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName( name: r'List'), name: ClassPropertyName(name: r'ob'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -391,13 +162,11 @@ class SomeQueryQuery extends GraphQLQuery { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName( name: r'SomeQuery$_Result$_SomeObject'), name: ClassPropertyName(name: r'o'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -463,224 +232,6 @@ class SomeQuery$Result extends JsonSerializable with EquatableMixin { List get props => [s, o]; Map toJson() => _$SomeQuery$ResultToJson(this); } -''', - generateHelpers: false)); - - test( - 'Query selections can be aliased', - () async => testGenerator( - query: 'query some_query { firstName: s, lastName: st }', - schema: r''' - schema { - query: Result - } - - type Result { - s: String - st: String - } - ''', - libraryDefinition: - LibraryDefinition(basename: r'query.graphql', queries: [ - QueryDefinition( - name: QueryName(name: r'SomeQuery$_Result'), - operationName: r'some_query', - classes: [ - ClassDefinition( - name: ClassName(name: r'SomeQuery$_Result'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'firstName'), - isNonNull: false, - isResolveType: false), - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'lastName'), - isNonNull: false, - isResolveType: false) - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false) - ], - generateHelpers: false, - suffix: r'Query') - ]), - generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND -// @dart = 2.12 - -import 'package:json_annotation/json_annotation.dart'; -import 'package:equatable/equatable.dart'; -import 'package:gql/ast.dart'; -part 'query.graphql.g.dart'; - -@JsonSerializable(explicitToJson: true) -class SomeQuery$Result extends JsonSerializable with EquatableMixin { - SomeQuery$Result(); - - factory SomeQuery$Result.fromJson(Map json) => - _$SomeQuery$ResultFromJson(json); - - String? firstName; - - String? lastName; - - @override - List get props => [firstName, lastName]; - Map toJson() => _$SomeQuery$ResultToJson(this); -} -''', - generateHelpers: false)); - - test( - 'Imports from the scalar mapping are included', - () async => testGenerator( - query: r'''query some_query { bigDecimal, dateTime }''', - schema: r''' - scalar BigDecimal - scalar DateTime - - schema { - query: SomeObject - } - - type SomeObject { - bigDecimal: BigDecimal - dateTime: DateTime - } - ''', - builderOptionsMap: { - 'scalar_mapping': [ - { - 'graphql_type': 'BigDecimal', - 'dart_type': { - 'name': 'Decimal', - 'imports': ['package:decimal/decimal.dart'], - }, - }, - { - 'graphql_type': 'DateTime', - 'dart_type': 'DateTime', - }, - ], - }, - libraryDefinition: - LibraryDefinition(basename: r'query.graphql', queries: [ - QueryDefinition( - name: QueryName(name: r'SomeQuery$_SomeObject'), - operationName: r'some_query', - classes: [ - ClassDefinition( - name: ClassName(name: r'SomeQuery$_SomeObject'), - properties: [ - ClassProperty( - type: TypeName(name: r'Decimal'), - name: ClassPropertyName(name: r'bigDecimal'), - isNonNull: false, - isResolveType: false), - ClassProperty( - type: TypeName(name: r'DateTime'), - name: ClassPropertyName(name: r'dateTime'), - isNonNull: false, - isResolveType: false) - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false) - ], - generateHelpers: false, - suffix: r'Query') - ], customImports: [ - r'package:decimal/decimal.dart' - ]), - generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND -// @dart = 2.12 - -import 'package:json_annotation/json_annotation.dart'; -import 'package:equatable/equatable.dart'; -import 'package:gql/ast.dart'; -import 'package:decimal/decimal.dart'; -part 'query.graphql.g.dart'; - -@JsonSerializable(explicitToJson: true) -class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { - SomeQuery$SomeObject(); - - factory SomeQuery$SomeObject.fromJson(Map json) => - _$SomeQuery$SomeObjectFromJson(json); - - Decimal? bigDecimal; - - DateTime? dateTime; - - @override - List get props => [bigDecimal, dateTime]; - Map toJson() => _$SomeQuery$SomeObjectToJson(this); -} -''', - generateHelpers: false)); - - test( - 'Query name (pascal casing)', - () async => testGenerator( - query: r'''query PascalCasingQuery { s }''', - schema: r''' - schema { - query: PascalCasingQuery - } - - type PascalCasingQuery { - s: String - } - ''', - libraryDefinition: - LibraryDefinition(basename: r'query.graphql', queries: [ - QueryDefinition( - name: - QueryName(name: r'PascalCasingQuery$_PascalCasingQuery'), - operationName: r'PascalCasingQuery', - classes: [ - ClassDefinition( - name: ClassName( - name: r'PascalCasingQuery$_PascalCasingQuery'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r's'), - isResolveType: false) - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: '__typename'), - isInput: false) - ], - generateHelpers: false, - suffix: r'Query') - ]), - generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND -// @dart = 2.12 - -import 'package:json_annotation/json_annotation.dart'; -import 'package:equatable/equatable.dart'; -import 'package:gql/ast.dart'; -part 'query.graphql.g.dart'; - -@JsonSerializable(explicitToJson: true) -class PascalCasingQuery$PascalCasingQuery extends JsonSerializable - with EquatableMixin { - PascalCasingQuery$PascalCasingQuery(); - - factory PascalCasingQuery$PascalCasingQuery.fromJson( - Map json) => - _$PascalCasingQuery$PascalCasingQueryFromJson(json); - - String? s; - - @override - List get props => [s]; - Map toJson() => - _$PascalCasingQuery$PascalCasingQueryToJson(this); -} ''', generateHelpers: false)); }); From 957b6db5b58101ea7d8872b469569c24b191ad6e Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:16:56 -0300 Subject: [PATCH 16/31] Update query_generator_test.dart --- test/query_generator/query_generator_test.dart | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/query_generator/query_generator_test.dart b/test/query_generator/query_generator_test.dart index 8e524f53..4da8eb1f 100644 --- a/test/query_generator/query_generator_test.dart +++ b/test/query_generator/query_generator_test.dart @@ -147,9 +147,11 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { name: ClassPropertyName(name: r'st'), isResolveType: false), ClassProperty( - type: TypeName( - name: - r'List'), + type: ListOfTypeName( + typeName: TypeName( + name: + r'SomeQuery$_Result$_SomeObject$_AnotherObject'), + isNonNull: false), name: ClassPropertyName(name: r'ob'), isResolveType: false) ], @@ -210,7 +212,7 @@ class SomeQuery$Result$SomeObject extends JsonSerializable with EquatableMixin { String? st; - List? ob; + List? ob; @override List get props => [st, ob]; From 9ae1113010222dc5e6a2436f1102bb9c00988db1 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:23:59 -0300 Subject: [PATCH 17/31] Fix some root tests --- .../append_type_name_test.dart | 82 +++++++------------ test/query_generator/forwarder_test.dart | 3 +- .../multiple_operations_per_file_test.dart | 59 ++++++------- .../multiple_queries_test.dart | 9 +- 4 files changed, 63 insertions(+), 90 deletions(-) diff --git a/test/query_generator/append_type_name_test.dart b/test/query_generator/append_type_name_test.dart index 17f3fa4f..a8a7cef2 100644 --- a/test/query_generator/append_type_name_test.dart +++ b/test/query_generator/append_type_name_test.dart @@ -48,13 +48,11 @@ void main() { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'e'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: {}, @@ -66,13 +64,11 @@ void main() { ClassProperty( type: TypeName(name: r'Custom$_QueryRoot$_q'), name: ClassPropertyName(name: r'q'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: {}, @@ -83,6 +79,7 @@ void main() { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -96,10 +93,10 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot$Q.fromJson(Map json) => _$Custom$QueryRoot$QFromJson(json); - String e; + String? e; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [e, $$typename]; @@ -113,10 +110,10 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$Q q; + Custom$QueryRoot$Q? q; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [q, $$typename]; @@ -164,13 +161,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'e'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: {}, @@ -182,13 +177,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'Custom$_QueryRoot$_q'), name: ClassPropertyName(name: r'q'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: {}, @@ -199,6 +192,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -212,10 +206,10 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot$Q.fromJson(Map json) => _$Custom$QueryRoot$QFromJson(json); - String e; + String? e; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [e, $$typename]; @@ -229,10 +223,10 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$Q q; + Custom$QueryRoot$Q? q; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [q, $$typename]; @@ -283,7 +277,6 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], mixins: [FragmentName(name: r'QueryResponseMixin')], @@ -296,13 +289,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'Custom$_QueryRoot$_q'), name: ClassPropertyName(name: r'q'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: {}, @@ -314,13 +305,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'e'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ]) ], @@ -328,6 +317,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -335,9 +325,9 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin QueryResponseMixin { - String e; + String? e; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; } @JsonSerializable(explicitToJson: true) @@ -349,7 +339,7 @@ class Custom$QueryRoot$Q extends JsonSerializable _$Custom$QueryRoot$QFromJson(json); @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [e, $$typename, $$typename]; @@ -363,10 +353,10 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$Q q; + Custom$QueryRoot$Q? q; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [q, $$typename]; @@ -423,13 +413,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'a'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], extension: ClassName(name: r'Custom$_QueryRoot$_q'), @@ -442,13 +430,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'b'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], extension: ClassName(name: r'Custom$_QueryRoot$_q'), @@ -462,7 +448,6 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: { @@ -479,13 +464,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'Custom$_QueryRoot$_q'), name: ClassPropertyName(name: r'q'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: {}, @@ -496,6 +479,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -509,11 +493,11 @@ class Custom$QueryRoot$Q$TypeA extends Custom$QueryRoot$Q with EquatableMixin { factory Custom$QueryRoot$Q$TypeA.fromJson(Map json) => _$Custom$QueryRoot$Q$TypeAFromJson(json); - int a; + int? a; @JsonKey(name: '__typename') @override - String $$typename; + String? $$typename; @override List get props => [a, $$typename]; @@ -527,11 +511,11 @@ class Custom$QueryRoot$Q$TypeB extends Custom$QueryRoot$Q with EquatableMixin { factory Custom$QueryRoot$Q$TypeB.fromJson(Map json) => _$Custom$QueryRoot$Q$TypeBFromJson(json); - int b; + int? b; @JsonKey(name: '__typename') @override - String $$typename; + String? $$typename; @override List get props => [b, $$typename]; @@ -554,7 +538,7 @@ class Custom$QueryRoot$Q extends JsonSerializable with EquatableMixin { } @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [$$typename]; @@ -577,10 +561,10 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$Q q; + Custom$QueryRoot$Q? q; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [q, $$typename]; @@ -626,7 +610,6 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], mixins: [FragmentName(name: r'QueryResponseMixin')], @@ -640,13 +623,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { type: TypeName( name: r'Custom$_QueryRoot$_QueryResponse'), name: ClassPropertyName(name: r'q'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: {}, @@ -658,13 +639,11 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'e'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ]) ], @@ -672,6 +651,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { suffix: r'Query') ]), generatedFile: r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -680,9 +660,9 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin QueryResponseMixin { - String e; + String? e; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; } @JsonSerializable(explicitToJson: true) @@ -694,7 +674,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable _$Custom$QueryRoot$QueryResponseFromJson(json); @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [e, $$typename, $$typename]; @@ -708,10 +688,10 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$QueryResponse q; + Custom$QueryRoot$QueryResponse? q; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [q, $$typename]; @@ -755,7 +735,7 @@ class CustomQuery extends GraphQLQuery { name: NameNode(value: 'QueryResponse'), typeCondition: TypeConditionNode( on: NamedTypeNode( - name: NameNode(value: 'QueryResponse'), )), + name: NameNode(value: 'QueryResponse'), isNonNull: false)), directives: [], selectionSet: SelectionSetNode(selections: [ FieldNode( diff --git a/test/query_generator/forwarder_test.dart b/test/query_generator/forwarder_test.dart index 3f2659a3..351faa8a 100644 --- a/test/query_generator/forwarder_test.dart +++ b/test/query_generator/forwarder_test.dart @@ -70,6 +70,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -83,7 +84,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - String a; + String? a; @override List get props => [a]; diff --git a/test/query_generator/multiple_operations_per_file_test.dart b/test/query_generator/multiple_operations_per_file_test.dart index 0533090e..7d8a5776 100644 --- a/test/query_generator/multiple_operations_per_file_test.dart +++ b/test/query_generator/multiple_operations_per_file_test.dart @@ -75,7 +75,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -87,7 +86,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'MutData$_Mutation$_MutationResponse'), name: ClassPropertyName(name: r'mut'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -97,9 +95,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -108,9 +105,8 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - isNonNull: true) + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'input')) ], generateHelpers: true, suffix: r'Mutation'), @@ -124,17 +120,15 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'i'), - isNonNull: false, isResolveType: false), ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName(name: r'int'), isNonNull: true), name: ClassPropertyName(name: r'list'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -146,7 +140,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'QueData$_Query$_QueryResponse'), name: ClassPropertyName(name: r'que'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -155,19 +148,19 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'List'), - name: QueryInputName(name: r'intsNonNullable'), - isNonNull: true), + type: ListOfTypeName( + typeName: TypeName(name: r'int'), isNonNull: true), + name: QueryInputName(name: r'intsNonNullable')), QueryInput( type: TypeName(name: r'String'), - name: QueryInputName(name: r'stringNullable'), - isNonNull: false) + name: QueryInputName(name: r'stringNullable')) ], generateHelpers: true, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -184,7 +177,7 @@ class MutData$Mutation$MutationResponse extends JsonSerializable Map json) => _$MutData$Mutation$MutationResponseFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -199,7 +192,7 @@ class MutData$Mutation extends JsonSerializable with EquatableMixin { factory MutData$Mutation.fromJson(Map json) => _$MutData$MutationFromJson(json); - MutData$Mutation$MutationResponse mut; + MutData$Mutation$MutationResponse? mut; @override List get props => [mut]; @@ -208,11 +201,11 @@ class MutData$Mutation extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class Input extends JsonSerializable with EquatableMixin { - Input({@required this.s}); + Input({required this.s}); factory Input.fromJson(Map json) => _$InputFromJson(json); - String s; + late String s; @override List get props => [s]; @@ -226,11 +219,11 @@ class QueData$Query$QueryResponse extends JsonSerializable with EquatableMixin { factory QueData$Query$QueryResponse.fromJson(Map json) => _$QueData$Query$QueryResponseFromJson(json); - String s; + String? s; - int i; + int? i; - List list; + late List list; @override List get props => [s, i, list]; @@ -244,7 +237,7 @@ class QueData$Query extends JsonSerializable with EquatableMixin { factory QueData$Query.fromJson(Map json) => _$QueData$QueryFromJson(json); - QueData$Query$QueryResponse que; + QueData$Query$QueryResponse? que; @override List get props => [que]; @@ -253,13 +246,13 @@ class QueData$Query extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class MutDataArguments extends JsonSerializable with EquatableMixin { - MutDataArguments({@required this.input}); + MutDataArguments({required this.input}); @override factory MutDataArguments.fromJson(Map json) => _$MutDataArgumentsFromJson(json); - final Input input; + late Input input; @override List get props => [input]; @@ -268,7 +261,7 @@ class MutDataArguments extends JsonSerializable with EquatableMixin { } class MutDataMutation extends GraphQLQuery { - MutDataMutation({this.variables}); + MutDataMutation({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -381,15 +374,15 @@ class MutDataMutation extends GraphQLQuery { @JsonSerializable(explicitToJson: true) class QueDataArguments extends JsonSerializable with EquatableMixin { - QueDataArguments({@required this.intsNonNullable, this.stringNullable}); + QueDataArguments({required this.intsNonNullable, this.stringNullable}); @override factory QueDataArguments.fromJson(Map json) => _$QueDataArgumentsFromJson(json); - final List intsNonNullable; + late List intsNonNullable; - final String stringNullable; + final String? stringNullable; @override List get props => [intsNonNullable, stringNullable]; @@ -398,7 +391,7 @@ class QueDataArguments extends JsonSerializable with EquatableMixin { } class QueDataQuery extends GraphQLQuery { - QueDataQuery({this.variables}); + QueDataQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -448,7 +441,7 @@ class QueDataQuery extends GraphQLQuery { VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'stringNullable')), type: NamedTypeNode( - name: NameNode(value: 'String'), ), + name: NameNode(value: 'String'), isNonNull: false), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/multiple_queries_test.dart b/test/query_generator/multiple_queries_test.dart index 660db695..27d2ab8f 100644 --- a/test/query_generator/multiple_queries_test.dart +++ b/test/query_generator/multiple_queries_test.dart @@ -43,12 +43,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'i'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -78,6 +76,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -91,9 +90,9 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { factory SomeQuery$SomeObject.fromJson(Map json) => _$SomeQuery$SomeObjectFromJson(json); - String s; + String? s; - int i; + int? i; @override List get props => [s, i]; @@ -107,7 +106,7 @@ class AnotherQuery$SomeObject extends JsonSerializable with EquatableMixin { factory AnotherQuery$SomeObject.fromJson(Map json) => _$AnotherQuery$SomeObjectFromJson(json); - String s; + String? s; @override List get props => [s]; From 0d9cb11a50141c5308027c4bb10656988b0e6482 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:29:51 -0300 Subject: [PATCH 18/31] Fix scalars and fromJson/toJson naming annotations --- lib/generator.dart | 4 ++-- .../scalars/custom_scalars_test.dart | 11 ++++++----- test/query_generator/scalars/scalars_test.dart | 15 ++++++--------- .../scalars/unused_custom_scalars_test.dart | 3 ++- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/generator.dart b/lib/generator.dart index c0d1c763..a08e76b1 100644 --- a/lib/generator.dart +++ b/lib/generator.dart @@ -354,9 +354,9 @@ Make sure your query is correct and your schema is updated.'''); .dartTypeSafe); final dartTypeSafeStr = TypeName(name: dartTypeName.dartTypeSafe); jsonKeyAnnotation['fromJson'] = - 'fromGraphQL${graphqlTypeSafeStr.namePrintable}ToDart${dartTypeSafeStr.namePrintable}'; + 'fromGraphQL${graphqlTypeSafeStr.dartTypeSafe}ToDart${dartTypeSafeStr.dartTypeSafe}'; jsonKeyAnnotation['toJson'] = - 'fromDart${dartTypeSafeStr.namePrintable}ToGraphQL${graphqlTypeSafeStr.namePrintable}'; + 'fromDart${dartTypeSafeStr.dartTypeSafe}ToGraphQL${graphqlTypeSafeStr.dartTypeSafe}'; } } // On enums else if (nextType is EnumTypeDefinitionNode) { diff --git a/test/query_generator/scalars/custom_scalars_test.dart b/test/query_generator/scalars/custom_scalars_test.dart index a6d63b35..ee0405de 100644 --- a/test/query_generator/scalars/custom_scalars_test.dart +++ b/test/query_generator/scalars/custom_scalars_test.dart @@ -112,7 +112,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'a'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -138,7 +137,6 @@ final LibraryDefinition libraryDefinitionWithCustomParserFns = annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyDartUuid, toJson: fromDartMyDartUuidToGraphQLMyUuid)' ], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -180,6 +178,7 @@ final LibraryDefinition libraryDefinitionWithCustomImports = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -193,7 +192,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { factory Query$SomeObject.fromJson(Map json) => _$Query$SomeObjectFromJson(json); - String a; + String? a; @override List get props => [a]; @@ -203,6 +202,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { const generatedFileWithCustomParserFns = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -220,7 +220,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { @JsonKey( fromJson: fromGraphQLMyUuidToDartMyDartUuid, toJson: fromDartMyDartUuidToGraphQLMyUuid) - MyDartUuid a; + MyDartUuid? a; @override List get props => [a]; @@ -230,6 +230,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { const generatedFileWithCustomImports = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -248,7 +249,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { @JsonKey( fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid) - MyUuid a; + MyUuid? a; @override List get props => [a]; diff --git a/test/query_generator/scalars/scalars_test.dart b/test/query_generator/scalars/scalars_test.dart index abb6ee1d..0baf2c49 100644 --- a/test/query_generator/scalars/scalars_test.dart +++ b/test/query_generator/scalars/scalars_test.dart @@ -75,22 +75,18 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'i'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'double'), name: ClassPropertyName(name: r'f'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'bool'), name: ClassPropertyName(name: r'b'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), @@ -106,6 +102,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -119,15 +116,15 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { factory SomeQuery$SomeObject.fromJson(Map json) => _$SomeQuery$SomeObjectFromJson(json); - int i; + int? i; - double f; + double? f; - String s; + String? s; - bool b; + bool? b; - String id; + String? id; @override List get props => [i, f, s, b, id]; diff --git a/test/query_generator/scalars/unused_custom_scalars_test.dart b/test/query_generator/scalars/unused_custom_scalars_test.dart index 50bfdf39..6ab1b8c8 100644 --- a/test/query_generator/scalars/unused_custom_scalars_test.dart +++ b/test/query_generator/scalars/unused_custom_scalars_test.dart @@ -62,6 +62,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -75,7 +76,7 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { factory Query$SomeObject.fromJson(Map json) => _$Query$SomeObjectFromJson(json); - String a; + String? a; @override List get props => [a]; From e431497614e6b9fbdca821207401ed76843200e9 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:33:13 -0300 Subject: [PATCH 19/31] Naming tests --- .../naming/casing_conversion_test.dart | 55 ++++++++----------- .../naming/simple_naming_test.dart | 20 ++++--- 2 files changed, 33 insertions(+), 42 deletions(-) diff --git a/test/query_generator/naming/casing_conversion_test.dart b/test/query_generator/naming/casing_conversion_test.dart index 3e010cdc..a64e5015 100644 --- a/test/query_generator/naming/casing_conversion_test.dart +++ b/test/query_generator/naming/casing_conversion_test.dart @@ -111,19 +111,16 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'CamelCaseType'), name: ClassPropertyName(name: r'camelCaseField'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'PascalCaseType'), name: ClassPropertyName(name: r'PascalCaseField'), annotations: [r'''JsonKey(name: 'PascalCaseField')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'SnakeCaseType'), name: ClassPropertyName(name: r'snake_case_field'), annotations: [r'''JsonKey(name: 'snake_case_field')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'ScreamingSnakeCaseType'), @@ -131,15 +128,13 @@ final LibraryDefinition libraryDefinition = annotations: [ r'''JsonKey(name: 'SCREAMING_SNAKE_CASE_FIELD')''' ], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'MyEnum'), name: ClassPropertyName(name: r'e'), annotations: [ - r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' + r'JsonKey(unknownEnumValue: MyEnum?.artemisUnknown)' ], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -151,7 +146,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'SomeObject'), name: ClassPropertyName(name: r'query'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -163,19 +157,16 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'CamelCaseTypeInput'), name: ClassPropertyName(name: r'camelCaseField'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'PascalCaseTypeInput'), name: ClassPropertyName(name: r'PascalCaseField'), annotations: [r'''JsonKey(name: 'PascalCaseField')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'SnakeCaseTypeInput'), name: ClassPropertyName(name: r'snake_case_field'), annotations: [r'''JsonKey(name: 'snake_case_field')'''], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'ScreamingSnakeCaseTypeInput'), @@ -183,15 +174,13 @@ final LibraryDefinition libraryDefinition = annotations: [ r'''JsonKey(name: 'SCREAMING_SNAKE_CASE_FIELD')''' ], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'MyEnum'), name: ClassPropertyName(name: r'e'), annotations: [ - r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' + r'JsonKey(unknownEnumValue: MyEnum?.artemisUnknown)' ], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -200,15 +189,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'filter'), - isNonNull: true) + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'filter')) ], generateHelpers: true, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -223,19 +212,19 @@ class SomeObject extends JsonSerializable with EquatableMixin { factory SomeObject.fromJson(Map json) => _$SomeObjectFromJson(json); - CamelCaseType camelCaseField; + CamelCaseType? camelCaseField; @JsonKey(name: 'PascalCaseField') - PascalCaseType pascalCaseField; + PascalCaseType? pascalCaseField; @JsonKey(name: 'snake_case_field') - SnakeCaseType snakeCaseField; + SnakeCaseType? snakeCaseField; @JsonKey(name: 'SCREAMING_SNAKE_CASE_FIELD') - ScreamingSnakeCaseType screamingSnakeCaseField; + ScreamingSnakeCaseType? screamingSnakeCaseField; - @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum e; + @JsonKey(unknownEnumValue: MyEnum?.artemisUnknown) + MyEnum? e; @override List get props => [ @@ -255,7 +244,7 @@ class SomeQuery$Query extends JsonSerializable with EquatableMixin { factory SomeQuery$Query.fromJson(Map json) => _$SomeQuery$QueryFromJson(json); - SomeObject query; + SomeObject? query; @override List get props => [query]; @@ -273,19 +262,19 @@ class Input extends JsonSerializable with EquatableMixin { factory Input.fromJson(Map json) => _$InputFromJson(json); - CamelCaseTypeInput camelCaseField; + CamelCaseTypeInput? camelCaseField; @JsonKey(name: 'PascalCaseField') - PascalCaseTypeInput pascalCaseField; + PascalCaseTypeInput? pascalCaseField; @JsonKey(name: 'snake_case_field') - SnakeCaseTypeInput snakeCaseField; + SnakeCaseTypeInput? snakeCaseField; @JsonKey(name: 'SCREAMING_SNAKE_CASE_FIELD') - ScreamingSnakeCaseTypeInput screamingSnakeCaseField; + ScreamingSnakeCaseTypeInput? screamingSnakeCaseField; - @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum e; + @JsonKey(unknownEnumValue: MyEnum?.artemisUnknown) + MyEnum? e; @override List get props => [ @@ -313,13 +302,13 @@ enum MyEnum { @JsonSerializable(explicitToJson: true) class SomeQueryArguments extends JsonSerializable with EquatableMixin { - SomeQueryArguments({@required this.filter}); + SomeQueryArguments({required this.filter}); @override factory SomeQueryArguments.fromJson(Map json) => _$SomeQueryArgumentsFromJson(json); - final Input filter; + late Input filter; @override List get props => [filter]; @@ -328,7 +317,7 @@ class SomeQueryArguments extends JsonSerializable with EquatableMixin { } class SomeQueryQuery extends GraphQLQuery { - SomeQueryQuery({this.variables}); + SomeQueryQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -339,7 +328,7 @@ class SomeQueryQuery extends GraphQLQuery { VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'filter')), type: NamedTypeNode( - name: NameNode(value: 'Input'), ), + name: NameNode(value: 'Input'), isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/naming/simple_naming_test.dart b/test/query_generator/naming/simple_naming_test.dart index 2c5bf59b..201af8eb 100644 --- a/test/query_generator/naming/simple_naming_test.dart +++ b/test/query_generator/naming/simple_naming_test.dart @@ -9,7 +9,7 @@ import '../../helpers.dart'; void main() { group('Simple naming', () { test( - 'Casing will be converted accordingly (and JsonKey names willb e populated accordingly)', + 'Casing will be converted accordingly (and JsonKey names will be populated accordingly)', () async => testGenerator( query: r''' query ClientEventsData { @@ -65,9 +65,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'ClientEventItem'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: TypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'type'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -77,9 +76,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'ClientEventPage'), properties: [ ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: + TypeName(name: r'ClientEventItem', isNonNull: true), + isNonNull: true), name: ClassPropertyName(name: r'items'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -89,7 +90,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'ClientEventsData$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'ClientEventPage'), + type: TypeName(name: r'ClientEventPage', isNonNull: true), name: ClassPropertyName(name: r'clientEvents'), isResolveType: false) ], @@ -102,6 +103,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -116,7 +118,7 @@ class ClientEventItem extends JsonSerializable with EquatableMixin { factory ClientEventItem.fromJson(Map json) => _$ClientEventItemFromJson(json); - int type; + late int type; @override List get props => [type]; @@ -130,7 +132,7 @@ class ClientEventPage extends JsonSerializable with EquatableMixin { factory ClientEventPage.fromJson(Map json) => _$ClientEventPageFromJson(json); - List items; + late List items; @override List get props => [items]; @@ -144,7 +146,7 @@ class ClientEventsData$Query extends JsonSerializable with EquatableMixin { factory ClientEventsData$Query.fromJson(Map json) => _$ClientEventsData$QueryFromJson(json); - ClientEventPage clientEvents; + late ClientEventPage clientEvents; @override List get props => [clientEvents]; From 2c12922d894beb231269da07433a152958fd5a4f Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:45:15 -0300 Subject: [PATCH 20/31] Fix mutations and inputs tests and naming annotation of enums and input objects --- lib/generator.dart | 4 +- lib/visitor/generator_visitor.dart | 8 +-- .../complex_input_objects_test.dart | 56 ++++++++----------- .../custom_scalars_on_input_objects_test.dart | 36 ++++++------ .../filter_input_objects_test.dart | 26 ++++----- .../input_duplication_test.dart | 49 ++++++++-------- .../mutations_and_inputs/mutations_test.dart | 51 ++++++++--------- .../non_nullable_list_inputs_test.dart | 2 +- .../recursive_input_test.dart | 15 ++--- 9 files changed, 108 insertions(+), 139 deletions(-) diff --git a/lib/generator.dart b/lib/generator.dart index a08e76b1..207fda03 100644 --- a/lib/generator.dart +++ b/lib/generator.dart @@ -371,10 +371,10 @@ Make sure your query is correct and your schema is updated.'''); replaceLeafWith: ClassName.fromPath(path: nextClassName), schema: context.schema); jsonKeyAnnotation['unknownEnumValue'] = - '${innerDartTypeName.namePrintable}.${ARTEMIS_UNKNOWN.name.namePrintable}'; + '${innerDartTypeName.dartTypeSafe}.${ARTEMIS_UNKNOWN.name.namePrintable}'; } else { jsonKeyAnnotation['unknownEnumValue'] = - '${dartTypeName.namePrintable}.${ARTEMIS_UNKNOWN.name.namePrintable}'; + '${dartTypeName.dartTypeSafe}.${ARTEMIS_UNKNOWN.name.namePrintable}'; } } diff --git a/lib/visitor/generator_visitor.dart b/lib/visitor/generator_visitor.dart index c27403ea..a93ed526 100644 --- a/lib/visitor/generator_visitor.dart +++ b/lib/visitor/generator_visitor.dart @@ -170,10 +170,10 @@ class GeneratorVisitor extends RecursiveVisitor { replaceLeafWith: ClassName.fromPath(path: nextClassName), schema: context.schema); jsonKeyAnnotation['unknownEnumValue'] = - '${EnumName(name: innerDartTypeName.name).namePrintable}.${ARTEMIS_UNKNOWN.name.namePrintable}'; + '${EnumName(name: innerDartTypeName.name).dartTypeSafe}.${ARTEMIS_UNKNOWN.name.namePrintable}'; } else { jsonKeyAnnotation['unknownEnumValue'] = - '${EnumName(name: dartTypeName.name).namePrintable}.${ARTEMIS_UNKNOWN.name.namePrintable}'; + '${EnumName(name: dartTypeName.name).dartTypeSafe}.${ARTEMIS_UNKNOWN.name.namePrintable}'; } } else if (leafType is InputObjectTypeDefinitionNode) { addUsedInputObjectsAndEnums(leafType); @@ -190,9 +190,9 @@ class GeneratorVisitor extends RecursiveVisitor { .dartTypeSafe); final dartTypeSafeStr = TypeName(name: dartTypeName.dartTypeSafe); jsonKeyAnnotation['fromJson'] = - 'fromGraphQL${graphqlTypeSafeStr.namePrintable}ToDart${dartTypeSafeStr.namePrintable}'; + 'fromGraphQL${graphqlTypeSafeStr.dartTypeSafe}ToDart${dartTypeSafeStr.dartTypeSafe}'; jsonKeyAnnotation['toJson'] = - 'fromDart${dartTypeSafeStr.namePrintable}ToGraphQL${graphqlTypeSafeStr.namePrintable}'; + 'fromDart${dartTypeSafeStr.dartTypeSafe}ToGraphQL${graphqlTypeSafeStr.dartTypeSafe}'; } } diff --git a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart index 7e694b63..3c589289 100644 --- a/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/complex_input_objects_test.dart @@ -57,15 +57,9 @@ final LibraryDefinition libraryDefinition = operationName: r'some_query', classes: [ EnumDefinition(name: EnumName(name: r'MyEnum'), values: [ - EnumValueDefinition( - name: EnumValueName(name: r'value1'), - ), - EnumValueDefinition( - name: EnumValueName(name: r'value2'), - ), - EnumValueDefinition( - name: EnumValueName(name: r'ARTEMIS_UNKNOWN'), - ), + EnumValueDefinition(name: EnumValueName(name: r'value1')), + EnumValueDefinition(name: EnumValueName(name: r'value2')), + EnumValueDefinition(name: EnumValueName(name: r'ARTEMIS_UNKNOWN')) ]), ClassDefinition( name: ClassName(name: r'SomeQuery$_QueryRoot$_SomeObject'), @@ -73,7 +67,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -85,7 +78,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'SomeQuery$_QueryRoot$_SomeObject'), name: ClassPropertyName(name: r'o'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -95,9 +87,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'ComplexInput'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'MyEnum'), @@ -105,17 +96,18 @@ final LibraryDefinition libraryDefinition = annotations: [ r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' ], - isNonNull: false, isResolveType: false), ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName(name: r'String'), isNonNull: false), name: ClassPropertyName(name: r'ls'), - isNonNull: false, isResolveType: false), ClassProperty( - type: TypeName(name: r'List>'), + type: ListOfTypeName( + typeName: ListOfTypeName( + typeName: TypeName(name: r'int'), isNonNull: false), + isNonNull: false), name: ClassPropertyName(name: r'i'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -124,15 +116,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'ComplexInput'), - name: QueryInputName(name: r'filter'), - isNonNull: true) + type: TypeName(name: r'ComplexInput', isNonNull: true), + name: QueryInputName(name: r'filter')) ], generateHelpers: true, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -148,7 +140,7 @@ class SomeQuery$QueryRoot$SomeObject extends JsonSerializable factory SomeQuery$QueryRoot$SomeObject.fromJson(Map json) => _$SomeQuery$QueryRoot$SomeObjectFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -162,7 +154,7 @@ class SomeQuery$QueryRoot extends JsonSerializable with EquatableMixin { factory SomeQuery$QueryRoot.fromJson(Map json) => _$SomeQuery$QueryRootFromJson(json); - SomeQuery$QueryRoot$SomeObject o; + SomeQuery$QueryRoot$SomeObject? o; @override List get props => [o]; @@ -171,19 +163,19 @@ class SomeQuery$QueryRoot extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class ComplexInput extends JsonSerializable with EquatableMixin { - ComplexInput({@required this.s, this.e, this.ls, this.i}); + ComplexInput({required this.s, this.e, this.ls, this.i}); factory ComplexInput.fromJson(Map json) => _$ComplexInputFromJson(json); - String s; + late String s; @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum e; + MyEnum? e; - List ls; + List? ls; - List> i; + List?>? i; @override List get props => [s, e, ls, i]; @@ -201,13 +193,13 @@ enum MyEnum { @JsonSerializable(explicitToJson: true) class SomeQueryArguments extends JsonSerializable with EquatableMixin { - SomeQueryArguments({@required this.filter}); + SomeQueryArguments({required this.filter}); @override factory SomeQueryArguments.fromJson(Map json) => _$SomeQueryArgumentsFromJson(json); - final ComplexInput filter; + late ComplexInput filter; @override List get props => [filter]; @@ -217,7 +209,7 @@ class SomeQueryArguments extends JsonSerializable with EquatableMixin { class SomeQueryQuery extends GraphQLQuery { - SomeQueryQuery({this.variables}); + SomeQueryQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -228,7 +220,7 @@ class SomeQueryQuery VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'filter')), type: NamedTypeNode( - name: NameNode(value: 'ComplexInput'), ), + name: NameNode(value: 'ComplexInput'), isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart index d47dff58..56015d14 100644 --- a/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/custom_scalars_on_input_objects_test.dart @@ -70,7 +70,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -83,7 +82,6 @@ final LibraryDefinition libraryDefinition = type: TypeName(name: r'Custom$_MutationRoot$_MutationResponse'), name: ClassPropertyName(name: r'mut'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -93,12 +91,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'MyUuid'), + type: TypeName(name: r'MyUuid', isNonNull: true), name: ClassPropertyName(name: r'id'), annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid)' ], - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -107,20 +104,18 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - isNonNull: true), + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'input')), QueryInput( type: TypeName(name: r'MyUuid'), name: QueryInputName(name: r'previousId'), - isNonNull: false, annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid)' ]), QueryInput( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName(name: r'MyUuid'), isNonNull: false), name: QueryInputName(name: r'listIds'), - isNonNull: false, annotations: [ r'JsonKey(fromJson: fromGraphQLListMyUuidToDartListMyUuid, toJson: fromDartListMyUuidToGraphQLListMyUuid)' ]) @@ -133,6 +128,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -151,7 +147,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable Map json) => _$Custom$MutationRoot$MutationResponseFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -166,7 +162,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { factory Custom$MutationRoot.fromJson(Map json) => _$Custom$MutationRootFromJson(json); - Custom$MutationRoot$MutationResponse mut; + Custom$MutationRoot$MutationResponse? mut; @override List get props => [mut]; @@ -175,14 +171,14 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class Input extends JsonSerializable with EquatableMixin { - Input({@required this.id}); + Input({required this.id}); factory Input.fromJson(Map json) => _$InputFromJson(json); @JsonKey( fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid) - MyUuid id; + late MyUuid id; @override List get props => [id]; @@ -191,23 +187,23 @@ class Input extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class CustomArguments extends JsonSerializable with EquatableMixin { - CustomArguments({@required this.input, this.previousId, this.listIds}); + CustomArguments({required this.input, this.previousId, this.listIds}); @override factory CustomArguments.fromJson(Map json) => _$CustomArgumentsFromJson(json); - final Input input; + late Input input; @JsonKey( fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid) - final MyUuid previousId; + final MyUuid? previousId; @JsonKey( fromJson: fromGraphQLListMyUuidToDartListMyUuid, toJson: fromDartListMyUuidToGraphQLListMyUuid) - final List listIds; + final List? listIds; @override List get props => [input, previousId, listIds]; @@ -217,7 +213,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { class CustomMutation extends GraphQLQuery { - CustomMutation({this.variables}); + CustomMutation({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -242,7 +238,7 @@ class CustomMutation type: ListTypeNode( type: NamedTypeNode( name: NameNode(value: 'MyUuid'), isNonNull: false), - ), + isNonNull: false), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart index 7d711907..cae19c35 100644 --- a/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart +++ b/test/query_generator/mutations_and_inputs/filter_input_objects_test.dart @@ -66,7 +66,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -78,7 +77,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'SomeQuery$_QueryRoot$_SomeObject'), name: ClassPropertyName(name: r'o'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -90,7 +88,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'SubInput'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -102,7 +99,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -111,15 +107,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - isNonNull: true) + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'input')) ], generateHelpers: true, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -135,7 +131,7 @@ class SomeQuery$QueryRoot$SomeObject extends JsonSerializable factory SomeQuery$QueryRoot$SomeObject.fromJson(Map json) => _$SomeQuery$QueryRoot$SomeObjectFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -149,7 +145,7 @@ class SomeQuery$QueryRoot extends JsonSerializable with EquatableMixin { factory SomeQuery$QueryRoot.fromJson(Map json) => _$SomeQuery$QueryRootFromJson(json); - SomeQuery$QueryRoot$SomeObject o; + SomeQuery$QueryRoot$SomeObject? o; @override List get props => [o]; @@ -162,7 +158,7 @@ class Input extends JsonSerializable with EquatableMixin { factory Input.fromJson(Map json) => _$InputFromJson(json); - SubInput s; + SubInput? s; @override List get props => [s]; @@ -176,7 +172,7 @@ class SubInput extends JsonSerializable with EquatableMixin { factory SubInput.fromJson(Map json) => _$SubInputFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -185,13 +181,13 @@ class SubInput extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class SomeQueryArguments extends JsonSerializable with EquatableMixin { - SomeQueryArguments({@required this.input}); + SomeQueryArguments({required this.input}); @override factory SomeQueryArguments.fromJson(Map json) => _$SomeQueryArgumentsFromJson(json); - final Input input; + late Input input; @override List get props => [input]; @@ -201,7 +197,7 @@ class SomeQueryArguments extends JsonSerializable with EquatableMixin { class SomeQueryQuery extends GraphQLQuery { - SomeQueryQuery({this.variables}); + SomeQueryQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -212,7 +208,7 @@ class SomeQueryQuery VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'input')), type: NamedTypeNode( - name: NameNode(value: 'Input'), ), + name: NameNode(value: 'Input'), isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/input_duplication_test.dart b/test/query_generator/mutations_and_inputs/input_duplication_test.dart index ed66f1b5..921de2a2 100644 --- a/test/query_generator/mutations_and_inputs/input_duplication_test.dart +++ b/test/query_generator/mutations_and_inputs/input_duplication_test.dart @@ -69,7 +69,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -81,7 +80,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Custom$_Mutation$_mut'), name: ClassPropertyName(name: r'mut'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -91,9 +89,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -102,9 +99,8 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - isNonNull: true) + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'input')) ], generateHelpers: true, suffix: r'Mutation'), @@ -118,7 +114,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -130,7 +125,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'CustomList$_Mutation$_mutList'), name: ClassPropertyName(name: r'mutList'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -140,9 +134,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -151,15 +144,17 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'List'), - name: QueryInputName(name: r'input'), - isNonNull: true) + type: ListOfTypeName( + typeName: TypeName(name: r'Input', isNonNull: true), + isNonNull: true), + name: QueryInputName(name: r'input')) ], generateHelpers: true, suffix: r'Mutation') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -174,7 +169,7 @@ class Custom$Mutation$Mut extends JsonSerializable with EquatableMixin { factory Custom$Mutation$Mut.fromJson(Map json) => _$Custom$Mutation$MutFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -188,7 +183,7 @@ class Custom$Mutation extends JsonSerializable with EquatableMixin { factory Custom$Mutation.fromJson(Map json) => _$Custom$MutationFromJson(json); - Custom$Mutation$Mut mut; + Custom$Mutation$Mut? mut; @override List get props => [mut]; @@ -197,11 +192,11 @@ class Custom$Mutation extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class Input extends JsonSerializable with EquatableMixin { - Input({@required this.s}); + Input({required this.s}); factory Input.fromJson(Map json) => _$InputFromJson(json); - String s; + late String s; @override List get props => [s]; @@ -215,7 +210,7 @@ class CustomList$Mutation$MutList extends JsonSerializable with EquatableMixin { factory CustomList$Mutation$MutList.fromJson(Map json) => _$CustomList$Mutation$MutListFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -229,7 +224,7 @@ class CustomList$Mutation extends JsonSerializable with EquatableMixin { factory CustomList$Mutation.fromJson(Map json) => _$CustomList$MutationFromJson(json); - CustomList$Mutation$MutList mutList; + CustomList$Mutation$MutList? mutList; @override List get props => [mutList]; @@ -238,13 +233,13 @@ class CustomList$Mutation extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class CustomArguments extends JsonSerializable with EquatableMixin { - CustomArguments({@required this.input}); + CustomArguments({required this.input}); @override factory CustomArguments.fromJson(Map json) => _$CustomArgumentsFromJson(json); - final Input input; + late Input input; @override List get props => [input]; @@ -253,7 +248,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { } class CustomMutation extends GraphQLQuery { - CustomMutation({this.variables}); + CustomMutation({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -305,13 +300,13 @@ class CustomMutation extends GraphQLQuery { @JsonSerializable(explicitToJson: true) class CustomListArguments extends JsonSerializable with EquatableMixin { - CustomListArguments({@required this.input}); + CustomListArguments({required this.input}); @override factory CustomListArguments.fromJson(Map json) => _$CustomListArgumentsFromJson(json); - final List input; + late List input; @override List get props => [input]; @@ -321,7 +316,7 @@ class CustomListArguments extends JsonSerializable with EquatableMixin { class CustomListMutation extends GraphQLQuery { - CustomListMutation({this.variables}); + CustomListMutation({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -334,7 +329,7 @@ class CustomListMutation type: ListTypeNode( type: NamedTypeNode( name: NameNode(value: 'Input'), isNonNull: true), - ), + isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/mutations_test.dart b/test/query_generator/mutations_and_inputs/mutations_test.dart index 0d3c3b54..5ca31c27 100644 --- a/test/query_generator/mutations_and_inputs/mutations_test.dart +++ b/test/query_generator/mutations_and_inputs/mutations_test.dart @@ -76,7 +76,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -89,7 +88,6 @@ final LibraryDefinition libraryDefinition = type: TypeName(name: r'Custom$_MutationRoot$_MutationResponse'), name: ClassPropertyName(name: r'mut'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -99,9 +97,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -110,9 +107,8 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - isNonNull: true) + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'input')) ], generateHelpers: true, suffix: r'Mutation'), @@ -127,7 +123,6 @@ final LibraryDefinition libraryDefinition = type: TypeName(name: r'String'), name: ClassPropertyName(name: r'_s'), annotations: [r'''JsonKey(name: '_s')'''], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -141,7 +136,6 @@ final LibraryDefinition libraryDefinition = name: r'$custom$_MutationRoot$_$MutationResponse'), name: ClassPropertyName(name: r'_mut'), annotations: [r'''JsonKey(name: '_mut')'''], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -151,10 +145,9 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'_Input'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'_s'), annotations: [r'''JsonKey(name: '_s')'''], - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -163,15 +156,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'_Input'), - name: QueryInputName(name: r'input'), - isNonNull: true) + type: TypeName(name: r'_Input', isNonNull: true), + name: QueryInputName(name: r'input')) ], generateHelpers: true, suffix: r'Mutation') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -188,7 +181,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable Map json) => _$Custom$MutationRoot$MutationResponseFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -203,7 +196,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { factory Custom$MutationRoot.fromJson(Map json) => _$Custom$MutationRootFromJson(json); - Custom$MutationRoot$MutationResponse mut; + Custom$MutationRoot$MutationResponse? mut; @override List get props => [mut]; @@ -212,11 +205,11 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class Input extends JsonSerializable with EquatableMixin { - Input({@required this.s}); + Input({required this.s}); factory Input.fromJson(Map json) => _$InputFromJson(json); - String s; + late String s; @override List get props => [s]; @@ -233,7 +226,7 @@ class $custom$MutationRoot$$MutationResponse extends JsonSerializable _$$custom$MutationRoot$$MutationResponseFromJson(json); @JsonKey(name: '_s') - String $s; + String? $s; @override List get props => [$s]; @@ -249,7 +242,7 @@ class $custom$MutationRoot extends JsonSerializable with EquatableMixin { _$$custom$MutationRootFromJson(json); @JsonKey(name: '_mut') - $custom$MutationRoot$$MutationResponse $mut; + $custom$MutationRoot$$MutationResponse? $mut; @override List get props => [$mut]; @@ -258,12 +251,12 @@ class $custom$MutationRoot extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class $Input extends JsonSerializable with EquatableMixin { - $Input({@required this.$s}); + $Input({required this.$s}); factory $Input.fromJson(Map json) => _$$InputFromJson(json); @JsonKey(name: '_s') - String $s; + late String $s; @override List get props => [$s]; @@ -272,13 +265,13 @@ class $Input extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class CustomArguments extends JsonSerializable with EquatableMixin { - CustomArguments({@required this.input}); + CustomArguments({required this.input}); @override factory CustomArguments.fromJson(Map json) => _$CustomArgumentsFromJson(json); - final Input input; + late Input input; @override List get props => [input]; @@ -288,7 +281,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { class CustomMutation extends GraphQLQuery { - CustomMutation({this.variables}); + CustomMutation({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -340,13 +333,13 @@ class CustomMutation @JsonSerializable(explicitToJson: true) class $customArguments extends JsonSerializable with EquatableMixin { - $customArguments({@required this.input}); + $customArguments({required this.input}); @override factory $customArguments.fromJson(Map json) => _$$customArgumentsFromJson(json); - final $Input input; + late $Input input; @override List get props => [input]; @@ -356,7 +349,7 @@ class $customArguments extends JsonSerializable with EquatableMixin { class $customMutation extends GraphQLQuery<$custom$MutationRoot, $customArguments> { - $customMutation({this.variables}); + $customMutation({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -367,7 +360,7 @@ class $customMutation VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'input')), type: NamedTypeNode( - name: NameNode(value: '_Input'), ), + name: NameNode(value: '_Input'), isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart index e66ad2e7..69a61344 100644 --- a/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart +++ b/test/query_generator/mutations_and_inputs/non_nullable_list_inputs_test.dart @@ -248,7 +248,7 @@ class SomeQueryQuery extends GraphQLQuery { type: NamedTypeNode( name: NameNode(value: 'Int'), isNonNull: true), isNonNull: true), - ), + isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/mutations_and_inputs/recursive_input_test.dart b/test/query_generator/mutations_and_inputs/recursive_input_test.dart index 564d8f68..8845edc7 100644 --- a/test/query_generator/mutations_and_inputs/recursive_input_test.dart +++ b/test/query_generator/mutations_and_inputs/recursive_input_test.dart @@ -46,7 +46,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'mut'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -58,12 +57,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Input'), name: ClassPropertyName(name: r'and'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'Input'), name: ClassPropertyName(name: r'or'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -72,15 +69,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - ) + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'input')) ], generateHelpers: false, suffix: r'Mutation') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -94,7 +91,7 @@ class Custom$Mutation extends JsonSerializable with EquatableMixin { factory Custom$Mutation.fromJson(Map json) => _$Custom$MutationFromJson(json); - String mut; + String? mut; @override List get props => [mut]; @@ -107,9 +104,9 @@ class Input extends JsonSerializable with EquatableMixin { factory Input.fromJson(Map json) => _$InputFromJson(json); - Input and; + Input? and; - Input or; + Input? or; @override List get props => [and, or]; From deccc52c6926be8e68149715dbf16f7d8cd544b9 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:50:48 -0300 Subject: [PATCH 21/31] Interfaces tests --- .../interface_fragment_glob_test.dart | 34 ++++++++---------- .../interface_possible_types_test.dart | 27 ++++++-------- .../interfaces/interface_test.dart | 36 ++++++++----------- 3 files changed, 40 insertions(+), 57 deletions(-) diff --git a/test/query_generator/interfaces/interface_fragment_glob_test.dart b/test/query_generator/interfaces/interface_fragment_glob_test.dart index 0c59b97f..ba2c1fe8 100644 --- a/test/query_generator/interfaces/interface_fragment_glob_test.dart +++ b/test/query_generator/interfaces/interface_fragment_glob_test.dart @@ -104,15 +104,14 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_nodeById$_chatMessage'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'message'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName( - name: r'Custom$_Query$_nodeById$_chatMessage$_user'), + name: r'Custom$_Query$_nodeById$_chatMessage$_user', + isNonNull: true), name: ClassPropertyName(name: r'user'), - isNonNull: true, isResolveType: false) ], extension: ClassName(name: r'Custom$_Query$_nodeById'), @@ -123,15 +122,13 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_nodeById'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: { @@ -147,7 +144,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Custom$_Query$_nodeById'), name: ClassPropertyName(name: r'nodeById'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -157,28 +153,26 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'UserFragMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'username'), - isNonNull: true, isResolveType: false) ]) ], inputs: [ QueryInput( - type: TypeName(name: r'String'), - name: QueryInputName(name: r'id'), - ) + type: TypeName(name: r'String', isNonNull: true), + name: QueryInputName(name: r'id')) ], generateHelpers: false, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -228,9 +222,9 @@ class Custom$Query$NodeById$ChatMessage extends Custom$Query$NodeById Map json) => _$Custom$Query$NodeById$ChatMessageFromJson(json); - String message; + late String message; - Custom$Query$NodeById$ChatMessage$User user; + late Custom$Query$NodeById$ChatMessage$User user; @override List get props => [message, user]; @@ -253,10 +247,10 @@ class Custom$Query$NodeById extends JsonSerializable with EquatableMixin { return _$Custom$Query$NodeByIdFromJson(json); } - String id; + late String id; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [id, $$typename]; @@ -279,7 +273,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { factory Custom$Query.fromJson(Map json) => _$Custom$QueryFromJson(json); - Custom$Query$NodeById nodeById; + Custom$Query$NodeById? nodeById; @override List get props => [nodeById]; diff --git a/test/query_generator/interfaces/interface_possible_types_test.dart b/test/query_generator/interfaces/interface_possible_types_test.dart index f828c801..6e0d9921 100644 --- a/test/query_generator/interfaces/interface_possible_types_test.dart +++ b/test/query_generator/interfaces/interface_possible_types_test.dart @@ -78,9 +78,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node$_User'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'username'), - isNonNull: true, isResolveType: false) ], extension: ClassName(name: r'Custom$_Query$_Node'), @@ -91,9 +90,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'message'), - isNonNull: true, isResolveType: false) ], extension: ClassName(name: r'Custom$_Query$_Node'), @@ -104,15 +102,13 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: { @@ -128,7 +124,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Custom$_Query$_Node'), name: ClassPropertyName(name: r'nodeById'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -137,15 +132,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'String'), - name: QueryInputName(name: r'id'), - ) + type: TypeName(name: r'String', isNonNull: true), + name: QueryInputName(name: r'id')) ], generateHelpers: false, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -159,7 +154,7 @@ class Custom$Query$Node$User extends Custom$Query$Node with EquatableMixin { factory Custom$Query$Node$User.fromJson(Map json) => _$Custom$Query$Node$UserFromJson(json); - String username; + late String username; @override List get props => [username]; @@ -174,7 +169,7 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node factory Custom$Query$Node$ChatMessage.fromJson(Map json) => _$Custom$Query$Node$ChatMessageFromJson(json); - String message; + late String message; @override List get props => [message]; @@ -196,10 +191,10 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin { return _$Custom$Query$NodeFromJson(json); } - String id; + late String id; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [id, $$typename]; @@ -222,7 +217,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { factory Custom$Query.fromJson(Map json) => _$Custom$QueryFromJson(json); - Custom$Query$Node nodeById; + Custom$Query$Node? nodeById; @override List get props => [nodeById]; diff --git a/test/query_generator/interfaces/interface_test.dart b/test/query_generator/interfaces/interface_test.dart index f1777bd7..6b2595b1 100644 --- a/test/query_generator/interfaces/interface_test.dart +++ b/test/query_generator/interfaces/interface_test.dart @@ -95,15 +95,14 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'message'), - isNonNull: true, isResolveType: false), ClassProperty( - type: - TypeName(name: r'Custom$_Query$_Node$_ChatMessage$_User'), + type: TypeName( + name: r'Custom$_Query$_Node$_ChatMessage$_User', + isNonNull: true), name: ClassPropertyName(name: r'user'), - isNonNull: true, isResolveType: false) ], extension: ClassName(name: r'Custom$_Query$_Node'), @@ -114,15 +113,13 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'__typename'), annotations: [r'''JsonKey(name: '__typename')'''], - isNonNull: false, isResolveType: true) ], factoryPossibilities: { @@ -138,7 +135,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Custom$_Query$_Node'), name: ClassPropertyName(name: r'nodeById'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -148,28 +144,26 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'UserFragMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'username'), - isNonNull: true, isResolveType: false) ]) ], inputs: [ QueryInput( - type: TypeName(name: r'String'), - name: QueryInputName(name: r'id'), - ) + type: TypeName(name: r'String', isNonNull: true), + name: QueryInputName(name: r'id')) ], generateHelpers: false, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -217,9 +211,9 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node factory Custom$Query$Node$ChatMessage.fromJson(Map json) => _$Custom$Query$Node$ChatMessageFromJson(json); - String message; + late String message; - Custom$Query$Node$ChatMessage$User user; + late Custom$Query$Node$ChatMessage$User user; @override List get props => [message, user]; @@ -241,10 +235,10 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin { return _$Custom$Query$NodeFromJson(json); } - String id; + late String id; @JsonKey(name: '__typename') - String $$typename; + String? $$typename; @override List get props => [id, $$typename]; @@ -267,7 +261,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { factory Custom$Query.fromJson(Map json) => _$Custom$QueryFromJson(json); - Custom$Query$Node nodeById; + Custom$Query$Node? nodeById; @override List get props => [nodeById]; From 114f996182fc7c2e1888a8c7b33a8534beb345a7 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 17:52:44 -0300 Subject: [PATCH 22/31] Remove more isNonNull's --- .../aliases/alias_on_leaves_test.dart | 2 -- .../aliases/alias_on_object_test.dart | 4 ---- .../field_not_found_mutation_test.dart | 6 ------ .../ast_schema/input_types_test.dart | 8 -------- .../multiple_schema_mappint_test.dart | 17 ++--------------- .../deprecated/deprecated_field_test.dart | 5 ----- .../deprecated_input_object_field_test.dart | 5 ----- .../deprecated_interface_field_test.dart | 7 ------- .../enums/enum_duplication_test.dart | 3 --- test/query_generator/enums/enum_list_test.dart | 1 - .../query_generator/enums/filter_enum_test.dart | 4 ---- .../enums/input_enum_list_test.dart | 7 +------ test/query_generator/enums/input_enum_test.dart | 10 +--------- test/query_generator/enums/kw_prefix_test.dart | 5 ----- test/query_generator/enums/query_enum_test.dart | 1 - .../fragments/fragment_duplication_test.dart | 11 ----------- .../fragments/fragment_glob_test.dart | 8 -------- .../fragments/fragment_on_fragments_test.dart | 5 ----- .../fragments/fragments_multiple_test.dart | 16 +--------------- .../fragments/fragments_test.dart | 1 - ...ltiple_references_on_simple_naming_test.dart | 4 ---- 21 files changed, 5 insertions(+), 125 deletions(-) diff --git a/test/query_generator/aliases/alias_on_leaves_test.dart b/test/query_generator/aliases/alias_on_leaves_test.dart index 8933f247..54a19829 100644 --- a/test/query_generator/aliases/alias_on_leaves_test.dart +++ b/test/query_generator/aliases/alias_on_leaves_test.dart @@ -74,7 +74,6 @@ final LibraryDefinition libraryDefinition = annotations: [ r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' ], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -86,7 +85,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'thisIsAString'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'SomeQuery$_Response$_SomeObject'), diff --git a/test/query_generator/aliases/alias_on_object_test.dart b/test/query_generator/aliases/alias_on_object_test.dart index b2374d00..c520ae75 100644 --- a/test/query_generator/aliases/alias_on_object_test.dart +++ b/test/query_generator/aliases/alias_on_object_test.dart @@ -58,7 +58,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'st'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -70,7 +69,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'str'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -82,12 +80,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'SomeQuery$_QueryResponse$_SomeObject'), name: ClassPropertyName(name: r'o'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName( diff --git a/test/query_generator/ast_schema/field_not_found_mutation_test.dart b/test/query_generator/ast_schema/field_not_found_mutation_test.dart index 120621c4..b7e6811c 100644 --- a/test/query_generator/ast_schema/field_not_found_mutation_test.dart +++ b/test/query_generator/ast_schema/field_not_found_mutation_test.dart @@ -65,12 +65,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'message'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -85,7 +83,6 @@ final LibraryDefinition libraryDefinition = name: r'CreateThing$_MutationRoot$_CreateThingResponse$_Thing'), name: ClassPropertyName(name: r'thing'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -98,7 +95,6 @@ final LibraryDefinition libraryDefinition = type: TypeName( name: r'CreateThing$_MutationRoot$_CreateThingResponse'), name: ClassPropertyName(name: r'createThing'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -110,12 +106,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'clientId'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'message'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/ast_schema/input_types_test.dart b/test/query_generator/ast_schema/input_types_test.dart index da851451..59ea6896 100644 --- a/test/query_generator/ast_schema/input_types_test.dart +++ b/test/query_generator/ast_schema/input_types_test.dart @@ -70,12 +70,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'message'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -90,7 +88,6 @@ final LibraryDefinition libraryDefinition = name: r'CreateThing$_MutationRoot$_CreateThingResponse$_Thing'), name: ClassPropertyName(name: r'thing'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -103,7 +100,6 @@ final LibraryDefinition libraryDefinition = type: TypeName( name: r'CreateThing$_MutationRoot$_CreateThingResponse'), name: ClassPropertyName(name: r'createThing'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -115,7 +111,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -127,17 +122,14 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'clientId'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'message'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'List'), name: ClassPropertyName(name: r'shares'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart index 728b4a4a..d1db5ada 100644 --- a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart +++ b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart @@ -163,12 +163,10 @@ final LibraryDefinition libraryDefinitionA = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'title'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'ArticleType'), @@ -176,7 +174,6 @@ final LibraryDefinition libraryDefinitionA = annotations: [ r'JsonKey(unknownEnumValue: ArticleType.artemisUnknown)' ], - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -188,7 +185,6 @@ final LibraryDefinition libraryDefinitionA = ClassProperty( type: TypeName(name: r'List'), name: ClassPropertyName(name: r'articles'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -228,12 +224,10 @@ final libraryDefinitionB = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'title'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'Privacy'), @@ -241,7 +235,6 @@ final libraryDefinitionB = annotations: [ r'JsonKey(unknownEnumValue: Privacy.artemisUnknown)' ], - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'Status'), @@ -249,7 +242,6 @@ final libraryDefinitionB = annotations: [ r'JsonKey(unknownEnumValue: Status.artemisUnknown)' ], - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -262,7 +254,6 @@ final libraryDefinitionB = type: TypeName( name: r'List'), name: ClassPropertyName(name: r'repositories'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -277,12 +268,10 @@ final libraryDefinitionB = annotations: [ r'JsonKey(unknownEnumValue: NotificationType.artemisUnknown)' ], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'bool'), name: ClassPropertyName(name: r'enabled'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -292,8 +281,7 @@ final libraryDefinitionB = inputs: [ QueryInput( type: TypeName(name: r'List'), - name: QueryInputName(name: r'notificationTypes'), - isNonNull: false) + name: QueryInputName(name: r'notificationTypes')) ], generateHelpers: true, suffix: r'Query') @@ -525,8 +513,7 @@ class BrowseRepositoriesQuery extends GraphQLQuery'), name: ClassPropertyName(name: r'articles'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -105,8 +101,7 @@ final LibraryDefinition libraryDefinition = name: QueryInputName(name: r'article_type_in'), annotations: [ r'''JsonKey(unknownEnumValue: ArticleType.artemisUnknown)''' - ], - isNonNull: false) + ]) ], generateHelpers: true, suffix: r'Query') diff --git a/test/query_generator/enums/input_enum_test.dart b/test/query_generator/enums/input_enum_test.dart index 220c8b20..cc432399 100644 --- a/test/query_generator/enums/input_enum_test.dart +++ b/test/query_generator/enums/input_enum_test.dart @@ -81,7 +81,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'MyEnum'), @@ -89,7 +88,6 @@ final LibraryDefinition libraryDefinition = annotations: [ r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' ], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'OtherEnum'), @@ -97,7 +95,6 @@ final LibraryDefinition libraryDefinition = annotations: [ r'JsonKey(unknownEnumValue: OtherEnum.artemisUnknown)' ], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -109,7 +106,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Custom$_QueryRoot$_QueryResponse'), name: ClassPropertyName(name: r'q'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -124,7 +120,6 @@ final LibraryDefinition libraryDefinition = annotations: [ r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' ], - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -135,16 +130,13 @@ final LibraryDefinition libraryDefinition = QueryInput( type: TypeName(name: r'String'), name: QueryInputName(name: r'_id'), - isNonNull: true, annotations: [r'''JsonKey(name: '_id')''']), QueryInput( type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - isNonNull: true), + name: QueryInputName(name: r'input')), QueryInput( type: TypeName(name: r'OtherEnum'), name: QueryInputName(name: r'o'), - isNonNull: true, annotations: [ r'JsonKey(unknownEnumValue: OtherEnum.artemisUnknown)' ]) diff --git a/test/query_generator/enums/kw_prefix_test.dart b/test/query_generator/enums/kw_prefix_test.dart index 5a4fef78..bb9bd33d 100644 --- a/test/query_generator/enums/kw_prefix_test.dart +++ b/test/query_generator/enums/kw_prefix_test.dart @@ -65,12 +65,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'title'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -82,7 +80,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'List'), name: ClassPropertyName(name: r'articles'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -97,12 +94,10 @@ final LibraryDefinition libraryDefinition = annotations: [ r'''JsonKey(name: 'operator', unknownEnumValue: SQLOperator.artemisUnknown)''' ], - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'value'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/enums/query_enum_test.dart b/test/query_generator/enums/query_enum_test.dart index 6260f954..90426d19 100644 --- a/test/query_generator/enums/query_enum_test.dart +++ b/test/query_generator/enums/query_enum_test.dart @@ -67,7 +67,6 @@ final LibraryDefinition libraryDefinition = annotations: [ r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' ], - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, diff --git a/test/query_generator/fragments/fragment_duplication_test.dart b/test/query_generator/fragments/fragment_duplication_test.dart index 86c8499e..65613ba1 100644 --- a/test/query_generator/fragments/fragment_duplication_test.dart +++ b/test/query_generator/fragments/fragment_duplication_test.dart @@ -97,7 +97,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'PokemonData$_Query$_pokemon'), name: ClassPropertyName(name: r'pokemon'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -115,12 +114,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'PokemonMixin$_evolution'), name: ClassPropertyName(name: r'evolution'), - isNonNull: false, isResolveType: false) ]), FragmentClassDefinition( @@ -129,7 +126,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'name'), - isNonNull: false, isResolveType: false) ]), FragmentClassDefinition( @@ -138,12 +134,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'number'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'name'), - isNonNull: false, isResolveType: false) ]) ], @@ -169,7 +163,6 @@ final LibraryDefinition libraryDefinition = type: TypeName( name: r'List'), name: ClassPropertyName(name: r'allPokemons'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -187,12 +180,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'PokemonMixin$_evolution'), name: ClassPropertyName(name: r'evolution'), - isNonNull: false, isResolveType: false) ]), FragmentClassDefinition( @@ -201,7 +192,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'name'), - isNonNull: false, isResolveType: false) ]), FragmentClassDefinition( @@ -210,7 +200,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'number'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), diff --git a/test/query_generator/fragments/fragment_glob_test.dart b/test/query_generator/fragments/fragment_glob_test.dart index e09272b7..09804596 100644 --- a/test/query_generator/fragments/fragment_glob_test.dart +++ b/test/query_generator/fragments/fragment_glob_test.dart @@ -104,7 +104,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'List'), name: ClassPropertyName(name: r'evolutions'), - isNonNull: false, isResolveType: false) ], mixins: [FragmentName(name: r'PokemonMixin')], @@ -117,7 +116,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Query$_Query$_Pokemon'), name: ClassPropertyName(name: r'pokemon'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -141,17 +139,14 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'PokemonMixin$_PokemonDimension'), name: ClassPropertyName(name: r'weight'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'PokemonMixin$_PokemonAttack'), name: ClassPropertyName(name: r'attacks'), - isNonNull: false, isResolveType: false) ]), FragmentClassDefinition( @@ -160,7 +155,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'minimum'), - isNonNull: false, isResolveType: false) ]), ClassDefinition( @@ -175,7 +169,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'List'), name: ClassPropertyName(name: r'special'), - isNonNull: false, isResolveType: false) ]), FragmentClassDefinition( @@ -184,7 +177,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'name'), - isNonNull: false, isResolveType: false) ]) ], diff --git a/test/query_generator/fragments/fragment_on_fragments_test.dart b/test/query_generator/fragments/fragment_on_fragments_test.dart index b93ddcd0..da93f8df 100644 --- a/test/query_generator/fragments/fragment_on_fragments_test.dart +++ b/test/query_generator/fragments/fragment_on_fragments_test.dart @@ -84,7 +84,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'Query$_Query$_Pokemon'), name: ClassPropertyName(name: r'pokemon'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -102,12 +101,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'PokemonMixin$_Pokemon'), name: ClassPropertyName(name: r'evolution'), - isNonNull: false, isResolveType: false) ]), FragmentClassDefinition( @@ -116,7 +113,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'name'), - isNonNull: false, isResolveType: false) ]), FragmentClassDefinition( @@ -125,7 +121,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'number'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), diff --git a/test/query_generator/fragments/fragments_multiple_test.dart b/test/query_generator/fragments/fragments_multiple_test.dart index f0bc098b..d963c462 100644 --- a/test/query_generator/fragments/fragments_multiple_test.dart +++ b/test/query_generator/fragments/fragments_multiple_test.dart @@ -102,12 +102,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'name'), - isNonNull: true, isResolveType: false) ]), FragmentClassDefinition( @@ -116,7 +114,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: true, isResolveType: false) ]), ClassDefinition( @@ -126,22 +123,18 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'DateTime'), name: ClassPropertyName(name: r'dateFrom'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'DateTime'), name: ClassPropertyName(name: r'dateTo'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'id'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r'voyageNumber'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -154,14 +147,12 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'numberOfReports'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName( name: r'VoyagesData$_Query$_VoyageList$_VoyageDetails$_Voyage'), name: ClassPropertyName(name: r'voyage'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -175,7 +166,6 @@ final LibraryDefinition libraryDefinition = name: r'List'), name: ClassPropertyName(name: r'voyages'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -187,7 +177,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'VoyagesData$_Query$_VoyageList'), name: ClassPropertyName(name: r'voyages'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -199,12 +188,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'limit'), - isNonNull: true, isResolveType: false), ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'offset'), - isNonNull: true, isResolveType: false) ], factoryPossibilities: {}, @@ -214,8 +201,7 @@ final LibraryDefinition libraryDefinition = inputs: [ QueryInput( type: TypeName(name: r'PaginationInput'), - name: QueryInputName(name: r'input'), - isNonNull: true) + name: QueryInputName(name: r'input')) ], generateHelpers: true, suffix: r'Query') diff --git a/test/query_generator/fragments/fragments_test.dart b/test/query_generator/fragments/fragments_test.dart index 46da8b3d..c7f76ba2 100644 --- a/test/query_generator/fragments/fragments_test.dart +++ b/test/query_generator/fragments/fragments_test.dart @@ -48,7 +48,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'int'), diff --git a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart index dcca96c1..2575e7da 100644 --- a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart +++ b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart @@ -70,12 +70,10 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'String'), name: ClassPropertyName(name: r's'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'int'), name: ClassPropertyName(name: r'i'), - isNonNull: false, isResolveType: false) ]), ClassDefinition( @@ -96,7 +94,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'SomeObject'), name: ClassPropertyName(name: r'someObject'), - isNonNull: false, isResolveType: false) ], factoryPossibilities: {}, @@ -108,7 +105,6 @@ final LibraryDefinition libraryDefinition = ClassProperty( type: TypeName(name: r'SomeObject'), name: ClassPropertyName(name: r'someObject'), - isNonNull: false, isResolveType: false), ClassProperty( type: TypeName(name: r'MoreData'), From a904e41b9f5536e068a259b184c261f878833145 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 18:06:17 -0300 Subject: [PATCH 23/31] Fragments and fix mixin generation on non-null field --- lib/generator/print_helpers.dart | 3 +- .../fragments/fragment_duplication_test.dart | 25 ++++--- .../fragments/fragment_glob_test.dart | 30 ++++---- .../fragments/fragment_on_fragments_test.dart | 15 ++-- .../fragments/fragments_multiple_test.dart | 70 ++++++++++--------- .../fragments/fragments_test.dart | 5 +- ...iple_references_on_simple_naming_test.dart | 11 +-- 7 files changed, 89 insertions(+), 70 deletions(-) diff --git a/lib/generator/print_helpers.dart b/lib/generator/print_helpers.dart index 2cac4091..baf91465 100644 --- a/lib/generator/print_helpers.dart +++ b/lib/generator/print_helpers.dart @@ -190,7 +190,8 @@ Spec fragmentClassDefinitionToSpec(FragmentClassDefinition definition) { final fields = (definition.properties ?? []).map((p) { final lines = []; lines.addAll(p.annotations.map((e) => '@$e')); - lines.add('${p.type.namePrintable} ${p.name.namePrintable};'); + lines.add( + '${p.type.isNonNull ? 'late ' : ''}${p.type.namePrintable} ${p.name.namePrintable};'); return lines.join('\n'); }); diff --git a/test/query_generator/fragments/fragment_duplication_test.dart b/test/query_generator/fragments/fragment_duplication_test.dart index 65613ba1..6bb5b586 100644 --- a/test/query_generator/fragments/fragment_duplication_test.dart +++ b/test/query_generator/fragments/fragment_duplication_test.dart @@ -112,7 +112,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -160,8 +160,10 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'AllPokemonsData$_Query'), properties: [ ClassProperty( - type: TypeName( - name: r'List'), + type: ListOfTypeName( + typeName: TypeName( + name: r'AllPokemonsData$_Query$_allPokemons'), + isNonNull: false), name: ClassPropertyName(name: r'allPokemons'), isResolveType: false) ], @@ -178,7 +180,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -212,6 +214,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -219,15 +222,15 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin PokemonMixin { - String id; - PokemonMixin$Evolution evolution; + late String id; + PokemonMixin$Evolution? evolution; } mixin PokemonNameMixin { - String name; + String? name; } mixin PokemonPartsMixin { - String number; - String name; + String? number; + String? name; } @JsonSerializable(explicitToJson: true) @@ -250,7 +253,7 @@ class PokemonData$Query extends JsonSerializable with EquatableMixin { factory PokemonData$Query.fromJson(Map json) => _$PokemonData$QueryFromJson(json); - PokemonData$Query$Pokemon pokemon; + PokemonData$Query$Pokemon? pokemon; @override List get props => [pokemon]; @@ -292,7 +295,7 @@ class AllPokemonsData$Query extends JsonSerializable with EquatableMixin { factory AllPokemonsData$Query.fromJson(Map json) => _$AllPokemonsData$QueryFromJson(json); - List allPokemons; + List? allPokemons; @override List get props => [allPokemons]; diff --git a/test/query_generator/fragments/fragment_glob_test.dart b/test/query_generator/fragments/fragment_glob_test.dart index 09804596..7321cbc3 100644 --- a/test/query_generator/fragments/fragment_glob_test.dart +++ b/test/query_generator/fragments/fragment_glob_test.dart @@ -102,7 +102,10 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Query$_Query$_Pokemon'), properties: [ ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: + TypeName(name: r'Query$_Query$_Pokemon$_Pokemon'), + isNonNull: false), name: ClassPropertyName(name: r'evolutions'), isResolveType: false) ], @@ -137,7 +140,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -167,7 +170,9 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonAttackMixin'), properties: [ ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName(name: r'PokemonAttackMixin$_Attack'), + isNonNull: false), name: ClassPropertyName(name: r'special'), isResolveType: false) ]), @@ -185,6 +190,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -193,18 +199,18 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin PokemonMixin { - String id; - PokemonMixin$PokemonDimension weight; - PokemonMixin$PokemonAttack attacks; + late String id; + PokemonMixin$PokemonDimension? weight; + PokemonMixin$PokemonAttack? attacks; } mixin WeightMixin { - String minimum; + String? minimum; } mixin PokemonAttackMixin { - List special; + List? special; } mixin AttackMixin { - String name; + String? name; } @JsonSerializable(explicitToJson: true) @@ -228,7 +234,7 @@ class Query$Query$Pokemon extends JsonSerializable factory Query$Query$Pokemon.fromJson(Map json) => _$Query$Query$PokemonFromJson(json); - List evolutions; + List? evolutions; @override List get props => [id, weight, attacks, evolutions]; @@ -242,7 +248,7 @@ class Query$Query extends JsonSerializable with EquatableMixin { factory Query$Query.fromJson(Map json) => _$Query$QueryFromJson(json); - Query$Query$Pokemon pokemon; + Query$Query$Pokemon? pokemon; @override List get props => [pokemon]; @@ -389,7 +395,7 @@ class QueryQuery extends GraphQLQuery { name: NameNode(value: 'attack'), typeCondition: TypeConditionNode( on: NamedTypeNode( - name: NameNode(value: 'Attack'), )), + name: NameNode(value: 'Attack'), isNonNull: false)), directives: [], selectionSet: SelectionSetNode(selections: [ FieldNode( diff --git a/test/query_generator/fragments/fragment_on_fragments_test.dart b/test/query_generator/fragments/fragment_on_fragments_test.dart index da93f8df..0b0c40ad 100644 --- a/test/query_generator/fragments/fragment_on_fragments_test.dart +++ b/test/query_generator/fragments/fragment_on_fragments_test.dart @@ -99,7 +99,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -133,6 +133,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -140,15 +141,15 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin PokemonMixin { - String id; - PokemonMixin$Pokemon evolution; + late String id; + PokemonMixin$Pokemon? evolution; } mixin PokemonNameMixin { - String name; + String? name; } mixin PokemonPartsMixin { - String number; - String name; + String? number; + String? name; } @JsonSerializable(explicitToJson: true) @@ -171,7 +172,7 @@ class Query$Query extends JsonSerializable with EquatableMixin { factory Query$Query.fromJson(Map json) => _$Query$QueryFromJson(json); - Query$Query$Pokemon pokemon; + Query$Query$Pokemon? pokemon; @override List get props => [pokemon]; diff --git a/test/query_generator/fragments/fragments_multiple_test.dart b/test/query_generator/fragments/fragments_multiple_test.dart index d963c462..7ad33afa 100644 --- a/test/query_generator/fragments/fragments_multiple_test.dart +++ b/test/query_generator/fragments/fragments_multiple_test.dart @@ -100,11 +100,11 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'DstMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'name'), isResolveType: false) ]), @@ -112,7 +112,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'DepartureMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false) ]), @@ -121,7 +121,7 @@ final LibraryDefinition libraryDefinition = name: r'VoyagesData$_Query$_VoyageList$_VoyageDetails$_Voyage'), properties: [ ClassProperty( - type: TypeName(name: r'DateTime'), + type: TypeName(name: r'DateTime', isNonNull: true), name: ClassPropertyName(name: r'dateFrom'), isResolveType: false), ClassProperty( @@ -133,7 +133,7 @@ final LibraryDefinition libraryDefinition = name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'voyageNumber'), isResolveType: false) ], @@ -145,13 +145,14 @@ final LibraryDefinition libraryDefinition = name: r'VoyagesData$_Query$_VoyageList$_VoyageDetails'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: TypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'numberOfReports'), isResolveType: false), ClassProperty( type: TypeName( name: - r'VoyagesData$_Query$_VoyageList$_VoyageDetails$_Voyage'), + r'VoyagesData$_Query$_VoyageList$_VoyageDetails$_Voyage', + isNonNull: true), name: ClassPropertyName(name: r'voyage'), isResolveType: false) ], @@ -162,9 +163,12 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'VoyagesData$_Query$_VoyageList'), properties: [ ClassProperty( - type: TypeName( - name: - r'List'), + type: ListOfTypeName( + typeName: TypeName( + name: + r'VoyagesData$_Query$_VoyageList$_VoyageDetails', + isNonNull: true), + isNonNull: true), name: ClassPropertyName(name: r'voyages'), isResolveType: false) ], @@ -175,7 +179,8 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'VoyagesData$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'VoyagesData$_Query$_VoyageList'), + type: TypeName( + name: r'VoyagesData$_Query$_VoyageList', isNonNull: true), name: ClassPropertyName(name: r'voyages'), isResolveType: false) ], @@ -186,11 +191,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'PaginationInput'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: TypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'limit'), isResolveType: false), ClassProperty( - type: TypeName(name: r'int'), + type: TypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'offset'), isResolveType: false) ], @@ -200,7 +205,7 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'PaginationInput'), + type: TypeName(name: r'PaginationInput', isNonNull: true), name: QueryInputName(name: r'input')) ], generateHelpers: true, @@ -208,6 +213,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -216,11 +222,11 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin DstMixin { - String id; - String name; + late String id; + late String name; } mixin DepartureMixin { - String id; + late String id; } @JsonSerializable(explicitToJson: true) @@ -232,13 +238,13 @@ class VoyagesData$Query$VoyageList$VoyageDetails$Voyage extends JsonSerializable Map json) => _$VoyagesData$Query$VoyageList$VoyageDetails$VoyageFromJson(json); - DateTime dateFrom; + late DateTime dateFrom; - DateTime dateTo; + DateTime? dateTo; - String id; + String? id; - String voyageNumber; + late String voyageNumber; @override List get props => [dateFrom, dateTo, id, voyageNumber]; @@ -255,9 +261,9 @@ class VoyagesData$Query$VoyageList$VoyageDetails extends JsonSerializable Map json) => _$VoyagesData$Query$VoyageList$VoyageDetailsFromJson(json); - int numberOfReports; + late int numberOfReports; - VoyagesData$Query$VoyageList$VoyageDetails$Voyage voyage; + late VoyagesData$Query$VoyageList$VoyageDetails$Voyage voyage; @override List get props => [numberOfReports, voyage]; @@ -273,7 +279,7 @@ class VoyagesData$Query$VoyageList extends JsonSerializable factory VoyagesData$Query$VoyageList.fromJson(Map json) => _$VoyagesData$Query$VoyageListFromJson(json); - List voyages; + late List voyages; @override List get props => [voyages]; @@ -287,7 +293,7 @@ class VoyagesData$Query extends JsonSerializable with EquatableMixin { factory VoyagesData$Query.fromJson(Map json) => _$VoyagesData$QueryFromJson(json); - VoyagesData$Query$VoyageList voyages; + late VoyagesData$Query$VoyageList voyages; @override List get props => [voyages]; @@ -296,14 +302,14 @@ class VoyagesData$Query extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class PaginationInput extends JsonSerializable with EquatableMixin { - PaginationInput({@required this.limit, @required this.offset}); + PaginationInput({required this.limit, required this.offset}); factory PaginationInput.fromJson(Map json) => _$PaginationInputFromJson(json); - int limit; + late int limit; - int offset; + late int offset; @override List get props => [limit, offset]; @@ -312,13 +318,13 @@ class PaginationInput extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class VoyagesDataArguments extends JsonSerializable with EquatableMixin { - VoyagesDataArguments({@required this.input}); + VoyagesDataArguments({required this.input}); @override factory VoyagesDataArguments.fromJson(Map json) => _$VoyagesDataArgumentsFromJson(json); - final PaginationInput input; + late PaginationInput input; @override List get props => [input]; @@ -328,7 +334,7 @@ class VoyagesDataArguments extends JsonSerializable with EquatableMixin { class VoyagesDataQuery extends GraphQLQuery { - VoyagesDataQuery({this.variables}); + VoyagesDataQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -373,7 +379,7 @@ class VoyagesDataQuery VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'input')), type: NamedTypeNode( - name: NameNode(value: 'PaginationInput'), ), + name: NameNode(value: 'PaginationInput'), isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/fragments/fragments_test.dart b/test/query_generator/fragments/fragments_test.dart index c7f76ba2..af46c126 100644 --- a/test/query_generator/fragments/fragments_test.dart +++ b/test/query_generator/fragments/fragments_test.dart @@ -66,6 +66,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -73,8 +74,8 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin MyFragmentMixin { - String s; - int i; + String? s; + int? i; } @JsonSerializable(explicitToJson: true) diff --git a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart index 2575e7da..7aafaaa0 100644 --- a/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart +++ b/test/query_generator/fragments/multiple_references_on_simple_naming_test.dart @@ -120,6 +120,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -127,8 +128,8 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin MyFragmentMixin { - String s; - int i; + String? s; + int? i; } @JsonSerializable(explicitToJson: true) @@ -150,7 +151,7 @@ class MoreData extends JsonSerializable with EquatableMixin { factory MoreData.fromJson(Map json) => _$MoreDataFromJson(json); - SomeObject someObject; + SomeObject? someObject; @override List get props => [someObject]; @@ -164,9 +165,9 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin { factory SomeQuery$QueryResponse.fromJson(Map json) => _$SomeQuery$QueryResponseFromJson(json); - SomeObject someObject; + SomeObject? someObject; - MoreData moreData; + MoreData? moreData; @override List get props => [someObject, moreData]; From 0cf9134eec34c44b88192fdbd8248a9be9562011 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 18:12:40 -0300 Subject: [PATCH 24/31] Enum tests --- .../enums/enum_duplication_test.dart | 39 +++++++------------ .../query_generator/enums/enum_list_test.dart | 23 +++++------ .../enums/filter_enum_test.dart | 14 +++---- .../enums/input_enum_list_test.dart | 33 +++++++++------- .../enums/input_enum_test.dart | 33 ++++++++-------- .../query_generator/enums/kw_prefix_test.dart | 26 +++++++------ .../enums/query_enum_test.dart | 5 ++- 7 files changed, 85 insertions(+), 88 deletions(-) diff --git a/test/query_generator/enums/enum_duplication_test.dart b/test/query_generator/enums/enum_duplication_test.dart index aba41088..45bbbed3 100644 --- a/test/query_generator/enums/enum_duplication_test.dart +++ b/test/query_generator/enums/enum_duplication_test.dart @@ -65,16 +65,9 @@ final LibraryDefinition libraryDefinition = operationName: r'custom', classes: [ EnumDefinition(name: EnumName(name: r'MyEnum'), values: [ - EnumValueDefinition( - name: EnumValueName(name: r'A'), - ), - EnumValueDefinition( - name: EnumValueName(name: r'B'), - ), - EnumValueDefinition( - name: EnumValueName( - name: r'ARTEMIS_UNKNOWN', - )) + EnumValueDefinition(name: EnumValueName(name: r'A')), + EnumValueDefinition(name: EnumValueName(name: r'B')), + EnumValueDefinition(name: EnumValueName(name: r'ARTEMIS_UNKNOWN')) ]), ClassDefinition( name: ClassName(name: r'Custom$_Query$_q'), @@ -109,16 +102,9 @@ final LibraryDefinition libraryDefinition = operationName: r'customList', classes: [ EnumDefinition(name: EnumName(name: r'MyEnum'), values: [ - EnumValueDefinition( - name: EnumValueName(name: r'A'), - ), - EnumValueDefinition( - name: EnumValueName(name: r'B'), - ), - EnumValueDefinition( - name: EnumValueName( - name: r'ARTEMIS_UNKNOWN', - )) + EnumValueDefinition(name: EnumValueName(name: r'A')), + EnumValueDefinition(name: EnumValueName(name: r'B')), + EnumValueDefinition(name: EnumValueName(name: r'ARTEMIS_UNKNOWN')) ]), ClassDefinition( name: ClassName(name: r'CustomList$_Query$_qList'), @@ -138,7 +124,9 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'CustomList$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName(name: r'CustomList$_Query$_qList'), + isNonNull: false), name: ClassPropertyName(name: r'qList'), isResolveType: false) ], @@ -151,6 +139,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -165,7 +154,7 @@ class Custom$Query$Q extends JsonSerializable with EquatableMixin { _$Custom$Query$QFromJson(json); @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum e; + MyEnum? e; @override List get props => [e]; @@ -179,7 +168,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { factory Custom$Query.fromJson(Map json) => _$Custom$QueryFromJson(json); - Custom$Query$Q q; + Custom$Query$Q? q; @override List get props => [q]; @@ -194,7 +183,7 @@ class CustomList$Query$QList extends JsonSerializable with EquatableMixin { _$CustomList$Query$QListFromJson(json); @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum e; + MyEnum? e; @override List get props => [e]; @@ -208,7 +197,7 @@ class CustomList$Query extends JsonSerializable with EquatableMixin { factory CustomList$Query.fromJson(Map json) => _$CustomList$QueryFromJson(json); - List qList; + List? qList; @override List get props => [qList]; diff --git a/test/query_generator/enums/enum_list_test.dart b/test/query_generator/enums/enum_list_test.dart index 60dfca10..a56ca19f 100644 --- a/test/query_generator/enums/enum_list_test.dart +++ b/test/query_generator/enums/enum_list_test.dart @@ -51,25 +51,19 @@ final LibraryDefinition libraryDefinition = operationName: r'custom', classes: [ EnumDefinition(name: EnumName(name: r'MyEnum'), values: [ - EnumValueDefinition( - name: EnumValueName(name: r'A'), - ), - EnumValueDefinition( - name: EnumValueName(name: r'B'), - ), - EnumValueDefinition( - name: EnumValueName( - name: r'ARTEMIS_UNKNOWN', - )) + EnumValueDefinition(name: EnumValueName(name: r'A')), + EnumValueDefinition(name: EnumValueName(name: r'B')), + EnumValueDefinition(name: EnumValueName(name: r'ARTEMIS_UNKNOWN')) ]), ClassDefinition( name: ClassName(name: r'Custom$_QueryRoot$_QueryResponse'), properties: [ ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName(name: r'MyEnum'), isNonNull: false), name: ClassPropertyName(name: r'le'), annotations: [ - r'''JsonKey(unknownEnumValue: MyEnum.artemisUnknown)''' + r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' ], isResolveType: false) ], @@ -93,6 +87,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -108,7 +103,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable _$Custom$QueryRoot$QueryResponseFromJson(json); @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - List le; + List? le; @override List get props => [le]; @@ -122,7 +117,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$QueryResponse q; + Custom$QueryRoot$QueryResponse? q; @override List get props => [q]; diff --git a/test/query_generator/enums/filter_enum_test.dart b/test/query_generator/enums/filter_enum_test.dart index 8dfe4424..41d03593 100644 --- a/test/query_generator/enums/filter_enum_test.dart +++ b/test/query_generator/enums/filter_enum_test.dart @@ -139,21 +139,21 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'input_enum'), + type: TypeName(name: r'input_enum', isNonNull: true), name: QueryInputName(name: r'e'), annotations: [ r'JsonKey(unknownEnumValue: InputEnum.artemisUnknown)' ]), QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'i'), - ) + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'i')) ], generateHelpers: false, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -169,7 +169,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable _$Custom$QueryRoot$QueryResponseFromJson(json); @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum e; + MyEnum? e; @override List get props => [e]; @@ -183,7 +183,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$QueryResponse q; + Custom$QueryRoot$QueryResponse? q; @override List get props => [q]; @@ -197,7 +197,7 @@ class Input extends JsonSerializable with EquatableMixin { factory Input.fromJson(Map json) => _$InputFromJson(json); @JsonKey(unknownEnumValue: $InputInputEnum.artemisUnknown) - $InputInputEnum e; + $InputInputEnum? e; @override List get props => [e]; diff --git a/test/query_generator/enums/input_enum_list_test.dart b/test/query_generator/enums/input_enum_list_test.dart index 843424bb..81b983fb 100644 --- a/test/query_generator/enums/input_enum_list_test.dart +++ b/test/query_generator/enums/input_enum_list_test.dart @@ -65,15 +65,15 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'BrowseArticles$_Query$_Article'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'title'), isResolveType: false), ClassProperty( - type: TypeName(name: r'ArticleType'), + type: TypeName(name: r'ArticleType', isNonNull: true), name: ClassPropertyName(name: r'article_type'), annotations: [ r'''JsonKey(name: 'article_type', unknownEnumValue: ArticleType.artemisUnknown)''' @@ -87,7 +87,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'BrowseArticles$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName( + name: r'BrowseArticles$_Query$_Article', + isNonNull: true), + isNonNull: false), name: ClassPropertyName(name: r'articles'), isResolveType: false) ], @@ -97,10 +101,12 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName(name: r'ArticleType', isNonNull: true), + isNonNull: false), name: QueryInputName(name: r'article_type_in'), annotations: [ - r'''JsonKey(unknownEnumValue: ArticleType.artemisUnknown)''' + r'JsonKey(unknownEnumValue: ArticleType.artemisUnknown)' ]) ], generateHelpers: true, @@ -108,6 +114,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -123,12 +130,12 @@ class BrowseArticles$Query$Article extends JsonSerializable factory BrowseArticles$Query$Article.fromJson(Map json) => _$BrowseArticles$Query$ArticleFromJson(json); - String id; + late String id; - String title; + late String title; @JsonKey(name: 'article_type', unknownEnumValue: ArticleType.artemisUnknown) - ArticleType articleType; + late ArticleType articleType; @override List get props => [id, title, articleType]; @@ -142,7 +149,7 @@ class BrowseArticles$Query extends JsonSerializable with EquatableMixin { factory BrowseArticles$Query.fromJson(Map json) => _$BrowseArticles$QueryFromJson(json); - List articles; + List? articles; @override List get props => [articles]; @@ -167,7 +174,7 @@ class BrowseArticlesArguments extends JsonSerializable with EquatableMixin { _$BrowseArticlesArgumentsFromJson(json); @JsonKey(unknownEnumValue: ArticleType.artemisUnknown) - final List article_type_in; + final List? article_type_in; @override List get props => [article_type_in]; @@ -177,7 +184,7 @@ class BrowseArticlesArguments extends JsonSerializable with EquatableMixin { class BrowseArticlesQuery extends GraphQLQuery { - BrowseArticlesQuery({this.variables}); + BrowseArticlesQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -190,7 +197,7 @@ class BrowseArticlesQuery type: ListTypeNode( type: NamedTypeNode( name: NameNode(value: 'ArticleType'), isNonNull: true), - ), + isNonNull: false), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/enums/input_enum_test.dart b/test/query_generator/enums/input_enum_test.dart index cc432399..5b915054 100644 --- a/test/query_generator/enums/input_enum_test.dart +++ b/test/query_generator/enums/input_enum_test.dart @@ -115,7 +115,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'MyEnum'), + type: TypeName(name: r'MyEnum', isNonNull: true), name: ClassPropertyName(name: r'e'), annotations: [ r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' @@ -128,14 +128,14 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: QueryInputName(name: r'_id'), annotations: [r'''JsonKey(name: '_id')''']), QueryInput( - type: TypeName(name: r'Input'), + type: TypeName(name: r'Input', isNonNull: true), name: QueryInputName(name: r'input')), QueryInput( - type: TypeName(name: r'OtherEnum'), + type: TypeName(name: r'OtherEnum', isNonNull: true), name: QueryInputName(name: r'o'), annotations: [ r'JsonKey(unknownEnumValue: OtherEnum.artemisUnknown)' @@ -146,6 +146,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -161,13 +162,13 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable factory Custom$QueryRoot$QueryResponse.fromJson(Map json) => _$Custom$QueryRoot$QueryResponseFromJson(json); - String s; + String? s; @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum my; + MyEnum? my; @JsonKey(unknownEnumValue: OtherEnum.artemisUnknown) - OtherEnum other; + OtherEnum? other; @override List get props => [s, my, other]; @@ -181,7 +182,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$QueryResponse q; + Custom$QueryRoot$QueryResponse? q; @override List get props => [q]; @@ -190,12 +191,12 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class Input extends JsonSerializable with EquatableMixin { - Input({@required this.e}); + Input({required this.e}); factory Input.fromJson(Map json) => _$InputFromJson(json); @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum e; + late MyEnum e; @override List get props => [e]; @@ -221,19 +222,19 @@ enum OtherEnum { @JsonSerializable(explicitToJson: true) class CustomArguments extends JsonSerializable with EquatableMixin { - CustomArguments({@required this.$id, @required this.input, @required this.o}); + CustomArguments({required this.$id, required this.input, required this.o}); @override factory CustomArguments.fromJson(Map json) => _$CustomArgumentsFromJson(json); @JsonKey(name: '_id') - final String $id; + late String $id; - final Input input; + late Input input; @JsonKey(unknownEnumValue: OtherEnum.artemisUnknown) - final OtherEnum o; + late OtherEnum o; @override List get props => [$id, input, o]; @@ -242,7 +243,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { } class CustomQuery extends GraphQLQuery { - CustomQuery({this.variables}); + CustomQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -264,7 +265,7 @@ class CustomQuery extends GraphQLQuery { VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'o')), type: NamedTypeNode( - name: NameNode(value: 'OtherEnum'), ), + name: NameNode(value: 'OtherEnum'), isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/enums/kw_prefix_test.dart b/test/query_generator/enums/kw_prefix_test.dart index bb9bd33d..0b075c71 100644 --- a/test/query_generator/enums/kw_prefix_test.dart +++ b/test/query_generator/enums/kw_prefix_test.dart @@ -63,11 +63,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SearchArticles$_Query$_Article'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'title'), isResolveType: false) ], @@ -78,7 +78,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SearchArticles$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName( + name: r'SearchArticles$_Query$_Article', + isNonNull: true), + isNonNull: false), name: ClassPropertyName(name: r'articles'), isResolveType: false) ], @@ -106,15 +110,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'ArticleTitleWhereConditions'), - name: QueryInputName(name: r'titleWhere'), - ) + type: TypeName(name: r'ArticleTitleWhereConditions'), + name: QueryInputName(name: r'titleWhere')) ], generateHelpers: false, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -129,9 +133,9 @@ class SearchArticles$Query$Article extends JsonSerializable factory SearchArticles$Query$Article.fromJson(Map json) => _$SearchArticles$Query$ArticleFromJson(json); - String id; + late String id; - String title; + late String title; @override List get props => [id, title]; @@ -145,7 +149,7 @@ class SearchArticles$Query extends JsonSerializable with EquatableMixin { factory SearchArticles$Query.fromJson(Map json) => _$SearchArticles$QueryFromJson(json); - List articles; + List? articles; @override List get props => [articles]; @@ -160,9 +164,9 @@ class ArticleTitleWhereConditions extends JsonSerializable with EquatableMixin { _$ArticleTitleWhereConditionsFromJson(json); @JsonKey(name: 'operator', unknownEnumValue: SQLOperator.artemisUnknown) - SQLOperator kw$operator; + SQLOperator? kw$operator; - String value; + String? value; @override List get props => [kw$operator, value]; diff --git a/test/query_generator/enums/query_enum_test.dart b/test/query_generator/enums/query_enum_test.dart index 90426d19..28fb0f82 100644 --- a/test/query_generator/enums/query_enum_test.dart +++ b/test/query_generator/enums/query_enum_test.dart @@ -89,6 +89,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -104,7 +105,7 @@ class Custom$QueryRoot$QueryResponse extends JsonSerializable _$Custom$QueryRoot$QueryResponseFromJson(json); @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum e; + MyEnum? e; @override List get props => [e]; @@ -118,7 +119,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { factory Custom$QueryRoot.fromJson(Map json) => _$Custom$QueryRootFromJson(json); - Custom$QueryRoot$QueryResponse q; + Custom$QueryRoot$QueryResponse? q; @override List get props => [q]; From 7bdd3f90ef6f78cb416ec1c5bd57b49ee73b6a51 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 18:22:13 -0300 Subject: [PATCH 25/31] Deprecated tests --- .../deprecated_enum_value_test.dart | 3 +- .../deprecated/deprecated_field_test.dart | 115 +++++------ .../deprecated_input_object_field_test.dart | 115 +++++------ .../deprecated_interface_field_test.dart | 189 ++++++++---------- 4 files changed, 201 insertions(+), 221 deletions(-) diff --git a/test/query_generator/deprecated/deprecated_enum_value_test.dart b/test/query_generator/deprecated/deprecated_enum_value_test.dart index b741f11e..f5694029 100644 --- a/test/query_generator/deprecated/deprecated_enum_value_test.dart +++ b/test/query_generator/deprecated/deprecated_enum_value_test.dart @@ -89,6 +89,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -103,7 +104,7 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin { _$SomeQuery$QueryResponseFromJson(json); @JsonKey(unknownEnumValue: StarWarsMovies.artemisUnknown) - StarWarsMovies someValue; + StarWarsMovies? someValue; @override List get props => [someValue]; diff --git a/test/query_generator/deprecated/deprecated_field_test.dart b/test/query_generator/deprecated/deprecated_field_test.dart index 12190414..050b6bfa 100644 --- a/test/query_generator/deprecated/deprecated_field_test.dart +++ b/test/query_generator/deprecated/deprecated_field_test.dart @@ -50,68 +50,69 @@ const query = r''' final LibraryDefinition libraryDefinition = LibraryDefinition(basename: r'query.graphql', queries: [ QueryDefinition( - document: parseString(query), - operationName: r'some_query', name: QueryName(name: r'SomeQuery$_QueryResponse'), + operationName: r'some_query', classes: [ ClassDefinition( - name: ClassName(name: r'SomeQuery$_QueryResponse$_deprecatedObject'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'someField'), - ), - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'deprecatedField'), - annotations: [r"Deprecated('message 2')"], - ), - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: + ClassName(name: r'SomeQuery$_QueryResponse$_deprecatedObject'), + properties: [ + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r'someField'), + isResolveType: false), + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r'deprecatedField'), + annotations: [r'''Deprecated('message 2')'''], + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), ClassDefinition( - name: ClassName(name: r'SomeQuery$_QueryResponse$_SomeObject'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'someField'), - ), - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'deprecatedField'), - annotations: [r"Deprecated('message 2')"], - ), - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: ClassName(name: r'SomeQuery$_QueryResponse$_SomeObject'), + properties: [ + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r'someField'), + isResolveType: false), + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r'deprecatedField'), + annotations: [r'''Deprecated('message 2')'''], + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), ClassDefinition( - name: ClassName(name: r'SomeQuery$_QueryResponse'), - properties: [ - ClassProperty( - type: - TypeName(name: r'SomeQuery$_QueryResponse$_deprecatedObject'), - name: ClassPropertyName(name: r'deprecatedObject'), - annotations: [r"Deprecated('message')"], - ), - ClassProperty( - type: TypeName(name: r'List'), - name: ClassPropertyName(name: r'someObjects'), - ) - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ) + name: ClassName(name: r'SomeQuery$_QueryResponse'), + properties: [ + ClassProperty( + type: TypeName( + name: r'SomeQuery$_QueryResponse$_deprecatedObject'), + name: ClassPropertyName(name: r'deprecatedObject'), + annotations: [r'''Deprecated('message')'''], + isResolveType: false), + ClassProperty( + type: ListOfTypeName( + typeName: TypeName( + name: r'SomeQuery$_QueryResponse$_SomeObject'), + isNonNull: false), + name: ClassPropertyName(name: r'someObjects'), + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false) ], generateHelpers: false, suffix: r'Query') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -127,10 +128,10 @@ class SomeQuery$QueryResponse$DeprecatedObject extends JsonSerializable Map json) => _$SomeQuery$QueryResponse$DeprecatedObjectFromJson(json); - String someField; + String? someField; @Deprecated('message 2') - String deprecatedField; + String? deprecatedField; @override List get props => [someField, deprecatedField]; @@ -147,10 +148,10 @@ class SomeQuery$QueryResponse$SomeObject extends JsonSerializable Map json) => _$SomeQuery$QueryResponse$SomeObjectFromJson(json); - String someField; + String? someField; @Deprecated('message 2') - String deprecatedField; + String? deprecatedField; @override List get props => [someField, deprecatedField]; @@ -166,9 +167,9 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin { _$SomeQuery$QueryResponseFromJson(json); @Deprecated('message') - SomeQuery$QueryResponse$DeprecatedObject deprecatedObject; + SomeQuery$QueryResponse$DeprecatedObject? deprecatedObject; - List someObjects; + List? someObjects; @override List get props => [deprecatedObject, someObjects]; diff --git a/test/query_generator/deprecated/deprecated_input_object_field_test.dart b/test/query_generator/deprecated/deprecated_input_object_field_test.dart index 5e78cd0e..f60fe6f8 100644 --- a/test/query_generator/deprecated/deprecated_input_object_field_test.dart +++ b/test/query_generator/deprecated/deprecated_input_object_field_test.dart @@ -45,70 +45,63 @@ mutation custom($input: Input!) { } '''; -final LibraryDefinition libraryDefinition = LibraryDefinition( - basename: r'query.graphql', - queries: [ - QueryDefinition( - operationName: r'custom', +final LibraryDefinition libraryDefinition = + LibraryDefinition(basename: r'query.graphql', queries: [ + QueryDefinition( name: QueryName(name: r'Custom$_MutationRoot'), + operationName: r'custom', classes: [ ClassDefinition( - name: ClassName(name: r'Custom$_MutationRoot$_MutationResponse'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r's'), - ), - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: ClassName(name: r'Custom$_MutationRoot$_MutationResponse'), + properties: [ + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r's'), + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), ClassDefinition( - name: ClassName(name: r'Custom$_MutationRoot'), - properties: [ - ClassProperty( - type: TypeName(name: r'Custom$_MutationRoot$_MutationResponse'), - name: ClassPropertyName(name: r'mut'), - ), - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: ClassName(name: r'Custom$_MutationRoot'), + properties: [ + ClassProperty( + type: + TypeName(name: r'Custom$_MutationRoot$_MutationResponse'), + name: ClassPropertyName(name: r'mut'), + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), ClassDefinition( - name: ClassName(name: r'Input'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r's'), - ), - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'd'), - annotations: [ - r"Deprecated('deprecated input field')", - ], - ), - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: true, - ), + name: ClassName(name: r'Input'), + properties: [ + ClassProperty( + type: TypeName(name: r'String', isNonNull: true), + name: ClassPropertyName(name: r's'), + isResolveType: false), + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r'd'), + annotations: [r'''Deprecated('deprecated input field')'''], + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: true) ], inputs: [ QueryInput( - type: TypeName(name: r'Input'), - name: QueryInputName(name: r'input'), - ), + type: TypeName(name: r'Input', isNonNull: true), + name: QueryInputName(name: r'input')) ], generateHelpers: true, - suffix: r'Mutation', - ), - ], -); + suffix: r'Mutation') +]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -125,7 +118,7 @@ class Custom$MutationRoot$MutationResponse extends JsonSerializable Map json) => _$Custom$MutationRoot$MutationResponseFromJson(json); - String s; + String? s; @override List get props => [s]; @@ -140,7 +133,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { factory Custom$MutationRoot.fromJson(Map json) => _$Custom$MutationRootFromJson(json); - Custom$MutationRoot$MutationResponse mut; + Custom$MutationRoot$MutationResponse? mut; @override List get props => [mut]; @@ -149,14 +142,14 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class Input extends JsonSerializable with EquatableMixin { - Input({@required this.s, this.d}); + Input({required this.s, this.d}); factory Input.fromJson(Map json) => _$InputFromJson(json); - String s; + late String s; @Deprecated('deprecated input field') - String d; + String? d; @override List get props => [s, d]; @@ -165,13 +158,13 @@ class Input extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class CustomArguments extends JsonSerializable with EquatableMixin { - CustomArguments({@required this.input}); + CustomArguments({required this.input}); @override factory CustomArguments.fromJson(Map json) => _$CustomArgumentsFromJson(json); - final Input input; + late Input input; @override List get props => [input]; @@ -181,7 +174,7 @@ class CustomArguments extends JsonSerializable with EquatableMixin { class CustomMutation extends GraphQLQuery { - CustomMutation({this.variables}); + CustomMutation({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -192,7 +185,7 @@ class CustomMutation VariableDefinitionNode( variable: VariableNode(name: NameNode(value: 'input')), type: NamedTypeNode( - name: NameNode(value: 'Input'), ), + name: NameNode(value: 'Input'), isNonNull: true), defaultValue: DefaultValueNode(value: null), directives: []) ], diff --git a/test/query_generator/deprecated/deprecated_interface_field_test.dart b/test/query_generator/deprecated/deprecated_interface_field_test.dart index 3c825eea..4783a7c7 100644 --- a/test/query_generator/deprecated/deprecated_interface_field_test.dart +++ b/test/query_generator/deprecated/deprecated_interface_field_test.dart @@ -73,116 +73,101 @@ final String graphQLSchema = r''' } '''; -final LibraryDefinition libraryDefinition = LibraryDefinition( - basename: r'query.graphql', - queries: [ - QueryDefinition( - operationName: r'custom', +final LibraryDefinition libraryDefinition = + LibraryDefinition(basename: r'query.graphql', queries: [ + QueryDefinition( name: QueryName(name: r'Custom$_Query'), + operationName: r'custom', classes: [ ClassDefinition( - name: ClassName(name: r'Custom$_Query$_Node$_User'), - extension: ClassName(name: r'Custom$_Query$_Node'), - mixins: [FragmentName(name: r'UserFragMixin')], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: ClassName(name: r'Custom$_Query$_Node$_User'), + extension: ClassName(name: r'Custom$_Query$_Node'), + mixins: [FragmentName(name: r'UserFragMixin')], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), ClassDefinition( - name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage$_User'), - extension: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), - mixins: [FragmentName(name: r'UserFragMixin')], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage$_User'), + extension: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), + mixins: [FragmentName(name: r'UserFragMixin')], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), ClassDefinition( - name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'message'), - isResolveType: false, - ), - ClassProperty( - type: TypeName(name: r'Custom$_Query$_Node$_ChatMessage$_User'), - name: ClassPropertyName(name: r'user'), - isResolveType: false, - ) - ], - extension: ClassName(name: r'Custom$_Query$_Node'), - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), + properties: [ + ClassProperty( + type: TypeName(name: r'String', isNonNull: true), + name: ClassPropertyName(name: r'message'), + isResolveType: false), + ClassProperty( + type: TypeName( + name: r'Custom$_Query$_Node$_ChatMessage$_User', + isNonNull: true), + name: ClassPropertyName(name: r'user'), + isResolveType: false) + ], + extension: ClassName(name: r'Custom$_Query$_Node'), + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), ClassDefinition( - name: ClassName(name: r'Custom$_Query$_Node'), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'id'), - isResolveType: false, - ), - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'deprecatedField'), - isResolveType: false, - annotations: [ - "Deprecated('deprecated interface field')", - ], - ), - ], - factoryPossibilities: { - r'User': ClassName(name: r'Custom$_Query$_Node$_User'), - r'ChatMessage': ClassName(name: r'Custom$_Query$_Node$_ChatMessage') - }, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: ClassName(name: r'Custom$_Query$_Node'), + properties: [ + ClassProperty( + type: TypeName(name: r'String', isNonNull: true), + name: ClassPropertyName(name: r'id'), + isResolveType: false), + ClassProperty( + type: TypeName(name: r'String'), + name: ClassPropertyName(name: r'deprecatedField'), + annotations: [ + r'''Deprecated('deprecated interface field')''' + ], + isResolveType: false) + ], + factoryPossibilities: { + r'User': ClassName(name: r'Custom$_Query$_Node$_User'), + r'ChatMessage': + ClassName(name: r'Custom$_Query$_Node$_ChatMessage') + }, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), ClassDefinition( - name: ClassName(name: r'Custom$_Query'), - properties: [ - ClassProperty( - type: TypeName(name: r'Custom$_Query$_Node'), - name: ClassPropertyName(name: r'nodeById'), - isResolveType: false, - ), - ], - factoryPossibilities: {}, - typeNameField: ClassPropertyName(name: r'__typename'), - isInput: false, - ), + name: ClassName(name: r'Custom$_Query'), + properties: [ + ClassProperty( + type: TypeName(name: r'Custom$_Query$_Node'), + name: ClassPropertyName(name: r'nodeById'), + isResolveType: false) + ], + factoryPossibilities: {}, + typeNameField: ClassPropertyName(name: r'__typename'), + isInput: false), FragmentClassDefinition( - name: FragmentName( - name: r'UserFragMixin', - ), - properties: [ - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'id'), - isResolveType: false, - ), - ClassProperty( - type: TypeName(name: r'String'), - name: ClassPropertyName(name: r'username'), - isResolveType: false, - ), - ], - ) + name: FragmentName(name: r'UserFragMixin'), + properties: [ + ClassProperty( + type: TypeName(name: r'String', isNonNull: true), + name: ClassPropertyName(name: r'id'), + isResolveType: false), + ClassProperty( + type: TypeName(name: r'String', isNonNull: true), + name: ClassPropertyName(name: r'username'), + isResolveType: false) + ]) ], inputs: [ QueryInput( - type: TypeName(name: r'String'), - name: QueryInputName(name: r'id'), - ), + type: TypeName(name: r'String', isNonNull: true), + name: QueryInputName(name: r'id')) ], generateHelpers: false, - suffix: r'Query', - ) - ], -); + suffix: r'Query') +]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -190,8 +175,8 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin UserFragMixin { - String id; - String username; + late String id; + late String username; } @JsonSerializable(explicitToJson: true) @@ -230,9 +215,9 @@ class Custom$Query$Node$ChatMessage extends Custom$Query$Node factory Custom$Query$Node$ChatMessage.fromJson(Map json) => _$Custom$Query$Node$ChatMessageFromJson(json); - String message; + late String message; - Custom$Query$Node$ChatMessage$User user; + late Custom$Query$Node$ChatMessage$User user; @override List get props => [message, user]; @@ -254,10 +239,10 @@ class Custom$Query$Node extends JsonSerializable with EquatableMixin { return _$Custom$Query$NodeFromJson(json); } - String id; + late String id; @Deprecated('deprecated interface field') - String deprecatedField; + String? deprecatedField; @override List get props => [id, deprecatedField]; @@ -280,7 +265,7 @@ class Custom$Query extends JsonSerializable with EquatableMixin { factory Custom$Query.fromJson(Map json) => _$Custom$QueryFromJson(json); - Custom$Query$Node nodeById; + Custom$Query$Node? nodeById; @override List get props => [nodeById]; From 202bda2baee7cf932a396b553ccc810a3bdb9e33 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 18:25:40 -0300 Subject: [PATCH 26/31] AST schema tests --- .../field_not_found_mutation_test.dart | 24 +++---- .../ast_schema/input_types_test.dart | 37 ++++++----- .../ast_schema/missing_schema_test.dart | 3 +- .../multiple_schema_mappint_test.dart | 64 +++++++++++-------- 4 files changed, 72 insertions(+), 56 deletions(-) diff --git a/test/query_generator/ast_schema/field_not_found_mutation_test.dart b/test/query_generator/ast_schema/field_not_found_mutation_test.dart index b7e6811c..f9b0e7a0 100644 --- a/test/query_generator/ast_schema/field_not_found_mutation_test.dart +++ b/test/query_generator/ast_schema/field_not_found_mutation_test.dart @@ -63,7 +63,7 @@ final LibraryDefinition libraryDefinition = name: r'CreateThing$_MutationRoot$_CreateThingResponse$_Thing'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -104,7 +104,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'CreateThingInput'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'clientId'), isResolveType: false), ClassProperty( @@ -118,15 +118,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'CreateThingInput'), - name: QueryInputName(name: r'createThingInput'), - ) + type: TypeName(name: r'CreateThingInput'), + name: QueryInputName(name: r'createThingInput')) ], generateHelpers: false, suffix: r'Mutation') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -142,9 +142,9 @@ class CreateThing$MutationRoot$CreateThingResponse$Thing Map json) => _$CreateThing$MutationRoot$CreateThingResponse$ThingFromJson(json); - String id; + late String id; - String message; + String? message; @override List get props => [id, message]; @@ -161,7 +161,7 @@ class CreateThing$MutationRoot$CreateThingResponse extends JsonSerializable Map json) => _$CreateThing$MutationRoot$CreateThingResponseFromJson(json); - CreateThing$MutationRoot$CreateThingResponse$Thing thing; + CreateThing$MutationRoot$CreateThingResponse$Thing? thing; @override List get props => [thing]; @@ -176,7 +176,7 @@ class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin { factory CreateThing$MutationRoot.fromJson(Map json) => _$CreateThing$MutationRootFromJson(json); - CreateThing$MutationRoot$CreateThingResponse createThing; + CreateThing$MutationRoot$CreateThingResponse? createThing; @override List get props => [createThing]; @@ -185,14 +185,14 @@ class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class CreateThingInput extends JsonSerializable with EquatableMixin { - CreateThingInput({@required this.clientId, this.message}); + CreateThingInput({required this.clientId, this.message}); factory CreateThingInput.fromJson(Map json) => _$CreateThingInputFromJson(json); - String clientId; + late String clientId; - String message; + String? message; @override List get props => [clientId, message]; diff --git a/test/query_generator/ast_schema/input_types_test.dart b/test/query_generator/ast_schema/input_types_test.dart index 59ea6896..95b118dc 100644 --- a/test/query_generator/ast_schema/input_types_test.dart +++ b/test/query_generator/ast_schema/input_types_test.dart @@ -68,7 +68,7 @@ final LibraryDefinition libraryDefinition = name: r'CreateThing$_MutationRoot$_CreateThingResponse$_Thing'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -109,7 +109,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'OtherObjectInput'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false) ], @@ -120,7 +120,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'CreateThingInput'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'clientId'), isResolveType: false), ClassProperty( @@ -128,7 +128,10 @@ final LibraryDefinition libraryDefinition = name: ClassPropertyName(name: r'message'), isResolveType: false), ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: + TypeName(name: r'OtherObjectInput', isNonNull: true), + isNonNull: false), name: ClassPropertyName(name: r'shares'), isResolveType: false) ], @@ -138,15 +141,15 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'CreateThingInput'), - name: QueryInputName(name: r'createThingInput'), - ) + type: TypeName(name: r'CreateThingInput'), + name: QueryInputName(name: r'createThingInput')) ], generateHelpers: false, suffix: r'Mutation') ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -162,9 +165,9 @@ class CreateThing$MutationRoot$CreateThingResponse$Thing Map json) => _$CreateThing$MutationRoot$CreateThingResponse$ThingFromJson(json); - String id; + late String id; - String message; + String? message; @override List get props => [id, message]; @@ -181,7 +184,7 @@ class CreateThing$MutationRoot$CreateThingResponse extends JsonSerializable Map json) => _$CreateThing$MutationRoot$CreateThingResponseFromJson(json); - CreateThing$MutationRoot$CreateThingResponse$Thing thing; + CreateThing$MutationRoot$CreateThingResponse$Thing? thing; @override List get props => [thing]; @@ -196,7 +199,7 @@ class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin { factory CreateThing$MutationRoot.fromJson(Map json) => _$CreateThing$MutationRootFromJson(json); - CreateThing$MutationRoot$CreateThingResponse createThing; + CreateThing$MutationRoot$CreateThingResponse? createThing; @override List get props => [createThing]; @@ -205,12 +208,12 @@ class CreateThing$MutationRoot extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class OtherObjectInput extends JsonSerializable with EquatableMixin { - OtherObjectInput({@required this.id}); + OtherObjectInput({required this.id}); factory OtherObjectInput.fromJson(Map json) => _$OtherObjectInputFromJson(json); - String id; + late String id; @override List get props => [id]; @@ -219,16 +222,16 @@ class OtherObjectInput extends JsonSerializable with EquatableMixin { @JsonSerializable(explicitToJson: true) class CreateThingInput extends JsonSerializable with EquatableMixin { - CreateThingInput({@required this.clientId, this.message, this.shares}); + CreateThingInput({required this.clientId, this.message, this.shares}); factory CreateThingInput.fromJson(Map json) => _$CreateThingInputFromJson(json); - String clientId; + late String clientId; - String message; + String? message; - List shares; + List? shares; @override List get props => [clientId, message, shares]; diff --git a/test/query_generator/ast_schema/missing_schema_test.dart b/test/query_generator/ast_schema/missing_schema_test.dart index 4bfc16c5..f600698e 100644 --- a/test/query_generator/ast_schema/missing_schema_test.dart +++ b/test/query_generator/ast_schema/missing_schema_test.dart @@ -52,6 +52,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -65,7 +66,7 @@ class Query$Query extends JsonSerializable with EquatableMixin { factory Query$Query.fromJson(Map json) => _$Query$QueryFromJson(json); - String a; + String? a; @override List get props => [a]; diff --git a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart index d1db5ada..7f998eb8 100644 --- a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart +++ b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart @@ -161,15 +161,15 @@ final LibraryDefinition libraryDefinitionA = name: ClassName(name: r'BrowseArticles$_Query$_articles'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'title'), isResolveType: false), ClassProperty( - type: TypeName(name: r'ArticleType'), + type: TypeName(name: r'ArticleType', isNonNull: true), name: ClassPropertyName(name: r'articleType'), annotations: [ r'JsonKey(unknownEnumValue: ArticleType.artemisUnknown)' @@ -183,7 +183,11 @@ final LibraryDefinition libraryDefinitionA = name: ClassName(name: r'BrowseArticles$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName( + name: r'BrowseArticles$_Query$_articles', + isNonNull: true), + isNonNull: false), name: ClassPropertyName(name: r'articles'), isResolveType: false) ], @@ -222,22 +226,22 @@ final libraryDefinitionB = name: ClassName(name: r'BrowseRepositories$_Query$_repositories'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: TypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'title'), isResolveType: false), ClassProperty( - type: TypeName(name: r'Privacy'), + type: TypeName(name: r'Privacy', isNonNull: true), name: ClassPropertyName(name: r'privacy'), annotations: [ r'JsonKey(unknownEnumValue: Privacy.artemisUnknown)' ], isResolveType: false), ClassProperty( - type: TypeName(name: r'Status'), + type: TypeName(name: r'Status', isNonNull: true), name: ClassPropertyName(name: r'status'), annotations: [ r'JsonKey(unknownEnumValue: Status.artemisUnknown)' @@ -251,8 +255,11 @@ final libraryDefinitionB = name: ClassName(name: r'BrowseRepositories$_Query'), properties: [ ClassProperty( - type: TypeName( - name: r'List'), + type: ListOfTypeName( + typeName: TypeName( + name: r'BrowseRepositories$_Query$_repositories', + isNonNull: true), + isNonNull: false), name: ClassPropertyName(name: r'repositories'), isResolveType: false) ], @@ -280,7 +287,9 @@ final libraryDefinitionB = ], inputs: [ QueryInput( - type: TypeName(name: r'List'), + type: ListOfTypeName( + typeName: TypeName(name: r'NotificationOptionInput'), + isNonNull: false), name: QueryInputName(name: r'notificationTypes')) ], generateHelpers: true, @@ -288,6 +297,7 @@ final libraryDefinitionB = ]); const generatedFileA = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -303,12 +313,12 @@ class BrowseArticles$Query$Articles extends JsonSerializable factory BrowseArticles$Query$Articles.fromJson(Map json) => _$BrowseArticles$Query$ArticlesFromJson(json); - String id; + late String id; - String title; + late String title; @JsonKey(unknownEnumValue: ArticleType.artemisUnknown) - ArticleType articleType; + late ArticleType articleType; @override List get props => [id, title, articleType]; @@ -322,7 +332,7 @@ class BrowseArticles$Query extends JsonSerializable with EquatableMixin { factory BrowseArticles$Query.fromJson(Map json) => _$BrowseArticles$QueryFromJson(json); - List articles; + List? articles; @override List get props => [articles]; @@ -390,6 +400,7 @@ class BrowseArticlesQuery '''; const generatedFileB = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:artemis/artemis.dart'; import 'package:json_annotation/json_annotation.dart'; @@ -406,15 +417,15 @@ class BrowseRepositories$Query$Repositories extends JsonSerializable Map json) => _$BrowseRepositories$Query$RepositoriesFromJson(json); - String id; + late String id; - String title; + late String title; @JsonKey(unknownEnumValue: Privacy.artemisUnknown) - Privacy privacy; + late Privacy privacy; @JsonKey(unknownEnumValue: Status.artemisUnknown) - Status status; + late Status status; @override List get props => [id, title, privacy, status]; @@ -429,7 +440,7 @@ class BrowseRepositories$Query extends JsonSerializable with EquatableMixin { factory BrowseRepositories$Query.fromJson(Map json) => _$BrowseRepositories$QueryFromJson(json); - List repositories; + List? repositories; @override List get props => [repositories]; @@ -444,9 +455,9 @@ class NotificationOptionInput extends JsonSerializable with EquatableMixin { _$NotificationOptionInputFromJson(json); @JsonKey(unknownEnumValue: NotificationType.artemisUnknown) - NotificationType type; + NotificationType? type; - bool enabled; + bool? enabled; @override List get props => [type, enabled]; @@ -490,7 +501,7 @@ class BrowseRepositoriesArguments extends JsonSerializable with EquatableMixin { factory BrowseRepositoriesArguments.fromJson(Map json) => _$BrowseRepositoriesArgumentsFromJson(json); - final List notificationTypes; + final List? notificationTypes; @override List get props => [notificationTypes]; @@ -500,7 +511,7 @@ class BrowseRepositoriesArguments extends JsonSerializable with EquatableMixin { class BrowseRepositoriesQuery extends GraphQLQuery { - BrowseRepositoriesQuery({this.variables}); + BrowseRepositoriesQuery({required this.variables}); @override final DocumentNode document = DocumentNode(definitions: [ @@ -513,8 +524,9 @@ class BrowseRepositoriesQuery extends GraphQLQuery Date: Wed, 17 Mar 2021 18:25:58 -0300 Subject: [PATCH 27/31] Revert "Add nnbd to options" This reverts commit a91ff5ea178bb1571d43998567c5ee642469c8ba. --- lib/schema/options.dart | 5 ----- lib/schema/options.g2.dart | 13 ++++++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/schema/options.dart b/lib/schema/options.dart index 980ba754..d96bbc8a 100644 --- a/lib/schema/options.dart +++ b/lib/schema/options.dart @@ -30,10 +30,6 @@ class GeneratorOptions { @JsonKey(defaultValue: []) final List ignoreForFile; - /// If artemis should generate nnbd code - @JsonKey(defaultValue: false) - final bool nnbd; - /// Instantiate generator options. GeneratorOptions({ this.generateHelpers = true, @@ -41,7 +37,6 @@ class GeneratorOptions { this.fragmentsGlob, this.schemaMapping = const [], this.ignoreForFile = const [], - this.nnbd = false, }); /// Build options from a JSON map. diff --git a/lib/schema/options.g2.dart b/lib/schema/options.g2.dart index e7f0aed4..ec18d1a9 100644 --- a/lib/schema/options.g2.dart +++ b/lib/schema/options.g2.dart @@ -1,5 +1,6 @@ +// @dart = 2.8 + // GENERATED CODE - DO NOT MODIFY BY HAND -// @dart=2.8 part of 'options.dart'; @@ -27,10 +28,10 @@ GeneratorOptions _$GeneratorOptionsFromJson(Map json) { ))) ?.toList() ?? [], - ignoreForFile: - (json['ignore_for_file'] as List)?.map((e) => e as String)?.toList() ?? - [], - nnbd: json['nnbd'] as bool ?? false, + ignoreForFile: (json['ignore_for_file'] as List) + ?.map((e) => e == null ? null : e as String) + ?.toList() ?? + [], ); } @@ -41,7 +42,6 @@ Map _$GeneratorOptionsToJson(GeneratorOptions instance) => 'fragments_glob': instance.fragmentsGlob, 'schema_mapping': instance.schemaMapping, 'ignore_for_file': instance.ignoreForFile, - 'nnbd': instance.nnbd, }; DartType _$DartTypeFromJson(Map json) { @@ -89,7 +89,6 @@ Map _$SchemaMapToJson(SchemaMap instance) => { 'schema': instance.schema, 'queries_glob': instance.queriesGlob, 'type_name_field': instance.typeNameField, - 'append_type_name': instance.appendTypeName, 'naming_scheme': _$NamingSchemeEnumMap[instance.namingScheme], }; From 6cd9bce92619f5806b3a175032df2c66c5945b56 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 18:27:21 -0300 Subject: [PATCH 28/31] Aliases tests --- .../aliases/alias_on_leaves_test.dart | 7 ++++--- .../aliases/alias_on_object_test.dart | 17 ++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/test/query_generator/aliases/alias_on_leaves_test.dart b/test/query_generator/aliases/alias_on_leaves_test.dart index 54a19829..f7990e92 100644 --- a/test/query_generator/aliases/alias_on_leaves_test.dart +++ b/test/query_generator/aliases/alias_on_leaves_test.dart @@ -100,6 +100,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -115,7 +116,7 @@ class SomeQuery$Response$SomeObject extends JsonSerializable _$SomeQuery$Response$SomeObjectFromJson(json); @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) - MyEnum thisIsAnEnum; + MyEnum? thisIsAnEnum; @override List get props => [thisIsAnEnum]; @@ -129,9 +130,9 @@ class SomeQuery$Response extends JsonSerializable with EquatableMixin { factory SomeQuery$Response.fromJson(Map json) => _$SomeQuery$ResponseFromJson(json); - String thisIsAString; + String? thisIsAString; - SomeQuery$Response$SomeObject o; + SomeQuery$Response$SomeObject? o; @override List get props => [thisIsAString, o]; diff --git a/test/query_generator/aliases/alias_on_object_test.dart b/test/query_generator/aliases/alias_on_object_test.dart index c520ae75..4aa01d12 100644 --- a/test/query_generator/aliases/alias_on_object_test.dart +++ b/test/query_generator/aliases/alias_on_object_test.dart @@ -86,8 +86,10 @@ final LibraryDefinition libraryDefinition = name: ClassPropertyName(name: r'o'), isResolveType: false), ClassProperty( - type: TypeName( - name: r'List'), + type: ListOfTypeName( + typeName: TypeName( + name: r'SomeQuery$_QueryResponse$_anotherObject'), + isNonNull: false), name: ClassPropertyName(name: r'anotherObject'), isResolveType: false) ], @@ -100,6 +102,7 @@ final LibraryDefinition libraryDefinition = ]); const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND +// @dart = 2.12 import 'package:json_annotation/json_annotation.dart'; import 'package:equatable/equatable.dart'; @@ -115,7 +118,7 @@ class SomeQuery$QueryResponse$SomeObject extends JsonSerializable Map json) => _$SomeQuery$QueryResponse$SomeObjectFromJson(json); - String st; + String? st; @override List get props => [st]; @@ -132,7 +135,7 @@ class SomeQuery$QueryResponse$AnotherObject extends JsonSerializable Map json) => _$SomeQuery$QueryResponse$AnotherObjectFromJson(json); - String str; + String? str; @override List get props => [str]; @@ -147,11 +150,11 @@ class SomeQuery$QueryResponse extends JsonSerializable with EquatableMixin { factory SomeQuery$QueryResponse.fromJson(Map json) => _$SomeQuery$QueryResponseFromJson(json); - String s; + String? s; - SomeQuery$QueryResponse$SomeObject o; + SomeQuery$QueryResponse$SomeObject? o; - List anotherObject; + List? anotherObject; @override List get props => [s, o, anotherObject]; From c68206f7b886aa5e877b3d03c3d10cceca55bd3d Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 18:37:52 -0300 Subject: [PATCH 29/31] Fix other dangling tests --- .../interfaces/interface_fragment_glob_test.dart | 4 ++-- test/query_generator/interfaces/interface_test.dart | 4 ++-- test/query_generator/naming/casing_conversion_test.dart | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/query_generator/interfaces/interface_fragment_glob_test.dart b/test/query_generator/interfaces/interface_fragment_glob_test.dart index ba2c1fe8..c00dea94 100644 --- a/test/query_generator/interfaces/interface_fragment_glob_test.dart +++ b/test/query_generator/interfaces/interface_fragment_glob_test.dart @@ -180,8 +180,8 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin UserFragMixin { - String id; - String username; + late String id; + late String username; } @JsonSerializable(explicitToJson: true) diff --git a/test/query_generator/interfaces/interface_test.dart b/test/query_generator/interfaces/interface_test.dart index 6b2595b1..6e1ab6c6 100644 --- a/test/query_generator/interfaces/interface_test.dart +++ b/test/query_generator/interfaces/interface_test.dart @@ -171,8 +171,8 @@ import 'package:gql/ast.dart'; part 'query.graphql.g.dart'; mixin UserFragMixin { - String id; - String username; + late String id; + late String username; } @JsonSerializable(explicitToJson: true) diff --git a/test/query_generator/naming/casing_conversion_test.dart b/test/query_generator/naming/casing_conversion_test.dart index a64e5015..07a226e4 100644 --- a/test/query_generator/naming/casing_conversion_test.dart +++ b/test/query_generator/naming/casing_conversion_test.dart @@ -133,7 +133,7 @@ final LibraryDefinition libraryDefinition = type: TypeName(name: r'MyEnum'), name: ClassPropertyName(name: r'e'), annotations: [ - r'JsonKey(unknownEnumValue: MyEnum?.artemisUnknown)' + r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' ], isResolveType: false) ], @@ -179,7 +179,7 @@ final LibraryDefinition libraryDefinition = type: TypeName(name: r'MyEnum'), name: ClassPropertyName(name: r'e'), annotations: [ - r'JsonKey(unknownEnumValue: MyEnum?.artemisUnknown)' + r'JsonKey(unknownEnumValue: MyEnum.artemisUnknown)' ], isResolveType: false) ], @@ -223,7 +223,7 @@ class SomeObject extends JsonSerializable with EquatableMixin { @JsonKey(name: 'SCREAMING_SNAKE_CASE_FIELD') ScreamingSnakeCaseType? screamingSnakeCaseField; - @JsonKey(unknownEnumValue: MyEnum?.artemisUnknown) + @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) MyEnum? e; @override @@ -273,7 +273,7 @@ class Input extends JsonSerializable with EquatableMixin { @JsonKey(name: 'SCREAMING_SNAKE_CASE_FIELD') ScreamingSnakeCaseTypeInput? screamingSnakeCaseField; - @JsonKey(unknownEnumValue: MyEnum?.artemisUnknown) + @JsonKey(unknownEnumValue: MyEnum.artemisUnknown) MyEnum? e; @override From 834957fc51c1311fc364e87f4280380c6b561c08 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 18:51:34 -0300 Subject: [PATCH 30/31] 7.0.0 --- CHANGELOG.md | 5 +++++ pubspec.yaml | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c75ac818..cf11843b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 7.0.0-beta.1 +**MAJOR BREAKING CHANGE** + +- Code generated by Artemis is now nnbd-compliant + ## 6.20.1-beta.2 - Add codespaces folder diff --git a/pubspec.yaml b/pubspec.yaml index 9ba23fe8..87c31fa6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,10 @@ name: artemis -version: 6.20.1-beta.2 +version: 7.0.0-beta.1 description: Build dart types from GraphQL schemas and queries (using Introspection Query). homepage: https://github.com/comigor/artemis environment: - # sdk: ">=2.12.0 <3.0.0" sdk: ">=2.8.0 <3.0.0" dependencies: From 0ce654f57e4863467a15d256a7f5befe175fffe8 Mon Sep 17 00:00:00 2001 From: Igor Borges Date: Wed, 17 Mar 2021 18:55:30 -0300 Subject: [PATCH 31/31] Update helpers.dart --- lib/generator/helpers.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/generator/helpers.dart b/lib/generator/helpers.dart index 5f272dea..ff885f7d 100644 --- a/lib/generator/helpers.dart +++ b/lib/generator/helpers.dart @@ -1,6 +1,5 @@ // @dart = 2.8 -import 'package:artemis/generator/data/data.dart'; import 'package:artemis/generator/ephemeral_data.dart'; import 'package:build/build.dart'; import 'package:gql/ast.dart';