Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 9 additions & 21 deletions map.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func toMapE[K comparable, V any](i any, keyFn func(any) K, valFn func(any) V) (m
m := map[K]V{}

if i == nil {
return nil, fmt.Errorf(errorMsg, i, i, m)
return m, fmt.Errorf(errorMsg, i, i, m)
}

switch v := i.(type) {
Expand Down Expand Up @@ -45,14 +45,10 @@ func toMapE[K comparable, V any](i any, keyFn func(any) K, valFn func(any) V) (m

case string:
err := jsonStringToObject(v, &m)
if err != nil {
return nil, err
}

return m, nil
return m, err

default:
return nil, fmt.Errorf(errorMsg, i, i, m)
return m, fmt.Errorf(errorMsg, i, i, m)
}
}

Expand Down Expand Up @@ -112,23 +108,19 @@ func ToStringMapStringSliceE(i any) (map[string][]string, error) {
for k, val := range v {
key, err := ToStringE(k)
if err != nil {
return nil, fmt.Errorf(errorMsg, i, i, m)
return m, fmt.Errorf(errorMsg, i, i, m)
}
value, err := ToStringSliceE(val)
if err != nil {
return nil, fmt.Errorf(errorMsg, i, i, m)
return m, fmt.Errorf(errorMsg, i, i, m)
}
m[key] = value
}
case string:
err := jsonStringToObject(v, &m)
if err != nil {
return nil, err
}

return m, nil
return m, err
default:
return nil, fmt.Errorf(errorMsg, i, i, m)
return m, fmt.Errorf(errorMsg, i, i, m)
}

return m, nil
Expand Down Expand Up @@ -180,15 +172,11 @@ func toStringMapIntE[T int | int64](i any, fn func(any) T, fnE func(any) (T, err

case string:
err := jsonStringToObject(v, &m)
if err != nil {
return nil, err
}

return m, nil
return m, err
}

if reflect.TypeOf(i).Kind() != reflect.Map {
return nil, fmt.Errorf(errorMsg, i, i, m)
return m, fmt.Errorf(errorMsg, i, i, m)
}

mVal := reflect.ValueOf(m)
Expand Down