Support clibase.struct

Emyrk · Emyrk · commit 02237b763478 · 2023-09-11T15:48:51.000-05:00
diff --git a/scripts/apitypings/main.go b/scripts/apitypings/main.go
@@ -830,6 +830,11 @@ func (g *Generator) typescriptType(ty types.Type) (TypescriptType, error) {
 		// We would need to add more logic to determine this, but for now
 		// just hard code them.
 		switch n.String() {
+		case "github.com/coder/coder/v2/cli/clibase.HostPort":
+			// Custom marshal json to be a string
+			return TypescriptType{ValueType: "string"}, nil
+		case "github.com/coder/coder/v2/cli/clibase.StringArray":
+			return TypescriptType{ValueType: "string[]"}, nil
 		case "github.com/coder/coder/v2/cli/clibase.String":
 			return TypescriptType{ValueType: "string"}, nil
 		case "github.com/coder/coder/v2/cli/clibase.YAMLConfigPath":
@@ -863,6 +868,17 @@ func (g *Generator) typescriptType(ty types.Type) (TypescriptType, error) {
 			return TypescriptType{ValueType: "string"}, nil
 		}
 
+		// Some hard codes are a bit trickier.
+		switch {
+		// Struct is a generic, so the type has generic constraints in the string.
+		case regexp.MustCompile(`github.com/coder/coder/v2/cli/clibase.Struct\[.*\]`).MatchString(n.String()):
+			// The marshal json just marshals the underlying value.
+			str, ok := ty.Underlying().(*types.Struct)
+			if ok {
+				return g.typescriptType(str.Field(0).Type())
+			}
+		}
+
 		// Then see if the type is defined elsewhere. If it is, we can just
 		// put the objName as it will be defined in the typescript codeblock
 		// we generate.
