feat!: Closure-based reader-writer serde for JSON, FormURL

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/httpResponse/bindingTraits/HTTPResponseTraitPayload.kt

@@ -13,16 +13,6 @@ import software.amazon.smithy.swift.codegen.integration.HttpBindingDescriptor
 import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
 import software.amazon.smithy.swift.codegen.integration.httpResponse.HTTPResponseBindingRenderable
 
-interface HTTPResponseTraitPayloadFactory {
-    fun construct(
-        ctx: ProtocolGenerator.GenerationContext,
-        responseBindings: List<HttpBindingDescriptor>,
-        errorShape: Shape,
-        writer: SwiftWriter,
-        customizations: HTTPProtocolCustomizable,
-    ): HTTPResponseBindingRenderable
-}
-
 class HTTPResponseTraitPayload(
     val ctx: ProtocolGenerator.GenerationContext,
     val responseBindings: List<HttpBindingDescriptor>,

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/httpResponse/bindingTraits/HTTPResponseTraitWithHTTPPayload.kt

@@ -86,6 +86,7 @@ class HTTPResponseTraitWithHTTPPayload(
             ShapeType.STRUCTURE, ShapeType.UNION -> {
                 if (target.hasTrait<StreamingTrait>()) {
                     writer.openBlock("if case .stream(let stream) = httpResponse.body {", "}") {
+                        writer.addImport(customizations.messageDecoderSymbol.namespace)
                         writer.write("let messageDecoder = \$N()", customizations.messageDecoderSymbol)
                         writer.write(
                             "let decoderStream = \$N(stream: stream, messageDecoder: messageDecoder, unmarshalClosure: \$N.unmarshal)",

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/httpResponse/bindingTraits/HTTPResponseTraitWithoutHTTPPayload.kt

@@ -52,6 +52,7 @@ class HTTPResponseTraitWithoutHTTPPayload(
         when (shape.type) {
             ShapeType.UNION -> {
                 writer.openBlock("if case let .stream(stream) = httpResponse.body {", "}") {
+                    writer.addImport(customizations.messageDecoderSymbol.namespace)
                     writer.write("let messageDecoder = \$N()", customizations.messageDecoderSymbol)
                     writer.write(
                         "let decoderStream = \$L<\$N>(stream: stream, messageDecoder: messageDecoder, unmarshalClosure: \$N.unmarshal)",

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

@@ -157,7 +157,7 @@ class OperationInputBodyMiddleware(
 
     private fun addEventStreamMiddleware(writer: SwiftWriter, operationStackName: String, inputSymbol: Symbol, outputSymbol: Symbol, payloadSymbol: Symbol, keyPath: String, defaultBody: String, requestWireProtocol: WireProtocol, sendInitialRequest: Boolean) {
         if (sendInitialRequest) {
-            writer.write("let initialRequestMessage = try input.makeInitialRequestMessage(encoder: encoder)")
+            writer.write("let initialRequestMessage = try input.makeInitialRequestMessage()")
         }
         writer.write(
             "\$L.\$L.intercept(position: \$L, middleware: \$N<\$N, \$N, \$N>(keyPath: \$L, defaultBody: \$L, marshalClosure: \$N.marshal\$L))",

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

@@ -41,17 +41,18 @@ class InitialRequestIntegration : SwiftIntegration {
                 .build()
             protocolGenerationContext.delegator.useShapeWriter(inputStruct) { writer ->
                 writer.apply {
-                    addImport(SwiftDependency.CLIENT_RUNTIME.target)
-                    openBlock("extension ${symbol.fullName} {", "}") {
+                    addImport(protocolGenerationContext.service.writerSymbol.namespace)
+                    openBlock("extension \$N {", "}", symbol) {
+                        writer.addImport(SwiftDependency.CLIENT_RUNTIME.target)
                         openBlock(
-                            "func makeInitialRequestMessage(encoder: ClientRuntime.RequestEncoder) throws -> EventStream.Message {",
+                            "func makeInitialRequestMessage() throws -> EventStream.Message {",
                             "}"
                         ) {
                             val nodeInfoUtils = NodeInfoUtils(protocolGenerationContext, writer, protocolGenerationContext.service.requestWireProtocol)
                             val rootNodeInfo = nodeInfoUtils.nodeInfo(it, true)
                             val valueWritingClosure = WritingClosureUtils(protocolGenerationContext, writer).writingClosure(it)
                             writer.write("let writer = \$N(nodeInfo: \$L)", protocolGenerationContext.service.writerSymbol, rootNodeInfo)
-                            writer.write("try writer.write(self, writingClosure: \$L)", valueWritingClosure)
+                            writer.write("try writer.write(self, with: \$L)", valueWritingClosure)
                             writer.write("let initialRequestPayload = try writer.data()")
                             openBlock(
                                 "let initialRequestMessage = EventStream.Message(",