Skip to content

Commit fde3c15

Browse files
committed
Revert "fix(goctl): only alias per-service message types in multi-service RPC generation"
This reverts commit 714419b.
1 parent 714419b commit fde3c15

File tree

2 files changed

+3
-138
lines changed

2 files changed

+3
-138
lines changed

tools/goctl/rpc/generator/gencall.go

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,16 @@ func (g *Generator) genCallGroup(ctx DirContext, proto parser.Proto, cfg *conf.C
6464
isCallPkgSameToGrpcPkg := childDir == ctx.GetProtoGo().Filename
6565

6666
serviceName := stringx.From(service.Name).ToCamel()
67-
68-
// Collect only the message types actually used by this service's RPCs,
69-
// so that each client file only aliases its own request/response types.
70-
usedTypes := collection.NewSet[string]()
71-
for _, rpc := range service.RPC {
72-
usedTypes.Add(parser.CamelCase(rpc.RequestType))
73-
usedTypes.Add(parser.CamelCase(rpc.ReturnsType))
74-
}
75-
7667
alias := collection.NewSet[string]()
7768
var hasSameNameBetweenMessageAndService bool
7869
for _, item := range proto.Message {
7970
msgName := getMessageName(*item.Message)
80-
camelMsgName := parser.CamelCase(msgName)
8171
if serviceName == msgName {
8272
hasSameNameBetweenMessageAndService = true
8373
}
84-
if !isCallPkgSameToPbPkg && usedTypes.Contains(camelMsgName) {
85-
alias.Add(fmt.Sprintf("%s = %s", camelMsgName,
86-
fmt.Sprintf("%s.%s", proto.PbPackage, camelMsgName)))
74+
if !isCallPkgSameToPbPkg {
75+
alias.Add(fmt.Sprintf("%s = %s", parser.CamelCase(msgName),
76+
fmt.Sprintf("%s.%s", proto.PbPackage, parser.CamelCase(msgName))))
8777
}
8878
}
8979
if hasSameNameBetweenMessageAndService {

tools/goctl/rpc/generator/gencall_test.go

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)