feat: add not operator

internals/utils.go

@@ -17,3 +17,16 @@ func SafeError(x error) string {
 	}
 	return x.Error()
 }
+
+func AddTest(testArr []Test, t Test, isNot bool) []Test {
+	if !isNot {
+		return append(testArr, t)
+	}
+
+	oldFn := t.ValidateFunc
+	t.ValidateFunc = func(val any, ctx ParseCtx) bool {
+		return !oldFn(val, ctx)
+	}
+
+	return append(testArr, t)
+}

string.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/Oudwins/zog/conf"
+	"github.com/Oudwins/zog/internals"
 	p "github.com/Oudwins/zog/internals"
 	"github.com/Oudwins/zog/zconst"
 )
@@ -25,6 +26,7 @@ type StringSchema struct {
 	required       *p.Test
 	catch          *string
 	coercer        conf.CoercerFunc
+	isNot          bool
 }
 
 // ! INTERNALS
@@ -157,8 +159,7 @@ func (v *StringSchema) Test(t p.Test, opts ...TestOption) *StringSchema {
 	for _, opt := range opts {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value is one of the enum values
@@ -167,8 +168,7 @@ func (v *StringSchema) OneOf(enum []string, options ...TestOption) *StringSchema
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value is at least n characters long
@@ -177,8 +177,7 @@ func (v *StringSchema) Min(n int, options ...TestOption) *StringSchema {
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value is at most n characters long
@@ -187,8 +186,7 @@ func (v *StringSchema) Max(n int, options ...TestOption) *StringSchema {
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value is exactly n characters long
@@ -197,8 +195,7 @@ func (v *StringSchema) Len(n int, options ...TestOption) *StringSchema {
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value is a valid email address
@@ -216,8 +213,7 @@ func (v *StringSchema) Email(options ...TestOption) *StringSchema {
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value is a valid URL
@@ -236,8 +232,7 @@ func (v *StringSchema) URL(options ...TestOption) *StringSchema {
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value has the prefix
@@ -257,8 +252,7 @@ func (v *StringSchema) HasPrefix(s string, options ...TestOption) *StringSchema
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value has the suffix
@@ -278,8 +272,7 @@ func (v *StringSchema) HasSuffix(s string, options ...TestOption) *StringSchema
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value contains the substring
@@ -299,8 +292,7 @@ func (v *StringSchema) Contains(sub string, options ...TestOption) *StringSchema
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value contains an uppercase letter
@@ -323,8 +315,7 @@ func (v *StringSchema) ContainsUpper(options ...TestOption) *StringSchema {
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value contains a digit
@@ -349,8 +340,7 @@ func (v *StringSchema) ContainsDigit(options ...TestOption) *StringSchema {
 		opt(&t)
 	}
 
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value contains a special character
@@ -377,8 +367,7 @@ func (v *StringSchema) ContainsSpecial(options ...TestOption) *StringSchema {
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that the value is a valid uuid
@@ -396,8 +385,7 @@ func (v *StringSchema) UUID(options ...TestOption) *StringSchema {
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
-	return v
+	return v.addTest(t)
 }
 
 // Test: checks that value matches to regex
@@ -417,6 +405,20 @@ func (v *StringSchema) Match(regex *regexp.Regexp, options ...TestOption) *Strin
 	for _, opt := range options {
 		opt(&t)
 	}
-	v.tests = append(v.tests, t)
+	return v.addTest(t)
+}
+
+// Test: nots the current fn
+func (v *StringSchema) Not() *StringSchema {
+	v.isNot = !v.isNot
+	return v
+}
+
+func (v *StringSchema) addTest(t internals.Test) *StringSchema {
+	v.tests = internals.AddTest(v.tests, t, v.isNot)
+	if v.isNot {
+		v.isNot = false
+	}
+
 	return v
 }

string_test.go

@@ -4,6 +4,7 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/Oudwins/zog/internals"
 	"github.com/Oudwins/zog/zconst"
 	"github.com/stretchr/testify/assert"
 )
@@ -377,3 +378,39 @@ func TestStringGetType(t *testing.T) {
 	s := String()
 	assert.Equal(t, zconst.TypeString, s.getType())
 }
+
+func TestStringNot(t *testing.T) {
+	tests := map[string]struct {
+		schema         *StringSchema
+		strVal         string
+		expectedErrMap internals.ZogErrList
+	}{
+		"not len success": {
+			schema:         String().Not().Len(10).Contains("test"),
+			strVal:         "test",
+			expectedErrMap: nil,
+		},
+		"not len fail": {
+			schema: String().Not().Len(4).Contains("t"),
+			strVal: "test",
+			expectedErrMap: internals.ZogErrList{
+				&internals.ZogErr{
+					C:       "len",
+					ParamsM: map[string]any{"len": 4},
+					Typ:     "string",
+					Val:     "test",
+					Msg:     "string must be exactly 4 character(s)",
+					Err:     nil,
+				},
+			},
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			var dest string
+			errMap := tc.schema.Parse(tc.strVal, &dest)
+			assert.Equal(t, tc.expectedErrMap, errMap)
+		})
+	}
+}