fix multipart/form-data in Swift (#231)

## 🧰 Changes

- fix argument name

## 🧬 QA & Testing

I fixed test code in
`/httpsnippet/src/targets/swift/urlsession/fixtures/`

`npm run test`

src/targets/swift/urlsession/client.ts

@@ -63,7 +63,7 @@ export const urlsession: Client<UrlsessionOptions> = {
 
         case 'application/json':
           if (postData.jsonObj) {
-            push(`${literalDeclaration('parameters', postData.jsonObj, opts)} as [String : Any]`);
+            push(`${literalDeclaration('parameters', postData.jsonObj, opts)} as [String : Any?]`);
             blank();
             push('let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])');
             blank();
@@ -87,7 +87,7 @@ export const urlsession: Client<UrlsessionOptions> = {
           push('body += "--\\(boundary)\\r\\n"', 1);
           push('body += "Content-Disposition:form-data; name=\\"\\(paramName)\\""', 1);
           push('if let filename = param["fileName"] {', 1);
-          push('let contentType = param["content-type"]!', 2);
+          push('let contentType = param["contentType"]!', 2);
           push('let fileContent = try String(contentsOfFile: filename, encoding: .utf8)', 2);
           push('body += "; filename=\\"\\(filename)\\"\\r\\n"', 2);
           push('body += "Content-Type: \\(contentType)\\r\\n\\r\\n"', 2);
@@ -150,7 +150,7 @@ export const urlsession: Client<UrlsessionOptions> = {
 
     blank();
 
-    push('let (data, response) = try await URLSession.shared.data(for: request)');
+    push('let (data, _) = try await URLSession.shared.data(for: request)');
     push('print(String(decoding: data, as: UTF8.self))');
 
     return join();

src/targets/swift/urlsession/fixtures/application-form-encoded.swift

@@ -14,5 +14,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/x-www-form-urlencoded"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/application-json.swift

@@ -7,7 +7,7 @@ let parameters = [
   "nested": ["a": "b"],
   "arr_mix": [1, "a", ["arr_mix_nested": []]],
   "boolean": false
-] as [String : Any]
+] as [String : Any?]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
@@ -18,5 +18,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/cookies.swift

@@ -6,5 +6,5 @@ request.httpMethod = "GET"
 request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["cookie": "foo=bar; bar=baz"]
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/custom-method.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "PROPFIND"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/full.swift

@@ -26,5 +26,5 @@ request.allHTTPHeaderFields = [
 ]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/headers.swift

@@ -11,5 +11,5 @@ request.allHTTPHeaderFields = [
   "quoted-value": "\"quoted\" 'string'"
 ]
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/http-insecure.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/indent-option.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/json-null-value.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-let parameters = ["foo": nil] as [String : Any]
+let parameters = ["foo": nil] as [String : Any?]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
@@ -11,5 +11,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/jsonObj-multiline.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-let parameters = ["foo": "bar"] as [String : Any]
+let parameters = ["foo": "bar"] as [String : Any?]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
@@ -11,5 +11,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/jsonObj-null-value.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-let parameters = ["foo": nil] as [String : Any]
+let parameters = ["foo": nil] as [String : Any?]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
@@ -11,5 +11,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/multipart-data.swift

@@ -21,7 +21,7 @@ for param in parameters {
   body += "--\(boundary)\r\n"
   body += "Content-Disposition:form-data; name=\"\(paramName)\""
   if let filename = param["fileName"] {
-    let contentType = param["content-type"]!
+    let contentType = param["contentType"]!
     let fileContent = try String(contentsOfFile: filename, encoding: .utf8)
     body += "; filename=\"\(filename)\"\r\n"
     body += "Content-Type: \(contentType)\r\n\r\n"
@@ -40,5 +40,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "multipart/form-data; boundary=---011000010111000001101001"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/multipart-file.swift

@@ -16,7 +16,7 @@ for param in parameters {
   body += "--\(boundary)\r\n"
   body += "Content-Disposition:form-data; name=\"\(paramName)\""
   if let filename = param["fileName"] {
-    let contentType = param["content-type"]!
+    let contentType = param["contentType"]!
     let fileContent = try String(contentsOfFile: filename, encoding: .utf8)
     body += "; filename=\"\(filename)\"\r\n"
     body += "Content-Type: \(contentType)\r\n\r\n"
@@ -35,5 +35,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "multipart/form-data; boundary=---011000010111000001101001"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/multipart-form-data-no-params.swift

@@ -6,5 +6,5 @@ request.httpMethod = "POST"
 request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["Content-Type": "multipart/form-data"]
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/multipart-form-data.swift

@@ -15,7 +15,7 @@ for param in parameters {
   body += "--\(boundary)\r\n"
   body += "Content-Disposition:form-data; name=\"\(paramName)\""
   if let filename = param["fileName"] {
-    let contentType = param["content-type"]!
+    let contentType = param["contentType"]!
     let fileContent = try String(contentsOfFile: filename, encoding: .utf8)
     body += "; filename=\"\(filename)\"\r\n"
     body += "Content-Type: \(contentType)\r\n\r\n"
@@ -34,5 +34,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["Content-Type": "multipart/form-data; boundary=---011000010111000001101001"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/nested.swift

@@ -13,5 +13,5 @@ var request = URLRequest(url: components.url!)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/postdata-malformed.swift

@@ -6,5 +6,5 @@ request.httpMethod = "POST"
 request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "application/json"]
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/pretty-option.swift

@@ -20,5 +20,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["cookie": "foo=bar; bar=baz", "accept": "application/json", "content-type": "application/x-www-form-urlencoded"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/query-encoded.swift

@@ -12,5 +12,5 @@ var request = URLRequest(url: components.url!)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/query.swift

@@ -14,5 +14,5 @@ var request = URLRequest(url: components.url!)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/short.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.timeoutInterval = 10
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/text-plain.swift

@@ -9,5 +9,5 @@ request.timeoutInterval = 10
 request.allHTTPHeaderFields = ["content-type": "text/plain"]
 request.httpBody = postData
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))

src/targets/swift/urlsession/fixtures/timeout-option.swift

@@ -5,5 +5,5 @@ var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.timeoutInterval = 5
 
-let (data, response) = try await URLSession.shared.data(for: request)
+let (data, _) = try await URLSession.shared.data(for: request)
 print(String(decoding: data, as: UTF8.self))