pharnexbase
/
validator
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

discriminate map validate and map array validate

Browse Source
local
hzy 2 years ago
parent f5e5146b31
commit 0e6a5850b2
47 changed files with 49 additions and 51 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      _examples/custom-validation/main.go
  2. 2
      _examples/custom/main.go
  3. 2
      _examples/dive/main.go
  4. 2
      _examples/gin-upgrading-overriding/v8_to_v9.go
  5. 2
      _examples/map-validation/main.go
  6. 2
      _examples/simple/main.go
  7. 2
      _examples/struct-level/main.go
  8. 2
      _examples/struct-map-rules-validation/main.go
  9. 4
      _examples/translations/main.go
  10. 2
      go.mod
  11. 2
      non-standard/validators/notblank.go
  12. 2
      non-standard/validators/notblank_test.go
  13. 2
      translations/ar/ar.go
  14. 2
      translations/ar/ar_test.go
  15. 2
      translations/en/en.go
  16. 2
      translations/en/en_test.go
  17. 2
      translations/es/es.go
  18. 2
      translations/es/es_test.go
  19. 2
      translations/fa/fa.go
  20. 2
      translations/fa/fa_test.go
  21. 2
      translations/fr/fr.go
  22. 2
      translations/fr/fr_test.go
  23. 2
      translations/id/id.go
  24. 2
      translations/id/id_test.go
  25. 2
      translations/it/it.go
  26. 2
      translations/it/it_test.go
  27. 1
      translations/ja/ja.go
  28. 2
      translations/ja/ja_test.go
  29. 2
      translations/lv/lv.go
  30. 2
      translations/lv/lv_test.go
  31. 1
      translations/nl/nl.go
  32. 2
      translations/nl/nl_test.go
  33. 1
      translations/pt/pt.go
  34. 3
      translations/pt/pt_test.go
  35. 2
      translations/pt_BR/pt_BR.go
  36. 2
      translations/pt_BR/pt_BR_test.go
  37. 2
      translations/ru/ru.go
  38. 2
      translations/ru/ru_test.go
  39. 2
      translations/tr/tr.go
  40. 2
      translations/tr/tr_test.go
  41. 1
      translations/vi/vi.go
  42. 2
      translations/vi/vi_test.go
  43. 2
      translations/zh/zh.go
  44. 2
      translations/zh/zh_test.go
  45. 1
      translations/zh_tw/zh_tw.go
  46. 2
      translations/zh_tw/zh_tw_test.go
  47. 10
      validator_instance.go

2
_examples/custom-validation/main.go
Unescape View File

@ -3,7 +3,7 @@ package main
import (
"fmt"
"github.com/go-playground/validator/v10"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
)
// MyStruct ..

2
_examples/custom/main.go
Unescape View File

@ -6,7 +6,7 @@ import (
"fmt"
"reflect"
"github.com/go-playground/validator/v10"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
)
// DbBackedUser User struct

2
_examples/dive/main.go
Unescape View File

@ -3,7 +3,7 @@ package main
import (
"fmt"
"github.com/go-playground/validator/v10"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
)
// Test ...

2
_examples/gin-upgrading-overriding/v8_to_v9.go
Unescape View File

