Bucket effect cancel IDs. (#3374)

* Bucket effect cancel IDs.

* wip

* wip

* remove cache reset

* wip

* wip

* wip

Author: mbrandonw

.github/package.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -24,12 +24,12 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
     .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
-    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.3.5"),
+    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"),
     .package(url: "https://github.com/pointfreeco/swift-navigation", from: "2.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-perception", from: "1.3.4"),
-    .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.2.2"),
+    .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),
     .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
     .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"601.0.0-prerelease"),
   ],

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -24,12 +24,12 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
     .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
-    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.3.5"),
+    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"),
     .package(url: "https://github.com/pointfreeco/swift-navigation", from: "2.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-perception", from: "1.3.4"),
-    .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.2.2"),
+    .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),
     .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
     .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"601.0.0-prerelease"),
   ],

Package.resolved

@@ -244,11 +244,18 @@ extension Task<Never, Never> {
   let discriminator: ObjectIdentifier
   let id: AnyHashable
   let navigationIDPath: NavigationIDPath
+  let testIdentifier: TestContext.Testing.Test.ID?
 
   init(id: some Hashable, navigationIDPath: NavigationIDPath) {
     self.discriminator = ObjectIdentifier(type(of: id))
     self.id = id
     self.navigationIDPath = navigationIDPath
+    switch TestContext.current {
+    case let .swiftTesting(.some(testing)):
+      self.testIdentifier = testing.test.id
+    default:
+      self.testIdentifier = nil
+    }
   }
 }
 

Package.swift

@@ -535,9 +535,6 @@ public final class TestStore<State, Action> {
   where State: Equatable, R.State == State, R.Action == Action {
     let sharedChangeTracker = SharedChangeTracker()
     let reducer = Dependencies.withDependencies {
-      if TestContext.current == .swiftTesting {
-        $0.resetCache()
-      }
       prepareDependencies(&$0)
       $0.sharedChangeTrackers.insert(sharedChangeTracker)
     } operation: {

[email protected]

@@ -0,0 +1,62 @@
+#if canImport(Testing)
+import ComposableArchitecture
+import Testing
+
+@Suite
+struct EffectCancellationIsolationTests {
+  @Test
+  func testIsolation1() async {
+    let store = await TestStore(initialState: Feature.State()) {
+      Feature()
+    }
+    await store.send(.start)
+    await store.receive(\.response) {
+      $0.value = 42
+    }
+    await store.send(.stop)
+  }
+
+  @Test
+  func testIsolation2() async {
+    let store = await TestStore(initialState: Feature.State()) {
+      Feature()
+    }
+    await store.send(.start)
+    await store.receive(\.response) {
+      $0.value = 42
+    }
+    await store.send(.stop)
+  }
+}
+
+@Reducer
+private struct Feature {
+  struct State: Equatable {
+    var value = 0
+  }
+  enum Action {
+    case response(Int)
+    case start
+    case stop
+  }
+  enum CancelID { case longLiving }
+  var body: some ReducerOf<Self> {
+    Reduce { state, action in
+      switch action {
+      case .response(let value):
+        state.value = value
+        return .none
+      case .start:
+        return .run { send in
+          await send(.response(42))
+          try await Task.never()
+        }
+          .cancellable(id: CancelID.longLiving, cancelInFlight: true)
+      case .stop:
+        return .cancel(id: CancelID.longLiving)
+      }
+    }
+  }
+}
+
+#endif

Sources/ComposableArchitecture/Effects/Cancellation.swift

@@ -11,6 +11,12 @@ final class EffectCancellationTests: BaseTCATestCase {
     self.cancellables.removeAll()
   }
 
+  override func invokeTest() {
+    withMainSerialExecutor {
+      super.invokeTest()
+    }
+  }
+
   func testCancellation() async {
     let values = LockIsolated<[Int]>([])