feat: Instance Storage

Author: mcgaryp

Package.swift

@@ -6,7 +6,8 @@ import PackageDescription
 let package = Package(
     name: "Astroject",
     platforms: [
-        .iOS(.v13)
+        .iOS(.v16),
+        .macOS(.v13)
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.

Sources/Astroject/Container.swift

@@ -9,44 +9,51 @@ import Foundation
 
 // ✅ Registration
 // ✅ Resolution
-// TODO: InstanceStore
+// ✅ InstanceStore
+// TODO: Error Handling
+// TODO: Write Unit Tests
+// TODO: Is this robust and sufficient enough to support my needs?
 
 public class Container {
-    var factories: ThreadSafeDictionary<FactoryKey, any FactoryRegistrable> = .init()
+    var factories: ThreadSafeDictionary<ProductKey, any Registrable> = .init()
 
     public init() {}
 
-    public func registerAsync<Product>(_ productType: Product.Type, name: String? = nil, factory block: @escaping (Resolver) async -> Product) {
-        let factoryKey = FactoryKey(productType: productType, name: name)
+    @discardableResult
+    public func registerAsync<Product>(_ productType: Product.Type, name: String? = nil, factory block: @escaping (Resolver) async -> Product) -> Registration<Product> {
+        let factoryKey = ProductKey(productType: productType, name: name)
         let factory = Factory.async(block)
-        let registration = FactoryRegistration(factory: factory)
+        let registration = Registration(factory: factory, container: self)
         factories.insert(registration, for: factoryKey)
+        return registration
     }
 
-    public func register<Product>(_ productType: Product.Type, name: String? = nil, factory block: @escaping (Resolver) -> Product) {
-        let factoryKey = FactoryKey(productType: productType, name: name)
+    @discardableResult
+    public func register<Product>(_ productType: Product.Type, name: String? = nil, factory block: @escaping (Resolver) -> Product) -> Registration<Product> {
+        let factoryKey = ProductKey(productType: productType, name: name)
         let factory = Factory.sync(block)
-        let registration = FactoryRegistration(factory: factory)
+        let registration = Registration(factory: factory, container: self)
         factories.insert(registration, for: factoryKey)
+        return registration
     }
 }
 
 extension Container: Resolver {
     public func resolve<Product>(_ productType: Product.Type, name: String?) -> Product? {
         let registration = registration(for: productType, with: name)
-        let product = registration?.factory.make(self)
+        let product = registration?.resolve()
         return product
     }
 
     public func resolveAsync<Product>(_ productType: Product.Type, name: String?) async -> Product? {
         let registration = registration(for: productType, with: name)
-        let product = await registration?.factory.makeAsync(self)
+        let product = await registration?.resolveAsync()
         return product
     }
 
-    func registration<Product>(for productType: Product.Type, with name: String?) -> FactoryRegistration<Product>? {
-        let factoryKey = FactoryKey(productType: productType, name: name)
-        let registration = factories.getValue(for: factoryKey) as? FactoryRegistration<Product>
+    func registration<Product>(for productType: Product.Type, with name: String?) -> Registration<Product>? {
+        let factoryKey = ProductKey(productType: productType, name: name)
+        let registration = factories.getValue(for: factoryKey) as? Registration<Product>
         return registration
     }
 }

Sources/Astroject/Errors/AstrojectError.swift

@@ -0,0 +1,22 @@
+//
+//  AstrojectError.swift
+//  Astroject
+//
+//  Created by Porter McGary on 2/27/25.
+//
+
+import Foundation
+
+/// Represents errors that can occur within the Astroject dependency injection container.
+public enum AstrojectError: Error {
+    /// Errors related to dependency resolution.
+    case resolution(ResolutionError)
+    /// Errors related to factory creation.
+    case factory(FactoryError)
+    /// Errors related to dependency registration.
+    case registration(RegistrationError)
+    /// Errors related to instance management.
+    case instance(InstanceError)
+    /// Errors that occur internally within the library.
+    case internalError(Error)
+}

Sources/Astroject/Errors/FactoryError.swift

@@ -0,0 +1,14 @@
+//
+//  FactoryError.swift
+//  Astroject
+//
+//  Created by Porter McGary on 2/27/25.
+//
+
+import Foundation
+
+/// Represents errors that can occur during factory creation.
+public enum FactoryError: Error {
+    /// An error that occurred within the factory closure.
+    case underlyingError(Error)
+}

Sources/Astroject/Errors/InstanceError.swift

@@ -0,0 +1,14 @@
+//
+//  InstanceError.swift
+//  Astroject
+//
+//  Created by Porter McGary on 2/27/25.
+//
+
+import Foundation
+
+/// Represents errors that can occur during instance management.
+public enum InstanceError: Error {
+    /// An instance is expected but not found.
+    case noInstance
+}

Sources/Astroject/Errors/RegistrationError.swift

@@ -0,0 +1,14 @@
+//
+//  RegistrationError.swift
+//  Astroject
+//
+//  Created by Porter McGary on 2/27/25.
+//
+
+import Foundation
+
+/// Represents errors that can occur during dependency registration.
+public enum RegistrationError: Error {
+    /// A registration is attempted with a ProductKey that already exists.
+    case alreadyRegistered
+}

Sources/Astroject/Errors/ResolutionError.swift

@@ -0,0 +1,18 @@
+//
+//  ResolutionError.swift
+//  Astroject
+//
+//  Created by Porter McGary on 2/27/25.
+//
+
+import Foundation
+
+/// Represents errors that can occur during dependency resolution.
+public enum ResolutionError: Error {
+    /// A dependency is requested but not registered.
+    case noRegistrationFound
+    /// Circular dependency detected.
+    case circularDependency
+    /// Calling a sync function when an async function should be called instead.
+    case asyncResolutionRequired
+}

Sources/Astroject/FactoryRegistration.swift

@@ -0,0 +1,28 @@
+//
+//  Composite.swift
+//  Astroject
+//
+//  Created by Porter McGary on 2/26/25.
+//
+
+import Foundation
+
+public class Composite<Product>: Instance {
+    var instances: [any Instance<Product>] = []
+    
+    public init(instances: [any Instance<Product>]) {
+        self.instances = instances
+    }
+    
+    public func get() -> Product? {
+        instances.compactMap { $0.get() }.first
+    }
+    
+    public func set(_ product: Product) {
+        instances.forEach { $0.set(product) }
+    }
+    
+    public func release() {
+        instances.forEach { $0.release() }
+    }
+}

Sources/Astroject/Instances/Composite.swift

@@ -0,0 +1,16 @@
+//
+//  Instance.swift
+//  Astroject
+//
+//  Created by Porter McGary on 2/26/25.
+//
+
+import Foundation
+
+public protocol Instance<Product> {
+    associatedtype Product
+    
+    func get() -> Product?
+    func set(_ product: Product)
+    func release()
+}