Replace void with undefined for TypeScript parameters

facebook · Jul 17, 2023 · 10f87a7 · 10f87a7
1 parent 2724a11
commit 10f87a7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/compiler/crates/relay-typegen/src/visit.rs b/compiler/crates/relay-typegen/src/visit.rs
@@ -1543,7 +1543,14 @@ fn make_prop(
                     if linked_field.node_type.is_list() {
                         AST::RawType(intern!("[]"))
                     } else {
-                        AST::RawType(intern!("null | void"))
+                        let typegen_language =
+                            typegen_context.project_config.typegen_config.language;
+
+                        if typegen_language == TypegenLanguage::TypeScript {
+                            AST::RawType(intern!("null | undefined"))
+                        } else {
+                            AST::RawType(intern!("null | void"))
+                        }
                     }
                 } else {
                     let setter_parameter = AST::Union(

diff --git a/...ests/generate_typescript/fixtures/updatable-operation-assignable-fragment-plural.expected b/...ests/generate_typescript/fixtures/updatable-operation-assignable-fragment-plural.expected
@@ -30,7 +30,7 @@ export type UpdatableQuery$data = {
     // value in case none of the concrete values match.
     readonly __typename: "%other";
   } | null;
-  set node(value: null | void);
+  set node(value: null | undefined);
 };
 export type UpdatableQuery = {
   response: UpdatableQuery$data;

diff --git a/...te_typescript/fixtures/updatable-operation-assignable-fragments-within-narrowing.expected b/...te_typescript/fixtures/updatable-operation-assignable-fragments-within-narrowing.expected
@@ -45,7 +45,7 @@ export type UpdatableQuery$data = {
       readonly " $fragmentSpreads": "Assignable_user";
     } | null);
   } | null;
-  set me(value: null | void);
+  set me(value: null | undefined);
 };
 export type UpdatableQuery = {
   response: UpdatableQuery$data;

diff --git a/...s/generate_typescript/fixtures/updatable-operation-multiple-assignable-fragments.expected b/...s/generate_typescript/fixtures/updatable-operation-multiple-assignable-fragments.expected
@@ -36,7 +36,7 @@ export type UpdatableQuery$data = {
       readonly " $fragmentSpreads": "Assignable_node";
     } | null);
   } | null;
-  set me(value: null | void);
+  set me(value: null | undefined);
 };
 export type UpdatableQuery = {
   response: UpdatableQuery$data;

diff --git a/...ay-typegen/tests/generate_typescript/fixtures/updatable-operation-special-fields.expected b/...ay-typegen/tests/generate_typescript/fixtures/updatable-operation-special-fields.expected
@@ -20,7 +20,7 @@ export type UpdatableQuery$data = {
     readonly aliased_typename: "User";
     readonly id: string;
   } | null;
-  set me(value: null | void);
+  set me(value: null | undefined);
 };
 export type UpdatableQuery = {
   response: UpdatableQuery$data;

diff --git a/...y-typegen/tests/generate_typescript/fixtures/updatable-operation-type-refinement.expected b/...y-typegen/tests/generate_typescript/fixtures/updatable-operation-type-refinement.expected
@@ -26,13 +26,13 @@ export type UpdatableQuery$data = {
     get address(): {
       city: string | null;
     } | null;
-    set address(value: null | void);
+    set address(value: null | undefined);
   } | {
     // This will never be '%other', but we need some
     // value in case none of the concrete values match.
     readonly __typename: "%other";
   } | null;
-  set maybeNodeInterface(value: null | void);
+  set maybeNodeInterface(value: null | undefined);
 };
 export type UpdatableQuery = {
   response: UpdatableQuery$data;

diff --git a/...iler/crates/relay-typegen/tests/generate_typescript/fixtures/updatable-operation.expected b/...iler/crates/relay-typegen/tests/generate_typescript/fixtures/updatable-operation.expected
@@ -12,7 +12,7 @@ export type UpdatableQuery$data = {
     actorCount: number | null;
     name: string | null;
   } | null;
-  set me(value: null | void);
+  set me(value: null | undefined);
 };
 export type UpdatableQuery = {
   response: UpdatableQuery$data;