Merge pull request #67 from Maks-Jago/1.4.8

1.4.8

Author: Maks-Jago

Package.swift

@@ -7,7 +7,7 @@ let package = Package(
     name: "SwiftUI-UDF",
     platforms: [
         .iOS(.v16),
-        .macOS(.v13),
+        .macOS(.v12),
     ],
     products: [
         .library(

Tests/SwiftUI-UDF-ConcurrencyTests/ContainersRedrawing/ContainerScopeTests.swift

@@ -52,12 +52,12 @@ final class ContainerScopeTests: XCTestCase {
     func test_componentRenderingAfterStateMutation() async {
         let store = EnvironmentStore(initial: AppState(), logger: TestStoreLogger())
 
-        let itemsContainer = ItemsListContainer()
+        let itemsContainer = await ItemsListContainer()
         let window = await PlatformWindow.render(container: itemsContainer)
 
         store.dispatch(Actions.UpdateFormField(keyPath: \PlainForm.title, value: "title 1"))
         await fulfill(description: "waiting for rendering", sleep: 1)
-        print(window) // To force a window redraw
+        await window.redraw()
         await fulfill(description: "waiting for rendering", sleep: 1)
 
         XCTAssertEqual(itemsContainer.renderingNumber, 2)
@@ -66,7 +66,7 @@ final class ContainerScopeTests: XCTestCase {
     func test_rootComponentRendering() async {
         let store = EnvironmentStore(initial: AppState(), logger: TestStoreLogger())
 
-        let rootContainer = RootContainer()
+        let rootContainer = await RootContainer()
         let window = await PlatformWindow.render(container: rootContainer)
 
         store.dispatch(Actions.UpdateFormField(keyPath: \PlainForm.title, value: "title 1"))
@@ -76,21 +76,21 @@ final class ContainerScopeTests: XCTestCase {
         store.dispatch(Actions.UpdateFormField(keyPath: \UserData.isUserLoggedIn, value: true))
         await fulfill(description: "waiting for rendering", sleep: 1)
 
-        print(window) // To force a window redraw
+        await window.redraw()
         await fulfill(description: "waiting for rendering", sleep: 1)
         XCTAssertEqual(rootContainer.renderingNumber, 2)
 
         store.dispatch(Actions.UpdateFormField(keyPath: \UserData.isUserLoggedIn, value: false))
         await fulfill(description: "waiting for rendering", sleep: 1)
 
-        print(window) // To force a window redraw
+        await window.redraw()
         await fulfill(description: "waiting for rendering", sleep: 1)
         XCTAssertEqual(rootContainer.renderingNumber, 3)
 
         store.dispatch(Actions.UpdateFormField(keyPath: \PlainForm.title, value: "title 2"))
         await fulfill(description: "waiting for rendering", sleep: 1)
 
-        print(window) // To force a window redraw
+        await window.redraw()
         await fulfill(description: "waiting for rendering", sleep: 1)
         XCTAssertEqual(rootContainer.renderingNumber, 3)
     }

Tests/SwiftUI-UDF-ConcurrencyTests/ContainersRedrawing/ContainerWithAppStateAsScopeTests.swift

@@ -45,7 +45,7 @@ final class ContainerWithAppStateAsScopeTests: XCTestCase {
     #if os(iOS)
         func test_rootComponentRendering() async {
             let store = EnvironmentStore(initial: AppState(), logger: TestStoreLogger())
-            let rootContainer = RootContainer()
+            let rootContainer = await RootContainer()
             let window = await PlatformWindow.render(container: rootContainer)
 
             XCTAssertEqual(rootContainer.renderingNumber, 0)
@@ -55,35 +55,35 @@ final class ContainerWithAppStateAsScopeTests: XCTestCase {
             store.dispatch(Actions.UpdateFormField(keyPath: \PlainForm.title, value: "title 1"))
             await fulfill(description: "waiting for rendering", sleep: 1)
 
-            print(window) // To force a window redraw
+            await window.redraw()
             await fulfill(description: "waiting for rendering", sleep: 1)
             XCTAssertEqual(rootContainer.renderingNumber, 2)
 
             store.dispatch(Actions.UpdateFormField(keyPath: \UserData.isUserLoggedIn, value: true))
             await fulfill(description: "waiting for rendering", sleep: 1)
 
-            print(window) // To force a window redraw
+            await window.redraw()
             await fulfill(description: "waiting for rendering", sleep: 1)
             XCTAssertEqual(rootContainer.renderingNumber, 3)
 
             store.dispatch(Actions.UpdateFormField(keyPath: \UserData.isUserLoggedIn, value: false))
             await fulfill(description: "waiting for rendering", sleep: 1)
 
-            print(window) // To force a window redraw
+            await window.redraw()
             await fulfill(description: "waiting for rendering", sleep: 1)
             XCTAssertEqual(rootContainer.renderingNumber, 4)
 
             store.dispatch(Actions.UpdateFormField(keyPath: \PlainForm.title, value: "title 2"))
             await fulfill(description: "waiting for rendering", sleep: 1)
 
-            print(window) // To force a window redraw
+            await window.redraw()
             await fulfill(description: "waiting for rendering", sleep: 1)
             XCTAssertEqual(rootContainer.renderingNumber, 5)
         }
 
         func test_noneScope() async {
             let store = EnvironmentStore(initial: AppState(), logger: TestStoreLogger())
-            let noneScopeContainer = NoneScopeContainer()
+            let noneScopeContainer = await NoneScopeContainer()
             let window = await PlatformWindow.render(container: noneScopeContainer)
 
             XCTAssertEqual(noneScopeContainer.renderingNumber, 0)
@@ -93,7 +93,7 @@ final class ContainerWithAppStateAsScopeTests: XCTestCase {
             store.dispatch(Actions.UpdateFormField(keyPath: \PlainForm.title, value: "title 1"))
             await fulfill(description: "waiting for rendering", sleep: 1)
 
-            print(window) // To force a window redraw
+            await window.redraw()
             XCTAssertEqual(noneScopeContainer.renderingNumber, 1)
         }
     #endif

Tests/SwiftUI-UDF-Tests/BindableReducers/BindableReducersMiddlewareTests.swift

@@ -36,6 +36,20 @@ final class BindableReducersMiddlewareTests: XCTestCase {
         }
     }
 
+    struct ItemReducible: UDF.Reducible {
+        var didLoadItemReduced: Int = 0
+
+        mutating func reduce(_ action: some Action) {
+            switch action {
+            case is Actions.DidLoadItem<Item>:
+                didLoadItemReduced += 1
+
+            default:
+                break
+            }
+        }
+    }
+
     enum ItemsFlow: IdentifiableFlow {
         case none, loading
 
@@ -60,6 +74,8 @@ final class BindableReducersMiddlewareTests: XCTestCase {
 
         @BindableReducer(ItemsFlow.self, bindedTo: ItemsContainer.self)
         fileprivate var itemsFlow
+
+        var itemReducible = ItemReducible()
     }
 
     func test_WhenLoadingDataForBindableReducers_OnleConcreteInstanceOfBindableFormShouldBeUpdated() async throws {
@@ -104,6 +120,33 @@ final class BindableReducersMiddlewareTests: XCTestCase {
         let itemsForm4: ItemsForm = try await XCTUnwrapAsync(await store.state.itemsForm[Item.ID(value: 4)])
         XCTAssertNotNil(itemsForm4.item)
     }
+
+    func test_WhenDispatchingBindedAction_DuplicationShouldBePrevented() async throws {
+        let store = await XCTestStore(initial: AppState())
+        await store.subscribe(ItemsMiddleware.self)
+
+        await store.dispatch(Actions._OnContainerDidLoad(containerType: ItemsContainer.self, id: .init(value: 1)))
+
+        let bindedReducersFormCount = try await XCTUnwrapAsync(await store.state.itemsForm).reducers.count
+        XCTAssertEqual(bindedReducersFormCount, 1)
+
+        let bindedReducersFlowCount = try await XCTUnwrapAsync(await store.state.itemsFlow).reducers.count
+        XCTAssertEqual(bindedReducersFlowCount, 1)
+
+        await store.dispatch(
+            ActionGroup {
+                Actions.LoadItem(id: .init(value: 1))
+            }.binded(to: ItemsContainer.self, by: Item.ID(value: 1))
+        )
+
+        await store.wait()
+
+        let itemsForm1: ItemsForm = try await XCTUnwrapAsync(await store.state.itemsForm[Item.ID(value: 1)])
+        let itemsReducer = try await XCTUnwrapAsync(await store.state.itemReducible)
+
+        XCTAssertNotNil(itemsForm1.item)
+        XCTAssertEqual(itemsReducer.didLoadItemReduced, 1)
+    }
 }
 
 // MARK: Actions