Cancel effects when root store deinits.

Author: mbrandonw

Package.resolved

@@ -52,14 +52,14 @@ public final class RootStore {
         defer { index += 1 }
         let action = self.bufferedActions[index] as! Action
         let effect = reducer.reduce(into: &currentState, action: action)
+        let uuid = UUID()
 
         switch effect.operation {
         case .none:
           break
         case let .publisher(publisher):
           var didComplete = false
           let boxedTask = Box<Task<Void, Never>?>(wrappedValue: nil)
-          let uuid = UUID()
           let effectCancellable = withEscapedDependencies { continuation in
             publisher
               .receive(on: UIScheduler.shared)
@@ -88,11 +88,13 @@ public final class RootStore {
             }
             boxedTask.wrappedValue = task
             tasks.withValue { $0.append(task) }
-            self.effectCancellables[uuid] = effectCancellable
+            self.effectCancellables[uuid] = AnyCancellable {
+              task.cancel()
+            }
           }
         case let .run(priority, operation):
           withEscapedDependencies { continuation in
-            let task = Task(priority: priority) { @MainActor in
+            let task = Task(priority: priority) { @MainActor [weak self] in
               let isCompleted = LockIsolated(false)
               defer { isCompleted.setValue(true) }
               await operation(
@@ -118,14 +120,18 @@ public final class RootStore {
                     )
                   }
                   if let task = continuation.yield({
-                    self.send(effectAction, originatingFrom: action)
+                    self?.send(effectAction, originatingFrom: action)
                   }) {
                     tasks.withValue { $0.append(task) }
                   }
                 }
               )
+              self?.effectCancellables[uuid] = nil
             }
             tasks.withValue { $0.append(task) }
+            self.effectCancellables[uuid] = AnyCancellable {
+              task.cancel()
+            }
           }
         }
       }

Sources/ComposableArchitecture/RootStore.swift

@@ -69,9 +69,9 @@ final class StoreLifetimeTests: BaseTCATestCase {
 
     @MainActor
     func testStoreDeinit_RunningEffect() async {
-      XCTTODO(
-        "We would like for this to pass, but it requires full deprecation of uncached child stores"
-      )
+//      XCTTODO(
+//        "We would like for this to pass, but it requires full deprecation of uncached child stores"
+//      )
       Logger.shared.isEnabled = true
       let effectFinished = self.expectation(description: "Effect finished")
       do {
@@ -99,9 +99,9 @@ final class StoreLifetimeTests: BaseTCATestCase {
 
     @MainActor
     func testStoreDeinit_RunningCombineEffect() async {
-      XCTTODO(
-        "We would like for this to pass, but it requires full deprecation of uncached child stores"
-      )
+//      XCTTODO(
+//        "We would like for this to pass, but it requires full deprecation of uncached child stores"
+//      )
       Logger.shared.isEnabled = true
       let effectFinished = self.expectation(description: "Effect finished")
       do {