MainActor-ing everything and everywhere

NikSativa · Oct 11, 2024 · 2628e19 · 2628e19
1 parent 337bb09
commit 2628e19
Show file tree

Hide file tree

Showing 38 changed files with 126 additions and 34 deletions.
diff --git a/.github/workflows/swift_macos.yml b/.github/workflows/swift_macos.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "*"
     paths:
       - ".github/workflows/**"
       - "Package.swift"

diff --git a/Source/Arguments.swift b/Source/Arguments.swift
@@ -1,16 +1,20 @@
 import Foundation
 
+@MainActor
 public struct Arguments {
     private let elements: [Any]
 
+    @MainActor
     public init(_ elements: [Any]) {
         self.elements = elements
     }
 
+    @MainActor
     public init(_ elements: Any...) {
         self.elements = elements
     }
 
+    @MainActor
     public init() {
         self.elements = []
     }
@@ -49,18 +53,22 @@ public struct Arguments {
     }
 }
 
+#if swift(>=6.0)
+
 // MARK: - Sequence
 
-extension Arguments: Sequence {
+extension Arguments: @preconcurrency Sequence {
     public func makeIterator() -> some IteratorProtocol {
         return ArgumentsIterator(self)
     }
 }
 
-private final class ArgumentsIterator: IteratorProtocol {
+@MainActor
+private final class ArgumentsIterator: @preconcurrency IteratorProtocol {
     let args: Arguments
     var idx = 0
 
+    @MainActor
     init(_ args: Arguments) {
         self.args = args
     }
@@ -79,8 +87,19 @@ private final class ArgumentsIterator: IteratorProtocol {
 
 // MARK: - Arguments + ExpressibleByArrayLiteral
 
+@MainActor
+extension Arguments: @preconcurrency ExpressibleByArrayLiteral {
+    public init(arrayLiteral elements: Any...) {
+        self.init(elements)
+    }
+}
+#else
+
+// MARK: - Arguments + ExpressibleByArrayLiteral
+
 extension Arguments: ExpressibleByArrayLiteral {
     public init(arrayLiteral elements: Any...) {
         self.init(elements)
     }
 }
+#endif
diff --git a/Source/Assembly.swift b/Source/Assembly.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 public protocol Assembly {
     /// unique identifier of the assembly that will be used to used to remove duplicates from the Container
     /// - Warning:  override it on your own risk

diff --git a/Source/Container.swift b/Source/Container.swift
@@ -1,16 +1,19 @@
 import Foundation
 
+@MainActor
 public final class Container {
     private typealias Storyboardable = (Any, Resolver) -> Void
     private var storages: [String: Storage] = [:]
 
+    @MainActor
     public init(assemblies: [Assembly]) {
         let allAssemblies = assemblies.flatMap(\.allDependencies).unified()
         for assembly in allAssemblies {
             assembly.assemble(with: self)
         }
     }
 
+    @MainActor
     public convenience init(assemblies: Assembly...) {
         self.init(assemblies: assemblies)
     }
@@ -75,7 +78,7 @@ extension Container: Registrator {
     @discardableResult
     public func register<T>(_ type: T.Type,
                             options: Options,
-                            entity: @escaping (Resolver, _ arguments: Arguments) -> T) -> Forwarding {
+                            entity: @MainActor @escaping (Resolver, _ arguments: Arguments) -> T) -> Forwarding {
         let key = key(type, name: options.name)
 
         if let found = storages[key] {
@@ -174,6 +177,7 @@ private extension Optional {
 }
 
 private extension [Assembly] {
+    @MainActor
     func unified() -> [Element] {
         var keys: Set<String> = []
         let unified = filter {

diff --git a/Source/Forwarder.swift b/Source/Forwarder.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 public protocol Forwarding {
     @discardableResult
     func implements<T>(_ type: T.Type, named: String?, accessLevel: Options.AccessLevel?) -> Self
@@ -12,14 +13,17 @@ public extension Forwarding {
     }
 }
 
+@MainActor
 protocol ForwardRegistrator: AnyObject {
     func register<T>(_ type: T.Type, named: String?, storage: Storage)
 }
 
+@MainActor
 struct Forwarder: Forwarding {
     private unowned let container: ForwardRegistrator
     private let storage: Storage
 
+    @MainActor
     init(container: ForwardRegistrator,
          storage: Storage) {
         self.container = container

diff --git a/Source/Options.swift b/Source/Options.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 public struct Options: Equatable {
     public enum AccessLevel: Equatable {
         case final
@@ -31,6 +32,7 @@ public struct Options: Equatable {
     public let entityKind: EntityKind
     public let name: String?
 
+    @MainActor
     public init(accessLevel: AccessLevel = .final,
                 entityKind: EntityKind = .weak,
                 name: String? = nil) {
@@ -40,14 +42,17 @@ public struct Options: Equatable {
     }
 }
 
+@MainActor
 public func +(lhs: Options, rhs: Options.EntityKind) -> Options {
     return .init(accessLevel: lhs.accessLevel, entityKind: rhs, name: lhs.name)
 }
 
+@MainActor
 public func +(lhs: Options, rhs: Options.AccessLevel) -> Options {
     return .init(accessLevel: rhs, entityKind: lhs.entityKind, name: lhs.name)
 }
 
+@MainActor
 public func +(lhs: Options, rhs: String) -> Options {
     return .init(accessLevel: lhs.accessLevel, entityKind: lhs.entityKind, name: rhs)
 }

diff --git a/Source/PropertyWrapper/DIPropertyWrapper/DIObservedObject.swift b/Source/PropertyWrapper/DIPropertyWrapper/DIObservedObject.swift
@@ -2,7 +2,8 @@
 import Combine
 import SwiftUI
 
-@MainActor @propertyWrapper
+@MainActor
+@propertyWrapper
 public struct DIObservedObject<Value: ObservableObject>: DynamicProperty {
     @EnvironmentObject
     private var container: ObservableResolver

diff --git a/Source/PropertyWrapper/DIPropertyWrapper/DIProvider.swift b/Source/PropertyWrapper/DIPropertyWrapper/DIProvider.swift
@@ -2,12 +2,14 @@
 import Foundation
 import SwiftUI
 
+@MainActor
 public struct DIProviderOptions {
     public let name: String?
     public let arguments: Arguments?
 }
 
-@MainActor @propertyWrapper
+@MainActor
+@propertyWrapper
 public struct DIProvider<Value>: DynamicProperty {
     @EnvironmentObject
     private var container: ObservableResolver

diff --git a/Source/PropertyWrapper/DIPropertyWrapper/DIState.swift b/Source/PropertyWrapper/DIPropertyWrapper/DIState.swift
@@ -2,7 +2,8 @@
 import Combine
 import SwiftUI
 
-@MainActor @propertyWrapper
+@MainActor
+@propertyWrapper
 public struct DIState<Value>: DynamicProperty {
     @EnvironmentObject
     private var container: ObservableResolver

diff --git a/Source/PropertyWrapper/DIPropertyWrapper/DIStateObject.swift b/Source/PropertyWrapper/DIPropertyWrapper/DIStateObject.swift
@@ -2,7 +2,8 @@
 import Combine
 import SwiftUI
 
-@MainActor @propertyWrapper
+@MainActor
+@propertyWrapper
 public struct DIStateObject<Value: ObservableObject>: DynamicProperty {
     @EnvironmentObject
     private var container: ObservableResolver

diff --git a/Source/PropertyWrapper/EnvParametersHolder.swift b/Source/PropertyWrapper/EnvParametersHolder.swift
@@ -1,6 +1,7 @@
 #if canImport(SwiftUI)
 import Foundation
 
+@MainActor
 internal final class EnvParametersHolder {
     var name: String?
     var arguments: Arguments?

diff --git a/Source/PropertyWrapper/SharedPropertyWrapper/Inject.swift b/Source/PropertyWrapper/SharedPropertyWrapper/Inject.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 @propertyWrapper
 public struct Inject<Value> {
     public private(set) var wrappedValue: Value {

diff --git a/Source/PropertyWrapper/SharedPropertyWrapper/InjectLazy.swift b/Source/PropertyWrapper/SharedPropertyWrapper/InjectLazy.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 @propertyWrapper
 public struct InjectLazy<Value> {
     public private(set) var wrappedValue: Value {

diff --git a/Source/PropertyWrapper/SharedPropertyWrapper/InjectProvider.swift b/Source/PropertyWrapper/SharedPropertyWrapper/InjectProvider.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 @propertyWrapper
 public struct InjectProvider<Value> {
     public private(set) var wrappedValue: Value {

diff --git a/Source/PropertyWrapper/SharedPropertyWrapper/InjectWrapped.swift b/Source/PropertyWrapper/SharedPropertyWrapper/InjectWrapped.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 @propertyWrapper
 public struct InjectWrapped<Value: InstanceWrapper> {
     public private(set) var wrappedValue: Value {

diff --git a/Source/Registrator.swift b/Source/Registrator.swift
@@ -1,21 +1,23 @@
 import Foundation
 
+@MainActor
 public protocol Registrator {
     /// register classes
     @discardableResult
     func register<T>(_ type: T.Type,
                      options: Options,
-                     entity: @escaping (_ resolver: Resolver, _ arguments: Arguments) -> T) -> Forwarding
+                     entity: @MainActor @escaping (_ resolver: Resolver, _ arguments: Arguments) -> T) -> Forwarding
 
     func registration<T>(for type: T.Type,
                          name: String?) -> Forwarding
 }
 
+@MainActor
 public extension Registrator {
     @discardableResult
     func register<T>(_ type: T.Type = T.self,
                      options: Options = .default,
-                     entity: @escaping (_ resolver: Resolver, _ arguments: Arguments) -> T) -> Forwarding {
+                     entity: @MainActor @escaping (_ resolver: Resolver, _ arguments: Arguments) -> T) -> Forwarding {
         return register(type,
                         options: options,
                         entity: entity)
@@ -24,7 +26,7 @@ public extension Registrator {
     @discardableResult
     func register<T>(_ type: T.Type = T.self,
                      options: Options = .default,
-                     entity: @escaping (_ resolver: Resolver) -> T) -> Forwarding {
+                     entity: @MainActor @escaping (_ resolver: Resolver) -> T) -> Forwarding {
         return register(type,
                         options: options,
                         entity: { resolver, _ in
@@ -35,7 +37,7 @@ public extension Registrator {
     @discardableResult
     func register<T>(_ type: T.Type = T.self,
                      options: Options = .default,
-                     entity: @escaping () -> T) -> Forwarding {
+                     entity: @MainActor @escaping () -> T) -> Forwarding {
         return register(type,
                         options: options,
                         entity: { _, _ in

diff --git a/Source/Resolver.swift b/Source/Resolver.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 public protocol Resolver {
     func optionalResolve<T>(_ type: T.Type, named: String?, with arguments: Arguments) -> T?
     func resolve<T>(_ type: T.Type, named: String?, with arguments: Arguments?) -> T

diff --git a/Source/SelfInjectable.swift b/Source/SelfInjectable.swift
@@ -2,6 +2,7 @@
 import Foundation
 import ObjectiveC
 
+@MainActor
 public protocol SelfInjectable {
     func resolveDependncies(with resolver: Resolver)
 }
@@ -14,6 +15,7 @@ extension NSObject {
         static let dipTag: StaticString = "DIKit.dipTag"
     }
 
+    @MainActor
     @objc
     private var isInitializedFromDI: Bool {
         get {
@@ -30,6 +32,7 @@ extension NSObject {
         }
     }
 
+    @MainActor
     @objc
     private(set) var dipTag: String? {
         get {
@@ -50,13 +53,15 @@ extension NSObject {
         }
     }
 
+    @MainActor
     private func isDependenciesInitializationNeeded() -> Bool {
         defer {
             isInitializedFromDI = true
         }
         return !isInitializedFromDI
     }
 
+    @MainActor
     public func resolveDependnciesIfNeeded(with resolver: Resolver) {
         if isDependenciesInitializationNeeded(),
            let selfInjectable = self as? SelfInjectable {

diff --git a/Source/Storages/ContainerStorage.swift b/Source/Storages/ContainerStorage.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 final class ContainerStorage: Storage {
     private var entity: Any?
     private let generator: Generator

diff --git a/Source/Storages/ForwardingStorage.swift b/Source/Storages/ForwardingStorage.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 final class ForwardingStorage: Storage {
     let accessLevel: Options.AccessLevel
     private let storage: Storage

diff --git a/Source/Storages/Storage.swift b/Source/Storages/Storage.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 protocol Storage {
     typealias Entity = Any
     typealias Generator = (Resolver, _ arguments: Arguments) -> Entity

diff --git a/Source/Storages/TransientStorage.swift b/Source/Storages/TransientStorage.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 final class TransientStorage: Storage {
     private let generator: Generator
     let accessLevel: Options.AccessLevel

diff --git a/Source/Storages/WeakStorage.swift b/Source/Storages/WeakStorage.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 final class WeakStorage: Storage {
     private weak var entity: AnyObject?
     private let generator: Generator