Skip to content

Commit 088cabb

Browse files
committed
fixup! fix: generate typescript types for healthcheck
1 parent ae97adf commit 088cabb

File tree

6 files changed

+19
-22
lines changed

6 files changed

+19
-22
lines changed

coderd/apidoc/docs.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/apidoc/swagger.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/api/debug.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/api/schemas.md

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/apitypings/main.go

+5-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ func main() {
3939
log.Fatal(ctx, err.Error())
4040
}
4141

42-
log.Info(ctx, "just generated", slog.F("basedir", baseDir))
4342
// Just cat the output to a file to capture it
4443
_, _ = fmt.Println(output)
4544
}
@@ -287,6 +286,7 @@ type Maps struct {
287286
AllowedTypes map[string]struct{}
288287
}
289288

289+
// objName prepends the package name of a type if it is outside of codersdk.
290290
func objName(obj types.Object) string {
291291
if pkgName := obj.Pkg().Name(); pkgName != "codersdk" {
292292
return cases.Title(language.English).String(pkgName) + obj.Name()
@@ -367,7 +367,7 @@ func (g *Generator) generateOne(m *Maps, obj types.Object) error {
367367
})
368368
}
369369

370-
block, err := g.buildUnion(m, obj, union)
370+
block, err := g.buildUnion(obj, union)
371371
if err != nil {
372372
return xerrors.Errorf("generate union %q: %w", objName, err)
373373
}
@@ -400,11 +400,11 @@ func (g *Generator) generateOne(m *Maps, obj types.Object) error {
400400
func (g *Generator) posLine(obj types.Object) string {
401401
file := g.pkg.Fset.File(obj.Pos())
402402
// Do not use filepath, as that changes behavior based on OS
403-
return fmt.Sprintf("// From %s\n", path.Join("codersdk", filepath.Base(file.Name())))
403+
return fmt.Sprintf("// From %s\n", path.Join(obj.Pkg().Name(), filepath.Base(file.Name())))
404404
}
405405

406406
// buildStruct just prints the typescript def for a type.
407-
func (g *Generator) buildUnion(m *Maps, obj types.Object, st *types.Union) (string, error) {
407+
func (g *Generator) buildUnion(obj types.Object, st *types.Union) (string, error) {
408408
var s strings.Builder
409409
_, _ = s.WriteString(g.posLine(obj))
410410

@@ -784,10 +784,7 @@ func (g *Generator) typescriptType(ty types.Type) (TypescriptType, error) {
784784
// Then see if the type is defined elsewhere. If it is, we can just
785785
// put the objName as it will be defined in the typescript codeblock
786786
// we generate.
787-
objName := n.Obj().Name()
788-
if pkgName := n.Obj().Pkg().Name(); pkgName != "codersdk" {
789-
objName = cases.Title(language.English).String(pkgName) + objName
790-
}
787+
objName := objName(n.Obj())
791788
genericName := ""
792789
genericTypes := make(map[string]string)
793790
if obj := g.pkg.Types.Scope().Lookup(n.Obj().Name()); obj != nil {

site/src/api/typesGenerated.ts

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)