Skip to content

Commit db69b78

Browse files
committed
rename tag from isValid to validateFn
1 parent 7705f81 commit db69b78

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

baked_in.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ var (
244244
"cron": isCron,
245245
"spicedb": isSpiceDB,
246246
"ein": isEIN,
247-
"isvalid": isValid,
247+
"validateFn": isValidateFn,
248248
}
249249
)
250250

@@ -3079,7 +3079,7 @@ func isEIN(fl FieldLevel) bool {
30793079
return einRegex().MatchString(field.String())
30803080
}
30813081

3082-
func isValid(fl FieldLevel) bool {
3082+
func isValidateFn(fl FieldLevel) bool {
30833083
if instance, ok := tryConvertFieldTo[interface{ Validate() error }](fl.Field()); ok {
30843084
return instance.Validate() == nil
30853085
}
@@ -3103,4 +3103,4 @@ func convertFieldTo[V any](field reflect.Value) (v V, ok bool) {
31033103

31043104
var zero V
31053105
return zero, false
3106-
}
3106+
}

doc.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -756,12 +756,12 @@ in a field of the struct specified via a parameter.
756756
// For slices of struct:
757757
Usage: unique=field
758758
759-
# IsValid
759+
# ValidateFn
760760
761761
This validates that an object respects the interface `Validate() error` and
762762
the method `Validate` does not return an error.
763763
764-
Usage: isvalid
764+
Usage: validateFn
765765
766766
# Alpha Only
767767

validator_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -14236,7 +14236,7 @@ func TestIsValid(t *testing.T) {
1423614236

1423714237
type Test struct {
1423814238
String string
14239-
Inner *NotRed `validate:"isvalid"`
14239+
Inner *NotRed `validate:"validateFn"`
1424014240
}
1424114241

1424214242
var tt Test
@@ -14247,7 +14247,7 @@ func TestIsValid(t *testing.T) {
1424714247
fe := errs.(ValidationErrors)[0]
1424814248
Equal(t, fe.Field(), "Inner")
1424914249
Equal(t, fe.Namespace(), "Test.Inner")
14250-
Equal(t, fe.Tag(), "isvalid")
14250+
Equal(t, fe.Tag(), "validateFn")
1425114251

1425214252
tt.Inner = &NotRed{Color: "blue"}
1425314253
errs = validate.Struct(tt)
@@ -14260,7 +14260,7 @@ func TestIsValid(t *testing.T) {
1426014260
fe = errs.(ValidationErrors)[0]
1426114261
Equal(t, fe.Field(), "Inner")
1426214262
Equal(t, fe.Namespace(), "Test.Inner")
14263-
Equal(t, fe.Tag(), "isvalid")
14263+
Equal(t, fe.Tag(), "validateFn")
1426414264

1426514265
})
1426614266

@@ -14269,7 +14269,7 @@ func TestIsValid(t *testing.T) {
1426914269

1427014270
type Test2 struct {
1427114271
String string
14272-
Inner NotRed `validate:"isvalid"`
14272+
Inner NotRed `validate:"validateFn"`
1427314273
}
1427414274

1427514275
var tt2 Test2
@@ -14289,6 +14289,6 @@ func TestIsValid(t *testing.T) {
1428914289
fe := errs.(ValidationErrors)[0]
1429014290
Equal(t, fe.Field(), "Inner")
1429114291
Equal(t, fe.Namespace(), "Test2.Inner")
14292-
Equal(t, fe.Tag(), "isvalid")
14292+
Equal(t, fe.Tag(), "validateFn")
1429314293
})
1429414294
}

0 commit comments

Comments
 (0)