Undo changes to variables

Author: tobias-tengler

compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/custom_scalar_variable_default_arg_non_strict.expected

@@ -44,7 +44,7 @@ extend type Query {
 ==================================== OUTPUT ===================================
 //- __generated__/fooCustomScalarLiteralArgQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<1637ce7cbd0ba6ee3c528ef86ee61d09>>
+ * <auto-generated> SignedSource<<3aa552e7fbe1065708942cd7012d713e>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -57,8 +57,8 @@ extend type Query {
 /*::
 import type { ClientRequest, ClientQuery } from 'relay-runtime';
 export type fooCustomScalarLiteralArgQuery$variables = {|
-  arg?: any | null,
-  arg_server?: any | null,
+  arg?: ?any,
+  arg_server?: ?any,
 |};
 export type fooCustomScalarLiteralArgQuery$data = {|
   +extension_field: ?{|

compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/prefetchable_refetchable_pagination.expected

@@ -61,7 +61,7 @@ type Page {
 ==================================== OUTPUT ===================================
 //- __generated__/RefetchableFragmentQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<609d2c8a7985b58c3ee779c39d147a80>>
+ * <auto-generated> SignedSource<<f564f1dfa61d152d3e7b6df1d206d243>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -76,8 +76,8 @@ import type { ConcreteRequest, Query } from 'relay-runtime';
 import type { FragmentType } from "relay-runtime";
 import type { foo$fragmentType } from "foo.graphql";
 export type RefetchableFragmentQuery$variables = {|
-  count?: number | null,
-  cursor?: string | null,
+  count?: ?number,
+  cursor?: ?string,
 |};
 export type RefetchableFragmentQuery$data = {|
   +viewer: ?{|
@@ -427,7 +427,7 @@ export default ((node/*: any*/)/*: PrefetchableRefetchableFragment<
 
 //- __generated__/fooQuery.graphql.js
 /**
- * <auto-generated> SignedSource<<4505ac4727019dd25452a16cd29ac487>>
+ * <auto-generated> SignedSource<<0692b813f39e023e6ae14977764bd0af>>
  * @flow
  * @lightSyntaxTransform
  * @nogrep
@@ -441,8 +441,8 @@ export default ((node/*: any*/)/*: PrefetchableRefetchableFragment<
 import type { ConcreteRequest, Query } from 'relay-runtime';
 import type { foo$fragmentType } from "foo.graphql";
 export type fooQuery$variables = {|
-  count?: number | null,
-  cursor?: string | null,
+  count?: ?number,
+  cursor?: ?string,
 |};
 export type fooQuery$data = {|
   +me: ?{|

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

@@ -557,7 +557,6 @@ fn get_resolver_arguments(
                 input_object_types,
                 encountered_enums,
                 custom_scalars,
-                true,
             ),
         }));
     }
@@ -2449,7 +2448,6 @@ fn transform_non_nullable_input_type(
             input_object_types,
             encountered_enums,
             custom_scalars,
-            false,
         ))),
         TypeReference::Named(named_type) => match named_type {
             Type::Scalar(scalar) => {
@@ -2485,7 +2483,6 @@ fn transform_non_nullable_input_type(
                                         input_object_types,
                                         encountered_enums,
                                         custom_scalars,
-                                        false,
                                     ),
                                 })
                             })
@@ -2512,7 +2509,6 @@ 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(
@@ -2522,21 +2518,13 @@ pub(crate) fn transform_input_type(
             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)
-            };
-        }
+        _ => AST::Optional(Box::new(transform_non_nullable_input_type(
+            typegen_context,
+            type_ref,
+            input_object_types,
+            encountered_enums,
+            custom_scalars,
+        ))),
     }
 }
 
@@ -2561,7 +2549,6 @@ pub(crate) fn get_input_variables_type<'a>(
                         input_object_types,
                         encountered_enums,
                         custom_scalars,
-                        false,
                     ),
                 })
             })

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

@@ -842,7 +842,6 @@ 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/custom-scalar-type-import.expected

@@ -13,7 +13,7 @@ query Viewer($params: JSON) {
 ==================================== OUTPUT ===================================
 import type { JSON } from "TypeDefsFile";
 export type Viewer$variables = {|
-  params?: JSON | null,
+  params?: ?JSON,
 |};
 export type Viewer$data = {|
   +viewer: ?{|

compiler/crates/relay-typegen/tests/generate_flow/fixtures/default-input.expected

@@ -8,11 +8,11 @@ mutation feedbackUnLikeMutation($input: FeedbackUnLikeInput) {
 }
 ==================================== OUTPUT ===================================
 export type FeedbackUnLikeInput = {|
-  feedbackId?: string | null,
+  feedbackId?: ?string,
   silent?: CustomBoolean,
 |};
 export type feedbackUnLikeMutation$variables = {|
-  input?: FeedbackUnLikeInput | null,
+  input?: ?FeedbackUnLikeInput,
 |};
 export type feedbackUnLikeMutation$data = {|
   +feedbackUnLike: ?{|

compiler/crates/relay-typegen/tests/generate_flow/fixtures/mutation-input-has-array.expected

@@ -8,10 +8,10 @@ mutation InputHasArray($input: UpdateAllSeenStateInput) @raw_response_type {
 }
 ==================================== OUTPUT ===================================
 export type UpdateAllSeenStateInput = {|
-  storyIds?: $ReadOnlyArray<string | null> | null,
+  storyIds?: ?$ReadOnlyArray<?string>,
 |};
 export type InputHasArray$variables = {|
-  input?: UpdateAllSeenStateInput | null,
+  input?: ?UpdateAllSeenStateInput,
 |};
 export type InputHasArray$data = {|
   +viewerNotificationsUpdateAllSeenState: ?{|

compiler/crates/relay-typegen/tests/generate_flow/fixtures/mutation-with-client-extension.expected

@@ -20,10 +20,10 @@ type Foo {
 }
 ==================================== OUTPUT ===================================
 export type UpdateAllSeenStateInput = {|
-  storyIds?: $ReadOnlyArray<string | null> | null,
+  storyIds?: ?$ReadOnlyArray<?string>,
 |};
 export type Test$variables = {|
-  input?: UpdateAllSeenStateInput | null,
+  input?: ?UpdateAllSeenStateInput,
 |};
 export type Test$data = {|
   +viewerNotificationsUpdateAllSeenState: ?{|

compiler/crates/relay-typegen/tests/generate_flow/fixtures/mutation-with-enums-on-fragment.expected

@@ -31,19 +31,19 @@ import type { FriendFragment$fragmentType } from "FriendFragment.graphql";
 export type TestEnums = "mark" | "zuck" | "%future added value";
 export type CommentCreateInput = {|
   client_mutation_id: string,
-  feedback?: CommentfeedbackFeedback | null,
-  feedbackId?: string | null,
+  feedback?: ?CommentfeedbackFeedback,
+  feedbackId?: ?string,
 |};
 export type CommentfeedbackFeedback = {|
-  comment?: FeedbackcommentComment | null,
+  comment?: ?FeedbackcommentComment,
 |};
 export type FeedbackcommentComment = {|
-  feedback?: CommentfeedbackFeedback | null,
+  feedback?: ?CommentfeedbackFeedback,
 |};
 export type CommentCreateMutation$variables = {|
-  first?: number | null,
+  first?: ?number,
   input: CommentCreateInput,
-  orderBy?: $ReadOnlyArray<string> | null,
+  orderBy?: ?$ReadOnlyArray<string>,
 |};
 export type CommentCreateMutation$data = {|
   +commentCreate: ?{|

compiler/crates/relay-typegen/tests/generate_flow/fixtures/mutation-with-nested-fragments.expected

@@ -34,19 +34,19 @@ fragment FeedbackFragment on Feedback {
 import type { FriendFragment$fragmentType } from "FriendFragment.graphql";
 export type CommentCreateInput = {|
   client_mutation_id: string,
-  feedback?: CommentfeedbackFeedback | null,
-  feedbackId?: string | null,
+  feedback?: ?CommentfeedbackFeedback,
+  feedbackId?: ?string,
 |};
 export type CommentfeedbackFeedback = {|
-  comment?: FeedbackcommentComment | null,
+  comment?: ?FeedbackcommentComment,
 |};
 export type FeedbackcommentComment = {|
-  feedback?: CommentfeedbackFeedback | null,
+  feedback?: ?CommentfeedbackFeedback,
 |};
 export type CommentCreateMutation$variables = {|
-  first?: number | null,
+  first?: ?number,
   input: CommentCreateInput,
-  orderBy?: $ReadOnlyArray<string> | null,
+  orderBy?: ?$ReadOnlyArray<string>,
 |};
 export type CommentCreateMutation$data = {|
   +commentCreate: ?{|