Added + as a word separator

Author: czechboy0

Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/SwiftSafeNames.swift

@@ -98,7 +98,8 @@ extension String {
         }
 
         // 1. Leave leading underscores as-are
-        // 2. In the middle: word separators: ["_", "-", "/", <space>] -> remove and capitalize next word
+        // 2. In the middle: word separators: ["_", "-", "/", "+", <space>] -> remove and capitalize
+        //    next word
         // 3. In the middle: period: ["."] -> replace with "_"
         // 4. In the middle: drop ["{", "}"] -> replace with ""
 
@@ -188,7 +189,7 @@ extension String {
                         buffer.append(char)
                     }
                     state = .accumulatingFirstWord(context)
-                } else if ["_", "-", " ", "/"].contains(char) {
+                } else if ["_", "-", " ", "/", "+"].contains(char) {
                     // In the middle of an identifier, these are considered
                     // word separators, so we remove the character and end the current word.
                     state = .waitingForWordStarter
@@ -218,14 +219,14 @@ extension String {
                     buffer.append("_")
                     state = .accumulatingWord
                 } else if ["{", "}"].contains(char) {
-                    // In the middle of an identifier, curly braces are dropped.
+                    // In the middle of an identifier, these are dropped.
                     state = .accumulatingWord
                 } else {
                     // Illegal character, fall back to the defensive strategy.
                     state = .fallback
                 }
             case .waitingForWordStarter:
-                if ["_", "-", ".", "/", "{", "}"].contains(char) {
+                if ["_", "-", ".", "/", "+", "{", "}"].contains(char) {
                     // Between words, just drop allowed special characters, since
                     // we're already between words anyway.
                     state = .waitingForWordStarter
@@ -250,7 +251,7 @@ extension String {
     }
 
     /// A list of word separator characters for the idiomatic naming strategy.
-    private static let wordSeparators: Set<Character> = ["_", "-", " ", "/"]
+    private static let wordSeparators: Set<Character> = ["_", "-", " ", "/", "+"]
 
     /// A list of Swift keywords.
     ///

Sources/_OpenAPIGeneratorCore/Translator/TypeAssignment/TypeAssigner.swift

@@ -541,7 +541,7 @@ struct TypeAssigner {
                 componentSeparator = ""
                 capitalizeNonFirstWords = true
             }
-            let prettifiedSubtype = capitalizeNonFirstWords ? safedSubtype.capitalized : safedSubtype
+            let prettifiedSubtype = capitalizeNonFirstWords ? safedSubtype.uppercasingFirstLetter : safedSubtype
             let prefix = "\(safedType)\(componentSeparator)\(prettifiedSubtype)"
             let params = contentType.lowercasedParameterPairs
             guard !params.isEmpty else { return prefix }
@@ -551,7 +551,7 @@ struct TypeAssigner {
                     .split(separator: "=")
                     .map { component in
                         let safedComponent = context.asSwiftSafeName(String(component), .noncapitalized)
-                        return capitalizeNonFirstWords ? safedComponent.capitalized : safedComponent
+                        return capitalizeNonFirstWords ? safedComponent.uppercasingFirstLetter : safedComponent
                     }
                     .joined(separator: componentSeparator)
             }

Tests/OpenAPIGeneratorCoreTests/Translator/TypeAssignment/Test_TypeAssigner.swift

@@ -105,27 +105,39 @@ class Test_TypeAssigner: Test_Core {
     }
 
     func testContentSwiftName() throws {
-        let nameMaker = makeTranslator().typeAssigner.contentSwiftName
-        let cases: [(String, String)] = [
+        let defensiveNameMaker = makeTranslator().typeAssigner.contentSwiftName
+        let idiomaticNameMaker = makeTranslator(namingStrategy: .idiomatic).typeAssigner.contentSwiftName
+        let cases: [(input: String, defensive: String, idiomatic: String)] = [
 
             // Short names.
-            ("application/json", "json"), ("application/x-www-form-urlencoded", "urlEncodedForm"),
-            ("multipart/form-data", "multipartForm"), ("text/plain", "plainText"), ("*/*", "any"),
-            ("application/xml", "xml"), ("application/octet-stream", "binary"), ("text/html", "html"),
-            ("application/yaml", "yaml"), ("text/csv", "csv"), ("image/png", "png"), ("application/pdf", "pdf"),
-            ("image/jpeg", "jpeg"),
+            ("application/json", "json", "json"),
+            ("application/x-www-form-urlencoded", "urlEncodedForm", "urlEncodedForm"),
+            ("multipart/form-data", "multipartForm", "multipartForm"),
+            ("text/plain", "plainText", "plainText"),
+            ("*/*", "any", "any"),
+            ("application/xml", "xml", "xml"),
+            ("application/octet-stream", "binary", "binary"),
+            ("text/html", "html", "html"),
+            ("application/yaml", "yaml", "yaml"),
+            ("text/csv", "csv", "csv"),
+            ("image/png", "png", "png"),
+            ("application/pdf", "pdf", "pdf"),
+            ("image/jpeg", "jpeg", "jpeg"),
 
             // Generic names.
-            ("application/myformat+json", "application_myformat_plus_json"), ("foo/bar", "foo_bar"),
+            ("application/myformat+json", "application_myformat_plus_json", "applicationMyformatJson"),
+            ("foo/bar", "foo_bar", "fooBar"),
+            ("text/event-stream", "text_event_hyphen_stream", "textEventStream"),
 
             // Names with a parameter.
-            ("application/foo", "application_foo"),
-            ("application/foo; bar=baz; boo=foo", "application_foo_bar_baz_boo_foo"),
-            ("application/foo; bar = baz", "application_foo_bar_baz"),
+            ("application/foo", "application_foo", "applicationFoo"),
+            ("application/foo; bar=baz; boo=foo", "application_foo_bar_baz_boo_foo", "applicationFooBarBazBooFoo"),
+            ("application/foo; bar = baz", "application_foo_bar_baz", "applicationFooBarBaz"),
         ]
-        for (string, name) in cases {
+        for (string, defensiveName, idiomaticName) in cases {
             let contentType = try XCTUnwrap(ContentType(string: string))
-            XCTAssertEqual(nameMaker(contentType), name, "Case \(string) failed")
+            XCTAssertEqual(defensiveNameMaker(contentType), defensiveName, "Case \(string) failed for defensive strategy")
+            XCTAssertEqual(idiomaticNameMaker(contentType), idiomaticName, "Case \(string) failed for idiomatic strategy")
         }
     }
 }