fix declaration location url

src/targets/swift/urlsession/client.ts

@@ -122,11 +122,13 @@ export const urlsession: Client<UrlsessionOptions> = {
 
     blank();
 
+    push(`let url = URL(string: "${uriObj.href}")!`);
+
     const queries = queryObj ? Object.entries(queryObj) : [];
     if (queries.length < 1) {
-      push(`var request = URLRequest(url: URL(string: "${uriObj.href}")!)`);
+      push('var request = URLRequest(url: url)');
     } else {
-      push(`var components = URLComponents(url: URL(string: "${uriObj.href}")!, resolvingAgainstBaseURL: true)!`);
+      push('var components = URLComponents(url: url, resolvingAgainstBaseURL: true)!');
       push('let queryItems: [URLQueryItem] = [');
 
       queries.forEach(query => {

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

@@ -8,7 +8,8 @@ let headers = ["content-type": "application/x-www-form-urlencoded"]
 var postData = Data("foo=bar".utf8)
 postData.append(Data("&hello=world".utf8))
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -15,7 +15,8 @@ let parameters = [
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -5,7 +5,8 @@ import Foundation
 
 let headers = ["cookie": "foo=bar; bar=baz"]
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/cookies")!)
+let url = URL(string: "https://httpbin.org/cookies")!
+var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.allHTTPHeaderFields = headers
 

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

@@ -3,7 +3,8 @@ import Foundation
   import FoundationNetworking
 #endif
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "PROPFIND"
 
 let (data, response) = try await URLSession.shared.data(for: request)

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

@@ -11,7 +11,8 @@ let headers = [
 
 let postData = Data("foo=bar".utf8)
 
-var components = URLComponents(url: URL(string: "https://httpbin.org/anything?key=value")!, resolvingAgainstBaseURL: true)!
+let url = URL(string: "https://httpbin.org/anything?key=value")!
+var components = URLComponents(url: url, resolvingAgainstBaseURL: true)!
 let queryItems: [URLQueryItem] = [
   URLQueryItem(name: "foo", value: "bar"),
   URLQueryItem(name: "foo", value: "baz"),

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

@@ -10,7 +10,8 @@ let headers = [
   "quoted-value": "\"quoted\" 'string'"
 ]
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/headers")!)
+let url = URL(string: "https://httpbin.org/headers")!
+var request = URLRequest(url: url)
 request.httpMethod = "GET"
 request.allHTTPHeaderFields = headers
 

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

@@ -3,7 +3,8 @@ import Foundation
   import FoundationNetworking
 #endif
 
-var request = URLRequest(url: URL(string: "http://httpbin.org/anything")!)
+let url = URL(string: "http://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "GET"
 
 let (data, response) = try await URLSession.shared.data(for: request)

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

@@ -3,7 +3,8 @@ import Foundation
   import FoundationNetworking
 #endif
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "GET"
 
 let (data, response) = try await URLSession.shared.data(for: request)

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

@@ -8,7 +8,8 @@ let parameters = ["foo": nil] as [String : Any]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -8,7 +8,8 @@ let parameters = ["foo": "bar"] as [String : Any]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -8,7 +8,8 @@ let parameters = ["foo": nil] as [String : Any]
 
 let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -39,7 +39,8 @@ for param in parameters {
   }
 }
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -34,7 +34,8 @@ for param in parameters {
   }
 }
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -5,7 +5,8 @@ import Foundation
 
 let headers = ["Content-Type": "multipart/form-data"]
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 

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

@@ -33,7 +33,8 @@ for param in parameters {
   }
 }
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -3,7 +3,8 @@ import Foundation
   import FoundationNetworking
 #endif
 
-var components = URLComponents(url: URL(string: "https://httpbin.org/anything")!, resolvingAgainstBaseURL: true)!
+let url = URL(string: "https://httpbin.org/anything")!
+var components = URLComponents(url: url, resolvingAgainstBaseURL: true)!
 let queryItems: [URLQueryItem] = [
   URLQueryItem(name: "foo[bar]", value: "baz,zap"),
   URLQueryItem(name: "fiz", value: "buz"),

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

@@ -5,7 +5,8 @@ import Foundation
 
 let headers = ["content-type": "application/json"]
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 

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

@@ -7,7 +7,8 @@ let headers = ["cookie": "foo=bar; bar=baz", "accept": "application/json", "cont
 
 let postData = Data("foo=bar".utf8)
 
-var components = URLComponents(url: URL(string: "https://httpbin.org/anything?key=value")!, resolvingAgainstBaseURL: true)!
+let url = URL(string: "https://httpbin.org/anything?key=value")!
+var components = URLComponents(url: url, resolvingAgainstBaseURL: true)!
 let queryItems: [URLQueryItem] = [
   URLQueryItem(name: "foo", value: "bar"),
   URLQueryItem(name: "foo", value: "baz"),

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

@@ -3,7 +3,8 @@ import Foundation
   import FoundationNetworking
 #endif
 
-var components = URLComponents(url: URL(string: "https://httpbin.org/anything")!, resolvingAgainstBaseURL: true)!
+let url = URL(string: "https://httpbin.org/anything")!
+var components = URLComponents(url: url, resolvingAgainstBaseURL: true)!
 let queryItems: [URLQueryItem] = [
   URLQueryItem(name: "startTime", value: "2019-06-13T19%3A08%3A25.455Z"),
   URLQueryItem(name: "endTime", value: "2015-09-15T14%3A00%3A12-04%3A00"),

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

@@ -3,7 +3,8 @@ import Foundation
   import FoundationNetworking
 #endif
 
-var components = URLComponents(url: URL(string: "https://httpbin.org/anything?key=value")!, resolvingAgainstBaseURL: true)!
+let url = URL(string: "https://httpbin.org/anything?key=value")!
+var components = URLComponents(url: url, resolvingAgainstBaseURL: true)!
 let queryItems: [URLQueryItem] = [
   URLQueryItem(name: "foo", value: "bar"),
   URLQueryItem(name: "foo", value: "baz"),

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

@@ -3,7 +3,8 @@ import Foundation
   import FoundationNetworking
 #endif
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "GET"
 
 let (data, response) = try await URLSession.shared.data(for: request)

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

@@ -7,7 +7,8 @@ let headers = ["content-type": "text/plain"]
 
 let postData = Data("Hello World".utf8)
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "POST"
 request.allHTTPHeaderFields = headers
 request.httpBody = postData

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

@@ -3,7 +3,8 @@ import Foundation
   import FoundationNetworking
 #endif
 
-var request = URLRequest(url: URL(string: "https://httpbin.org/anything")!)
+let url = URL(string: "https://httpbin.org/anything")!
+var request = URLRequest(url: url)
 request.httpMethod = "GET"
 
 let (data, response) = try await URLSession.shared.data(for: request)