Skip to content

Commit

Permalink
⬆️ up: replace json driver to goccy/go-json from json-iterator/go
Browse files Browse the repository at this point in the history
  • Loading branch information
inhere committed Feb 11, 2023
1 parent d52926f commit 5eb6061
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
8 changes: 2 additions & 6 deletions driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ func NewDriver(name string, dec Decoder, enc Encoder) *StdDriver {
}

// Name of driver
func (d *StdDriver) Name() string {
return d.name
}
func (d *StdDriver) Name() string { return d.name }

// Decode of driver
func (d *StdDriver) Decode(blob []byte, v any) (err error) {
Expand All @@ -59,13 +57,11 @@ func (d *StdDriver) GetEncoder() Encoder {
}

/*************************************************************
* json driver
* JSON driver
*************************************************************/

var (
// JSONAllowComments support write comments on json file.
//
// Deprecated: please use JSONDriver.ClearComments = true
JSONAllowComments = true

// JSONMarshalIndent if not empty, will use json.MarshalIndent for encode data.
Expand Down
10 changes: 4 additions & 6 deletions json/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,23 @@
package json

import (
"github.com/goccy/go-json"
"github.com/gookit/config/v2"
"github.com/gookit/goutil/jsonutil"
"github.com/json-iterator/go"
)

var parser = jsoniter.ConfigCompatibleWithStandardLibrary

var (
// Decoder for json
Decoder config.Decoder = func(data []byte, v any) (err error) {
if config.JSONAllowComments {
str := jsonutil.StripComments(string(data))
return parser.Unmarshal([]byte(str), v)
return json.Unmarshal([]byte(str), v)
}
return parser.Unmarshal(data, v)
return json.Unmarshal(data, v)
}

// Encoder for json
Encoder config.Encoder = parser.Marshal
Encoder config.Encoder = json.Marshal
// Driver for json
Driver = config.NewDriver(config.JSON, Decoder, Encoder)
)

0 comments on commit 5eb6061

Please sign in to comment.