feature: refactor api parse to g4 (#365)
* feature: refactor api parse to g4 * new g4 parser * add CHANGE_LOG.MD * refactor * fix byte bug * refactor * optimized * optimized * revert * update readme.md * update readme.md * update readme.md * update readme.md * remove no need * fix java gen * add upgrade * resolve confilits Co-authored-by: anqiansong <anqiansong@xiaoheiban.cn>
This commit is contained in:
kingxt
GitHub
@@ -1,6 +1,7 @@
|
||||
package tsgen
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
@@ -10,9 +11,9 @@ import (
|
||||
"github.com/tal-tech/go-zero/tools/goctl/util"
|
||||
)
|
||||
|
||||
func writeProperty(writer io.Writer, member spec.Member, indent int, prefixForType func(string) string) error {
|
||||
func writeProperty(writer io.Writer, member spec.Member, indent int) error {
|
||||
writeIndent(writer, indent)
|
||||
ty, err := goTypeToTs(member.Type, prefixForType)
|
||||
ty, err := goTypeToTs(member.Type, false)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -45,68 +46,56 @@ func writeIndent(writer io.Writer, indent int) {
|
||||
}
|
||||
}
|
||||
|
||||
func goTypeToTs(tp string, prefixForType func(string) string) (string, error) {
|
||||
if val, pri := primitiveType(tp); pri {
|
||||
return val, nil
|
||||
func goTypeToTs(tp spec.Type, fromPacket bool) (string, error) {
|
||||
switch v := tp.(type) {
|
||||
case spec.DefineStruct:
|
||||
return addPrefix(tp, fromPacket), nil
|
||||
case spec.PrimitiveType:
|
||||
r, ok := primitiveType(tp.Name())
|
||||
if !ok {
|
||||
return "", errors.New("unsupported primitive type " + tp.Name())
|
||||
}
|
||||
|
||||
return r, nil
|
||||
case spec.MapType:
|
||||
valueType, err := goTypeToTs(v.Value, fromPacket)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return fmt.Sprintf("{ [key: string]: %s }", valueType), nil
|
||||
case spec.ArrayType:
|
||||
if tp.Name() == "[]byte" {
|
||||
return "Blob", nil
|
||||
}
|
||||
|
||||
valueType, err := goTypeToTs(v.Value, fromPacket)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return fmt.Sprintf("Array<%s>", valueType), nil
|
||||
case spec.InterfaceType:
|
||||
return "any", nil
|
||||
case spec.PointerType:
|
||||
return goTypeToTs(v.Type, fromPacket)
|
||||
}
|
||||
if tp == "[]byte" {
|
||||
return "Blob", nil
|
||||
} else if strings.HasPrefix(tp, "[][]") {
|
||||
tys, err := apiutil.DecomposeType(tp)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if len(tys) == 0 {
|
||||
return "", fmt.Errorf("%s tp parse error", tp)
|
||||
}
|
||||
innerType, err := goTypeToTs(tys[0], prefixForType)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return fmt.Sprintf("Array<Array<%s>>", innerType), nil
|
||||
} else if strings.HasPrefix(tp, "[]") {
|
||||
tys, err := apiutil.DecomposeType(tp)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if len(tys) == 0 {
|
||||
return "", fmt.Errorf("%s tp parse error", tp)
|
||||
}
|
||||
innerType, err := goTypeToTs(tys[0], prefixForType)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return fmt.Sprintf("Array<%s>", innerType), nil
|
||||
} else if strings.HasPrefix(tp, "map") {
|
||||
tys, err := apiutil.DecomposeType(tp)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if len(tys) != 2 {
|
||||
return "", fmt.Errorf("%s tp parse error", tp)
|
||||
}
|
||||
innerType, err := goTypeToTs(tys[1], prefixForType)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return fmt.Sprintf("{ [key: string]: %s }", innerType), nil
|
||||
}
|
||||
return addPrefixIfNeed(util.Title(tp), prefixForType), nil
|
||||
|
||||
return "", errors.New("unsupported type " + tp.Name())
|
||||
}
|
||||
|
||||
func addPrefixIfNeed(tp string, prefixForType func(string) string) string {
|
||||
if val, pri := primitiveType(tp); pri {
|
||||
return val
|
||||
func addPrefix(tp spec.Type, fromPacket bool) string {
|
||||
if fromPacket {
|
||||
return packagePrefix + util.Title(tp.Name())
|
||||
}
|
||||
tp = strings.Replace(tp, "*", "", 1)
|
||||
return prefixForType(tp) + util.Title(tp)
|
||||
return util.Title(tp.Name())
|
||||
}
|
||||
|
||||
func primitiveType(tp string) (string, bool) {
|
||||
switch tp {
|
||||
case "string":
|
||||
return "string", true
|
||||
case "int", "int8", "int32", "int64":
|
||||
case "int", "int8", "int32", "int64", "uint", "uint8", "uint16", "uint32", "uint64":
|
||||
return "number", true
|
||||
case "float", "float32", "float64":
|
||||
return "number", true
|
||||
@@ -120,52 +109,56 @@ func primitiveType(tp string) (string, bool) {
|
||||
return "", false
|
||||
}
|
||||
|
||||
func writeType(writer io.Writer, tp spec.Type, inlineType func(string) (*spec.Type, error), prefixForType func(string) string) error {
|
||||
fmt.Fprintf(writer, "export interface %s {\n", util.Title(tp.Name))
|
||||
if err := genMembers(writer, tp, false, inlineType, prefixForType); err != nil {
|
||||
func writeType(writer io.Writer, tp spec.Type) error {
|
||||
fmt.Fprintf(writer, "export interface %s {\n", util.Title(tp.Name()))
|
||||
if err := genMembers(writer, tp, false); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Fprintf(writer, "}\n")
|
||||
err := genParamsTypesIfNeed(writer, tp, inlineType, prefixForType)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
return genParamsTypesIfNeed(writer, tp)
|
||||
}
|
||||
|
||||
func genParamsTypesIfNeed(writer io.Writer, tp spec.Type, inlineType func(string) (*spec.Type, error), prefixForType func(string) string) error {
|
||||
members := tp.GetNonBodyMembers()
|
||||
func genParamsTypesIfNeed(writer io.Writer, tp spec.Type) error {
|
||||
definedType, ok := tp.(spec.DefineStruct)
|
||||
if !ok {
|
||||
return errors.New("no members of type " + tp.Name())
|
||||
}
|
||||
|
||||
members := definedType.GetNonBodyMembers()
|
||||
if len(members) == 0 {
|
||||
return nil
|
||||
}
|
||||
fmt.Fprintf(writer, "\n")
|
||||
fmt.Fprintf(writer, "export interface %sParams {\n", util.Title(tp.Name))
|
||||
if err := genMembers(writer, tp, true, inlineType, prefixForType); err != nil {
|
||||
fmt.Fprintf(writer, "export interface %sParams {\n", util.Title(tp.Name()))
|
||||
if err := genMembers(writer, tp, true); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Fprintf(writer, "}\n")
|
||||
return nil
|
||||
}
|
||||
|
||||
func genMembers(writer io.Writer, tp spec.Type, isParam bool, inlineType func(string) (*spec.Type, error), prefixForType func(string) string) error {
|
||||
members := tp.GetBodyMembers()
|
||||
func genMembers(writer io.Writer, tp spec.Type, isParam bool) error {
|
||||
definedType, ok := tp.(spec.DefineStruct)
|
||||
if !ok {
|
||||
return errors.New("no members of type " + tp.Name())
|
||||
}
|
||||
|
||||
members := definedType.GetBodyMembers()
|
||||
if isParam {
|
||||
members = tp.GetNonBodyMembers()
|
||||
members = definedType.GetNonBodyMembers()
|
||||
}
|
||||
for _, member := range members {
|
||||
if member.IsInline {
|
||||
// 获取inline类型的成员然后添加到type中
|
||||
it, err := inlineType(strings.TrimPrefix(member.Type, "*"))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := genMembers(writer, *it, isParam, inlineType, prefixForType); err != nil {
|
||||
if err := genMembers(writer, member.Type, isParam); err != nil {
|
||||
return err
|
||||
}
|
||||
continue
|
||||
}
|
||||
if err := writeProperty(writer, member, 1, prefixForType); err != nil {
|
||||
return apiutil.WrapErr(err, " type "+tp.Name)
|
||||
|
||||
if err := writeProperty(writer, member, 1); err != nil {
|
||||
return apiutil.WrapErr(err, " type "+tp.Name())
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user