Update Tic-Tac-Toe to use enum state (#595)

* Update Tic-Tac-Toe to use enum state

* wip

* more swift compatability changes

Co-authored-by: Brandon Williams <[email protected]>

Author: mluisbrown

Examples/TicTacToe/Sources/Core/AppCore.swift

@@ -5,11 +5,11 @@ import LoginCore
 import NewGameCore
 import ReactiveSwift
 
-public struct AppState: Equatable {
-  public var login: LoginState? = LoginState()
-  public var newGame: NewGameState?
+public enum AppState: Equatable {
+  case login(LoginState)
+  case newGame(NewGameState)
 
-  public init() {}
+  public init() { self = .login(.init()) }
 }
 
 public enum AppAction: Equatable {
@@ -31,8 +31,8 @@ public struct AppEnvironment {
 }
 
 public let appReducer = Reducer<AppState, AppAction, AppEnvironment>.combine(
-  loginReducer.optional().pullback(
-    state: \.login,
+  loginReducer.pullback(
+    state: /AppState.login,
     action: /AppAction.login,
     environment: {
       LoginEnvironment(
@@ -41,25 +41,23 @@ public let appReducer = Reducer<AppState, AppAction, AppEnvironment>.combine(
       )
     }
   ),
-  newGameReducer.optional().pullback(
-    state: \.newGame,
+  newGameReducer.pullback(
+    state: /AppState.newGame,
     action: /AppAction.newGame,
     environment: { _ in NewGameEnvironment() }
   ),
   Reducer { state, action, _ in
     switch action {
     case let .login(.twoFactor(.twoFactorResponse(.success(response)))),
       let .login(.loginResponse(.success(response))) where !response.twoFactorRequired:
-      state.newGame = NewGameState()
-      state.login = nil
+      state = .newGame(.init())
       return .none
 
     case .login:
       return .none
 
     case .newGame(.logoutButtonTapped):
-      state.newGame = nil
-      state.login = LoginState()
+      state = .login(.init())
       return .none
 
     case .newGame:

Examples/TicTacToe/Sources/Views-SwiftUI/AppSwiftView.swift

@@ -12,19 +12,20 @@ public struct AppView: View {
     self.store = store
   }
 
-  @ViewBuilder public var body: some View {
-    IfLetStore(self.store.scope(state: \.login, action: AppAction.login)) { store in
-      NavigationView {
-        LoginView(store: store)
+  public var body: some View {
+    SwitchStore(self.store) {
+      CaseLet(state: /AppState.login, action: AppAction.login) { store in
+        NavigationView {
+          LoginView(store: store)
+        }
+        .navigationViewStyle(StackNavigationViewStyle())
       }
-      .navigationViewStyle(StackNavigationViewStyle())
-    }
-
-    IfLetStore(self.store.scope(state: \.newGame, action: AppAction.newGame)) { store in
-      NavigationView {
-        NewGameView(store: store)
+      CaseLet(state: /AppState.newGame, action: AppAction.newGame) { store in
+        NavigationView {
+          NewGameView(store: store)
+        }
+        .navigationViewStyle(StackNavigationViewStyle())
       }
-      .navigationViewStyle(StackNavigationViewStyle())
     }
   }
 }

Examples/TicTacToe/Sources/Views-UIKit/AppViewController.swift

@@ -35,13 +35,13 @@ class AppViewController: UINavigationController {
     super.viewDidLoad()
 
     self.store
-      .scope(state: \.login, action: AppAction.login)
+      .scope(state: /AppState.login, action: AppAction.login)
       .ifLet(then: { [weak self] loginStore in
         self?.setViewControllers([LoginViewController(store: loginStore)], animated: false)
       })
 
     self.store
-      .scope(state: \.newGame, action: AppAction.newGame)
+      .scope(state: /AppState.newGame, action: AppAction.newGame)
       .ifLet(then: { [weak self] newGameStore in
         self?.setViewControllers([NewGameViewController(store: newGameStore)], animated: false)
       })

Sources/ComposableArchitecture/SwiftUI/SwitchStore.swift

@@ -69,9 +69,9 @@ public struct SwitchStore<State, Action, Content>: View where Content: View {
 public struct CaseLet<GlobalState, GlobalAction, LocalState, LocalAction, Content>: View
 where Content: View {
   @EnvironmentObject private var store: StoreObservableObject<GlobalState, GlobalAction>
-  let toLocalState: (GlobalState) -> LocalState?
-  let fromLocalAction: (LocalAction) -> GlobalAction
-  let content: (Store<LocalState, LocalAction>) -> Content
+  public let toLocalState: (GlobalState) -> LocalState?
+  public let fromLocalAction: (LocalAction) -> GlobalAction
+  public let content: (Store<LocalState, LocalAction>) -> Content
 
   /// Initializes a `CaseLet` view that computes content depending on if a store of enum state
   /// matches a particular case.
@@ -158,10 +158,9 @@ extension SwitchStore {
 
   public init<State1, Action1, Content1>(
     _ store: Store<State, Action>,
-    @ViewBuilder content: @escaping ()
-      -> CaseLet<State, Action, State1, Action1, Content1>,
     file: StaticString = #file,
-    line: UInt = #line
+    line: UInt = #line,
+    @ViewBuilder content: @escaping () -> CaseLet<State, Action, State1, Action1, Content1>
   )
   where
     Content == WithViewStore<
@@ -216,12 +215,14 @@ extension SwitchStore {
 
   public init<State1, Action1, Content1, State2, Action2, Content2>(
     _ store: Store<State, Action>,
-    @ViewBuilder content: @escaping () -> TupleView<(
-      CaseLet<State, Action, State1, Action1, Content1>,
-      CaseLet<State, Action, State2, Action2, Content2>
-    )>,
     file: StaticString = #file,
-    line: UInt = #line
+    line: UInt = #line,
+    @ViewBuilder content: @escaping () -> TupleView<
+      (
+        CaseLet<State, Action, State1, Action1, Content1>,
+        CaseLet<State, Action, State2, Action2, Content2>
+      )
+    >
   )
   where
     Content == WithViewStore<
@@ -291,13 +292,15 @@ extension SwitchStore {
 
   public init<State1, Action1, Content1, State2, Action2, Content2, State3, Action3, Content3>(
     _ store: Store<State, Action>,
-    @ViewBuilder content: @escaping () -> TupleView<(
-      CaseLet<State, Action, State1, Action1, Content1>,
-      CaseLet<State, Action, State2, Action2, Content2>,
-      CaseLet<State, Action, State3, Action3, Content3>
-    )>,
     file: StaticString = #file,
-    line: UInt = #line
+    line: UInt = #line,
+    @ViewBuilder content: @escaping () -> TupleView<
+      (
+        CaseLet<State, Action, State1, Action1, Content1>,
+        CaseLet<State, Action, State2, Action2, Content2>,
+        CaseLet<State, Action, State3, Action3, Content3>
+      )
+    >
   )
   where
     Content == WithViewStore<
@@ -384,14 +387,16 @@ extension SwitchStore {
     State4, Action4, Content4
   >(
     _ store: Store<State, Action>,
-    @ViewBuilder content: @escaping () -> TupleView<(
-      CaseLet<State, Action, State1, Action1, Content1>,
-      CaseLet<State, Action, State2, Action2, Content2>,
-      CaseLet<State, Action, State3, Action3, Content3>,
-      CaseLet<State, Action, State4, Action4, Content4>
-    )>,
     file: StaticString = #file,
-    line: UInt = #line
+    line: UInt = #line,
+    @ViewBuilder content: @escaping () -> TupleView<
+      (
+        CaseLet<State, Action, State1, Action1, Content1>,
+        CaseLet<State, Action, State2, Action2, Content2>,
+        CaseLet<State, Action, State3, Action3, Content3>,
+        CaseLet<State, Action, State4, Action4, Content4>
+      )
+    >
   )
   where
     Content == WithViewStore<
@@ -490,15 +495,17 @@ extension SwitchStore {
     State5, Action5, Content5
   >(
     _ store: Store<State, Action>,
-    @ViewBuilder content: @escaping () -> TupleView<(
-      CaseLet<State, Action, State1, Action1, Content1>,
-      CaseLet<State, Action, State2, Action2, Content2>,
-      CaseLet<State, Action, State3, Action3, Content3>,
-      CaseLet<State, Action, State4, Action4, Content4>,
-      CaseLet<State, Action, State5, Action5, Content5>
-    )>,
     file: StaticString = #file,
-    line: UInt = #line
+    line: UInt = #line,
+    @ViewBuilder content: @escaping () -> TupleView<
+      (
+        CaseLet<State, Action, State1, Action1, Content1>,
+        CaseLet<State, Action, State2, Action2, Content2>,
+        CaseLet<State, Action, State3, Action3, Content3>,
+        CaseLet<State, Action, State4, Action4, Content4>,
+        CaseLet<State, Action, State5, Action5, Content5>
+      )
+    >
   )
   where
     Content == WithViewStore<