Skip to content

Commit 002f37a

Browse files
rsfreitasrsfreitas
authored
fix: change strcase dependency (#48)
1 parent 120807e commit 002f37a

File tree

9 files changed

+33
-25
lines changed

9 files changed

+33
-25
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/creasty/defaults v1.8.0
1010
github.com/fatih/camelcase v1.0.0
1111
github.com/go-playground/validator/v10 v10.26.0
12-
github.com/iancoleman/strcase v0.3.0
12+
github.com/stoewer/go-strcase v1.3.0
1313
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463
1414
google.golang.org/protobuf v1.36.6
1515
)

‎go.sum

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1 h1:V1xulAoqLq
88
github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1/go.mod h1:c5D8gWRIZ2HLWO3gXYTtUfw/hbJyD8xikv2ooPxnklQ=
99
github.com/creasty/defaults v1.8.0 h1:z27FJxCAa0JKt3utc0sCImAEb+spPucmKoOdLHvHYKk=
1010
github.com/creasty/defaults v1.8.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM=
11+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1112
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1213
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1314
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
@@ -24,12 +25,18 @@ github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc
2425
github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
2526
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
2627
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
27-
github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
28-
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
2928
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
3029
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
3130
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3231
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
32+
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
33+
github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
34+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
35+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
36+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
37+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
38+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
39+
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
3340
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
3441
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
3542
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
@@ -47,5 +54,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463/go.
4754
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
4855
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
4956
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
57+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5058
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
5159
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎pkg/context/field.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/iancoleman/strcase"
7+
"github.com/stoewer/go-strcase"
88
descriptor "google.golang.org/protobuf/types/descriptorpb"
99

1010
"github.com/mikros-dev/protoc-gen-mikros-extensions/internal/testing"
@@ -77,7 +77,7 @@ func loadField(opt LoadFieldOptions) (*Field, error) {
7777
Type: opt.Field.Proto.GetType(),
7878
GoType: goType,
7979
GoName: opt.Field.Schema.GoName,
80-
JsonName: strings.ToLower(strcase.ToSnake(opt.Field.Proto.GetJsonName())),
80+
JsonName: strings.ToLower(strcase.SnakeCase(opt.Field.Proto.GetJsonName())),
8181
ProtoName: opt.Field.Proto.GetName(),
8282
DomainName: converter.DomainName(),
8383
DomainTag: converter.DomainTag(),

‎pkg/converters/database.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package converters
33
import (
44
"fmt"
55

6-
"github.com/iancoleman/strcase"
6+
"github.com/stoewer/go-strcase"
77

88
"github.com/mikros-dev/protoc-gen-mikros-extensions/pkg/mikros_extensions"
99
)
@@ -51,7 +51,7 @@ func (d *Database) FieldName(name string) string {
5151
}
5252
}
5353

54-
return strcase.ToSnake(fieldName)
54+
return strcase.SnakeCase(fieldName)
5555
}
5656

