Deprecate Store.scope(state:) for view store observe

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-AlertsAndConfirmationDialogs.swift

@@ -112,11 +112,11 @@ struct AlertAndConfirmationDialogView: View {
     }
     .navigationTitle("Alerts & Dialogs")
     .alert(
-      self.store.scope(state: \.alert),
+      self.store.scope(state: \.alert, action: { $0 }),
       dismiss: .alertDismissed
     )
     .confirmationDialog(
-      self.store.scope(state: \.confirmationDialog),
+      self.store.scope(state: \.confirmationDialog, action: { $0 }),
       dismiss: .confirmationDialogDismissed
     )
   }

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift

@@ -139,7 +139,7 @@ struct AnimationsView: View {
         Button("Reset") { viewStore.send(.resetButtonTapped) }
           .padding([.horizontal, .bottom])
       }
-      .alert(self.store.scope(state: \.alert), dismiss: .alertDismissed)
+      .alert(self.store.scope(state: \.alert, action: { $0 }), dismiss: .alertDismissed)
       .navigationBarTitleDisplayMode(.inline)
     }
   }

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-SharedState.swift

@@ -218,7 +218,7 @@ struct SharedStateCounterView: View {
       }
       .padding(.top)
       .navigationTitle("Shared State Demo")
-      .alert(self.store.scope(state: \.alert), dismiss: .alertDismissed)
+      .alert(self.store.scope(state: \.alert, action: { $0 }), dismiss: .alertDismissed)
     }
   }
 }

Examples/CaseStudies/SwiftUICaseStudies/02-Effects-WebSocket.swift

@@ -180,7 +180,7 @@ struct WebSocketView: View {
           Text("Received messages")
         }
       }
-      .alert(self.store.scope(state: \.alert), dismiss: .alertDismissed)
+      .alert(self.store.scope(state: \.alert, action: { $0 }), dismiss: .alertDismissed)
       .navigationTitle("Web Socket")
     }
   }

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ReusableFavoriting.swift

@@ -77,7 +77,7 @@ struct FavoriteButton<ID: Hashable & Sendable>: View {
         Image(systemName: "heart")
           .symbolVariant(viewStore.isFavorite ? .fill : .none)
       }
-      .alert(self.store.scope(state: \.alert), dismiss: .alertDismissed)
+      .alert(self.store.scope(state: \.alert, action: { $0 }), dismiss: .alertDismissed)
     }
   }
 }

Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift

@@ -141,7 +141,10 @@ struct SpeechRecognitionView: View {
         }
       }
       .padding()
-      .alert(self.store.scope(state: \.alert), dismiss: .authorizationStateAlertDismissed)
+      .alert(
+        self.store.scope(state: \.alert, action: { $0 }),
+        dismiss: .authorizationStateAlertDismissed
+      )
     }
   }
 }

Examples/TicTacToe/tic-tac-toe/Sources/GameUIKit/GameViewController.swift

@@ -29,7 +29,7 @@ public final class GameViewController: UIViewController {
 
   public init(store: StoreOf<Game>) {
     self.store = store
-    self.viewStore = ViewStore(store.scope(state: ViewState.init))
+    self.viewStore = ViewStore(store, observe: ViewState.init)
     super.init(nibName: nil, bundle: nil)
   }
 

Examples/TicTacToe/tic-tac-toe/Sources/LoginSwiftUI/LoginView.swift

@@ -95,7 +95,7 @@ public struct LoginView: View {
         .disabled(viewStore.isLoginButtonDisabled)
       }
       .disabled(viewStore.isFormDisabled)
-      .alert(self.store.scope(state: \.alert), dismiss: .alertDismissed)
+      .alert(self.store.scope(state: \.alert, action: { $0 }), dismiss: .alertDismissed)
     }
     .navigationTitle("Login")
   }

Examples/TicTacToe/tic-tac-toe/Sources/LoginUIKit/LoginViewController.swift

