feat: add other not required

foomo · Mar 13, 2023 · 50edfcd · 50edfcd
1 parent ddcc37e
commit 50edfcd
Show file tree

Hide file tree

Showing 17 changed files with 90 additions and 53 deletions.
diff --git a/rule/any.go b/rule/any.go
@@ -7,7 +7,7 @@ import (
 
 func Required[T any](ctx context.Context, v T) error {
 	if reflect.ValueOf(v).IsZero() {
-		return NewRequiredError()
+		return NewError(NameRequired)
 	}
 	return nil
 }
diff --git a/rule/float.go b/rule/float.go
@@ -29,6 +29,13 @@ func FloatRequired[T Float](ctx context.Context, v T) error {
 	return nil
 }
 
+func FloatNotRequired[T Float](ctx context.Context, v T) error {
+	if v == T(0) {
+		return ErrBreak
+	}
+	return nil
+}
+
 func FloatSize[T Float](expected T) FloatRule[T] {
 	return func(ctx context.Context, v T) error {
 		if v != expected {

diff --git a/rule/float32.go b/rule/float32.go
@@ -29,6 +29,13 @@ func Float32Required(ctx context.Context, v float32) error {
 	return nil
 }
 
+func Float32NotRequired(ctx context.Context, v float32) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func Float32Size(expected float32) Float32Rule {
 	return func(ctx context.Context, v float32) error {
 		if v != expected {

diff --git a/rule/float64.go b/rule/float64.go
@@ -29,6 +29,13 @@ func Float64Required(ctx context.Context, v float64) error {
 	return nil
 }
 
+func Float64NotRequired(ctx context.Context, v float64) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func Float64Size(expected float64) Float64Rule {
 	return func(ctx context.Context, v float64) error {
 		if v != expected {

diff --git a/rule/int.go b/rule/int.go
@@ -29,6 +29,13 @@ func IntRequired(ctx context.Context, v int) error {
 	return nil
 }
 
+func IntNotRequired(ctx context.Context, v int) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func IntSize(expected int) IntRule {
 	return func(ctx context.Context, v int) error {
 		if v != expected {

diff --git a/rule/int32.go b/rule/int32.go
@@ -29,6 +29,13 @@ func Int32Required(ctx context.Context, v int32) error {
 	return nil
 }
 
+func Int32NotRequired(ctx context.Context, v int32) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func Int32Size(expected int32) Int32Rule {
 	return func(ctx context.Context, v int32) error {
 		if v != expected {

diff --git a/rule/int64.go b/rule/int64.go
@@ -29,6 +29,13 @@ func Int64Required(ctx context.Context, v int64) error {
 	return nil
 }
 
+func Int64NotRequired(ctx context.Context, v int64) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func Int64Size(expected int64) Int64Rule {
 	return func(ctx context.Context, v int64) error {
 		if v != expected {

diff --git a/rule/int8.go b/rule/int8.go
@@ -29,6 +29,13 @@ func Int8Required(ctx context.Context, v int8) error {
 	return nil
 }
 
+func Int8NotRequired(ctx context.Context, v int8) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func Int8Size(expected int8) Int8Rule {
 	return func(ctx context.Context, v int8) error {
 		if v != expected {

diff --git a/rule/integer.go b/rule/integer.go
@@ -2,11 +2,9 @@ package rule
 
 import (
 	"context"
-
-	"golang.org/x/exp/constraints"
 )
 
-func IntegerMin[T constraints.Integer](expected T) IntegerRule[T] {
+func IntegerMin[T Integer](expected T) IntegerRule[T] {
 	return func(ctx context.Context, v T) error {
 		if v < expected {
 			return NewErrorf(NameMin, 'd', expected)
@@ -15,7 +13,7 @@ func IntegerMin[T constraints.Integer](expected T) IntegerRule[T] {
 	}
 }
 
-func IntegerMax[T constraints.Integer](expected T) IntegerRule[T] {
+func IntegerMax[T Integer](expected T) IntegerRule[T] {
 	return func(ctx context.Context, v T) error {
 		if v > expected {
 			return NewErrorf(NameMax, 'd', expected)
@@ -24,14 +22,21 @@ func IntegerMax[T constraints.Integer](expected T) IntegerRule[T] {
 	}
 }
 
-func IntegerRequired[T constraints.Integer](ctx context.Context, v T) error {
+func IntegerRequired[T Integer](ctx context.Context, v T) error {
 	if v == T(0) {
 		return NewError(NameRequired)
 	}
 	return nil
 }
 
-func IntegerSize[T constraints.Integer](expected T) IntegerRule[T] {
+func IntegerNotRequired[T Integer](ctx context.Context, v T) error {
+	if v == T(0) {
+		return ErrBreak
+	}
+	return nil
+}
+
+func IntegerSize[T Integer](expected T) IntegerRule[T] {
 	return func(ctx context.Context, v T) error {
 		if v != expected {
 			return NewErrorf(NameSize, 'd', expected)
@@ -40,7 +45,7 @@ func IntegerSize[T constraints.Integer](expected T) IntegerRule[T] {
 	}
 }
 
-func IntegerOmitEmpty[T constraints.Integer](ctx context.Context, v T) error {
+func IntegerOmitEmpty[T Integer](ctx context.Context, v T) error {
 	if v == T(0) {
 		return ErrBreak
 	}

diff --git a/rule/omitempty.go b/rule/omitempty.go
diff --git a/rule/omitempty_test.go b/rule/omitempty_test.go
diff --git a/rule/required.go b/rule/required.go
diff --git a/rule/uint.go b/rule/uint.go
@@ -29,6 +29,13 @@ func UIntRequired(ctx context.Context, v uint) error {
 	return nil
 }
 
+func UIntNotRequired(ctx context.Context, v uint) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func UIntSize(expected uint) UIntRule {
 	return func(ctx context.Context, v uint) error {
 		if v != expected {

diff --git a/rule/uint32.go b/rule/uint32.go
@@ -29,6 +29,13 @@ func UInt32Required(ctx context.Context, v uint32) error {
 	return nil
 }
 
+func UInt32NotRequired(ctx context.Context, v uint32) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func UInt32Size(expected uint32) UInt32Rule {
 	return func(ctx context.Context, v uint32) error {
 		if v != expected {

diff --git a/rule/uint64.go b/rule/uint64.go
@@ -29,6 +29,13 @@ func UInt64Required(ctx context.Context, v uint64) error {
 	return nil
 }
 
+func UInt64NotRequired(ctx context.Context, v uint64) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func UInt64Size(expected uint64) UInt64Rule {
 	return func(ctx context.Context, v uint64) error {
 		if v != expected {

diff --git a/rule/uint8.go b/rule/uint8.go
@@ -29,6 +29,13 @@ func UInt8Required(ctx context.Context, v uint8) error {
 	return nil
 }
 
+func UInt8NotRequired(ctx context.Context, v uint8) error {
+	if v == 0 {
+		return ErrBreak
+	}
+	return nil
+}
+
 func UInt8Size(expected uint8) UInt8Rule {
 	return func(ctx context.Context, v uint8) error {
 		if v != expected {

diff --git a/rule/validator.go b/rule/validator.go
@@ -8,11 +8,6 @@ type Validator interface {
 	Valid() bool
 }
 
-// NewValidError constructor
-func NewValidError() *Error {
-	return NewError(NameValid)
-}
-
 func Valid[T Validator](ctx context.Context, v T) error {
 	if !v.Valid() {
 		return NewError(NameValid)