ObjC: getServiceOrFatal and support in ServiceProviderInject

Author: ProVir

ServiceContainerKit/Sources/ServiceProviderObjC.swift

@@ -38,6 +38,17 @@ public class ServiceProviderObjC: NSObject {
     @objc public func getService() -> Any? {
         return try? swiftProvider.getServiceBindingObjC(params: Void())
     }
+    
+    /// Get Service if there are no errors or fatal with debug details when failure obtain.
+    @objc public func getServiceOrFatal() -> Any {
+        do {
+            return try swiftProvider.getServiceBindingObjC(params: Void())
+        } catch let error as ServiceObtainError {
+            fatalError(error.fatalMessage)
+        } catch {
+            fatalError(error.localizedDescription)
+        }
+    }
 }
 
 /// Wrapper ServiceParamsProvider for use in ObjC code.
@@ -65,6 +76,17 @@ public class ServiceParamsProviderObjC: NSObject {
     @objc public func getService(params: Any) -> Any? {
         return try? swiftProvider.getServiceBindingObjC(params: params)
     }
+    
+    /// Get Service if there are no errors or fatal with debug details when failure obtain.
+    @objc public func getServiceOrFatal(params: Any) -> Any {
+        do {
+            return try swiftProvider.getServiceBindingObjC(params: params)
+        } catch let error as ServiceObtainError {
+            fatalError(error.fatalMessage)
+        } catch {
+            fatalError(error.localizedDescription)
+        }
+    }
 }
 
 // MARK: - Private

ServiceInjects/Sources/EntityInjectResolver.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import ServiceContainerKit
 
 /// Token for register entity
 public protocol EntityInjectToken: class { }

ServiceInjects/Sources/InjectsLogger.swift

@@ -9,6 +9,8 @@
 import Foundation
 import ServiceContainerKit
 
+typealias LogRecorder = ServiceContainerKit.LogRecorder
+
 /// Logger for injects
 public protocol ServiceInjectLogger: Logger {
     func entityInjectResolverDidAutoRemove(entityType: Any.Type, delay: TimeInterval)

ServiceInjects/Sources/ServiceProviderInject.swift

@@ -16,38 +16,69 @@ public final class ServiceProviderInject<Container, Provider> {
     private var lazyInitToken: ServiceInjectReadyToken?
     private var state = InjectState<Provider>()
 
+    // MARK: Common constructors
+    
     /// `keyPath` - key in container with value type `ServiceProvider`.
     public convenience init<Service>(_ keyPath: KeyPath<Container, Provider>, file: StaticString = #file, line: UInt = #line)
         where Provider == ServiceProvider<Service> {
-        self.init(baseInitFor: keyPath, file: file, line: line)
+        self.init(baseInitFor: keyPath, map: { $0 }, file: file, line: line)
     }
 
     /// `keyPath` - key in container with optional value type `ServiceProvider?`.
     public convenience init<Service>(_ keyPath: KeyPath<Container, Provider>, file: StaticString = #file, line: UInt = #line)
         where Provider == ServiceProvider<Service>? {
-        self.init(baseInitFor: keyPath, file: file, line: line)
+        self.init(baseInitFor: keyPath, map: { $0 }, file: file, line: line)
     }
 
     /// `keyPath` - key in container with value type `ServiceParamsProvider`.
     public convenience init<Service, Params>(_ keyPath: KeyPath<Container, Provider>, file: StaticString = #file, line: UInt = #line)
         where Provider == ServiceParamsProvider<Service, Params> {
-        self.init(baseInitFor: keyPath, file: file, line: line)
+        self.init(baseInitFor: keyPath, map: { $0 }, file: file, line: line)
     }
 
     /// `keyPath` - key in container with optional value type `ServiceParamsProvider?`.
     public convenience init<Service, Params>(_ keyPath: KeyPath<Container, Provider>, file: StaticString = #file, line: UInt = #line)
         where Provider == ServiceParamsProvider<Service, Params>? {
-        self.init(baseInitFor: keyPath, file: file, line: line)
+        self.init(baseInitFor: keyPath, map: { $0 }, file: file, line: line)
+    }
+    
+    // MARK: ObjC constructors
+    
+    /// `keyPath` - key in container with value type `ServiceProvider`, injected value type is `ServiceProviderObjC`.
+    public convenience init<Service>(objc keyPath: KeyPath<Container, ServiceProvider<Service>>, file: StaticString = #file, line: UInt = #line)
+        where Provider == ServiceProviderObjC {
+        self.init(baseInitFor: keyPath, map: { ServiceProviderObjC($0) }, file: file, line: line)
+    }
+    
+    /// `keyPath` - key in container with optional value type `ServiceProvider?`, injected value type is `ServiceProviderObjC?`.
+    public convenience init<Service>(objc keyPath: KeyPath<Container, ServiceProvider<Service>?>, file: StaticString = #file, line: UInt = #line)
+        where Provider == ServiceProviderObjC? {
+        self.init(baseInitFor: keyPath, map: { $0.map { ServiceProviderObjC($0) } }, file: file, line: line)
     }
 
-    private init(baseInitFor keyPath: KeyPath<Container, Provider>, file: StaticString, line: UInt) {
+    /// `keyPath` - key in container with value type `ServiceParamsProvider`, injected value type is `ServiceParamsProviderObjC`.
+    public convenience init<Service, Params>(objc keyPath: KeyPath<Container, ServiceParamsProvider<Service, Params>>, file: StaticString = #file, line: UInt = #line)
+        where Provider == ServiceParamsProviderObjC {
+        self.init(baseInitFor: keyPath, map: { ServiceParamsProviderObjC($0) }, file: file, line: line)
+    }
+    
+    /// `keyPath` - key in container with optional value type `ServiceParamsProvider?`, injected value type is `ServiceParamsProviderObjC?`.
+    public convenience init<Service, Params>(objc keyPath: KeyPath<Container, ServiceParamsProvider<Service, Params>?>, file: StaticString = #file, line: UInt = #line)
+        where Provider == ServiceParamsProviderObjC? {
+        self.init(baseInitFor: keyPath, map: { $0.map { ServiceParamsProviderObjC($0) } }, file: file, line: line)
+    }
+    
+    
+    // MARK: General
+    
+    private init<SrcProvider>(baseInitFor keyPath: KeyPath<Container, SrcProvider>, map: @escaping (SrcProvider) -> Provider, file: StaticString, line: UInt) {
         setup { [unowned self] container in
             guard let container = container else {
                 fatalError("Not found Container for Inject", file: file, line: line)
             }
 
             let provider = container[keyPath: keyPath]
-            self.state.storage.setEntity(provider)
+            self.state.storage.setEntity(map(provider))
         }
     }
 

Tester/ServiceContainers/ServiceContainer.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import ServiceContainerKit
+import ServiceInjects
 
 /// DI Continer for swift
 struct ServiceContainer {
@@ -40,13 +41,15 @@ struct ServiceContainer {
 @objc(ServiceContainer)
 class ServiceContainerObjC: NSObject {
     init(container: ServiceContainer) {
-        firstServiceProvider = ServiceProviderObjC(container.firstServiceProvider)
+        // Not supported for Injects
         sharedFirstService = container.sharedFirstService
 
         super.init()
     }
 
-    @objc let firstServiceProvider: ServiceProviderObjC
+    @ServiceProviderInject(objc: \ServiceContainer.firstServiceProvider)
+    @objc var firstServiceProvider
+    
     @objc let sharedFirstService: FirstService
 }