Merge pull request #37 from foomo/fix/ts-scalar-union-definition

fix: change scalar union type rendering
foomo · Jul 17, 2023 · 31ed425 · 31ed425
2 parents 1837e9b + e46893a
commit 31ed425
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/typescript.go b/typescript.go
@@ -174,14 +174,23 @@ func renderTypescriptStruct(str *Struct, mappings config.TypeScriptMappings, sca
 			}
 			ts.nl()
 		case str.UnionFields[0].Value.Scalar != nil:
+			ts.app("export const " + str.Name + " = ")
+			ts.app("{ ")
+			for i, field := range str.UnionFields {
+				if i > 0 {
+					ts.app(", ")
+				}
+				ts.app("...")
+				field.Value.tsType(mappings, scalars, structs, ts, &JSONInfo{OmitEmpty: true})
+			}
+			ts.app(" }")
+			ts.nl()
 			ts.app("export type " + str.Name + " = ")
 			for i, field := range str.UnionFields {
 				if i > 0 {
-					ts.app(" & ")
+					ts.app(" | ")
 				}
-				ts.app("(typeof ")
 				field.Value.tsType(mappings, scalars, structs, ts, &JSONInfo{OmitEmpty: true})
-				ts.app(")")
 			}
 			ts.nl()
 		default: