fix: move DSL overloads to be extension methods on generated clients

Author: ianbotsf

.changes/e1fa257d-73b3-4616-8c39-f32956008124.json

@@ -0,0 +1,5 @@
+{
+    "id": "e1fa257d-73b3-4616-8c39-f32956008124",
+    "type": "bugfix",
+    "description": "**Breaking**: Move DSL overloads on generated clients to extension methods"
+}

smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceGenerator.kt

@@ -80,12 +80,12 @@ class ServiceGenerator(private val ctx: RenderingContext<ServiceShape>) {
                 renderServiceConfig()
             }
             .call {
-                operations.forEach { op ->
-                    renderOperation(operationsIndex, op)
-                }
+                operations.forEach { renderOperation(operationsIndex, it) }
             }
             .closeBlock("}")
             .write("")
+
+        operations.forEach { renderOperationDslOverload(operationsIndex, it) }
     }
 
     private fun renderServiceConfig() {
@@ -154,7 +154,9 @@ class ServiceGenerator(private val ctx: RenderingContext<ServiceShape>) {
         writer.renderDocumentation(op)
         writer.renderAnnotations(op)
         writer.write(opIndex.operationSignature(ctx.model, ctx.symbolProvider, op, includeOptionalDefault = true))
+    }
 
+    private fun renderOperationDslOverload(opIndex: OperationIndex, op: OperationShape) {
         // Add DSL overload (if appropriate)
         opIndex.getInput(op).ifPresent { inputShape ->
             val outputShape = opIndex.getOutput(op)
@@ -167,7 +169,7 @@ class ServiceGenerator(private val ctx: RenderingContext<ServiceShape>) {
                 writer.write("")
                 writer.renderDocumentation(op)
                 writer.renderAnnotations(op)
-                val signature = "suspend fun $operationName(block: $input.Builder.() -> Unit)"
+                val signature = "suspend inline fun ${serviceSymbol.name}.$operationName(crossinline block: $input.Builder.() -> Unit)"
                 val impl = "$operationName($input.Builder().apply(block).build())"
                 writer.write("$signature = $impl")
             }

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

@@ -233,6 +233,7 @@ class StructureGenerator(
                 write("")
 
                 // generate the constructor used internally by serde
+                write("@PublishedApi")
                 write("internal constructor()")
                 // generate the constructor that converts from the underlying immutable class to a builder instance
                 writer.write("@PublishedApi")

smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceGeneratorTest.kt

@@ -164,11 +164,11 @@ class ServiceGeneratorTest {
     @Test
     fun `it adds DSL overloads for operations`() {
         val expectedSignatures = listOf(
-            "suspend fun getFoo(block: GetFooRequest.Builder.() -> Unit) = getFoo(GetFooRequest.Builder().apply(block).build())",
-            "suspend fun getFooNoInput(block: GetFooNoInputRequest.Builder.() -> Unit) = getFooNoInput(GetFooNoInputRequest.Builder().apply(block).build())",
-            "suspend fun getFooNoOutput(block: GetFooNoOutputRequest.Builder.() -> Unit) = getFooNoOutput(GetFooNoOutputRequest.Builder().apply(block).build())",
-            "suspend fun getFooStreamingInput(block: GetFooStreamingInputRequest.Builder.() -> Unit) = getFooStreamingInput(GetFooStreamingInputRequest.Builder().apply(block).build())",
-            "suspend fun getFooStreamingInputNoOutput(block: GetFooStreamingInputNoOutputRequest.Builder.() -> Unit) = getFooStreamingInputNoOutput(GetFooStreamingInputNoOutputRequest.Builder().apply(block).build())",
+            "suspend inline fun TestClient.getFoo(crossinline block: GetFooRequest.Builder.() -> Unit) = getFoo(GetFooRequest.Builder().apply(block).build())",
+            "suspend inline fun TestClient.getFooNoInput(crossinline block: GetFooNoInputRequest.Builder.() -> Unit) = getFooNoInput(GetFooNoInputRequest.Builder().apply(block).build())",
+            "suspend inline fun TestClient.getFooNoOutput(crossinline block: GetFooNoOutputRequest.Builder.() -> Unit) = getFooNoOutput(GetFooNoOutputRequest.Builder().apply(block).build())",
+            "suspend inline fun TestClient.getFooStreamingInput(crossinline block: GetFooStreamingInputRequest.Builder.() -> Unit) = getFooStreamingInput(GetFooStreamingInputRequest.Builder().apply(block).build())",
+            "suspend inline fun TestClient.getFooStreamingInputNoOutput(crossinline block: GetFooStreamingInputNoOutputRequest.Builder.() -> Unit) = getFooStreamingInputNoOutput(GetFooStreamingInputNoOutputRequest.Builder().apply(block).build())",
         )
         expectedSignatures.forEach {
             commonTestContents.shouldContainOnlyOnceWithDiff(it)

smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGeneratorTest.kt

@@ -174,6 +174,7 @@ class StructureGeneratorTest {
                 var `object`: kotlin.String? = null
                 var quux: com.test.model.Qux? = null
         
+                @PublishedApi
                 internal constructor()
                 @PublishedApi
                 internal constructor(x: com.test.model.MyStruct) : this() {