changed transformError

Author: dimacgka

examples/custom/main.go

@@ -21,7 +21,7 @@ func main() {
 		// Custom on struct type
 		c.Custom(func(ctx context.Context, h shared.StructCustomHelper, obj *User) []shared.Error {
 			if obj.Name != "Rebecca" {
-				format := "Only Rebecca name is allowed" // you can add translations if you want, see translations example
+				format := "Only Rebecca name is allowed" // you can add translations if you want, see translation example
 				return []shared.Error{h.ErrorT(ctx, &obj.Name, obj.Name, format)}
 			}
 			return nil
@@ -31,7 +31,7 @@ func main() {
 		c.String(&obj.LastName).
 			Custom(func(ctx context.Context, h *shared.FieldCustomHelper, value *string) []shared.Error {
 				if *value != "Rebecca" {
-					localeKey := "Only \"Rebecca\" is allowed" // you can add translations if you want, see translations example
+					localeKey := "Only Rebecca is allowed" // you can add translations if you want, see translation example
 					return []shared.Error{h.ErrorT(ctx, value, localeKey)}
 				}
 				return nil

helper.go

@@ -13,7 +13,6 @@ import (
 type helper struct {
 	t                translator.Translator
 	getFieldLocation func(field fmap.Field) string
-	transformError   func(errs []shared.Error) []error
 }
 
 // ErrorT returns a shared.Error with the given location, message, and value.

options.go

@@ -45,6 +45,8 @@ func WithFieldLocationNamingFn(fn func(field fmap.Field) string) Option {
 // WithErrorsTransformer returns an Option that sets the transformer for the Validator.
 func WithErrorsTransformer(fn func(errs []shared.Error) []error) Option {
 	return optionFunc(func(v *Validator) {
-		v.helper.transformError = fn
+		if fn != nil {
+			v.transformError = fn
+		}
 	})
 }

options_test.go

@@ -89,12 +89,30 @@ func TestWithMultipleOptionsWithErrorsTransformer(t *testing.T) {
 		}
 		return newErrs
 	}
-	opt := WithErrorsTransformer(transformer)
 
-	v := New(opt)
-	opt.apply(v)
+	testCases := []struct {
+		name        string
+		transformer func([]shared.Error) []error
+	}{
+		{
+			name:        "Transformer set",
+			transformer: transformer,
+		},
+		{
+			name:        "Transformer not set",
+			transformer: nil,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			opt := WithErrorsTransformer(tc.transformer)
+			v := New(opt)
+			opt.apply(v)
 
-	if v.helper.transformError == nil {
-		t.Errorf("expected transformError to be set")
+			if v.transformError == nil {
+				t.Errorf("expected function, but got nil")
+			}
+		})
 	}
 }

validator.go

@@ -9,8 +9,9 @@ import (
 
 // Validator is a struct that holds a storage and a helper object.
 type Validator struct {
-	storage *storage
-	helper  *helper
+	storage        *storage
+	helper         *helper
+	transformError func(errs []shared.Error) []error
 }
 
 // ValidateTyped validates an object of any type using validators from the storage.
@@ -32,14 +33,7 @@ func (v *Validator) ValidateTyped(ctx context.Context, obj any) []shared.Error {
 // objects instead of shared.Error objects.
 func (v *Validator) Validate(ctx context.Context, obj any) []error {
 	errsTyped := v.ValidateTyped(ctx, obj)
-	errs := make([]error, len(errsTyped))
-	for i, err := range errsTyped {
-		errs[i] = err
-	}
-	if v.helper.transformError != nil {
-		return v.helper.transformError(errsTyped)
-	}
-	return errs
+	return v.transformError(errsTyped)
 }
 
 // GetHelper returns the helper object associated with the Validator instance.
@@ -53,6 +47,13 @@ func New(opts ...Option) *Validator {
 	v := &Validator{
 		storage: newStorage(),
 		helper:  newHelper(),
+		transformError: func(errs []shared.Error) []error {
+			errsNew := make([]error, len(errs))
+			for i, err := range errs {
+				errsNew[i] = err
+			}
+			return errsNew
+		},
 	}
 	for _, opt := range opts {
 		opt.apply(v)

validator_test.go

@@ -214,7 +214,9 @@ func TestValidatorValidate(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			v := New()
 			v.storage.validators[reflect.TypeOf(test.obj)] = []structValidationFn{test.validator}
-			v.helper.transformError = test.transformError
+			if test.transformError != nil {
+				v.transformError = test.transformError
+			}
 			errs := v.Validate(context.Background(), test.obj)
 			if len(errs) != test.expectedErrs {
 				t.Errorf("expected %d errors, got %d", test.expectedErrs, len(errs))