protoc-gen-go: Add JSON tags to oneof values and members

Oneof values should include json tags to use proper camelCase name and can be safely omitted when we're handling the interface.
protocolbuffers · Nov 29, 2023 · eb117e7 · eb117e7
1 parent 2087447
commit eb117e7
Show file tree

Hide file tree

Showing 20 changed files with 131 additions and 123 deletions.
diff --git a/cmd/protoc-gen-go/internal_gengo/main.go b/cmd/protoc-gen-go/internal_gengo/main.go
@@ -378,6 +378,7 @@ func genMessageField(g *protogen.GeneratedFile, f *fileInfo, m *messageInfo, fie
 
 		tags := structTags{
 			{"protobuf_oneof", string(oneof.Desc.Name())},
+			{"json", string(oneof.Desc.JSONName()) + ",omitempty"},
 		}
 		if m.isTracked {
 			tags = append(tags, gotrackTags...)
@@ -812,6 +813,7 @@ func genMessageOneofWrapperTypes(g *protogen.GeneratedFile, f *fileInfo, m *mess
 			goType, _ := fieldGoType(g, f, field)
 			tags := structTags{
 				{"protobuf", fieldProtobufTagValue(field)},
+				{"json", string(field.Desc.JSONName())},
 			}
 			if m.isTracked {
 				tags = append(tags, gotrackTags...)

diff --git a/cmd/protoc-gen-go/testdata/comments/comments.pb.go b/cmd/protoc-gen-go/testdata/comments/comments.pb.go
diff --git a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.pb.go
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/sub/a.pb.go
diff --git a/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go b/cmd/protoc-gen-go/testdata/issue780_oneof_conflict/test.pb.go
diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
diff --git a/cmd/protoc-gen-go/testdata/retention/retention.pb.go b/cmd/protoc-gen-go/testdata/retention/retention.pb.go
diff --git a/internal/descfmt/desc_test.go b/internal/descfmt/desc_test.go
@@ -23,6 +23,7 @@ func TestDescriptorAccessors(t *testing.T) {
 		"Syntax":        true,
 		"Name":          true,
 		"FullName":      true,
+		"JSONName":      true,
 		"IsPlaceholder": true,
 		"Options":       true,
 		"ProtoInternal": true,

diff --git a/internal/filedesc/desc.go b/internal/filedesc/desc.go
@@ -351,6 +351,7 @@ func (od *Oneof) Options() protoreflect.ProtoMessage {
 func (od *Oneof) Fields() protoreflect.FieldDescriptors  { return &od.L1.Fields }
 func (od *Oneof) Format(s fmt.State, r rune)             { descfmt.FormatDesc(s, r, od) }
 func (od *Oneof) ProtoType(protoreflect.OneofDescriptor) {}
+func (od *Oneof) JSONName() string                       { return strs.JSONCamelCase(string(od.Name())) }
 
 type (
 	Extension struct {