Updated With Publisher Kit Support

Package.resolved

@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "PublisherKit",
+        "repositoryURL": "https://github.com/ragzy15/PublisherKit",
+        "state": {
+          "branch": null,
+          "revision": "ad211780f0f532a473e3d5d1cef2a2644024d7c4",
+          "version": "1.0.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Package.swift

@@ -18,6 +18,7 @@ let package = Package(
             targets: ["NetworkKit"]),
     ],
     dependencies: [
+        .package(url: "https://github.com/ragzy15/PublisherKit", from: .init(1, 0, 0))
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
     ],
@@ -26,7 +27,7 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "NetworkKit",
-            dependencies: []),
+            dependencies: ["PublisherKit"]),
         .testTarget(
             name: "NetworkKitTests",
             dependencies: ["NetworkKit"]),

Sources/NetworkKit/Create Request/Create Request.swift

@@ -15,7 +15,7 @@ public struct CreateRequest {
 
     public let request: URLRequest
 
-    public init?(with connection: ConnectionRepresentable, query urlQuery: URLQuery?) {
+    public init?(with connection: ConnectionRepresentable, query urlQuery: Set<URLQueryItem>, body: Data?, headers: HTTPHeaderParameters) {
 
         var components = URLComponents()
         components.scheme = connection.scheme.rawValue
@@ -26,15 +26,15 @@ public struct CreateRequest {
         components.host = (subURL.isEmpty ? subURL : subURL + ".") + connection.host.host
         components.path = endPoint + connection.path
 
-        var queryItems: [URLQueryItem] = []
-        queryItems.addURLQuery(query: urlQuery)
+        var queryItems = Set<URLQueryItem>()
         queryItems.addURLQuery(query: connection.defaultQuery)
         queryItems.addURLQuery(query: connection.host.defaultUrlQuery)
+        queryItems = queryItems.union(urlQuery)
 
         let method = connection.method
 
         if !queryItems.isEmpty {
-            components.queryItems = queryItems
+            components.queryItems = Array(queryItems)
         }
 
         guard let url = components.url else {
@@ -47,15 +47,15 @@ public struct CreateRequest {
         let defaultHeaderFields = connection.host.defaultHeaders
         let connectionHeaderFields = connection.httpHeaders
 
-        let headerFields = defaultHeaderFields.merging(connectionHeaderFields) { (_, new) in new }
+        var headerFields = defaultHeaderFields.merging(connectionHeaderFields) { (_, new) in new }
+        headerFields.merge(headers) { (_, new) in new }
 
         if !headerFields.isEmpty {
             urlRequest.allHTTPHeaderFields = headerFields
         }
+
+        urlRequest.httpBody = body
         request = urlRequest
 
-        #if DEBUG
-        DebugPrint.logAPIRequest(request: request, apiName: connection.name)
-        #endif
     }
 }

Sources/NetworkKit/Debug Loging/NKLogger.swift

@@ -0,0 +1,226 @@
+//
+//  NKLogger.swift
+//  NetworkKit
+//
+//  Created by Raghav Ahuja on 18/10/19.
+//  Copyright © 2019 Raghav Ahuja. All rights reserved.
+//
+
+import Foundation
+
+final public class NKLogger {
+
+    /// Allows Logs to be Printed in Debug Console.
+    /// Default value is `true`
+    public var isLoggingEnabled: Bool = true
+
+    public static let `default` = NKLogger()
+
+    /**
+     Creates a `NKLogger`.
+     */
+    public init() { }
+
+    /**
+     Writes the textual representations of the given items into the standard output.
+     
+     - parameter items: Zero or more items to print..
+     - parameter separator: A string to print between each item. The default is a single space (" ").
+     - parameter terminator: The string to print after all items have been printed. The default is a newline ("\n").
+     
+     */
+    func print(_ items: Any..., separator: String = " ", terminator: String = "\n") {
+        #if DEBUG
+        guard NKConfiguration.allowLoggingOnAllSessions, isLoggingEnabled else { return }
+        Swift.print(items, separator: separator, terminator: terminator)
+        #endif
+    }
+
+    /**
+     Writes the textual representations of the given items most suitable for debugging into the standard output.
+     
+     - parameter items: Zero or more items to print.
+     - parameter separator: A string to print between each item. The default is a single space (" ").
+     - parameter terminator: The string to print after all items have been printed. The default is a newline ("\n").
+     
+     */
+    func debugPrint(_ items: Any..., separator: String = " ", terminator: String = "\n") {
+        #if DEBUG
+        guard NKConfiguration.allowLoggingOnAllSessions, isLoggingEnabled else { return }
+        Swift.debugPrint(items, separator: separator, terminator: terminator)
+        #endif
+    }
+
+    /**
+     Handles APIRequest logging sent by the `NetworkKit`.
+     
+     - parameter request: URLRequest
+     - parameter apiName: API name.
+     */
+    func logAPIRequest(request: URLRequest?, apiName: String?) {
+        #if DEBUG
+        guard NKConfiguration.allowLoggingOnAllSessions, isLoggingEnabled else { return }
+
+        Swift.print(
+            """
+            ------------------------------------------------------------
+            API Call Request for:
+            Name: \(apiName ?? "nil")
+            \(request?.debugDescription ?? "")
+            
+            """
+        )
+        #endif
+    }
+
+    /**
+     Print JSON sent by the `NetworkKit`.
+     
+     - parameter data: Input Type to be printed
+     - parameter apiName: API name.
+     */
+    func printJSON<Input>(data: Input, apiName: String) {
+        #if DEBUG
+        guard NKConfiguration.allowLoggingOnAllSessions, isLoggingEnabled else { return }
+        guard let data = data as? Data else {
+            return
+        }
+
+        do {
+            let object = try JSONSerialization.jsonObject(with: data, options: [])
+            let newData = try JSONSerialization.data(withJSONObject: object, options: .prettyPrinted)
+
+//            Swift.print(
+//                """
+//                ------------------------------------------------------------
+//                Printing JSON for:
+//                API Name: \(apiName)
+//                JSON:
+//
+            //                """)
+            Swift.print("""
+                    ------------------------------------------------------------
+                    JSON:
+                           
+                    """)
+            Swift.print(String(data: newData, encoding: .utf8) ?? "nil")
+            Swift.print("------------------------------------------------------------")
+
+        } catch {
+
+        }
+        #endif
+    }
+
+    /**
+     Handles errors sent by the `NetworkKit`.
+     
+     - parameter error: Error occurred.
+     - parameter file: Source file name.
+     - parameter line: Source line number.
+     - parameter function: Source function name.
+     */
+    @inline(__always)
+    func log(error: Error, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
+        #if DEBUG
+        guard NKConfiguration.allowLoggingOnAllSessions, isLoggingEnabled else { return }
+
+        Swift.print("⚠️ [NetworkKit: Error] \((String(describing: file) as NSString).lastPathComponent):\(line) \(function)\n  ↪︎ \(error as NSError)\n")
+        #endif
+    }
+
+    /**
+     Handles assertions made throughout the `NetworkKit`.
+     
+     - parameter condition: Assertion condition.
+     - parameter message: Assertion failure message.
+     - parameter file: Source file name.
+     - parameter line: Source line number.
+     - parameter function: Source function name.
+     */
+    @inline(__always)
+    func assert(_ condition: @autoclosure () -> Bool, _ message: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
+
+        #if DEBUG
+        let condition = condition()
+
+        if condition { return }
+
+        let message = message()
+
+        Swift.print("❗ [NetworkKit: Assertion Failure] \((String(describing: file) as NSString).lastPathComponent):\(line) \(function)\n  ↪︎ \(message)\n")
+        Swift.assert(condition, message, file: file, line: line)
+        #endif
+    }
+
+    /**
+     Handles assertion failures made throughout the `NetworkKit`.
+     
+     - parameter message: Assertion failure message.
+     - parameter file: Source file name.
+     - parameter line: Source line number.
+     - parameter function: Source function name.
+     */
+    @inlinable public func assertionFailure(_ message: @autoclosure () -> String = String(), file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
+        let message = message()
+        Swift.print("❗ [NetworkKit: Assertion Failure] \((String(describing: file) as NSString).lastPathComponent):\(line) \(function)\n  ↪︎ \(message)\n")
+        Swift.assertionFailure(message, file: file, line: line)
+    }
+
+    /**
+     Handles precondition failures made throughout the `NetworkKit`.
+     
+     - parameter message: Assertion failure message.
+     - parameter file: Source file name.
+     - parameter line: Source line number.
+     - parameter function: Source function name.
+     */
+    @inlinable public func preconditionFailure(_ message: @autoclosure () -> String = String(), file: StaticString = #file, line: UInt = #line, function: StaticString = #function) -> Never {
+        let message = message()
+        Swift.print("❗ [NetworkKit: Assertion Failure] \((String(describing: file) as NSString).lastPathComponent):\(line) \(function)\n  ↪︎ \(message)\n")
+        Swift.preconditionFailure(message, file: file, line: line)
+    }
+
+    /**
+     Handles preconditions made throughout the `NetworkKit`.
+     
+     - parameter condition: Precondition to be satisfied.
+     - parameter message: Precondition failure message.
+     - parameter file: Source file name.
+     - parameter line: Source line number.
+     - parameter function: Source function name.
+     */
+    @inline(__always)
+    func precondition(_ condition: @autoclosure () -> Bool, _ message: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
+
+        #if DEBUG
+        let condition = condition()
+
+        if condition { return }
+
+        let message = message()
+
+        Swift.print("❗ [NetworkKit: Precondition Failure] \((String(describing: file) as NSString).lastPathComponent):\(line) \(function)\n  ↪︎ \(message)\n")
+        Swift.preconditionFailure(message, file: file, line: line)
+        #endif
+    }
+
+    /**
+     Handles fatal errors made throughout the `NetworkKit`.
+     - Important: Implementers should guarantee that this function doesn't return, either by calling another `Never` function such as `fatalError()` or `abort()`, or by raising an exception.
+     
+     - parameter message: Fatal error message.
+     - parameter file: Source file name.
+     - parameter line: Source line number.
+     - parameter function: Source function name.
+     */
+    @inline(__always)
+    func fatalError(_ message: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) -> Never {
+
+        #if DEBUG
+        let message = message()
+        Swift.print("❗ [NetworkKit: Fatal Error] \((String(describing: file) as NSString).lastPathComponent):\(line) \(function)\n  ↪︎ \(message)\n")
+        Swift.fatalError(message, file: file, line: line)
+        #endif
+    }
+}