Revert "fix: err code 迁移到各自的包下 (#65)" (#66)

This reverts commit ef397cab50.
This commit is contained in:
libin
2024-04-03 10:46:39 +08:00
committed by GitHub
parent ef397cab50
commit b5654c2b4b
24 changed files with 108 additions and 123 deletions

View File

@@ -1,6 +1,7 @@
package anyUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"math"
"reflect"
"strconv"
@@ -13,7 +14,7 @@ func AnyToFloat32(i any) (float32, error) {
return 0, err
}
if f64 < -math.MaxFloat32 || f64 > math.MaxFloat32 {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return float32(f64), nil
}
@@ -38,7 +39,7 @@ func AnyToFloat64(i any) (float64, error) {
case reflect.String:
floatValue, err := strconv.ParseFloat(v.String(), 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return floatValue, nil
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
@@ -54,6 +55,6 @@ func AnyToFloat64(i any) (float64, error) {
return 0, nil
}
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}

View File

@@ -1,6 +1,7 @@
package anyUtil
import (
go_easy_utils "github.com/jefferyjob/go-easy-utils/v2"
"math"
"testing"
)
@@ -29,8 +30,8 @@ func TestAnyToFloat32(t *testing.T) {
{uint32(32), 32, nil},
{uint64(64), 64, nil},
{"3.14", 3.14, nil},
{math.MaxFloat64, 0, ErrValOut},
{make(chan int), 0, ErrType},
{math.MaxFloat64, 0, go_easy_utils.ErrValOut},
{make(chan int), 0, go_easy_utils.ErrType},
}
for _, test := range tests {
@@ -78,8 +79,8 @@ func TestAnyToFloat64(t *testing.T) {
{complex128(1 + 2i), 1, nil},
{&iPtr, 90, nil},
{(*int)(nil), 0, nil},
{"abc", 0, ErrSyntax},
{[]int{}, 0, ErrType},
{"abc", 0, go_easy_utils.ErrSyntax},
{[]int{}, 0, go_easy_utils.ErrType},
}
for _, test := range tests {

View File

@@ -1,6 +1,7 @@
package anyUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"math"
"reflect"
"strconv"
@@ -15,7 +16,7 @@ func AnyToInt(i any) (int, error) {
// int 兼容32位和64位系统
if int64(int(v)) != v {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return int(v), nil
@@ -28,7 +29,7 @@ func AnyToInt8(i any) (int8, error) {
return 0, err
}
if value < math.MinInt8 || value > math.MaxInt8 {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return int8(value), nil
}
@@ -40,7 +41,7 @@ func AnyToInt16(i any) (int16, error) {
return 0, err
}
if value < math.MinInt16 || value > math.MaxInt16 {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return int16(value), nil
}
@@ -52,7 +53,7 @@ func AnyToInt32(i any) (int32, error) {
return 0, err
}
if value < math.MinInt32 || value > math.MaxInt32 {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return int32(value), nil
}
@@ -77,7 +78,7 @@ func AnyToInt64(i any) (int64, error) {
case reflect.String:
intValue, err := strconv.ParseInt(v.String(), 10, 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return intValue, nil
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
@@ -95,6 +96,6 @@ func AnyToInt64(i any) (int64, error) {
return 0, nil
}
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}

View File

@@ -2,6 +2,7 @@ package anyUtil
import (
"errors"
"github.com/jefferyjob/go-easy-utils/v2"
"math"
"testing"
)
@@ -31,7 +32,7 @@ func TestAnyToInt(t *testing.T) {
{input: float32(123.45), expected: 123, err: nil},
{input: float64(123.45), expected: 123, err: nil},
{input: "123", expected: 123, err: nil},
{input: "abc", expected: 0, err: ErrSyntax},
{input: "abc", expected: 0, err: go_easy_utils.ErrSyntax},
}
for _, tc := range testCases {
@@ -82,13 +83,13 @@ func TestAnyToInt8(t *testing.T) {
name: "positive integer out of range",
input: 128,
expected: 0,
err: ErrValOut,
err: go_easy_utils.ErrValOut,
},
{
name: "negative integer out of range",
input: -129,
expected: 0,
err: ErrValOut,
err: go_easy_utils.ErrValOut,
},
{
name: "float",
@@ -106,13 +107,13 @@ func TestAnyToInt8(t *testing.T) {
name: "string out of range",
input: "128",
expected: 0,
err: ErrValOut,
err: go_easy_utils.ErrValOut,
},
{
name: "invalid string",
input: "invalid",
expected: 0,
err: ErrSyntax,
err: go_easy_utils.ErrSyntax,
},
}
@@ -158,8 +159,8 @@ func TestAnyToInt16(t *testing.T) {
{float32(123.45), 123, nil},
{float64(123.45), 123, nil},
{"12345", 12345, nil},
{math.MinInt16 - 1, 0, ErrValOut},
{"not a number", 0, ErrSyntax},
{math.MinInt16 - 1, 0, go_easy_utils.ErrValOut},
{"not a number", 0, go_easy_utils.ErrSyntax},
}
for _, tt := range tests {
@@ -183,13 +184,13 @@ func TestAnyToInt32(t *testing.T) {
}{
{int(123), 123, nil},
{int64(2147483647), 2147483647, nil},
{int64(2147483648), 0, ErrValOut},
{int64(2147483648), 0, go_easy_utils.ErrValOut},
{int64(-2147483648), -2147483648, nil},
{int64(-2147483649), 0, ErrValOut},
{int64(-2147483649), 0, go_easy_utils.ErrValOut},
{float64(123.45), 123, nil},
{"123", 123, nil},
{"-2147483649", 0, ErrValOut},
{struct{}{}, 0, ErrType},
{"-2147483649", 0, go_easy_utils.ErrValOut},
{struct{}{}, 0, go_easy_utils.ErrType},
}
for _, testCase := range testCases {

View File

@@ -1,6 +1,7 @@
package anyUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"math"
"reflect"
"strconv"
@@ -15,7 +16,7 @@ func AnyToUint(i any) (uint, error) {
// uint 兼容32位和64位系统
if uint64(uint(v)) != v {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return uint(v), nil
@@ -28,7 +29,7 @@ func AnyToUint8(i any) (uint8, error) {
return 0, err
}
if value > math.MaxUint8 {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return uint8(value), nil
}
@@ -40,7 +41,7 @@ func AnyToUint16(i any) (uint16, error) {
return 0, err
}
if value > math.MaxUint16 {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return uint16(value), nil
}
@@ -52,7 +53,7 @@ func AnyToUint32(i any) (uint32, error) {
return 0, err
}
if value > math.MaxUint32 {
return 0, ErrValOut
return 0, go_easy_utils.ErrValOut
}
return uint32(value), nil
}
@@ -77,26 +78,26 @@ func AnyToUint64(i any) (uint64, error) {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
intValue := v.Int()
if intValue < 0 {
return 0, ErrUnsignedInt
return 0, go_easy_utils.ErrUnsignedInt
}
return uint64(intValue), nil
case reflect.Float32, reflect.Float64:
floatValue := v.Float()
if floatValue < 0 {
return 0, ErrUnsignedInt
return 0, go_easy_utils.ErrUnsignedInt
}
return uint64(floatValue), nil
case reflect.Complex64, reflect.Complex128:
realValue := real(v.Complex())
if realValue < 0 {
return 0, ErrUnsignedInt
return 0, go_easy_utils.ErrUnsignedInt
}
return uint64(realValue), nil
case reflect.String:
strValue := v.String()
uintValue, err := strconv.ParseUint(strValue, 10, 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return uintValue, nil
case reflect.Bool:
@@ -106,6 +107,6 @@ func AnyToUint64(i any) (uint64, error) {
return 0, nil
}
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}

View File

@@ -1,6 +1,7 @@
package anyUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"reflect"
"testing"
)
@@ -13,11 +14,11 @@ func TestAnyToUint(t *testing.T) {
err error
}{
{10, 10, nil},
{-5, 0, ErrUnsignedInt},
{-5, 0, go_easy_utils.ErrUnsignedInt},
{"20", 20, nil},
{1.5, 1, nil},
{2.5, 2, nil},
{make(chan int), 0, ErrType},
{make(chan int), 0, go_easy_utils.ErrType},
}
// Test loop
@@ -38,10 +39,10 @@ func TestAnyToUint8(t *testing.T) {
err error
}{
{10, 10, nil},
{300, 0, ErrValOut},
{300, 0, go_easy_utils.ErrValOut},
{"20", 20, nil},
{1.5, 1, nil},
{make(chan int), 0, ErrType},
{make(chan int), 0, go_easy_utils.ErrType},
}
// Test loop
@@ -62,10 +63,10 @@ func TestAnyToUint16(t *testing.T) {
err error
}{
{10, 10, nil},
{70000, 0, ErrValOut},
{70000, 0, go_easy_utils.ErrValOut},
{"20", 20, nil},
{1.5, 1, nil},
{make(chan int), 0, ErrType},
{make(chan int), 0, go_easy_utils.ErrType},
}
// Test loop
@@ -86,10 +87,10 @@ func TestAnyToUint32(t *testing.T) {
err error
}{
{10, 10, nil},
{5000000000, 0, ErrValOut},
{5000000000, 0, go_easy_utils.ErrValOut},
{"20", 20, nil},
{1.5, 1, nil},
{make(chan int), 0, ErrType},
{make(chan int), 0, go_easy_utils.ErrType},
}
// Test loop
@@ -114,37 +115,37 @@ func TestAnyToUint64(t *testing.T) {
{
name: "Test -float32",
input: float32(-0.1),
wantError: ErrUnsignedInt,
wantError: go_easy_utils.ErrUnsignedInt,
},
{
name: "Test -float64",
input: float64(-0.2),
wantError: ErrUnsignedInt,
wantError: go_easy_utils.ErrUnsignedInt,
},
{
name: "Test -int",
input: int(-1),
wantError: ErrUnsignedInt,
wantError: go_easy_utils.ErrUnsignedInt,
},
{
name: "Test -int8",
input: int8(-2),
wantError: ErrUnsignedInt,
wantError: go_easy_utils.ErrUnsignedInt,
},
{
name: "Test -int16",
input: int16(-3),
wantError: ErrUnsignedInt,
wantError: go_easy_utils.ErrUnsignedInt,
},
{
name: "Test -int32",
input: int32(-4),
wantError: ErrUnsignedInt,
wantError: go_easy_utils.ErrUnsignedInt,
},
{
name: "Test -int64",
input: int64(-5),
wantError: ErrUnsignedInt,
wantError: go_easy_utils.ErrUnsignedInt,
},
{
name: "Test uint",
@@ -219,7 +220,7 @@ func TestAnyToUint64(t *testing.T) {
{
name: "Test invalid string",
input: "not a number",
wantError: ErrSyntax,
wantError: go_easy_utils.ErrSyntax,
},
{
name: "Test nil pointer",
@@ -250,12 +251,12 @@ func TestAnyToUint64(t *testing.T) {
{
name: "test -complex",
input: complex(-1, -1),
wantError: ErrUnsignedInt,
wantError: go_easy_utils.ErrUnsignedInt,
},
{
name: "Test invalid type",
input: make(chan int),
wantError: ErrType,
wantError: go_easy_utils.ErrType,
},
}

View File

@@ -1,24 +0,0 @@
package anyUtil
import (
"errors"
"strconv"
)
var (
// ErrSyntax indicates that a value does not have the right syntax for the target type
// 指示值不具有目标类型的正确语法
ErrSyntax = strconv.ErrSyntax
// ErrType indicates that a value does not have the right syntax for the target type
// 指示值不具有目标类型的正确语法
ErrType = errors.New("unsupported type")
// ErrValOut Indicates that the range corresponding to the type is exceeded
// 表示超出了类型对应的范围
ErrValOut = errors.New("value out of range")
// ErrUnsignedInt The identity type is negative, so it cannot be converted to an unsigned integer
// 标识类型为负数,所以无法转为无符号的整型
ErrUnsignedInt = errors.New("cannot convert negative value to unsigned integer")
)

View File

@@ -1 +0,0 @@
package byteUtil

View File

@@ -1 +0,0 @@
package cryptoUtil

View File

@@ -1 +0,0 @@
package emojiUtil

22
errorcode.go Normal file
View File

@@ -0,0 +1,22 @@
package go_easy_utils
import (
"errors"
"strconv"
)
// ErrSyntax indicates that a value does not have the right syntax for the target type
// 指示值不具有目标类型的正确语法
var ErrSyntax = strconv.ErrSyntax
// ErrType indicates that a value does not have the right syntax for the target type
// 指示值不具有目标类型的正确语法
var ErrType = errors.New("unsupported type")
// ErrValOut Indicates that the range corresponding to the type is exceeded
// 表示超出了类型对应的范围
var ErrValOut = errors.New("value out of range")
// ErrUnsignedInt The identity type is negative, so it cannot be converted to an unsigned integer
// 标识类型为负数,所以无法转为无符号的整型
var ErrUnsignedInt = errors.New("cannot convert negative value to unsigned integer")

View File

@@ -1 +0,0 @@
package floatUtil

View File

@@ -1,16 +0,0 @@
package jsonUtil
import (
"errors"
"strconv"
)
var (
// ErrSyntax indicates that a value does not have the right syntax for the target type
// 指示值不具有目标类型的正确语法
ErrSyntax = strconv.ErrSyntax
// ErrType indicates that a value does not have the right syntax for the target type
// 指示值不具有目标类型的正确语法
ErrType = errors.New("unsupported type")
)

View File

@@ -1,6 +1,7 @@
package jsonUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"reflect"
"strconv"
)
@@ -26,7 +27,7 @@ func toFloat64(i any) (float64, error) {
case string:
floatValue, err := strconv.ParseFloat(v, 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return floatValue, nil
case uint:
@@ -66,7 +67,7 @@ func toFloat64(i any) (float64, error) {
//case *string:
// floatValue, err := strconv.ParseFloat(*v, 64)
// if err != nil {
// return 0, ErrSyntax
// return 0, go_easy_utils.ErrSyntax
// }
// return floatValue, nil
//case *uint:
@@ -100,7 +101,7 @@ func toFloat64(i any) (float64, error) {
// return 0, nil
// }
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}
@@ -126,7 +127,7 @@ func toFloat64Reflect(i any) (float64, error) {
}
floatValue, err := strconv.ParseFloat(v.String(), 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return floatValue, nil
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
@@ -144,6 +145,6 @@ func toFloat64Reflect(i any) (float64, error) {
//case reflect.Ptr, reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Slice:
// return 0, nil
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}

View File

@@ -1,6 +1,7 @@
package jsonUtil
import (
go_easy_utils "github.com/jefferyjob/go-easy-utils/v2"
"reflect"
"testing"
)
@@ -43,8 +44,8 @@ func TestToFloat64(t *testing.T) {
{true, 1, nil},
{false, 0, nil},
{(*bool)(nil), 0, nil},
{make(chan int), 0, ErrType},
{"abc", 0, ErrSyntax},
{make(chan int), 0, go_easy_utils.ErrType},
{"abc", 0, go_easy_utils.ErrSyntax},
}
for _, tc := range testCases {
@@ -89,7 +90,7 @@ func TestToFloat64Pointer(t *testing.T) {
name: "invalid string input",
input: stringPtr("abc"),
expectedValue: 0,
expectedError: ErrSyntax,
expectedError: go_easy_utils.ErrSyntax,
},
{
name: "valid string input",
@@ -185,7 +186,7 @@ func TestToFloat64Pointer(t *testing.T) {
name: "unsupported input type",
input: "unsupported",
expectedValue: 0,
expectedError: ErrSyntax,
expectedError: go_easy_utils.ErrSyntax,
},
}

View File

@@ -1,6 +1,7 @@
package jsonUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"reflect"
"strconv"
)
@@ -45,7 +46,7 @@ func toInt64(i any) (int64, error) {
case string:
intValue, err := strconv.ParseInt(v, 10, 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return intValue, nil
case int:
@@ -96,7 +97,7 @@ func toInt64(i any) (int64, error) {
// }
// intValue, err := strconv.ParseInt(*v, 10, 64)
// if err != nil {
// return 0, ErrSyntax
// return 0, go_easy_utils.ErrSyntax
// }
// return intValue, nil
//case *int:
@@ -110,7 +111,7 @@ func toInt64(i any) (int64, error) {
//case *int64:
// return *v, nil
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}
@@ -136,7 +137,7 @@ func toInt64Reflect(i any) (int64, error) {
}
intValue, err := strconv.ParseInt(v.String(), 10, 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return intValue, nil
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
@@ -154,6 +155,6 @@ func toInt64Reflect(i any) (int64, error) {
return 0, nil
}
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}

View File

@@ -1,6 +1,7 @@
package jsonUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"testing"
)
@@ -30,8 +31,8 @@ func TestToInt64(t *testing.T) {
{complex64(1 + 2i), 1, nil},
{complex128(1 + 2i), 1, nil},
{nil, 0, nil},
{"not a number", 0, ErrSyntax},
{make(chan int), 0, ErrType},
{"not a number", 0, go_easy_utils.ErrSyntax},
{make(chan int), 0, go_easy_utils.ErrType},
}
for _, tt := range tests {

View File

@@ -1,6 +1,7 @@
package jsonUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"reflect"
"strconv"
)
@@ -42,7 +43,7 @@ func toUint64(i any) (uint64, error) {
case string:
intValue, err := strconv.ParseUint(v, 10, 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return intValue, nil
case bool:
@@ -109,7 +110,7 @@ func toUint64(i any) (uint64, error) {
//case *string:
// intValue, err := strconv.ParseUint(*v, 10, 64)
// if err != nil {
// return 0, ErrSyntax
// return 0, go_easy_utils.ErrSyntax
// }
// return intValue, nil
//case *bool:
@@ -154,7 +155,7 @@ func toUint64(i any) (uint64, error) {
// }
// return uint64(*v), nil
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}
@@ -198,7 +199,7 @@ func toUint64Reflect(i any) (uint64, error) {
}
uintValue, err := strconv.ParseUint(v.String(), 10, 64)
if err != nil {
return 0, ErrSyntax
return 0, go_easy_utils.ErrSyntax
}
return uintValue, nil
case reflect.Bool:
@@ -208,6 +209,6 @@ func toUint64Reflect(i any) (uint64, error) {
return 0, nil
}
default:
return 0, ErrType
return 0, go_easy_utils.ErrType
}
}

View File

@@ -1,6 +1,7 @@
package jsonUtil
import (
"github.com/jefferyjob/go-easy-utils/v2"
"testing"
)
@@ -124,7 +125,7 @@ func TestToUint64(t *testing.T) {
{
name: "Test invalid string",
input: "not a number",
wantError: ErrSyntax,
wantError: go_easy_utils.ErrSyntax,
},
{
name: "Test nil pointer",
@@ -145,7 +146,7 @@ func TestToUint64(t *testing.T) {
{
name: "Test invalid type",
input: make(chan int),
wantError: ErrType,
wantError: go_easy_utils.ErrType,
},
}

View File

@@ -1 +0,0 @@
package mapUtil

View File

@@ -1 +0,0 @@
package mathUtil

View File

@@ -1 +0,0 @@
package sliceUtil

View File

@@ -1 +0,0 @@
package strUtil

View File

@@ -1 +0,0 @@
package validUtil