diff --git a/package-lock.json b/package-lock.json index ae10d151d..42c18d787 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@readme/httpsnippet", - "version": "10.0.4", + "version": "10.0.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@readme/httpsnippet", - "version": "10.0.4", + "version": "10.0.5", "license": "MIT", "dependencies": { "qs": "^6.11.2", diff --git a/package.json b/package.json index 3ad41effa..9db428ebd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@readme/httpsnippet", - "version": "10.0.4", + "version": "10.0.5", "description": "HTTP Request snippet generator for *most* languages", "homepage": "https://github.com/readmeio/httpsnippet", "license": "MIT", diff --git a/src/targets/swift/urlsession/client.ts b/src/targets/swift/urlsession/client.ts index ec0b7c9a5..f133aad5d 100644 --- a/src/targets/swift/urlsession/client.ts +++ b/src/targets/swift/urlsession/client.ts @@ -63,7 +63,7 @@ export const urlsession: Client = { 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 = { 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 = { 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(); diff --git a/src/targets/swift/urlsession/fixtures/application-form-encoded.swift b/src/targets/swift/urlsession/fixtures/application-form-encoded.swift index 96b417cec..b79554db0 100644 --- a/src/targets/swift/urlsession/fixtures/application-form-encoded.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/application-json.swift b/src/targets/swift/urlsession/fixtures/application-json.swift index 40eebf951..39508bf62 100644 --- a/src/targets/swift/urlsession/fixtures/application-json.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/cookies.swift b/src/targets/swift/urlsession/fixtures/cookies.swift index 7ffaac8d7..cd1ea1906 100644 --- a/src/targets/swift/urlsession/fixtures/cookies.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/custom-method.swift b/src/targets/swift/urlsession/fixtures/custom-method.swift index ca11226f2..118ff4933 100644 --- a/src/targets/swift/urlsession/fixtures/custom-method.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/full.swift b/src/targets/swift/urlsession/fixtures/full.swift index 51546cf0a..65ca5fcac 100644 --- a/src/targets/swift/urlsession/fixtures/full.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/headers.swift b/src/targets/swift/urlsession/fixtures/headers.swift index 7bb9413bb..3a48c3d7d 100644 --- a/src/targets/swift/urlsession/fixtures/headers.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/http-insecure.swift b/src/targets/swift/urlsession/fixtures/http-insecure.swift index 35f8cedce..ec6724995 100644 --- a/src/targets/swift/urlsession/fixtures/http-insecure.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/indent-option.swift b/src/targets/swift/urlsession/fixtures/indent-option.swift index 57129ea4d..3a536dee1 100644 --- a/src/targets/swift/urlsession/fixtures/indent-option.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/json-null-value.swift b/src/targets/swift/urlsession/fixtures/json-null-value.swift index d34f232af..05c778801 100644 --- a/src/targets/swift/urlsession/fixtures/json-null-value.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/jsonObj-multiline.swift b/src/targets/swift/urlsession/fixtures/jsonObj-multiline.swift index 34e3bf2c8..9d52037e9 100644 --- a/src/targets/swift/urlsession/fixtures/jsonObj-multiline.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/jsonObj-null-value.swift b/src/targets/swift/urlsession/fixtures/jsonObj-null-value.swift index d34f232af..05c778801 100644 --- a/src/targets/swift/urlsession/fixtures/jsonObj-null-value.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/multipart-data.swift b/src/targets/swift/urlsession/fixtures/multipart-data.swift index 56a45a881..caa96a7ea 100644 --- a/src/targets/swift/urlsession/fixtures/multipart-data.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/multipart-file.swift b/src/targets/swift/urlsession/fixtures/multipart-file.swift index 19a5bbede..56ad78d56 100644 --- a/src/targets/swift/urlsession/fixtures/multipart-file.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/multipart-form-data-no-params.swift b/src/targets/swift/urlsession/fixtures/multipart-form-data-no-params.swift index 3e6dc16d7..5b0f3e986 100644 --- a/src/targets/swift/urlsession/fixtures/multipart-form-data-no-params.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/multipart-form-data.swift b/src/targets/swift/urlsession/fixtures/multipart-form-data.swift index ec50e6d8f..c31e98f87 100644 --- a/src/targets/swift/urlsession/fixtures/multipart-form-data.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/nested.swift b/src/targets/swift/urlsession/fixtures/nested.swift index f512fef8e..ead43cc60 100644 --- a/src/targets/swift/urlsession/fixtures/nested.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/postdata-malformed.swift b/src/targets/swift/urlsession/fixtures/postdata-malformed.swift index d3e7ff6e6..70f169a07 100644 --- a/src/targets/swift/urlsession/fixtures/postdata-malformed.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/pretty-option.swift b/src/targets/swift/urlsession/fixtures/pretty-option.swift index fbf550675..5af163617 100644 --- a/src/targets/swift/urlsession/fixtures/pretty-option.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/query-encoded.swift b/src/targets/swift/urlsession/fixtures/query-encoded.swift index dc249497f..9c62da4e5 100644 --- a/src/targets/swift/urlsession/fixtures/query-encoded.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/query.swift b/src/targets/swift/urlsession/fixtures/query.swift index 230b7ab0a..66cb4c12f 100644 --- a/src/targets/swift/urlsession/fixtures/query.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/short.swift b/src/targets/swift/urlsession/fixtures/short.swift index 57129ea4d..3a536dee1 100644 --- a/src/targets/swift/urlsession/fixtures/short.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/text-plain.swift b/src/targets/swift/urlsession/fixtures/text-plain.swift index 4a3fa9cf4..9fb8c0d67 100644 --- a/src/targets/swift/urlsession/fixtures/text-plain.swift +++ b/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)) \ No newline at end of file diff --git a/src/targets/swift/urlsession/fixtures/timeout-option.swift b/src/targets/swift/urlsession/fixtures/timeout-option.swift index 110a85fee..0ed67b65c 100644 --- a/src/targets/swift/urlsession/fixtures/timeout-option.swift +++ b/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)) \ No newline at end of file