* feat: add color to debug (#2433)

* fix header and path type ts gen

Co-authored-by: chen quan <chenquan.dev@gmail.com>
This commit is contained in:
bensonfx
2022-09-24 22:28:25 +08:00
committed by GitHub
parent 111e626a73
commit e7acadb15d
3 changed files with 153 additions and 26 deletions

View File

@@ -11,6 +11,12 @@ import (
"github.com/zeromicro/go-zero/tools/goctl/util"
)
const (
formTagKey = "form"
pathTagKey = "path"
headerTagKey = "header"
)
func writeProperty(writer io.Writer, member spec.Member, indent int) error {
writeIndent(writer, indent)
ty, err := goTypeToTs(member.Type, false)
@@ -129,13 +135,21 @@ func genParamsTypesIfNeed(writer io.Writer, tp spec.Type) error {
if len(members) == 0 {
return nil
}
fmt.Fprintf(writer, "\n")
fmt.Fprintf(writer, "export interface %sParams {\n", util.Title(tp.Name()))
if err := writeMembers(writer, tp, true); err != nil {
if err := writeTagMembers(writer, tp, formTagKey); err != nil {
return err
}
fmt.Fprintf(writer, "}\n")
if len(definedType.GetTagMembers(headerTagKey)) > 0 {
fmt.Fprintf(writer, "export interface %sHeaders {\n", util.Title(tp.Name()))
if err := writeTagMembers(writer, tp, headerTagKey); err != nil {
return err
}
fmt.Fprintf(writer, "}\n")
}
return nil
}
@@ -168,3 +182,30 @@ func writeMembers(writer io.Writer, tp spec.Type, isParam bool) error {
}
return nil
}
func writeTagMembers(writer io.Writer, tp spec.Type, tagKey string) error {
definedType, ok := tp.(spec.DefineStruct)
if !ok {
pointType, ok := tp.(spec.PointerType)
if ok {
return writeTagMembers(writer, pointType.Type, tagKey)
}
return fmt.Errorf("type %s not supported", tp.Name())
}
members := definedType.GetTagMembers(tagKey)
for _, member := range members {
if member.IsInline {
if err := writeTagMembers(writer, member.Type, tagKey); err != nil {
return err
}
continue
}
if err := writeProperty(writer, member, 1); err != nil {
return apiutil.WrapErr(err, " type "+tp.Name())
}
}
return nil
}