mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
chore: fixup typegen for preview types (#17339)
Preview types override the json marshal behavior.
This commit is contained in:
@@ -32,10 +32,9 @@ func main() {
|
||||
// Serpent has some types referenced in the codersdk.
|
||||
// We want the referenced types generated.
|
||||
referencePackages := map[string]string{
|
||||
"github.com/coder/preview": "",
|
||||
"github.com/coder/serpent": "Serpent",
|
||||
"github.com/hashicorp/hcl/v2": "Hcl",
|
||||
"tailscale.com/derp": "",
|
||||
"github.com/coder/preview/types": "Preview",
|
||||
"github.com/coder/serpent": "Serpent",
|
||||
"tailscale.com/derp": "",
|
||||
// Conflicting name "DERPRegion"
|
||||
"tailscale.com/tailcfg": "Tail",
|
||||
"tailscale.com/net/netcheck": "Netcheck",
|
||||
@@ -90,8 +89,22 @@ func TypeMappings(gen *guts.GoParser) error {
|
||||
gen.IncludeCustomDeclaration(map[string]guts.TypeOverride{
|
||||
"github.com/coder/coder/v2/codersdk.NullTime": config.OverrideNullable(config.OverrideLiteral(bindings.KeywordString)),
|
||||
// opt.Bool can return 'null' if unset
|
||||
"tailscale.com/types/opt.Bool": config.OverrideNullable(config.OverrideLiteral(bindings.KeywordBoolean)),
|
||||
"github.com/hashicorp/hcl/v2.Expression": config.OverrideLiteral(bindings.KeywordUnknown),
|
||||
"tailscale.com/types/opt.Bool": config.OverrideNullable(config.OverrideLiteral(bindings.KeywordBoolean)),
|
||||
// hcl diagnostics should be cast to `preview.FriendlyDiagnostic`
|
||||
"github.com/hashicorp/hcl/v2.Diagnostic": func() bindings.ExpressionType {
|
||||
return bindings.Reference(bindings.Identifier{
|
||||
Name: "FriendlyDiagnostic",
|
||||
Package: nil,
|
||||
Prefix: "",
|
||||
})
|
||||
},
|
||||
"github.com/coder/preview/types.HCLString": func() bindings.ExpressionType {
|
||||
return bindings.Reference(bindings.Identifier{
|
||||
Name: "NullHCLString",
|
||||
Package: nil,
|
||||
Prefix: "",
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
err := gen.IncludeCustom(map[string]string{
|
||||
|
||||
Reference in New Issue
Block a user