Add names to schemes and make urns.Schemes() return full Scheme objects

urns/schemes.go

@@ -45,38 +45,43 @@ func init() {
 	register(WhatsApp)
 }
 
-var schemes = map[string]*Scheme{}
-var schemePrefixes = []string{}
+var schemeByPrefix = map[string]*Scheme{}
+var schemes = []*Scheme{}
 
 func register(s *Scheme) {
-	schemes[s.Prefix] = s
-	schemePrefixes = append(schemePrefixes, s.Prefix)
+	schemeByPrefix[s.Prefix] = s
+	schemes = append(schemes, s)
 }
 
 type Scheme struct {
 	Prefix    string
+	Name      string
 	Normalize func(string) string
 	Validate  func(string) bool
 	Format    func(string) string
 }
 
 var Discord = &Scheme{
 	Prefix:   "discord",
+	Name:     "Discord",
 	Validate: func(path string) bool { return allDigitsRegex.MatchString(path) },
 }
 
 var Email = &Scheme{
 	Prefix:    "mailto",
+	Name:      "Email",
 	Normalize: func(path string) string { return strings.ToLower(path) },
 	Validate:  func(path string) bool { return emailRegex.MatchString(path) },
 }
 
 var External = &Scheme{
 	Prefix: "ext",
+	Name:   "External",
 }
 
 var Facebook = &Scheme{
 	Prefix: "facebook",
+	Name:   "Facebook",
 	Validate: func(path string) bool {
 		// we don't validate facebook refs since they come from the outside
 		if strings.HasPrefix(path, FacebookRefPrefix) {
@@ -89,30 +94,36 @@ var Facebook = &Scheme{
 
 var Firebase = &Scheme{
 	Prefix: "fcm",
+	Name:   "Firebase",
 }
 
 var FreshChat = &Scheme{
 	Prefix:   "freshchat",
+	Name:     "FreshChat",
 	Validate: func(path string) bool { return freshchatRegex.MatchString(path) },
 }
 
 var Instagram = &Scheme{
 	Prefix:   "instagram",
+	Name:     "Instagram",
 	Validate: func(path string) bool { return allDigitsRegex.MatchString(path) },
 }
 
 var JioChat = &Scheme{
 	Prefix:   "jiochat",
+	Name:     "JioChat",
 	Validate: func(path string) bool { return allDigitsRegex.MatchString(path) },
 }
 
 var Line = &Scheme{
 	Prefix:   "line",
+	Name:     "LINE",
 	Validate: func(path string) bool { return lineRegex.MatchString(path) },
 }
 
 var Phone = &Scheme{
 	Prefix: "tel",
+	Name:   "Phone",
 	Normalize: func(path string) string {
 		// might have alpha characters in it
 		return strings.ToUpper(path)
@@ -129,19 +140,23 @@ var Phone = &Scheme{
 
 var RocketChat = &Scheme{
 	Prefix: "rocketchat",
+	Name:   "Rocket.Chat",
 }
 
 var Slack = &Scheme{
 	Prefix: "slack",
+	Name:   "Slack",
 }
 
 var Telegram = &Scheme{
 	Prefix:   "telegram",
+	Name:     "Telegram",
 	Validate: func(path string) bool { return allDigitsRegex.MatchString(path) },
 }
 
 var Twitter = &Scheme{
 	Prefix: "twitter",
+	Name:   "Twitter Handle",
 	Normalize: func(path string) string {
 		// handles are case-insensitive, so we always store as lowercase
 		path = strings.ToLower(path)
@@ -154,28 +169,34 @@ var Twitter = &Scheme{
 
 var TwitterID = &Scheme{
 	Prefix:   "twitterid",
+	Name:     "Twitter",
 	Validate: func(path string) bool { return allDigitsRegex.MatchString(path) },
 }
 
 var Viber = &Scheme{
 	Prefix:   "viber",
+	Name:     "Viber",
 	Validate: func(path string) bool { return viberRegex.MatchString(path) },
 }
 
 var VK = &Scheme{
 	Prefix: "vk",
+	Name:   "VK",
 }
 
 var WebChat = &Scheme{
 	Prefix:   "webchat",
+	Name:     "WebChat",
 	Validate: func(path string) bool { return webchatRegex.MatchString(path) },
 }
 
 var WeChat = &Scheme{
 	Prefix: "wechat",
+	Name:   "WeChat",
 }
 
 var WhatsApp = &Scheme{
 	Prefix:   "whatsapp",
+	Name:     "WhatsApp",
 	Validate: func(path string) bool { return allDigitsRegex.MatchString(path) },
 }

urns/urns.go

@@ -13,13 +13,13 @@ const (
 
 // IsValidScheme checks whether the provided scheme is valid
 func IsValidScheme(scheme string) bool {
-	_, valid := schemes[scheme]
+	_, valid := schemeByPrefix[scheme]
 	return valid
 }
 
 // Schemes returns the valid URN schemes
-func Schemes() []string {
-	return schemePrefixes
+func Schemes() []*Scheme {
+	return schemes
 }
 
 // URN represents a Universal Resource Name, we use this for contact identifiers like phone numbers etc..
@@ -77,7 +77,7 @@ func (u URN) ToParts() (string, string, string, string) {
 // Normalize normalizes the URN into it's canonical form and should be performed before URN comparisons
 func (u URN) Normalize() URN {
 	scheme, path, query, display := u.ToParts()
-	s := schemes[scheme]
+	s := schemeByPrefix[scheme]
 
 	path = strings.TrimSpace(path)
 
@@ -104,7 +104,7 @@ func (u URN) Validate() error {
 		return fmt.Errorf("path component too long")
 	}
 
-	s := schemes[scheme]
+	s := schemeByPrefix[scheme]
 	if s.Validate != nil && !s.Validate(path) {
 		return fmt.Errorf("invalid path component")
 	}
@@ -164,7 +164,7 @@ func (u URN) Format() string {
 		return display
 	}
 
-	s := schemes[scheme]
+	s := schemeByPrefix[scheme]
 	if s != nil && s.Format != nil {
 		return s.Format(path)
 	}

urns/urns_test.go

@@ -14,7 +14,7 @@ func TestIsValidScheme(t *testing.T) {
 	assert.False(t, urns.IsValidScheme("xyz"))
 
 	assert.Len(t, urns.Schemes(), 20)
-	assert.Equal(t, "discord", urns.Schemes()[0])
+	assert.Equal(t, "Discord", urns.Schemes()[0].Name)
 }
 
 func TestURNProperties(t *testing.T) {