Do not add ? to export type

Emyrk · Emyrk · commit 481e498e6c6a · 2022-10-19T17:39:43.000-05:00
diff --git a/scripts/apitypings/main.go b/scripts/apitypings/main.go
@@ -312,12 +312,11 @@ func (g *Generator) buildUnion(obj types.Object, st *types.Union) (string, error
 		optional = optional || scriptType.Optional
 	}
 
-	qMark := ""
 	if optional {
-		qMark = "?"
+		allTypes = append(allTypes, "null")
 	}
 
-	s.WriteString(fmt.Sprintf("export type %s%s = %s\n", obj.Name(), qMark, strings.Join(allTypes, " | ")))
+	s.WriteString(fmt.Sprintf("export type %s = %s\n", obj.Name(), strings.Join(allTypes, " | ")))
 
 	return s.String(), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -312,12 +312,11 @@ func (g Generator) buildUnion(obj types.Object, st types.Union) (string, error`
`312`	`312`	`optional = optional \|\| scriptType.Optional`
`313`	`313`	`}`
`314`	`314`
`315`		`- qMark := ""`
`316`	`315`	`if optional {`
`317`		`- qMark = "?"`
	`316`	`+ allTypes = append(allTypes, "null")`
`318`	`317`	`}`
`319`	`318`
`320`		`- s.WriteString(fmt.Sprintf("export type %s%s = %s\n", obj.Name(), qMark, strings.Join(allTypes, " \| ")))`
	`319`	`+ s.WriteString(fmt.Sprintf("export type %s = %s\n", obj.Name(), strings.Join(allTypes, " \| ")))`
`321`	`320`
`322`	`321`	`return s.String(), nil`
`323`	`322`	`}`