Fix A Trailing '?' When Passing Empty Query Items (#12)

Author: otaviocc

Sources/MicroClient/Extensions/URLComponents.swift

@@ -17,9 +17,14 @@ extension URL {
             resolvingAgainstBaseURL: false
         )
 
-        components?.queryItems = networkRequest.queryItems
+        let queryItems = networkRequest
+            .queryItems
             .filter { $0.value != nil }
 
+        if !queryItems.isEmpty {
+            components?.queryItems = queryItems
+        }
+
         return try unwrap(
             value: components?.url,
             error: NetworkClientError.malformedURL

Tests/MicroClientTests/NetworkRequestQueryItemsTests.swift

@@ -50,4 +50,72 @@ struct NetworkRequestQueryItemsTests {
             "It should preserve nil values in query items"
         )
     }
+
+    @Test("It should not add a trailing '?' when there are no query items")
+    func noTrailingQuestionMark() throws {
+        let configuration = NetworkClientMother.makeNetworkConfiguration()
+
+        let request = NetworkRequest<VoidRequest, VoidResponse>(
+            path: "/v1/endpoint",
+            method: .get
+        )
+
+        let url = try URL.makeURL(
+            configuration: configuration,
+            networkRequest: request
+        )
+
+        #expect(
+            url.absoluteString == "https://api.example.com/v1/endpoint",
+            "It should not have a trailing '?'"
+        )
+    }
+
+    @Test("It should add a trailing '?' when an empty queryItems is provided")
+    func trailingQuestionMarkWithEmptyQueryItems() throws {
+        let configuration = NetworkClientMother.makeNetworkConfiguration()
+
+        let request = NetworkRequest<VoidRequest, VoidResponse>(
+            path: "/v1/endpoint",
+            method: .get,
+            queryItems: []
+        )
+
+        let url = try URL.makeURL(
+            configuration: configuration,
+            networkRequest: request
+        )
+
+        #expect(
+            url.absoluteString == "https://api.example.com/v1/endpoint",
+            "It should not have a trailing '?'"
+        )
+    }
+
+    @Test("It should add '?' and query items when query items are present")
+    func addQuestionMarkWithQueryItems() throws {
+        let configuration = NetworkClientMother.makeNetworkConfiguration()
+
+        let queryItems = [
+            URLQueryItem(name: "page", value: "1"),
+            URLQueryItem(name: "limit", value: "10"),
+            URLQueryItem(name: "sort", value: "name")
+        ]
+
+        let request = NetworkRequest<VoidRequest, VoidResponse>(
+            path: "/v1/endpoint",
+            method: .get,
+            queryItems: queryItems
+        )
+
+        let url = try URL.makeURL(
+            configuration: configuration,
+            networkRequest: request
+        )
+
+        #expect(
+            url.absoluteString == "https://api.example.com/v1/endpoint?page=1&limit=10&sort=name",
+            "It should add the '?' and query items"
+        )
+    }
 }