Make typescript output optional fields for the never types

strawberry-graphql · Oct 2, 2024 · 4e57fbd · 4e57fbd
1 parent 5834355
commit 4e57fbd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/strawberry/codegen/plugins/typescript.py b/strawberry/codegen/plugins/typescript.py
@@ -111,12 +111,12 @@ def _print_oneof_object_type(self, type_: GraphQLObjectType) -> str:
                     field_row = self._print_oneof_field(field)
                 else:
                     # ... and the rest set to `never` to prevent multiple from being set
-                    field_row = f"{field.name}: never"
-                option_fields.append(textwrap.indent(field_row, " " * 4))
-            options.append("{\n" + ",\n".join(option_fields) + "\n}")
+                    field_row = f"{field.name}?: never"
+                option_fields.append(field_row)
+            options.append("{ " + ", ".join(option_fields) + " }")
 
         # Union all the options together
-        all_options = " | ".join(options)
+        all_options = "\n    | ".join(options)
 
         return f"type {type_.name} = {all_options}"
 

diff --git a/tests/codegen/snapshots/typescript/oneof.ts b/tests/codegen/snapshots/typescript/oneof.ts
@@ -2,13 +2,8 @@ type OneOfTestResult = {
     one_of: string
 }
 
-type OneOfInput = {
-    a: string,
-    b: never
-} | {
-    a: never,
-    b: string
-}
+type OneOfInput = { a: string, b?: never }
+    | { a?: never, b: string }
 
 type OneOfTestVariables = {
     value: OneOfInput

diff --git a/tests/codegen/snapshots/typescript/oneof_typename.ts b/tests/codegen/snapshots/typescript/oneof_typename.ts
@@ -8,13 +8,8 @@ type OneOfTypenameTestResult = {
     alias: OneOfTypenameTestResultOneOfTypenamePerson
 }
 
-type OneOfInput = {
-    a: string,
-    b: never
-} | {
-    a: never,
-    b: string
-}
+type OneOfInput = { a: string, b?: never }
+    | { a?: never, b: string }
 
 type OneOfTypenameTestVariables = {
     value: OneOfInput