Skip to content

refactor(protoc-gen-pony): remove mapValuePonyType duplicate of elemPonyType #49

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
enilsen16 merged 2 commits into from
Apr 29, 2026
Merged

refactor(protoc-gen-pony): remove mapValuePonyType duplicate of elemPonyType #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e62e2f8
refactor(protoc-gen-pony): remove mapValuePonyType duplicate of elemP…
enilsen16 Apr 29, 2026
49dd0ab
Merge branch 'main' into refactor/simplify-protoc-gen-pony
enilsen16 Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions cmd/protoc-gen-pony/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func (ctx *genCtx) emitDecode(className string, supported []*protogen.Field, one
name := string(field.Desc.Name())
if field.Desc.IsMap() {
kType := ctx.mapKeyPonyType(field.Message.Fields[0])
vType := ctx.mapValuePonyType(field.Message.Fields[1])
vType := ctx.elemPonyType(field.Message.Fields[1])
ctx.g.P(` var `, name, `: Map[`, kType, `, `, vType, `] trn = recover trn Map[`, kType, `, `, vType, `] end`)
} else if field.Desc.IsList() {
elem := ctx.elemPonyType(field)
Expand Down Expand Up @@ -325,7 +325,7 @@ func (ctx *genCtx) emitMapDecodeArm(field *protogen.Field, name string, num prot
valField := field.Message.Fields[1]
keySpec := scalarSpecs[keyField.Desc.Kind()]
kType := ctx.mapKeyPonyType(keyField)
vType := ctx.mapValuePonyType(valField)
vType := ctx.elemPonyType(valField)
keyReadExpr := strings.Replace(keySpec.readExpr, "reader", "entry_sub", 1)

ctx.g.P(` | (`, num, `, WireLenDelim) =>`)
Expand Down Expand Up @@ -771,16 +771,6 @@ func (ctx *genCtx) mapKeyPonyType(field *protogen.Field) string {
return scalarSpecs[field.Desc.Kind()].ponyType
}

func (ctx *genCtx) mapValuePonyType(field *protogen.Field) string {
switch field.Desc.Kind() {
case protoreflect.MessageKind:
return ponyMessageClassName(field.Message) + " val"
case protoreflect.EnumKind:
return ponyEnumTypeName(field.Enum)
}
return scalarSpecs[field.Desc.Kind()].ponyType
}

func (ctx *genCtx) mapValueDefault(field *protogen.Field) string {
switch field.Desc.Kind() {
case protoreflect.MessageKind:
Expand Down Expand Up @@ -876,8 +866,6 @@ var wktBlocklist = map[string]bool{
"google/protobuf/descriptor.proto": true,
}

// isWKT reports whether f is a blocked well-known-type file. Most WKTs
// generate as regular proto3 messages; only the circular/JSON-only ones stay TODO.
func isWKT(f protoreflect.FileDescriptor) bool {
return wktBlocklist[f.Path()]
}
Expand Down Expand Up @@ -1025,7 +1013,7 @@ func (ctx *genCtx) supportedFields(fields []*protogen.Field) []*protogen.Field {
func (ctx *genCtx) fieldPonyType(field *protogen.Field) string {
if field.Desc.IsMap() {
kType := ctx.mapKeyPonyType(field.Message.Fields[0])
vType := ctx.mapValuePonyType(field.Message.Fields[1])
vType := ctx.elemPonyType(field.Message.Fields[1])
return "Map[" + kType + ", " + vType + "] val"
}
if field.Desc.IsList() {
Expand Down Expand Up @@ -1062,7 +1050,7 @@ func (ctx *genCtx) elemPonyType(field *protogen.Field) string {
func (ctx *genCtx) fieldPonyDefault(field *protogen.Field) string {
if field.Desc.IsMap() {
kType := ctx.mapKeyPonyType(field.Message.Fields[0])
vType := ctx.mapValuePonyType(field.Message.Fields[1])
vType := ctx.elemPonyType(field.Message.Fields[1])
return "recover val Map[" + kType + ", " + vType + "] end"
}
if field.Desc.IsList() {
Expand Down