Fix struct the Router parameter for get URLRequest (#6)

* wip

* fix document

Author: devyhan

.swiftpm/xcode/package.xcworkspace/xcuserdata/ijaewon.xcuserdatad/UserInterfaceState.xcuserstate

@@ -236,13 +236,13 @@ enum APIs: RouterProtocol {
 }
 
 // http://api.github.com/orgs/organization/repos
-let listOrganizationRepositoriesUrl = APIs.listOrganizationRepositories(organizationName: "organization").router?.request.urlRequest?.url
+let listOrganizationRepositoriesUrl = APIs.listOrganizationRepositories(organizationName: "organization").request.urlRequest?.url
 
 // http://api.github.com/search/repositories?q=apirouter
-let searchRepositoriesUrl = APIs.searchRepositories(query: "apirouter").router?.request.urlRequest?.url
+let searchRepositoriesUrl = APIs.searchRepositories(query: "apirouter").request.urlRequest?.url
 
 let repositoryInfo: APIs.RepositoryInfo = .init(name: "Hello-World", description: "This is your first repository", homePage: "https://github.com", private: false, hasIssues: true, hasProjects: true, hasWiki: false)
-let request = APIs.createAnOrganizationRepository(organizationName: "SomeOrganization", repositoryInfo: repositoryInfo).router?.request.urlRequest
+let request = APIs.createAnOrganizationRepository(organizationName: "SomeOrganization", repositoryInfo: repositoryInfo).request.urlRequest
 
 URLSession.shared.dataTask(with: request) { data, response, error in
 ...

README.md

@@ -52,6 +52,7 @@ public extension Router {
 
 public struct Router: _RouterProtocol {
   var request: Request
+  public var urlRequest: URLRequest?
 
   public init(_ request: Request) {
     self.request = request
@@ -76,6 +77,8 @@ public struct Request: _RouterProtocol {
     router.request.urlRequest?.httpBody = self.urlRequest?.httpBody
     router.request.urlRequest?.httpMethod = self.urlRequest?.httpMethod
     router.request.urlRequest?.allHTTPHeaderFields = self.urlRequest?.allHTTPHeaderFields
+    
+    router.urlRequest = router.request.urlRequest
   }
 
   private func buildUrl(_ router: inout Router) -> Foundation.URL? {
@@ -99,6 +102,6 @@ public struct BaseURL: _RouterProtocol {
   }
 
   public func build(_ router: inout Router) {
-    router.request.urlRequest = URLRequest(url: Foundation.URL(string: self.url)!)
+    router.request = Request(URLRequest(url: Foundation.URL(string: self.url)!))
   }
 }

Sources/APIRouter/RouterBuilder.swift

@@ -4,7 +4,7 @@ import XCTest
 
 final class RouterBuilderTests: XCTestCase {
   func testGeneratedRouterWithRouterBuilder() {
-    let request = Router {
+    let router = Router {
       Request {
         Body {
           Param("VALUE", forKey: "KEY")
@@ -30,13 +30,13 @@ final class RouterBuilderTests: XCTestCase {
     urlRequest.httpMethod = "GET"
     urlRequest.allHTTPHeaderFields = header
 
-    guard let request = request?.request.urlRequest else { return }
+    guard let request = router?.urlRequest else { return }
 
     XCTAssertEqual(request, urlRequest)
   }
 
   func testGeneratedRouterWithRouterBuilderUsingBaseURL() {
-    let request = Router {
+    let router = Router {
       BaseURL("https://www.baseurl.com")
       Request {
         Body {
@@ -61,7 +61,7 @@ final class RouterBuilderTests: XCTestCase {
     urlRequest.httpMethod = "GET"
     urlRequest.allHTTPHeaderFields = header
 
-    guard let request = request?.request.urlRequest else { return }
+    guard let request = router?.urlRequest else { return }
 
     XCTAssertEqual(request, urlRequest)
   }
@@ -121,8 +121,8 @@ final class RouterBuilderTests: XCTestCase {
     optionTwoUrlRequest.httpMethod = "GET"
     optionTwoUrlRequest.allHTTPHeaderFields = header
 
-    guard let optionOneRequest = APIRouter.one.router?.request.urlRequest else { return }
-    guard let optionTwoRequest = APIRouter.two.router?.request.urlRequest else { return }
+    guard let optionOneRequest = APIRouter.one.router?.urlRequest else { return }
+    guard let optionTwoRequest = APIRouter.two.router?.urlRequest else { return }
 
     XCTAssertEqual(optionOneRequest, optionOneUrlRequest)
     XCTAssertEqual(optionTwoRequest, optionTwoUrlRequest)