Merge pull request #2 from ryanslikesocool/main

Support custom decoders in decoding completions

Author: mattmassicotte

Sources/AsyncXPCConnection/NSXPCConnection+Continuations.swift

@@ -1,3 +1,4 @@
+import Combine
 import Foundation
 
 enum ConnectionContinuationError: Error {
@@ -316,42 +317,45 @@ extension NSXPCConnection {
 
 #if compiler(<6.0)
 	@_unsafeInheritExecutor
-	public func withDecodingCompletion<Service, Value: Decodable>(
+	public func withDecodingCompletion<Service, Value: Decodable, Decoder: TopLevelDecoder>(
 		function: String = #function,
+		using decoder: Decoder = JSONDecoder(),
 		_ body: (Service, @escaping @Sendable (Data?, Error?) -> Void) -> Void
-	) async throws -> Value {
+	) async throws -> Value where Decoder.Input == Data {
 		let data: Data = try await withValueErrorCompletion(function: function) { service, handler in
 			body(service, handler)
 		}
 
-		return try JSONDecoder().decode(Value.self, from: data)
+		return try decoder.decode(Value.self, from: data)
 	}
 #else
-	public func withDecodingCompletion<Service, Value: Decodable>(
+	public func withDecodingCompletion<Service, Value: Decodable, Decoder: TopLevelDecoder>(
 		isolation: isolated (any Actor)? = #isolation,
 		function: String = #function,
+		using decoder: Decoder = JSONDecoder(),
 		_ body: (Service, @escaping (Data?, Error?) -> Void) -> Void
-	) async throws -> Value {
+	) async throws -> Value where Decoder.Input == Data {
 		let data: Data = try await withValueErrorCompletion(isolation: isolation, function: function) { service, handler in
 			body(service, handler)
 		}
 
-		return try JSONDecoder().decode(Value.self, from: data)
+		return try decoder.decode(Value.self, from: data)
 	}
 #endif
 
 #if compiler(>=6.0)
-	@available(*, deprecated, message: "please use withDecodingCompletion(isolation:function:_:)")
+	@available(*, deprecated, message: "please use withDecodingCompletion(isolation:function:using:_:)")
 #endif
-	public func withDecodingCompletion<Service, Value: Decodable>(
+	public func withDecodingCompletion<Service, Value: Decodable, Decoder: TopLevelDecoder>(
 		function: String = #function,
 		on actor: isolated some Actor,
+		using decoder: Decoder = JSONDecoder(),
 		_ body: (Service, @escaping @Sendable (Data?, Error?) -> Void) -> Void
-	) async throws -> Value {
+	) async throws -> Value where Decoder.Input == Data {
 		let data: Data = try await withValueErrorCompletion(function: function, on: actor) { service, handler in
 			body(service, handler)
 		}
 
-		return try JSONDecoder().decode(Value.self, from: data)
+		return try decoder.decode(Value.self, from: data)
 	}
 }

Sources/AsyncXPCConnection/QueuedRemoteXPCService.swift

@@ -1,3 +1,4 @@
+import Combine
 import Foundation
 
 public protocol AsyncQueuing {
@@ -109,14 +110,15 @@ extension QueuedRemoteXPCService {
 		return try await task.value
 	}
 
-	public func addDecodingOperation<Value: Sendable & Decodable>(
+	public func addDecodingOperation<Value: Sendable & Decodable, Decoder: TopLevelDecoder>(
 		barrier: Bool = false,
+		using decoder: Decoder = JSONDecoder(),
 		operation: @escaping (Service, @escaping ValueErrorOperationHandler<Data>) -> Void
-	) async throws -> Value {
+	) async throws -> Value where Decoder.Input == Data {
 		let task: Task<Value, Error> = queue.addOperation(priority: nil, barrier: barrier) {
 			let conn = try await provider()
 
-			return try await conn.withDecodingCompletion { service, handler in
+			return try await conn.withDecodingCompletion(using: decoder) { service, handler in
 				operation(service, handler)
 			}
 		}

Sources/AsyncXPCConnection/RemoteXPCService.swift

@@ -1,3 +1,4 @@
+import Combine
 import Foundation
 
 /// A thin wrapper around NSXPCConnection with a defined service type.
@@ -88,11 +89,12 @@ extension RemoteXPCService {
 	}
 
 	@_unsafeInheritExecutor
-	public func withDecodingCompletion<Value: Decodable>(
+	public func withDecodingCompletion<Value: Decodable, Decoder: TopLevelDecoder>(
 		function: String = #function,
+		using decoder: Decoder = JSONDecoder(),
 		_ body: (Service, @escaping (Data?, Error?) -> Void) -> Void
-	) async throws -> Value {
-		try await connection.withDecodingCompletion(function: function, body)
+	) async throws -> Value where Decoder.Input == Data {
+		try await connection.withDecodingCompletion(function: function, using: decoder, body)
 	}
 #else
 	public func withValueErrorCompletion<Value: Sendable>(
@@ -119,12 +121,13 @@ extension RemoteXPCService {
 		try await connection.withErrorCompletion(isolation: isolation, function: function, body)
 	}
 
-	public func withDecodingCompletion<Value: Decodable>(
+	public func withDecodingCompletion<Value: Decodable, Decoder: TopLevelDecoder>(
 		isolation: isolated (any Actor)? = #isolation,
 		function: String = #function,
+		using decoder: Decoder = JSONDecoder(),
 		_ body: (Service, @escaping (Data?, Error?) -> Void) -> Void
-	) async throws -> Value {
-		try await connection.withDecodingCompletion(isolation: isolation, function: function, body)
+	) async throws -> Value where Decoder.Input == Data {
+		try await connection.withDecodingCompletion(isolation: isolation, function: function, using: decoder, body)
 	}
 #endif
 }