More PR comments; rebase on top of #91

Author: natanrolnik

Sources/AWSLambdaEvents/APIGateway+V2.swift

@@ -126,6 +126,8 @@ public struct APIGatewayV2Request: Encodable, Sendable {
     }
 }
 
+extension APIGatewayV2Request: DecodableRequest {}
+
 public struct APIGatewayV2Response: Codable, Sendable {
     public var statusCode: HTTPResponse.Status
     public var headers: HTTPHeaders?
@@ -148,6 +150,8 @@ public struct APIGatewayV2Response: Codable, Sendable {
     }
 }
 
+extension APIGatewayV2Response: EncodableResponse {}
+
 extension APIGatewayV2Request: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)

Sources/AWSLambdaEvents/Codable Helpers/DecodableRequest.swift

@@ -73,6 +73,3 @@ extension DecodableRequest {
         return try decoder.decode(T.self, from: requestData)
     }
 }
-
-extension APIGatewayV2Request: DecodableRequest {}
-extension FunctionURLRequest: DecodableRequest {}

Sources/AWSLambdaEvents/Codable Helpers/EncodableResponse.swift

@@ -34,8 +34,8 @@ public protocol EncodableResponse {
         statusCode: HTTPResponse.Status,
         headers: HTTPHeaders?,
         body: String?,
-        cookies: [String]?,
-        isBase64Encoded: Bool?
+        isBase64Encoded: Bool?,
+        cookies: [String]?
     )
 }
 
@@ -66,8 +66,8 @@ extension EncodableResponse {
                 statusCode: status,
                 headers: headers,
                 body: String(data: encodedResponse, encoding: .utf8),
-                cookies: cookies,
-                isBase64Encoded: nil
+                isBase64Encoded: nil,
+                cookies: cookies
             )
         } catch {
             return onError(error)
@@ -80,28 +80,9 @@ extension EncodableResponse {
                 statusCode: .internalServerError,
                 headers: nil,
                 body: "Internal Server Error: \(String(describing: error))",
-                cookies: nil,
-                isBase64Encoded: nil
+                isBase64Encoded: nil,
+                cookies: nil
             )
         }
     }
 }
-
-extension APIGatewayV2Response: EncodableResponse {
-    public init(
-        statusCode: HTTPResponse.Status,
-        headers: HTTPHeaders?,
-        body: String?,
-        cookies: [String]?,
-        isBase64Encoded: Bool?
-    ) {
-        self.init(
-            statusCode: statusCode,
-            headers: headers,
-            body: body,
-            isBase64Encoded: isBase64Encoded,
-            cookies: cookies
-        )
-    }
-}
-extension FunctionURLResponse: EncodableResponse {}

Sources/AWSLambdaEvents/FunctionURL.swift

@@ -83,6 +83,8 @@ public struct FunctionURLRequest: Codable, Sendable {
     public let stageVariables: [String: String]?
 }
 
+extension FunctionURLRequest: DecodableRequest {}
+
 // MARK: - Response -
 
 public struct FunctionURLResponse: Codable, Sendable {
@@ -121,3 +123,5 @@ public struct FunctionURLResponse: Codable, Sendable {
         self.isBase64Encoded = isBase64Encoded
     }
 }
+
+extension FunctionURLResponse: EncodableResponse {}