5757
func (d *Database) Tag(name string) string {

‎pkg/converters/field.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/iancoleman/strcase"
7+
"github.com/stoewer/go-strcase"
88
"google.golang.org/protobuf/reflect/protoreflect"
99
descriptor "google.golang.org/protobuf/types/descriptorpb"
1010

@@ -288,7 +288,7 @@ func (f *Field) DomainName() string {
288288
if f.fieldExtensions != nil {
289289
if domain := f.fieldExtensions.GetDomain(); domain != nil {
290290
if n := domain.GetName(); n != "" {
291-
return strcase.ToCamel(n)
291+
return strcase.UpperCamelCase(n)
292292
}
293293
}
294294
}
@@ -299,14 +299,14 @@ func (f *Field) DomainName() string {
299299
func (f *Field) DomainTag() string {
300300
var (
301301
domain *mikros_extensions.FieldDomainOptions
302-
fieldName = strcase.ToSnake(f.DomainName())
302+
fieldName = strcase.SnakeCase(f.DomainName())
303303
jsonTag = ",omitempty"
304304
)
305305

306306
if f.messageExtensions != nil {
307307
if messageDomain := f.messageExtensions.GetDomain(); messageDomain != nil {
308308
if messageDomain.GetNamingMode() == mikros_extensions.NamingMode_NAMING_MODE_CAMEL_CASE {
309-
fieldName = strcase.ToLowerCamel(f.DomainName())
309+
fieldName = strcase.LowerCamelCase(f.DomainName())
310310
}
311311
}
312312
}
@@ -347,7 +347,7 @@ func (f *Field) InboundName() string {
347347
}
348348

349349
// Default is snake_case
350-
fieldName := strcase.ToSnake(name)
350+
fieldName := strcase.SnakeCase(name)
351351
if f.messageExtensions != nil {
352352
if messageInbound := f.messageExtensions.GetInbound(); messageInbound != nil {
353353
if messageInbound.GetNamingMode() == mikros_extensions.NamingMode_NAMING_MODE_CAMEL_CASE {
@@ -380,7 +380,7 @@ func (f *Field) OutboundTag() string {
380380
}
381381

382382
// Default is snake_case
383-
fieldName := strcase.ToSnake(name)
383+
fieldName := strcase.SnakeCase(name)
384384
if f.messageExtensions != nil {
385385
if messageOutbound := f.messageExtensions.GetOutbound(); messageOutbound != nil {
386386
if messageOutbound.GetNamingMode() == mikros_extensions.NamingMode_NAMING_MODE_CAMEL_CASE {
@@ -418,7 +418,7 @@ func (f *Field) OutboundJsonTagFieldName() string {
418418
}
419419

420420
// Default is snake_case
421-
fieldName := strcase.ToSnake(name)
421+
fieldName := strcase.SnakeCase(name)
422422
if f.messageExtensions != nil {
423423
if messageOutbound := f.messageExtensions.GetOutbound(); messageOutbound != nil {
424424
if messageOutbound.GetNamingMode() == mikros_extensions.NamingMode_NAMING_MODE_CAMEL_CASE {

‎pkg/converters/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package converters
33
import (
44
"strings"
55

6-
"github.com/iancoleman/strcase"
6+
"github.com/stoewer/go-strcase"
77
)
88

99
func TrimPackageName(name, packageName string) string {
@@ -15,5 +15,5 @@ func TrimPackageName(name, packageName string) string {
1515
}
1616

1717
func inboundOutboundCamelCase(s string) string {
18-
return strcase.ToLowerCamel(s)
18+
return strcase.LowerCamelCase(s)
1919
}

‎pkg/protobuf/field.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"regexp"
66
"strings"
77

8-
"github.com/iancoleman/strcase"
8+
"github.com/stoewer/go-strcase"
99
"google.golang.org/protobuf/compiler/protogen"
1010
"google.golang.org/protobuf/reflect/protoreflect"
1111
descriptor "google.golang.org/protobuf/types/descriptorpb"
@@ -33,7 +33,7 @@ func parseField(proto *descriptor.FieldDescriptorProto, schema *protogen.Field,
3333
optional: proto.GetProto3Optional(),
3434
array: proto.GetLabel() == descriptor.FieldDescriptorProto_LABEL_REPEATED,
3535
Name: proto.GetName(),
36-
JsonName: strings.ToLower(strcase.ToSnake(proto.GetJsonName())),
36+
JsonName: strings.ToLower(strcase.SnakeCase(proto.GetJsonName())),
3737
GoName: schema.GoName,
3838
TypeName: proto.GetTypeName(),
3939
Type: proto.GetType(),

‎pkg/template/template.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"text/template"
1111

1212
"github.com/go-playground/validator/v10"
13-
"github.com/iancoleman/strcase"
13+
"github.com/stoewer/go-strcase"
1414
"google.golang.org/protobuf/compiler/protogen"
1515

1616
"github.com/mikros-dev/protoc-gen-mikros-extensions/internal/addon"
@@ -214,7 +214,7 @@ func (t *Templates) Execute() ([]*Generated, error) {
214214
// Filename: Path + Package Name + Module Name + Template Name + Extension
215215
templateName := fmt.Sprintf("%s.%s", t.moduleName, tpl.name)
216216
if tpl.addon != nil {
217-
templateName = fmt.Sprintf("%s.%s.%s", t.moduleName, strcase.ToSnake(tpl.addon.Addon().Name()), tpl.name)
217+
templateName = fmt.Sprintf("%s.%s.%s", t.moduleName, strcase.SnakeCase(tpl.addon.Addon().Name()), tpl.name)
218218
}
219219

220220
filename := filepath.Join(

‎pkg/template/types/types.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"strings"
55
"text/template"
66

7-
"github.com/iancoleman/strcase"
7+
"github.com/stoewer/go-strcase"
88
)
99

1010
type Kind int
@@ -25,14 +25,14 @@ type ValidateForExecution func() bool
2525
// HelperApi gives the API available for all templates to be used.
2626
func HelperApi() map[string]interface{} {
2727
return template.FuncMap{
28-
"toLowerCamelCase": strcase.ToLowerCamel,
28+
"toLowerCamelCase": strcase.LowerCamelCase,
2929
"firstLower": func(s string) string {
3030
c := s[0]
3131
return strings.ToLower(string(c))
3232
},
33-
"toSnake": strcase.ToSnake,
34-
"toCamelCase": strcase.ToCamel,
35-
"toKebab": strcase.ToKebab,
33+
"toSnake": strcase.SnakeCase,
34+
"toCamelCase": strcase.UpperCamelCase,
35+
"toKebab": strcase.KebabCase,
3636
"trimSuffix": strings.TrimSuffix,
3737
}
3838
}

0 commit comments

Comments
 (0)