Skip to content
This repository has been archived by the owner on Oct 2, 2024. It is now read-only.

Commit

Permalink
Merge pull request #344 from comigor/mis-mapping_dynamic_to_Dynamic
Browse files Browse the repository at this point in the history 
mis-mapping dynamic to Dynamic
  • Loading branch information
@vasilich6107
vasilich6107 authored Jul 17, 2021
2 parents a8dd885 + 0d236a9 commit ac4e597
Show file tree
Hide file tree
Showing 46 changed files with 232 additions and 202 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 12 additions & 0 deletions lib/generator/data/class_property.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/generator/graphql_helpers.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Expand Down
14 changes: 7 additions & 7 deletions pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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

14 changes: 4 additions & 10 deletions test/query_generator/aliases/alias_on_leaves_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions test/query_generator/aliases/alias_on_object_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
],
Expand All @@ -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)
],
Expand All @@ -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(
Expand Down
12 changes: 6 additions & 6 deletions test/query_generator/append_type_name_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions test/query_generator/ast_schema/field_not_found_mutation_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
],
Expand Down Expand Up @@ -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)
],
Expand Down
10 changes: 5 additions & 5 deletions test/query_generator/ast_schema/input_types_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
],
Expand Down Expand Up @@ -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(
Expand All @@ -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)
],
Expand Down
2 changes: 1 addition & 1 deletion test/query_generator/ast_schema/missing_schema_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
],
Expand Down
10 changes: 5 additions & 5 deletions test/query_generator/ast_schema/multiple_schema_mappint_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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)
],
Expand Down
8 changes: 4 additions & 4 deletions test/query_generator/deprecated/deprecated_field_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions test/query_generator/deprecated/deprecated_input_object_field_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
],
Expand All @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions test/query_generator/deprecated/deprecated_interface_field_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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')'''
Expand Down Expand Up @@ -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,
Expand Down
Loading

0 comments on commit ac4e597

Please sign in to comment.