Refactors and made ServiceContainer thread safe

Author: FastestMolasses

CodeEdit.xcodeproj/project.pbxproj

@@ -1370,7 +1370,6 @@
 				58798244292E78D80085B254 /* CodeFile */,
 				58FD7603291EA1CB0051D6E4 /* Commands */,
 				284DC84B2978B5EB00BF2770 /* Contributors */,
-				300051652BBD3A4400A98562 /* DependencyInjection */,
 				043C321227E31FE8006AE443 /* Documents */,
 				6C147C3C29A328020089B630 /* Editor */,
 				6C6BD6ED29CD123000235D17 /* Extensions */,
@@ -2138,6 +2137,7 @@
 		58D01C85293167DC00C5B6B4 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				300051652BBD3A4400A98562 /* DependencyInjection */,
 				6C48D8EF2972DAC300D6D205 /* Environment */,
 				58D01C87293167DC00C5B6B4 /* Extensions */,
 				58D01C8F293167DC00C5B6B4 /* KeyChain */,

CodeEdit/AppDelegate.swift

@@ -236,7 +236,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 private func setupServiceContainer() {
     // Example for how services will be instantiated
 //    ServiceContainer.register(
-//        type: PasteboardService.self,
 //        PasteboardService()
 //    )
 }

CodeEdit/Utils/DependencyInjection/ServiceContainer.swift

@@ -5,40 +5,48 @@
 //  Created by Abe Malla on 4/3/24.
 //
 
-enum ServiceContainer {
-    private static var factories: [String: () -> Any] = [:]
-    private static var cache: [String: Any] = [:]
+import Foundation
 
-    static func register<Service>(type: Service.Type, _ factory: @autoclosure @escaping () -> Service) {
-        factories[String(describing: type.self)] = factory
+enum ServiceContainer {
+    private static var factories: [ObjectIdentifier: () -> Any] = [:]
+    private static var cache: [ObjectIdentifier: Any] = [:]
+    private static let queue = DispatchQueue(label: "ServiceContainerQueue")
+
+    static func register<Service>(_ factory: @autoclosure @escaping () -> Service) {
+        queue.sync {
+            let key = ObjectIdentifier(Service.Type.self)
+            factories[key] = factory
+        }
     }
 
     static func resolve<Service>(_ resolveType: ServiceType = .singleton, _ type: Service.Type) -> Service? {
-        let serviceName = String(describing: type.self)
+        let serviceId = ObjectIdentifier(Service.Type.self)
 
-        switch resolveType {
-        case .singleton:
-            if let service = cache[serviceName] as? Service {
-                return service
-            } else {
-                let service = factories[serviceName]?() as? Service
+        return queue.sync {
+            switch resolveType {
+            case .singleton:
+                if let service = cache[serviceId] as? Service {
+                    return service
+                } else {
+                    let service = factories[serviceId]?() as? Service
+
+                    if let service = service {
+                        cache[serviceId] = service
+                    }
+
+                    return service
+                }
+            case .newSingleton:
+                let service = factories[serviceId]?() as? Service
 
                 if let service = service {
-                    cache[serviceName] = service
+                    cache[serviceId] = service
                 }
 
                 return service
+            case .new:
+                return factories[serviceId]?() as? Service
             }
-        case .newSingleton:
-            let service = factories[serviceName]?() as? Service
-
-            if let service = service {
-                cache[serviceName] = service
-            }
-
-            return service
-        case .new:
-            return factories[serviceName]?() as? Service
         }
     }
 }

CodeEdit/Utils/DependencyInjection/ServiceWrapper.swift

@@ -7,7 +7,6 @@
 
 @propertyWrapper
 struct Service<Service> {
-
     var service: Service
 
     init(_ type: ServiceType = .singleton) {