@@ -40,7 +40,7 @@ public class LoginViewController: UIViewController {
 
   public init(store: StoreOf<Login>) {
     self.store = store
-    self.viewStore = ViewStore(store.scope(state: ViewState.init, action: Login.Action.init))
+    self.viewStore = ViewStore(store, observe: ViewState.init, send: Login.Action.init)
     super.init(nibName: nil, bundle: nil)
   }
 

Examples/TicTacToe/tic-tac-toe/Sources/NewGameUIKit/NewGameViewController.swift

@@ -33,7 +33,7 @@ public class NewGameViewController: UIViewController {
 
   public init(store: StoreOf<NewGame>) {
     self.store = store
-    self.viewStore = ViewStore(store.scope(state: ViewState.init, action: NewGame.Action.init))
+    self.viewStore = ViewStore(store, observe: ViewState.init, send: NewGame.Action.init)
     super.init(nibName: nil, bundle: nil)
   }
 

Examples/TicTacToe/tic-tac-toe/Sources/TwoFactorSwiftUI/TwoFactorView.swift

@@ -66,7 +66,7 @@ public struct TwoFactorView: View {
           }
         }
       }
-      .alert(self.store.scope(state: \.alert), dismiss: .alertDismissed)
+      .alert(self.store.scope(state: \.alert, action: { $0 }), dismiss: .alertDismissed)
       .disabled(viewStore.isFormDisabled)
       .navigationTitle("Confirmation Code")
     }

Examples/TicTacToe/tic-tac-toe/Sources/TwoFactorUIKit/TwoFactorViewController.swift

