@preconcurrency @MainActor isolation of Store

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-dependencies",
       "state" : {
-        "revision" : "cc26d06125dbc913c6d9e8a905a5db0b994509e0",
-        "version" : "1.3.5"
+        "revision" : "d7472be6b3c89251ce4c0db07d32405b43426781",
+        "version" : "1.3.7"
       }
     },
     {
@@ -113,8 +113,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-macro-testing",
       "state" : {
-        "revision" : "a35257b7e9ce44e92636447003a8eeefb77b145c",
-        "version" : "0.5.1"
+        "revision" : "20c1a8f3b624fb5d1503eadcaa84743050c350f4",
+        "version" : "0.5.2"
       }
     },
     {
@@ -131,8 +131,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
       "state" : {
-        "revision" : "c097f955b4e724690f0fc8ffb7a6d4b881c9c4e3",
-        "version" : "1.17.2"
+        "revision" : "6d932a79e7173b275b96c600c86c603cf84f153c",
+        "version" : "1.17.4"
       }
     },
     {

Sources/ComposableArchitecture/Internal/DispatchQueue.swift

@@ -12,6 +12,18 @@ func mainActorASAP(execute block: @escaping @MainActor @Sendable () -> Void) {
   }
 }
 
+func mainActorNow(execute block: @escaping @MainActor @Sendable () -> Void) {
+  if DispatchQueue.getSpecific(key: key) == value {
+    assumeMainActorIsolated {
+      block()
+    }
+  } else {
+    DispatchQueue.main.sync {
+      block()
+    }
+  }
+}
+
 private let key: DispatchSpecificKey<UInt8> = {
   let key = DispatchSpecificKey<UInt8>()
   DispatchQueue.main.setSpecific(key: key, value: value)
@@ -21,7 +33,11 @@ private let value: UInt8 = 0
 
 // NB: Currently we can't use 'MainActor.assumeIsolated' on CI, but we can approximate this in
 //     the meantime.
-@MainActor(unsafe)
+#if swift(<5.10)
+  @MainActor(unsafe)
+#else
+  @preconcurrency @MainActor
+#endif
 private func assumeMainActorIsolated(_ block: @escaping @MainActor @Sendable () -> Void) {
   block()
 }

Sources/ComposableArchitecture/Observation/ViewAction.swift

@@ -9,14 +9,15 @@ public protocol ViewAction<ViewAction> {
 }
 
 /// A type that represents a view with a ``Store`` that can send ``ViewAction``s.
+#if swift(<5.10)
+  @MainActor(unsafe)
+#else
+  @preconcurrency @MainActor
+#endif
 public protocol ViewActionSending<StoreState, StoreAction> {
   associatedtype StoreState
   associatedtype StoreAction: ViewAction
-  #if swift(>=5.10)
-    @MainActor @preconcurrency var store: Store<StoreState, StoreAction> { get }
-  #else
-    @MainActor(unsafe) var store: Store<StoreState, StoreAction> { get }
-  #endif
+  var store: Store<StoreState, StoreAction> { get }
 }
 
 extension ViewActionSending {

Sources/ComposableArchitecture/RootStore.swift

@@ -2,6 +2,7 @@ import Combine
 import Foundation
 
 @_spi(Internals)
+@MainActor
 public final class RootStore {
   private var bufferedActions: [Any] = []
   let didSet = CurrentValueRelay(())

Sources/ComposableArchitecture/Store.swift

@@ -132,6 +132,11 @@ import SwiftUI
 /// case. Further, all actions sent to the store and all scopes (see ``scope(state:action:)-90255``)
 /// of the store are also checked to make sure that work is performed on the main thread.
 @dynamicMemberLookup
+#if swift(<5.10)
+  @MainActor(unsafe)
+#else
+  @preconcurrency @MainActor
+#endif
 public final class Store<State, Action> {
   var canCacheChildren = true
   private var children: [ScopeID<State, Action>: AnyObject] = [:]
@@ -462,7 +467,7 @@ public final class Store<State, Action> {
 }
 
 extension Store: CustomDebugStringConvertible {
-  public var debugDescription: String {
+  public nonisolated var debugDescription: String {
     storeTypeName(of: self)
   }
 }

Sources/ComposableArchitecture/SwiftUI/Binding.swift

@@ -402,6 +402,11 @@ where Value: CustomDebugStringConvertible {
 /// Read <doc:Bindings> for more information.
 @dynamicMemberLookup
 @propertyWrapper
+#if swift(<5.10)
+  @MainActor(unsafe)
+#else
+  @preconcurrency @MainActor
+#endif
 public struct BindingViewStore<State> {
   let store: Store<State, BindingAction<State>>
   #if DEBUG

Sources/ComposableArchitecture/SwiftUI/PresentationModifier.swift

@@ -305,6 +305,11 @@ public struct AnyIdentifiable: Identifiable {
   }
 }
 
+#if swift(<5.10)
+  @MainActor(unsafe)
+#else
+  @preconcurrency @MainActor
+#endif
 @_spi(Presentation)
 public struct DestinationContent<State, Action> {
   let store: Store<State?, Action>

Sources/ComposableArchitecture/TestStore.swift

@@ -76,10 +76,9 @@ import IssueReporting
 /// One can assert against its behavior over time:
 ///
 /// ```swift
-/// @MainActor
 /// class CounterTests: XCTestCase {
 ///   func testCounter() async {
-///     let store = TestStore(
+///     let store = await TestStore(
 ///       // Given: a counter state of 0
 ///       initialState: Counter.State(count: 0),
 ///     ) {
@@ -423,6 +422,11 @@ import IssueReporting
 /// [merowing.info]: https://www.merowing.info
 /// [exhaustive-testing-in-tca]: https://www.merowing.info/exhaustive-testing-in-tca/
 /// [Composable-Architecture-at-Scale]: https://vimeo.com/751173570
+#if swift(<5.10)
+  @MainActor(unsafe)
+#else
+  @preconcurrency @MainActor
+#endif
 public final class TestStore<State, Action> {
 
   /// The current dependencies of the test store.
@@ -553,7 +557,6 @@ public final class TestStore<State, Action> {
   ///
   /// - Parameter duration: The amount of time to wait before asserting.
   @available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
-  @MainActor
   public func finish(
     timeout duration: Duration,
     fileID: StaticString = #fileID,
@@ -574,7 +577,6 @@ public final class TestStore<State, Action> {
   ///
   /// - Parameter nanoseconds: The amount of time to wait before asserting.
   @_disfavoredOverload
-  @MainActor
   public func finish(
     timeout nanoseconds: UInt64? = nil,
     fileID: StaticString = #fileID,
@@ -624,8 +626,8 @@ public final class TestStore<State, Action> {
   }
 
   deinit {
-    self.completed()
     uncheckedUseMainSerialExecutor = self.originalUseMainSerialExecutor
+    mainActorNow { self.completed() }
   }
 
   func completed() {
@@ -759,14 +761,13 @@ public final class TestStore<State, Action> {
   ///   - updateValuesForOperation: A closure for updating the store's dependency values for the
   ///     duration of the operation.
   ///   - operation: The operation.
-  @MainActor
   public func withDependencies<R>(
-    _ updateValuesForOperation: (_ dependencies: inout DependencyValues) async throws -> Void,
-    operation: @MainActor () async throws -> R
+    _ updateValuesForOperation: (_ dependencies: inout DependencyValues) throws -> Void,
+    operation: () async throws -> R
   ) async rethrows -> R {
     let previous = self.dependencies
     defer { self.dependencies = previous }
-    try await updateValuesForOperation(&self.dependencies)
+    try updateValuesForOperation(&self.dependencies)
     return try await operation()
   }
 
@@ -790,10 +791,9 @@ public final class TestStore<State, Action> {
   /// - Parameters:
   ///   - exhaustivity: The exhaustivity.
   ///   - operation: The operation.
-  @MainActor
   public func withExhaustivity<R>(
     _ exhaustivity: Exhaustivity,
-    operation: @MainActor () async throws -> R
+    operation: () async throws -> R
   ) async rethrows -> R {
     let previous = self.exhaustivity
     defer { self.exhaustivity = previous }
@@ -838,7 +838,6 @@ extension TestStore where State: Equatable {
   /// immediately after awaiting `store.send`:
   ///
   /// ```swift
-  /// @MainActor
   /// func testAnalytics() async {
   ///   let events = LockIsolated<[String]>([])
   ///   let analytics = AnalyticsClient(
@@ -847,7 +846,7 @@ extension TestStore where State: Equatable {
   ///     }
   ///   )
   ///
-  ///   let store = TestStore(initialState: Feature.State()) {
+  ///   let store = await TestStore(initialState: Feature.State()) {
   ///     Feature()
   ///   } withDependencies {
   ///     $0.analytics = analytics
@@ -893,7 +892,6 @@ extension TestStore where State: Equatable {
   ///     expected.
   /// - Returns: A ``TestStoreTask`` that represents the lifecycle of the effect executed when
   ///   sending the action.
-  @MainActor
   @discardableResult
   public func send(
     _ action: Action,
@@ -1024,7 +1022,6 @@ extension TestStore where State: Equatable {
   /// - Parameters:
   ///   - updateStateToExpectedResult: A closure that asserts against the current state of the test
   ///   store.
-  @MainActor
   public func assert(
     _ updateStateToExpectedResult: @escaping (_ state: inout State) throws -> Void,
     fileID: StaticString = #fileID,
@@ -1293,7 +1290,6 @@ extension TestStore where State: Equatable, Action: Equatable {
   ///     of the store after processing the given action. Do not provide a closure if no change
   ///     is expected.
   @available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
-  @MainActor
   public func receive(
     _ expectedAction: Action,
     timeout duration: Duration,
@@ -1342,7 +1338,6 @@ extension TestStore where State: Equatable, Action: Equatable {
   ///     the store. The mutable state sent to this closure must be modified to match the state of
   ///     the store after processing the given action. Do not provide a closure if no change is
   ///     expected.
-  @MainActor
   @_disfavoredOverload
   public func receive(
     _ expectedAction: Action,
@@ -1508,9 +1503,8 @@ extension TestStore where State: Equatable {
   ///     to the store. The mutable state sent to this closure must be modified to match the state
   ///     of the store after processing the given action. Do not provide a closure if no change is
   ///     expected.
-  @available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
-  @MainActor
   @_disfavoredOverload
+  @available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
   public func receive(
     _ isMatching: (_ action: Action) -> Bool,
     timeout duration: Duration,
@@ -1563,7 +1557,6 @@ extension TestStore where State: Equatable {
   ///     the store. The mutable state sent to this closure must be modified to match the state of
   ///     the store after processing the given action. Do not provide a closure if no change is
   ///     expected.
-  @MainActor
   @_disfavoredOverload
   public func receive(
     _ isMatching: (_ action: Action) -> Bool,
@@ -1641,7 +1634,6 @@ extension TestStore where State: Equatable {
   ///     the store. The mutable state sent to this closure must be modified to match the state of
   ///     the store after processing the given action. Do not provide a closure if no change is
   ///     expected.
-  @MainActor
   @_disfavoredOverload
   public func receive<Value>(
     _ actionCase: CaseKeyPath<Action, Value>,
@@ -1687,7 +1679,6 @@ extension TestStore where State: Equatable {
   ///     to the store. The mutable state sent to this closure must be modified to match the state
   ///     of the store after processing the given action. Do not provide a closure if no change is
   ///     expected.
-  @MainActor
   @_disfavoredOverload
   public func receive<Value: Equatable>(
     _ actionCase: CaseKeyPath<Action, Value>,
@@ -1764,7 +1755,6 @@ extension TestStore where State: Equatable {
     message:
       "Use the version of this operator with case key paths, instead. See the following migration guide for more information: https://pointfreeco.github.io/swift-composable-architecture/main/documentation/composablearchitecture/migratingto1.4#Using-case-key-paths"
   )
-  @MainActor
   @_disfavoredOverload
   public func receive<Value>(
     _ actionCase: AnyCasePath<Action, Value>,
@@ -1842,7 +1832,6 @@ extension TestStore where State: Equatable {
   ///     to the store. The mutable state sent to this closure must be modified to match the state
   ///     of the store after processing the given action. Do not provide a closure if no change is
   ///     expected.
-  @MainActor
   @_disfavoredOverload
   @available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
   public func receive<Value>(
@@ -1889,7 +1878,6 @@ extension TestStore where State: Equatable {
   ///     to the store. The mutable state sent to this closure must be modified to match the state
   ///     of the store after processing the given action. Do not provide a closure if no change is
   ///     expected.
-  @MainActor
   @_disfavoredOverload
   @available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
   public func receive<Value: Equatable>(
@@ -1919,7 +1907,6 @@ extension TestStore where State: Equatable {
     )
   }
 
-  @MainActor
   @_disfavoredOverload
   @available(
     iOS,
@@ -2103,7 +2090,6 @@ extension TestStore where State: Equatable {
     self.reducer.state = state
   }
 
-  @MainActor
   private func receiveAction(
     matching predicate: (Action) -> Bool,
     timeout nanoseconds: UInt64?,
@@ -2196,9 +2182,8 @@ extension TestStore where State: Equatable {
   ///     expected.
   /// - Returns: A ``TestStoreTask`` that represents the lifecycle of the effect executed when
   ///   sending the action.
-  @MainActor
-  @discardableResult
   @_disfavoredOverload
+  @discardableResult
   public func send(
     _ action: CaseKeyPath<Action, Void>,
     assert updateStateToExpectedResult: ((_ state: inout State) throws -> Void)? = nil,
@@ -2243,9 +2228,8 @@ extension TestStore where State: Equatable {
   ///     expected.
   /// - Returns: A ``TestStoreTask`` that represents the lifecycle of the effect executed when
   ///   sending the action.
-  @MainActor
-  @discardableResult
   @_disfavoredOverload
+  @discardableResult
   public func send<Value>(
     _ action: CaseKeyPath<Action, Value>,
     _ value: Value,
@@ -2288,7 +2272,6 @@ extension TestStore {
   ///
   /// - Parameter strict: When `true` and there are no in-flight actions to cancel, a test failure
   ///   will be reported.
-  @MainActor
   public func skipReceivedActions(
     strict: Bool = true,
     fileID: StaticString = #fileID,
@@ -2369,7 +2352,6 @@ extension TestStore {
   ///
   /// - Parameter strict: When `true` and there are no in-flight actions to cancel, a test failure
   ///   will be reported.
-  @MainActor
   public func skipInFlightEffects(
     strict: Bool = true,
     fileID: StaticString = #fileID,
@@ -2872,7 +2854,6 @@ public enum Exhaustivity: Equatable, Sendable {
 }
 
 extension TestStore {
-  @MainActor
   @available(
     *,
     unavailable,