wip

Author: mbrandonw

Sources/ComposableArchitecture/Core.swift

@@ -61,11 +61,11 @@ final class RootCore<Root: Reducer>: Core {
     self.reducer = reducer
   }
   func send(_ action: Root.Action) -> Task<Void, Never>? {
-    _withoutPerceptionChecking {
-      _send(action)
-    }
+      _withoutPerceptionChecking {
+        _send(action)
+      }
   }
-  func _send(_ action: Root.Action) -> Task<Void, Never>? {
+  private func _send(_ action: Root.Action) -> Task<Void, Never>? {
     self.bufferedActions.append(action)
     guard !self.isSending else { return nil }
 

Sources/ComposableArchitecture/Internal/NavigationID.swift

@@ -1,3 +1,4 @@
+import Foundation
 @_spi(Reflection) import CasePaths
 
 extension DependencyValues {
@@ -38,8 +39,6 @@ struct NavigationID: Hashable, @unchecked Sendable {
   private let identifier: AnyHashable?
   private let tag: UInt32?
 
-
-
   enum Kind: Hashable {
     case casePath(root: Any.Type, value: Any.Type)
     case keyPath(AnyKeyPath)
@@ -113,10 +112,10 @@ struct NavigationID: Hashable, @unchecked Sendable {
     }
   }
 
-  init(kind: Kind, identifier: AnyHashable?, tag: UInt32?) {
-    self.kind = kind
-    self.identifier = identifier
-    self.tag = tag
+  init() {
+    self.kind = .keyPath(\Void.self)
+    self.identifier = UUID()
+    self.tag = nil
   }
 
   static func == (lhs: Self, rhs: Self) -> Bool {

Sources/ComposableArchitecture/Reducer/Reducers/DependencyKeyWritingReducer.swift

@@ -76,7 +76,9 @@ extension Reducer {
     //     specialization defined below from being called, which fuses chained calls.
     -> _DependencyKeyWritingReducer<Self>
   {
-    _DependencyKeyWritingReducer(base: self) { $0[keyPath: keyPath] = value }
+    _DependencyKeyWritingReducer(base: self) {
+      $0[keyPath: keyPath] = value
+    }
   }
 
   /// Places a value in the reducer's dependencies.
@@ -144,7 +146,9 @@ extension Reducer {
     //     specialization defined below from being called, which fuses chained calls.
     -> _DependencyKeyWritingReducer<Self>
   {
-    _DependencyKeyWritingReducer(base: self) { transform(&$0[keyPath: keyPath]) }
+    _DependencyKeyWritingReducer(base: self) {
+      transform(&$0[keyPath: keyPath])
+    }
   }
 }
 

Sources/ComposableArchitecture/Store.swift

@@ -174,19 +174,11 @@ public final class Store<State, Action> {
     @ReducerBuilder<State, Action> reducer: () -> R,
     withDependencies prepareDependencies: ((inout DependencyValues) -> Void)? = nil
   ) {
-    let prepDeps: (inout DependencyValues) -> Void = {
-      $0.navigationIDPath = NavigationIDPath(path: [
-        NavigationID(
-          kind: .keyPath(\State.self),
-          identifier: UUID(),
-          tag: nil
-        )
-      ])
-      prepareDependencies?(&$0)
-    }
-    let (initialState, reducer, dependencies) = withDependencies(prepDeps) {
+    let (initialState, reducer, dependencies) = withDependencies(prepareDependencies ?? { _ in }) {
       @Dependency(\.self) var dependencies
-      return (initialState(), reducer(), dependencies)
+      var updatedDependencies = dependencies
+      updatedDependencies.navigationIDPath = NavigationIDPath(path: [NavigationID()])
+      return (initialState(), reducer(), updatedDependencies)
     }
     self.init(
       initialState: initialState,

Sources/ComposableArchitecture/TestStore.swift

@@ -541,6 +541,7 @@ public final class TestStore<State: Equatable, Action> {
     let reducer = Dependencies.withDependencies {
       prepareDependencies(&$0)
       sharedChangeTracker.track(&$0)
+      $0.navigationIDPath = NavigationIDPath(path: [NavigationID()])
     } operation: {
       TestReducer(Reduce(reducer()), initialState: initialState())
     }

Tests/ComposableArchitectureTests/StoreTests.swift

@@ -1235,6 +1235,30 @@ final class StoreTests: BaseTCATestCase {
     XCTAssertEqual(store1.count, 42)
     XCTAssertEqual(store2.count, 0)
   }
+
+  @available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
+  @MainActor func testRootStoreCancellationIsolation_TestStore() async throws {
+    let clock = TestClock()
+    let store1 = TestStore(initialState: RootStoreCancellationIsolation.State()) {
+      RootStoreCancellationIsolation()
+    } withDependencies: {
+      $0.continuousClock = clock
+    }
+    let store2 = TestStore(initialState: RootStoreCancellationIsolation.State()) {
+      RootStoreCancellationIsolation()
+    } withDependencies: {
+      $0.continuousClock = clock
+    }
+    await store1.send(.tap)
+    await store2.send(.tap)
+    try await Task.sleep(nanoseconds: 100_000_000)
+    await store2.send(.cancelButtonTapped)
+    await clock.run()
+    await store1.receive(\.response) {
+      $0.count = 42
+    }
+  }
+
   @available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
   @Reducer struct RootStoreCancellationIsolation {
     @ObservableState struct State: Equatable {