Merge pull request #20 from wlsdms0122/develop

[RELEASE] Reducer/2.3.0

Sources/Reducer/Reducer.swift

@@ -39,18 +39,15 @@ final class TaskBag<Item> {
     }
 
     // MARK: - Property
-    private var items = Set<TaskItem>()
+    private(set) var items = Set<TaskItem>()
 
     // MARK: - Public
     func store(_ item: TaskItem) {
         items.insert(item)
 
-        let ref = UnsafeMutablePointer<Set<TaskItem>?>.allocate(capacity: 1)
-        ref.pointee = items
-
-        Task {
+        Task { @MainActor [weak self] in
             await item.task.value
-            ref.pointee?.remove(item)
+            self?.items.remove(item)
         }
     }
 
@@ -65,6 +62,7 @@ final class TaskBag<Item> {
     }
 }
 
+@MainActor
 open class Reducer<R: Reduce>: ObservableObject, Mutable {
     public typealias Action = R.Action
     public typealias Mutation = R.Mutation
@@ -96,8 +94,10 @@ open class Reducer<R: Reduce>: ObservableObject, Mutable {
 
     // MARK: - Lifecycle
     open func mutate(_ mutation: Mutation) {
-        // Reduce state from mutation.
-        state = reduce(state: state, mutation: mutation)
+        Task { @MainActor in
+            // Reduce state from mutation.
+            state = reduce(state: state, mutation: mutation)
+        }
     }
 
     // MARK: - Public

Tests/MacroTests/ReduceMacroTests.swift

@@ -14,7 +14,6 @@ let testMacros: [String: Macro.Type] = [
     "Reduce": ReduceMacro.self,
 ]
 
-@MainActor
 final class ReduceMacroTests: XCTestCase {
     // MARK: - Property
 

Tests/ReducerTests/Model/CountIncreaseReduce.swift

@@ -5,6 +5,7 @@
 //  Created by JSilver on 2023/03/07.
 //
 
+import Foundation
 import Reducer
 
 @Reduce

Tests/ReducerTests/ReducerTests.swift

@@ -9,7 +9,6 @@ import XCTest
 @testable import Reducer
 import Combine
 
-@MainActor
 final class ReducerTests: XCTestCase {
     // MARK: - Property
 
@@ -23,6 +22,7 @@ final class ReducerTests: XCTestCase {
     }
 
     // MARK: - Test
+    @MainActor
     func test_that_count_increases_when_receiving_increase_action() async throws {
         // Given
         let reducer = Reducer(
@@ -46,6 +46,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [0, 1, 2])
     }
 
+    @MainActor
     func test_that_count_does_not_mutate_when_receiving_same_action_twice() async throws {
         // Given
         let reducer = Reducer(
@@ -69,6 +70,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [0, 1])
     }
 
+    @MainActor
     func test_that_all_action_cancelled_when_reducer_deinit() async throws {
         // Given
         var reducer: Reducer<CountIncreaseReduce>? = Reducer(
@@ -94,6 +96,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [0])
     }
 
+    @MainActor
     func test_that_count_increases_when_mutate_in_start() async throws {
         // Given
         let reducer = Reducer(TimerReduce(
@@ -110,6 +113,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertGreaterThan(result.last ?? 0, 0)
     }
 
+    @MainActor
     func test_that_count_increases_when_await_mutate_in_start() async throws {
         // Given
         let reducer = Reducer(AwaitStartReduce(
@@ -126,6 +130,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [0, 1])
     }
 
+    @MainActor
     func test_that_reducer_should_be_able_to_assign_proxy_reduce() async throws {
         // Given
         var reducer = Reducer(CountIncreaseReduce(
@@ -165,7 +170,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [0, 10])
     }
 
-
+    @MainActor
     func test_that_initial_count_is_100_when_proxy_set_initial_count() async throws {
         // Given
         let reducer = Reducer<CountIncreaseReduce>(proxy: .init(
@@ -184,6 +189,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [100])
     }
 
+    @MainActor
     func test_that_count_increases_when_proxy_receiving_increase_action() async throws {
         // Given
         let reducer = Reducer<CountIncreaseReduce>(proxy: .init(
@@ -220,6 +226,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [0, 1])
     }
 
+    @MainActor
     func test_that_count_increases_10_when_proxy_receiving_increase_action() async throws {
         // Given
         let reducer = Reducer<CountIncreaseReduce>(proxy: .init(
@@ -257,6 +264,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [0, 10, 20])
     }
 
+    @MainActor
     func test_that_count_does_not_mutate_when_proxy_same_action_twice() async throws {
         // Given
         let reducer = Reducer<CountIncreaseReduce>(proxy: .init(
@@ -296,6 +304,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertEqual(result, [0, 1])
     }
 
+    @MainActor
     func test_that_count_increases_when_proxy_mutate_in_start() async throws {
         // Given
         var cancellable: AnyCancellable? = nil
@@ -327,6 +336,7 @@ final class ReducerTests: XCTestCase {
         XCTAssertGreaterThan(result.last ?? 0, 0)
     }
 
+    @MainActor
     func test_that_reducer_can_assign_proxy_inherited_reduce() async throws {
         // Given
         let reducer = Reducer<CountIncreaseReduce>(

Tests/ReducerTests/TaskBagTests.swift

@@ -9,7 +9,6 @@ import XCTest
 @testable import Reducer
 import Combine
 
-@MainActor
 final class TaskBagTests: XCTestCase {
     // MARK: - Property
 
@@ -23,6 +22,33 @@ final class TaskBagTests: XCTestCase {
     }
 
     // MARK: - Test
+    func test_that_task_bag_remove_complete_task() async throws {
+        // Given
+        let taskBag = TaskBag<Int>()
+
+        taskBag.store(.init(
+            1,
+            with: Task {
+                try? await Task.sleep(nanoseconds: 1_000_000_000)
+            }
+        ))
+        taskBag.store(.init(
+            2,
+            with: Task {
+                try? await Task.sleep(nanoseconds: 100_000_000)
+            }
+        ))
+
+        let count = taskBag.items.count
+
+        // When
+        try await Task.sleep(nanoseconds: 500_000_000)
+
+        // Then
+        XCTAssertEqual(count, 2)
+        XCTAssertEqual(taskBag.items.count, 1)
+    }
+
     func test_that_task_bag_cancel_all_task_when_deinit() async throws {
         // Given
         let expectation = expectation(description: "")