fix: GraphQLEnum value camelCase conversion strategy (#2745)

apollographql · Jan 5, 2023 · 73f4f0d · 73f4f0d
1 parent 618f336
commit 73f4f0d
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 23 deletions.
diff --git a/Sources/ApolloCodegenLib/Templates/RenderingHelpers/GraphQLEnumValue+Rendered.swift b/Sources/ApolloCodegenLib/Templates/RenderingHelpers/GraphQLEnumValue+Rendered.swift
@@ -23,20 +23,23 @@ extension GraphQLEnumValue.Name {
     }
   }
 
+  /// Convert to `camelCase` from a number of different `snake_case` variants.
+  ///
+  /// All inner `_` characters will be removed, each 'word' will be capitalized, returning a final
+  /// firstLowercased string while preserving original leading and trailing `_` characters.
   private func convertToCamelCase(_ value: String) -> String {
-    if value.allSatisfy({ $0.isUppercase }) {
-      // For `UPPERCASE`. e.g) UPPER -> upper, STARWARS -> starwards
-      return value.lowercased()
+    guard value.firstIndex(of: "_") != nil else {
+      if value.firstIndex(where: { $0.isLowercase }) != nil {
+        return value.firstLowercased
+      } else {
+        return value.lowercased()
+      }
     }
-    if value.contains("_") {
-      // For `snake_case`. e.g) snake_case -> snakeCase, UPPER_SNAKE_CASE -> upperSnakeCase
-      return value.split(separator: "_").enumerated().map { $0.offset == 0 ? $0.element.lowercased() : $0.element.capitalized }.joined()
-    }
-    if let firstChar = value.first, firstChar.isUppercase {
-      // For `UpperCamelCase`. e.g) UpperCamelCase -> upperCamelCase
-      return [firstChar.lowercased(), String(value.suffix(from: value.index(value.startIndex, offsetBy: 1)))].joined()
-    }
-    return value
+
+    return value.components(separatedBy: "_")
+      .map({ $0.isEmpty ? "_" : $0.capitalized })
+      .joined()
+      .firstLowercased
   }
 
 }
diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/EnumTemplateTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/EnumTemplateTests.swift
@@ -110,14 +110,24 @@ class EnumTemplateTests: XCTestCase {
     expect(actual).to(equalLineByLine(expected, ignoringExtraLines: true))
   }
 
-  func test_render_givenCaseConversionStrategy_camelCase_generatesSwiftEnum_convertedToCamelCase() {
+  func test_render_givenOption_caseConversionStrategy_camelCase_generatesSwiftEnumValues_convertedToCamelCase() {
     // given
     buildSubject(
       name: "casedEnum",
       values: [
-        ("lower", nil, nil),
-        ("UPPER", nil, nil),
+        // Mixed case
+        ("lowercase", nil, nil),
+        ("UPPERCASE", nil, nil),
         ("Capitalized", nil, nil),
+        ("snake_case", nil, nil),
+        ("UPPER_SNAKE_CASE", nil, nil),
+        ("_1", nil, nil),
+        ("_one_two_three_", nil, nil),
+        ("camelCased", nil, nil),
+        ("UpperCamelCase", nil, nil),
+        ("BEFORE2023", nil, nil),
+
+        // Escaped keywords
         ("associatedtype", nil, nil),
         ("class", nil, nil),
         ("deinit", nil, nil),
@@ -170,14 +180,24 @@ class EnumTemplateTests: XCTestCase {
         ("throws", nil, nil),
         ("true", nil, nil),
         ("try", nil, nil),
-      ]
+      ],
+      config: .mock(
+        options: .init(conversionStrategies: .init(enumCases: .camelCase))
+      )
     )
 
     let expected = """
     enum CasedEnum: String, EnumType {
-      case lower = "lower"
-      case upper = "UPPER"
+      case lowercase = "lowercase"
+      case uppercase = "UPPERCASE"
       case capitalized = "Capitalized"
+      case snakeCase = "snake_case"
+      case upperSnakeCase = "UPPER_SNAKE_CASE"
+      case _1 = "_1"
+      case _oneTwoThree_ = "_one_two_three_"
+      case camelCased = "camelCased"
+      case upperCamelCase = "UpperCamelCase"
+      case before2023 = "BEFORE2023"
       case `associatedtype` = "associatedtype"
       case `class` = "class"
       case `deinit` = "deinit"
@@ -241,14 +261,24 @@ class EnumTemplateTests: XCTestCase {
     expect(actual).to(equalLineByLine(expected))
   }
 
-  func test_render_givenSchemaEnum_noneConveersionStrategies_generatesSwiftEnumRespectingValueCasing() throws {
+  func test_render_givenOption_caseConversionStrategy_none_generatesSwiftEnumValues_respectingSchemaValueCasing() throws {
     // given
     buildSubject(
       name: "casedEnum",
       values: [
-        ("lower", nil, nil),
-        ("UPPER", nil, nil),
+        // Mixed case
+        ("lowercase", nil, nil),
+        ("UPPERCASE", nil, nil),
         ("Capitalized", nil, nil),
+        ("snake_case", nil, nil),
+        ("UPPER_SNAKE_CASE", nil, nil),
+        ("_1", nil, nil),
+        ("_one_two_three_", nil, nil),
+        ("camelCased", nil, nil),
+        ("UpperCamelCase", nil, nil),
+        ("BEFORE2023", nil, nil),
+
+        // Escaped keywords
         ("associatedtype", nil, nil),
         ("class", nil, nil),
         ("deinit", nil, nil),
@@ -309,9 +339,16 @@ class EnumTemplateTests: XCTestCase {
 
     let expected = """
     enum CasedEnum: String, EnumType {
-      case lower
-      case UPPER
+      case lowercase
+      case UPPERCASE
       case Capitalized
+      case snake_case
+      case UPPER_SNAKE_CASE
+      case _1
+      case _one_two_three_
+      case camelCased
+      case UpperCamelCase
+      case BEFORE2023
       case `associatedtype`
       case `class`
       case `deinit`