⬆️ dep: upgrade dep to latest and update the README

CHANGELOG.md

@@ -8,14 +8,14 @@
 
 ```go
 // Gt check value greater dst value. only check for: int(X), uint(X), float(X)
-func Gt(val interface{}, dstVal int64) bool {
+func Gt(val any, dstVal int64) bool {
 ```
 
 **v2 new:**
 
 ```go
 // Gt check value greater dst value. only check for: int(X), uint(X), float(X)
-func Gt(val, dstVal interface{}) bool {
+func Gt(val, dstVal any) bool {
 	return gt(reflect.ValueOf(val), reflect.ValueOf(dstVal))
 }
 
@@ -37,7 +37,7 @@ type Validation struct {
 }
 
 	v.pool = &sync.Pool{
-		New: func() interface{} {
+		New: func() any {
 			return &Validation{
 				v: v,
 			}
@@ -50,7 +50,7 @@ type Validation struct {
 ```go
 type DataFace interface {
 	BindStruct() error
-	SafeVal(field string) interface{}
+	SafeVal(field string) any
 
 ...
 }

README.md

@@ -196,7 +196,7 @@ import (
 )
 
 func main()  {
-	m := map[string]interface{}{
+	m := map[string]any{
 		"name":  "inhere",
 		"age":   100,
 		"oldSt": 1,
@@ -299,16 +299,16 @@ func main()  {
 
 Quick create `Validation` instance.
 
-- `New(data interface{}, scene ...string) *Validation`
+- `New(data any, scene ...string) *Validation`
 - `Request(r *http.Request) *Validation`
 - `JSON(s string, scene ...string) *Validation`
-- `Struct(s interface{}, scene ...string) *Validation`
-- `Map(m map[string]interface{}, scene ...string) *Validation`
+- `Struct(s any, scene ...string) *Validation`
+- `Map(m map[string]any, scene ...string) *Validation`
 
 Quick create `DataFace` instance.
 
-- `FromMap(m map[string]interface{}) *MapData`
-- `FromStruct(s interface{}) (*StructData, error)`
+- `FromMap(m map[string]any) *MapData`
+- `FromStruct(s any) (*StructData, error)`
 - `FromJSON(s string) (*MapData, error)`
 - `FromJSONBytes(bs []byte) (*MapData, error)`
 - `FromURLValues(values url.Values) *FormData`
@@ -317,7 +317,7 @@ Quick create `DataFace` instance.
 > Create `Validation` from `DataFace`
 
 ```go
-d := FromMap(map[string]interface{}{"key": "val"})
+d := FromMap(map[string]any{"key": "val"})
 v := d.Validation()
 ```
 
@@ -497,7 +497,7 @@ validate.AddGlobalMessages(map[string]string{
 - Add messages for current validation
 
 ```go
-v := validate.New(map[string]interface{}{
+v := validate.New(map[string]any{
     "name": "inhere",
 })
 v.StringRule("name", "required|string|minLen:7|maxLen:15")
@@ -545,12 +545,12 @@ func (f UserForm) Messages() map[string]string {
 You can add one or more custom validators at once.
 
 ```go
-validate.AddValidator("myCheck0", func(val interface{}) bool {
+validate.AddValidator("myCheck0", func(val any) bool {
 	// do validate val ...
 	return true
 })
 validate.AddValidators(validate.M{
-	"myCheck1": func(val interface{}) bool {
+	"myCheck1": func(val any) bool {
 		// do validate val ...
 		return true
 	},
@@ -563,12 +563,12 @@ Again, you can add one or more custom validators at once.
 
 ```go
 v := validate.Struct(u)
-v.AddValidator("myFunc3", func(val interface{}) bool {
+v.AddValidator("myFunc3", func(val any) bool {
 	// do validate val ...
 	return true
 })
 v.AddValidators(validate.M{
-	"myFunc4": func(val interface{}) bool {
+	"myFunc4": func(val any) bool {
 		// do validate val ...
 		return true
 	},
@@ -594,12 +594,12 @@ package main
 import "github.com/gookit/validate"
 
 func init() {
-	validate.AddFilter("myToIntFilter0", func(val interface{}) int {
+	validate.AddFilter("myToIntFilter0", func(val any) int {
 		// do filtering val ...
 		return 1
 	})
 	validate.AddFilters(validate.M{
-		"myToIntFilter1": func(val interface{}) (int, error) {
+		"myToIntFilter1": func(val any) (int, error) {
 			// do filtering val ...
 			return 1, nil
 		},
@@ -619,12 +619,12 @@ import "github.com/gookit/validate"
 func main() {
 	v := validate.New(&someStrcut{})
 
-	v.AddFilter("myToIntFilter0", func(val interface{}) int {
+	v.AddFilter("myToIntFilter0", func(val any) int {
 		// do filtering val ...
 		return 1
 	})
 	v.AddFilters(validate.M{
-		"myToIntFilter1": func(val interface{}) (int, error) {
+		"myToIntFilter1": func(val any) (int, error) {
 			// do filtering val ...
 			return 1, nil
 		},
@@ -648,7 +648,7 @@ However, note that the validator name must start with `required`, e.g. `required
 		Age:  0,
 	})
 
-	v.AddValidator("required_custom", func(val interface{}) bool {
+	v.AddValidator("required_custom", func(val any) bool {
 		// do check value
 		return false
 	})
@@ -673,7 +673,7 @@ import (
 // implements the binding.StructValidator
 type customValidator struct {}
 
-func (c *customValidator) ValidateStruct(ptr interface{}) error {
+func (c *customValidator) ValidateStruct(ptr any) error {
     v := validate.Struct(ptr)
     v.Validate() // do validating
 
@@ -684,7 +684,7 @@ func (c *customValidator) ValidateStruct(ptr interface{}) error {
     return v.Errors
 }
 
-func (c *customValidator) Engine() interface{} {
+func (c *customValidator) Engine() any {
     return nil
 }
 

README.zh-CN.md

@@ -186,7 +186,7 @@ import "fmt"
 import "github.com/gookit/validate"
 
 func main()  {
-	m := map[string]interface{}{
+	m := map[string]any{
 		"name":  "inhere",
 		"age":   100,
 		"oldSt": 1,
@@ -280,14 +280,14 @@ func main()  {
 
 - `Request(r *http.Request) *Validation`
 - `JSON(s string, scene ...string) *Validation`
-- `Struct(s interface{}, scene ...string) *Validation`
-- `Map(m map[string]interface{}, scene ...string) *Validation`
-- `New(data interface{}, scene ...string) *Validation` 
+- `Struct(s any, scene ...string) *Validation`
+- `Map(m map[string]any, scene ...string) *Validation`
+- `New(data any, scene ...string) *Validation` 
 
 快速创建 `DataFace` 实例：
 
-- `FromMap(m map[string]interface{}) *MapData`
-- `FromStruct(s interface{}) (*StructData, error)`
+- `FromMap(m map[string]any) *MapData`
+- `FromStruct(s any) (*StructData, error)`
 - `FromJSON(s string) (*MapData, error)`
 - `FromJSONBytes(bs []byte) (*MapData, error)`
 - `FromURLValues(values url.Values) *FormData`
@@ -296,7 +296,7 @@ func main()  {
 > 通过 `DataFace` 创建 `Validation` 
 
 ```go
-d := FromMap(map[string]interface{}{"key": "val"})
+d := FromMap(map[string]any{"key": "val"})
 v := d.Validation()
 ```
 
@@ -306,8 +306,8 @@ v := d.Validation()
 - `func (v *Validation) Filtering() bool` 应用所有过滤规则
 - `func (v *Validation) Validate() bool` 应用所有验证和过滤规则，返回是否验证成功
 - `func (v *Validation) ValidateE() Errors` 应用所有验证和过滤规则，并在失败时返回错误
-- `func (v *Validation) SafeData() map[string]interface{}` 获取所有经过验证的数据
-- `func (v *Validation) BindSafeData(ptr interface{}) error` 将验证后的安全数据绑定到一个结构体
+- `func (v *Validation) SafeData() map[string]any` 获取所有经过验证的数据
+- `func (v *Validation) BindSafeData(ptr any) error` 将验证后的安全数据绑定到一个结构体
 
 ## 更多使用
 
@@ -435,7 +435,7 @@ validate.AddGlobalMessages(map[string]string{
 - 为当前验证添加消息(_仅本次验证有效_)
 
 ```go
-v := validate.New(map[string]interface{}{
+v := validate.New(map[string]any{
     "name": "inhere",
 })
 v.StringRule("name", "required|string|minLen:7|maxLen:15")
@@ -482,12 +482,12 @@ func (f UserForm) Messages() map[string]string {
 你可以一次添加一个或者多个自定义验证器
 
 ```go
-	validate.AddValidator("myCheck0", func(val interface{}) bool {
+	validate.AddValidator("myCheck0", func(val any) bool {
 		// do validate val ...
 		return true
 	})
 	validate.AddValidators(M{
-		"myCheck1": func(val interface{}) bool {
+		"myCheck1": func(val any) bool {
 			// do validate val ...
 			return true
 		},
@@ -500,12 +500,12 @@ func (f UserForm) Messages() map[string]string {
 
 ```go
 	v := validate.Struct(u)
-	v.AddValidator("myFunc3", func(val interface{}) bool {
+	v.AddValidator("myFunc3", func(val any) bool {
 		// do validate val ...
 		return true
 	})
 	v.AddValidators(M{
-		"myFunc4": func(val interface{}) bool {
+		"myFunc4": func(val any) bool {
 			// do validate val ...
 			return true
 		},
@@ -531,12 +531,12 @@ package main
 import "github.com/gookit/validate"
 
 func init() {
-	validate.AddFilter("myToIntFilter0", func(val interface{}) int {
+	validate.AddFilter("myToIntFilter0", func(val any) int {
 		// do filtering val ...
 		return 1
 	})
 	validate.AddFilters(validate.M{
-		"myToIntFilter1": func(val interface{}) (int, error) {
+		"myToIntFilter1": func(val any) (int, error) {
 			// do filtering val ...
 			return 1, nil
 		},
@@ -556,12 +556,12 @@ import "github.com/gookit/validate"
 func main() {
 	v := validate.New(&someStrcut{})
 
-	v.AddFilter("myToIntFilter0", func(val interface{}) int {
+	v.AddFilter("myToIntFilter0", func(val any) int {
 		// do filtering val ...
 		return 1
 	})
 	v.AddFilters(validate.M{
-		"myToIntFilter1": func(val interface{}) (int, error) {
+		"myToIntFilter1": func(val any) (int, error) {
 			// do filtering val ...
 			return 1, nil
 		},
@@ -584,7 +584,7 @@ func main() {
 		Age:  0,
 	})
 
-	v.AddValidator("required_custom", func(val interface{}) bool {
+	v.AddValidator("required_custom", func(val any) bool {
 		// do check value
 		return false
 	})
@@ -607,14 +607,14 @@ import (
 // implements the binding.StructValidator
 type customValidator struct {}
 
-func (c *customValidator) ValidateStruct(ptr interface{}) error {
+func (c *customValidator) ValidateStruct(ptr any) error {
     v := validate.Struct(ptr)
     v.Validate() // 调用验证
 
     return v.Errors
 }
 
-func (c *customValidator) Engine() interface{} {
+func (c *customValidator) Engine() any {
     return nil
 }
 

go.mod

@@ -4,11 +4,11 @@ go 1.18
 
 require (
 	github.com/gookit/filter v1.2.0
-	github.com/gookit/goutil v0.6.11
+	github.com/gookit/goutil v0.6.12
 )
 
 require (
-	github.com/gookit/color v1.5.3 // indirect
+	github.com/gookit/color v1.5.4 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/sys v0.10.0 // indirect

go.sum

@@ -1,12 +1,12 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/gookit/color v1.5.3 h1:twfIhZs4QLCtimkP7MOxlF3A0U/5cDPseRT9M/+2SCE=
-github.com/gookit/color v1.5.3/go.mod h1:NUzwzeehUfl7GIb36pqId+UGmRfQcU/WiiyTTeNjHtE=
+github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
+github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
 github.com/gookit/filter v1.2.0 h1:r7E01dHVkysb5WgzooiGsfblHGShEZCeGcyYM+5IpYU=
 github.com/gookit/filter v1.2.0/go.mod h1:bXs9RcB4Blxwny970opiwABeIEqQ/gzOMmHBhKwBdms=
-github.com/gookit/goutil v0.6.11 h1:615nIGRpQHFmgJ1oaA48q/z7bTx6KzMvHmKTsp21T2E=
-github.com/gookit/goutil v0.6.11/go.mod h1:bU9ghaM9uW23x2+jB0WcywRsFGbIP0hvdIKYl2OMiog=
+github.com/gookit/goutil v0.6.12 h1:73vPUcTtVGXbhSzBOFcnSB1aJl7Jq9np3RAE50yIDZc=
+github.com/gookit/goutil v0.6.12/go.mod h1:g6krlFib8xSe3G1h02IETowOtrUGpAmetT8IevDpvpM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=