Updated libraries

vendor/github.com/go-openapi/swag/util.go

@@ -33,6 +33,12 @@ var once sync.Once
 
 var isInitialism func(string) bool
 
+var (
+	splitRex1     *regexp.Regexp
+	splitRex2     *regexp.Regexp
+	splitReplacer *strings.Replacer
+)
+
 func init() {
 	// Taken from https://github.com/golang/lint/blob/3390df4df2787994aea98de825b964ac7944b817/lint.go#L732-L769
 	var configuredInitialisms = map[string]bool{
@@ -153,49 +159,54 @@ func SplitByFormat(data, format string) []string {
 	return result
 }
 
-type byLength []string
+type byInitialism []string
 
-func (s byLength) Len() int {
+func (s byInitialism) Len() int {
 	return len(s)
 }
-func (s byLength) Swap(i, j int) {
+func (s byInitialism) Swap(i, j int) {
 	s[i], s[j] = s[j], s[i]
 }
-func (s byLength) Less(i, j int) bool {
-	return len(s[i]) < len(s[j])
+func (s byInitialism) Less(i, j int) bool {
+	if len(s[i]) != len(s[j]) {
+		return len(s[i]) < len(s[j])
+	}
+
+	return strings.Compare(s[i], s[j]) > 0
 }
 
 // Prepares strings by splitting by caps, spaces, dashes, and underscore
 func split(str string) []string {
-	repl := strings.NewReplacer(
-		"@", "At ",
-		"&", "And ",
-		"|", "Pipe ",
-		"$", "Dollar ",
-		"!", "Bang ",
-		"-", " ",
-		"_", " ",
-	)
-
-	rex1 := regexp.MustCompile(`(\p{Lu})`)
-	rex2 := regexp.MustCompile(`(\pL|\pM|\pN|\p{Pc})+`)
+	// check if consecutive single char things make up an initialism
+	once.Do(func() {
+		splitRex1 = regexp.MustCompile(`(\p{Lu})`)
+		splitRex2 = regexp.MustCompile(`(\pL|\pM|\pN|\p{Pc})+`)
+		splitReplacer = strings.NewReplacer(
+			"@", "At ",
+			"&", "And ",
+			"|", "Pipe ",
+			"$", "Dollar ",
+			"!", "Bang ",
+			"-", " ",
+			"_", " ",
+		)
+		ensureSorted()
+	})
 
 	str = trim(str)
 
 	// Convert dash and underscore to spaces
-	str = repl.Replace(str)
+	str = splitReplacer.Replace(str)
 
 	// Split when uppercase is found (needed for Snake)
-	str = rex1.ReplaceAllString(str, " $1")
+	str = splitRex1.ReplaceAllString(str, " $1")
 
-	// check if consecutive single char things make up an initialism
-	once.Do(ensureSorted)
 	for _, k := range initialisms {
-		str = strings.Replace(str, rex1.ReplaceAllString(k, " $1"), " "+k, -1)
+		str = strings.Replace(str, splitRex1.ReplaceAllString(k, " $1"), " "+k, -1)
 	}
 	// Get the final list of words
 	//words = rex2.FindAllString(str, -1)
-	return rex2.FindAllString(str, -1)
+	return splitRex2.FindAllString(str, -1)
 }
 
 // Removes leading whitespaces
@@ -215,7 +226,7 @@ func lower(str string) string {
 
 // Camelize an uppercased word
 func Camelize(word string) (camelized string) {
-	for pos, ru := range word {
+	for pos, ru := range []rune(word) {
 		if pos > 0 {
 			camelized += string(unicode.ToLower(ru))
 		} else {
@@ -271,7 +282,7 @@ func ToHumanNameTitle(name string) string {
 	for _, w := range in {
 		uw := upper(w)
 		if !isInitialism(uw) {
-			out = append(out, upper(w[:1])+lower(w[1:]))
+			out = append(out, Camelize(w))
 		} else {
 			out = append(out, w)
 		}
@@ -289,7 +300,7 @@ func ToJSONName(name string) string {
 			out = append(out, lower(w))
 			continue
 		}
-		out = append(out, upper(w[:1])+lower(w[1:]))
+		out = append(out, Camelize(w))
 	}
 	return strings.Join(out, "")
 }
@@ -315,19 +326,15 @@ func ToGoName(name string) string {
 		uw := upper(w)
 		mod := int(math.Min(float64(len(uw)), 2))
 		if !isInitialism(uw) && !isInitialism(uw[:len(uw)-mod]) {
-			uw = upper(w[:1]) + lower(w[1:])
+			uw = Camelize(w)
 		}
 		out = append(out, uw)
 	}
 
 	result := strings.Join(out, "")
 	if len(result) > 0 {
-		ud := upper(result[:1])
-		ru := []rune(ud)
-		if unicode.IsUpper(ru[0]) {
-			result = ud + result[1:]
-		} else {
-			result = "X" + ud + result[1:]
+		if !unicode.IsUpper([]rune(result)[0]) {
+			result = "X" + result
 		}
 	}
 	return result