coder
diff --git a/‎coderd/apidoc/docs.go
+6-14 b/‎coderd/apidoc/docs.go
+6-14
diff --git a/‎coderd/apidoc/swagger.json
+6-14 b/‎coderd/apidoc/swagger.json
+6-14
diff --git a/‎coderd/healthcheck/websocket.go
+7-13 b/‎coderd/healthcheck/websocket.go
+7-13
diff --git a/‎coderd/healthcheck/websocket_test.go
+2-2 b/‎coderd/healthcheck/websocket_test.go
+2-2
diff --git a/‎docs/api/debug.md
+3-5 b/‎docs/api/debug.md
+3-5
diff --git a/‎docs/api/schemas.md
+12-31 b/‎docs/api/schemas.md
+12-31
diff --git a/‎go.mod
+1-1 b/‎go.mod
+1-1
diff --git a/‎scripts/apitypings/main.go
+9-3 b/‎scripts/apitypings/main.go
+9-3
diff --git a/‎site/src/api/typesGenerated.ts
+5-9 b/‎site/src/api/typesGenerated.ts
+5-9
@@ -21,14 +21,10 @@ type WebsocketReportOptions struct {
 
 // @typescript-generate WebsocketReport
 type WebsocketReport struct {
-	Healthy  bool              `json:"healthy"`
-	Response WebsocketResponse `json:"response"`
-	Error    *string           `json:"error"`
-}
-
-type WebsocketResponse struct {
-	Body string `json:"body"`
-	Code int    `json:"code"`
+	Healthy bool    `json:"healthy"`
+	Body    string  `json:"body"`
+	Code    int     `json:"code"`
+	Error   *string `json:"error"`
 }
 
 func (r *WebsocketReport) Run(ctx context.Context, opts *WebsocketReportOptions) {
@@ -60,10 +56,8 @@ func (r *WebsocketReport) Run(ctx context.Context, opts *WebsocketReportOptions)
 			}
 		}
 
-		r.Response = WebsocketResponse{
-			Body: body,
-			Code: res.StatusCode,
-		}
+		r.Body = body
+		r.Code = res.StatusCode
 	}
 	if err != nil {
 		r.Error = convertError(xerrors.Errorf("websocket dial: %w", err))
@@ -116,7 +110,7 @@ func (s *WebsocketEchoServer) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 	c, err := websocket.Accept(rw, r, &websocket.AcceptOptions{})
 	if err != nil {
 		rw.WriteHeader(http.StatusBadRequest)
-		rw.Write([]byte(fmt.Sprint("unable to accept:", err)))
+		_, _ = rw.Write([]byte(fmt.Sprint("unable to accept:", err)))
 		return
 	}
 	defer c.Close(websocket.StatusGoingAway, "goodbye")
 
@@ -63,7 +63,7 @@ func TestWebsocket(t *testing.T) {
 		})
 
 		require.NotNil(t, wsReport.Error)
-		assert.Equal(t, wsReport.Response.Body, "test error")
-		assert.Equal(t, wsReport.Response.Code, http.StatusBadRequest)
+		assert.Equal(t, wsReport.Body, "test error")
+		assert.Equal(t, wsReport.Code, http.StatusBadRequest)
 	})
 }
@@ -356,7 +356,7 @@ require (
 	go.opentelemetry.io/otel/metric v1.16.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
 	go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/text v0.11.0
 	golang.org/x/time v0.3.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde // indirect
 
@@ -492,6 +492,10 @@ func (g *Generator) buildStruct(obj types.Object, st *types.Struct) (string, err
 			panic("invalid struct tags on type " + obj.String())
 		}
 
+		if !field.Exported() {
+			continue
+		}
+
 		// Use the json name if present
 		jsonTag, err := tags.Get("json")
 		var (
@@ -692,11 +696,12 @@ func (g *Generator) typescriptType(ty types.Type) (TypescriptType, error) {
 		}, nil
 	case *types.Map:
 		// map[string][string] -> Record<string, string>
-		keyType, err := g.typescriptType(ty.Key())
+		m := ty
+		keyType, err := g.typescriptType(m.Key())
 		if err != nil {
 			return TypescriptType{}, xerrors.Errorf("map key: %w", err)
 		}
-		valueType, err := g.typescriptType(ty.Elem())
+		valueType, err := g.typescriptType(m.Elem())
 		if err != nil {
 			return TypescriptType{}, xerrors.Errorf("map key: %w", err)
 		}
@@ -787,7 +792,8 @@ func (g *Generator) typescriptType(ty types.Type) (TypescriptType, error) {
 		objName := objName(n.Obj())
 		genericName := ""
 		genericTypes := make(map[string]string)
-		if obj := g.pkg.Types.Scope().Lookup(n.Obj().Name()); obj != nil {
+		pkgName := n.Obj().Pkg().Name()
+		if obj := g.pkg.Types.Scope().Lookup(n.Obj().Name()); g.pkg.Name == pkgName && obj != nil {
 			// Sweet! Using other typescript types as fields. This could be an
 			// enum or another struct
 			if args := n.TypeArgs(); args != nil && args.Len() > 0 {
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func TestWebsocket(t *testing.T) {`
`63`	`63`	`})`
`64`	`64`
`65`	`65`	`require.NotNil(t, wsReport.Error)`
`66`		`- assert.Equal(t, wsReport.Response.Body, "test error")`
`67`		`- assert.Equal(t, wsReport.Response.Code, http.StatusBadRequest)`
	`66`	`+ assert.Equal(t, wsReport.Body, "test error")`
	`67`	`+ assert.Equal(t, wsReport.Code, http.StatusBadRequest)`
`68`	`68`	`})`
`69`	`69`	`}`