@ -4,8 +4,8 @@ import (
"reflect"
"sync"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"github.com/gin-gonic/gin/binding"
"github.com/go-playground/validator/v10"
)
type defaultValidator struct {

2
_examples/map-validation/main.go
Unescape View File

@ -2,7 +2,7 @@ package main
import (
"fmt"
"github.com/go-playground/validator/v10"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
)
var validate *validator.Validate

2
_examples/simple/main.go
Unescape View File

@ -3,7 +3,7 @@ package main
import (
"fmt"
"github.com/go-playground/validator/v10"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
)
// User contains user information

2
_examples/struct-level/main.go
Unescape View File

@ -6,7 +6,7 @@ import (
"reflect"
"strings"
"github.com/go-playground/validator/v10"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
)
type validationError struct {

2
_examples/struct-map-rules-validation/main.go
Unescape View File

@ -2,7 +2,7 @@ package main
import (
"fmt"
"github.com/go-playground/validator/v10"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
)
type Data struct {

4
_examples/translations/main.go
Unescape View File

@ -3,10 +3,10 @@ package main
import (
"fmt"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
en_translations "gitea.drugeyes.vip/pharnexbase/validator/v10/translations/en"
"github.com/go-playground/locales/en"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
en_translations "github.com/go-playground/validator/v10/translations/en"
)
// User contains user information

2
go.mod
Unescape View File

@ -1,4 +1,4 @@
module github.com/go-playground/validator/v10
module gitea.drugeyes.vip/pharnexbase/validator/v10
go 1.18

2
non-standard/validators/notblank.go
Unescape View File

@ -4,7 +4,7 @@ import (
"reflect"
"strings"
"github.com/go-playground/validator/v10"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
)
// NotBlank is the validation function for validating if the current field

2
non-standard/validators/notblank_test.go
Unescape View File

@ -3,8 +3,8 @@ package validators
import (
"testing"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"github.com/go-playground/assert/v2"
"github.com/go-playground/validator/v10"
)
type test struct {

2
translations/ar/ar.go
Unescape View File

@ -8,9 +8,9 @@ import (
"strings"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/ar/ar_test.go
Unescape View File

@ -4,10 +4,10 @@ import (
"testing"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
. "github.com/go-playground/assert/v2"
english "github.com/go-playground/locales/en"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/en/en.go
Unescape View File

@ -8,9 +8,9 @@ import (
"strings"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/en/en_test.go
Unescape View File

@ -4,10 +4,10 @@ import (
"testing"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
. "github.com/go-playground/assert/v2"
english "github.com/go-playground/locales/en"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/es/es.go
Unescape View File

@ -8,9 +8,9 @@ import (
"strings"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/es/es_test.go
Unescape View File

@ -4,10 +4,10 @@ import (
"testing"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
. "github.com/go-playground/assert/v2"
spanish "github.com/go-playground/locales/es"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/fa/fa.go
Unescape View File

@ -8,9 +8,9 @@ import (
"strings"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/fa/fa_test.go
Unescape View File

@ -4,10 +4,10 @@ import (
"testing"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
. "github.com/go-playground/assert/v2"
english "github.com/go-playground/locales/en"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/fr/fr.go
Unescape View File

@ -8,9 +8,9 @@ import (
"strings"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/fr/fr_test.go
Unescape View File

@ -4,10 +4,10 @@ import (
"testing"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
. "github.com/go-playground/assert/v2"
french "github.com/go-playground/locales/fr"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/id/id.go
Unescape View File

@ -8,9 +8,9 @@ import (
"strings"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/id/id_test.go
Unescape View File

@ -4,10 +4,10 @@ import (
"testing"
"time"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
. "github.com/go-playground/assert/v2"
indonesia "github.com/go-playground/locales/id"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/it/it.go
Unescape View File

@ -2,6 +2,7 @@ package it
import (
"fmt"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"log"
"reflect"
"strconv"
@ -10,7 +11,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/it/it_test.go
Unescape View File

@ -1,13 +1,13 @@
package it
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
italian "github.com/go-playground/locales/it"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

1
translations/ja/ja.go
Unescape View File

@ -10,7 +10,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/ja/ja_test.go
Unescape View File

@ -1,13 +1,13 @@
package ja
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
ja_locale "github.com/go-playground/locales/ja"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/lv/lv.go
Unescape View File

@ -2,6 +2,7 @@ package lv
import (
"fmt"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"log"
"reflect"
"strconv"
@ -10,7 +11,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/lv/lv_test.go
Unescape View File

@ -1,13 +1,13 @@
package lv
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
english "github.com/go-playground/locales/en"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

1
translations/nl/nl.go
Unescape View File

@ -10,7 +10,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/nl/nl_test.go
Unescape View File

@ -1,13 +1,13 @@
package nl
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
english "github.com/go-playground/locales/en"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

1
translations/pt/pt.go
Unescape View File

@ -10,7 +10,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

3
translations/pt/pt_test.go
Unescape View File

@ -1,14 +1,13 @@
package pt
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
"github.com/go-playground/locales/pt"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/pt_BR/pt_BR.go
Unescape View File

@ -2,6 +2,7 @@ package pt_BR
import (
"fmt"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"log"
"reflect"
"strconv"
@ -10,7 +11,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/pt_BR/pt_BR_test.go
Unescape View File

@ -1,13 +1,13 @@
package pt_BR
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
brazilian_portuguese "github.com/go-playground/locales/pt_BR"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/ru/ru.go
Unescape View File

@ -2,6 +2,7 @@ package ru
import (
"fmt"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"log"
"reflect"
"strconv"
@ -10,7 +11,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/ru/ru_test.go
Unescape View File

@ -1,6 +1,7 @@
package ru
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"log"
//"github.com/rustery/validator"
"testing"
@ -9,7 +10,6 @@ import (
. "github.com/go-playground/assert/v2"
russian "github.com/go-playground/locales/ru"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/tr/tr.go
Unescape View File

@ -2,6 +2,7 @@ package tr
import (
"fmt"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"log"
"reflect"
"strconv"
@ -10,7 +11,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/tr/tr_test.go
Unescape View File

@ -1,13 +1,13 @@
package tr
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
turkish "github.com/go-playground/locales/tr"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

1
translations/vi/vi.go
Unescape View File

@ -10,7 +10,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/vi/vi_test.go
Unescape View File

@ -1,13 +1,13 @@
package vi
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
vietnamese "github.com/go-playground/locales/vi"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

2
translations/zh/zh.go
Unescape View File

@ -2,6 +2,7 @@ package zh
import (
"fmt"
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"log"
"reflect"
"strconv"
@ -10,7 +11,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/zh/zh_test.go
Unescape View File

@ -1,13 +1,13 @@
package zh
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
zhongwen "github.com/go-playground/locales/zh"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

1
translations/zh_tw/zh_tw.go
Unescape View File

@ -10,7 +10,6 @@ import (
"github.com/go-playground/locales"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
// RegisterDefaultTranslations registers a set of default translations

2
translations/zh_tw/zh_tw_test.go
Unescape View File

@ -1,13 +1,13 @@
package zh_tw
import (
"gitea.drugeyes.vip/pharnexbase/validator/v10"
"testing"
"time"
. "github.com/go-playground/assert/v2"
zhongwen "github.com/go-playground/locales/zh_Hant_TW"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
)
func TestTranslations(t *testing.T) {

10
validator_instance.go
Unescape View File

@ -161,15 +161,19 @@ func (v Validate) ValidateMapCtx(ctx context.Context, data map[string]interface{
if len(err) > 0 {
errs[field] = err
}
} else if dataObjs, ok := data[field].([]map[string]interface{}); ok {
} else {
errs[field] = errors.New("The field: '" + field + "' is not a map to dive")
}
} else if arrRuleObj, ok := rule.([]map[string]interface{}); ok {
if dataObjs, ok := data[field].([]map[string]interface{}); ok && len(arrRuleObj) > 0 {
for _, obj := range dataObjs {
err := v.ValidateMapCtx(ctx, obj, ruleObj)
err := v.ValidateMapCtx(ctx, obj, arrRuleObj[0])
if len(err) > 0 {
errs[field] = err
}
}
} else {
errs[field] = errors.New("The field: '" + field + "' is not a map to dive")
errs[field] = errors.New("The field: '" + field + "' is not a map array")
}
} else if ruleStr, ok := rule.(string); ok {
err := v.VarCtx(ctx, data[field], ruleStr)

Write Preview
Loading…
Cancel
Save