Skip to content
Open
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions mapstructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ func (d *Decoder) decodeInt(name string, data any, val reflect.Value) error {
})
}
case dataType.PkgPath() == "encoding/json" && dataType.Name() == "Number":
jn := data.(json.Number)
jn := dataVal.Interface().(json.Number)
i, err := jn.Int64()
if err != nil {
return newDecodeError(name, &ParseError{
Expand Down Expand Up @@ -885,7 +885,7 @@ func (d *Decoder) decodeUint(name string, data any, val reflect.Value) error {
})
}
case dataType.PkgPath() == "encoding/json" && dataType.Name() == "Number":
jn := data.(json.Number)
jn := dataVal.Interface().(json.Number)
i, err := strconv.ParseUint(string(jn), 0, 64)
if err != nil {
return newDecodeError(name, &ParseError{
Expand Down Expand Up @@ -976,7 +976,7 @@ func (d *Decoder) decodeFloat(name string, data any, val reflect.Value) error {
})
}
case dataType.PkgPath() == "encoding/json" && dataType.Name() == "Number":
jn := data.(json.Number)
jn := dataVal.Interface().(json.Number)
i, err := jn.Float64()
if err != nil {
return newDecodeError(name, &ParseError{
Expand Down
36 changes: 36 additions & 0 deletions mapstructure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,42 @@ func TestBasicTypes(t *testing.T) {
}
}

func TestDecode_JSONNumberPointer(t *testing.T) {
t.Parallel()

for _, tc := range []struct {
name string
input json.Number
want any
wantErr bool
}{
{"int64", "-42", int64(-42), false},
{"uint64", "9223372036854775809", uint64(9223372036854775809), false},
{"float64", "42.5", float64(42.5), false},
{"invalid_int64", "invalid", int64(0), true},
{"invalid_uint64", "invalid", uint64(0), true},
{"invalid_float64", "invalid", float64(0), true},
} {
t.Run(tc.name, func(t *testing.T) {
result := reflect.New(reflect.TypeOf(tc.want))
err := Decode(&tc.input, result.Interface())
if tc.wantErr {
var parseErr *ParseError
if !errors.As(err, &parseErr) {
t.Fatalf("expected ParseError, got %v", err)
}
return
}
if err != nil {
t.Fatal(err)
}
if got := result.Elem().Interface(); !reflect.DeepEqual(got, tc.want) {
t.Fatalf("got %#v, want %#v", got, tc.want)
}
})
}
}

func TestBasic_IntWithFloat(t *testing.T) {
t.Parallel()

Expand Down