111

Author: lvan100

gen/generator/golang/client.go

@@ -102,16 +102,17 @@ func (t *Type) QueryCount() int {
 
 // RPC represents a single remote procedure call with HTTP metadata.
 type RPC struct {
-	Name        string   // Method name
-	Request     string   // Request type name
-	Response    string   // Response type name
-	Stream      bool     // Whether this RPC is a streaming RPC
-	Path        string   // HTTP path
-	FormatPath  string   // Formatted HTTP path
-	PathParams  []string // HTTP path parameters
-	Method      string   // HTTP method (GET, POST, etc.)
-	ContentType string   // HTTP Content-Type
-	Comment     string   // Comment of the RPC
+	Name         string            // Method name
+	Request      string            // Request type name
+	Response     string            // Response type name
+	Stream       bool              // Whether this RPC is a streaming RPC
+	Path         string            // HTTP path
+	FormatPath   string            // Formatted HTTP path
+	PathSegments []pathidl.Segment // HTTP path segments
+	PathParams   map[string]string // HTTP path parameters
+	Method       string            // HTTP method (GET, POST, etc.)
+	ContentType  string            // HTTP Content-Type
+	Comment      string            // Comment of the RPC
 }
 
 type ReqIndex struct {
@@ -150,15 +151,17 @@ func Convert(dir string) (GoCode, error) {
 	for _, doc := range project.Files {
 		for _, r := range doc.RPCs {
 			rpc := RPC{
-				Name:        r.Name,
-				Request:     r.Request.Name,
-				Response:    r.Response.UserType.Name,
-				Stream:      r.Response.Stream,
-				Path:        r.Path,
-				FormatPath:  r.Path, // 假设是普通路径
-				Method:      r.Method,
-				ContentType: r.ContentType,
-				Comment:     formatComment(r.Comments),
+				Name:         r.Name,
+				Request:      r.Request.Name,
+				Response:     r.Response.UserType.Name,
+				Stream:       r.Response.Stream,
+				Path:         r.Path,
+				FormatPath:   r.Path, // 假设是普通路径
+				PathSegments: r.PathSegments,
+				PathParams:   r.PathParams,
+				Method:       r.Method,
+				ContentType:  r.ContentType,
+				Comment:      formatComment(r.Comments),
 			}
 			code.RPCs = append(code.RPCs, rpc)
 			code.Reqs[rpc.Request] = ReqIndex{}
@@ -200,54 +203,19 @@ func Convert(dir string) (GoCode, error) {
 	}
 
 	for rpcIndex, rpc := range code.RPCs {
-		segments, err := pathidl.Parse(rpc.Path)
-		if err != nil {
-			return GoCode{}, errutil.Explain(err, `failed to parse path %s`, rpc.Path)
+		for k, s := range rpc.PathParams {
+			rpc.PathParams[k] = httpidl.ToPascal(s)
 		}
-
-		var (
-			params     = make(map[string]string)
-			formatPath strings.Builder
-		)
-
-		for _, seg := range segments {
+		var formatPath strings.Builder
+		for _, seg := range rpc.PathSegments {
 			formatPath.WriteString("/")
 			if seg.Type == pathidl.Static {
 				formatPath.WriteString(seg.Value)
 				continue
 			}
 			formatPath.WriteString("%s")
-			params[seg.Value] = ""
-		}
-
-		if len(params) == 0 {
-			continue
 		}
-
-		reqIndex := code.Reqs[rpc.Request]
-		t := code.Types[reqIndex.File][reqIndex.Index]
-		for _, f := range t.Fields {
-			if f.Binding == nil || f.Binding.From != "path" {
-				continue
-			}
-			if _, ok := params[f.Binding.Name]; !ok {
-				err = errutil.Explain(nil, "path parameter %s not found in request type %s", f.Binding.Name, rpc.Request)
-				return GoCode{}, err
-			}
-			params[f.Binding.Name] = f.Name
-		}
-
-		var paramNames []string
-		for k, s := range params {
-			if s == "" {
-				err = errutil.Explain(nil, "path parameter %s not found in request type %s", k, rpc.Request)
-				return GoCode{}, err
-			}
-			paramNames = append(paramNames, s)
-		}
-
 		rpc.FormatPath = formatPath.String()
-		rpc.PathParams = paramNames
 		code.RPCs[rpcIndex] = rpc
 	}
 	return code, nil

gen/generator/golang/spec.go

@@ -29,6 +29,7 @@ import (
 	"strings"
 
 	"github.com/antlr4-go/antlr/v4"
+	"github.com/go-spring/gs-http-gen/lib/pathidl"
 	"github.com/go-spring/gs-http-gen/lib/validate"
 	"github.com/lvan100/golib/errutil"
 )
@@ -152,6 +153,45 @@ func ParseDir(dir string) (Project, error) {
 		}
 	}
 
+	for _, doc := range files {
+		for rpcIndex, rpc := range doc.RPCs {
+			segments, err := pathidl.Parse(rpc.Path)
+			if err != nil {
+				return Project{}, errutil.Explain(err, `failed to parse path %s`, rpc.Path)
+			}
+			params := make(map[string]string)
+			for _, seg := range segments {
+				if seg.Type == pathidl.Static {
+					continue
+				}
+				params[seg.Value] = ""
+			}
+			srcType, ok := GetType(files, rpc.Request.Name)
+			if !ok {
+				return Project{}, errutil.Explain(nil, "type %s is used but not defined", rpc.Request.Name)
+			}
+			for _, f := range srcType.Fields {
+				if f.Binding == nil || f.Binding.From != "path" {
+					continue
+				}
+				if _, ok = params[f.Binding.Name]; !ok {
+					err = errutil.Explain(nil, "path parameter %s not found in request type %s", f.Binding.Name, rpc.Request)
+					return Project{}, err
+				}
+				params[f.Binding.Name] = f.Name
+			}
+			for k, s := range params {
+				if s == "" {
+					err = errutil.Explain(nil, "path parameter %s not found in request type %s", k, rpc.Request)
+					return Project{}, err
+				}
+			}
+			rpc.PathSegments = segments
+			rpc.PathParams = params
+			doc.RPCs[rpcIndex] = rpc
+		}
+	}
+
 	return Project{
 		Meta:  meta,
 		Files: files,

lib/httpidl/parser.go

@@ -1072,7 +1072,9 @@
       "ContentType": "application/x-www-form-urlencoded",
       "ConnTimeout": 100,
       "ReadTimeout": 100,
-      "WriteTimeout": 100
+      "WriteTimeout": 100,
+      "PathSegments": null,
+      "PathParams": null
     }
   ],
   "EnumTypes": {

lib/httpidl/testdata/success/http.idl.json

@@ -17,6 +17,7 @@
 package httpidl
 
 import (
+	"github.com/go-spring/gs-http-gen/lib/pathidl"
 	"github.com/go-spring/gs-http-gen/lib/validate"
 )
 
@@ -248,6 +249,9 @@ type RPC struct {
 	ConnTimeout  int // Connection timeout, ms
 	ReadTimeout  int // Read timeout, ms
 	WriteTimeout int // Write timeout, ms
+
+	PathSegments []pathidl.Segment
+	PathParams   map[string]string
 }
 
 // RespType represents the response type of an RPC.