fix conversation

Signed-off-by: PhongND <phongnd@ftech.ai>
FullStack-Swift · Oct 6, 2023 · bdb482f · bdb482f
1 parent 23e446c
commit bdb482f
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 8 deletions.
diff --git a/...m/xcode/package.xcworkspace/xcuserdata/phongnd.xcuserdatad/UserInterfaceState.xcuserstate b/...m/xcode/package.xcworkspace/xcuserdata/phongnd.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Sources/BuildRequest/Core/RequestProtocol.swift b/Sources/BuildRequest/Core/RequestProtocol.swift
@@ -101,14 +101,7 @@ extension RequestProtocol {
 
   public func executing(request: inout URLRequest, requests: [RequestProtocol] = []) {
     if requests.isEmpty { return }
-//    var items: [RequestProtocol] = []
-//    items.append(contentsOf: requests.filter({$0 is RUrl}))
-//    items.append(contentsOf: requests.filter({$0 is RPath}))
-//    items.append(contentsOf: requests.filter({!($0 is RUrl || $0 is REncoding || $0 is RPath)}))
-//    items.append(contentsOf: requests.filter({$0 is REncoding}))
-
     let items: [RequestProtocol] = requests.cRequests()
-    /// build
     items.forEach {
       $0.build(request: &request)
     }

diff --git a/Sources/BuildRequest/RequestBuilds/RQueryItems.swift b/Sources/BuildRequest/RequestBuilds/RQueryItems.swift
@@ -20,6 +20,14 @@ public struct RQueryItems: RequestProtocol {
     } ?? []
   }
 
+  public init(_ queryItem: Data? = nil) {
+    self.init(queryItem?.toDictionary())
+  }
+
+  public init(_ queryItem: String? = nil) {
+    self.init(queryItem?.toDictionary())
+  }
+
   public init(_ params: [RQueryItem]) {
     self.children = params
   }
@@ -29,6 +37,18 @@ extension RQueryItems {
   public init(_ initial: () -> [String: Any]?) {
     self.init(initial())
   }
+
+  public init(_ initial: () -> Data?) {
+    self.init(initial()?.toDictionary())
+  }
+
+  public init(_ initial: () -> String?) {
+    self.init(initial()?.toDictionary())
+  }
+
+  public init(_ initial: () -> [RQueryItem]) {
+    self.init(initial())
+  }
 }
 
 extension RQueryItems {

diff --git a/Sources/BuildRequest/RequestBuilds/RUrl.swift b/Sources/BuildRequest/RequestBuilds/RUrl.swift
@@ -1,7 +1,8 @@
 import Foundation
 
 public struct RUrl: RequestProtocol {
-  private let urlString: String
+
+  public var urlString: String
 
   public init(_ urlString: String) {
     self.urlString = urlString
@@ -13,6 +14,18 @@ public struct RUrl: RequestProtocol {
 }
 
 extension RUrl {
+
+  /// Init with computed closure
+  ///```swift
+  ///RUrl("path")
+  ///   .withPath("otherPaht")
+  ///   .with {
+  ///     $0.urlString += "other" // updating urlstring
+  ///     print($0.urlString)
+  ///   }
+  ///
+  ///```
+  /// - Parameter initial: A closure return a string url.
   public init(_ initial: () -> String) {
     self.init(initial())
   }

diff --git a/Tests/BuildRequestTests/BuildRequestTest.swift b/Tests/BuildRequestTests/BuildRequestTest.swift
@@ -211,4 +211,10 @@ final class BuildRequestTest: XCTestCase {
     let sequence = _SequenceMany(requests: requests)
     print(sequence)
   }
+
+  func test_rurl() {
+    let url = RUrl("")
+      .withPath("ABC")
+      .with { $0.path }
+  }
 }