Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions camel.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ func toCamelInitCase(s string, initCase bool) string {
n := strings.Builder{}
n.Grow(len(s))
capNext := initCase
for i, v := range []byte(s) {
prevWasNum := false
sBytes := []byte(s)
sLen := len(sBytes)
for i, v := range sBytes {
vIsCap := v >= 'A' && v <= 'Z'
vIsLow := v >= 'a' && v <= 'z'
if capNext {
Expand All @@ -59,16 +62,26 @@ func toCamelInitCase(s string, initCase bool) string {
if vIsCap || vIsLow {
n.WriteByte(v)
capNext = false
} else if vIsNum := v >= '0' && v <= '9'; vIsNum {
prevWasNum = false
} else if isNum(v) {
n.WriteByte(v)
prevWasNum = true
capNext = true
} else {
capNext = v == '_' || v == ' ' || v == '-' || v == '.'
if capNext && prevWasNum && (sLen > i+1 && isNum([]byte(s)[i+1])) {
n.WriteByte('_')
prevWasNum = false
}
}
}
return n.String()
}

func isNum(v byte) bool {
return v >= '0' && v <= '9'
}

// ToCamel converts a string to CamelCase
func ToCamel(s string) string {
return toCamelInitCase(s, true)
Expand Down
9 changes: 9 additions & 0 deletions camel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ func toCamel(tb testing.TB) {
{"", ""},
{"many_many_words", "ManyManyWords"},
{"AnyKind of_string", "AnyKindOfString"},
{"AnyKind.of_string13_", "AnyKindOfString13"},
{"AnyKind.of_string13__", "AnyKindOfString13"},
{"AnyKind.of_string13-", "AnyKindOfString13"},
{"AnyKind.of_string13--", "AnyKindOfString13"},
{"AnyKind.of_string13 ", "AnyKindOfString13"},
{"AnyKind.of_string13_37", "AnyKindOfString13_37"},
{"AnyKind.of_string13_37 test", "AnyKindOfString13_37Test"},
{"odd-fix", "OddFix"},
{"numbers2And55with000", "Numbers2And55With000"},
{"ID", "Id"},
Expand Down Expand Up @@ -67,6 +74,8 @@ func toLowerCamel(tb testing.TB) {
{"", ""},
{"AnyKind of_string", "anyKindOfString"},
{"AnyKind.of-string", "anyKindOfString"},
{"AnyKind.of_string13_37", "anyKindOfString13_37"},
{"AnyKind.of_string13_37test", "anyKindOfString13_37Test"},
{"ID", "id"},
{"some string", "someString"},
{" some string", "someString"},
Expand Down
2 changes: 2 additions & 0 deletions snake_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ func toSnake(tb testing.TB) {
{"ManyManyWords", "many_many_words"},
{"manyManyWords", "many_many_words"},
{"AnyKind of_string", "any_kind_of_string"},
{"AnyKind of string13 37", "any_kind_of_string_13_37"},
{"AnyKind of string13 37 test", "any_kind_of_string_13_37_test"},
{"numbers2and55with000", "numbers_2_and_55_with_000"},
{"JSONData", "json_data"},
{"userID", "user_id"},
Expand Down