Merge pull request #48 from GoodRequest/feature/optional-url-init

Support for optionals in URL and Data resolution

Author: plajdo

Sources/GoodNetworking/Models/Endpoint.swift

@@ -28,21 +28,23 @@ public protocol Endpoint {
     @available(*, deprecated, message: "Encoding will be automatically determined by the kind of `parameters` in the future.")
     var encoding: ParameterEncoding { get }
 
-    /// Creates a URL by combining `path` with `baseUrl`.
+    /// Creates a URL by resolving `path` over `baseUrl`.
+    ///
     /// This function is a customization point for modifying the URL by current runtime,
     /// for example for API versioning or platform separation.
+    ///
+    /// Note that this function will be only called if the ``path`` resolved
+    /// is a relative URL. If ``path`` specifies an absolute URL, it will be
+    /// used instead, without any modifications.
+    ///
     /// - Parameter baseUrl: Base URL for the request to combine with.
-    /// - Throws: If creating a concrete URL fails.
-    /// - Returns: URL for the request.
+    /// - Returns: URL for the request or `nil` if such URL cannot be constructed.
     @NetworkActor func url(on baseUrl: URLConvertible) async -> URL?
 
 }
 
-@available(*, deprecated, message: "Default values for deprecated properties")
 public extension Endpoint {
-
-    var encoding: ParameterEncoding { AutomaticEncoding.default }
-
+    
     @NetworkActor func url(on baseUrl: URLConvertible) async -> URL? {
         let baseUrl = await baseUrl.resolveUrl()
         let path = await path.resolveUrl()
@@ -53,6 +55,13 @@ public extension Endpoint {
 
 }
 
+@available(*, deprecated, message: "Default values for deprecated properties")
+public extension Endpoint {
+
+    var encoding: ParameterEncoding { AutomaticEncoding.default }
+    
+}
+
 // MARK: - Parameters
 
 /// Enum that represents the data to be sent with the request,

…dNetworking/Models/EndpointFactory.swift …dNetworking/Models/EndpointBuilder.swiftSources/GoodNetworking/Models/EndpointFactory.swift renamed to Sources/GoodNetworking/Models/EndpointBuilder.swift Sources/GoodNetworking/Models/EndpointFactory.swift renamed to Sources/GoodNetworking/Models/EndpointBuilder.swift

@@ -1,5 +1,5 @@
 //
-//  EndpointFactory.swift
+//  EndpointBuilder.swift
 //  GoodNetworking
 //
 //  Created by Filip Šašala on 06/08/2025.
@@ -10,7 +10,7 @@ import Foundation
 /// Modified implementation of factory pattern to build
 /// endpoint as a series of function calls instead of conforming
 /// to a protocol.
-public final class EndpointFactory: Endpoint {
+public final class EndpointBuilder: Endpoint {
 
     public var path: URLConvertible
     public var method: HTTPMethod = .get
@@ -29,7 +29,7 @@ public final class EndpointFactory: Endpoint {
 
 }
 
-public extension EndpointFactory {
+public extension EndpointBuilder {
 
     func method(_ method: HTTPMethod) -> Self {
         self.method = method
@@ -82,14 +82,17 @@ public extension EndpointFactory {
 
 }
 
-private extension EndpointFactory {
+private extension EndpointBuilder {
 
     func assertBothQueryAndBodyUsage() {
         assert(self.parameters == nil, "Support for query and body parameters at the same time is currently not available.")
     }
 
 }
 
-public func at(_ path: URLConvertible) -> EndpointFactory {
-    EndpointFactory(at: path)
+public func at(_ path: URLConvertible) -> EndpointBuilder {
+    EndpointBuilder(at: path)
 }
+
+@available(*, deprecated, renamed: "EndpointBuilder")
+public typealias EndpointFactory = EndpointBuilder

Sources/GoodNetworking/Models/URLConvertible.swift

@@ -48,3 +48,48 @@ extension String: URLConvertible {
     }
 
 }
+
+// MARK: - Extensions
+
+extension URL {
+    
+    /// Initialize with optional string.
+    ///
+    /// Returns `nil` if a `URL` cannot be formed with the string (for example,  if the string
+    /// contains characters that are illegal in a URL, or is an empty string, or is `nil`).
+    /// - Parameter string: String containing the URL or `nil`
+    public init?(_ string: String?) {
+        guard let string else { return nil }
+        self.init(string: string)
+    }
+    
+    /// Checks if URL contains a non-empty scheme.
+    ///
+    /// Returns `true` if ``scheme`` is not `nil` and not empty, eg. `https://`
+    var hasScheme: Bool {
+        if let scheme, !scheme.isEmpty {
+            return true
+        } else {
+            return false
+        }
+    }
+    
+    /// Checks if URL contains a non-empty host.
+    ///
+    /// Returns `true` if ``host`` is not `nil` and not empty, eg. `goodrequest.com`
+    var hasHost: Bool {
+        if let host, !host.isEmpty {
+            return true
+        } else {
+            return false
+        }
+    }
+    
+    /// Checks if URL can be considered an absolute URL.
+    ///
+    /// Returns `true` if the URL is a file URL or has both host and scheme.
+    var isAbsolute: Bool {
+        return isFileURL || hasScheme && hasHost
+    }
+    
+}

Sources/GoodNetworking/Session/NetworkSession.swift

@@ -212,7 +212,7 @@ extension NetworkSession {
         // handle decoding corner cases
         var decoder = JSONDecoder()
         switch T.self {
-        case is Data.Type:
+        case is Data.Type, is Optional<Data>.Type:
             return data as! T
 
         case let t as WithCustomDecoder:
@@ -248,10 +248,25 @@ extension NetworkSession {
 
     @discardableResult
     public func request(endpoint: Endpoint) async throws(NetworkError) -> Data {
-        guard let basePath = await baseUrl.resolveUrl()?.absoluteString,
-              let url = await endpoint.url(on: basePath)
-        else {
-            throw URLError(.badURL).asNetworkError()
+        let endpointPath = await endpoint.path.resolveUrl()
+        let url: URL
+
+        // If endpoint already contains an absolute path, do not concatenate
+        // with baseURL and use that instead
+        if let endpointPath, endpointPath.isAbsolute {
+            url = endpointPath
+        } else {
+            // If endpoint has only relative path, resolve it over baseURL
+            let baseUrl = await baseUrl.resolveUrl()
+            let endpointResolvedUrl = await endpoint.url(on: baseUrl)
+
+            // If neither endpoint nor baseURL are specified, URL cannot be resolved
+            guard let endpointResolvedUrl else {
+                throw URLError(.badURL).asNetworkError()
+            }
+
+            // URL is resolved
+            url = endpointResolvedUrl
         }
 
         // url + method