Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

slice converted to single value #244

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

slice converted to single value #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0e0fbb
slice2single
huangnauh Mar 19, 2021
145c58d
add tests
huangnauh Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 41 additions & 1 deletion mapstructure.go
View file
Open in desktop
Expand Up @@ -571,7 +571,11 @@ func (d *Decoder) decodeString(name string, data interface{}, val reflect.Value)
}
val.SetString(string(uints))
default:
converted = false
if dataVal.Len() == 1 {
return d.decodeString(name, dataVal.Index(0).Interface(), val)
} else {
converted = false
}
}
default:
converted = false
Expand Down Expand Up @@ -624,6 +628,15 @@ func (d *Decoder) decodeInt(name string, data interface{}, val reflect.Value) er
"error decoding json.Number into %s: %s", name, err)
}
val.SetInt(i)
case dataKind == reflect.Slice && d.config.WeaklyTypedInput,
dataKind == reflect.Array && d.config.WeaklyTypedInput:
if dataVal.Len() == 1 {
return d.decodeInt(name, dataVal.Index(0).Interface(), val)
} else {
return fmt.Errorf(
"'%s' expected type '%s', got unconvertible type '%s'",
name, val.Type(), dataVal.Type())
}
default:
return fmt.Errorf(
"'%s' expected type '%s', got unconvertible type '%s', value: '%v'",
Expand Down Expand Up @@ -685,6 +698,15 @@ func (d *Decoder) decodeUint(name string, data interface{}, val reflect.Value) e
name, i)
}
val.SetUint(uint64(i))
case dataKind == reflect.Slice && d.config.WeaklyTypedInput,
dataKind == reflect.Array && d.config.WeaklyTypedInput:
if dataVal.Len() == 1 {
return d.decodeUint(name, dataVal.Index(0).Interface(), val)
} else {
return fmt.Errorf(
"'%s' expected type '%s', got unconvertible type '%s'",
name, val.Type(), dataVal.Type())
}
default:
return fmt.Errorf(
"'%s' expected type '%s', got unconvertible type '%s', value: '%v'",
Expand Down Expand Up @@ -716,6 +738,15 @@ func (d *Decoder) decodeBool(name string, data interface{}, val reflect.Value) e
} else {
return fmt.Errorf("cannot parse '%s' as bool: %s", name, err)
}
case dataKind == reflect.Slice && d.config.WeaklyTypedInput,
dataKind == reflect.Array && d.config.WeaklyTypedInput:
if dataVal.Len() == 1 {
return d.decodeBool(name, dataVal.Index(0).Interface(), val)
} else {
return fmt.Errorf(
"'%s' expected type '%s', got unconvertible type '%s'",
name, val.Type(), dataVal.Type())
}
default:
return fmt.Errorf(
"'%s' expected type '%s', got unconvertible type '%s', value: '%v'",
Expand Down Expand Up @@ -763,6 +794,15 @@ func (d *Decoder) decodeFloat(name string, data interface{}, val reflect.Value)
"error decoding json.Number into %s: %s", name, err)
}
val.SetFloat(i)
case dataKind == reflect.Slice && d.config.WeaklyTypedInput,
dataKind == reflect.Array && d.config.WeaklyTypedInput:
if dataVal.Len() == 1 {
return d.decodeFloat(name, dataVal.Index(0).Interface(), val)
} else {
return fmt.Errorf(
"'%s' expected type '%s', got unconvertible type '%s'",
name, val.Type(), dataVal.Type())
}
default:
return fmt.Errorf(
"'%s' expected type '%s', got unconvertible type '%s', value: '%v'",
Expand Down
12 changes: 12 additions & 0 deletions mapstructure_test.go
View file
Open in desktop
Expand Up @@ -201,6 +201,10 @@ type TypeConversionResult struct {
StringToIntSlice []int
StringToStrArray [1]string
StringToIntArray [1]int
SliceToString string
SliceToInt64 int64
SliceToTrue bool
SliceToFalse bool
SliceToMap map[string]interface{}
MapToSlice []interface{}
ArrayToMap map[string]interface{}
Expand Down Expand Up @@ -1090,6 +1094,10 @@ func TestDecode_TypeConversion(t *testing.T) {
"StringToIntSlice": "42",
"StringToStrArray": "A",
"StringToIntArray": "42",
"SliceToString": []string{"42"},
"SliceToInt64": []string{"42"},
"SliceToTrue": []string{"true"},
"SliceToFalse": []string{""},
"SliceToMap": []interface{}{},
"MapToSlice": map[string]interface{}{},
"ArrayToMap": []interface{}{},
Expand Down Expand Up @@ -1136,6 +1144,10 @@ func TestDecode_TypeConversion(t *testing.T) {
StringToIntSlice: []int{42},
StringToStrArray: [1]string{"A"},
StringToIntArray: [1]int{42},
SliceToString: "42",
SliceToInt64: 42,
SliceToTrue: true,
SliceToFalse: false,
SliceToMap: map[string]interface{}{},
MapToSlice: []interface{}{},
ArrayToMap: map[string]interface{}{},
Expand Down