Merge pull request #17 from Lickability/kpa/store-not-main-actor

Moving Store off main actor

Author: Twigz

Example/Photos/With Stores/Banner Feature/MockBannerNetworkStateController.swift

@@ -6,10 +6,10 @@
 //
 
 import Foundation
-import Combine
+@preconcurrency import Combine
 
 /// A really contrived fake interface similar to networking state controller for updating `Banner` models on a nonexistent server.
-final class MockBannerNetworkStateController {
+final class MockBannerNetworkStateController: Sendable {
 
     /// Represents the state of a network request for a banner.
     enum NetworkState {
@@ -67,22 +67,19 @@ final class MockBannerNetworkStateController {
     }
 
     /// A publisher that sends updates of the `NetworkState`.
-    public var publisher: PassthroughSubject<NetworkState, Never> = .init()
+    public let publisher: PassthroughSubject<NetworkState, Never> = .init()
 
     /// Uploads a `Banner` to a fake server.
     /// - Parameter banner: The `Banner` to upload.
-    @MainActor
     func upload(banner: Banner) {
         self.publisher.send(.inProgress)
-
+        
         DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
 
             // Pick whether you would like to get a successful (`.finished(.success...`) state or any error for this "network request".
 
-            //self.publisher.send(.finished(.success(banner)))
+            self.publisher.send(.finished(.success(banner)))
 
-            self.publisher.send(.finished(.failure(.intentionalFailure)))
-
         }
 
     }

Example/Photos/With Stores/Banner Feature/View Level/BannerUpdateViewStore.swift

@@ -18,7 +18,7 @@ final class BannerUpdateViewStore: Store {
     // MARK: - Store
 
     /// Represents the state of the `BannerUpdateViewStore`
-    struct State {
+    struct State: Sendable {
         /// Stores the state of the nested `BannerDataStore`
         let bannerViewState: BannerDataStore.State
 
@@ -51,7 +51,7 @@ final class BannerUpdateViewStore: Store {
         }
     }
 
-    enum Action {
+    enum Action: Sendable {
         /// Action to update the title of the banner with a given string
         case updateTitle(String)
 
@@ -106,11 +106,13 @@ final class BannerUpdateViewStore: Store {
 
 extension BannerUpdateViewStoreType {
     /// Computed property that creates a binding for the working title
+    @MainActor
     var workingTitle: Binding<String> {
         makeBinding(stateKeyPath: \.workingCopy.title, actionCasePath: /Action.updateTitle)
     }
 
     /// Computed property that creates a binding for the error presentation state
+    @MainActor
     var isErrorPresented: Binding<Bool> {
         .init(get: {
             return self.state.error != nil

Example/Photos/With Stores/PhotoListViewStore.swift

@@ -165,11 +165,13 @@ extension PhotoListViewStoreType {
     }
 
     /// Computed property that creates a binding for the `showUpdateView` state
+    @MainActor
     var showUpdateView: Binding<Bool> {
         makeBinding(stateKeyPath: \.showUpdateView, actionCasePath: /PhotoListViewStore.Action.showUpdateView)
     }
 
     /// Computed property that creates a binding for the `showsPhotoCount` state
+    @MainActor
     var showsPhotoCount: Binding<Bool> {
 //
 //        return Binding<Bool> {
@@ -183,6 +185,7 @@ extension PhotoListViewStoreType {
     }
 
     /// Computed property that creates a binding for the `searchText` state
+    @MainActor
     var searchText: Binding<String> {
         makeBinding(stateKeyPath: \.searchText, actionCasePath: /Action.search)
     }

Sources/Store/MainQueueScheduler.swift

@@ -11,8 +11,7 @@ import SwiftUI
 
 /// Scheduler that allows you to either have a `default` implementation of the `DispatchQueue.main` scheduler,  a `synchronous` implementation that will immediately call back, a `test` scheduler for fine grained control of time, and an `animated` scheduler to drive animations.
 /// You will want to use this to avoid the behavior of `DispatchQueue.main`'s scheduler to schedule work asynchronously by default.
-@MainActor
-public final class MainQueueScheduler: @preconcurrency Scheduler {
+public final class MainQueueScheduler: Scheduler {
 
     /// Describes the characteristics of the scheduler.
     public enum SchedulerType: Equatable {

Sources/Store/Store+BindingAdditions.swift

@@ -6,8 +6,8 @@
 //
 
 import SwiftUI
-import CasePaths
-import Combine
+@preconcurrency import CasePaths
+@preconcurrency import Combine
 
 /// An extension on `Store` that provides conveniences for creating `Binding`s.
 public extension Store {
@@ -16,6 +16,7 @@ public extension Store {
     /// - Parameters:
     ///   - stateKeyPath: The `KeyPath` to the `State` property that this binding wraps.
     ///   - actionCasePath: The `CasePath` to the `Action` case associated with the `State` property.
+    @MainActor
     func makeBinding<Value>(stateKeyPath: KeyPath<State, Value>, actionCasePath: CasePath<Action, Value>) -> Binding<Value> {
         return .init {
             self.state[keyPath: stateKeyPath]
@@ -28,6 +29,7 @@ public extension Store {
     /// - Parameters:
     ///   - stateKeyPath: The `KeyPath` to the `State` property that this binding wraps.
     ///   - actionCasePath: The `CasePath` to the `Action` case associated with the `State` property.
+    @MainActor
     func makeBinding<Value>(stateKeyPath: KeyPath<State, Value>, actionCasePath: CasePath<Action, Void>) -> Binding<Value> {
         return .init {
             self.state[keyPath: stateKeyPath]
@@ -40,6 +42,7 @@ public extension Store {
     /// - Parameters:
     ///   - stateKeyPath: The `KeyPath` to the optional `State` property whose existence determines the wrapped value.
     ///   - actionCasePath: The `CasePath` to the `Action` case associated with the `State` property.
+    @MainActor
     func makeBinding<Value>(stateKeyPath: KeyPath<State, Value?>, actionCasePath: CasePath<Action, Void>) -> Binding<Bool> {
         return .init {
             self.state[keyPath: stateKeyPath] != nil
@@ -52,6 +55,7 @@ public extension Store {
     /// - Parameters:
     ///   - stateKeyPath: The `KeyPath` to the optional `State` property whose existence determines the wrapped value.
     ///   - actionCasePath: The `CasePath` to the `Action` case associated with the `State` property.
+    @MainActor
     func makeBinding<Value>(stateKeyPath: KeyPath<State, Value?>, actionCasePath: CasePath<Action, Value?>) -> Binding<Bool> {
         return .init {
             self.state[keyPath: stateKeyPath] != nil
@@ -68,6 +72,7 @@ public extension Store {
     /// - Parameters:
     ///   - stateKeyPath: The `KeyPath` to the `State` property that this binding wraps.
     ///   - publisher: The publisher to send the value to.
+    @MainActor
     func makeBinding<Value>(stateKeyPath: KeyPath<State, Value>, publisher: PassthroughSubject<Value, Never>) -> Binding<Value> {
         return .init {
             self.state[keyPath: stateKeyPath]
@@ -80,6 +85,7 @@ public extension Store {
     /// - Parameters:
     ///   - StateKeyPath: The `KeyPath` to the `State` property that this binding wraps.
     ///   - publisher: The publisher to send the value to.
+    @MainActor
     func makeBinding<Value>(stateKeyPath: KeyPath<State, Value>, publisher: CurrentValueSubject<Value, Never>) -> Binding<Value> {
         return .init {
             self.state[keyPath: stateKeyPath]

Sources/Store/Store.swift

@@ -9,7 +9,6 @@ import SwiftUI
 import Combine
 
 /// A store is an `ObservableObject` that allows us to separate business and/or view level logic and the rendering of views in a way that is repeatable, prescriptive, flexible, and testable by default.
-@MainActor
 public protocol Store<State, Action>: ObservableObject {
 
     /// A container type for state associated with the corresponding domain.