Merge pull request #302 from comigor/Nullable_scalar_mapping_types

Nullable scalar_mapping types
comigor · Apr 30, 2021 · aa066f6 · aa066f6
2 parents 1d933e0 + 404453a
commit aa066f6
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 7.0.0-beta.9
+
+- nullable scalar_mapping types
+
 ## 7.0.0-beta.8
 
 - packages update

diff --git a/lib/generator.dart b/lib/generator.dart
@@ -358,10 +358,18 @@ Make sure your query is correct and your schema is updated.''');
                   dartType: false, schema: context.schema)
               .dartTypeSafe);
       final dartTypeSafeStr = TypeName(name: dartTypeName.dartTypeSafe);
-      jsonKeyAnnotation['fromJson'] =
-          'fromGraphQL${graphqlTypeSafeStr.dartTypeSafe}ToDart${dartTypeSafeStr.dartTypeSafe}';
-      jsonKeyAnnotation['toJson'] =
-          'fromDart${dartTypeSafeStr.dartTypeSafe}ToGraphQL${graphqlTypeSafeStr.dartTypeSafe}';
+
+      if (fieldType.isNonNull) {
+        jsonKeyAnnotation['fromJson'] =
+            'fromGraphQL${graphqlTypeSafeStr.dartTypeSafe}ToDart${dartTypeSafeStr.dartTypeSafe}';
+        jsonKeyAnnotation['toJson'] =
+            'fromDart${dartTypeSafeStr.dartTypeSafe}ToGraphQL${graphqlTypeSafeStr.dartTypeSafe}';
+      } else {
+        jsonKeyAnnotation['fromJson'] =
+            'fromGraphQL${graphqlTypeSafeStr.dartTypeSafe}ToDart${dartTypeSafeStr.dartTypeSafe}Nullable';
+        jsonKeyAnnotation['toJson'] =
+            'fromDart${dartTypeSafeStr.dartTypeSafe}ToGraphQL${graphqlTypeSafeStr.dartTypeSafe}Nullable';
+      }
     }
   } // On enums
   else if (nextType is EnumTypeDefinitionNode) {

diff --git a/lib/visitor/generator_visitor.dart b/lib/visitor/generator_visitor.dart
@@ -189,10 +189,18 @@ class GeneratorVisitor extends RecursiveVisitor {
                     dartType: false, schema: context.schema)
                 .dartTypeSafe);
         final dartTypeSafeStr = TypeName(name: dartTypeName.dartTypeSafe);
-        jsonKeyAnnotation['fromJson'] =
-            'fromGraphQL${graphqlTypeSafeStr.dartTypeSafe}ToDart${dartTypeSafeStr.dartTypeSafe}';
-        jsonKeyAnnotation['toJson'] =
-            'fromDart${dartTypeSafeStr.dartTypeSafe}ToGraphQL${graphqlTypeSafeStr.dartTypeSafe}';
+
+        if (node.type.isNonNull) {
+          jsonKeyAnnotation['fromJson'] =
+              'fromGraphQL${graphqlTypeSafeStr.dartTypeSafe}ToDart${dartTypeSafeStr.dartTypeSafe}';
+          jsonKeyAnnotation['toJson'] =
+              'fromDart${dartTypeSafeStr.dartTypeSafe}ToGraphQL${graphqlTypeSafeStr.dartTypeSafe}';
+        } else {
+          jsonKeyAnnotation['fromJson'] =
+              'fromGraphQL${graphqlTypeSafeStr.dartTypeSafe}ToDart${dartTypeSafeStr.dartTypeSafe}Nullable';
+          jsonKeyAnnotation['toJson'] =
+              'fromDart${dartTypeSafeStr.dartTypeSafe}ToGraphQL${graphqlTypeSafeStr.dartTypeSafe}Nullable';
+        }
       }
     }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: artemis
-version: 7.0.0-beta.8
+version: 7.0.0-beta.9
 
 description: Build dart types from GraphQL schemas and queries (using Introspection Query).
 homepage: https://github.com/comigor/artemis

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
@@ -26,6 +26,7 @@ void main() {
 
           input Input {
             id: MyUuid!
+            idNullabe: MyUuid
           }
           ''',
         libraryDefinition: libraryDefinition,
@@ -94,6 +95,13 @@ final LibraryDefinition libraryDefinition =
                   annotations: [
                     r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid)'
                   ],
+                  isResolveType: false),
+              ClassProperty(
+                  type: TypeName(name: r'MyUuid'),
+                  name: ClassPropertyName(name: r'idNullabe'),
+                  annotations: [
+                    r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuidNullable, toJson: fromDartMyUuidToGraphQLMyUuidNullable)'
+                  ],
                   isResolveType: false)
             ],
             factoryPossibilities: {},
@@ -108,14 +116,14 @@ final LibraryDefinition libraryDefinition =
             type: TypeName(name: r'MyUuid'),
             name: QueryInputName(name: r'previousId'),
             annotations: [
-              r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid)'
+              r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuidNullable, toJson: fromDartMyUuidToGraphQLMyUuidNullable)'
             ]),
         QueryInput(
             type: ListOfTypeName(
                 typeName: TypeName(name: r'MyUuid'), isNonNull: false),
             name: QueryInputName(name: r'listIds'),
             annotations: [
-              r'JsonKey(fromJson: fromGraphQLListMyUuidToDartListMyUuid, toJson: fromDartListMyUuidToGraphQLListMyUuid)'
+              r'JsonKey(fromJson: fromGraphQLListMyUuidToDartListMyUuidNullable, toJson: fromDartListMyUuidToGraphQLListMyUuidNullable)'
             ])
       ],
       generateHelpers: true,
@@ -169,7 +177,7 @@ class Custom$MutationRoot extends JsonSerializable with EquatableMixin {
 
 @JsonSerializable(explicitToJson: true)
 class Input extends JsonSerializable with EquatableMixin {
-  Input({required this.id});
+  Input({required this.id, this.idNullabe});
 
   factory Input.fromJson(Map<String, dynamic> json) => _$InputFromJson(json);
 
@@ -178,8 +186,13 @@ class Input extends JsonSerializable with EquatableMixin {
       toJson: fromDartMyUuidToGraphQLMyUuid)
   late MyUuid id;
 
+  @JsonKey(
+      fromJson: fromGraphQLMyUuidToDartMyUuidNullable,
+      toJson: fromDartMyUuidToGraphQLMyUuidNullable)
+  MyUuid? idNullabe;
+
   @override
-  List<Object?> get props => [id];
+  List<Object?> get props => [id, idNullabe];
   Map<String, dynamic> toJson() => _$InputToJson(this);
 }
 
@@ -194,13 +207,13 @@ class CustomArguments extends JsonSerializable with EquatableMixin {
   late Input input;
 
   @JsonKey(
-      fromJson: fromGraphQLMyUuidToDartMyUuid,
-      toJson: fromDartMyUuidToGraphQLMyUuid)
+      fromJson: fromGraphQLMyUuidToDartMyUuidNullable,
+      toJson: fromDartMyUuidToGraphQLMyUuidNullable)
   final MyUuid? previousId;
 
   @JsonKey(
-      fromJson: fromGraphQLListMyUuidToDartListMyUuid,
-      toJson: fromDartListMyUuidToGraphQLListMyUuid)
+      fromJson: fromGraphQLListMyUuidToDartListMyUuidNullable,
+      toJson: fromDartListMyUuidToGraphQLListMyUuidNullable)
   final List<MyUuid?>? listIds;
 
   @override

diff --git a/test/query_generator/scalars/custom_scalars_test.dart b/test/query_generator/scalars/custom_scalars_test.dart
@@ -133,7 +133,7 @@ final LibraryDefinition libraryDefinitionWithCustomParserFns =
                   type: TypeName(name: r'MyDartUuid'),
                   name: ClassPropertyName(name: r'a'),
                   annotations: [
-                    r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyDartUuid, toJson: fromDartMyDartUuidToGraphQLMyUuid)'
+                    r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyDartUuidNullable, toJson: fromDartMyDartUuidToGraphQLMyUuidNullable)'
                   ],
                   isResolveType: false)
             ],
@@ -160,7 +160,7 @@ final LibraryDefinition libraryDefinitionWithCustomImports =
                   type: TypeName(name: r'MyUuid'),
                   name: ClassPropertyName(name: r'a'),
                   annotations: [
-                    r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuid, toJson: fromDartMyUuidToGraphQLMyUuid)'
+                    r'JsonKey(fromJson: fromGraphQLMyUuidToDartMyUuidNullable, toJson: fromDartMyUuidToGraphQLMyUuidNullable)'
                   ],
                   isResolveType: false)
             ],
@@ -216,8 +216,8 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin {
       _$Query$SomeObjectFromJson(json);
 
   @JsonKey(
-      fromJson: fromGraphQLMyUuidToDartMyDartUuid,
-      toJson: fromDartMyDartUuidToGraphQLMyUuid)
+      fromJson: fromGraphQLMyUuidToDartMyDartUuidNullable,
+      toJson: fromDartMyDartUuidToGraphQLMyUuidNullable)
   MyDartUuid? a;
 
   @override
@@ -245,8 +245,8 @@ class Query$SomeObject extends JsonSerializable with EquatableMixin {
       _$Query$SomeObjectFromJson(json);
 
   @JsonKey(
-      fromJson: fromGraphQLMyUuidToDartMyUuid,
-      toJson: fromDartMyUuidToGraphQLMyUuid)
+      fromJson: fromGraphQLMyUuidToDartMyUuidNullable,
+      toJson: fromDartMyUuidToGraphQLMyUuidNullable)
   MyUuid? a;
 
   @override