mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2025-01-29 18:32:46 +00:00
all: implement Go-specific GenerateLegacyUnmarshalJSON
This change adds the first Go specific editions feature and the associated proto. The feature is used to control if the legacy UnmarshalJSON method should be generated for enums. This change only affects protos using editions. More tests will be added in a followup change. Change-Id: Ifb62454d7568bd6d90d0b93f8953adcfe46c45fd Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/561938 Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Lasse Folger <lassefolger@google.com>
This commit is contained in:
Lasse Folger
Gopher Robot
parent
99e193e5dd
commit
2040e8671b
@ -18,6 +18,7 @@ import (
|
||||
|
||||
"google.golang.org/protobuf/compiler/protogen"
|
||||
"google.golang.org/protobuf/internal/encoding/tag"
|
||||
"google.golang.org/protobuf/internal/filedesc"
|
||||
"google.golang.org/protobuf/internal/genid"
|
||||
"google.golang.org/protobuf/internal/version"
|
||||
"google.golang.org/protobuf/reflect/protoreflect"
|
||||
@ -288,7 +289,11 @@ func genEnum(g *protogen.GeneratedFile, f *fileInfo, e *enumInfo) {
|
||||
genEnumReflectMethods(g, f, e)
|
||||
|
||||
// UnmarshalJSON method.
|
||||
if e.genJSONMethod && e.Desc.Syntax() == protoreflect.Proto2 {
|
||||
needsUnmarshalJSONMethod := e.genJSONMethod && e.Desc.Syntax() == protoreflect.Proto2
|
||||
if fde, ok := e.Desc.(*filedesc.Enum); ok && fde.L1.EditionFeatures.GenerateLegacyUnmarshalJSON {
|
||||
needsUnmarshalJSONMethod = true
|
||||
}
|
||||
if needsUnmarshalJSONMethod {
|
||||
g.P("// Deprecated: Do not use.")
|
||||
g.P("func (x *", e.GoIdent, ") UnmarshalJSON(b []byte) error {")
|
||||
g.P("num, err := ", protoimplPackage.Ident("X"), ".UnmarshalJSONEnum(x.Descriptor(), b)")
|
||||
|
||||
588
cmd/protoc-gen-go/testdata/protoeditions/enum.pb.go
vendored
Normal file
588
cmd/protoc-gen-go/testdata/protoeditions/enum.pb.go
vendored
Normal file
@ -0,0 +1,588 @@
|
||||
// Copyright 2024 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// source: cmd/protoc-gen-go/testdata/protoeditions/enum.proto
|
||||
|
||||
package protoeditions
|
||||
|
||||
import (
|
||||
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
|
||||
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
|
||||
_ "google.golang.org/protobuf/types/gofeaturespb"
|
||||
reflect "reflect"
|
||||
sync "sync"
|
||||
)
|
||||
|
||||
// EnumType1 comment.
|
||||
type EnumType1 int32
|
||||
|
||||
const (
|
||||
// EnumType1_ONE comment.
|
||||
EnumType1_ONE EnumType1 = 1
|
||||
// EnumType1_TWO comment.
|
||||
EnumType1_TWO EnumType1 = 2
|
||||
)
|
||||
|
||||
// Enum value maps for EnumType1.
|
||||
var (
|
||||
EnumType1_name = map[int32]string{
|
||||
1: "ONE",
|
||||
2: "TWO",
|
||||
}
|
||||
EnumType1_value = map[string]int32{
|
||||
"ONE": 1,
|
||||
"TWO": 2,
|
||||
}
|
||||
)
|
||||
|
||||
func (x EnumType1) Enum() *EnumType1 {
|
||||
p := new(EnumType1)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x EnumType1) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (EnumType1) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[0].Descriptor()
|
||||
}
|
||||
|
||||
func (EnumType1) Type() protoreflect.EnumType {
|
||||
return &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[0]
|
||||
}
|
||||
|
||||
func (x EnumType1) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use EnumType1.Descriptor instead.
|
||||
func (EnumType1) EnumDescriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{0}
|
||||
}
|
||||
|
||||
type EnumType2 int32
|
||||
|
||||
const (
|
||||
EnumType2_duplicate1 EnumType2 = 1
|
||||
EnumType2_duplicate2 EnumType2 = 1
|
||||
)
|
||||
|
||||
// Enum value maps for EnumType2.
|
||||
var (
|
||||
EnumType2_name = map[int32]string{
|
||||
1: "duplicate1",
|
||||
// Duplicate value: 1: "duplicate2",
|
||||
}
|
||||
EnumType2_value = map[string]int32{
|
||||
"duplicate1": 1,
|
||||
"duplicate2": 1,
|
||||
}
|
||||
)
|
||||
|
||||
func (x EnumType2) Enum() *EnumType2 {
|
||||
p := new(EnumType2)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x EnumType2) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (EnumType2) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[1].Descriptor()
|
||||
}
|
||||
|
||||
func (EnumType2) Type() protoreflect.EnumType {
|
||||
return &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[1]
|
||||
}
|
||||
|
||||
func (x EnumType2) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use EnumType2.Descriptor instead.
|
||||
func (EnumType2) EnumDescriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{1}
|
||||
}
|
||||
|
||||
type LegacyUnmarshalJSONTest int32
|
||||
|
||||
const (
|
||||
LegacyUnmarshalJSONTest_FOO LegacyUnmarshalJSONTest = 0
|
||||
LegacyUnmarshalJSONTest_BAR LegacyUnmarshalJSONTest = 1
|
||||
LegacyUnmarshalJSONTest_BAZ LegacyUnmarshalJSONTest = 4
|
||||
)
|
||||
|
||||
// Enum value maps for LegacyUnmarshalJSONTest.
|
||||
var (
|
||||
LegacyUnmarshalJSONTest_name = map[int32]string{
|
||||
0: "FOO",
|
||||
1: "BAR",
|
||||
4: "BAZ",
|
||||
}
|
||||
LegacyUnmarshalJSONTest_value = map[string]int32{
|
||||
"FOO": 0,
|
||||
"BAR": 1,
|
||||
"BAZ": 4,
|
||||
}
|
||||
)
|
||||
|
||||
func (x LegacyUnmarshalJSONTest) Enum() *LegacyUnmarshalJSONTest {
|
||||
p := new(LegacyUnmarshalJSONTest)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x LegacyUnmarshalJSONTest) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (LegacyUnmarshalJSONTest) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[2].Descriptor()
|
||||
}
|
||||
|
||||
func (LegacyUnmarshalJSONTest) Type() protoreflect.EnumType {
|
||||
return &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[2]
|
||||
}
|
||||
|
||||
func (x LegacyUnmarshalJSONTest) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Do not use.
|
||||
func (x *LegacyUnmarshalJSONTest) UnmarshalJSON(b []byte) error {
|
||||
num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*x = LegacyUnmarshalJSONTest(num)
|
||||
return nil
|
||||
}
|
||||
|
||||
// Deprecated: Use LegacyUnmarshalJSONTest.Descriptor instead.
|
||||
func (LegacyUnmarshalJSONTest) EnumDescriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{2}
|
||||
}
|
||||
|
||||
// NestedEnumType1A comment.
|
||||
type EnumContainerMessage1_NestedEnumType1A int32
|
||||
|
||||
const (
|
||||
// NestedEnumType1A_VALUE comment.
|
||||
EnumContainerMessage1_NESTED_1A_VALUE EnumContainerMessage1_NestedEnumType1A = 0
|
||||
)
|
||||
|
||||
// Enum value maps for EnumContainerMessage1_NestedEnumType1A.
|
||||
var (
|
||||
EnumContainerMessage1_NestedEnumType1A_name = map[int32]string{
|
||||
0: "NESTED_1A_VALUE",
|
||||
}
|
||||
EnumContainerMessage1_NestedEnumType1A_value = map[string]int32{
|
||||
"NESTED_1A_VALUE": 0,
|
||||
}
|
||||
)
|
||||
|
||||
func (x EnumContainerMessage1_NestedEnumType1A) Enum() *EnumContainerMessage1_NestedEnumType1A {
|
||||
p := new(EnumContainerMessage1_NestedEnumType1A)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x EnumContainerMessage1_NestedEnumType1A) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (EnumContainerMessage1_NestedEnumType1A) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[3].Descriptor()
|
||||
}
|
||||
|
||||
func (EnumContainerMessage1_NestedEnumType1A) Type() protoreflect.EnumType {
|
||||
return &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[3]
|
||||
}
|
||||
|
||||
func (x EnumContainerMessage1_NestedEnumType1A) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use EnumContainerMessage1_NestedEnumType1A.Descriptor instead.
|
||||
func (EnumContainerMessage1_NestedEnumType1A) EnumDescriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{0, 0}
|
||||
}
|
||||
|
||||
type EnumContainerMessage1_NestedEnumType1B int32
|
||||
|
||||
const (
|
||||
EnumContainerMessage1_NESTED_1B_VALUE EnumContainerMessage1_NestedEnumType1B = 0
|
||||
)
|
||||
|
||||
// Enum value maps for EnumContainerMessage1_NestedEnumType1B.
|
||||
var (
|
||||
EnumContainerMessage1_NestedEnumType1B_name = map[int32]string{
|
||||
0: "NESTED_1B_VALUE",
|
||||
}
|
||||
EnumContainerMessage1_NestedEnumType1B_value = map[string]int32{
|
||||
"NESTED_1B_VALUE": 0,
|
||||
}
|
||||
)
|
||||
|
||||
func (x EnumContainerMessage1_NestedEnumType1B) Enum() *EnumContainerMessage1_NestedEnumType1B {
|
||||
p := new(EnumContainerMessage1_NestedEnumType1B)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x EnumContainerMessage1_NestedEnumType1B) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (EnumContainerMessage1_NestedEnumType1B) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[4].Descriptor()
|
||||
}
|
||||
|
||||
func (EnumContainerMessage1_NestedEnumType1B) Type() protoreflect.EnumType {
|
||||
return &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[4]
|
||||
}
|
||||
|
||||
func (x EnumContainerMessage1_NestedEnumType1B) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use EnumContainerMessage1_NestedEnumType1B.Descriptor instead.
|
||||
func (EnumContainerMessage1_NestedEnumType1B) EnumDescriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{0, 1}
|
||||
}
|
||||
|
||||
// NestedEnumType2A comment.
|
||||
type EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A int32
|
||||
|
||||
const (
|
||||
// NestedEnumType2A_VALUE comment.
|
||||
EnumContainerMessage1_EnumContainerMessage2_NESTED_2A_VALUE EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A = 0
|
||||
)
|
||||
|
||||
// Enum value maps for EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A.
|
||||
var (
|
||||
EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A_name = map[int32]string{
|
||||
0: "NESTED_2A_VALUE",
|
||||
}
|
||||
EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A_value = map[string]int32{
|
||||
"NESTED_2A_VALUE": 0,
|
||||
}
|
||||
)
|
||||
|
||||
func (x EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A) Enum() *EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A {
|
||||
p := new(EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[5].Descriptor()
|
||||
}
|
||||
|
||||
func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A) Type() protoreflect.EnumType {
|
||||
return &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[5]
|
||||
}
|
||||
|
||||
func (x EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A.Descriptor instead.
|
||||
func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A) EnumDescriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{0, 0, 0}
|
||||
}
|
||||
|
||||
type EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B int32
|
||||
|
||||
const (
|
||||
EnumContainerMessage1_EnumContainerMessage2_NESTED_2B_VALUE EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B = 0
|
||||
)
|
||||
|
||||
// Enum value maps for EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B.
|
||||
var (
|
||||
EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B_name = map[int32]string{
|
||||
0: "NESTED_2B_VALUE",
|
||||
}
|
||||
EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B_value = map[string]int32{
|
||||
"NESTED_2B_VALUE": 0,
|
||||
}
|
||||
)
|
||||
|
||||
func (x EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) Enum() *EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B {
|
||||
p := new(EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[6].Descriptor()
|
||||
}
|
||||
|
||||
func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) Type() protoreflect.EnumType {
|
||||
return &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes[6]
|
||||
}
|
||||
|
||||
func (x EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B.Descriptor instead.
|
||||
func (EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B) EnumDescriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{0, 0, 1}
|
||||
}
|
||||
|
||||
type EnumContainerMessage1 struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
DefaultDuplicate1 *EnumType2 `protobuf:"varint,1,opt,name=default_duplicate1,json=defaultDuplicate1,enum=goproto.protoc.protoeditions.EnumType2,def=1" json:"default_duplicate1,omitempty"`
|
||||
DefaultDuplicate2 *EnumType2 `protobuf:"varint,2,opt,name=default_duplicate2,json=defaultDuplicate2,enum=goproto.protoc.protoeditions.EnumType2,def=1" json:"default_duplicate2,omitempty"`
|
||||
}
|
||||
|
||||
// Default values for EnumContainerMessage1 fields.
|
||||
const (
|
||||
Default_EnumContainerMessage1_DefaultDuplicate1 = EnumType2_duplicate1
|
||||
Default_EnumContainerMessage1_DefaultDuplicate2 = EnumType2_duplicate2
|
||||
)
|
||||
|
||||
func (x *EnumContainerMessage1) Reset() {
|
||||
*x = EnumContainerMessage1{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_msgTypes[0]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *EnumContainerMessage1) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*EnumContainerMessage1) ProtoMessage() {}
|
||||
|
||||
func (x *EnumContainerMessage1) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_msgTypes[0]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use EnumContainerMessage1.ProtoReflect.Descriptor instead.
|
||||
func (*EnumContainerMessage1) Descriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{0}
|
||||
}
|
||||
|
||||
func (x *EnumContainerMessage1) GetDefaultDuplicate1() EnumType2 {
|
||||
if x != nil && x.DefaultDuplicate1 != nil {
|
||||
return *x.DefaultDuplicate1
|
||||
}
|
||||
return Default_EnumContainerMessage1_DefaultDuplicate1
|
||||
}
|
||||
|
||||
func (x *EnumContainerMessage1) GetDefaultDuplicate2() EnumType2 {
|
||||
if x != nil && x.DefaultDuplicate2 != nil {
|
||||
return *x.DefaultDuplicate2
|
||||
}
|
||||
return Default_EnumContainerMessage1_DefaultDuplicate2
|
||||
}
|
||||
|
||||
type EnumContainerMessage1_EnumContainerMessage2 struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
}
|
||||
|
||||
func (x *EnumContainerMessage1_EnumContainerMessage2) Reset() {
|
||||
*x = EnumContainerMessage1_EnumContainerMessage2{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_msgTypes[1]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *EnumContainerMessage1_EnumContainerMessage2) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*EnumContainerMessage1_EnumContainerMessage2) ProtoMessage() {}
|
||||
|
||||
func (x *EnumContainerMessage1_EnumContainerMessage2) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_msgTypes[1]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use EnumContainerMessage1_EnumContainerMessage2.ProtoReflect.Descriptor instead.
|
||||
func (*EnumContainerMessage1_EnumContainerMessage2) Descriptor() ([]byte, []int) {
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP(), []int{0, 0}
|
||||
}
|
||||
|
||||
var File_cmd_protoc_gen_go_testdata_protoeditions_enum_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDesc = []byte{
|
||||
0x0a, 0x33, 0x63, 0x6d, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
|
||||
0x2d, 0x67, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x65, 0x6e, 0x75, 0x6d, 0x2e,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1c, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x65, 0x64, 0x69, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x73, 0x1a, 0x29, 0x72, 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x2f, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x64, 0x65, 0x73, 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x5f,
|
||||
0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9c,
|
||||
0x03, 0x0a, 0x15, 0x45, 0x6e, 0x75, 0x6d, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72,
|
||||
0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x31, 0x12, 0x62, 0x0a, 0x12, 0x64, 0x65, 0x66, 0x61,
|
||||
0x75, 0x6c, 0x74, 0x5f, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x31, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x65, 0x64, 0x69, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x73, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x32, 0x3a, 0x0a, 0x64,
|
||||
0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x31, 0x52, 0x11, 0x64, 0x65, 0x66, 0x61, 0x75,
|
||||
0x6c, 0x74, 0x44, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x31, 0x12, 0x62, 0x0a, 0x12,
|
||||
0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
|
||||
0x65, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x65,
|
||||
0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65,
|
||||
0x32, 0x3a, 0x0a, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x32, 0x52, 0x11, 0x64,
|
||||
0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x44, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x32,
|
||||
0x1a, 0x69, 0x0a, 0x15, 0x45, 0x6e, 0x75, 0x6d, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
|
||||
0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x22, 0x27, 0x0a, 0x10, 0x4e, 0x65, 0x73,
|
||||
0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x32, 0x41, 0x12, 0x13, 0x0a,
|
||||
0x0f, 0x4e, 0x45, 0x53, 0x54, 0x45, 0x44, 0x5f, 0x32, 0x41, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45,
|
||||
0x10, 0x00, 0x22, 0x27, 0x0a, 0x10, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d,
|
||||
0x54, 0x79, 0x70, 0x65, 0x32, 0x42, 0x12, 0x13, 0x0a, 0x0f, 0x4e, 0x45, 0x53, 0x54, 0x45, 0x44,
|
||||
0x5f, 0x32, 0x42, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0x10, 0x00, 0x22, 0x27, 0x0a, 0x10, 0x4e,
|
||||
0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x31, 0x41, 0x12,
|
||||
0x13, 0x0a, 0x0f, 0x4e, 0x45, 0x53, 0x54, 0x45, 0x44, 0x5f, 0x31, 0x41, 0x5f, 0x56, 0x41, 0x4c,
|
||||
0x55, 0x45, 0x10, 0x00, 0x22, 0x27, 0x0a, 0x10, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e,
|
||||
0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x31, 0x42, 0x12, 0x13, 0x0a, 0x0f, 0x4e, 0x45, 0x53, 0x54,
|
||||
0x45, 0x44, 0x5f, 0x31, 0x42, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0x10, 0x00, 0x2a, 0x1d, 0x0a,
|
||||
0x09, 0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x31, 0x12, 0x07, 0x0a, 0x03, 0x4f, 0x4e,
|
||||
0x45, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x57, 0x4f, 0x10, 0x02, 0x2a, 0x51, 0x0a, 0x09,
|
||||
0x45, 0x6e, 0x75, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x32, 0x12, 0x0e, 0x0a, 0x0a, 0x64, 0x75, 0x70,
|
||||
0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x31, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x64, 0x75, 0x70,
|
||||
0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x32, 0x10, 0x01, 0x1a, 0x02, 0x10, 0x01, 0x22, 0x04, 0x08,
|
||||
0x02, 0x10, 0x02, 0x22, 0x04, 0x08, 0x03, 0x10, 0x03, 0x2a, 0x09, 0x52, 0x45, 0x53, 0x45, 0x52,
|
||||
0x56, 0x45, 0x44, 0x31, 0x2a, 0x09, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x32, 0x2a,
|
||||
0x3d, 0x0a, 0x17, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x55, 0x6e, 0x6d, 0x61, 0x72, 0x73, 0x68,
|
||||
0x61, 0x6c, 0x4a, 0x53, 0x4f, 0x4e, 0x54, 0x65, 0x73, 0x74, 0x12, 0x07, 0x0a, 0x03, 0x46, 0x4f,
|
||||
0x4f, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x41, 0x52, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03,
|
||||
0x42, 0x41, 0x5a, 0x10, 0x04, 0x1a, 0x07, 0x3a, 0x05, 0xd2, 0x3e, 0x02, 0x08, 0x01, 0x42, 0x4a,
|
||||
0x5a, 0x43, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e,
|
||||
0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x63, 0x6d, 0x64,
|
||||
0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x74,
|
||||
0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x65, 0x64, 0x69,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x73, 0x92, 0x03, 0x02, 0x10, 0x02, 0x62, 0x08, 0x65, 0x64, 0x69, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x73, 0x70, 0xe8, 0x07,
|
||||
}
|
||||
|
||||
var (
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescOnce sync.Once
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescData = file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDesc
|
||||
)
|
||||
|
||||
func file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescGZIP() []byte {
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescOnce.Do(func() {
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescData = protoimpl.X.CompressGZIP(file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescData)
|
||||
})
|
||||
return file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes = make([]protoimpl.EnumInfo, 7)
|
||||
var file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
|
||||
var file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_goTypes = []interface{}{
|
||||
(EnumType1)(0), // 0: goproto.protoc.protoeditions.EnumType1
|
||||
(EnumType2)(0), // 1: goproto.protoc.protoeditions.EnumType2
|
||||
(LegacyUnmarshalJSONTest)(0), // 2: goproto.protoc.protoeditions.LegacyUnmarshalJSONTest
|
||||
(EnumContainerMessage1_NestedEnumType1A)(0), // 3: goproto.protoc.protoeditions.EnumContainerMessage1.NestedEnumType1A
|
||||
(EnumContainerMessage1_NestedEnumType1B)(0), // 4: goproto.protoc.protoeditions.EnumContainerMessage1.NestedEnumType1B
|
||||
(EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A)(0), // 5: goproto.protoc.protoeditions.EnumContainerMessage1.EnumContainerMessage2.NestedEnumType2A
|
||||
(EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B)(0), // 6: goproto.protoc.protoeditions.EnumContainerMessage1.EnumContainerMessage2.NestedEnumType2B
|
||||
(*EnumContainerMessage1)(nil), // 7: goproto.protoc.protoeditions.EnumContainerMessage1
|
||||
(*EnumContainerMessage1_EnumContainerMessage2)(nil), // 8: goproto.protoc.protoeditions.EnumContainerMessage1.EnumContainerMessage2
|
||||
}
|
||||
var file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_depIdxs = []int32{
|
||||
1, // 0: goproto.protoc.protoeditions.EnumContainerMessage1.default_duplicate1:type_name -> goproto.protoc.protoeditions.EnumType2
|
||||
1, // 1: goproto.protoc.protoeditions.EnumContainerMessage1.default_duplicate2:type_name -> goproto.protoc.protoeditions.EnumType2
|
||||
2, // [2:2] is the sub-list for method output_type
|
||||
2, // [2:2] is the sub-list for method input_type
|
||||
2, // [2:2] is the sub-list for extension type_name
|
||||
2, // [2:2] is the sub-list for extension extendee
|
||||
0, // [0:2] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_init() }
|
||||
func file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_init() {
|
||||
if File_cmd_protoc_gen_go_testdata_protoeditions_enum_proto != nil {
|
||||
return
|
||||
}
|
||||
if !protoimpl.UnsafeEnabled {
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*EnumContainerMessage1); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*EnumContainerMessage1_EnumContainerMessage2); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
type x struct{}
|
||||
out := protoimpl.TypeBuilder{
|
||||
File: protoimpl.DescBuilder{
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDesc,
|
||||
NumEnums: 7,
|
||||
NumMessages: 2,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
GoTypes: file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_goTypes,
|
||||
DependencyIndexes: file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_depIdxs,
|
||||
EnumInfos: file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_enumTypes,
|
||||
MessageInfos: file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_msgTypes,
|
||||
}.Build()
|
||||
File_cmd_protoc_gen_go_testdata_protoeditions_enum_proto = out.File
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_rawDesc = nil
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_goTypes = nil
|
||||
file_cmd_protoc_gen_go_testdata_protoeditions_enum_proto_depIdxs = nil
|
||||
}
|
||||
66
cmd/protoc-gen-go/testdata/protoeditions/enum.proto
vendored
Normal file
66
cmd/protoc-gen-go/testdata/protoeditions/enum.proto
vendored
Normal file
@ -0,0 +1,66 @@
|
||||
// Copyright 2024 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
edition = "2023";
|
||||
|
||||
package goproto.protoc.protoeditions;
|
||||
|
||||
import "reflect/protodesc/proto/go_features.proto";
|
||||
|
||||
option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/protoeditions";
|
||||
option features.enum_type = CLOSED;
|
||||
|
||||
// EnumType1 comment.
|
||||
enum EnumType1 {
|
||||
// EnumType1_ONE comment.
|
||||
ONE = 1;
|
||||
// EnumType1_TWO comment.
|
||||
TWO = 2;
|
||||
}
|
||||
|
||||
enum EnumType2 {
|
||||
option allow_alias = true;
|
||||
|
||||
duplicate1 = 1;
|
||||
duplicate2 = 1;
|
||||
|
||||
reserved RESERVED1;
|
||||
reserved RESERVED2;
|
||||
reserved 2, 3;
|
||||
}
|
||||
|
||||
message EnumContainerMessage1 {
|
||||
EnumType2 default_duplicate1 = 1 [default = duplicate1];
|
||||
EnumType2 default_duplicate2 = 2 [default = duplicate2];
|
||||
|
||||
// NestedEnumType1A comment.
|
||||
enum NestedEnumType1A {
|
||||
// NestedEnumType1A_VALUE comment.
|
||||
NESTED_1A_VALUE = 0;
|
||||
}
|
||||
|
||||
enum NestedEnumType1B {
|
||||
NESTED_1B_VALUE = 0;
|
||||
}
|
||||
|
||||
message EnumContainerMessage2 {
|
||||
// NestedEnumType2A comment.
|
||||
enum NestedEnumType2A {
|
||||
// NestedEnumType2A_VALUE comment.
|
||||
NESTED_2A_VALUE = 0;
|
||||
}
|
||||
|
||||
enum NestedEnumType2B {
|
||||
NESTED_2B_VALUE = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
enum LegacyUnmarshalJSONTest {
|
||||
option features.(google.protobuf.go).legacy_unmarshal_json_enum = true;
|
||||
|
||||
FOO = 0;
|
||||
BAR = 1;
|
||||
BAZ = 4;
|
||||
}
|
||||
@ -84,6 +84,14 @@ func main() {
|
||||
flag.BoolVar(&run, "execute", false, "Write generated files to destination.")
|
||||
flag.StringVar(&protoRoot, "protoroot", os.Getenv("PROTOBUF_ROOT"), "The root of the protobuf source tree.")
|
||||
flag.Parse()
|
||||
protocPath, err := exec.LookPath("protoc")
|
||||
if err != nil {
|
||||
panic("protoc not found in $PATH.")
|
||||
|
||||
}
|
||||
if !strings.Contains(protocPath, ".cache/bin") {
|
||||
fmt.Fprintf(os.Stderr, "found protoc in $PATH but it is not in '.cache/bin`.\nRun ./test.bash and add '.cache/bin' to your $PATH to make sure you are using the same protoc as ./test.bash.\n")
|
||||
}
|
||||
if protoRoot == "" {
|
||||
panic("protobuf source root is not set")
|
||||
}
|
||||
@ -126,12 +134,18 @@ func generateLocalProtos() {
|
||||
annotate map[string]bool // .proto files to annotate
|
||||
exclude map[string]bool // .proto files to exclude from generation
|
||||
}{{
|
||||
path: "cmd/protoc-gen-go/testdata",
|
||||
pkgPaths: map[string]string{"cmd/protoc-gen-go/testdata/nopackage/nopackage.proto": "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/nopackage"},
|
||||
path: "cmd/protoc-gen-go/testdata",
|
||||
pkgPaths: map[string]string{
|
||||
"cmd/protoc-gen-go/testdata/nopackage/nopackage.proto": "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/nopackage",
|
||||
"reflect/protodesc/proto/go_features.proto": "google.golang.org/protobuf/types/gofeaturespb",
|
||||
},
|
||||
annotate: map[string]bool{"cmd/protoc-gen-go/testdata/annotations/annotations.proto": true},
|
||||
}, {
|
||||
path: "internal/testprotos",
|
||||
exclude: map[string]bool{"internal/testprotos/irregular/irregular.proto": true},
|
||||
}, {
|
||||
path: "reflect/protodesc/proto",
|
||||
pkgPaths: map[string]string{"reflect/protodesc/proto/go_features.proto": "google.golang.org/protobuf/types/gofeaturespb"},
|
||||
}}
|
||||
excludeRx := regexp.MustCompile(`legacy/.*/`)
|
||||
for _, d := range dirs {
|
||||
@ -171,6 +185,12 @@ func generateLocalProtos() {
|
||||
if filepath.Base(d.path) == "testdata" {
|
||||
var imports []string
|
||||
for sd := range subDirs {
|
||||
// TODO remove once editions runtime support has landed. Right
|
||||
// now editions based protos will crash the runtime test during
|
||||
// init.
|
||||
if strings.Contains(sd, "editions") {
|
||||
continue
|
||||
}
|
||||
imports = append(imports, fmt.Sprintf("_ %q", path.Join(modulePath, d.path, filepath.ToSlash(sd))))
|
||||
}
|
||||
sort.Strings(imports)
|
||||
@ -259,7 +279,11 @@ func generateRemoteProtos() {
|
||||
|
||||
func protoc(args ...string) {
|
||||
// TODO: Remove --experimental_allow_proto3_optional flag.
|
||||
cmd := exec.Command("protoc", "--plugin=protoc-gen-go="+os.Args[0], "--experimental_allow_proto3_optional")
|
||||
cmd := exec.Command(
|
||||
"protoc",
|
||||
"--plugin=protoc-gen-go="+os.Args[0],
|
||||
"--experimental_allow_proto3_optional",
|
||||
"--experimental_editions")
|
||||
cmd.Args = append(cmd.Args, args...)
|
||||
cmd.Env = append(os.Environ(), "RUN_AS_PROTOC_PLUGIN=1")
|
||||
out, err := cmd.CombinedOutput()
|
||||
|
||||
@ -98,6 +98,9 @@ type (
|
||||
// IsJSONCompliant is true if json_format is ALLOW
|
||||
// https://protobuf.dev/editions/features/#json_format
|
||||
IsJSONCompliant bool
|
||||
// GenerateLegacyUnmarshalJSON determines if the plugin generates the
|
||||
// UnmarshalJSON([]byte) error method for enums.
|
||||
GenerateLegacyUnmarshalJSON bool
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
31
internal/genid/go_features_gen.go
Normal file
31
internal/genid/go_features_gen.go
Normal file
@ -0,0 +1,31 @@
|
||||
// Copyright 2019 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
// Code generated by generate-protos. DO NOT EDIT.
|
||||
|
||||
package genid
|
||||
|
||||
import (
|
||||
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
|
||||
)
|
||||
|
||||
const File_reflect_protodesc_proto_go_features_proto = "reflect/protodesc/proto/go_features.proto"
|
||||
|
||||
// Names for google.protobuf.GoFeatures.
|
||||
const (
|
||||
GoFeatures_message_name protoreflect.Name = "GoFeatures"
|
||||
GoFeatures_message_fullname protoreflect.FullName = "google.protobuf.GoFeatures"
|
||||
)
|
||||
|
||||
// Field names for google.protobuf.GoFeatures.
|
||||
const (
|
||||
GoFeatures_LegacyUnmarshalJsonEnum_field_name protoreflect.Name = "legacy_unmarshal_json_enum"
|
||||
|
||||
GoFeatures_LegacyUnmarshalJsonEnum_field_fullname protoreflect.FullName = "google.protobuf.GoFeatures.legacy_unmarshal_json_enum"
|
||||
)
|
||||
|
||||
// Field numbers for google.protobuf.GoFeatures.
|
||||
const (
|
||||
GoFeatures_LegacyUnmarshalJsonEnum_field_number protoreflect.FieldNumber = 1
|
||||
)
|
||||
@ -28,6 +28,7 @@ func (r descsByName) initEnumDeclarations(eds []*descriptorpb.EnumDescriptorProt
|
||||
opts = proto.Clone(opts).(*descriptorpb.EnumOptions)
|
||||
e.L2.Options = func() protoreflect.ProtoMessage { return opts }
|
||||
}
|
||||
e.L1.EditionFeatures = mergeEditionFeatures(parent, ed.GetOptions().GetFeatures())
|
||||
for _, s := range ed.GetReservedName() {
|
||||
e.L2.ReservedNames.List = append(e.L2.ReservedNames.List, protoreflect.Name(s))
|
||||
}
|
||||
@ -37,9 +38,6 @@ func (r descsByName) initEnumDeclarations(eds []*descriptorpb.EnumDescriptorProt
|
||||
protoreflect.EnumNumber(rr.GetEnd()),
|
||||
})
|
||||
}
|
||||
if e.Base.L0.ParentFile.Syntax() == protoreflect.Editions {
|
||||
e.L1.EditionFeatures = mergeEditionFeatures(parent, ed.GetOptions().GetFeatures())
|
||||
}
|
||||
if e.L2.Values.List, err = r.initEnumValuesFromDescriptorProto(ed.GetValue(), e, sb); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@ import (
|
||||
"google.golang.org/protobuf/proto"
|
||||
"google.golang.org/protobuf/reflect/protoreflect"
|
||||
"google.golang.org/protobuf/types/descriptorpb"
|
||||
gofeaturespb "google.golang.org/protobuf/types/gofeaturespb"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -127,6 +128,12 @@ func mergeEditionFeatures(parentDesc protoreflect.Descriptor, child *descriptorp
|
||||
parentFS.IsJSONCompliant = *jf == descriptorpb.FeatureSet_ALLOW
|
||||
}
|
||||
|
||||
if goFeatures, ok := proto.GetExtension(child, gofeaturespb.E_Go).(*gofeaturespb.GoFeatures); ok && goFeatures != nil {
|
||||
if luje := goFeatures.LegacyUnmarshalJsonEnum; luje != nil {
|
||||
parentFS.GenerateLegacyUnmarshalJSON = *luje
|
||||
}
|
||||
}
|
||||
|
||||
return parentFS
|
||||
}
|
||||
|
||||
|
||||
@ -11,15 +11,14 @@ package google.protobuf;
|
||||
|
||||
import "google/protobuf/descriptor.proto";
|
||||
|
||||
option go_package = "google.golang.org/protobuf/reflect/protodesc/proto";
|
||||
|
||||
extend google.protobuf.FeatureSet {
|
||||
optional GoFeatures go = 1002;
|
||||
}
|
||||
|
||||
message GoFeatures {
|
||||
// Whether or not to generate the deprecated UnmarshalJSON method for enums.
|
||||
// BEGIN GOOGLE-INTERNAL
|
||||
// Can only be true for proto using the OPEN_V1 api.
|
||||
// END GOOGLE-INTERNAL
|
||||
optional bool legacy_unmarshal_json_enum = 1 [
|
||||
retention = RETENTION_RUNTIME,
|
||||
targets = TARGET_TYPE_ENUM,
|
||||
|
||||
177
types/gofeaturespb/go_features.pb.go
Normal file
177
types/gofeaturespb/go_features.pb.go
Normal file
@ -0,0 +1,177 @@
|
||||
// Protocol Buffers - Google's data interchange format
|
||||
// Copyright 2023 Google Inc. All rights reserved.
|
||||
//
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file or at
|
||||
// https://developers.google.com/open-source/licenses/bsd
|
||||
|
||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// source: reflect/protodesc/proto/go_features.proto
|
||||
|
||||
package proto
|
||||
|
||||
import (
|
||||
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
|
||||
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
|
||||
descriptorpb "google.golang.org/protobuf/types/descriptorpb"
|
||||
reflect "reflect"
|
||||
sync "sync"
|
||||
)
|
||||
|
||||
type GoFeatures struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
// Whether or not to generate the deprecated UnmarshalJSON method for enums.
|
||||
LegacyUnmarshalJsonEnum *bool `protobuf:"varint,1,opt,name=legacy_unmarshal_json_enum,json=legacyUnmarshalJsonEnum" json:"legacy_unmarshal_json_enum,omitempty"`
|
||||
}
|
||||
|
||||
func (x *GoFeatures) Reset() {
|
||||
*x = GoFeatures{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_reflect_protodesc_proto_go_features_proto_msgTypes[0]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *GoFeatures) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*GoFeatures) ProtoMessage() {}
|
||||
|
||||
func (x *GoFeatures) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_reflect_protodesc_proto_go_features_proto_msgTypes[0]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use GoFeatures.ProtoReflect.Descriptor instead.
|
||||
func (*GoFeatures) Descriptor() ([]byte, []int) {
|
||||
return file_reflect_protodesc_proto_go_features_proto_rawDescGZIP(), []int{0}
|
||||
}
|
||||
|
||||
func (x *GoFeatures) GetLegacyUnmarshalJsonEnum() bool {
|
||||
if x != nil && x.LegacyUnmarshalJsonEnum != nil {
|
||||
return *x.LegacyUnmarshalJsonEnum
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
var file_reflect_protodesc_proto_go_features_proto_extTypes = []protoimpl.ExtensionInfo{
|
||||
{
|
||||
ExtendedType: (*descriptorpb.FeatureSet)(nil),
|
||||
ExtensionType: (*GoFeatures)(nil),
|
||||
Field: 1002,
|
||||
Name: "google.protobuf.go",
|
||||
Tag: "bytes,1002,opt,name=go",
|
||||
Filename: "reflect/protodesc/proto/go_features.proto",
|
||||
},
|
||||
}
|
||||
|
||||
// Extension fields to descriptorpb.FeatureSet.
|
||||
var (
|
||||
// optional google.protobuf.GoFeatures go = 1002;
|
||||
E_Go = &file_reflect_protodesc_proto_go_features_proto_extTypes[0]
|
||||
)
|
||||
|
||||
var File_reflect_protodesc_proto_go_features_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_reflect_protodesc_proto_go_features_proto_rawDesc = []byte{
|
||||
0x0a, 0x29, 0x72, 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x64,
|
||||
0x65, 0x73, 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x5f, 0x66, 0x65, 0x61,
|
||||
0x74, 0x75, 0x72, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x67, 0x6f, 0x6f,
|
||||
0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x1a, 0x20, 0x67, 0x6f,
|
||||
0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65,
|
||||
0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6a,
|
||||
0x0a, 0x0a, 0x47, 0x6f, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x5c, 0x0a, 0x1a,
|
||||
0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x75, 0x6e, 0x6d, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6c,
|
||||
0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
|
||||
0x42, 0x1f, 0x88, 0x01, 0x01, 0x98, 0x01, 0x06, 0xa2, 0x01, 0x09, 0x12, 0x04, 0x74, 0x72, 0x75,
|
||||
0x65, 0x18, 0xe6, 0x07, 0xa2, 0x01, 0x0a, 0x12, 0x05, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x18, 0xe7,
|
||||
0x07, 0x52, 0x17, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x55, 0x6e, 0x6d, 0x61, 0x72, 0x73, 0x68,
|
||||
0x61, 0x6c, 0x4a, 0x73, 0x6f, 0x6e, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x49, 0x0a, 0x02, 0x67, 0x6f,
|
||||
0x12, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
|
||||
0x75, 0x66, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x65, 0x74, 0x18, 0xea, 0x07,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x47, 0x6f, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65,
|
||||
0x73, 0x52, 0x02, 0x67, 0x6f, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
|
||||
0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x62, 0x75, 0x66, 0x2f, 0x72, 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x64, 0x65, 0x73, 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
}
|
||||
|
||||
var (
|
||||
file_reflect_protodesc_proto_go_features_proto_rawDescOnce sync.Once
|
||||
file_reflect_protodesc_proto_go_features_proto_rawDescData = file_reflect_protodesc_proto_go_features_proto_rawDesc
|
||||
)
|
||||
|
||||
func file_reflect_protodesc_proto_go_features_proto_rawDescGZIP() []byte {
|
||||
file_reflect_protodesc_proto_go_features_proto_rawDescOnce.Do(func() {
|
||||
file_reflect_protodesc_proto_go_features_proto_rawDescData = protoimpl.X.CompressGZIP(file_reflect_protodesc_proto_go_features_proto_rawDescData)
|
||||
})
|
||||
return file_reflect_protodesc_proto_go_features_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_reflect_protodesc_proto_go_features_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
|
||||
var file_reflect_protodesc_proto_go_features_proto_goTypes = []interface{}{
|
||||
(*GoFeatures)(nil), // 0: google.protobuf.GoFeatures
|
||||
(*descriptorpb.FeatureSet)(nil), // 1: google.protobuf.FeatureSet
|
||||
}
|
||||
var file_reflect_protodesc_proto_go_features_proto_depIdxs = []int32{
|
||||
1, // 0: google.protobuf.go:extendee -> google.protobuf.FeatureSet
|
||||
0, // 1: google.protobuf.go:type_name -> google.protobuf.GoFeatures
|
||||
2, // [2:2] is the sub-list for method output_type
|
||||
2, // [2:2] is the sub-list for method input_type
|
||||
1, // [1:2] is the sub-list for extension type_name
|
||||
0, // [0:1] is the sub-list for extension extendee
|
||||
0, // [0:0] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_reflect_protodesc_proto_go_features_proto_init() }
|
||||
func file_reflect_protodesc_proto_go_features_proto_init() {
|
||||
if File_reflect_protodesc_proto_go_features_proto != nil {
|
||||
return
|
||||
}
|
||||
if !protoimpl.UnsafeEnabled {
|
||||
file_reflect_protodesc_proto_go_features_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*GoFeatures); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
type x struct{}
|
||||
out := protoimpl.TypeBuilder{
|
||||
File: protoimpl.DescBuilder{
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_reflect_protodesc_proto_go_features_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 1,
|
||||
NumExtensions: 1,
|
||||
NumServices: 0,
|
||||
},
|
||||
GoTypes: file_reflect_protodesc_proto_go_features_proto_goTypes,
|
||||
DependencyIndexes: file_reflect_protodesc_proto_go_features_proto_depIdxs,
|
||||
MessageInfos: file_reflect_protodesc_proto_go_features_proto_msgTypes,
|
||||
ExtensionInfos: file_reflect_protodesc_proto_go_features_proto_extTypes,
|
||||
}.Build()
|
||||
File_reflect_protodesc_proto_go_features_proto = out.File
|
||||
file_reflect_protodesc_proto_go_features_proto_rawDesc = nil
|
||||
file_reflect_protodesc_proto_go_features_proto_goTypes = nil
|
||||
file_reflect_protodesc_proto_go_features_proto_depIdxs = nil
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user