Allow MainActor Dependency Registration

Sources/Factory/Factory/Containers.swift

@@ -105,6 +105,19 @@ extension ManagedContainer {
     @inlinable @inline(__always) public func callAsFunction<P,T>(key: StaticString = #function, _ factory: @escaping @Sendable (P) -> T) -> ParameterFactory<P,T> {
         ParameterFactory(self, key: key, factory)
     }
+
+    /// Syntactic sugar allows container to create a properly bound Factory on MainActor.
+    @MainActor
+    @inlinable @inline(__always) public func callAsFunction<T: Sendable>(key: StaticString = #function, _ factory: @escaping @MainActor () -> T) -> Factory<T> {
+        return Factory(self, key: key, factory)
+    }
+
+    /// Syntactic sugar allows container to create a properly bound ParameterFactory on MainActor.
+    @MainActor
+    @inlinable @inline(__always) public func callAsFunction<P,T: Sendable>(key: StaticString = #function, _ factory: @escaping @MainActor (P) -> T) -> ParameterFactory<P,T> {
+        return ParameterFactory(self, key: key, factory)
+    }
+
     /// Syntactic sugar allows container to create a factory whose optional registration is promised before resolution.
     /// ```swift
     /// extension Container {

Sources/Factory/Factory/Factory.swift

@@ -72,7 +72,7 @@ public struct Factory<T>: FactoryModifying {
     ///   current container as well defining the scope.
     ///   - key: Hidden value used to differentiate different instances of the same type in the same container.
     ///   - factory: A factory closure that produces an object of the desired type when required.
-    public init(_ container: ManagedContainer, key: StaticString = #function, _ factory: @escaping @Sendable () -> T) {
+    public init(_ container: ManagedContainer, key: StaticString = #function, _ factory: @escaping () -> T) {
         self.registration = FactoryRegistration<Void,T>(key: key, container: container, factory: factory)
     }
 
@@ -144,8 +144,6 @@ public struct Factory<T>: FactoryModifying {
 
 }
 
-extension Factory: Sendable where T: Sendable {}
-
 // MARK: - ParameterFactory
 
 /// Factory capable of taking parameters at runtime
@@ -200,7 +198,7 @@ public struct ParameterFactory<P,T>: FactoryModifying {
     ///   current container as well defining the scope.
     ///   - key: Hidden value used to differentiate different instances of the same type in the same container.
     ///   - factory: A factory closure that produces an object of the desired type when required.
-    public init(_ container: ManagedContainer, key: StaticString = #function, _ factory: @escaping @Sendable (P) -> T) {
+    public init(_ container: ManagedContainer, key: StaticString = #function, _ factory: @escaping (P) -> T) {
         self.registration = FactoryRegistration<P,T>(key: key, container: container, factory: factory)
     }
 

Sources/Factory/Factory/Globals.swift

@@ -32,7 +32,7 @@ import Foundation
 nonisolated(unsafe) internal var globalGraphResolutionDepth = 0
 
 /// Internal key used for Resolver mode
-nonisolated(unsafe) internal let globalResolverKey: StaticString = "*"
+internal let globalResolverKey: StaticString = "*"
 
 #if DEBUG
 /// Internal variables used for debugging

Sources/Factory/Factory/Registrations.swift

@@ -27,14 +27,14 @@
 import Foundation
 
 /// Shared registration type for Factory and ParameterFactory. Used internally to manage the registration and resolution process.
-public struct FactoryRegistration<P,T>: Sendable {
+public struct FactoryRegistration<P,T> {
 
     /// Key used to manage registrations and cached values.
     internal let key: FactoryKey
     /// A strong reference to the container supporting this Factory.
     internal let container: ManagedContainer
     /// Typed factory with scope and factory.
-    internal let factory: @Sendable (P) -> T
+    internal let factory: (P) -> T
 
     #if DEBUG
     /// Internal debug
@@ -45,7 +45,7 @@ public struct FactoryRegistration<P,T>: Sendable {
     internal var once: Bool = false
 
     /// Initializer for registration sets passed values and default scope from container manager.
-    internal init(key: StaticString, container: ManagedContainer, factory: @escaping @Sendable (P) -> T) {
+    internal init(key: StaticString, container: ManagedContainer, factory: @escaping (P) -> T) {
         self.key = FactoryKey(type: T.self, key: key)
         self.container = container
         self.factory = factory

Tests/FactoryTests/FactoryIsolationTests.swift

@@ -37,7 +37,8 @@ final class FactoryIsolationTests: XCTestCase {
   func testInjectSendableDependency() {
     let _: SomeSendableType = Container.shared.sendable()
   }
-
+
+  @MainActor
   func testInjectMainActorDependency() async {
     let _: SomeMainActorType = await Container.shared.mainActor().wrapped()
   }

Tests/FactoryTests/MockServices.swift

@@ -9,7 +9,7 @@ import Foundation
 @testable import Factory
 
 // Swift 6
-extension Container: @retroactive AutoRegistering {
+extension Container: AutoRegistering {
     public func autoRegister() {
         // print("Container.autoRegister")
     }