From 0d236a9955f340a2f351b5a513182b95e2dc5f6b Mon Sep 17 00:00:00 2001 From: vasilich Date: Sat, 17 Jul 2021 13:21:33 +0300 Subject: [PATCH] mis-mapping dynamic to Dynamic --- CHANGELOG.md | 4 +++ lib/generator/data/class_property.dart | 12 +++++++ lib/generator/graphql_helpers.dart | 2 +- pubspec.yaml | 14 ++++---- .../aliases/alias_on_leaves_test.dart | 14 +++----- .../aliases/alias_on_object_test.dart | 6 ++-- .../append_type_name_test.dart | 12 +++---- .../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/deprecated_field_test.dart | 8 ++--- .../deprecated_input_object_field_test.dart | 6 ++-- .../deprecated_interface_field_test.dart | 12 +++---- .../enums/input_enum_list_test.dart | 4 +-- .../enums/input_enum_test.dart | 4 +-- .../query_generator/enums/kw_prefix_test.dart | 6 ++-- test/query_generator/forwarder_test.dart | 2 +- .../fragments/fragment_duplication_test.dart | 16 ++++----- .../fragments/fragment_glob_test.dart | 6 ++-- .../fragment_multiple_queries_test.dart | 12 +++---- .../fragments/fragment_on_fragments_test.dart | 8 ++--- .../fragments/fragments_multiple_test.dart | 20 +++++------ .../fragments/fragments_test.dart | 4 +-- ...iple_references_on_simple_naming_test.dart | 4 +-- .../interface_fragment_glob_test.dart | 10 +++--- .../interface_possible_types_test.dart | 8 ++--- .../interfaces/interface_test.dart | 10 +++--- .../multiple_operations_per_file_test.dart | 14 ++++---- .../multiple_queries_test.dart | 6 ++-- .../complex_input_objects_test.dart | 10 +++--- .../custom_scalars_on_input_objects_test.dart | 10 +++--- .../filter_input_objects_test.dart | 4 +-- .../input_duplication_test.dart | 8 ++--- .../mutations_and_inputs/mutations_test.dart | 8 ++--- .../non_nullable_list_inputs_test.dart | 22 ++++++++----- .../recursive_input_test.dart | 2 +- .../naming/simple_naming_test.dart | 2 +- test/query_generator/nnbd_test.dart | 21 ++++++------ .../query_generator/query_generator_test.dart | 10 +++--- .../scalars/custom_scalars_test.dart | 33 +++++++++++++------ .../query_generator/scalars/scalars_test.dart | 10 +++--- .../scalars/unused_custom_scalars_test.dart | 2 +- test/query_generator/subscription_test.dart | 4 +-- .../union/union_types_test.dart | 26 +++++++-------- .../union/union_with_nested_types_test.dart | 8 ++--- 46 files changed, 232 insertions(+), 202 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c92e206..2feaec43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 7.1.0-beta.2 + +- fix for https://github.com/comigor/artemis/issues/341 + ## 7.1.0-beta.1 - duplicated $$typename fix diff --git a/lib/generator/data/class_property.dart b/lib/generator/data/class_property.dart index a6871023..45468879 100644 --- a/lib/generator/data/class_property.dart +++ b/lib/generator/data/class_property.dart @@ -103,6 +103,18 @@ class TypeName extends Name with DataPrinter { } } +/// Type name +class DartTypeName extends TypeName with DataPrinter { + /// Instantiate a type name definition. + DartTypeName({ + required String name, + bool isNonNull = false, + }) : super(name: name, isNonNull: isNonNull); + + @override + String normalize(String name) => '$name${isNonNull ? '' : '?'}'; +} + /// Type name class ListOfTypeName extends TypeName with DataPrinter { /// Instantiate a type name definition. diff --git a/lib/generator/graphql_helpers.dart b/lib/generator/graphql_helpers.dart index c3b8a249..6b1fbdc2 100644 --- a/lib/generator/graphql_helpers.dart +++ b/lib/generator/graphql_helpers.dart @@ -51,7 +51,7 @@ TypeName buildTypeName( final graphQLTypeValue = scalar?.graphQLType; if (dartType && dartTypeValue != null && dartTypeValue.name != null) { - return TypeName( + return DartTypeName( name: dartTypeValue.name!, isNonNull: node.isNonNull, ); diff --git a/pubspec.yaml b/pubspec.yaml index 92bd2743..5fa1f320 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: artemis -version: 7.1.0-beta.1 +version: 7.1.0-beta.2 description: Build dart types from GraphQL schemas and queries (using Introspection Query). homepage: https://github.com/comigor/artemis @@ -10,9 +10,9 @@ environment: dependencies: build_config: ^1.0.0 code_builder: ^4.0.0 - build: ^2.0.2 + build: ^2.0.3 collection: ^1.15.0 - dart_style: ^2.0.1 + dart_style: ^2.0.2 equatable: ^2.0.3 glob: ^2.0.1 gql_code_builder: ^0.2.0 @@ -30,11 +30,11 @@ dependencies: dev_dependencies: args: ^2.1.1 - build_runner: ^2.0.5 - build_test: ^2.1.0 + build_runner: ^2.0.6 + build_test: ^2.1.2 json_serializable: ^4.1.3 - build_resolvers: ^2.0.3 + build_resolvers: ^2.0.4 pedantic: ^1.11.1 - test: ^1.17.9 + test: ^1.17.10 logging: ^1.0.1 diff --git a/test/query_generator/aliases/alias_on_leaves_test.dart b/test/query_generator/aliases/alias_on_leaves_test.dart index cd8a97be..c37b7203 100644 --- a/test/query_generator/aliases/alias_on_leaves_test.dart +++ b/test/query_generator/aliases/alias_on_leaves_test.dart @@ -53,15 +53,9 @@ final LibraryDefinition libraryDefinition = operationName: r'some_query', 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'SomeQuery$_Response$_SomeObject'), @@ -81,7 +75,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_Response'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'thisIsAString'), isResolveType: false), ClassProperty( diff --git a/test/query_generator/aliases/alias_on_object_test.dart b/test/query_generator/aliases/alias_on_object_test.dart index 83602f7e..4ba99fd3 100644 --- a/test/query_generator/aliases/alias_on_object_test.dart +++ b/test/query_generator/aliases/alias_on_object_test.dart @@ -54,7 +54,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_QueryResponse$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'st'), isResolveType: false) ], @@ -65,7 +65,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_QueryResponse$_anotherObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'str'), isResolveType: false) ], @@ -76,7 +76,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_QueryResponse'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( diff --git a/test/query_generator/append_type_name_test.dart b/test/query_generator/append_type_name_test.dart index 93fd179e..656d37a5 100644 --- a/test/query_generator/append_type_name_test.dart +++ b/test/query_generator/append_type_name_test.dart @@ -40,7 +40,7 @@ void main() { name: ClassName(name: r'Custom$_QueryRoot$_q'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'e'), isResolveType: false), ClassProperty( @@ -155,7 +155,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { name: ClassName(name: r'Custom$_QueryRoot$_q'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'e'), isResolveType: false), ClassProperty( @@ -301,7 +301,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { name: FragmentName(name: r'QueryResponseMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'e'), isResolveType: false), ClassProperty( @@ -411,7 +411,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { name: ClassName(name: r'Custom$_QueryRoot$_q$_typeA'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'a'), isResolveType: false), ClassProperty( @@ -428,7 +428,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { name: ClassName(name: r'Custom$_QueryRoot$_q$_typeB'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'b'), isResolveType: false), ClassProperty( @@ -641,7 +641,7 @@ class Custom$QueryRoot extends JsonSerializable with EquatableMixin { name: FragmentName(name: r'QueryResponseMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'e'), isResolveType: false), ClassProperty( 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 20d1f55e..a52a48de 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 @@ -61,11 +61,11 @@ final LibraryDefinition libraryDefinition = name: r'CreateThing$_MutationRoot$_CreateThingResponse$_Thing'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'message'), isResolveType: false) ], @@ -102,11 +102,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'CreateThingInput'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'clientId'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'message'), isResolveType: false) ], diff --git a/test/query_generator/ast_schema/input_types_test.dart b/test/query_generator/ast_schema/input_types_test.dart index c2ae60ad..9595aa02 100644 --- a/test/query_generator/ast_schema/input_types_test.dart +++ b/test/query_generator/ast_schema/input_types_test.dart @@ -66,11 +66,11 @@ final LibraryDefinition libraryDefinition = name: r'CreateThing$_MutationRoot$_CreateThingResponse$_Thing'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'message'), isResolveType: false) ], @@ -107,11 +107,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'CreateThingInput'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'clientId'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'message'), isResolveType: false), ClassProperty( @@ -129,7 +129,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'OtherObjectInput'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false) ], diff --git a/test/query_generator/ast_schema/missing_schema_test.dart b/test/query_generator/ast_schema/missing_schema_test.dart index a8396e86..95cc8123 100644 --- a/test/query_generator/ast_schema/missing_schema_test.dart +++ b/test/query_generator/ast_schema/missing_schema_test.dart @@ -37,7 +37,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Query$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'a'), isResolveType: 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 fcca6ac2..fdbb0d42 100644 --- a/test/query_generator/ast_schema/multiple_schema_mappint_test.dart +++ b/test/query_generator/ast_schema/multiple_schema_mappint_test.dart @@ -157,11 +157,11 @@ final LibraryDefinition libraryDefinitionA = name: ClassName(name: r'BrowseArticles$_Query$_articles'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'title'), isResolveType: false), ClassProperty( @@ -222,11 +222,11 @@ final libraryDefinitionB = name: ClassName(name: r'BrowseRepositories$_Query$_repositories'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'title'), isResolveType: false), ClassProperty( @@ -273,7 +273,7 @@ final libraryDefinitionB = ], isResolveType: false), ClassProperty( - type: TypeName(name: r'bool'), + type: DartTypeName(name: r'bool'), name: ClassPropertyName(name: r'enabled'), isResolveType: false) ], diff --git a/test/query_generator/deprecated/deprecated_field_test.dart b/test/query_generator/deprecated/deprecated_field_test.dart index d72ac136..a9a198c9 100644 --- a/test/query_generator/deprecated/deprecated_field_test.dart +++ b/test/query_generator/deprecated/deprecated_field_test.dart @@ -55,11 +55,11 @@ final LibraryDefinition libraryDefinition = ClassName(name: r'SomeQuery$_QueryResponse$_deprecatedObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'someField'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'deprecatedField'), annotations: [r'''Deprecated('message 2')'''], isResolveType: false) @@ -71,11 +71,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_QueryResponse$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'someField'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'deprecatedField'), annotations: [r'''Deprecated('message 2')'''], isResolveType: 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 c5ce744e..3343d9ed 100644 --- a/test/query_generator/deprecated/deprecated_input_object_field_test.dart +++ b/test/query_generator/deprecated/deprecated_input_object_field_test.dart @@ -53,7 +53,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_MutationRoot$_MutationResponse'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -76,11 +76,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'd'), annotations: [r'''Deprecated('deprecated input field')'''], isResolveType: false) diff --git a/test/query_generator/deprecated/deprecated_interface_field_test.dart b/test/query_generator/deprecated/deprecated_interface_field_test.dart index c9d0a8f3..36c11f3c 100644 --- a/test/query_generator/deprecated/deprecated_interface_field_test.dart +++ b/test/query_generator/deprecated/deprecated_interface_field_test.dart @@ -94,7 +94,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'message'), isResolveType: false), ClassProperty( @@ -112,11 +112,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'deprecatedField'), annotations: [ r'''Deprecated('deprecated interface field')''' @@ -145,18 +145,18 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'UserFragMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'username'), isResolveType: false) ]) ], inputs: [ QueryInput( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: QueryInputName(name: r'id')) ], generateHelpers: false, diff --git a/test/query_generator/enums/input_enum_list_test.dart b/test/query_generator/enums/input_enum_list_test.dart index b3a4d2d0..e9b2fd12 100644 --- a/test/query_generator/enums/input_enum_list_test.dart +++ b/test/query_generator/enums/input_enum_list_test.dart @@ -63,11 +63,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'BrowseArticles$_Query$_Article'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'title'), isResolveType: false), ClassProperty( diff --git a/test/query_generator/enums/input_enum_test.dart b/test/query_generator/enums/input_enum_test.dart index c5aed1f6..31a1bcce 100644 --- a/test/query_generator/enums/input_enum_test.dart +++ b/test/query_generator/enums/input_enum_test.dart @@ -77,7 +77,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_QueryRoot$_QueryResponse'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( @@ -126,7 +126,7 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: QueryInputName(name: r'_id'), annotations: [r'''JsonKey(name: '_id')''']), QueryInput( diff --git a/test/query_generator/enums/kw_prefix_test.dart b/test/query_generator/enums/kw_prefix_test.dart index 2399f61c..83397833 100644 --- a/test/query_generator/enums/kw_prefix_test.dart +++ b/test/query_generator/enums/kw_prefix_test.dart @@ -61,11 +61,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SearchArticles$_Query$_Article'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'title'), isResolveType: false) ], @@ -98,7 +98,7 @@ final LibraryDefinition libraryDefinition = ], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'value'), isResolveType: false) ], diff --git a/test/query_generator/forwarder_test.dart b/test/query_generator/forwarder_test.dart index 58a23504..268e87ec 100644 --- a/test/query_generator/forwarder_test.dart +++ b/test/query_generator/forwarder_test.dart @@ -55,7 +55,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_QueryRoot'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'a'), isResolveType: false) ], diff --git a/test/query_generator/fragments/fragment_duplication_test.dart b/test/query_generator/fragments/fragment_duplication_test.dart index 99c476ce..7b17476b 100644 --- a/test/query_generator/fragments/fragment_duplication_test.dart +++ b/test/query_generator/fragments/fragment_duplication_test.dart @@ -110,7 +110,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -122,7 +122,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonNameMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]), @@ -130,11 +130,11 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonPartsMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'number'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]) @@ -178,7 +178,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -190,7 +190,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonNameMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]), @@ -198,11 +198,11 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonPartsMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'number'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]) diff --git a/test/query_generator/fragments/fragment_glob_test.dart b/test/query_generator/fragments/fragment_glob_test.dart index b59e0933..ee567bc3 100644 --- a/test/query_generator/fragments/fragment_glob_test.dart +++ b/test/query_generator/fragments/fragment_glob_test.dart @@ -138,7 +138,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -154,7 +154,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'WeightMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'minimum'), isResolveType: false) ]), @@ -178,7 +178,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'AttackMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]) diff --git a/test/query_generator/fragments/fragment_multiple_queries_test.dart b/test/query_generator/fragments/fragment_multiple_queries_test.dart index 935f9a42..c93f064e 100644 --- a/test/query_generator/fragments/fragment_multiple_queries_test.dart +++ b/test/query_generator/fragments/fragment_multiple_queries_test.dart @@ -116,18 +116,18 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonFragmentMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'number'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]) ], inputs: [ QueryInput( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: QueryInputName(name: r'name')) ], generateHelpers: true, @@ -160,18 +160,18 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonFragmentMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'number'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]) ], inputs: [ QueryInput( - type: TypeName(name: r'int', isNonNull: true), + type: DartTypeName(name: r'int', isNonNull: true), name: QueryInputName(name: r'first')) ], generateHelpers: true, diff --git a/test/query_generator/fragments/fragment_on_fragments_test.dart b/test/query_generator/fragments/fragment_on_fragments_test.dart index 0f50e90b..15bbe7d8 100644 --- a/test/query_generator/fragments/fragment_on_fragments_test.dart +++ b/test/query_generator/fragments/fragment_on_fragments_test.dart @@ -97,7 +97,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -109,7 +109,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonNameMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]), @@ -117,11 +117,11 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'PokemonPartsMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'number'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'name'), isResolveType: false) ]) diff --git a/test/query_generator/fragments/fragments_multiple_test.dart b/test/query_generator/fragments/fragments_multiple_test.dart index 88d904ba..7501dca6 100644 --- a/test/query_generator/fragments/fragments_multiple_test.dart +++ b/test/query_generator/fragments/fragments_multiple_test.dart @@ -98,11 +98,11 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'DstMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'name'), isResolveType: false) ]), @@ -110,7 +110,7 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'DepartureMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false) ]), @@ -119,19 +119,19 @@ final LibraryDefinition libraryDefinition = name: r'VoyagesData$_Query$_VoyageList$_VoyageDetails$_Voyage'), properties: [ ClassProperty( - type: TypeName(name: r'DateTime', isNonNull: true), + type: DartTypeName(name: r'DateTime', isNonNull: true), name: ClassPropertyName(name: r'dateFrom'), isResolveType: false), ClassProperty( - type: TypeName(name: r'DateTime'), + type: DartTypeName(name: r'DateTime'), name: ClassPropertyName(name: r'dateTo'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'voyageNumber'), isResolveType: false) ], @@ -143,7 +143,7 @@ final LibraryDefinition libraryDefinition = name: r'VoyagesData$_Query$_VoyageList$_VoyageDetails'), properties: [ ClassProperty( - type: TypeName(name: r'int', isNonNull: true), + type: DartTypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'numberOfReports'), isResolveType: false), ClassProperty( @@ -189,11 +189,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'PaginationInput'), properties: [ ClassProperty( - type: TypeName(name: r'int', isNonNull: true), + type: DartTypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'limit'), isResolveType: false), ClassProperty( - type: TypeName(name: r'int', isNonNull: true), + type: DartTypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'offset'), isResolveType: false) ], diff --git a/test/query_generator/fragments/fragments_test.dart b/test/query_generator/fragments/fragments_test.dart index 14b70084..35864ec1 100644 --- a/test/query_generator/fragments/fragments_test.dart +++ b/test/query_generator/fragments/fragments_test.dart @@ -44,11 +44,11 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'MyFragmentMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'i'), isResolveType: 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 af2621db..4a0d1378 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 @@ -66,11 +66,11 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'MyFragmentMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'i'), isResolveType: false) ]), diff --git a/test/query_generator/interfaces/interface_fragment_glob_test.dart b/test/query_generator/interfaces/interface_fragment_glob_test.dart index b51dfa74..7ac98635 100644 --- a/test/query_generator/interfaces/interface_fragment_glob_test.dart +++ b/test/query_generator/interfaces/interface_fragment_glob_test.dart @@ -101,7 +101,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_nodeById$_chatMessage'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'message'), isResolveType: false), ClassProperty( @@ -119,7 +119,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_nodeById'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -150,18 +150,18 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'UserFragMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'username'), isResolveType: false) ]) ], inputs: [ QueryInput( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: QueryInputName(name: r'id')) ], generateHelpers: false, diff --git a/test/query_generator/interfaces/interface_possible_types_test.dart b/test/query_generator/interfaces/interface_possible_types_test.dart index a2094601..b34e0499 100644 --- a/test/query_generator/interfaces/interface_possible_types_test.dart +++ b/test/query_generator/interfaces/interface_possible_types_test.dart @@ -76,7 +76,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node$_User'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'username'), isResolveType: false) ], @@ -88,7 +88,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'message'), isResolveType: false) ], @@ -100,7 +100,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -130,7 +130,7 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: QueryInputName(name: r'id')) ], generateHelpers: false, diff --git a/test/query_generator/interfaces/interface_test.dart b/test/query_generator/interfaces/interface_test.dart index 76c1aa35..f34a283f 100644 --- a/test/query_generator/interfaces/interface_test.dart +++ b/test/query_generator/interfaces/interface_test.dart @@ -92,7 +92,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node$_ChatMessage'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'message'), isResolveType: false), ClassProperty( @@ -110,7 +110,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Query$_Node'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -141,18 +141,18 @@ final LibraryDefinition libraryDefinition = name: FragmentName(name: r'UserFragMixin'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'username'), isResolveType: false) ]) ], inputs: [ QueryInput( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: QueryInputName(name: r'id')) ], generateHelpers: false, diff --git a/test/query_generator/multiple_operations_per_file_test.dart b/test/query_generator/multiple_operations_per_file_test.dart index 5162f492..84099806 100644 --- a/test/query_generator/multiple_operations_per_file_test.dart +++ b/test/query_generator/multiple_operations_per_file_test.dart @@ -71,7 +71,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'MutData$_Mutation$_MutationResponse'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -93,7 +93,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -116,16 +116,16 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'QueData$_Query$_QueryResponse'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'i'), isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'int'), isNonNull: true), + typeName: DartTypeName(name: r'int'), isNonNull: true), name: ClassPropertyName(name: r'list'), isResolveType: false) ], @@ -147,10 +147,10 @@ final LibraryDefinition libraryDefinition = inputs: [ QueryInput( type: ListOfTypeName( - typeName: TypeName(name: r'int'), isNonNull: true), + typeName: DartTypeName(name: r'int'), isNonNull: true), name: QueryInputName(name: r'intsNonNullable')), QueryInput( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: QueryInputName(name: r'stringNullable')) ], generateHelpers: true, diff --git a/test/query_generator/multiple_queries_test.dart b/test/query_generator/multiple_queries_test.dart index 4e3caf9f..636295b5 100644 --- a/test/query_generator/multiple_queries_test.dart +++ b/test/query_generator/multiple_queries_test.dart @@ -39,11 +39,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'i'), isResolveType: false) ], @@ -61,7 +61,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'AnotherQuery$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: 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 197f4e0e..149e79a0 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 @@ -63,7 +63,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_QueryRoot$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -85,7 +85,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'ComplexInput'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( @@ -97,13 +97,15 @@ final LibraryDefinition libraryDefinition = isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'String'), isNonNull: false), + typeName: DartTypeName(name: r'String'), + isNonNull: false), name: ClassPropertyName(name: r'ls'), isResolveType: false), ClassProperty( type: ListOfTypeName( typeName: ListOfTypeName( - typeName: TypeName(name: r'int'), isNonNull: false), + typeName: DartTypeName(name: r'int'), + isNonNull: false), isNonNull: false), name: ClassPropertyName(name: r'i'), isResolveType: false) 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 089c9708..a27642af 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 @@ -67,7 +67,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_MutationRoot$_MutationResponse'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -90,14 +90,14 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'MyUuid', isNonNull: true), + type: DartTypeName(name: r'MyUuid', isNonNull: true), name: ClassPropertyName(name: r'id'), annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid)' ], isResolveType: false), ClassProperty( - type: TypeName(name: r'MyUuid'), + type: DartTypeName(name: r'MyUuid'), name: ClassPropertyName(name: r'idNullabe'), annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidNullableToDartMyUuidNullable, toJson: fromDartMyUuidNullableToGraphQLMyUuidNullable)' @@ -113,14 +113,14 @@ final LibraryDefinition libraryDefinition = type: TypeName(name: r'Input', isNonNull: true), name: QueryInputName(name: r'input')), QueryInput( - type: TypeName(name: r'MyUuid'), + type: DartTypeName(name: r'MyUuid'), name: QueryInputName(name: r'previousId'), annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidNullableToDartMyUuidNullable, toJson: fromDartMyUuidNullableToGraphQLMyUuidNullable)' ]), QueryInput( type: ListOfTypeName( - typeName: TypeName(name: r'MyUuid'), isNonNull: false), + typeName: DartTypeName(name: r'MyUuid'), isNonNull: false), name: QueryInputName(name: r'listIds'), annotations: [ r'JsonKey(fromJson: fromGraphQLListNullableMyUuidNullableToDartListNullableMyUuidNullable, toJson: fromDartListNullableMyUuidNullableToGraphQLListNullableMyUuidNullable)' 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 fa40a287..a442c160 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 @@ -62,7 +62,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_QueryRoot$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -95,7 +95,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SubInput'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], 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 bce82871..96d92320 100644 --- a/test/query_generator/mutations_and_inputs/input_duplication_test.dart +++ b/test/query_generator/mutations_and_inputs/input_duplication_test.dart @@ -65,7 +65,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Mutation$_mut'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -87,7 +87,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -110,7 +110,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'CustomList$_Mutation$_mutList'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -132,7 +132,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), isResolveType: false) ], diff --git a/test/query_generator/mutations_and_inputs/mutations_test.dart b/test/query_generator/mutations_and_inputs/mutations_test.dart index 63f0a547..f50ec4e7 100644 --- a/test/query_generator/mutations_and_inputs/mutations_test.dart +++ b/test/query_generator/mutations_and_inputs/mutations_test.dart @@ -72,7 +72,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_MutationRoot$_MutationResponse'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -95,7 +95,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Input'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -118,7 +118,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'$custom$_MutationRoot$_$MutationResponse'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_s'), annotations: [r'''JsonKey(name: '_s')'''], isResolveType: false) @@ -143,7 +143,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'_Input'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'_s'), annotations: [r'''JsonKey(name: '_s')'''], isResolveType: false) 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 63d88931..ed9391ab 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 @@ -34,7 +34,7 @@ void main() { name: ClassName(name: r'SomeQuery$_Query$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false) ], @@ -56,33 +56,37 @@ void main() { ], inputs: [ QueryInput( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: QueryInputName(name: r'i')), QueryInput( - type: TypeName(name: r'int', isNonNull: true), + type: DartTypeName(name: r'int', isNonNull: true), name: QueryInputName(name: r'inn')), QueryInput( type: ListOfTypeName( - typeName: TypeName(name: r'int'), isNonNull: false), + typeName: DartTypeName(name: r'int'), + isNonNull: false), name: QueryInputName(name: r'li')), QueryInput( type: ListOfTypeName( - typeName: TypeName(name: r'int', isNonNull: true), + typeName: + DartTypeName(name: r'int', isNonNull: true), isNonNull: false), name: QueryInputName(name: r'linn')), QueryInput( type: ListOfTypeName( - typeName: TypeName(name: r'int'), isNonNull: true), + typeName: DartTypeName(name: r'int'), + isNonNull: true), name: QueryInputName(name: r'lnni')), QueryInput( type: ListOfTypeName( - typeName: TypeName(name: r'int', isNonNull: true), + typeName: + DartTypeName(name: r'int', isNonNull: true), isNonNull: true), name: QueryInputName(name: r'lnninn')), QueryInput( type: ListOfTypeName( typeName: ListOfTypeName( - typeName: TypeName(name: r'int'), + typeName: DartTypeName(name: r'int'), isNonNull: false), isNonNull: false), name: QueryInputName(name: r'matrix')), @@ -90,7 +94,7 @@ void main() { type: ListOfTypeName( typeName: ListOfTypeName( typeName: - TypeName(name: r'int', isNonNull: true), + DartTypeName(name: r'int', isNonNull: true), isNonNull: true), isNonNull: true), name: QueryInputName(name: r'matrixnn')) 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 1908658a..1f8e0204 100644 --- a/test/query_generator/mutations_and_inputs/recursive_input_test.dart +++ b/test/query_generator/mutations_and_inputs/recursive_input_test.dart @@ -42,7 +42,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Custom$_Mutation'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'mut'), isResolveType: false) ], diff --git a/test/query_generator/naming/simple_naming_test.dart b/test/query_generator/naming/simple_naming_test.dart index 8fc64aaa..5d2a6191 100644 --- a/test/query_generator/naming/simple_naming_test.dart +++ b/test/query_generator/naming/simple_naming_test.dart @@ -62,7 +62,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'ClientEventItem'), properties: [ ClassProperty( - type: TypeName(name: r'int', isNonNull: true), + type: DartTypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'type'), isResolveType: false) ], diff --git a/test/query_generator/nnbd_test.dart b/test/query_generator/nnbd_test.dart index 9a102ac6..c1cd0b05 100644 --- a/test/query_generator/nnbd_test.dart +++ b/test/query_generator/nnbd_test.dart @@ -57,11 +57,11 @@ final libraryDefinition = name: ClassName(name: r'Query$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'nonNullAndSelected'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'nullableAndSelected'), isResolveType: false) ], @@ -109,46 +109,47 @@ final listsLibraryDefinition = name: ClassName(name: r'Query$_Query'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'i'), isResolveType: false), ClassProperty( - type: TypeName(name: r'int', isNonNull: true), + type: DartTypeName(name: r'int', isNonNull: true), name: ClassPropertyName(name: r'inn'), isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'int'), isNonNull: false), + typeName: DartTypeName(name: r'int'), isNonNull: false), name: ClassPropertyName(name: r'li'), isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'int', isNonNull: true), + typeName: DartTypeName(name: r'int', isNonNull: true), isNonNull: false), name: ClassPropertyName(name: r'linn'), isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'int'), isNonNull: true), + typeName: DartTypeName(name: r'int'), isNonNull: true), name: ClassPropertyName(name: r'lnni'), isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'int', isNonNull: true), + typeName: DartTypeName(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), + typeName: DartTypeName(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), + typeName: DartTypeName(name: r'int', isNonNull: true), isNonNull: true), isNonNull: true), name: ClassPropertyName(name: r'matrixnn'), diff --git a/test/query_generator/query_generator_test.dart b/test/query_generator/query_generator_test.dart index b4e9c90d..f687cdb9 100644 --- a/test/query_generator/query_generator_test.dart +++ b/test/query_generator/query_generator_test.dart @@ -29,11 +29,11 @@ void main() { name: ClassName(name: r'SomeQuery$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'i'), isResolveType: false) ], @@ -116,7 +116,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { r'SomeQuery$_Result$_SomeObject$_AnotherObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'str'), isResolveType: false) ], @@ -127,7 +127,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { name: ClassName(name: r'SomeQuery$_Result$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'st'), isResolveType: false), ClassProperty( @@ -146,7 +146,7 @@ class SomeQuery$SomeObject extends JsonSerializable with EquatableMixin { name: ClassName(name: r'SomeQuery$_Result'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( diff --git a/test/query_generator/scalars/custom_scalars_test.dart b/test/query_generator/scalars/custom_scalars_test.dart index 64bacd66..7bb77040 100644 --- a/test/query_generator/scalars/custom_scalars_test.dart +++ b/test/query_generator/scalars/custom_scalars_test.dart @@ -9,9 +9,10 @@ void main() { test( 'If they can be converted to a simple dart class', () async => testGenerator( - query: 'query query { a }', + query: 'query query { a, b }', schema: r''' scalar MyUuid + scalar Json schema { query: SomeObject @@ -19,6 +20,7 @@ void main() { type SomeObject { a: MyUuid + b: Json } ''', libraryDefinition: libraryDefinition, @@ -29,6 +31,10 @@ void main() { 'graphql_type': 'MyUuid', 'dart_type': 'String', }, + { + 'graphql_type': 'Json', + 'dart_type': 'Map', + }, ], }, ), @@ -113,8 +119,12 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Query$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'a'), + isResolveType: false), + ClassProperty( + type: DartTypeName(name: r'Map'), + name: ClassPropertyName(name: r'b'), isResolveType: false) ], factoryPossibilities: {}, @@ -135,7 +145,7 @@ final LibraryDefinition libraryDefinitionWithCustomParserFns = name: ClassName(name: r'Query$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'MyDartUuid'), + type: DartTypeName(name: r'MyDartUuid'), name: ClassPropertyName(name: r'a'), annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidNullableToDartMyDartUuidNullable, toJson: fromDartMyDartUuidNullableToGraphQLMyUuidNullable)' @@ -162,14 +172,14 @@ final LibraryDefinition libraryDefinitionWithCustomImports = name: ClassName(name: r'Query$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'MyUuid'), + type: DartTypeName(name: r'MyUuid'), name: ClassPropertyName(name: r'a'), annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidNullableToDartMyUuidNullable, toJson: fromDartMyUuidNullableToGraphQLMyUuidNullable)' ], isResolveType: false), ClassProperty( - type: TypeName(name: r'MyUuid', isNonNull: true), + type: DartTypeName(name: r'MyUuid', isNonNull: true), name: ClassPropertyName(name: r'b'), annotations: [ r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid)' @@ -177,7 +187,7 @@ final LibraryDefinition libraryDefinitionWithCustomImports = isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'MyUuid', isNonNull: true), + typeName: DartTypeName(name: r'MyUuid', isNonNull: true), isNonNull: true), name: ClassPropertyName(name: r'c'), annotations: [ @@ -186,7 +196,8 @@ final LibraryDefinition libraryDefinitionWithCustomImports = isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'MyUuid'), isNonNull: false), + typeName: DartTypeName(name: r'MyUuid'), + isNonNull: false), name: ClassPropertyName(name: r'd'), annotations: [ r'JsonKey(fromJson: fromGraphQLListNullableMyUuidNullableToDartListNullableMyUuidNullable, toJson: fromDartListNullableMyUuidNullableToGraphQLListNullableMyUuidNullable)' @@ -194,7 +205,7 @@ final LibraryDefinition libraryDefinitionWithCustomImports = isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'MyUuid'), isNonNull: true), + typeName: DartTypeName(name: r'MyUuid'), isNonNull: true), name: ClassPropertyName(name: r'e'), annotations: [ r'JsonKey(fromJson: fromGraphQLListMyUuidNullableToDartListMyUuidNullable, toJson: fromDartListMyUuidNullableToGraphQLListMyUuidNullable)' @@ -202,7 +213,7 @@ final LibraryDefinition libraryDefinitionWithCustomImports = isResolveType: false), ClassProperty( type: ListOfTypeName( - typeName: TypeName(name: r'MyUuid', isNonNull: true), + typeName: DartTypeName(name: r'MyUuid', isNonNull: true), isNonNull: false), name: ClassPropertyName(name: r'f'), annotations: [ @@ -238,8 +249,10 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin { String? a; + Map? b; + @override - List get props => [a]; + List get props => [a, b]; @override Map toJson() => _$Query$SomeObjectToJson(this); } diff --git a/test/query_generator/scalars/scalars_test.dart b/test/query_generator/scalars/scalars_test.dart index c9d5fd7d..a5b371f5 100644 --- a/test/query_generator/scalars/scalars_test.dart +++ b/test/query_generator/scalars/scalars_test.dart @@ -71,23 +71,23 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'i'), isResolveType: false), ClassProperty( - type: TypeName(name: r'double'), + type: DartTypeName(name: r'double'), name: ClassPropertyName(name: r'f'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r's'), isResolveType: false), ClassProperty( - type: TypeName(name: r'bool'), + type: DartTypeName(name: r'bool'), name: ClassPropertyName(name: r'b'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'id'), isResolveType: false) ], diff --git a/test/query_generator/scalars/unused_custom_scalars_test.dart b/test/query_generator/scalars/unused_custom_scalars_test.dart index 3e84dfdb..508f185a 100644 --- a/test/query_generator/scalars/unused_custom_scalars_test.dart +++ b/test/query_generator/scalars/unused_custom_scalars_test.dart @@ -47,7 +47,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'Query$_SomeObject'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'a'), isResolveType: false) ], diff --git a/test/query_generator/subscription_test.dart b/test/query_generator/subscription_test.dart index 5cc4e0e6..9dc8357a 100644 --- a/test/query_generator/subscription_test.dart +++ b/test/query_generator/subscription_test.dart @@ -94,11 +94,11 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'NewUserSub$_Subscription$_User'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'firstName'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'lastName'), isResolveType: false), ClassProperty( diff --git a/test/query_generator/union/union_types_test.dart b/test/query_generator/union/union_types_test.dart index a548d8ce..0385116f 100644 --- a/test/query_generator/union/union_types_test.dart +++ b/test/query_generator/union/union_types_test.dart @@ -83,31 +83,31 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion$_TypeA'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'a'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_'), annotations: [r'''JsonKey(name: '_')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_a'), annotations: [r'''JsonKey(name: '_a')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_a_a'), annotations: [r'''JsonKey(name: '_a_a')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_a_a_'), annotations: [r'''JsonKey(name: '_a_a_')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_new'), annotations: [r'''JsonKey(name: '_new')'''], isResolveType: false), @@ -125,36 +125,36 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'SomeQuery$_SomeObject$_SomeUnion$_TypeB'), properties: [ ClassProperty( - type: TypeName(name: r'int'), + type: DartTypeName(name: r'int'), name: ClassPropertyName(name: r'b'), isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_'), annotations: [r'''JsonKey(name: '_')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_b'), annotations: [r'''JsonKey(name: '_b')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_b_b'), annotations: [r'''JsonKey(name: '_b_b')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'_b_b_'), annotations: [r'''JsonKey(name: '_b_b_')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'new'), annotations: [r'''JsonKey(name: 'new')'''], isResolveType: false), ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'IN'), annotations: [r'''JsonKey(name: 'IN')'''], isResolveType: false), diff --git a/test/query_generator/union/union_with_nested_types_test.dart b/test/query_generator/union/union_with_nested_types_test.dart index 7d8c3f58..1c59ca77 100644 --- a/test/query_generator/union/union_with_nested_types_test.dart +++ b/test/query_generator/union/union_with_nested_types_test.dart @@ -96,7 +96,7 @@ final LibraryDefinition libraryDefinition = r'CheckoutById$_QueryRoot$_Node$_Checkout$_CheckoutLineItemConnection$_CheckoutLineItemEdge$_ImageConnection'), properties: [ ClassProperty( - type: TypeName(name: r'String'), + type: DartTypeName(name: r'String'), name: ClassPropertyName(name: r'id'), isResolveType: false) ], @@ -126,7 +126,7 @@ final LibraryDefinition libraryDefinition = r'CheckoutById$_QueryRoot$_Node$_Checkout$_CheckoutLineItemConnection'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -146,7 +146,7 @@ final LibraryDefinition libraryDefinition = name: ClassName(name: r'CheckoutById$_QueryRoot$_Node$_Checkout'), properties: [ ClassProperty( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: ClassPropertyName(name: r'id'), isResolveType: false), ClassProperty( @@ -190,7 +190,7 @@ final LibraryDefinition libraryDefinition = ], inputs: [ QueryInput( - type: TypeName(name: r'String', isNonNull: true), + type: DartTypeName(name: r'String', isNonNull: true), name: QueryInputName(name: r'checkoutId')) ], generateHelpers: false,