@@ -30,7 +30,7 @@ public final class TwoFactorViewController: UIViewController {
 
   public init(store: StoreOf<TwoFactor>) {
     self.store = store
-    self.viewStore = ViewStore(store.scope(state: ViewState.init, action: TwoFactor.Action.init))
+    self.viewStore = ViewStore(store, observe: ViewState.init, send: TwoFactor.Action.init)
     super.init(nibName: nil, bundle: nil)
   }
 

Examples/Todos/Todos/Todos.swift

@@ -111,7 +111,7 @@ struct AppView: View {
 
   init(store: StoreOf<Todos>) {
     self.store = store
-    self.viewStore = ViewStore(self.store.scope(state: ViewState.init(state:)))
+    self.viewStore = ViewStore(self.store, observe: ViewState.init(state:))
   }
 
   struct ViewState: Equatable {

Examples/VoiceMemos/VoiceMemos/VoiceMemos.swift

@@ -165,7 +165,7 @@ struct VoiceMemosView: View {
           .background(Color.init(white: 0.95))
         }
         .alert(
-          self.store.scope(state: \.alert),
+          self.store.scope(state: \.alert, action: { $0 }),
           dismiss: .alertDismissed
         )
         .navigationTitle("Voice memos")

Sources/ComposableArchitecture/Documentation.docc/Articles/Performance.md

@@ -184,7 +184,7 @@ struct AppView: View {
       TabView {
         ActivityView(
           store: self.store
-            .scope(state: \.activity, action: AppAction.activity
+            .scope(state: \.activity, action: AppAction.activity)
         )
         .badge("\(viewStore.unreadActivityCount)")
 

Sources/ComposableArchitecture/Internal/Deprecations.swift

@@ -5,6 +5,23 @@ import XCTestDynamicOverlay
 
 // MARK: - Deprecated after 0.52.0
 
+extension Store {
+  @available(
+    *,
+    deprecated,
+    message: """
+      'Store.scope' requires an explicit 'action' transform and is intended to be used to transform a store of a parent domain into a store of a child domain.
+
+      When transforming store state into view state, use the 'observe' parameter when constructing a view store.
+      """
+  )
+  public func scope<ChildState>(
+    state toChildState: @escaping (State) -> ChildState
+  ) -> Store<ChildState, Action> {
+    self.scope(state: toChildState, action: { $0 })
+  }
+}
+
 extension EffectPublisher {
   @available(
     *,
@@ -851,7 +868,7 @@ extension ForEachStore {
   {
     let data = store.state.value
     self.data = data
-    self.content = WithViewStore(store.scope(state: { $0.map { $0[keyPath: id] } })) { viewStore in
+    self.content = WithViewStore(store, observe: { $0.map { $0[keyPath: id] } }) { viewStore in
       ForEach(Array(viewStore.state.enumerated()), id: \.element) { index, _ in
         content(
           store.scope(

Sources/ComposableArchitecture/Store.swift

@@ -316,18 +316,6 @@ public final class Store<State, Action> {
     #endif
   }
 
-  /// Scopes the store to one that exposes child state.
-  ///
-  /// A version of ``scope(state:action:)`` that leaves the action type unchanged.
-  ///
-  /// - Parameter toChildState: A function that transforms `State` into `ChildState`.
-  /// - Returns: A new store with its domain (state and action) transformed.
-  public func scope<ChildState>(
-    state toChildState: @escaping (State) -> ChildState
-  ) -> Store<ChildState, Action> {
-    self.scope(state: toChildState, action: { $0 })
-  }
-
   func filter(
     _ isSent: @escaping (State, Action) -> Bool
   ) -> Store<State, Action> {
@@ -485,7 +473,7 @@ public final class Store<State, Action> {
 
   /// Returns a "stateless" store by erasing state to `Void`.
   public var stateless: Store<Void, Action> {
-    self.scope(state: { _ in () })
+    self.scope(state: { _ in () }, action: { $0 })
   }
 
   /// Returns an "actionless" store by erasing action to `Never`.

Sources/ComposableArchitecture/SwiftUI/IfLetStore.swift

@@ -9,7 +9,7 @@ import SwiftUI
 ///
 /// ```swift
 /// IfLetStore(
-///   store.scope(state: \SearchState.results, action: SearchAction.results),
+///   store.scope(state: \SearchState.results, action: SearchAction.results)
 /// ) {
 ///   SearchResultsView(store: $0)
 /// } else: {
@@ -59,10 +59,13 @@ public struct IfLetStore<State, Action, Content: View>: View {
           first: ifContent(
             store
               .filter { state, _ in state == nil ? !BindingLocal.isActive : true }
-              .scope {
-                state = $0 ?? state
-                return state
-              }
+              .scope(
+                state: {
+                  state = $0 ?? state
+                  return state
+                },
+                action: { $0 }
+              )
           )
         )
       } else {
@@ -88,10 +91,13 @@ public struct IfLetStore<State, Action, Content: View>: View {
         return ifContent(
           store
             .filter { state, _ in state == nil ? !BindingLocal.isActive : true }
-            .scope {
-              state = $0 ?? state
-              return state
-            }
+            .scope(
+              state: {
+                state = $0 ?? state
+                return state
+              },
+              action: { $0 }
+            )
         )
       } else {
         return nil

Sources/ComposableArchitecture/SwiftUI/WithViewStore.swift

@@ -339,7 +339,7 @@ public struct WithViewStore<ViewState, ViewAction, Content: View>: View {
     line: UInt = #line
   ) {
     self.init(
-      store: store.scope(state: toViewState),
+      store: store.scope(state: toViewState, action: { $0 }),
       removeDuplicates: isDuplicate,
       content: content,
       file: file,
@@ -591,7 +591,7 @@ extension WithViewStore where ViewState: Equatable, Content: View {
     line: UInt = #line
   ) {
     self.init(
-      store: store.scope(state: toViewState),
+      store: store.scope(state: toViewState, action: { $0 }),
       removeDuplicates: ==,
       content: content,
       file: file,

Sources/ComposableArchitecture/UIKit/IfLetUIKit.swift

@@ -54,10 +54,13 @@ extension Store {
       .sink { state in
         if var state = state {
           unwrap(
-            self.scope {
-              state = $0 ?? state
-              return state
-            }
+            self.scope(
+              state: {
+                state = $0 ?? state
+                return state
+              },
+              action: { $0 }
+            )
           )
         } else {
           `else`()

Tests/ComposableArchitectureTests/EffectDebounceTests.swift

@@ -10,8 +10,7 @@ final class EffectDebounceTests: BaseTCATestCase {
     let mainQueue = DispatchQueue.test
     var values: [Int] = []
 
-    // NB: Explicit @MainActor is needed for Swift 5.5.2
-    @MainActor func runDebouncedEffect(value: Int) {
+    func runDebouncedEffect(value: Int) {
       struct CancelToken: Hashable {}
       Just(value)
         .eraseToEffect()
@@ -57,8 +56,7 @@ final class EffectDebounceTests: BaseTCATestCase {
     var values: [Int] = []
     var effectRuns = 0
 
-    // NB: Explicit @MainActor is needed for Swift 5.5.2
-    @MainActor func runDebouncedEffect(value: Int) {
+    func runDebouncedEffect(value: Int) {
       struct CancelToken: Hashable {}
 
       Deferred { () -> Just<Int> in

Tests/ComposableArchitectureTests/EffectRunTests.swift

@@ -30,7 +30,7 @@ final class EffectRunTests: BaseTCATestCase {
         return .run { _ in
           struct Failure: Error {}
           throw Failure()
-        } catch: { @Sendable _, send in  // NB: Explicit '@Sendable' required in 5.5.2
+        } catch: { _, send in
           await send(.response)
         }
       case .response:
@@ -109,7 +109,7 @@ final class EffectRunTests: BaseTCATestCase {
           Task.cancel(id: CancelID.responseA)
           try Task.checkCancellation()
           await send(.responseA)
-        } catch: { @Sendable _, send in  // NB: Explicit '@Sendable' required in 5.5.2
+        } catch: { _, send in
           await send(.responseB)
         }
         .cancellable(id: CancelID.responseA)

Tests/ComposableArchitectureTests/EffectTaskTests.swift

@@ -29,7 +29,7 @@ final class EffectTaskTests: BaseTCATestCase {
         return .task {
           struct Failure: Error {}
           throw Failure()
-        } catch: { @Sendable _ in  // NB: Explicit '@Sendable' required in 5.5.2
+        } catch: { _ in
           .response
         }
       case .response:
@@ -106,7 +106,7 @@ final class EffectTaskTests: BaseTCATestCase {
           Task.cancel(id: CancelID.responseA)
           try Task.checkCancellation()
           return .responseA
-        } catch: { @Sendable _ in  // NB: Explicit '@Sendable' required in 5.5.2
+        } catch: { _ in
           .responseB
         }
         .cancellable(id: CancelID.responseA)

Tests/ComposableArchitectureTests/EffectThrottleTests.swift

@@ -14,9 +14,7 @@ final class EffectThrottleTests: BaseTCATestCase {
     var values: [Int] = []
     var effectRuns = 0
 
-    // NB: Explicit @MainActor is needed for Swift 5.5.2
-    @MainActor func runThrottledEffect(value: Int) {
-
+    func runThrottledEffect(value: Int) {
       Deferred { () -> Just<Int> in
         effectRuns += 1
         return Just(value)
@@ -71,9 +69,7 @@ final class EffectThrottleTests: BaseTCATestCase {
     var values: [Int] = []
     var effectRuns = 0
 
-    // NB: Explicit @MainActor is needed for Swift 5.5.2
-    @MainActor func runThrottledEffect(value: Int) {
-
+    func runThrottledEffect(value: Int) {
       Deferred { () -> Just<Int> in
         effectRuns += 1
         return Just(value)
@@ -140,8 +136,7 @@ final class EffectThrottleTests: BaseTCATestCase {
     var values: [Int] = []
     var effectRuns = 0
 
-    // NB: Explicit @MainActor is needed for Swift 5.5.2
-    @MainActor func runThrottledEffect(value: Int) {
+    func runThrottledEffect(value: Int) {
 
       Deferred { () -> Just<Int> in
         effectRuns += 1
@@ -188,8 +183,7 @@ final class EffectThrottleTests: BaseTCATestCase {
     var values: [Int] = []
     var effectRuns = 0
 
-    // NB: Explicit @MainActor is needed for Swift 5.5.2
-    @MainActor func runThrottledEffect(value: Int) {
+    func runThrottledEffect(value: Int) {
       Deferred { () -> Just<Int> in
         effectRuns += 1
         return Just(value)