Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: nested descriptors #56

Merged
merged 1 commit into from
Jan 6, 2022
Merged

fix: nested descriptors #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions features/fastreflection/descriptors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ func (g *descGen) generate() {
g.P(")")
g.P("func init() {")
g.P(copied.InitFunctionName(g.file), "()")
parentMd, ok := g.message.Desc.Parent().(protoreflect.MessageDescriptor)
switch ok {
// case nested message
case true:
g.P(messageDescriptorName(g.message), " = ", g.file.GoDescriptorIdent.GoName, ".Messages().ByName(\"", parentMd.Name(), "\").Messages().ByName(\"", g.message.Desc.Name(), "\")")
default:
g.P(messageDescriptorName(g.message), " = ", g.file.GoDescriptorIdent.GoName, ".Messages().ByName(\"", g.message.Desc.Name(), "\")")
// we need to consider nested messages. so we try to recreate the hierarchy
// ex messageA contains messageB contains messageC
args := []interface{}{messageDescriptorName(g.message), " = ", g.file.GoDescriptorIdent.GoName}
for _, md := range findParents(g.message.Desc) {
args = append(args, ".Messages().ByName(\"", md.Name(), "\")")
}
g.P(args...)
for _, field := range g.message.Fields {
g.P(fieldDescriptorName(field), " = ", messageDescriptorName(g.message), ".Fields().ByName(\"", field.Desc.Name(), "\")")
}
Expand All @@ -42,3 +41,12 @@ func (g *descGen) generate() {
func fieldDescriptorName(field *protogen.Field) string {
return fmt.Sprintf("fd_%s_%s", field.Parent.GoIdent.GoName, field.Desc.Name())
}

func findParents(message protoreflect.MessageDescriptor) []protoreflect.MessageDescriptor {
parent, ok := message.Parent().(protoreflect.MessageDescriptor)
if !ok {
return []protoreflect.MessageDescriptor{message}
}

return append(findParents(parent), message)
}
19 changes: 19 additions & 0 deletions internal/testprotos/test3/test_nesting.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
syntax = "proto3";
package goproto.proto.test3;

option go_package = "github.com/cosmos/cosmos-proto/internal/testprotos/test3";

message MultiLayeredNesting {
message Nested1 {
message Nested2 {
message Nested3 {
oneof nested3_oneof {
string nested_3_string = 1;
int32 nested_3_int32 = 2;
}
}
Nested3 nested_3 = 1;
}
}
Nested1 nested1 = 1;
}
Loading