feat: Optimize Encoding Functions and Add Descriptive Comments (#3543)
This commit is contained in:
@@ -9,36 +9,35 @@ import (
|
|||||||
"gopkg.in/yaml.v2"
|
"gopkg.in/yaml.v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// TomlToJson converts TOML data into its JSON representation.
|
||||||
func TomlToJson(data []byte) ([]byte, error) {
|
func TomlToJson(data []byte) ([]byte, error) {
|
||||||
var val any
|
var val any
|
||||||
if err := toml.NewDecoder(bytes.NewReader(data)).Decode(&val); err != nil {
|
if err := toml.NewDecoder(bytes.NewReader(data)).Decode(&val); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
return encodeToJSON(val)
|
||||||
var buf bytes.Buffer
|
|
||||||
if err := json.NewEncoder(&buf).Encode(val); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf.Bytes(), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// YamlToJson converts YAML data into its JSON representation.
|
||||||
func YamlToJson(data []byte) ([]byte, error) {
|
func YamlToJson(data []byte) ([]byte, error) {
|
||||||
var val any
|
var val any
|
||||||
if err := yaml.Unmarshal(data, &val); err != nil {
|
if err := yaml.Unmarshal(data, &val); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
val = toStringKeyMap(val)
|
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
|
var buf bytes.Buffer
|
||||||
if err := json.NewEncoder(&buf).Encode(val); err != nil {
|
if err := json.NewEncoder(&buf).Encode(val); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return buf.Bytes(), nil
|
return buf.Bytes(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// convertKeyToString ensures all keys of the map are of type string.
|
||||||
func convertKeyToString(in map[any]any) map[string]any {
|
func convertKeyToString(in map[any]any) map[string]any {
|
||||||
res := make(map[string]any)
|
res := make(map[string]any)
|
||||||
for k, v := range in {
|
for k, v := range in {
|
||||||
@@ -47,10 +46,12 @@ func convertKeyToString(in map[any]any) map[string]any {
|
|||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// convertNumberToJsonNumber converts numbers into json.Number type for compatibility.
|
||||||
func convertNumberToJsonNumber(in any) json.Number {
|
func convertNumberToJsonNumber(in any) json.Number {
|
||||||
return json.Number(lang.Repr(in))
|
return json.Number(lang.Repr(in))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// convertSlice processes slice items to ensure key compatibility.
|
||||||
func convertSlice(in []any) []any {
|
func convertSlice(in []any) []any {
|
||||||
res := make([]any, len(in))
|
res := make([]any, len(in))
|
||||||
for i, v := range in {
|
for i, v := range in {
|
||||||
@@ -59,6 +60,7 @@ func convertSlice(in []any) []any {
|
|||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// toStringKeyMap processes the data to ensure that all map keys are of type string.
|
||||||
func toStringKeyMap(v any) any {
|
func toStringKeyMap(v any) any {
|
||||||
switch v := v.(type) {
|
switch v := v.(type) {
|
||||||
case []any:
|
case []any:
|
||||||
|
|||||||
Reference in New Issue
Block a user