Undo changes to resolver args

Author: tobias-tengler

compiler/crates/relay-typegen/src/visit.rs

@@ -557,6 +557,7 @@ fn get_resolver_arguments(
                 input_object_types,
                 encountered_enums,
                 custom_scalars,
+                true,
             ),
         }));
     }
@@ -2448,6 +2449,7 @@ fn transform_non_nullable_input_type(
             input_object_types,
             encountered_enums,
             custom_scalars,
+            false,
         ))),
         TypeReference::Named(named_type) => match named_type {
             Type::Scalar(scalar) => {
@@ -2483,6 +2485,7 @@ fn transform_non_nullable_input_type(
                                         input_object_types,
                                         encountered_enums,
                                         custom_scalars,
+                                        false,
                                     ),
                                 })
                             })
@@ -2509,6 +2512,7 @@ pub(crate) fn transform_input_type(
     input_object_types: &mut InputObjectTypes,
     encountered_enums: &mut EncounteredEnums,
     custom_scalars: &mut CustomScalarsImports,
+    should_output_optional: bool,
 ) -> AST {
     match type_ref {
         TypeReference::NonNull(of_type) => transform_non_nullable_input_type(
@@ -2518,13 +2522,21 @@ pub(crate) fn transform_input_type(
             encountered_enums,
             custom_scalars,
         ),
-        _ => AST::Nullable(Box::new(transform_non_nullable_input_type(
-            typegen_context,
-            type_ref,
-            input_object_types,
-            encountered_enums,
-            custom_scalars,
-        ))),
+        _ => {
+            let ast = Box::new(transform_non_nullable_input_type(
+                typegen_context,
+                type_ref,
+                input_object_types,
+                encountered_enums,
+                custom_scalars,
+            ));
+
+            return if should_output_optional {
+                AST::Optional(ast)
+            } else {
+                AST::Nullable(ast)
+            };
+        }
     }
 }
 
@@ -2549,6 +2561,7 @@ pub(crate) fn get_input_variables_type<'a>(
                         input_object_types,
                         encountered_enums,
                         custom_scalars,
+                        false,
                     ),
                 })
             })

compiler/crates/relay-typegen/src/write.rs

@@ -842,6 +842,7 @@ fn generate_provided_variables_type(
                 input_object_types,
                 encountered_enums,
                 custom_scalars,
+                false,
             )));
             let provider_module = Prop::KeyValuePair(KeyValuePairProp {
                 key: "get".intern(),

compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-live-resolver-with-field-args-no-fragment.expected

@@ -25,7 +25,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 // A type error here indicates that the type signature of the resolver module is incorrect.
 (userPopStarNameResolverType: (
   args: {|
-    count: number | null,
+    count: ?number,
     greeting: string,
   |},
 ) => LiveState<?mixed>);

compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-live-resolver-with-field-args.expected

@@ -28,7 +28,7 @@ import userPopStarNameResolverType from "PopStarNameResolver";
 (userPopStarNameResolverType: (
   rootKey: relayResolver_PopStarNameResolverFragment_name$key,
   args: {|
-    count: number | null,
+    count: ?number,
     greeting: string,
   |},
 ) => LiveState<?mixed>);