✨ feat: strutil - add new func: IsUint, IsPositiveNum

Author: inhere

internal/checkfn/check.go

@@ -118,11 +118,31 @@ func StringsContains(ss []string, s string) bool {
 	return false
 }
 
-// check is number: int or float
-var numReg = regexp.MustCompile(`^[-+]?\d*\.?\d+$`)
+var (
+	// check is number: int or float
+	numReg = regexp.MustCompile(`^[-+]?\d*\.?\d+$`)
+	// is positive number: int or float
+	pNumReg = regexp.MustCompile(`^\d*\.?\d+$`)
+)
 
 // IsNumeric returns true if the given string is a numeric, otherwise false.
-func IsNumeric(s string) bool { return numReg.MatchString(s) }
+func IsNumeric(s string) bool {
+	if s == "" {
+		return false
+	}
+	return numReg.MatchString(s)
+}
+
+// IsPositiveNum check input string is positive number
+func IsPositiveNum(s string) bool {
+	if s == "" {
+		return false
+	}
+	if s[0] == '-' {
+		return false
+	}
+	return pNumReg.MatchString(s)
+}
 
 // IsHttpURL check input is http/https url
 func IsHttpURL(s string) bool {

strutil/check.go

@@ -17,18 +17,43 @@ var IsHttpURL = checkfn.IsHttpURL
 // IsNumChar returns true if the given character is a numeric, otherwise false.
 func IsNumChar(c byte) bool { return c >= '0' && c <= '9' }
 
-var intReg = regexp.MustCompile(`^\d+$`)
-var floatReg = regexp.MustCompile(`^[-+]?\d*\.?\d+$`)
+var (
+	uintReg = regexp.MustCompile(`^\d+$`)
+	intReg  = regexp.MustCompile(`^[-+]?\d+$`)
+
+	floatReg = regexp.MustCompile(`^[-+]?\d*\.?\d+$`)
+)
 
 // IsInt check the string is an integer number
-func IsInt(s string) bool { return intReg.MatchString(s) }
+func IsInt(s string) bool {
+	if s == "" {
+		return false
+	}
+	return intReg.MatchString(s)
+}
+
+// IsUint check the string is an unsigned integer number
+func IsUint(s string) bool {
+	if s == "" {
+		return false
+	}
+	return uintReg.MatchString(s)
+}
 
 // IsFloat check the string is a float number
-func IsFloat(s string) bool { return floatReg.MatchString(s) }
+func IsFloat(s string) bool {
+	if s == "" {
+		return false
+	}
+	return floatReg.MatchString(s)
+}
 
 // IsNumeric returns true if the given string is a numeric(int/float), otherwise false.
 func IsNumeric(s string) bool { return checkfn.IsNumeric(s) }
 
+// IsPositiveNum check the string is a positive number
+func IsPositiveNum(s string) bool { return checkfn.IsPositiveNum(s) }
+
 // IsAlphabet char
 func IsAlphabet(char uint8) bool {
 	// A 65 -> Z 90

strutil/check_test.go

@@ -8,14 +8,26 @@ import (
 )
 
 func TestIsInt(t *testing.T) {
+	// IsInt
 	assert.True(t, strutil.IsInt("123"))
 	assert.True(t, strutil.IsInt("0"))
 	assert.True(t, strutil.IsInt("456789"))
+	assert.True(t, strutil.IsInt("-123"))
 
 	assert.False(t, strutil.IsInt("123.45"))
 	assert.False(t, strutil.IsInt("abc"))
 	assert.False(t, strutil.IsInt("123abc"))
 	assert.False(t, strutil.IsInt(""))
+
+	// IsUint
+	assert.True(t, strutil.IsUint("123"))
+	assert.True(t, strutil.IsUint("0"))
+	assert.True(t, strutil.IsUint("456789"))
+
+	assert.False(t, strutil.IsUint("-123"))
+	assert.False(t, strutil.IsUint("123.45"))
+	assert.False(t, strutil.IsUint("ab3"))
+	assert.False(t, strutil.IsUint(""))
 }
 
 func TestIsFloat(t *testing.T) {
@@ -33,6 +45,26 @@ func TestIsFloat(t *testing.T) {
 	assert.False(t, strutil.IsFloat(""))
 }
 
+func TestIsNumeric(t *testing.T) {
+	// IsNumeric
+	assert.True(t, strutil.IsNumeric("0"))
+	assert.True(t, strutil.IsNumeric("234"))
+	assert.True(t, strutil.IsNumeric("-234"))
+	assert.True(t, strutil.IsNumeric("23.4"))
+	assert.True(t, strutil.IsNumeric("-23.4"))
+	assert.False(t, strutil.IsNumeric(""))
+	assert.False(t, strutil.IsNumeric("a34"))
+
+	// IsPositiveNum
+	assert.True(t, strutil.IsPositiveNum("0.0"))
+	assert.True(t, strutil.IsPositiveNum("234"))
+	assert.True(t, strutil.IsPositiveNum("23.4"))
+	assert.False(t, strutil.IsPositiveNum("-23.4"))
+	assert.False(t, strutil.IsPositiveNum("-234"))
+	assert.False(t, strutil.IsPositiveNum("a34"))
+	assert.False(t, strutil.IsPositiveNum(""))
+}
+
 func TestIsAlphabet(t *testing.T) {
 	assert.True(t, strutil.IsNumChar('9'))
 	assert.False(t, strutil.IsNumChar('A'))
@@ -44,9 +76,6 @@ func TestIsAlphabet(t *testing.T) {
 	assert.True(t, strutil.IsAlphabet('a'))
 	assert.True(t, strutil.IsAlphabet('Z'))
 	assert.True(t, strutil.IsAlphabet('z'))
-
-	assert.True(t, strutil.IsNumeric("234"))
-	assert.False(t, strutil.IsNumeric("a34"))
 }
 
 func TestIsAlphaNum(t *testing.T) {