github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 09:00:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Optimize Encoding Functions and Add Descriptive Comments (#3543)

Browse Source
This commit is contained in:
Xinwei Xiong 2023-09-06 22:19:50 +08:00 committed by GitHub
parent 69a3024853
commit ca5a7df5b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/encoding/encoding.go
View File

@ -9,36 +9,35 @@ import (
"gopkg.in/yaml.v2"
)
// TomlToJson converts TOML data into its JSON representation.
func TomlToJson(data []byte) ([]byte, error) {
var val any
if err := toml.NewDecoder(bytes.NewReader(data)).Decode(&val); err != nil {
return nil, err
}
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(val); err != nil {
return nil, err
}
return buf.Bytes(), nil
return encodeToJSON(val)
}
// YamlToJson converts YAML data into its JSON representation.
func YamlToJson(data []byte) ([]byte, error) {
var val any
if err := yaml.Unmarshal(data, &val); err != nil {
return nil, err
}
val = toStringKeyMap(val)
return encodeToJSON(val)
}
// encodeToJSON encodes the given value into its JSON representation.
func encodeToJSON(val any) ([]byte, error) {
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(val); err != nil {
return nil, err
}
return buf.Bytes(), nil
}
// convertKeyToString ensures all keys of the map are of type string.
func convertKeyToString(in map[any]any) map[string]any {
res := make(map[string]any)
for k, v := range in {
@ -47,10 +46,12 @@ func convertKeyToString(in map[any]any) map[string]any {
return res
}
// convertNumberToJsonNumber converts numbers into json.Number type for compatibility.
func convertNumberToJsonNumber(in any) json.Number {
return json.Number(lang.Repr(in))
}
// convertSlice processes slice items to ensure key compatibility.
func convertSlice(in []any) []any {
res := make([]any, len(in))
for i, v := range in {
@ -59,6 +60,7 @@ func convertSlice(in []any) []any {
return res
}
// toStringKeyMap processes the data to ensure that all map keys are of type string.
func toStringKeyMap(v any) any {
switch v := v.(type) {
case []any: