State composition + Failable reducer + Compact features

App/WildWestOnline.xctestplan

@@ -28,80 +28,72 @@
       "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "AppTests",
-        "name" : "AppTests"
+        "identifier" : "GameCoreTests",
+        "name" : "GameCoreTests"
       }
     },
     {
       "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "GamePlayTests",
-        "name" : "GamePlayTests"
+        "identifier" : "AppCoreTests",
+        "name" : "AppCoreTests"
       }
     },
     {
-      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "GameCoreTests",
-        "name" : "GameCoreTests"
+        "identifier" : "NavigationCoreTests",
+        "name" : "NavigationCoreTests"
       }
     },
     {
-      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "AppCoreTests",
-        "name" : "AppCoreTests"
+        "identifier" : "CardsDataTests",
+        "name" : "CardsDataTests"
       }
     },
     {
-      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "CardsRepositoryTests",
-        "name" : "CardsRepositoryTests"
+        "identifier" : "SerializationTests",
+        "name" : "SerializationTests"
       }
     },
     {
-      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "HomeTests",
-        "name" : "HomeTests"
+        "identifier" : "GameUITests",
+        "name" : "GameUITests"
       }
     },
     {
-      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "SettingsCoreTests",
-        "name" : "SettingsCoreTests"
+        "identifier" : "HomeUITests",
+        "name" : "HomeUITests"
       }
     },
     {
-      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "SettingsTests",
-        "name" : "SettingsTests"
+        "identifier" : "SettingsUITests",
+        "name" : "SettingsUITests"
       }
     },
     {
-      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "SplashTests",
-        "name" : "SplashTests"
+        "identifier" : "SplashUITests",
+        "name" : "SplashUITests"
       }
     },
     {
-      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:WildWestOnline",
-        "identifier" : "UtilsTests",
-        "name" : "UtilsTests"
+        "identifier" : "SettingsCoreTests",
+        "name" : "SettingsCoreTests"
       }
     }
   ],

App/WildWestOnlineApp.swift

@@ -4,13 +4,16 @@
 //
 //  Created by Hugues Telolahy on 02/04/2023.
 //
-import App
 import AppCore
-import CardsRepository
+import CardsData
 import GameCore
+import GameUI
+import HomeUI
 import Redux
+import SettingsUI
 import SettingsCore
-import SettingsRepository
+import SettingsData
+import SplashUI
 import SwiftUI
 import Theme
 
