这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: better integer validation checks #768

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

Merged
merged 1 commit into from
Mar 17, 2025
Merged

fix: better integer validation checks #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,10 +428,18 @@ func Validate(r Registry, s *Schema, path *PathBuffer, mode ValidateMode, v any,
case uint64:
num = float64(v)
default:
res.Add(path, v, validation.MsgExpectedNumber)
if s.Type == TypeInteger {
res.Add(path, v, validation.MsgExpectedInteger)
} else {
res.Add(path, v, validation.MsgExpectedNumber)
}
return
}

if s.Type == TypeInteger && num != math.Trunc(num) {
res.Add(path, v, validation.MsgExpectedInteger)
}

if s.Minimum != nil {
if num < *s.Minimum {
res.Add(path, v, s.msgMinimum)
Expand Down
12 changes: 9 additions & 3 deletions validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@ var validateTests = []struct {
name: "expected number int",
typ: reflect.TypeOf(0),
input: "",
errs: []string{"expected number"},
errs: []string{"expected integer"},
},
{
name: "expected number int from float64",
typ: reflect.TypeOf(0),
input: float64(1.5),
errs: []string{"expected integer"},
},
{
name: "expected number float64",
Expand Down Expand Up @@ -731,13 +737,13 @@ var validateTests = []struct {
name: "expected map item",
typ: reflect.TypeOf(map[any]int{}),
input: map[string]any{"one": 1, "two": true},
errs: []string{"expected number"},
errs: []string{"expected integer"},
},
{
name: "expected map any item",
typ: reflect.TypeOf(map[any]int{}),
input: map[any]any{"one": 1, "two": true},
errs: []string{"expected number"},
errs: []string{"expected integer"},
},
{
name: "map minProps success",
Expand Down
1 change: 1 addition & 0 deletions validation/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var (
MsgExpectedPropertyNameInObject = "expected propertyName value to be present in object"
MsgExpectedBoolean = "expected boolean"
MsgExpectedNumber = "expected number"
MsgExpectedInteger = "expected integer"
MsgExpectedString = "expected string"
MsgExpectedBase64String = "expected string to be base64 encoded"
MsgExpectedArray = "expected array"
Expand Down
Loading