fix: return an error instead of panic.
This commit is contained in:
parent
86261f2b0a
commit
230cd28ac9
2 changed files with 59 additions and 15 deletions
|
@ -1,6 +1,7 @@
|
||||||
package file
|
package file
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
@ -15,12 +16,15 @@ func decodeRawToNode(data map[string]interface{}, rootName string, filters ...st
|
||||||
}
|
}
|
||||||
|
|
||||||
vData := reflect.ValueOf(data)
|
vData := reflect.ValueOf(data)
|
||||||
decodeRaw(root, vData, filters...)
|
err := decodeRaw(root, vData, filters...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
return root, nil
|
return root, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func decodeRaw(node *parser.Node, vData reflect.Value, filters ...string) {
|
func decodeRaw(node *parser.Node, vData reflect.Value, filters ...string) error {
|
||||||
sortedKeys := sortKeys(vData, filters)
|
sortedKeys := sortKeys(vData, filters)
|
||||||
|
|
||||||
for _, key := range sortedKeys {
|
for _, key := range sortedKeys {
|
||||||
|
@ -38,7 +42,11 @@ func decodeRaw(node *parser.Node, vData reflect.Value, filters ...string) {
|
||||||
case reflect.Bool:
|
case reflect.Bool:
|
||||||
fallthrough
|
fallthrough
|
||||||
case reflect.String:
|
case reflect.String:
|
||||||
child.Value = getSimpleValue(value)
|
value, err := getSimpleValue(value)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
child.Value = value
|
||||||
case reflect.Slice:
|
case reflect.Slice:
|
||||||
var values []string
|
var values []string
|
||||||
|
|
||||||
|
@ -63,40 +71,52 @@ func decodeRaw(node *parser.Node, vData reflect.Value, filters ...string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
child.Children = append(child.Children, ch)
|
child.Children = append(child.Children, ch)
|
||||||
decodeRaw(ch, sValue)
|
err := decodeRaw(ch, sValue)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
values = append(values, getSimpleValue(sValue))
|
val, err := getSimpleValue(sValue)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
values = append(values, val)
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
panic("Unsupported slice type: " + item.Kind().String())
|
return fmt.Errorf("field %s uses unsupported slice type: %s", child.Name, item.Kind().String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
child.Value = strings.Join(values, ",")
|
child.Value = strings.Join(values, ",")
|
||||||
case reflect.Map:
|
case reflect.Map:
|
||||||
decodeRaw(child, value)
|
err := decodeRaw(child, value)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
panic("Unsupported type: " + value.Kind().String())
|
return fmt.Errorf("field %s uses unsupported type: %s", child.Name, value.Kind().String())
|
||||||
}
|
}
|
||||||
|
|
||||||
node.Children = append(node.Children, child)
|
node.Children = append(node.Children, child)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getSimpleValue(item reflect.Value) string {
|
func getSimpleValue(item reflect.Value) (string, error) {
|
||||||
switch item.Kind() {
|
switch item.Kind() {
|
||||||
case reflect.String:
|
case reflect.String:
|
||||||
return item.String()
|
return item.String(), nil
|
||||||
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
||||||
return strconv.FormatInt(item.Int(), 10)
|
return strconv.FormatInt(item.Int(), 10), nil
|
||||||
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
||||||
return strconv.FormatUint(item.Uint(), 10)
|
return strconv.FormatUint(item.Uint(), 10), nil
|
||||||
case reflect.Float32, reflect.Float64:
|
case reflect.Float32, reflect.Float64:
|
||||||
return strings.TrimSuffix(strconv.FormatFloat(item.Float(), 'f', 6, 64), ".000000")
|
return strings.TrimSuffix(strconv.FormatFloat(item.Float(), 'f', 6, 64), ".000000"), nil
|
||||||
case reflect.Bool:
|
case reflect.Bool:
|
||||||
return strconv.FormatBool(item.Bool())
|
return strconv.FormatBool(item.Bool()), nil
|
||||||
default:
|
default:
|
||||||
panic("Unsupported Simple value type: " + item.Kind().String())
|
return "", fmt.Errorf("unsupported simple value type: %s", item.Kind().String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -538,3 +538,27 @@ func Test_decodeRawToNode(t *testing.T) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Test_decodeRawToNode_errors(t *testing.T) {
|
||||||
|
testCases := []struct {
|
||||||
|
desc string
|
||||||
|
data map[string]interface{}
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
desc: "invalid type",
|
||||||
|
data: map[string]interface{}{
|
||||||
|
"foo": struct{}{},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range testCases {
|
||||||
|
test := test
|
||||||
|
t.Run(test.desc, func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
_, err := decodeRawToNode(test.data, parser.DefaultRootName)
|
||||||
|
require.Error(t, err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue