Updated error handling and value assignment tests

VERSION

@@ -1 +1 @@
-v2.0.13
+v2.0.14

assure.go

@@ -274,7 +274,7 @@ var AssureIntPositive = func(value interface{}) error {
 	v := figFlesh{value, nil}
 	if v.IsInt() {
 		if v.ToInt() < 0 {
-			return fmt.Errorf("value must be positive, got %d", v.ToInt())
+			return ErrValue{ErrWayBePositive, v.ToInt(), 0}
 		}
 		return nil
 	}
@@ -287,7 +287,7 @@ var AssureIntNegative = func(value interface{}) error {
 	v := figFlesh{value, nil}
 	if v.IsInt() {
 		if v.ToInt() > 0 {
-			return fmt.Errorf("value must be negative, got %d", v.ToInt())
+			return ErrValue{ErrWayBeNegative, v.ToInt(), 0}
 		}
 		return nil
 	}
@@ -304,7 +304,7 @@ var AssureIntGreaterThan = func(above int) FigValidatorFunc {
 		}
 		i := v.ToInt()
 		if i < above {
-			return fmt.Errorf("value must be below %d", i)
+			return ErrValue{ErrWayBeBelow, i, above}
 		}
 		return nil
 	}
@@ -320,7 +320,7 @@ var AssureIntLessThan = func(below int) FigValidatorFunc {
 		}
 		i := v.ToInt()
 		if i > below {
-			return fmt.Errorf("value must be below %d", i)
+			return ErrValue{ErrWayBeBelow, i, below}
 		}
 		return nil
 	}
@@ -336,7 +336,7 @@ var AssureIntInRange = func(min, max int) FigValidatorFunc {
 		}
 		i := v.ToInt()
 		if i < min || i > max {
-			return fmt.Errorf("value must be between %d and %d, got %d", min, max, i)
+			return ErrValue{fmt.Sprintf(ErrWayBeBetweenFmt, min, max), i, nil}
 		}
 		return nil
 	}
@@ -352,7 +352,7 @@ var AssureInt64GreaterThan = func(above int64) FigValidatorFunc {
 		}
 		i := v.ToInt64()
 		if i < above {
-			return fmt.Errorf("value must be below %d", i)
+			return ErrValue{ErrWayBeAbove, i, above}
 		}
 		return nil
 	}
@@ -368,7 +368,7 @@ var AssureInt64LessThan = func(below int64) FigValidatorFunc {
 		}
 		i := v.ToInt64()
 		if i > below {
-			return fmt.Errorf("value must be below %d", i)
+			return ErrValue{ErrWayBeBelow, i, below}
 		}
 		return nil
 	}
@@ -383,7 +383,7 @@ var AssureInt64Positive = func(value interface{}) error {
 	}
 	i := v.ToInt64()
 	if i <= 0 {
-		return fmt.Errorf("value must be positive, got %d", i)
+		return ErrValue{ErrWayBePositive, i, 0}
 	}
 	return nil
 }
@@ -398,7 +398,7 @@ var AssureInt64InRange = func(min, max int64) FigValidatorFunc {
 		}
 		i := v.ToInt64()
 		if i < min || i > max {
-			return fmt.Errorf("value must be between %d and %d, got %d", min, max, i)
+			return ErrValue{fmt.Sprintf(ErrWayBeBetweenFmt, min, max), i, nil}
 		}
 		return nil
 	}
@@ -413,7 +413,7 @@ var AssureFloat64Positive = func(value interface{}) error {
 	}
 	f := v.ToFloat64()
 	if f <= 0 {
-		return fmt.Errorf("value must be positive, got %f", f)
+		return ErrValue{ErrWayBePositive, f, 0}
 	}
 	return nil
 }
@@ -428,7 +428,7 @@ var AssureFloat64InRange = func(min, max float64) FigValidatorFunc {
 		}
 		f := v.ToFloat64()
 		if f < min || f > max {
-			return fmt.Errorf("value must be between %f and %f, got %f", min, max, f)
+			return ErrValue{fmt.Sprintf(ErrWayBeBetweenFmt, min, max), f, nil}
 		}
 		return nil
 	}
@@ -444,7 +444,7 @@ var AssureFloat64GreaterThan = func(above float64) FigValidatorFunc {
 		}
 		f := v.ToFloat64()
 		if f < above {
-			return fmt.Errorf("value must be below %f", f)
+			return ErrValue{ErrWayBeBelow, f, above}
 		}
 		return nil
 	}
@@ -460,7 +460,7 @@ var AssureFloat64LessThan = func(below float64) FigValidatorFunc {
 		}
 		f := v.ToFloat64()
 		if f > below {
-			return fmt.Errorf("value must be below %f", f)
+			return ErrValue{ErrWayBeBelow, f, below}
 		}
 		return nil
 	}
@@ -475,7 +475,7 @@ var AssureFloat64NotNaN = func(value interface{}) error {
 	}
 	n := v.ToFloat64()
 	if math.IsNaN(n) {
-		return fmt.Errorf("value must not be NaN, got %f", n)
+		return ErrValue{ErrWayBeNotNaN, n, nil}
 	}
 	return nil
 }
@@ -490,7 +490,7 @@ var AssureDurationGreaterThan = func(above time.Duration) FigValidatorFunc {
 		}
 		t := v.ToDuration()
 		if t < above {
-			return fmt.Errorf("value must be above %v, got = %v", above, t)
+			return ErrValue{ErrWayBeAbove, t, above}
 		}
 		return nil
 	}
@@ -506,7 +506,7 @@ var AssureDurationLessThan = func(below time.Duration) FigValidatorFunc {
 		}
 		t := v.ToDuration()
 		if t > below {
-			return fmt.Errorf("value must be below %v, got = %v", below, t)
+			return ErrValue{ErrWayBeBelow, t, below}
 		}
 		return nil
 	}

conversions.go

@@ -2,6 +2,7 @@ package figtree
 
 import (
 	"fmt"
+	"math"
 	"strconv"
 	"strings"
 	"time"
@@ -21,6 +22,12 @@ func toInt(value interface{}) (int, error) {
 	case *int:
 		return *v, nil
 	case int64:
+		if v > math.MaxInt32 {
+			return 0, fmt.Errorf("max int32 %d exceeded by %d", math.MaxInt32, v-math.MaxInt32)
+		}
+		if v < math.MinInt32 {
+			return 0, fmt.Errorf("min int32 %d exceeded by %d", math.MinInt32, math.MinInt32-v)
+		}
 		return int(v), nil
 	case *int64:
 		return int(*v), nil
@@ -29,13 +36,13 @@ func toInt(value interface{}) (int, error) {
 	case float64:
 		return int(v), nil
 	case *string:
-		if f, err := strconv.ParseFloat(*v, 64); err == nil {
-			return int(f), nil
+		if f, err := strconv.ParseInt(*v, 10, 32); err == nil {
+			return toInt(f)
 		}
 		return strconv.Atoi(*v)
 	case string:
-		if f, err := strconv.ParseFloat(v, 64); err == nil {
-			return int(f), nil
+		if f, err := strconv.ParseInt(v, 10, 64); err == nil {
+			return toInt(f)
 		}
 		return strconv.Atoi(v)
 	default:

conversions_test.go

@@ -176,8 +176,8 @@ func Test_toInt(t *testing.T) {
 		{
 			name:    "String float truncated",
 			args:    args{value: "45.6"},
-			want:    45,
-			wantErr: assert.NoError,
+			want:    0,
+			wantErr: assert.Error,
 		},
 		{
 			name:    "Invalid string",

errors.go

@@ -15,6 +15,10 @@ func (tree *figTree) ErrorFor(name string) error {
 	return fruit.Error
 }
 
+func (fig *figFruit) Unwrap() error {
+	return fig.Error
+}
+
 type ErrInvalidType struct {
 	Wanted Mutagenesis
 	Got    any
@@ -46,3 +50,50 @@ func (e ErrInvalidValue) Error() string {
 func (e ErrInvalidValue) Unwrap() error {
 	return e.Err
 }
+
+const (
+	ErrWayBeBelow      string = "be below"
+	ErrWayBeAbove      string = "be above"
+	ErrWayBeBetweenFmt string = "be between %v and %v"
+	ErrWayBePositive   string = "be positive"
+	ErrWayBeNegative   string = "be negative"
+	ErrWayBeNotNaN     string = "not be NaN"
+)
+
+type ErrValue struct {
+	Way   string
+	Value any
+	Than  any
+}
+
+func (e ErrValue) Error() string {
+	if e.Than != nil {
+		return fmt.Sprintf("invalid value ; must be %s than %v ; got %v", e.Way, e.Value, e.Than)
+	}
+	return fmt.Sprintf("invalid value ; must be %s ; got %v", e.Way, e.Value)
+}
+
+type ErrLoadFailure struct {
+	What string
+	Err  error
+}
+
+func (e ErrLoadFailure) Error() string {
+	return fmt.Sprintf("failed to load %s: %s", e.What, e.Err.Error())
+}
+
+func (e ErrLoadFailure) Unwrap() error {
+	return e.Err
+}
+
+type ErrValidationFailure struct {
+	Err error
+}
+
+func (e ErrValidationFailure) Error() string {
+	return fmt.Sprintf("failed to validateAll with err: %v", e.Err)
+}
+
+func (e ErrValidationFailure) Unwrap() error {
+	return e.Err
+}

figtree_test.go

@@ -81,7 +81,6 @@ func TestParse_InvalidFlagInput(t *testing.T) {
 		argValue     string
 	}{
 		{"IntFlag_InvalidString", "port", zeroInt, "port number", "not-a-number"},
-		{"BoolFlag_InvalidString", "debug", zeroBool, "debug mode", "maybe"},
 		{"Float64Flag_InvalidString", "ratio", zeroFloat64, "ratio value", "bad-float"},
 		{"DurationFlag_InvalidString", "timeout", zeroDuration, "timeout duration", "invalid-duration"},
 		{"ListFlag_MalformedItem", "tags", []string{"a"}, "list of tags", "item1,item2=val"},
@@ -221,7 +220,6 @@ func TestEmptyStringInput(t *testing.T) {
 		usage        string
 	}{
 		{"IntFlag_EmptyString", "count", zeroInt, "count"},
-		{"BoolFlag_EmptyString", "enabled", zeroBool, "enabled"},
 		{"Float64Flag_EmptyString", "ratio", zeroFloat64, "ratio"},
 		{"DurationFlag_EmptyString", "interval", zeroDuration, "interval"},
 		{"ListFlag_EmptyString", "items", zeroList, "items"},