@@ -20,7 +23,7 @@ struct WildWestOnlineApp: App {
 
     var body: some Scene {
         WindowGroup {
-            AppView {
+            ContentView {
                 createStore()
             }
             .environment(\.colorScheme, .light)
@@ -29,12 +32,71 @@ struct WildWestOnlineApp: App {
     }
 }
 
-private func createStore() -> Store<AppState> {
+struct ContentView: View {
+    @StateObject private var store: Store<AppState, Any>
+
+    public init(store: @escaping () -> Store<AppState, Any>) {
+        // SwiftUI ensures that the following initialization uses the
+        // closure only once during the lifetime of the view.
+        _store = StateObject(wrappedValue: store())
+    }
+
+    var body: some View {
+        Group {
+            switch store.state.screens.last {
+            case .splash:
+                SplashView {
+                    store.projection(SplashView.deriveState, SplashView.embedAction)
+                }
+
+            case .home:
+                HomeView {
+                    store.projection(HomeView.deriveState, HomeView.embedAction)
+                }
+
+            case .game:
+                GameView {
+                    store.projection(GameView.deriveState, GameView.embedAction)
+                }
+
+            default:
+                EmptyView()
+            }
+        }
+        .sheet(isPresented: Binding<Bool>(
+            get: { store.state.screens.last == .settings },
+            set: { _ in }
+        ), onDismiss: {
+        }, content: {
+            SettingsView {
+                store.projection(SettingsView.deriveState, SettingsView.embedAction)
+            }
+        })
+        .foregroundColor(.primary)
+    }
+}
+
+#Preview {
+    ContentView {
+        Store(initial: .preview)
+    }
+}
+
+private extension AppState {
+    static var preview: Self {
+        .init(
+            screens: [.home],
+            settings: SettingsState.makeBuilder().build(),
+            inventory: Inventory.makeBuilder().build()
+        )
+    }
+}
+
+private func createStore() -> Store<AppState, Any> {
     let settingsService = SettingsRepository()
     let cardsService = CardsRepository()
 
     let settings = SettingsState.makeBuilder()
-        .withInventory(cardsService.inventory)
         .withPlayersCount(settingsService.playersCount())
         .withWaitDelayMilliseconds(settingsService.waitDelayMilliseconds())
         .withSimulation(settingsService.isSimulationEnabled())
@@ -43,15 +105,26 @@ private func createStore() -> Store<AppState> {
 
     let initialState = AppState(
         screens: [.splash],
-        settings: settings
+        settings: settings,
+        inventory: cardsService.inventory
     )
 
-    return Store<AppState>(
+    return Store<AppState, Any>(
         initial: initialState,
         reducer: AppState.reducer,
         middlewares: [
-            Middlewares.lift(Middlewares.updateGame(), stateMap: { $0.game }),
-            Middlewares.lift(Middlewares.saveSettings(with: settingsService), stateMap: { $0.settings }),
+            Middlewares.lift(
+                Middlewares.updateGame(),
+                deriveState: { $0.game },
+                deriveAction: { $0 as? GameAction },
+                embedAction: { action, _ in action }
+            ),
+            Middlewares.lift(
+                Middlewares.saveSettings(with: settingsService),
+                deriveState: { $0.settings },
+                deriveAction: { $0 as? SettingsAction },
+                embedAction: { action, _ in action }
+            ),
             Middlewares.logger()
         ]
     )

README.md

@@ -54,8 +54,19 @@ Redux architecture is meant to protect changes in an application’s state. It f
 The app should have a single real Store, holding a single source-of-truth. 
 However, we can "derive" this store to small subsets, called store projections, that will handle a smaller part of the state for each screen. So we can map back-and-forth to the original store types.
 
-![](Docs/app_modules.png)
+#### Clean+Redux Principles
+- App = ∑ View(ViewState, ViewAction)
+- ViewState = derive(AppState)
+- ViewAction = extract(AppAction)
+- AppState = ∑ State
+- State = Reducer(State, Action)
+- Action = Middleware(State, Action, Service)
 
+#### Project structure
+
+The project is composed of SwiftPackage products with the following structure. 
+
+![](Docs/project_structure.png)
 
 
 ### Sequence diagram

WildWestOnline.xcodeproj/project.pbxproj

@@ -7,9 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		153E2F5B2C50C4A1003E9F54 /* CardsData in Frameworks */ = {isa = PBXBuildFile; productRef = 153E2F5A2C50C4A1003E9F54 /* CardsData */; };
+		153E2F5D2C50C4A1003E9F54 /* SettingsData in Frameworks */ = {isa = PBXBuildFile; productRef = 153E2F5C2C50C4A1003E9F54 /* SettingsData */; };
+		153E2F5F2C50C6DE003E9F54 /* GameUI in Frameworks */ = {isa = PBXBuildFile; productRef = 153E2F5E2C50C6DE003E9F54 /* GameUI */; };
+		153E2F612C50C6DE003E9F54 /* HomeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 153E2F602C50C6DE003E9F54 /* HomeUI */; };
+		153E2F632C50C6DE003E9F54 /* SettingsUI in Frameworks */ = {isa = PBXBuildFile; productRef = 153E2F622C50C6DE003E9F54 /* SettingsUI */; };
+		153E2F652C50C6DE003E9F54 /* SplashUI in Frameworks */ = {isa = PBXBuildFile; productRef = 153E2F642C50C6DE003E9F54 /* SplashUI */; };
 		2699EF0129D93AD00030ACCD /* WildWestOnlineApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2699EF0029D93AD00030ACCD /* WildWestOnlineApp.swift */; };
 		2699EF0529D93AD10030ACCD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2699EF0429D93AD10030ACCD /* Assets.xcassets */; };
-		26E6D66D2B2480C1009643EB /* App in Frameworks */ = {isa = PBXBuildFile; productRef = 26E6D66C2B2480C1009643EB /* App */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,7 +32,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				26E6D66D2B2480C1009643EB /* App in Frameworks */,
+				153E2F5F2C50C6DE003E9F54 /* GameUI in Frameworks */,
+				153E2F652C50C6DE003E9F54 /* SplashUI in Frameworks */,
+				153E2F612C50C6DE003E9F54 /* HomeUI in Frameworks */,
+				153E2F632C50C6DE003E9F54 /* SettingsUI in Frameworks */,
+				153E2F5D2C50C4A1003E9F54 /* SettingsData in Frameworks */,
+				153E2F5B2C50C4A1003E9F54 /* CardsData in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -88,7 +98,12 @@
 			);
 			name = WildWestOnline;
 			packageProductDependencies = (
-				26E6D66C2B2480C1009643EB /* App */,
+				153E2F5A2C50C4A1003E9F54 /* CardsData */,
+				153E2F5C2C50C4A1003E9F54 /* SettingsData */,
+				153E2F5E2C50C6DE003E9F54 /* GameUI */,
+				153E2F602C50C6DE003E9F54 /* HomeUI */,
+				153E2F622C50C6DE003E9F54 /* SettingsUI */,
+				153E2F642C50C6DE003E9F54 /* SplashUI */,
 			);
 			productName = ReduxGameDSL;
 			productReference = 2699EEFD29D93AD00030ACCD /* WildWestOnline.app */;
@@ -375,9 +390,29 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		26E6D66C2B2480C1009643EB /* App */ = {
+		153E2F5A2C50C4A1003E9F54 /* CardsData */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = App;
+			productName = CardsData;
+		};
+		153E2F5C2C50C4A1003E9F54 /* SettingsData */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = SettingsData;
+		};
+		153E2F5E2C50C6DE003E9F54 /* GameUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = GameUI;
+		};
+		153E2F602C50C6DE003E9F54 /* HomeUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = HomeUI;
+		};
+		153E2F622C50C6DE003E9F54 /* SettingsUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = SettingsUI;
+		};
+		153E2F642C50C6DE003E9F54 /* SplashUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = SplashUI;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};