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>
2021-01-11 15:10:51 +08:00
parent b0ccfb8eb4
commit ee19fb736b
88 changed files with 13641 additions and 2458 deletions
--- a/tools/goctl/api/javagen/gencomponents.go
+++ b/tools/goctl/api/javagen/gencomponents.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 	"text/template"

+	"github.com/tal-tech/go-zero/core/stringx"
 	"github.com/tal-tech/go-zero/tools/goctl/api/spec"
 	apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util"
 	"github.com/tal-tech/go-zero/tools/goctl/util"
@@ -17,21 +18,46 @@ const (
 	componentTemplate = `// Code generated by goctl. DO NOT EDIT.
 package com.xhb.logic.http.packet.{{.packet}}.model;

-import com.xhb.logic.http.DeProguardable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+{{.imports}}

 {{.componentType}}
 `
+
+	httpResponseData = "import com.xhb.core.response.HttpResponseData;"
+	httpData         = "import com.xhb.core.packet.HttpData;"
 )

+type componentsContext struct {
+	api           *spec.ApiSpec
+	requestTypes  []spec.Type
+	responseTypes []spec.Type
+	imports       []string
+}
+
 func genComponents(dir, packetName string, api *spec.ApiSpec) error {
-	types := apiutil.GetSharedTypes(api)
+	types := api.Types
 	if len(types) == 0 {
 		return nil
 	}
+
+	var requestTypes []spec.Type
+	var responseTypes []spec.Type
+	for _, group := range api.Service.Groups {
+		for _, route := range group.Routes {
+			if route.RequestType != nil {
+				requestTypes = append(requestTypes, route.RequestType)
+			}
+			if route.ResponseType != nil {
+				responseTypes = append(responseTypes, route.ResponseType)
+			}
+		}
+	}
+
+	context := componentsContext{api: api, requestTypes: requestTypes, responseTypes: responseTypes}
 	for _, ty := range types {
-		if err := createComponent(dir, packetName, ty, api.Types); err != nil {
+		if err := context.createComponent(dir, packetName, ty); err != nil {
 			return err
 		}
 	}
@@ -39,8 +65,21 @@ func genComponents(dir, packetName string, api *spec.ApiSpec) error {
 	return nil
 }

-func createComponent(dir, packetName string, ty spec.Type, types []spec.Type) error {
-	modelFile := util.Title(ty.Name) + ".java"
+func (c *componentsContext) createComponent(dir, packetName string, ty spec.Type) error {
+	defineStruct, ok := ty.(spec.DefineStruct)
+	if !ok {
+		return errors.New("unsupported type %s" + ty.Name())
+	}
+
+	for _, item := range c.requestTypes {
+		if item.Name() == defineStruct.Name() {
+			if len(defineStruct.GetFormMembers())+len(defineStruct.GetBodyMembers()) == 0 {
+				return nil
+			}
+		}
+	}
+
+	modelFile := util.Title(ty.Name()) + ".java"
 	filename := path.Join(dir, modelDir, modelFile)
 	if err := util.RemoveOrQuit(filename); err != nil {
 		return err
@@ -55,77 +94,72 @@ func createComponent(dir, packetName string, ty spec.Type, types []spec.Type) er
 	}
 	defer fp.Close()

-	tys, err := buildType(ty, types)
+	tyString, err := c.buildType(defineStruct)
 	if err != nil {
 		return err
 	}

 	t := template.Must(template.New("componentType").Parse(componentTemplate))
 	return t.Execute(fp, map[string]string{
-		"componentType": tys,
+		"componentType": tyString,
 		"packet":        packetName,
+		"imports":       strings.Join(c.imports, "\n"),
 	})
 }

-func buildType(ty spec.Type, types []spec.Type) (string, error) {
+func (c *componentsContext) buildType(ty spec.DefineStruct) (string, error) {
 	var builder strings.Builder
-	if err := writeType(&builder, ty, types); err != nil {
-		return "", apiutil.WrapErr(err, "Type "+ty.Name+" generate error")
+	if err := c.writeType(&builder, ty); err != nil {
+		return "", apiutil.WrapErr(err, "Type "+ty.Name()+" generate error")
 	}
+
 	return builder.String(), nil
 }

-func writeType(writer io.Writer, tp spec.Type, types []spec.Type) error {
-	fmt.Fprintf(writer, "public class %s implements DeProguardable {\n", util.Title(tp.Name))
-	var members []spec.Member
-	err := writeMembers(writer, types, tp.Members, &members, 1)
+func (c *componentsContext) writeType(writer io.Writer, defineStruct spec.DefineStruct) error {
+	responseData := "HttpData"
+	for _, item := range c.responseTypes {
+		if item.Name() == defineStruct.Name() {
+			responseData = "HttpResponseData"
+			if !stringx.Contains(c.imports, httpResponseData) {
+				c.imports = append(c.imports, httpResponseData)
+			}
+			break
+		}
+	}
+	if responseData == "HttpData" && !stringx.Contains(c.imports, httpData) {
+		c.imports = append(c.imports, httpData)
+	}
+
+	fmt.Fprintf(writer, "public class %s extends %s {\n", util.Title(defineStruct.Name()), responseData)
+	err := c.writeMembers(writer, defineStruct, 1)
 	if err != nil {
 		return err
 	}

-	genGetSet(writer, members, 1)
+	genGetSet(writer, defineStruct, 1)
 	fmt.Fprintf(writer, "}")
 	return nil
 }

-func writeMembers(writer io.Writer, types []spec.Type, members []spec.Member, allMembers *[]spec.Member, indent int) error {
-	for _, member := range members {
-		if !member.IsInline {
-			_, err := member.GetPropertyName()
-			if err != nil {
-				return err
-			}
-		}
-		if !member.IsBodyMember() {
-			continue
-		}
-
-		for _, item := range *allMembers {
-			if item.Name == member.Name {
+func (c *componentsContext) writeMembers(writer io.Writer, ty spec.DefineStruct, indent int) error {
+	for _, member := range ty.Members {
+		if member.IsInline {
+			defineStruct, ok := member.Type.(spec.DefineStruct)
+			if ok {
+				err := c.writeMembers(writer, defineStruct, indent)
+				if err != nil {
+					return err
+				}
 				continue
 			}
+			return errors.New("unsupported inline type %s" + member.Type.Name())
 		}

-		if member.IsInline {
-			hasInline := false
-			for _, ty := range types {
-				if strings.ToLower(ty.Name) == strings.ToLower(member.Name) {
-					err := writeMembers(writer, types, ty.Members, allMembers, indent)
-					if err != nil {
-						return err
-					}
-					hasInline = true
-					break
-				}
-			}
-			if !hasInline {
-				return errors.New("inline type " + member.Name + " not exist, please correct api file")
-			}
-		} else {
+		if member.IsBodyMember() || member.IsFormMember() {
 			if err := writeProperty(writer, member, indent); err != nil {
 				return err
 			}
-			*allMembers = append(*allMembers, member)
 		}
 	}
 	return nil