allow more symbols in account.Number

account/number.go

@@ -13,7 +13,7 @@ import (
 	"github.com/domonda/go-errs"
 )
 
-var numberRegex = regexp.MustCompile(`^[0-9A-Za-z_]+$`)
+var numberRegex = regexp.MustCompile(`^[0-9A-Za-z][0-9A-Za-z_\-\/:.;,]*$`)
 
 const (
 	ErrInvalidNumber      errs.Sentinel = "invalid account number"
@@ -49,14 +49,14 @@ func NumberFromUint(u uint64) Number {
 }
 
 // Valid returns true if the Number matches
-// the regular expression `^[0-9A-Za-z_]+$`
+// the regular expression `^[0-9A-Za-z][0-9A-Za-z_\-\/:.;,]*$`
 func (n Number) Valid() bool {
 	return numberRegex.MatchString(string(n))
 }
 
 // Validate returns a wrapped ErrInvalidNumber
 // error if the Number does not match
-// the regular expression `^[0-9A-Za-z_]+$`
+// the regular expression `^[0-9A-Za-z][0-9A-Za-z_\-\/:.;,]*$`
 func (n Number) Validate() error {
 	if !n.Valid() {
 		return fmt.Errorf("%w: %q", ErrInvalidNumber, n)

account/number_test.go

@@ -1,6 +1,10 @@
 package account
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
 
 func TestNumber_TrimLeadingZeros(t *testing.T) {
 	tests := []struct {
@@ -27,3 +31,33 @@ func TestNumber_TrimLeadingZeros(t *testing.T) {
 		})
 	}
 }
+
+func TestNumber_Valid(t *testing.T) {
+	valid := []Number{
+		"0",
+		"0/",
+		"0/0",
+		"Hello_World",
+		"a.b",
+		"a:b",
+		"a,b",
+		"a;b",
+		"a.b.",
+		"a:b:",
+		"a,b,",
+		"a;b;",
+	}
+	for _, n := range valid {
+		t.Run(string(n), func(t *testing.T) {
+			require.Truef(t, n.Valid(), "Number(%#v).Valid()", n)
+		})
+	}
+	invalid := []Number{
+		"",
+	}
+	for _, n := range invalid {
+		t.Run(string(n), func(t *testing.T) {
+			require.Falsef(t, n.Valid(), "Number(%#v).Valid()", n)
+		})
+	}
+}