fix!: consistent naming for types, protocols and everything else (#461)

Author: ganeshnj

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/PaginatorGenerator.kt

@@ -20,7 +20,7 @@ import software.amazon.smithy.swift.codegen.model.camelCaseName
 import software.amazon.smithy.swift.codegen.model.expectShape
 import software.amazon.smithy.swift.codegen.model.hasTrait
 import software.amazon.smithy.swift.codegen.model.isBoxed
-import software.amazon.smithy.swift.codegen.utils.toCamelCase
+import software.amazon.smithy.swift.codegen.utils.toLowerCamelCase
 
 /**
  * Generate paginators for supporting operations.  See
@@ -155,7 +155,7 @@ class PaginatorGenerator : SwiftIntegration {
                             .call {
                                 val sortedMembers = inputShape.members().sortedBy { it.camelCaseName() }
                                 for ((index, member) in sortedMembers.withIndex()) {
-                                    if (member.memberName.toCamelCase() != markerLiteral) {
+                                    if (member.memberName.toLowerCamelCase() != markerLiteral) {
                                         writer.writeInline("\n\$L: \$L", member.camelCaseName(), "self.${member.camelCaseName()}")
                                     } else {
                                         writer.writeInline("\n\$L: \$L", member.camelCaseName(), "token")

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/StructureGenerator.kt

@@ -26,6 +26,7 @@ import software.amazon.smithy.swift.codegen.model.hasTrait
 import software.amazon.smithy.swift.codegen.model.isError
 import software.amazon.smithy.swift.codegen.model.nestedNamespaceType
 import software.amazon.smithy.swift.codegen.model.recursiveSymbol
+import software.amazon.smithy.swift.codegen.utils.toUpperCamelCase
 
 class StructureGenerator(
     private val model: Model,
@@ -52,7 +53,7 @@ class StructureGenerator(
     }
 
     fun render() {
-        writer.putContext("struct.name", structSymbol.name)
+        writer.putContext("struct.name", structSymbol.name.toUpperCamelCase())
         if (shape.isError) {
             renderErrorStructure()
         } else {

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SymbolVisitor.kt

@@ -51,6 +51,7 @@ import software.amazon.smithy.swift.codegen.model.defaultName
 import software.amazon.smithy.swift.codegen.model.hasTrait
 import software.amazon.smithy.swift.codegen.model.nestedNamespaceType
 import software.amazon.smithy.swift.codegen.utils.clientName
+import software.amazon.smithy.swift.codegen.utils.toLowerCamelCase
 import software.amazon.smithy.utils.StringUtils.lowerCase
 import java.util.logging.Logger
 
@@ -94,7 +95,7 @@ class SymbolVisitor(private val model: Model, swiftSettings: SwiftSettings) :
             val name = escaper.escapeMemberName(shape.memberName)
             return if (!name.equals("sdkUnknown")) lowerCase(name) else name
         }
-        return escaper.escapeMemberName(shape.memberName.decapitalize())
+        return escaper.escapeMemberName(shape.memberName.toLowerCamelCase())
     }
 
     override fun integerShape(shape: IntegerShape): Symbol = numberShape(shape, "Int", "0")

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/EndpointTraitConstructor.kt

@@ -7,7 +7,7 @@ package software.amazon.smithy.swift.codegen.integration
 
 import software.amazon.smithy.model.shapes.Shape
 import software.amazon.smithy.model.traits.EndpointTrait
-import software.amazon.smithy.swift.codegen.utils.toCamelCase
+import software.amazon.smithy.swift.codegen.utils.toLowerCamelCase
 
 class EndpointTraitConstructor(private val endpointTrait: EndpointTrait, private val inputShape: Shape) {
     fun construct(): String {
@@ -16,7 +16,7 @@ class EndpointTraitConstructor(private val endpointTrait: EndpointTrait, private
                 // hostLabel can only target string shapes
                 // see: https://awslabs.github.io/smithy/1.0/spec/core/endpoint-traits.html#hostlabel-trait
                 val member = inputShape.members().first { it.memberName == segment.content }
-                "\\(input.${member.memberName.toCamelCase()}!)"
+                "\\(input.${member.memberName.toLowerCamelCase()}!)"
             } else {
                 segment.content
             }

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/ServiceConfig.kt

@@ -8,7 +8,7 @@ package software.amazon.smithy.swift.codegen.integration
 import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.swift.codegen.ClientRuntimeTypes
 import software.amazon.smithy.swift.codegen.SwiftWriter
-import software.amazon.smithy.swift.codegen.utils.toPascalCase
+import software.amazon.smithy.swift.codegen.utils.toUpperCamelCase
 
 /**
  * Represents a config field on a client config struct.
@@ -20,7 +20,7 @@ data class ConfigField(val memberName: String?, val type: Symbol, val propFormat
  */
 abstract class ServiceConfig(val writer: SwiftWriter, val serviceName: String) {
 
-    open val typeName: String = "${serviceName.toPascalCase()}Configuration"
+    open val typeName: String = "${serviceName.toUpperCamelCase()}Configuration"
     open val typeProtocol: Symbol = Symbol.builder().name("${typeName}Protocol").build()
 
     open val typesToConformConfigTo: List<Symbol> = mutableListOf(ClientRuntimeTypes.Core.SDKRuntimeConfiguration)

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/utils/CaseUtils.kt

@@ -32,9 +32,25 @@ fun String.splitOnWordBoundaries(): List<String> {
     return result.split(" ")
 }
 
-fun String.toPascalCase(): String = splitOnWordBoundaries().joinToString(separator = "") { it.lowercase().replaceFirstChar { c -> c.uppercaseChar() } }
+// See https://awslabs.github.io/smithy/1.0/spec/aws/aws-core.html#using-sdk-service-id-for-client-naming
+fun String.clientName(): String = toUpperCamelCase()
 
-fun String.toCamelCase(): String = toPascalCase().replaceFirstChar { c -> c.lowercaseChar() }
+fun String.toLowerCamelCase(): String {
+    val words = this.splitOnWordBoundaries()
 
-// See https://awslabs.github.io/smithy/1.0/spec/aws/aws-core.html#using-sdk-service-id-for-client-naming
-fun String.clientName(): String = toPascalCase()
+    // make first part lowercase
+    val firstWord = words.first().lowercase()
+
+    // join
+    return firstWord + words.drop(1).joinToString(separator = "")
+}
+
+fun String.toUpperCamelCase(): String {
+    val words = this.splitOnWordBoundaries()
+
+    // make first part uppercase
+    val firstWord = words.first().replaceFirstChar { c -> c.uppercaseChar() }
+
+    // join
+    return firstWord + words.drop(1).joinToString(separator = "")
+}

smithy-swift-codegen/src/test/kotlin/CaseUtilsTests.kt

@@ -0,0 +1,38 @@
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import software.amazon.smithy.swift.codegen.utils.toLowerCamelCase
+import software.amazon.smithy.swift.codegen.utils.toUpperCamelCase
+
+class CaseUtilsTests {
+    @Test
+    fun `it should convert to camel case when only first letter upper case`() {
+        val input = "FooBar"
+        val expected = "fooBar"
+        val actual = input.toLowerCamelCase()
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `it should convert to camel case when contiguous letters upper case`() {
+        val input = "FOOBar"
+        val expected = "fooBar"
+        val actual = input.toLowerCamelCase()
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `it should convert to upper case when only first is lower case`() {
+        val input = "fooBar"
+        val expected = "FooBar"
+        val actual = input.toUpperCamelCase()
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `it should convert to upper case when contiguous letters lower case`() {
+        val input = "fOOBar"
+        val expected = "FOOBar"
+        val actual = input.toUpperCamelCase()
+        assertEquals(expected, actual)
+    }
+}

smithy-swift-codegen/src/test/kotlin/SymbolVisitorTest.kt

@@ -13,15 +13,16 @@ class SymbolVisitorTest {
     // See https://awslabs.github.io/smithy/1.0/spec/aws/aws-core.html#using-sdk-service-id-for-client-naming
     @Test
     fun `it produces the correct string transformation for client names`() {
-        assertEquals("ApiGateway", "API Gateway".clientName())
+        assertEquals("APIGateway", "API Gateway".clientName())
         assertEquals("Lambda", "Lambda".clientName())
         assertEquals("ElastiCache", "ElastiCache".clientName())
         assertEquals("ApiGatewayManagementApi", "ApiGatewayManagementApi".clientName())
         assertEquals("MigrationHubConfig", "MigrationHub Config".clientName())
         assertEquals("IoTFleetHub", "IoTFleetHub".clientName())
-        assertEquals("Iot1ClickProjects", "IoT 1Click Projects".clientName())
-        assertEquals("DynamoDb", "DynamoDB".clientName())
+        assertEquals("IoT1ClickProjects", "IoT 1Click Projects".clientName())
+        assertEquals("DynamoDB", "DynamoDB".clientName())
         assertEquals("ExampleClient", "Example Client".clientName())
         assertEquals("ExampleClient", " Example Client ".clientName())
+        assertEquals("EMRServerless", "EMR Serverless".clientName())
     }
 }