Skip to content

Commit

Permalink
feat: support automatic camel case field key
Browse files Browse the repository at this point in the history
Add camel case encoding option
Add camel case key conversion
Add camel case test
  • Loading branch information
ErikPelli committed May 25, 2022
1 parent 23bd66f commit c1b23af
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 2 deletions.
26 changes: 26 additions & 0 deletions encode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2388,3 +2388,29 @@ func TestIssue324(t *testing.T) {
t.Fatalf("failed to encode. expected %q but got %q", expected, got)
}
}

func TestIssue271(t *testing.T) {
type T struct {
FieldA bool
}

type T2 struct {
FieldA bool `json:"fieldA"`
}

v := T{FieldA: true}
got, err := json.MarshalWithOption(v, json.EnableCamelCase())
if err != nil {
t.Fatal(err)
}

v2 := T2{FieldA: true}
expected, err := json.Marshal(v2)
if err != nil {
t.Fatal(err)
}

if !bytes.Equal(expected, got) {
t.Fatalf("failed to encode. expected %q but got %q", expected, got)
}
}
3 changes: 2 additions & 1 deletion internal/encoder/option.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
)

type OptionFlag uint8
type OptionFlag uint16

const (
HTMLEscapeOption OptionFlag = 1 << iota
Expand All @@ -16,6 +16,7 @@ const (
ContextOption
NormalizeUTF8Option
FieldQueryOption
CamelCaseOption
)

type Option struct {
Expand Down
13 changes: 12 additions & 1 deletion internal/encoder/vm/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package vm
import (
"encoding/json"
"fmt"
"unicode"
"unsafe"

"github.com/goccy/go-json/internal/encoder"
Expand Down Expand Up @@ -184,7 +185,17 @@ func appendStructHead(_ *encoder.RuntimeContext, b []byte) []byte {
return append(b, '{')
}

func appendStructKey(_ *encoder.RuntimeContext, code *encoder.Opcode, b []byte) []byte {
func appendStructKey(e *encoder.RuntimeContext, code *encoder.Opcode, b []byte) []byte {
if e.Option.Flag&encoder.CamelCaseOption > 0 {
key := []rune(code.Key)
for i := range key {
if unicode.IsLetter(key[i]) {
key[i] = unicode.ToLower(key[i])
break
}
}
return append(b, string(key)...)
}
return append(b, code.Key...)
}

Expand Down
7 changes: 7 additions & 0 deletions option.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ func DisableHTMLEscape() EncodeOptionFunc {
}
}

// EnableCamelCase convert the keys to camel case when encoding a struct.
func EnableCamelCase() EncodeOptionFunc {
return func(opt *EncodeOption) {
opt.Flag |= encoder.CamelCaseOption
}
}

// DisableNormalizeUTF8
// By default, when encoding string, UTF8 characters in the range of 0x80 - 0xFF are processed by applying \ufffd for invalid code and escaping for \u2028 and \u2029.
// This option disables this behaviour. You can expect faster speeds by applying this option, but be careful.
Expand Down

0 comments on commit c1b23af

Please sign in to comment.