mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2025-02-18 18:39:51 +00:00
reflect/protoreflect: add HasJSONName, ReservedRanges, and ReservedNames
These properties of descriptors are currently missing and makes it impossible to convert a FileDescriptorProto into one of the structured Go representations and convert it back to a proto message without loss of information. Furthermore, ReservedRanges and ReservedNames has semantic importance to text serialization. Change-Id: Ic33c30020ad51912b143156b95f47a4fb8da3503 Reviewed-on: https://go-review.googlesource.com/c/153019 Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
Joe Tsai
Joe Tsai
parent
381f04c102
commit
bce82b8e0d
@ -207,6 +207,22 @@ func genReflectFileDescriptor(gen *protogen.Plugin, g *protogen.GeneratedFile, f
|
||||
g.P("{Name: ", strconv.Quote(string(value.Desc.Name())), ", Number: ", value.Desc.Number(), "},")
|
||||
}
|
||||
g.P("},")
|
||||
if resvNames := enum.Desc.ReservedNames(); resvNames.Len() > 0 {
|
||||
var ss []string
|
||||
for i := 0; i < resvNames.Len(); i++ {
|
||||
s := resvNames.Get(i)
|
||||
ss = append(ss, strconv.Quote(string(s)))
|
||||
}
|
||||
g.P("ReservedNames: []", protoreflectPackage.Ident("Name"), "{", strings.Join(ss, ","), "},")
|
||||
}
|
||||
if resvRanges := enum.Desc.ReservedRanges(); resvRanges.Len() > 0 {
|
||||
var ss []string
|
||||
for i := 0; i < resvRanges.Len(); i++ {
|
||||
r := resvRanges.Get(i)
|
||||
ss = append(ss, fmt.Sprintf("{%d,%d}", r[0], r[1]))
|
||||
}
|
||||
g.P("ReservedRanges: [][2]", protoreflectPackage.Ident("EnumNumber"), "{", strings.Join(ss, ","), "},")
|
||||
}
|
||||
g.P("},")
|
||||
}
|
||||
g.P("}")
|
||||
@ -245,8 +261,9 @@ func genReflectFileDescriptor(gen *protogen.Plugin, g *protogen.GeneratedFile, f
|
||||
g.P("Number: ", field.Number(), ",")
|
||||
g.P("Cardinality: ", protoreflectPackage.Ident(field.Cardinality().GoString()), ",")
|
||||
g.P("Kind: ", protoreflectPackage.Ident(field.Kind().GoString()), ",")
|
||||
// TODO: omit JSONName if it can be derived from Name?
|
||||
g.P("JSONName: ", strconv.Quote(field.JSONName()), ",")
|
||||
if field.HasJSONName() {
|
||||
g.P("JSONName: ", strconv.Quote(field.JSONName()), ",")
|
||||
}
|
||||
if field.HasDefault() {
|
||||
v := field.Default().Interface()
|
||||
typeName := reflect.TypeOf(v).Name()
|
||||
@ -285,6 +302,22 @@ func genReflectFileDescriptor(gen *protogen.Plugin, g *protogen.GeneratedFile, f
|
||||
}
|
||||
g.P("},")
|
||||
}
|
||||
if resvNames := message.Desc.ReservedNames(); resvNames.Len() > 0 {
|
||||
var ss []string
|
||||
for i := 0; i < resvNames.Len(); i++ {
|
||||
s := resvNames.Get(i)
|
||||
ss = append(ss, strconv.Quote(string(s)))
|
||||
}
|
||||
g.P("ReservedNames: []", protoreflectPackage.Ident("Name"), "{", strings.Join(ss, ","), "},")
|
||||
}
|
||||
if resvRanges := message.Desc.ReservedRanges(); resvRanges.Len() > 0 {
|
||||
var ss []string
|
||||
for i := 0; i < resvRanges.Len(); i++ {
|
||||
r := resvRanges.Get(i)
|
||||
ss = append(ss, fmt.Sprintf("{%d,%d}", r[0], r[1]))
|
||||
}
|
||||
g.P("ReservedRanges: [][2]", protoreflectPackage.Ident("FieldNumber"), "{", strings.Join(ss, ","), "},")
|
||||
}
|
||||
if extRanges := message.Desc.ExtensionRanges(); extRanges.Len() > 0 {
|
||||
var ss []string
|
||||
for i := 0; i < extRanges.Len(); i++ {
|
||||
|
||||
43
cmd/protoc-gen-go/testdata/proto2/enum.pb.go
vendored
43
cmd/protoc-gen-go/testdata/proto2/enum.pb.go
vendored
@ -461,26 +461,27 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptor_de9f68860d540858 = []byte{
|
||||
// 296 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0xd0, 0xc1, 0x4b, 0xfb, 0x30,
|
||||
0x14, 0x07, 0xf0, 0x5f, 0xb6, 0xc3, 0x0f, 0x73, 0x98, 0x59, 0x64, 0x30, 0x06, 0xc2, 0xd8, 0x45,
|
||||
0x19, 0xac, 0x21, 0xef, 0xe8, 0x45, 0x3a, 0xd7, 0x9b, 0x6e, 0xa0, 0x53, 0x41, 0x0f, 0x25, 0x6b,
|
||||
0xb3, 0x58, 0x68, 0x93, 0xb2, 0x26, 0x82, 0xff, 0x84, 0x7f, 0xb3, 0xac, 0x95, 0xae, 0x62, 0x15,
|
||||
0x3c, 0xe5, 0xbd, 0x97, 0x6f, 0x3e, 0x90, 0x87, 0xfb, 0xf9, 0xce, 0x58, 0x03, 0x4c, 0x6a, 0x97,
|
||||
0x79, 0x65, 0x4d, 0x07, 0xca, 0x94, 0x45, 0xd5, 0x46, 0xd5, 0x01, 0x93, 0xf7, 0x2e, 0x1e, 0x04,
|
||||
0xda, 0x65, 0x57, 0x46, 0x5b, 0x91, 0x68, 0xb9, 0xbb, 0x91, 0x45, 0x21, 0x94, 0xe4, 0xf4, 0x19,
|
||||
0xd3, 0x58, 0x6e, 0x85, 0x4b, 0x6d, 0x18, 0xbb, 0x3c, 0x4d, 0x22, 0x61, 0x25, 0x1f, 0xa2, 0x31,
|
||||
0x3a, 0xef, 0xc1, 0xd8, 0x6b, 0xd5, 0xbc, 0xbd, 0xb4, 0x7e, 0xcb, 0x25, 0x5c, 0xe0, 0xc3, 0x9b,
|
||||
0xdb, 0xfe, 0xa7, 0xb3, 0xa8, 0x47, 0xad, 0x38, 0x0c, 0x3b, 0x7f, 0xc6, 0xe1, 0x3b, 0x0e, 0xa3,
|
||||
0xa4, 0xfd, 0x4b, 0x30, 0x39, 0xc3, 0x64, 0x29, 0x0b, 0x2b, 0xe3, 0x9a, 0xf2, 0xe9, 0x09, 0x3e,
|
||||
0x5e, 0x06, 0x77, 0xeb, 0x60, 0x11, 0x82, 0x1f, 0x3e, 0xf8, 0xd7, 0xf7, 0x01, 0xf9, 0xd7, 0x12,
|
||||
0x9c, 0x37, 0x83, 0xf3, 0x9f, 0x83, 0xbc, 0x29, 0xf2, 0x5f, 0x44, 0xde, 0x14, 0x79, 0x2d, 0x4e,
|
||||
0x4f, 0xf1, 0x51, 0x1d, 0xa1, 0xff, 0x71, 0x77, 0xb5, 0x0c, 0x08, 0xda, 0x17, 0xeb, 0xc7, 0x15,
|
||||
0xe9, 0x4c, 0xd9, 0xe1, 0x1a, 0x68, 0x0f, 0x37, 0xd6, 0x4c, 0xd0, 0x97, 0x1e, 0x08, 0x1a, 0x75,
|
||||
0x08, 0x9a, 0xfb, 0x4f, 0x97, 0x2a, 0xb1, 0x2f, 0x6e, 0xe3, 0x45, 0x26, 0x63, 0xca, 0xa4, 0x42,
|
||||
0x2b, 0x56, 0x6e, 0x74, 0xe3, 0xb6, 0xec, 0x15, 0x58, 0x94, 0xc5, 0x55, 0x1f, 0xcd, 0x94, 0xd4,
|
||||
0x33, 0x65, 0x98, 0x95, 0x85, 0x8d, 0x85, 0x15, 0xd5, 0x18, 0x3e, 0x02, 0x00, 0x00, 0xff, 0xff,
|
||||
0x26, 0xf5, 0x57, 0x52, 0x4e, 0x02, 0x00, 0x00,
|
||||
// 317 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0xd0, 0xd1, 0x4b, 0xc2, 0x40,
|
||||
0x1c, 0x07, 0xf0, 0xb6, 0x09, 0xe9, 0x3d, 0xd8, 0xb9, 0x10, 0x44, 0x08, 0x64, 0x2f, 0x85, 0xe0,
|
||||
0xc6, 0xfd, 0x1e, 0x7b, 0x89, 0x99, 0xf7, 0x56, 0x4a, 0x6a, 0x06, 0xf5, 0x20, 0xe7, 0x76, 0x5e,
|
||||
0x03, 0x77, 0x27, 0xee, 0x2e, 0xe8, 0x9f, 0xe8, 0x6f, 0x0e, 0x5d, 0xcc, 0x45, 0x2b, 0xe8, 0x69,
|
||||
0xdf, 0xdf, 0x6f, 0xdf, 0x7d, 0x60, 0x3f, 0xd4, 0xda, 0xee, 0x94, 0x56, 0x10, 0x70, 0x69, 0x52,
|
||||
0xff, 0x90, 0xdd, 0xb6, 0x50, 0x87, 0x90, 0x8f, 0x51, 0xfe, 0x00, 0xef, 0xc3, 0x41, 0x6d, 0x2a,
|
||||
0x4d, 0x7a, 0xab, 0xa4, 0x66, 0x89, 0xe4, 0xbb, 0x7b, 0x9e, 0x65, 0x4c, 0x70, 0xe2, 0xbe, 0x20,
|
||||
0x37, 0xe6, 0x6b, 0x66, 0x36, 0x7a, 0x19, 0x9b, 0xed, 0x26, 0x89, 0x98, 0xe6, 0xa4, 0x63, 0xf5,
|
||||
0xac, 0xab, 0x26, 0xf4, 0xfc, 0x4a, 0xcd, 0xdf, 0x4b, 0xf3, 0xf7, 0x2d, 0x87, 0x6b, 0x74, 0xfc,
|
||||
0x66, 0xda, 0xfa, 0x72, 0x46, 0xc5, 0xaa, 0x12, 0x87, 0x8e, 0xfd, 0x6f, 0x1c, 0x7e, 0xe2, 0xd0,
|
||||
0x4d, 0xaa, 0x7f, 0x09, 0xbc, 0x4b, 0x84, 0xc7, 0x3c, 0xd3, 0x3c, 0x2e, 0xa8, 0xd0, 0x3d, 0x47,
|
||||
0x67, 0x63, 0x3a, 0x9b, 0xd3, 0xd1, 0x12, 0xc2, 0xe5, 0x22, 0xbc, 0x7b, 0xa4, 0xf8, 0xa4, 0xa2,
|
||||
0x38, 0x2c, 0x17, 0x87, 0xbf, 0x17, 0x49, 0x59, 0x24, 0x7f, 0x88, 0xa4, 0x2c, 0x92, 0x42, 0xec,
|
||||
0x5f, 0xa0, 0x46, 0x51, 0x71, 0x4f, 0x91, 0x33, 0x19, 0x53, 0x6c, 0xed, 0xc3, 0xfc, 0x69, 0x82,
|
||||
0xed, 0xfe, 0xc3, 0xf1, 0x35, 0xb8, 0x4d, 0x54, 0x3a, 0x33, 0xb6, 0xbe, 0xcd, 0x80, 0xad, 0xae,
|
||||
0x8d, 0x2d, 0xaf, 0x56, 0xb7, 0xb1, 0xed, 0xd5, 0xea, 0x0e, 0x76, 0xfa, 0x8d, 0x29, 0x9d, 0xd1,
|
||||
0xe9, 0x82, 0x8e, 0xc8, 0x31, 0xc2, 0x30, 0x7c, 0xbe, 0x11, 0x89, 0x7e, 0x35, 0x2b, 0x3f, 0x52,
|
||||
0x69, 0x20, 0xd4, 0x86, 0x49, 0x11, 0x1c, 0x6e, 0xbe, 0x32, 0xeb, 0xe0, 0x0d, 0x82, 0x28, 0x8d,
|
||||
0xf3, 0x39, 0x1a, 0x08, 0x2e, 0x07, 0x42, 0x05, 0x9a, 0x67, 0x3a, 0x66, 0x9a, 0xe5, 0x6b, 0xf8,
|
||||
0x0c, 0x00, 0x00, 0xff, 0xff, 0x8c, 0xcb, 0xe0, 0x01, 0x70, 0x02, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func init() {
|
||||
@ -559,6 +560,8 @@ var xxx_Enum_ProtoFile_EnumDescs = [6]prototype.Enum{
|
||||
{Name: "duplicate1", Number: 1},
|
||||
{Name: "duplicate2", Number: 1},
|
||||
},
|
||||
ReservedNames: []protoreflect.Name{"RESERVED1", "RESERVED2"},
|
||||
ReservedRanges: [][2]protoreflect.EnumNumber{{2, 2}, {3, 3}},
|
||||
},
|
||||
{
|
||||
Name: "NestedEnumType1A",
|
||||
|
||||
4
cmd/protoc-gen-go/testdata/proto2/enum.proto
vendored
4
cmd/protoc-gen-go/testdata/proto2/enum.proto
vendored
@ -20,6 +20,10 @@ enum EnumType2 {
|
||||
option allow_alias = true;
|
||||
duplicate1 = 1;
|
||||
duplicate2 = 1;
|
||||
|
||||
reserved "RESERVED1";
|
||||
reserved "RESERVED2";
|
||||
reserved 2, 3;
|
||||
}
|
||||
|
||||
message EnumContainerMessage1 {
|
||||
|
||||
251
cmd/protoc-gen-go/testdata/proto2/fields.pb.go
vendored
251
cmd/protoc-gen-go/testdata/proto2/fields.pb.go
vendored
@ -1445,129 +1445,132 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptor_fd8a9d72b841fd68 = []byte{
|
||||
// 1941 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0x5b, 0x73, 0x23, 0x47,
|
||||
0x15, 0xc7, 0x3d, 0x23, 0xf9, 0xa2, 0xb6, 0x65, 0xc9, 0xed, 0x2c, 0xd5, 0xec, 0x53, 0xc7, 0x04,
|
||||
0x32, 0x21, 0xbb, 0x76, 0x2c, 0x8f, 0xdb, 0x89, 0x80, 0x02, 0x5c, 0x78, 0x31, 0x55, 0xb0, 0x0b,
|
||||
0xc3, 0x6e, 0x51, 0xb5, 0x71, 0x95, 0x6b, 0x6c, 0x8d, 0xb4, 0x22, 0xd2, 0x8c, 0x22, 0x8d, 0x76,
|
||||
0x59, 0x3e, 0x05, 0xd7, 0x8f, 0xc1, 0xfd, 0x0e, 0xe1, 0x03, 0x70, 0xbf, 0x5f, 0x92, 0x40, 0x96,
|
||||
0xfb, 0xf5, 0x91, 0xcb, 0xeb, 0xa6, 0x4e, 0x9f, 0xee, 0x9e, 0xee, 0xd1, 0x3e, 0xd8, 0x7e, 0xb2,
|
||||
0x75, 0xf4, 0x3f, 0xe7, 0xdf, 0xdd, 0xd3, 0xbf, 0xa3, 0x9e, 0x26, 0xeb, 0xa3, 0x71, 0x96, 0x67,
|
||||
0xad, 0xad, 0x6e, 0x3f, 0x19, 0x74, 0x26, 0x9b, 0xf2, 0x13, 0xbd, 0xd4, 0xcb, 0xe4, 0x3f, 0xf8,
|
||||
0xf1, 0x14, 0xff, 0xb4, 0x36, 0xfe, 0x73, 0x85, 0x34, 0xaf, 0x81, 0xee, 0x66, 0x32, 0xc9, 0x3f,
|
||||
0x90, 0x4c, 0x26, 0x71, 0x2f, 0xa1, 0x6f, 0x22, 0xf5, 0x6c, 0x94, 0xf7, 0xb3, 0x34, 0x1e, 0x1c,
|
||||
0x9f, 0x64, 0xd9, 0x80, 0x79, 0xdc, 0x0b, 0x96, 0xa2, 0x15, 0x1d, 0xdc, 0xcf, 0xb2, 0x01, 0xfd,
|
||||
0x90, 0x25, 0x4a, 0xd2, 0xe9, 0x90, 0xf9, 0xdc, 0x0b, 0x56, 0x5b, 0x57, 0x36, 0x1f, 0x69, 0xb4,
|
||||
0x59, 0x36, 0xd9, 0x3c, 0x48, 0xa7, 0xc3, 0xa2, 0x24, 0x7c, 0xa2, 0x6f, 0x26, 0xab, 0xa6, 0x64,
|
||||
0x3f, 0xcd, 0x77, 0x5a, 0xac, 0xc2, 0xbd, 0x60, 0x3e, 0x32, 0x46, 0xef, 0x83, 0x20, 0x7d, 0x92,
|
||||
0x34, 0x8c, 0x6c, 0x82, 0xba, 0x2a, 0xf7, 0x82, 0xb5, 0xc8, 0x64, 0x7f, 0xb8, 0x3f, 0x23, 0x9c,
|
||||
0xa2, 0x70, 0x9e, 0x7b, 0x41, 0xbd, 0x10, 0xde, 0x42, 0x61, 0xc9, 0x58, 0x84, 0x6c, 0x81, 0x7b,
|
||||
0x41, 0xc5, 0x31, 0x16, 0xe1, 0x8c, 0xb1, 0x08, 0xd9, 0x22, 0xf7, 0x02, 0xea, 0x1a, 0x97, 0x84,
|
||||
0x53, 0x14, 0x2e, 0x71, 0x2f, 0xa8, 0xba, 0xc6, 0x22, 0xa4, 0x4f, 0x93, 0xb5, 0xa2, 0x62, 0xb7,
|
||||
0xff, 0xb1, 0xa4, 0xb3, 0xd3, 0x62, 0x35, 0xee, 0x05, 0x8d, 0xa8, 0x69, 0x6a, 0xaa, 0x38, 0x7d,
|
||||
0x8a, 0x98, 0xd8, 0xb1, 0xd6, 0x12, 0xee, 0x05, 0x8b, 0x91, 0x71, 0xbb, 0xa6, 0xa4, 0xf6, 0x84,
|
||||
0xba, 0x83, 0x2c, 0xce, 0xd9, 0x32, 0xf7, 0x02, 0xbf, 0x98, 0xd0, 0x35, 0x08, 0x3e, 0xc2, 0x5e,
|
||||
0x84, 0x6c, 0x85, 0x7b, 0x41, 0xb3, 0x6c, 0x2f, 0xc2, 0x59, 0x7b, 0x11, 0xb2, 0x3a, 0xf7, 0x82,
|
||||
0x85, 0x92, 0x7d, 0x69, 0xfe, 0x9d, 0x6c, 0x7a, 0x32, 0x48, 0xd8, 0x2a, 0xf7, 0x02, 0xaf, 0x98,
|
||||
0xff, 0x7b, 0x64, 0xd4, 0x5d, 0xd1, 0x7c, 0xdc, 0x4f, 0x7b, 0xac, 0xc1, 0xbd, 0xa0, 0x66, 0xad,
|
||||
0xa8, 0x8c, 0x3a, 0x13, 0x3a, 0xb9, 0x9f, 0x27, 0x13, 0xd6, 0xe4, 0x5e, 0xb0, 0x52, 0x4c, 0x68,
|
||||
0x1f, 0x82, 0xf4, 0xb6, 0x35, 0x46, 0xb5, 0xd1, 0xd8, 0x1a, 0xf7, 0x82, 0xe5, 0xd6, 0xd6, 0x59,
|
||||
0xf7, 0xa5, 0xfa, 0x5b, 0x4c, 0x4a, 0x53, 0xf1, 0x7c, 0xb1, 0xe1, 0x7b, 0xe3, 0x6c, 0x3a, 0x62,
|
||||
0x94, 0x7b, 0x01, 0x69, 0xed, 0x9e, 0xb5, 0xf0, 0x0d, 0x95, 0xfc, 0x5e, 0x48, 0x8e, 0xdc, 0x5a,
|
||||
0x80, 0xdc, 0x38, 0x79, 0x71, 0xda, 0x1f, 0x27, 0x1d, 0x44, 0x2e, 0xe1, 0x3e, 0x20, 0xa7, 0x83,
|
||||
0x1a, 0x39, 0x23, 0x92, 0xc8, 0x75, 0xb9, 0x7f, 0x7e, 0xe4, 0x74, 0x09, 0x8d, 0x9c, 0x29, 0x89,
|
||||
0x84, 0xf4, 0xb8, 0x0f, 0xc8, 0xe9, 0xa8, 0x41, 0xce, 0xc8, 0x14, 0x72, 0x77, 0xb8, 0x0f, 0xc8,
|
||||
0xe9, 0x70, 0x81, 0x9c, 0x11, 0x2a, 0xe4, 0xfa, 0xdc, 0x07, 0xe4, 0x74, 0xb8, 0x40, 0xce, 0x36,
|
||||
0x16, 0x21, 0xfb, 0x28, 0xf7, 0x01, 0x39, 0xcb, 0x18, 0x77, 0x92, 0x63, 0x2c, 0x42, 0xf6, 0x02,
|
||||
0xf7, 0x01, 0x39, 0xdb, 0xb8, 0x24, 0x54, 0xc8, 0x0d, 0xb8, 0x0f, 0xc8, 0xd9, 0xc6, 0x88, 0x5c,
|
||||
0x51, 0x51, 0x63, 0x34, 0xe4, 0x3e, 0x20, 0x67, 0x6a, 0x5a, 0xc8, 0x19, 0xb1, 0xd6, 0xa6, 0xdc,
|
||||
0x07, 0xe4, 0x74, 0xdc, 0x42, 0xae, 0x90, 0x4a, 0xe4, 0x32, 0xee, 0x03, 0x72, 0x46, 0xa8, 0x91,
|
||||
0x2b, 0xd9, 0x8b, 0x90, 0x8d, 0xb8, 0x0f, 0xc8, 0xb9, 0xf6, 0x88, 0x9c, 0x6b, 0x2f, 0x42, 0xf6,
|
||||
0x22, 0xf7, 0x01, 0x39, 0xc7, 0xbe, 0x34, 0x7f, 0x85, 0xdc, 0x98, 0xfb, 0x80, 0x9c, 0x0e, 0x17,
|
||||
0xc8, 0x15, 0x03, 0x40, 0xe4, 0x26, 0xdc, 0x07, 0xe4, 0x8c, 0xbd, 0x41, 0xae, 0xd8, 0x92, 0x12,
|
||||
0xb9, 0x9c, 0xfb, 0x80, 0x9c, 0xd9, 0x93, 0x1a, 0x39, 0x23, 0xd3, 0xc8, 0x4d, 0xb9, 0x7f, 0x21,
|
||||
0xe4, 0x74, 0x21, 0x0b, 0x39, 0x1d, 0x42, 0xe4, 0xee, 0x72, 0xff, 0x3c, 0xc8, 0x45, 0x2a, 0x59,
|
||||
0x21, 0xe7, 0xd4, 0xa2, 0x4f, 0x40, 0xf1, 0x51, 0x12, 0xe7, 0x1a, 0xb9, 0xef, 0x79, 0xbc, 0x82,
|
||||
0xcc, 0x61, 0x54, 0x32, 0x17, 0x59, 0x2a, 0xc9, 0xdc, 0xf7, 0x41, 0x75, 0x01, 0xe8, 0xb0, 0x86,
|
||||
0x84, 0xee, 0x2d, 0xb0, 0xb2, 0xaa, 0x26, 0x32, 0xf2, 0x03, 0x28, 0x2a, 0xa9, 0xc3, 0x30, 0x52,
|
||||
0x17, 0xc0, 0xa3, 0x52, 0x3a, 0x45, 0xdd, 0x0f, 0x41, 0x28, 0xb1, 0xc3, 0xb8, 0xc2, 0xce, 0x56,
|
||||
0x2a, 0xec, 0x7e, 0x04, 0xca, 0x7a, 0xa1, 0x54, 0xdc, 0x95, 0xbc, 0x45, 0xc8, 0x7e, 0x0c, 0xc2,
|
||||
0x8a, 0xe3, 0x2d, 0xc2, 0x19, 0x6f, 0x11, 0xb2, 0x9f, 0x80, 0x90, 0xba, 0xde, 0x25, 0xa5, 0x22,
|
||||
0xef, 0xa7, 0xa0, 0xac, 0xba, 0xde, 0x22, 0xa4, 0x57, 0x60, 0xef, 0xeb, 0x9a, 0x1a, 0xa7, 0x9f,
|
||||
0x81, 0x56, 0xb2, 0xa7, 0xaa, 0x6a, 0xf6, 0xde, 0x4a, 0x4c, 0xcc, 0xb0, 0xf7, 0x73, 0x10, 0x4b,
|
||||
0xf8, 0xf0, 0x0b, 0x0d, 0x9f, 0x3d, 0x2b, 0x84, 0xef, 0x17, 0xa0, 0xf4, 0x8b, 0x59, 0x21, 0x7d,
|
||||
0xb3, 0x23, 0x10, 0x21, 0xfb, 0x25, 0x48, 0x9b, 0xe5, 0x11, 0x88, 0x70, 0x76, 0x04, 0x22, 0x64,
|
||||
0xbf, 0x02, 0xf1, 0x42, 0x69, 0x04, 0xa5, 0x55, 0x50, 0xfc, 0xfd, 0x1a, 0xa4, 0x5e, 0xb1, 0x0a,
|
||||
0x0a, 0x40, 0x67, 0x65, 0x11, 0xc0, 0xdf, 0x80, 0xb2, 0x66, 0xad, 0x2c, 0x12, 0x68, 0xcf, 0x0a,
|
||||
0x09, 0xfc, 0x2d, 0x08, 0x57, 0x8a, 0x59, 0x21, 0x82, 0xcf, 0x5b, 0xe3, 0xd4, 0x08, 0xbe, 0x0c,
|
||||
0xca, 0x8b, 0x31, 0x88, 0x95, 0x34, 0x83, 0x47, 0x05, 0x00, 0xc8, 0xe0, 0x2b, 0x50, 0xf9, 0x5c,
|
||||
0x10, 0x62, 0xb6, 0x81, 0xd0, 0x2a, 0x46, 0x03, 0xb2, 0xd2, 0x49, 0xba, 0xf1, 0x74, 0x90, 0x23,
|
||||
0x83, 0x9f, 0x83, 0x53, 0xe4, 0x52, 0xbb, 0x9a, 0x8f, 0xa7, 0x49, 0xb4, 0xac, 0xbe, 0x92, 0x20,
|
||||
0xde, 0x2a, 0x94, 0x92, 0xc3, 0xcf, 0x5f, 0xe0, 0xbc, 0xd9, 0xae, 0xdc, 0xb8, 0x7e, 0x60, 0xca,
|
||||
0x4a, 0x16, 0x9f, 0x24, 0x75, 0x5d, 0x16, 0xb9, 0xf9, 0x02, 0xd4, 0x9d, 0x6f, 0x7b, 0xdb, 0x91,
|
||||
0xf6, 0x43, 0x18, 0x9f, 0x22, 0xab, 0x5a, 0xa8, 0x58, 0xfc, 0x22, 0x28, 0xd7, 0x40, 0xa9, 0x4b,
|
||||
0x28, 0x1a, 0x2d, 0xa9, 0x82, 0xf1, 0x4b, 0x20, 0xad, 0xdb, 0xd2, 0x5b, 0xfa, 0xf7, 0xd2, 0xb6,
|
||||
0x17, 0x21, 0xfb, 0x32, 0x28, 0x2b, 0x25, 0x7b, 0xf9, 0x53, 0xe0, 0xd8, 0x8b, 0x90, 0x7d, 0x05,
|
||||
0x94, 0xb4, 0x6c, 0xef, 0x4a, 0x15, 0x8f, 0x5f, 0x05, 0x69, 0xb5, 0x6c, 0x2f, 0x42, 0x7a, 0x95,
|
||||
0x34, 0x4d, 0x55, 0xcd, 0xd8, 0xd7, 0x40, 0xdc, 0x00, 0x71, 0x43, 0xd7, 0xd5, 0x48, 0x3e, 0x4d,
|
||||
0x74, 0xc8, 0x10, 0xf9, 0x75, 0x50, 0x2f, 0x82, 0x5a, 0x9b, 0x5e, 0x33, 0xfc, 0x9a, 0xa9, 0x21,
|
||||
0x92, 0xdf, 0x00, 0xa9, 0xdf, 0xae, 0xee, 0x6c, 0x6e, 0x87, 0x66, 0x76, 0xc8, 0xe5, 0xcc, 0x38,
|
||||
0x44, 0xc8, 0xbe, 0x09, 0xf2, 0xe6, 0xec, 0x38, 0xe4, 0x6f, 0xb8, 0x3b, 0x0e, 0x11, 0xb2, 0x6f,
|
||||
0x81, 0x7a, 0x61, 0x66, 0x1c, 0x22, 0xa4, 0x9b, 0xc5, 0x72, 0x28, 0x30, 0xbf, 0x0d, 0x5a, 0xaf,
|
||||
0xbd, 0x00, 0x03, 0xd9, 0xde, 0x35, 0x6b, 0xa2, 0xf8, 0xdc, 0xb3, 0x56, 0x1a, 0xf1, 0xfc, 0x0e,
|
||||
0xe8, 0x6b, 0xed, 0xc6, 0x9d, 0x64, 0x30, 0xc8, 0xae, 0x6c, 0xdc, 0xcb, 0xc6, 0x83, 0xce, 0xe3,
|
||||
0x1b, 0xa4, 0x58, 0x77, 0xc4, 0xf5, 0xed, 0xc5, 0x84, 0x91, 0xd6, 0x97, 0x20, 0x6f, 0xa5, 0xfd,
|
||||
0x06, 0xcc, 0x3b, 0xda, 0xd9, 0x11, 0x47, 0xad, 0xdd, 0xdd, 0xa3, 0xd6, 0x9e, 0x38, 0xda, 0xd9,
|
||||
0xdd, 0x33, 0x4b, 0x80, 0x10, 0x6f, 0x93, 0x75, 0x9d, 0xfd, 0xf1, 0x64, 0x9c, 0x69, 0xef, 0xd7,
|
||||
0xd0, 0x7b, 0x2e, 0x5a, 0x53, 0xdf, 0xde, 0x4e, 0xc6, 0x99, 0x32, 0xdc, 0x22, 0xd4, 0x49, 0x41,
|
||||
0xd7, 0x07, 0xe8, 0x3a, 0x17, 0x35, 0xad, 0x0c, 0xf4, 0xd8, 0x23, 0x8f, 0x39, 0x8f, 0xe4, 0x38,
|
||||
0x4d, 0x7a, 0xfd, 0xb4, 0xcb, 0x3e, 0x51, 0xc1, 0x27, 0x73, 0xb5, 0x9f, 0x76, 0x23, 0x6a, 0x3f,
|
||||
0x99, 0xeb, 0x52, 0x40, 0x45, 0x39, 0x71, 0x94, 0x4d, 0x20, 0xf1, 0x93, 0x98, 0x58, 0x99, 0xc9,
|
||||
0xfb, 0xa0, 0xfc, 0x9e, 0x3e, 0x43, 0xd6, 0x4a, 0x86, 0x71, 0xca, 0x3e, 0xa5, 0x92, 0xd2, 0x38,
|
||||
0x35, 0x8f, 0x16, 0xcd, 0xe2, 0x94, 0x3e, 0x47, 0x2e, 0xb9, 0x4f, 0x4b, 0x8f, 0xf1, 0xd3, 0x15,
|
||||
0xf9, 0xd0, 0x70, 0x8c, 0xeb, 0xce, 0x23, 0x53, 0x83, 0x7c, 0x76, 0x26, 0x55, 0x8d, 0xf2, 0x33,
|
||||
0x98, 0x5a, 0x99, 0xcd, 0x54, 0xc3, 0x6c, 0x15, 0x0b, 0xa9, 0x4d, 0xe3, 0x94, 0x7d, 0x56, 0xa5,
|
||||
0xc1, 0x38, 0x9b, 0xae, 0x61, 0x9c, 0xd2, 0x53, 0xd2, 0x18, 0xc6, 0x23, 0x6c, 0x1a, 0x8a, 0xdd,
|
||||
0xff, 0x56, 0x64, 0xcf, 0x6d, 0x9f, 0xb9, 0xe7, 0xc6, 0x23, 0xd9, 0x5b, 0x24, 0xe1, 0x07, 0x69,
|
||||
0x3e, 0xbe, 0x1f, 0xd5, 0x87, 0x76, 0x8c, 0x0e, 0x08, 0x05, 0x13, 0xdc, 0x0b, 0xc7, 0x43, 0xd5,
|
||||
0xdb, 0xff, 0x87, 0x3e, 0xef, 0x38, 0x87, 0x0f, 0xee, 0x18, 0x15, 0x40, 0xab, 0xe6, 0xb0, 0x14,
|
||||
0xa6, 0x5d, 0x02, 0x31, 0x8d, 0x14, 0xb6, 0xd9, 0xff, 0xa3, 0xd7, 0xdb, 0xce, 0xe1, 0xa5, 0xc0,
|
||||
0x83, 0xf6, 0x8a, 0x4e, 0xab, 0x43, 0x27, 0x48, 0x39, 0x21, 0x59, 0x9a, 0x64, 0x5d, 0x6c, 0xf9,
|
||||
0x2f, 0xc3, 0xcb, 0xfb, 0xd2, 0xe1, 0x5c, 0x54, 0x93, 0x41, 0xd9, 0xec, 0xaf, 0x6b, 0x85, 0x1c,
|
||||
0xc3, 0x2b, 0xd5, 0xf3, 0xb7, 0x7a, 0x53, 0x4f, 0x3a, 0x6e, 0x90, 0x65, 0xac, 0x87, 0xed, 0xf8,
|
||||
0x55, 0x28, 0x38, 0x7f, 0x38, 0x17, 0xa1, 0x0b, 0x36, 0xf8, 0x27, 0xc8, 0x0a, 0x6a, 0x54, 0x7b,
|
||||
0xff, 0x9d, 0xbc, 0x54, 0x38, 0x9c, 0x8b, 0x30, 0x55, 0xf5, 0x76, 0xa3, 0x52, 0x9d, 0xfd, 0xf7,
|
||||
0xa0, 0xaa, 0x1b, 0x95, 0x6a, 0xeb, 0xb6, 0x9f, 0x08, 0xd9, 0x6b, 0x20, 0xaa, 0xd8, 0x7e, 0x22,
|
||||
0x74, 0xfd, 0x44, 0xc8, 0x1e, 0x80, 0x88, 0x3a, 0x7e, 0xb6, 0x4a, 0xb5, 0xf2, 0x3f, 0x80, 0xaa,
|
||||
0xea, 0xf8, 0xc9, 0xd3, 0xc7, 0xaa, 0xaa, 0xa5, 0xfb, 0xf2, 0x1f, 0x41, 0xd7, 0x38, 0x9c, 0x8b,
|
||||
0xea, 0x58, 0xad, 0x6b, 0x4e, 0x4a, 0x18, 0x30, 0x0d, 0xfc, 0x4f, 0x20, 0x5c, 0x3c, 0x9c, 0x8b,
|
||||
0xd0, 0x47, 0x77, 0x6f, 0x33, 0x03, 0xec, 0xdd, 0x7f, 0x06, 0x95, 0x6f, 0x66, 0x80, 0x5d, 0xbb,
|
||||
0xe4, 0x2a, 0x42, 0xf6, 0x17, 0x90, 0x35, 0x4b, 0xae, 0x22, 0x2c, 0xb9, 0x8a, 0x90, 0xfd, 0x15,
|
||||
0x84, 0x0b, 0xae, 0xab, 0x3d, 0x5b, 0xd5, 0xa9, 0xff, 0x06, 0x32, 0xcf, 0xcc, 0x56, 0x75, 0xe8,
|
||||
0x62, 0xe5, 0xb0, 0x47, 0xfe, 0x1d, 0x54, 0xb5, 0x62, 0xe5, 0xb0, 0x3b, 0x9a, 0x19, 0x60, 0x5b,
|
||||
0xfc, 0x07, 0x88, 0x56, 0xcc, 0x0c, 0xb0, 0x21, 0x7e, 0x44, 0x8f, 0x4b, 0x1f, 0x9b, 0xfe, 0x59,
|
||||
0xbd, 0xd0, 0x6d, 0x81, 0x99, 0x88, 0x46, 0xe9, 0x96, 0xda, 0xc0, 0x78, 0x64, 0xfa, 0x57, 0x55,
|
||||
0x5e, 0x15, 0xb4, 0xce, 0x7c, 0x55, 0x00, 0xa9, 0xf2, 0xbc, 0x64, 0xc6, 0x8b, 0xc7, 0xa5, 0x67,
|
||||
0xc8, 0x1a, 0x8e, 0x77, 0x10, 0x8f, 0x7b, 0xc9, 0x24, 0x3f, 0xce, 0xe3, 0x1e, 0x7b, 0xf8, 0xf0,
|
||||
0xe1, 0x43, 0x4f, 0x6d, 0xe8, 0x86, 0xfc, 0xfa, 0xfd, 0xf8, 0xed, 0xcd, 0xb8, 0x47, 0x1f, 0xd7,
|
||||
0xab, 0x90, 0xdf, 0xcb, 0x8e, 0xb7, 0xd9, 0x4b, 0xf3, 0x52, 0xe8, 0x29, 0x38, 0x6e, 0xde, 0xcb,
|
||||
0xb6, 0x5d, 0x49, 0x8b, 0x7d, 0x77, 0x5e, 0x6e, 0x56, 0x4b, 0xd2, 0xba, 0x2c, 0x48, 0xdd, 0xb9,
|
||||
0xbe, 0x70, 0xee, 0x63, 0x70, 0x8e, 0xeb, 0xf2, 0xde, 0xc6, 0x5c, 0x6b, 0x48, 0x19, 0xe4, 0x39,
|
||||
0xef, 0x60, 0xce, 0x4b, 0x25, 0xe6, 0xdd, 0x93, 0x2f, 0x9f, 0xe6, 0xdd, 0x0c, 0xf3, 0xf6, 0x20,
|
||||
0xcf, 0x3a, 0x36, 0x3a, 0x47, 0x61, 0xcc, 0x7b, 0x15, 0xcf, 0xcc, 0xe6, 0x3c, 0x89, 0x89, 0xef,
|
||||
0x22, 0x74, 0xb6, 0xab, 0xd2, 0x26, 0xa9, 0xbc, 0x90, 0xdc, 0x97, 0xd7, 0x98, 0xf3, 0x11, 0xfc,
|
||||
0x4b, 0x1f, 0x23, 0xf3, 0x77, 0xe3, 0xc1, 0x34, 0x91, 0xb7, 0x96, 0x95, 0x08, 0x3f, 0xb4, 0xfd,
|
||||
0x67, 0xbd, 0xcb, 0x39, 0xb9, 0xf4, 0xc8, 0x7e, 0x69, 0x17, 0xa9, 0x61, 0x91, 0x03, 0xbb, 0xc8,
|
||||
0x05, 0xce, 0xda, 0x96, 0x6b, 0x46, 0xd6, 0x1f, 0xd1, 0x39, 0x6d, 0xcf, 0x05, 0xf4, 0xdc, 0xb7,
|
||||
0x3d, 0xcf, 0xfb, 0x1a, 0x6a, 0x19, 0x3e, 0x47, 0x48, 0xb1, 0xcb, 0xe4, 0x45, 0xa0, 0xdc, 0x02,
|
||||
0x72, 0x6d, 0x8f, 0xe5, 0xcd, 0x31, 0xfb, 0xb7, 0xc4, 0x4a, 0x6d, 0x29, 0xa9, 0x93, 0x55, 0x2f,
|
||||
0xd7, 0xc8, 0xa2, 0xaa, 0xba, 0xf1, 0x46, 0x52, 0x95, 0xfd, 0x75, 0x89, 0x54, 0x6f, 0x1f, 0x44,
|
||||
0x37, 0x9a, 0x73, 0x74, 0x91, 0xc0, 0x19, 0xbb, 0xe9, 0xed, 0xd7, 0x4d, 0x03, 0x81, 0xa4, 0xfd,
|
||||
0x65, 0x52, 0x33, 0x9b, 0x6c, 0xff, 0xdd, 0xb7, 0xdf, 0xd9, 0xeb, 0xe7, 0x77, 0xa6, 0x27, 0x9b,
|
||||
0xa7, 0xd9, 0x70, 0xab, 0x97, 0x0d, 0xe2, 0xb4, 0xb7, 0x25, 0x47, 0x7e, 0x32, 0xed, 0x6e, 0xdd,
|
||||
0x6d, 0x6d, 0x9d, 0x0e, 0x3b, 0xf8, 0xf9, 0xf4, 0x6a, 0x2f, 0x49, 0xaf, 0xf6, 0xb2, 0xad, 0x3c,
|
||||
0x99, 0xe4, 0x9d, 0x38, 0x8f, 0x31, 0xdc, 0x7a, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x50, 0xd6, 0x5a,
|
||||
0xc4, 0xe5, 0x16, 0x00, 0x00,
|
||||
// 1987 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0xdb, 0x73, 0x23, 0x47,
|
||||
0xf5, 0xc7, 0x3d, 0x23, 0xf9, 0xa2, 0xb6, 0x64, 0xc9, 0xe3, 0xdd, 0x5f, 0xf5, 0x6f, 0x9f, 0x3a,
|
||||
0x26, 0x90, 0x09, 0x59, 0xdb, 0xb1, 0x3c, 0x6e, 0x27, 0x02, 0x0a, 0xe2, 0x8a, 0x17, 0x93, 0x02,
|
||||
0x19, 0x26, 0x76, 0x51, 0xb5, 0x71, 0x95, 0x6a, 0x6c, 0x8f, 0xb4, 0x22, 0xd2, 0x8c, 0x23, 0x8d,
|
||||
0x76, 0x59, 0xfe, 0x8a, 0x6c, 0x80, 0xbf, 0x81, 0x27, 0xee, 0x77, 0x08, 0x7f, 0x00, 0xf7, 0xfb,
|
||||
0x25, 0x09, 0x24, 0xdc, 0xaf, 0xaf, 0xc0, 0xeb, 0x52, 0xa7, 0x4f, 0x77, 0x4f, 0xf7, 0x68, 0x1f,
|
||||
0xd6, 0x7e, 0xd8, 0x5a, 0xeb, 0xe8, 0x7b, 0xce, 0xb7, 0xbb, 0xa7, 0x3f, 0x47, 0x3d, 0x4d, 0x56,
|
||||
0xce, 0x47, 0x69, 0x96, 0x36, 0x37, 0xba, 0xfd, 0x78, 0x70, 0x36, 0x5e, 0x17, 0x9f, 0xbc, 0xab,
|
||||
0xbd, 0x54, 0xfc, 0x81, 0x1f, 0x4f, 0xf1, 0xbf, 0xe6, 0xea, 0x67, 0xd6, 0x48, 0xe3, 0x06, 0xe8,
|
||||
0x0e, 0xe3, 0x71, 0xf6, 0xa1, 0x78, 0x3c, 0x8e, 0x7a, 0xb1, 0xf7, 0x36, 0x52, 0x4b, 0xcf, 0xb3,
|
||||
0x7e, 0x9a, 0x44, 0x83, 0xce, 0x49, 0x9a, 0x0e, 0xa8, 0xc3, 0x1c, 0x7f, 0x21, 0xac, 0xaa, 0xe0,
|
||||
0x6e, 0x9a, 0x0e, 0xbc, 0x8f, 0x18, 0xa2, 0x38, 0x99, 0x0c, 0xa9, 0xcb, 0x1c, 0x7f, 0xa9, 0x79,
|
||||
0x7d, 0xfd, 0x81, 0x46, 0xeb, 0x45, 0x93, 0xf5, 0xbd, 0x64, 0x32, 0xcc, 0x4b, 0xc2, 0x27, 0xef,
|
||||
0xed, 0x64, 0x49, 0x97, 0xec, 0x27, 0xd9, 0x56, 0x93, 0x96, 0x98, 0xe3, 0xcf, 0x86, 0xda, 0xe8,
|
||||
0x03, 0x10, 0xf4, 0x1e, 0x23, 0x75, 0x2d, 0x1b, 0xa3, 0xae, 0xcc, 0x1c, 0x7f, 0x39, 0xd4, 0xd9,
|
||||
0xcf, 0xf7, 0xa7, 0x84, 0x13, 0x14, 0xce, 0x32, 0xc7, 0xaf, 0xe5, 0xc2, 0x23, 0x14, 0x16, 0x8c,
|
||||
0x79, 0x40, 0xe7, 0x98, 0xe3, 0x97, 0x2c, 0x63, 0x1e, 0x4c, 0x19, 0xf3, 0x80, 0xce, 0x33, 0xc7,
|
||||
0xf7, 0x6c, 0xe3, 0x82, 0x70, 0x82, 0xc2, 0x05, 0xe6, 0xf8, 0x65, 0xdb, 0x98, 0x07, 0xde, 0x13,
|
||||
0x64, 0x39, 0xaf, 0xd8, 0xed, 0x7f, 0x3c, 0x3e, 0xdb, 0x6a, 0xd2, 0x0a, 0x73, 0xfc, 0x7a, 0xd8,
|
||||
0xd0, 0x35, 0x65, 0xdc, 0x7b, 0x9c, 0xe8, 0x58, 0x47, 0x69, 0x09, 0x73, 0xfc, 0xf9, 0x50, 0xbb,
|
||||
0xdd, 0x90, 0x52, 0x73, 0x42, 0xdd, 0x41, 0x1a, 0x65, 0x74, 0x91, 0x39, 0xbe, 0x9b, 0x4f, 0xe8,
|
||||
0x06, 0x04, 0x1f, 0x60, 0xcf, 0x03, 0x5a, 0x65, 0x8e, 0xdf, 0x28, 0xda, 0xf3, 0x60, 0xda, 0x9e,
|
||||
0x07, 0xb4, 0xc6, 0x1c, 0x7f, 0xae, 0x60, 0x5f, 0x98, 0xff, 0x59, 0x3a, 0x39, 0x19, 0xc4, 0x74,
|
||||
0x89, 0x39, 0xbe, 0x93, 0xcf, 0xff, 0x59, 0x11, 0xb5, 0x57, 0x34, 0x1b, 0xf5, 0x93, 0x1e, 0xad,
|
||||
0x33, 0xc7, 0xaf, 0x18, 0x2b, 0x2a, 0xa2, 0xd6, 0x84, 0x4e, 0xee, 0x66, 0xf1, 0x98, 0x36, 0x98,
|
||||
0xe3, 0x57, 0xf3, 0x09, 0xed, 0x42, 0xd0, 0xbb, 0x69, 0x8c, 0x51, 0x6e, 0x34, 0xba, 0xcc, 0x1c,
|
||||
0x7f, 0xb1, 0xb9, 0xf1, 0xb0, 0xfb, 0x52, 0xfe, 0x9f, 0x4f, 0x4a, 0x51, 0xf1, 0x42, 0xbe, 0xe1,
|
||||
0x7b, 0xa3, 0x74, 0x72, 0x4e, 0x3d, 0xe6, 0xf8, 0xa4, 0xb9, 0xfd, 0xb0, 0x85, 0x0f, 0x64, 0xf2,
|
||||
0xfb, 0x21, 0x39, 0xb4, 0x6b, 0x01, 0x72, 0xa3, 0xf8, 0xa5, 0x49, 0x7f, 0x14, 0x9f, 0x21, 0x72,
|
||||
0x31, 0x73, 0x01, 0x39, 0x15, 0x54, 0xc8, 0x69, 0x91, 0x40, 0xae, 0xcb, 0xdc, 0x8b, 0x23, 0xa7,
|
||||
0x4a, 0x28, 0xe4, 0x74, 0x49, 0x24, 0xa4, 0xc7, 0x5c, 0x40, 0x4e, 0x45, 0x35, 0x72, 0x5a, 0x26,
|
||||
0x91, 0xbb, 0xc5, 0x5c, 0x40, 0x4e, 0x85, 0x73, 0xe4, 0xb4, 0x50, 0x22, 0xd7, 0x67, 0x2e, 0x20,
|
||||
0xa7, 0xc2, 0x39, 0x72, 0xa6, 0x31, 0x0f, 0xe8, 0xc7, 0x98, 0x0b, 0xc8, 0x19, 0xc6, 0xb8, 0x93,
|
||||
0x2c, 0x63, 0x1e, 0xd0, 0x17, 0x99, 0x0b, 0xc8, 0x99, 0xc6, 0x05, 0xa1, 0x44, 0x6e, 0xc0, 0x5c,
|
||||
0x40, 0xce, 0x34, 0x46, 0xe4, 0xf2, 0x8a, 0x0a, 0xa3, 0x21, 0x73, 0x01, 0x39, 0x5d, 0xd3, 0x40,
|
||||
0x4e, 0x8b, 0x95, 0x36, 0x61, 0x2e, 0x20, 0xa7, 0xe2, 0x06, 0x72, 0xb9, 0x54, 0x20, 0x97, 0x32,
|
||||
0x17, 0x90, 0xd3, 0x42, 0x85, 0x5c, 0xc1, 0x9e, 0x07, 0xf4, 0x9c, 0xb9, 0x80, 0x9c, 0x6d, 0x8f,
|
||||
0xc8, 0xd9, 0xf6, 0x3c, 0xa0, 0x2f, 0x31, 0x17, 0x90, 0xb3, 0xec, 0x0b, 0xf3, 0x97, 0xc8, 0x8d,
|
||||
0x98, 0x0b, 0xc8, 0xa9, 0x70, 0x8e, 0x5c, 0x3e, 0x00, 0x44, 0x6e, 0xcc, 0x5c, 0x40, 0x4e, 0xdb,
|
||||
0x6b, 0xe4, 0xf2, 0x2d, 0x29, 0x90, 0xcb, 0x98, 0x0b, 0xc8, 0xe9, 0x3d, 0xa9, 0x90, 0xd3, 0x32,
|
||||
0x85, 0xdc, 0x84, 0xb9, 0x97, 0x42, 0x4e, 0x15, 0x32, 0x90, 0x53, 0x21, 0x44, 0xee, 0x36, 0x73,
|
||||
0x2f, 0x82, 0x5c, 0x28, 0x93, 0x25, 0x72, 0x56, 0x2d, 0xef, 0x51, 0x28, 0x7e, 0x1e, 0x47, 0x99,
|
||||
0x42, 0xee, 0xbb, 0x0e, 0x2b, 0x21, 0x73, 0x18, 0x15, 0xcc, 0x85, 0x86, 0x4a, 0x30, 0xf7, 0x3d,
|
||||
0x50, 0x5d, 0x02, 0x3a, 0xac, 0x21, 0xa0, 0x7b, 0x07, 0xac, 0xac, 0xac, 0x89, 0x8c, 0x7c, 0x1f,
|
||||
0x8a, 0x0a, 0xea, 0x30, 0x8c, 0xd4, 0xf9, 0xf0, 0xa8, 0xa4, 0x4e, 0x52, 0xf7, 0x03, 0x10, 0x0a,
|
||||
0xec, 0x30, 0x2e, 0xb1, 0x33, 0x95, 0x12, 0xbb, 0x1f, 0x82, 0xb2, 0x96, 0x2b, 0x25, 0x77, 0x05,
|
||||
0x6f, 0x1e, 0xd0, 0x1f, 0x81, 0xb0, 0x64, 0x79, 0xf3, 0x60, 0xca, 0x9b, 0x07, 0xf4, 0xc7, 0x20,
|
||||
0xf4, 0x6c, 0xef, 0x82, 0x52, 0x92, 0xf7, 0x13, 0x50, 0x96, 0x6d, 0x6f, 0x1e, 0x78, 0xd7, 0x61,
|
||||
0xef, 0xab, 0x9a, 0x0a, 0xa7, 0x9f, 0x82, 0x56, 0xb0, 0x27, 0xab, 0x2a, 0xf6, 0xde, 0x49, 0x74,
|
||||
0x4c, 0xb3, 0xf7, 0x33, 0x10, 0x0b, 0xf8, 0xf0, 0x0b, 0x05, 0x9f, 0x39, 0x2b, 0x84, 0xef, 0xe7,
|
||||
0xa0, 0x74, 0xf3, 0x59, 0x21, 0x7d, 0xd3, 0x23, 0xe0, 0x01, 0xfd, 0x05, 0x48, 0x1b, 0xc5, 0x11,
|
||||
0xf0, 0x60, 0x7a, 0x04, 0x3c, 0xa0, 0xbf, 0x04, 0xf1, 0x5c, 0x61, 0x04, 0x85, 0x55, 0x90, 0xfc,
|
||||
0xfd, 0x0a, 0xa4, 0x4e, 0xbe, 0x0a, 0x12, 0x40, 0x6b, 0x65, 0x11, 0xc0, 0x5f, 0x83, 0xb2, 0x62,
|
||||
0xac, 0x2c, 0x12, 0x68, 0xce, 0x0a, 0x09, 0xfc, 0x0d, 0x08, 0xab, 0xf9, 0xac, 0x10, 0xc1, 0x17,
|
||||
0x8c, 0x71, 0x2a, 0x04, 0x5f, 0x03, 0xe5, 0xe5, 0x18, 0xc4, 0x4a, 0x8a, 0xc1, 0xe3, 0x1c, 0x00,
|
||||
0x64, 0xf0, 0x75, 0xa8, 0x7c, 0x21, 0x08, 0x31, 0x5b, 0x43, 0x68, 0x14, 0xf3, 0x7c, 0x52, 0x3d,
|
||||
0x8b, 0xbb, 0xd1, 0x64, 0x90, 0x21, 0x83, 0x9f, 0x85, 0x53, 0xe4, 0x42, 0xab, 0x9c, 0x8d, 0x26,
|
||||
0x71, 0xb8, 0x28, 0xbf, 0x12, 0x20, 0x1e, 0xe5, 0x4a, 0xc1, 0xe1, 0xe7, 0x2e, 0x71, 0xde, 0x6c,
|
||||
0x95, 0x0e, 0xda, 0x7b, 0xba, 0xac, 0x60, 0xf1, 0x31, 0x52, 0x53, 0x65, 0x91, 0x9b, 0xcf, 0x43,
|
||||
0xdd, 0xd9, 0x96, 0xb3, 0x19, 0x2a, 0x3f, 0x84, 0xf1, 0x71, 0xb2, 0xa4, 0x84, 0x92, 0xc5, 0x2f,
|
||||
0x80, 0x72, 0x19, 0x94, 0xaa, 0x84, 0xa4, 0xd1, 0x90, 0x4a, 0x18, 0xbf, 0x08, 0xd2, 0x9a, 0x29,
|
||||
0x3d, 0x52, 0xbf, 0x97, 0xa6, 0x3d, 0x0f, 0xe8, 0x97, 0x40, 0x59, 0x2a, 0xd8, 0x8b, 0x9f, 0x02,
|
||||
0xcb, 0x9e, 0x07, 0xf4, 0xcb, 0xa0, 0xf4, 0x8a, 0xf6, 0xb6, 0x54, 0xf2, 0xf8, 0x15, 0x90, 0x96,
|
||||
0x8b, 0xf6, 0x3c, 0xf0, 0xd6, 0x48, 0x43, 0x57, 0x55, 0x8c, 0x7d, 0x15, 0xc4, 0x75, 0x10, 0xd7,
|
||||
0x55, 0x5d, 0x85, 0xe4, 0x13, 0x44, 0x85, 0x34, 0x91, 0x5f, 0x03, 0xf5, 0x3c, 0xa8, 0x95, 0xe9,
|
||||
0x0d, 0xcd, 0xaf, 0x9e, 0x1a, 0x22, 0xf9, 0x75, 0x90, 0xba, 0xad, 0xf2, 0xd6, 0xfa, 0x66, 0xa0,
|
||||
0x67, 0x87, 0x5c, 0x4e, 0x8d, 0x83, 0x07, 0xf4, 0x1b, 0x20, 0x6f, 0x4c, 0x8f, 0x43, 0xfc, 0x86,
|
||||
0xdb, 0xe3, 0xe0, 0x01, 0xfd, 0x26, 0xa8, 0xe7, 0xa6, 0xc6, 0xc1, 0x03, 0x6f, 0x3d, 0x5f, 0x0e,
|
||||
0x09, 0xe6, 0xb7, 0x40, 0xeb, 0xb4, 0xe6, 0x60, 0x20, 0x9b, 0xdb, 0x7a, 0x4d, 0x24, 0x9f, 0x3b,
|
||||
0xc6, 0x4a, 0x23, 0x9e, 0xdf, 0x06, 0x7d, 0xa5, 0x55, 0xbf, 0x15, 0x0f, 0x06, 0xe9, 0xf5, 0xd5,
|
||||
0x3b, 0xe9, 0x68, 0x70, 0xf6, 0xc8, 0x2a, 0xc9, 0xd7, 0x1d, 0x71, 0x7d, 0x77, 0x3e, 0x61, 0xa4,
|
||||
0xf5, 0x55, 0xc8, 0xab, 0xb6, 0xfe, 0x0f, 0xf3, 0x8e, 0xb7, 0xb6, 0xf8, 0x71, 0x73, 0x7b, 0xfb,
|
||||
0xb8, 0xb9, 0xc3, 0x8f, 0xb7, 0xb6, 0x77, 0xf4, 0x12, 0x20, 0xc4, 0x9b, 0x64, 0x45, 0x65, 0x7f,
|
||||
0x22, 0x1e, 0xa5, 0xca, 0xfb, 0x4d, 0xf4, 0x9e, 0x09, 0x97, 0xe5, 0xb7, 0x37, 0xe3, 0x51, 0x2a,
|
||||
0x0d, 0x37, 0x88, 0x67, 0xa5, 0xa0, 0xeb, 0x5b, 0xe8, 0x3a, 0x13, 0x36, 0x8c, 0x0c, 0xf4, 0xd8,
|
||||
0x21, 0x57, 0xac, 0x47, 0xd2, 0x49, 0xe2, 0x5e, 0x3f, 0xe9, 0xd2, 0x97, 0x4b, 0xf8, 0x64, 0xd6,
|
||||
0xfa, 0x49, 0x37, 0xf4, 0xcc, 0x27, 0xd3, 0x16, 0x02, 0x8f, 0x17, 0x13, 0xcf, 0xd3, 0x31, 0x24,
|
||||
0xde, 0xc3, 0xc4, 0xd2, 0x54, 0xde, 0x87, 0xc5, 0xf7, 0xde, 0x93, 0x64, 0xb9, 0x60, 0x18, 0x25,
|
||||
0xf4, 0x15, 0x99, 0x94, 0x44, 0x89, 0x7e, 0xb4, 0x68, 0x16, 0x25, 0xde, 0xd3, 0xe4, 0xaa, 0xfd,
|
||||
0xb4, 0xd4, 0x18, 0x3f, 0x59, 0x12, 0x0f, 0x0d, 0xc7, 0xb8, 0x62, 0x3d, 0x32, 0x39, 0xc8, 0xa7,
|
||||
0xa6, 0x52, 0xe5, 0x28, 0x3f, 0x85, 0xa9, 0xa5, 0xe9, 0x4c, 0x39, 0xcc, 0x66, 0xbe, 0x90, 0xca,
|
||||
0x34, 0x4a, 0xe8, 0xa7, 0x65, 0x1a, 0x8c, 0xb3, 0x61, 0x1b, 0x46, 0x89, 0x77, 0x4a, 0xea, 0xc3,
|
||||
0xe8, 0x1c, 0x9b, 0x86, 0x64, 0xf7, 0xdf, 0x25, 0xd1, 0x73, 0x5b, 0x0f, 0xdd, 0x73, 0xa3, 0x73,
|
||||
0xd1, 0x5b, 0x04, 0xe1, 0x7b, 0x49, 0x36, 0xba, 0x1b, 0xd6, 0x86, 0x66, 0xcc, 0x1b, 0x10, 0x0f,
|
||||
0x4c, 0x70, 0x2f, 0x74, 0x86, 0xb2, 0xb7, 0xff, 0x07, 0x7d, 0xde, 0x73, 0x01, 0x1f, 0xdc, 0x31,
|
||||
0x32, 0x80, 0x56, 0x8d, 0x61, 0x21, 0xec, 0x75, 0x09, 0xc4, 0x14, 0x52, 0xd8, 0x66, 0xff, 0x8b,
|
||||
0x5e, 0xef, 0xba, 0x80, 0x97, 0x04, 0x0f, 0xda, 0x2b, 0x3a, 0x2d, 0x0d, 0xad, 0xa0, 0xc7, 0x08,
|
||||
0x49, 0x93, 0x38, 0xed, 0x62, 0xcb, 0x7f, 0x0d, 0x5e, 0xde, 0x17, 0xf6, 0x67, 0xc2, 0x8a, 0x08,
|
||||
0x8a, 0x66, 0xdf, 0x56, 0x0a, 0x31, 0x86, 0xd7, 0xcb, 0x17, 0x6f, 0xf5, 0xba, 0x9e, 0x70, 0x5c,
|
||||
0x25, 0x8b, 0x58, 0x0f, 0xdb, 0xf1, 0x1b, 0x50, 0x70, 0x76, 0x7f, 0x26, 0x44, 0x17, 0x6c, 0xf0,
|
||||
0x8f, 0x92, 0x2a, 0x6a, 0x64, 0x7b, 0xff, 0xad, 0xb8, 0x54, 0xd8, 0x9f, 0x09, 0x31, 0x55, 0xf6,
|
||||
0x76, 0xad, 0x92, 0x9d, 0xfd, 0x77, 0xa0, 0xaa, 0x69, 0x95, 0x6c, 0xeb, 0xa6, 0x1f, 0x0f, 0xe8,
|
||||
0x9b, 0x20, 0x2a, 0x99, 0x7e, 0x3c, 0xb0, 0xfd, 0x78, 0x40, 0xdf, 0x02, 0x91, 0x67, 0xf9, 0x99,
|
||||
0x2a, 0xd9, 0xca, 0x7f, 0x0f, 0xaa, 0xb2, 0xe5, 0x27, 0x4e, 0x1f, 0x4b, 0xb2, 0x96, 0xea, 0xcb,
|
||||
0x7f, 0x00, 0x5d, 0x7d, 0x7f, 0x26, 0xac, 0x61, 0xb5, 0xae, 0x3e, 0x29, 0x61, 0x40, 0x37, 0xf0,
|
||||
0x3f, 0x82, 0x70, 0x7e, 0x7f, 0x26, 0x44, 0x1f, 0xd5, 0xbd, 0xf5, 0x0c, 0xb0, 0x77, 0xff, 0x09,
|
||||
0x54, 0xae, 0x9e, 0x01, 0x76, 0xed, 0x82, 0x2b, 0x0f, 0xe8, 0x9f, 0x41, 0xd6, 0x28, 0xb8, 0xf2,
|
||||
0xa0, 0xe0, 0xca, 0x03, 0xfa, 0x17, 0x10, 0xce, 0xd9, 0xae, 0xe6, 0x6c, 0x65, 0xa7, 0xfe, 0x2b,
|
||||
0xc8, 0x1c, 0x3d, 0x5b, 0xd9, 0xa1, 0xf3, 0x95, 0xc3, 0x1e, 0xf9, 0x37, 0x50, 0x55, 0xf2, 0x95,
|
||||
0xc3, 0xee, 0xa8, 0x67, 0x80, 0x6d, 0xf1, 0xef, 0x20, 0xaa, 0xea, 0x19, 0x60, 0x43, 0xfc, 0xa8,
|
||||
0x1a, 0x97, 0x3a, 0x36, 0xfd, 0xa3, 0x7c, 0xa9, 0xdb, 0x02, 0x3d, 0x11, 0x85, 0xd2, 0x91, 0xdc,
|
||||
0xc0, 0x78, 0x64, 0xfa, 0x67, 0x59, 0x5c, 0x15, 0x34, 0x1f, 0xfa, 0xaa, 0x00, 0x52, 0xc5, 0x79,
|
||||
0x49, 0x8f, 0x17, 0x8f, 0x4b, 0x4f, 0x92, 0x65, 0x1c, 0xef, 0x20, 0x1a, 0xf5, 0xe2, 0x71, 0xd6,
|
||||
0xc9, 0xa2, 0x1e, 0xbd, 0x7f, 0xff, 0xfe, 0x7d, 0x47, 0x6e, 0xe8, 0xba, 0xf8, 0xfa, 0x83, 0xf8,
|
||||
0xed, 0x61, 0xd4, 0xf3, 0x1e, 0x51, 0xab, 0x90, 0xdd, 0x49, 0x3b, 0x9b, 0xf4, 0xd5, 0x59, 0x21,
|
||||
0x74, 0x24, 0x1c, 0x87, 0x77, 0xd2, 0x4d, 0x5b, 0xd2, 0xa4, 0xdf, 0x99, 0x15, 0x9b, 0xd5, 0x90,
|
||||
0x34, 0xaf, 0x71, 0x52, 0xb3, 0xae, 0x2f, 0xac, 0xfb, 0x18, 0x9c, 0xe3, 0x8a, 0xb8, 0xb7, 0xd1,
|
||||
0xd7, 0x1a, 0x42, 0x06, 0x79, 0xd6, 0x3b, 0x98, 0xf5, 0x52, 0x89, 0x79, 0x77, 0xc4, 0xcb, 0xa7,
|
||||
0x7e, 0x37, 0xc3, 0xbc, 0x1d, 0xc8, 0x33, 0x8e, 0x8d, 0xd6, 0x51, 0x18, 0xf3, 0xde, 0xc0, 0x33,
|
||||
0xb3, 0x3e, 0x4f, 0x62, 0xe2, 0xfb, 0x88, 0x37, 0xdd, 0x55, 0xbd, 0x06, 0x29, 0xbd, 0x18, 0xdf,
|
||||
0x15, 0xd7, 0x98, 0xb3, 0x21, 0xfc, 0xe9, 0x5d, 0x21, 0xb3, 0xb7, 0xa3, 0xc1, 0x24, 0x16, 0xb7,
|
||||
0x96, 0xa5, 0x10, 0x3f, 0xb4, 0xdc, 0xa7, 0x9c, 0x6b, 0x19, 0xb9, 0xfa, 0xc0, 0x7e, 0x69, 0x16,
|
||||
0xa9, 0x60, 0x91, 0x3d, 0xb3, 0xc8, 0x25, 0xce, 0xda, 0x86, 0x6b, 0x4a, 0x56, 0x1e, 0xd0, 0x39,
|
||||
0x4d, 0xcf, 0x39, 0xf4, 0xdc, 0x35, 0x3d, 0x2f, 0xfa, 0x1a, 0x6a, 0x18, 0x3e, 0x4d, 0x48, 0xbe,
|
||||
0xcb, 0xc4, 0x45, 0xa0, 0xd8, 0x02, 0x62, 0x6d, 0x3b, 0xe2, 0xe6, 0x98, 0xfe, 0x4b, 0x60, 0x25,
|
||||
0xb7, 0x94, 0xd0, 0x89, 0xaa, 0xd7, 0x2a, 0x64, 0x5e, 0x56, 0x5d, 0xfd, 0x7f, 0x52, 0x16, 0xfd,
|
||||
0x75, 0x81, 0x94, 0x6f, 0xee, 0x85, 0x07, 0x8d, 0x19, 0x6f, 0x9e, 0xc0, 0x19, 0xbb, 0xe1, 0xec,
|
||||
0xd6, 0x74, 0x03, 0x81, 0xa4, 0xdd, 0x45, 0x52, 0xd1, 0x9b, 0xec, 0xb9, 0xb9, 0x85, 0x97, 0xdb,
|
||||
0x8d, 0x7b, 0xed, 0xe7, 0xe6, 0x16, 0xee, 0xb5, 0x1b, 0xaf, 0xb4, 0xc3, 0xea, 0xe1, 0x5e, 0xbb,
|
||||
0x73, 0xb8, 0x7f, 0x70, 0xf4, 0xfc, 0x33, 0xed, 0x67, 0xc3, 0x2b, 0xe6, 0xa7, 0x0e, 0xfc, 0x3b,
|
||||
0x68, 0xef, 0xed, 0x3e, 0x73, 0xf3, 0xbd, 0xbd, 0x7e, 0x76, 0x6b, 0x72, 0xb2, 0x7e, 0x9a, 0x0e,
|
||||
0x37, 0x7a, 0xe9, 0x20, 0x4a, 0x7a, 0x1b, 0x62, 0xb6, 0x27, 0x93, 0xee, 0xc6, 0xed, 0xe6, 0xc6,
|
||||
0xe9, 0xf0, 0x0c, 0x3f, 0x9f, 0xae, 0xf5, 0xe2, 0x64, 0xad, 0x97, 0x6e, 0x64, 0xf1, 0x38, 0x3b,
|
||||
0x8b, 0xb2, 0x08, 0xc3, 0xcd, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x34, 0xd6, 0x88, 0x19,
|
||||
0x17, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func init() {
|
||||
@ -2434,6 +2437,8 @@ var xxx_Fields_ProtoFile_MessageDescs = [9]prototype.Message{
|
||||
{Name: "oneof_field"},
|
||||
{Name: "oneof_two"},
|
||||
},
|
||||
ReservedNames: []protoreflect.Name{"TEN_THOUSAND", "TEN_THOUSAND_AND_ONE"},
|
||||
ReservedRanges: [][2]protoreflect.FieldNumber{{10000, 10001}, {10001, 10002}},
|
||||
},
|
||||
{
|
||||
Name: "OptionalGroup",
|
||||
|
||||
@ -137,4 +137,7 @@ message FieldTestMessage {
|
||||
ONE = 1;
|
||||
}
|
||||
message Message {}
|
||||
|
||||
reserved 10000, 10001;
|
||||
reserved "TEN_THOUSAND", "TEN_THOUSAND_AND_ONE";
|
||||
}
|
||||
|
||||
@ -409,6 +409,9 @@ func TestDescriptor(t *testing.T) {
|
||||
case "Enums", "Messages", "Extensions":
|
||||
// Ignore nested message and enum declarations since
|
||||
// legacy descriptors are all created standalone.
|
||||
case "HasJSONName":
|
||||
// Ignore this since the semantics of the field has
|
||||
// changed across protoc and protoc-gen-go releases.
|
||||
case "OneofType", "ExtendedType", "EnumType", "MessageType":
|
||||
// Avoid descending into a dependency to avoid a cycle.
|
||||
// Just record the full name if available.
|
||||
|
||||
@ -30,10 +30,14 @@ func formatListOpt(vs list, isRoot, allowMulti bool) string {
|
||||
if isRoot {
|
||||
var name string
|
||||
switch vs.(type) {
|
||||
case pref.Names:
|
||||
name = "Names"
|
||||
case pref.FieldNumbers:
|
||||
name = "FieldNumbers"
|
||||
case pref.FieldRanges:
|
||||
name = "FieldRanges"
|
||||
case pref.EnumRanges:
|
||||
name = "EnumRanges"
|
||||
case pref.FileImports:
|
||||
name = "FileImports"
|
||||
case pref.Descriptor:
|
||||
@ -44,6 +48,11 @@ func formatListOpt(vs list, isRoot, allowMulti bool) string {
|
||||
|
||||
var ss []string
|
||||
switch vs := vs.(type) {
|
||||
case pref.Names:
|
||||
for i := 0; i < vs.Len(); i++ {
|
||||
ss = append(ss, fmt.Sprint(vs.Get(i)))
|
||||
}
|
||||
return start + joinStrings(ss, false) + end
|
||||
case pref.FieldNumbers:
|
||||
for i := 0; i < vs.Len(); i++ {
|
||||
ss = append(ss, fmt.Sprint(vs.Get(i)))
|
||||
@ -55,7 +64,17 @@ func formatListOpt(vs list, isRoot, allowMulti bool) string {
|
||||
if r[0]+1 == r[1] {
|
||||
ss = append(ss, fmt.Sprintf("%d", r[0]))
|
||||
} else {
|
||||
ss = append(ss, fmt.Sprintf("%d:%d", r[0], r[1]))
|
||||
ss = append(ss, fmt.Sprintf("%d:%d", r[0], r[1])) // enum ranges are end exclusive
|
||||
}
|
||||
}
|
||||
return start + joinStrings(ss, false) + end
|
||||
case pref.EnumRanges:
|
||||
for i := 0; i < vs.Len(); i++ {
|
||||
r := vs.Get(i)
|
||||
if r[0] == r[1] {
|
||||
ss = append(ss, fmt.Sprintf("%d", r[0]))
|
||||
} else {
|
||||
ss = append(ss, fmt.Sprintf("%d:%d", r[0], int64(r[1])+1)) // enum ranges are end inclusive
|
||||
}
|
||||
}
|
||||
return start + joinStrings(ss, false) + end
|
||||
@ -86,10 +105,10 @@ func formatListOpt(vs list, isRoot, allowMulti bool) string {
|
||||
// Using a list allows us to print the accessors in a sensible order.
|
||||
var descriptorAccessors = map[reflect.Type][]string{
|
||||
reflect.TypeOf((*pref.FileDescriptor)(nil)).Elem(): {"Path", "Package", "Imports", "Messages", "Enums", "Extensions", "Services"},
|
||||
reflect.TypeOf((*pref.MessageDescriptor)(nil)).Elem(): {"IsMapEntry", "Fields", "Oneofs", "RequiredNumbers", "ExtensionRanges", "Messages", "Enums", "Extensions"},
|
||||
reflect.TypeOf((*pref.FieldDescriptor)(nil)).Elem(): {"Number", "Cardinality", "Kind", "JSONName", "IsPacked", "IsMap", "IsWeak", "HasDefault", "Default", "OneofType", "ExtendedType", "MessageType", "EnumType"},
|
||||
reflect.TypeOf((*pref.MessageDescriptor)(nil)).Elem(): {"IsMapEntry", "Fields", "Oneofs", "ReservedNames", "ReservedRanges", "RequiredNumbers", "ExtensionRanges", "Messages", "Enums", "Extensions"},
|
||||
reflect.TypeOf((*pref.FieldDescriptor)(nil)).Elem(): {"Number", "Cardinality", "Kind", "HasJSONName", "JSONName", "IsPacked", "IsMap", "IsWeak", "HasDefault", "Default", "OneofType", "ExtendedType", "MessageType", "EnumType"},
|
||||
reflect.TypeOf((*pref.OneofDescriptor)(nil)).Elem(): {"Fields"}, // not directly used; must keep in sync with formatDescOpt
|
||||
reflect.TypeOf((*pref.EnumDescriptor)(nil)).Elem(): {"Values"},
|
||||
reflect.TypeOf((*pref.EnumDescriptor)(nil)).Elem(): {"Values", "ReservedNames", "ReservedRanges"},
|
||||
reflect.TypeOf((*pref.EnumValueDescriptor)(nil)).Elem(): {"Number"},
|
||||
reflect.TypeOf((*pref.ServiceDescriptor)(nil)).Elem(): {"Methods"},
|
||||
reflect.TypeOf((*pref.MethodDescriptor)(nil)).Elem(): {"InputType", "OutputType", "IsStreamingClient", "IsStreamingServer"},
|
||||
|
||||
@ -58,7 +58,7 @@ import (
|
||||
func NewFile(fd *descriptorpb.FileDescriptorProto, r *protoregistry.Files) (protoreflect.FileDescriptor, error) {
|
||||
var f prototype.File
|
||||
switch fd.GetSyntax() {
|
||||
case "", "proto2":
|
||||
case "proto2", "":
|
||||
f.Syntax = protoreflect.Proto2
|
||||
case "proto3":
|
||||
f.Syntax = protoreflect.Proto3
|
||||
@ -172,6 +172,15 @@ func messagesFromDescriptorProto(mds []*descriptorpb.DescriptorProto, syntax pro
|
||||
Options: od.Options,
|
||||
})
|
||||
}
|
||||
for _, s := range md.GetReservedName() {
|
||||
m.ReservedNames = append(m.ReservedNames, protoreflect.Name(s))
|
||||
}
|
||||
for _, rr := range md.GetReservedRange() {
|
||||
m.ReservedRanges = append(m.ReservedRanges, [2]protoreflect.FieldNumber{
|
||||
protoreflect.FieldNumber(rr.GetStart()),
|
||||
protoreflect.FieldNumber(rr.GetEnd()),
|
||||
})
|
||||
}
|
||||
for _, xr := range md.GetExtensionRange() {
|
||||
m.ExtensionRanges = append(m.ExtensionRanges, [2]protoreflect.FieldNumber{
|
||||
protoreflect.FieldNumber(xr.GetStart()),
|
||||
@ -210,6 +219,15 @@ func enumsFromDescriptorProto(eds []*descriptorpb.EnumDescriptorProto, r *protor
|
||||
Options: vd.Options,
|
||||
})
|
||||
}
|
||||
for _, s := range ed.GetReservedName() {
|
||||
e.ReservedNames = append(e.ReservedNames, protoreflect.Name(s))
|
||||
}
|
||||
for _, rr := range ed.GetReservedRange() {
|
||||
e.ReservedRanges = append(e.ReservedRanges, [2]protoreflect.EnumNumber{
|
||||
protoreflect.EnumNumber(rr.GetStart()),
|
||||
protoreflect.EnumNumber(rr.GetEnd()),
|
||||
})
|
||||
}
|
||||
es = append(es, e)
|
||||
}
|
||||
return es, nil
|
||||
|
||||
@ -300,6 +300,18 @@ type FieldRanges interface {
|
||||
// EnumNumber is the numeric value for an enum.
|
||||
type EnumNumber int32
|
||||
|
||||
// EnumRanges represent a list of enum number ranges.
|
||||
type EnumRanges interface {
|
||||
// Len reports the number of ranges in the list.
|
||||
Len() int
|
||||
// Get returns the ith range. It panics if out of bounds.
|
||||
Get(i int) [2]EnumNumber // start inclusive; end inclusive
|
||||
// Has reports whether n is within any of the ranges.
|
||||
Has(n EnumNumber) bool
|
||||
|
||||
doNotImplement
|
||||
}
|
||||
|
||||
var (
|
||||
regexName = regexp.MustCompile(`^[_a-zA-Z][_a-zA-Z0-9]*$`)
|
||||
regexFullName = regexp.MustCompile(`^[_a-zA-Z][_a-zA-Z0-9]*(\.[_a-zA-Z][_a-zA-Z0-9]*)*$`)
|
||||
@ -315,6 +327,18 @@ func (n Name) IsValid() bool {
|
||||
return regexName.MatchString(string(n))
|
||||
}
|
||||
|
||||
// Names represent a list of names.
|
||||
type Names interface {
|
||||
// Len reports the number of names in the list.
|
||||
Len() int
|
||||
// Get returns the ith name. It panics if out of bounds.
|
||||
Get(i int) Name
|
||||
// Has reports whether s matches any names in the list.
|
||||
Has(s Name) bool
|
||||
|
||||
doNotImplement
|
||||
}
|
||||
|
||||
// FullName is a qualified name that uniquely identifies a proto declaration.
|
||||
// A qualified name is the concatenation of the proto package along with the
|
||||
// fully-declared name (i.e., name of parent preceding the name of the child),
|
||||
|
||||
@ -229,6 +229,10 @@ type MessageDescriptor interface {
|
||||
// Oneofs is a list of nested oneof declarations.
|
||||
Oneofs() OneofDescriptors
|
||||
|
||||
// ReservedNames is a list of reserved field names.
|
||||
ReservedNames() Names
|
||||
// ReservedRanges is a list of reserved ranges of field numbers.
|
||||
ReservedRanges() FieldRanges
|
||||
// RequiredNumbers is a list of required field numbers.
|
||||
// In Proto3, it is always an empty list.
|
||||
RequiredNumbers() FieldNumbers
|
||||
@ -295,6 +299,9 @@ type FieldDescriptor interface {
|
||||
// Kind reports the basic kind for this field.
|
||||
Kind() Kind
|
||||
|
||||
// HasJSONName reports whether this field has an explicitly set JSON name.
|
||||
HasJSONName() bool
|
||||
|
||||
// JSONName reports the name used for JSON serialization.
|
||||
// It is usually the camel-cased form of the field name.
|
||||
JSONName() string
|
||||
@ -316,6 +323,9 @@ type FieldDescriptor interface {
|
||||
// and MessageDescriptor.IsMapEntry is true.
|
||||
IsMap() bool
|
||||
|
||||
// HasDefault reports whether this field has a default value.
|
||||
HasDefault() bool
|
||||
|
||||
// Default returns the default value for scalar fields.
|
||||
// For proto2, it is the default value as specified in the proto file,
|
||||
// or the zero value if unspecified.
|
||||
@ -327,9 +337,6 @@ type FieldDescriptor interface {
|
||||
// of an enum field, and is nil for any other kind of field.
|
||||
DefaultEnumValue() EnumValueDescriptor
|
||||
|
||||
// HasDefault reports whether this field has a default value.
|
||||
HasDefault() bool
|
||||
|
||||
// OneofType is the containing oneof that this field belongs to,
|
||||
// and is nil if this field is not part of a oneof.
|
||||
OneofType() OneofDescriptor
|
||||
@ -478,6 +485,11 @@ type EnumDescriptor interface {
|
||||
// Values is a list of nested enum value declarations.
|
||||
Values() EnumValueDescriptors
|
||||
|
||||
// ReservedNames is a list of reserved enum names.
|
||||
ReservedNames() Names
|
||||
// ReservedRanges is a list of reserved ranges of enum numbers.
|
||||
ReservedRanges() EnumRanges
|
||||
|
||||
isEnumDescriptor
|
||||
}
|
||||
type isEnumDescriptor interface{ ProtoType(EnumDescriptor) }
|
||||
|
||||
@ -26,11 +26,13 @@ func TestDescriptors(t *testing.T) {
|
||||
|
||||
[]pref.FileImports{(*fileImports)(nil)},
|
||||
[]pref.MessageDescriptors{(*messages)(nil)},
|
||||
[]pref.Names{(*names)(nil)},
|
||||
[]pref.FieldNumbers{(*numbers)(nil)},
|
||||
[]pref.FieldRanges{(*ranges)(nil)},
|
||||
[]pref.FieldRanges{(*fieldRanges)(nil)},
|
||||
[]pref.FieldDescriptors{(*fields)(nil), (*oneofFields)(nil)},
|
||||
[]pref.OneofDescriptors{(*oneofs)(nil)},
|
||||
[]pref.ExtensionDescriptors{(*extensions)(nil)},
|
||||
[]pref.EnumRanges{(*enumRanges)(nil)},
|
||||
[]pref.EnumDescriptors{(*enums)(nil)},
|
||||
[]pref.EnumValueDescriptors{(*enumValues)(nil)},
|
||||
[]pref.ServiceDescriptors{(*services)(nil)},
|
||||
|
||||
@ -13,16 +13,18 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
emptyFiles fileImports
|
||||
emptyMessages messages
|
||||
emptyFields fields
|
||||
emptyOneofs oneofs
|
||||
emptyNumbers numbers
|
||||
emptyRanges ranges
|
||||
emptyEnums enums
|
||||
emptyEnumValues enumValues
|
||||
emptyExtensions extensions
|
||||
emptyServices services
|
||||
emptyFiles fileImports
|
||||
emptyMessages messages
|
||||
emptyFields fields
|
||||
emptyOneofs oneofs
|
||||
emptyNames names
|
||||
emptyNumbers numbers
|
||||
emptyFieldRanges fieldRanges
|
||||
emptyEnums enums
|
||||
emptyEnumValues enumValues
|
||||
emptyEnumRanges enumRanges
|
||||
emptyExtensions extensions
|
||||
emptyServices services
|
||||
)
|
||||
|
||||
type placeholderName pref.FullName
|
||||
@ -61,8 +63,10 @@ func (t placeholderMessage) Options() pref.ProtoMessage { retur
|
||||
func (t placeholderMessage) IsMapEntry() bool { return false }
|
||||
func (t placeholderMessage) Fields() pref.FieldDescriptors { return &emptyFields }
|
||||
func (t placeholderMessage) Oneofs() pref.OneofDescriptors { return &emptyOneofs }
|
||||
func (t placeholderMessage) ReservedNames() pref.Names { return &emptyNames }
|
||||
func (t placeholderMessage) ReservedRanges() pref.FieldRanges { return &emptyFieldRanges }
|
||||
func (t placeholderMessage) RequiredNumbers() pref.FieldNumbers { return &emptyNumbers }
|
||||
func (t placeholderMessage) ExtensionRanges() pref.FieldRanges { return &emptyRanges }
|
||||
func (t placeholderMessage) ExtensionRanges() pref.FieldRanges { return &emptyFieldRanges }
|
||||
func (t placeholderMessage) ExtensionRangeOptions(int) pref.ProtoMessage { panic("out of bounds") }
|
||||
func (t placeholderMessage) Enums() pref.EnumDescriptors { return &emptyEnums }
|
||||
func (t placeholderMessage) Messages() pref.MessageDescriptors { return &emptyMessages }
|
||||
@ -76,5 +80,7 @@ type placeholderEnum struct {
|
||||
|
||||
func (t placeholderEnum) Options() pref.ProtoMessage { return optionTypes.Enum }
|
||||
func (t placeholderEnum) Values() pref.EnumValueDescriptors { return &emptyEnumValues }
|
||||
func (t placeholderEnum) ReservedNames() pref.Names { return &emptyNames }
|
||||
func (t placeholderEnum) ReservedRanges() pref.EnumRanges { return &emptyEnumRanges }
|
||||
func (t placeholderEnum) Format(s fmt.State, r rune) { pfmt.FormatDesc(s, r, t) }
|
||||
func (t placeholderEnum) ProtoType(pref.EnumDescriptor) {}
|
||||
|
||||
@ -98,6 +98,8 @@ type Message struct {
|
||||
Name protoreflect.Name
|
||||
Fields []Field
|
||||
Oneofs []Oneof
|
||||
ReservedNames []protoreflect.Name
|
||||
ReservedRanges [][2]protoreflect.FieldNumber
|
||||
ExtensionRanges [][2]protoreflect.FieldNumber
|
||||
ExtensionRangeOptions []protoreflect.ProtoMessage
|
||||
Options protoreflect.ProtoMessage
|
||||
@ -158,9 +160,11 @@ type Extension struct {
|
||||
|
||||
// Enum is a constructor for protoreflect.EnumDescriptor.
|
||||
type Enum struct {
|
||||
Name protoreflect.Name
|
||||
Values []EnumValue
|
||||
Options protoreflect.ProtoMessage
|
||||
Name protoreflect.Name
|
||||
Values []EnumValue
|
||||
ReservedNames []protoreflect.Name
|
||||
ReservedRanges [][2]protoreflect.EnumNumber
|
||||
Options protoreflect.ProtoMessage
|
||||
|
||||
*enumMeta
|
||||
}
|
||||
|
||||
@ -14,6 +14,21 @@ import (
|
||||
pref "github.com/golang/protobuf/v2/reflect/protoreflect"
|
||||
)
|
||||
|
||||
type names []pref.Name
|
||||
|
||||
func (p *names) Len() int { return len(*p) }
|
||||
func (p *names) Get(i int) pref.Name { return (*p)[i] }
|
||||
func (p *names) Has(s pref.Name) bool {
|
||||
for _, n := range *p {
|
||||
if s == n {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
func (p *names) Format(s fmt.State, r rune) { pfmt.FormatList(s, r, p) }
|
||||
func (p *names) ProtoInternal(pragma.DoNotImplement) {}
|
||||
|
||||
type numbersMeta struct {
|
||||
once sync.Once
|
||||
ns []pref.FieldNumber
|
||||
@ -38,11 +53,11 @@ func (p *numbers) Has(n pref.FieldNumber) bool { return p.nss.Has(uint64
|
||||
func (p *numbers) Format(s fmt.State, r rune) { pfmt.FormatList(s, r, p) }
|
||||
func (p *numbers) ProtoInternal(pragma.DoNotImplement) {}
|
||||
|
||||
type ranges [][2]pref.FieldNumber
|
||||
type fieldRanges [][2]pref.FieldNumber
|
||||
|
||||
func (p *ranges) Len() int { return len(*p) }
|
||||
func (p *ranges) Get(i int) [2]pref.FieldNumber { return (*p)[i] }
|
||||
func (p *ranges) Has(n pref.FieldNumber) bool {
|
||||
func (p *fieldRanges) Len() int { return len(*p) }
|
||||
func (p *fieldRanges) Get(i int) [2]pref.FieldNumber { return (*p)[i] }
|
||||
func (p *fieldRanges) Has(n pref.FieldNumber) bool {
|
||||
for _, r := range *p {
|
||||
if r[0] <= n && n < r[1] {
|
||||
return true
|
||||
@ -50,8 +65,23 @@ func (p *ranges) Has(n pref.FieldNumber) bool {
|
||||
}
|
||||
return false
|
||||
}
|
||||
func (p *ranges) Format(s fmt.State, r rune) { pfmt.FormatList(s, r, p) }
|
||||
func (p *ranges) ProtoInternal(pragma.DoNotImplement) {}
|
||||
func (p *fieldRanges) Format(s fmt.State, r rune) { pfmt.FormatList(s, r, p) }
|
||||
func (p *fieldRanges) ProtoInternal(pragma.DoNotImplement) {}
|
||||
|
||||
type enumRanges [][2]pref.EnumNumber
|
||||
|
||||
func (p *enumRanges) Len() int { return len(*p) }
|
||||
func (p *enumRanges) Get(i int) [2]pref.EnumNumber { return (*p)[i] }
|
||||
func (p *enumRanges) Has(n pref.EnumNumber) bool {
|
||||
for _, r := range *p {
|
||||
if r[0] <= n && n <= r[1] {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
func (p *enumRanges) Format(s fmt.State, r rune) { pfmt.FormatList(s, r, p) }
|
||||
func (p *enumRanges) ProtoInternal(pragma.DoNotImplement) {}
|
||||
|
||||
type fileImports []pref.FileImport
|
||||
|
||||
|
||||
@ -181,8 +181,10 @@ func (t messageDesc) Options() pref.ProtoMessage { return altOptions(
|
||||
func (t messageDesc) IsMapEntry() bool { return t.m.mo.lazyInit(t).isMapEntry }
|
||||
func (t messageDesc) Fields() pref.FieldDescriptors { return t.m.fs.lazyInit(t, t.m.Fields) }
|
||||
func (t messageDesc) Oneofs() pref.OneofDescriptors { return t.m.os.lazyInit(t, t.m.Oneofs) }
|
||||
func (t messageDesc) ReservedNames() pref.Names { return (*names)(&t.m.ReservedNames) }
|
||||
func (t messageDesc) ReservedRanges() pref.FieldRanges { return (*fieldRanges)(&t.m.ReservedRanges) }
|
||||
func (t messageDesc) RequiredNumbers() pref.FieldNumbers { return t.m.ns.lazyInit(t.m.Fields) }
|
||||
func (t messageDesc) ExtensionRanges() pref.FieldRanges { return (*ranges)(&t.m.ExtensionRanges) }
|
||||
func (t messageDesc) ExtensionRanges() pref.FieldRanges { return (*fieldRanges)(&t.m.ExtensionRanges) }
|
||||
func (t messageDesc) ExtensionRangeOptions(i int) pref.ProtoMessage {
|
||||
return extensionRangeOptions(i, len(t.m.ExtensionRanges), t.m.ExtensionRangeOptions)
|
||||
}
|
||||
@ -246,13 +248,14 @@ func (t fieldDesc) Options() pref.ProtoMessage { return altOptio
|
||||
func (t fieldDesc) Number() pref.FieldNumber { return t.f.Number }
|
||||
func (t fieldDesc) Cardinality() pref.Cardinality { return t.f.Cardinality }
|
||||
func (t fieldDesc) Kind() pref.Kind { return t.f.Kind }
|
||||
func (t fieldDesc) HasJSONName() bool { return t.f.JSONName != "" }
|
||||
func (t fieldDesc) JSONName() string { return t.f.js.lazyInit(t.f) }
|
||||
func (t fieldDesc) IsPacked() bool { return t.f.fo.lazyInit(t).isPacked }
|
||||
func (t fieldDesc) IsWeak() bool { return t.f.fo.lazyInit(t).isWeak }
|
||||
func (t fieldDesc) IsMap() bool { return t.f.fo.lazyInit(t).isMap }
|
||||
func (t fieldDesc) HasDefault() bool { return t.f.Default.IsValid() }
|
||||
func (t fieldDesc) Default() pref.Value { return t.f.dv.value(t, t.f.Default) }
|
||||
func (t fieldDesc) DefaultEnumValue() pref.EnumValueDescriptor { return t.f.dv.enum(t, t.f.Default) }
|
||||
func (t fieldDesc) HasDefault() bool { return t.f.Default.IsValid() }
|
||||
func (t fieldDesc) OneofType() pref.OneofDescriptor { return t.f.ot.lazyInit(t, t.f.OneofName) }
|
||||
func (t fieldDesc) ExtendedType() pref.MessageDescriptor { return nil }
|
||||
func (t fieldDesc) MessageType() pref.MessageDescriptor { return t.f.mt.lazyInit(t, &t.f.MessageType) }
|
||||
@ -261,13 +264,17 @@ func (t fieldDesc) Format(s fmt.State, r rune) { pfmt.FormatDesc
|
||||
func (t fieldDesc) ProtoType(pref.FieldDescriptor) {}
|
||||
func (t fieldDesc) ProtoInternal(pragma.DoNotImplement) {}
|
||||
|
||||
type jsonName struct{ once sync.Once }
|
||||
type jsonName struct {
|
||||
once sync.Once
|
||||
name string
|
||||
}
|
||||
|
||||
func (p *jsonName) lazyInit(f *Field) string {
|
||||
p.once.Do(func() {
|
||||
// TODO: We may need to share this logic with jsonpb for implementation
|
||||
// of the FieldMask well-known type.
|
||||
if f.JSONName != "" {
|
||||
p.name = f.JSONName
|
||||
return
|
||||
}
|
||||
var b []byte
|
||||
@ -283,9 +290,9 @@ func (p *jsonName) lazyInit(f *Field) string {
|
||||
}
|
||||
wasUnderscore = c == '_'
|
||||
}
|
||||
f.JSONName = string(b)
|
||||
p.name = string(b)
|
||||
})
|
||||
return f.JSONName
|
||||
return p.name
|
||||
}
|
||||
|
||||
// oneofReference resolves the name of a oneof by searching the parent
|
||||
@ -418,13 +425,14 @@ func (t extensionDesc) Options() pref.ProtoMessage { return altO
|
||||
func (t extensionDesc) Number() pref.FieldNumber { return t.x.Number }
|
||||
func (t extensionDesc) Cardinality() pref.Cardinality { return t.x.Cardinality }
|
||||
func (t extensionDesc) Kind() pref.Kind { return t.x.Kind }
|
||||
func (t extensionDesc) HasJSONName() bool { return false }
|
||||
func (t extensionDesc) JSONName() string { return "" }
|
||||
func (t extensionDesc) IsPacked() bool { return isPacked(t.Options()) }
|
||||
func (t extensionDesc) IsWeak() bool { return false }
|
||||
func (t extensionDesc) IsMap() bool { return false }
|
||||
func (t extensionDesc) HasDefault() bool { return t.x.Default.IsValid() }
|
||||
func (t extensionDesc) Default() pref.Value { return t.x.dv.value(t, t.x.Default) }
|
||||
func (t extensionDesc) DefaultEnumValue() pref.EnumValueDescriptor { return t.x.dv.enum(t, t.x.Default) }
|
||||
func (t extensionDesc) HasDefault() bool { return t.x.Default.IsValid() }
|
||||
func (t extensionDesc) OneofType() pref.OneofDescriptor { return nil }
|
||||
func (t extensionDesc) ExtendedType() pref.MessageDescriptor {
|
||||
return t.x.xt.lazyInit(t, &t.x.ExtendedType)
|
||||
@ -453,6 +461,8 @@ func (t enumDesc) IsPlaceholder() bool { return false }
|
||||
func (t enumDesc) DescriptorProto() (pref.Message, bool) { return nil, false }
|
||||
func (t enumDesc) Options() pref.ProtoMessage { return altOptions(t.e.Options, optionTypes.Enum) }
|
||||
func (t enumDesc) Values() pref.EnumValueDescriptors { return t.e.vs.lazyInit(t, t.e.Values) }
|
||||
func (t enumDesc) ReservedNames() pref.Names { return (*names)(&t.e.ReservedNames) }
|
||||
func (t enumDesc) ReservedRanges() pref.EnumRanges { return (*enumRanges)(&t.e.ReservedRanges) }
|
||||
func (t enumDesc) Format(s fmt.State, r rune) { pfmt.FormatDesc(s, r, t) }
|
||||
func (t enumDesc) ProtoType(pref.EnumDescriptor) {}
|
||||
func (t enumDesc) ProtoInternal(pragma.DoNotImplement) {}
|
||||
|
||||
@ -19,6 +19,8 @@ type StandaloneMessage struct {
|
||||
FullName protoreflect.FullName
|
||||
Fields []Field
|
||||
Oneofs []Oneof
|
||||
ReservedNames []protoreflect.Name
|
||||
ReservedRanges [][2]protoreflect.FieldNumber
|
||||
ExtensionRanges [][2]protoreflect.FieldNumber
|
||||
ExtensionRangeOptions []protoreflect.ProtoMessage
|
||||
Options protoreflect.ProtoMessage
|
||||
@ -83,10 +85,12 @@ func NewMessages(ts []*StandaloneMessage) ([]protoreflect.MessageDescriptor, err
|
||||
// StandaloneEnum is a constructor for a protoreflect.EnumDescriptor
|
||||
// that does not have a parent.
|
||||
type StandaloneEnum struct {
|
||||
Syntax protoreflect.Syntax
|
||||
FullName protoreflect.FullName
|
||||
Values []EnumValue
|
||||
Options protoreflect.ProtoMessage
|
||||
Syntax protoreflect.Syntax
|
||||
FullName protoreflect.FullName
|
||||
Values []EnumValue
|
||||
ReservedNames []protoreflect.Name
|
||||
ReservedRanges [][2]protoreflect.EnumNumber
|
||||
Options protoreflect.ProtoMessage
|
||||
|
||||
vals enumValuesMeta
|
||||
}
|
||||
|
||||
@ -24,11 +24,17 @@ func (t standaloneMessage) DescriptorProto() (pref.Message, bool) { return nil,
|
||||
func (t standaloneMessage) Options() pref.ProtoMessage {
|
||||
return altOptions(t.m.Options, optionTypes.Message)
|
||||
}
|
||||
func (t standaloneMessage) IsMapEntry() bool { return t.m.options.lazyInit(t).isMapEntry }
|
||||
func (t standaloneMessage) Fields() pref.FieldDescriptors { return t.m.fields.lazyInit(t, t.m.Fields) }
|
||||
func (t standaloneMessage) Oneofs() pref.OneofDescriptors { return t.m.oneofs.lazyInit(t, t.m.Oneofs) }
|
||||
func (t standaloneMessage) IsMapEntry() bool { return t.m.options.lazyInit(t).isMapEntry }
|
||||
func (t standaloneMessage) Fields() pref.FieldDescriptors { return t.m.fields.lazyInit(t, t.m.Fields) }
|
||||
func (t standaloneMessage) Oneofs() pref.OneofDescriptors { return t.m.oneofs.lazyInit(t, t.m.Oneofs) }
|
||||
func (t standaloneMessage) ReservedNames() pref.Names { return (*names)(&t.m.ReservedNames) }
|
||||
func (t standaloneMessage) ReservedRanges() pref.FieldRanges {
|
||||
return (*fieldRanges)(&t.m.ReservedRanges)
|
||||
}
|
||||
func (t standaloneMessage) RequiredNumbers() pref.FieldNumbers { return t.m.nums.lazyInit(t.m.Fields) }
|
||||
func (t standaloneMessage) ExtensionRanges() pref.FieldRanges { return (*ranges)(&t.m.ExtensionRanges) }
|
||||
func (t standaloneMessage) ExtensionRanges() pref.FieldRanges {
|
||||
return (*fieldRanges)(&t.m.ExtensionRanges)
|
||||
}
|
||||
func (t standaloneMessage) ExtensionRangeOptions(i int) pref.ProtoMessage {
|
||||
return extensionRangeOptions(i, len(t.m.ExtensionRanges), t.m.ExtensionRangeOptions)
|
||||
}
|
||||
@ -50,6 +56,8 @@ func (t standaloneEnum) IsPlaceholder() bool { return false }
|
||||
func (t standaloneEnum) DescriptorProto() (pref.Message, bool) { return nil, false }
|
||||
func (t standaloneEnum) Options() pref.ProtoMessage { return altOptions(t.e.Options, optionTypes.Enum) }
|
||||
func (t standaloneEnum) Values() pref.EnumValueDescriptors { return t.e.vals.lazyInit(t, t.e.Values) }
|
||||
func (t standaloneEnum) ReservedNames() pref.Names { return (*names)(&t.e.ReservedNames) }
|
||||
func (t standaloneEnum) ReservedRanges() pref.EnumRanges { return (*enumRanges)(&t.e.ReservedRanges) }
|
||||
func (t standaloneEnum) Format(s fmt.State, r rune) { pfmt.FormatDesc(s, r, t) }
|
||||
func (t standaloneEnum) ProtoType(pref.EnumDescriptor) {}
|
||||
func (t standaloneEnum) ProtoInternal(pragma.DoNotImplement) {}
|
||||
@ -69,15 +77,16 @@ func (t standaloneExtension) Options() pref.ProtoMessage {
|
||||
func (t standaloneExtension) Number() pref.FieldNumber { return t.x.Number }
|
||||
func (t standaloneExtension) Cardinality() pref.Cardinality { return t.x.Cardinality }
|
||||
func (t standaloneExtension) Kind() pref.Kind { return t.x.Kind }
|
||||
func (t standaloneExtension) HasJSONName() bool { return false }
|
||||
func (t standaloneExtension) JSONName() string { return "" }
|
||||
func (t standaloneExtension) IsPacked() bool { return isPacked(t.Options()) }
|
||||
func (t standaloneExtension) IsWeak() bool { return false }
|
||||
func (t standaloneExtension) IsMap() bool { return false }
|
||||
func (t standaloneExtension) HasDefault() bool { return t.x.Default.IsValid() }
|
||||
func (t standaloneExtension) Default() pref.Value { return t.x.dv.value(t, t.x.Default) }
|
||||
func (t standaloneExtension) DefaultEnumValue() pref.EnumValueDescriptor {
|
||||
return t.x.dv.enum(t, t.x.Default)
|
||||
}
|
||||
func (t standaloneExtension) HasDefault() bool { return t.x.Default.IsValid() }
|
||||
func (t standaloneExtension) OneofType() pref.OneofDescriptor { return nil }
|
||||
func (t standaloneExtension) MessageType() pref.MessageDescriptor { return t.x.MessageType }
|
||||
func (t standaloneExtension) EnumType() pref.EnumDescriptor { return t.x.EnumType }
|
||||
|
||||
@ -109,6 +109,8 @@ func TestFile(t *testing.T) {
|
||||
},
|
||||
{Name: "O2"}, // "test.B.O2"
|
||||
},
|
||||
ReservedNames: []pref.Name{"fizz", "buzz"},
|
||||
ReservedRanges: [][2]pref.FieldNumber{{100, 200}, {300, 301}},
|
||||
ExtensionRanges: [][2]pref.FieldNumber{{1000, 2000}, {3000, 3001}},
|
||||
ExtensionRangeOptions: []pref.ProtoMessage{
|
||||
0: (*descriptorpb.ExtensionRangeOptions)(nil),
|
||||
@ -145,6 +147,8 @@ func TestFile(t *testing.T) {
|
||||
},
|
||||
{Name: "BAR", Number: 1},
|
||||
},
|
||||
ReservedNames: []pref.Name{"FIZZ", "BUZZ"},
|
||||
ReservedRanges: [][2]pref.EnumNumber{{10, 19}, {30, 30}},
|
||||
}},
|
||||
Extensions: []ptype.Extension{{
|
||||
Name: "X", // "test.X"
|
||||
@ -252,6 +256,11 @@ func TestFile(t *testing.T) {
|
||||
},
|
||||
{Name: scalar.String("O2")},
|
||||
},
|
||||
ReservedName: []string{"fizz", "buzz"},
|
||||
ReservedRange: []*descriptorpb.DescriptorProto_ReservedRange{
|
||||
{Start: scalar.Int32(100), End: scalar.Int32(200)},
|
||||
{Start: scalar.Int32(300), End: scalar.Int32(301)},
|
||||
},
|
||||
ExtensionRange: []*descriptorpb.DescriptorProto_ExtensionRange{
|
||||
{Start: scalar.Int32(1000), End: scalar.Int32(2000)},
|
||||
{Start: scalar.Int32(3000), End: scalar.Int32(3001), Options: new(descriptorpb.ExtensionRangeOptions)},
|
||||
@ -295,6 +304,11 @@ func TestFile(t *testing.T) {
|
||||
},
|
||||
{Name: scalar.String("BAR"), Number: scalar.Int32(1)},
|
||||
},
|
||||
ReservedName: []string{"FIZZ", "BUZZ"},
|
||||
ReservedRange: []*descriptorpb.EnumDescriptorProto_EnumReservedRange{
|
||||
{Start: scalar.Int32(10), End: scalar.Int32(19)},
|
||||
{Start: scalar.Int32(30), End: scalar.Int32(30)},
|
||||
},
|
||||
}},
|
||||
Extension: []*descriptorpb.FieldDescriptorProto{{
|
||||
Name: scalar.String("X"),
|
||||
@ -381,6 +395,7 @@ func testFileAccessors(t *testing.T, fd pref.FileDescriptor) {
|
||||
"Cardinality": pref.Optional,
|
||||
"Kind": pref.StringKind,
|
||||
"Options": &descriptorpb.FieldOptions{Deprecated: scalar.Bool(true)},
|
||||
"HasJSONName": false,
|
||||
"JSONName": "key",
|
||||
"IsPacked": false,
|
||||
"IsMap": false,
|
||||
@ -433,11 +448,12 @@ func testFileAccessors(t *testing.T, fd pref.FileDescriptor) {
|
||||
},
|
||||
"ByJSONName:fieldTwo": nil,
|
||||
"ByJSONName:Field2": M{
|
||||
"Name": pref.Name("field_two"),
|
||||
"Index": 1,
|
||||
"JSONName": "Field2",
|
||||
"Default": pref.EnumNumber(1),
|
||||
"OneofType": M{"Name": pref.Name("O2"), "IsPlaceholder": false},
|
||||
"Name": pref.Name("field_two"),
|
||||
"Index": 1,
|
||||
"HasJSONName": true,
|
||||
"JSONName": "Field2",
|
||||
"Default": pref.EnumNumber(1),
|
||||
"OneofType": M{"Name": pref.Name("O2"), "IsPlaceholder": false},
|
||||
},
|
||||
"ByName:fieldThree": nil,
|
||||
"ByName:field_three": M{
|
||||
@ -490,6 +506,23 @@ func testFileAccessors(t *testing.T, fd pref.FileDescriptor) {
|
||||
},
|
||||
},
|
||||
},
|
||||
"ReservedNames": M{
|
||||
"Len": 2,
|
||||
"Get:0": pref.Name("fizz"),
|
||||
"Has:buzz": true,
|
||||
"Has:noexist": false,
|
||||
},
|
||||
"ReservedRanges": M{
|
||||
"Len": 2,
|
||||
"Get:0": [2]pref.FieldNumber{100, 200},
|
||||
"Has:99": false,
|
||||
"Has:100": true,
|
||||
"Has:150": true,
|
||||
"Has:199": true,
|
||||
"Has:200": false,
|
||||
"Has:300": true,
|
||||
"Has:301": false,
|
||||
},
|
||||
"RequiredNumbers": M{
|
||||
"Len": 1,
|
||||
"Get:0": pref.FieldNumber(6),
|
||||
@ -505,6 +538,7 @@ func testFileAccessors(t *testing.T, fd pref.FileDescriptor) {
|
||||
"Has:1999": true,
|
||||
"Has:2000": false,
|
||||
"Has:3000": true,
|
||||
"Has:3001": false,
|
||||
},
|
||||
"ExtensionRangeOptions:0": (*descriptorpb.ExtensionRangeOptions)(nil),
|
||||
"ExtensionRangeOptions:1": new(descriptorpb.ExtensionRangeOptions),
|
||||
@ -541,6 +575,23 @@ func testFileAccessors(t *testing.T, fd pref.FileDescriptor) {
|
||||
"ByNumber:2": nil,
|
||||
"ByNumber:1": M{"FullName": pref.FullName("test.BAR")},
|
||||
},
|
||||
"ReservedNames": M{
|
||||
"Len": 2,
|
||||
"Get:0": pref.Name("FIZZ"),
|
||||
"Has:BUZZ": true,
|
||||
"Has:NOEXIST": false,
|
||||
},
|
||||
"ReservedRanges": M{
|
||||
"Len": 2,
|
||||
"Get:0": [2]pref.EnumNumber{10, 19},
|
||||
"Has:9": false,
|
||||
"Has:10": true,
|
||||
"Has:15": true,
|
||||
"Has:19": true,
|
||||
"Has:20": false,
|
||||
"Has:30": true,
|
||||
"Has:31": false,
|
||||
},
|
||||
},
|
||||
},
|
||||
"Extensions": M{
|
||||
@ -718,6 +769,7 @@ func testFileFormat(t *testing.T, fd pref.FileDescriptor) {
|
||||
Number: 2
|
||||
Cardinality: optional
|
||||
Kind: enum
|
||||
HasJSONName: true
|
||||
JSONName: "Field2"
|
||||
HasDefault: true
|
||||
Default: 1
|
||||
@ -736,6 +788,7 @@ func testFileFormat(t *testing.T, fd pref.FileDescriptor) {
|
||||
Number: 4
|
||||
Cardinality: repeated
|
||||
Kind: message
|
||||
HasJSONName: true
|
||||
JSONName: "Field4"
|
||||
IsMap: true
|
||||
MessageType: test.A
|
||||
@ -760,6 +813,8 @@ func testFileFormat(t *testing.T, fd pref.FileDescriptor) {
|
||||
Name: O2
|
||||
Fields: [field_two, field_three]
|
||||
}]
|
||||
ReservedNames: [fizz, buzz]
|
||||
ReservedRanges: [100:200, 300]
|
||||
RequiredNumbers: [6]
|
||||
ExtensionRanges: [1000:2000, 3000]
|
||||
}, {
|
||||
@ -799,6 +854,8 @@ func testFileFormat(t *testing.T, fd pref.FileDescriptor) {
|
||||
{Name: FOO}
|
||||
{Name: BAR, Number: 1}
|
||||
]
|
||||
ReservedNames: [FIZZ, BUZZ]
|
||||
ReservedRanges: [10:20, 30]
|
||||
}]
|
||||
Extensions: [{
|
||||
Name: X
|
||||
|
||||
@ -3911,6 +3911,7 @@ var xxx_Descriptor_ProtoFile_MessageDescs = [27]prototype.Message{
|
||||
JSONName: "uninterpretedOption",
|
||||
},
|
||||
},
|
||||
ReservedRanges: [][2]protoreflect.FieldNumber{{38, 39}},
|
||||
ExtensionRanges: [][2]protoreflect.FieldNumber{{1000, 536870912}},
|
||||
},
|
||||
{
|
||||
@ -3955,6 +3956,7 @@ var xxx_Descriptor_ProtoFile_MessageDescs = [27]prototype.Message{
|
||||
JSONName: "uninterpretedOption",
|
||||
},
|
||||
},
|
||||
ReservedRanges: [][2]protoreflect.FieldNumber{{8, 9}, {9, 10}},
|
||||
ExtensionRanges: [][2]protoreflect.FieldNumber{{1000, 536870912}},
|
||||
},
|
||||
{
|
||||
@ -4015,6 +4017,7 @@ var xxx_Descriptor_ProtoFile_MessageDescs = [27]prototype.Message{
|
||||
JSONName: "uninterpretedOption",
|
||||
},
|
||||
},
|
||||
ReservedRanges: [][2]protoreflect.FieldNumber{{4, 5}},
|
||||
ExtensionRanges: [][2]protoreflect.FieldNumber{{1000, 536870912}},
|
||||
},
|
||||
{
|
||||
@ -4056,6 +4059,7 @@ var xxx_Descriptor_ProtoFile_MessageDescs = [27]prototype.Message{
|
||||
JSONName: "uninterpretedOption",
|
||||
},
|
||||
},
|
||||
ReservedRanges: [][2]protoreflect.FieldNumber{{5, 6}},
|
||||
ExtensionRanges: [][2]protoreflect.FieldNumber{{1000, 536870912}},
|
||||
},
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user