Merge pull request #46 from Ryu0118/reducer-macro

[WIP] Add Reducer macro

Author: Ryu0118

.DS_Store

@@ -1,8 +1,9 @@
 import SwiftUI
 import SimplexArchitecture
 
-struct RepositoryReducer: ReducerProtocol {
-    enum Action {
+@Reducer
+struct RepositoryReducer {
+    enum ViewAction {
         case onOpenURLButtonTapped
     }
 

Examples/Github-App/Github-App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,8 +1,9 @@
 import SwiftUI
 import SimplexArchitecture
 
-struct RootReducer: ReducerProtocol {
-    enum Action: Equatable {
+@Reducer
+struct RootReducer {
+    enum ViewAction: Equatable {
         case onSearchButtonTapped
         case onTextChanged(String)
     }
@@ -20,9 +21,19 @@ struct RootReducer: ReducerProtocol {
 
     func reduce(
         into state: StateContainer<RootView>,
-        action: ReducerAction
-    ) -> SideEffect<RootReducer> {
+        action: Action
+    ) -> SideEffect<Self> {
         switch action {
+        case .onSearchButtonTapped:
+            state.isLoading = true
+            return fetchRepositories(query: state.text)
+
+        case .onTextChanged(let text):
+            if text.isEmpty {
+                state.repositories = []
+            }
+            return .none
+
         case let .fetchRepositoriesResponse(.success(repositories)):
             state.isLoading = false
             state.repositories = repositories
@@ -50,23 +61,6 @@ struct RootReducer: ReducerProtocol {
         }
     }
 
-    func reduce(
-        into state: StateContainer<RootView>,
-        action: Action
-    ) -> SideEffect<Self> {
-        switch action {
-        case .onSearchButtonTapped:
-            state.isLoading = true
-            return fetchRepositories(query: state.text)
-
-        case .onTextChanged(let text):
-            if text.isEmpty {
-                state.repositories = []
-            }
-            return .none
-        }
-    }
-
     func fetchRepositories(query: String) -> SideEffect<Self> {
         .run { send in
             await send(

Examples/Github-App/Github-App/View/RepositoryView.swift

@@ -36,8 +36,9 @@ let package = Package(
 ## Usage
 ### Basic Usage
 ```Swift
-struct MyReducer: ReducerProtocol {
-    enum Action {
+@Reducer
+struct MyReducer {
+    enum ViewAction {
         case increment
         case decrement
     }
@@ -80,8 +81,9 @@ ReducerState is also effective to improve performance because the View is not up
 
 This is the example code
 ```Swift
-struct MyReducer: ReducerProtocol {
-    enum Action {
+@Reducer
+struct MyReducer {
+    enum ViewAction {
         case increment
         case decrement
     }
@@ -135,8 +137,9 @@ If there are Actions that you do not want to expose to View, ReducerAction is ef
 This is the sample code:
 
 ```Swift
-struct MyReducer: ReducerProtocol {
-    enum Action {
+@Reducer
+struct MyReducer {
+    enum ViewAction {
         case login
     }
 
@@ -156,11 +159,6 @@ struct MyReducer: ReducerProtocol {
                     )
                 )
             }
-        }
-    }
-
-    func reduce(into state: StateContainer<MyView>, action: ReducerAction) -> SideEffect<Self> {
-        switch action {
         case let .loginResponse(result):
             ...
             return .none
@@ -206,12 +204,13 @@ struct ParentView: View {
     }
 }
 
-struct ParentReducer: ReducerProtocol {
-    enum Action {
+@Reducer
+struct ParentReducer {
+    enum ViewAction {
         case child(ChildReducer.Action)
     }
 
-    func reduce(into state: StateContainer<ParentView>, action: Action) -> SideEffect<ParentReducer> {
+    func reduce(into state: StateContainer<ParentView>, action: Action) -> SideEffect<Self> {
         switch action {
         case .child(.onButtonTapped):
             // do something
@@ -231,12 +230,13 @@ struct ChildView: View, ActionSendable {
     }
 }
 
-struct ChildReducer: ReducerProtocol {
-    enum Action {
+@Reducer
+struct ChildReducer {
+    enum ViewAction {
         case onButtonTapped
     }
 
-    func reduce(into state: StateContainer<ChildView>, action: Action) -> SideEffect<ChildReducer> {
+    func reduce(into state: StateContainer<ChildView>, action: Action) -> SideEffect<Self> {
         switch action {
         case .onButtonTapped:
             return .none

Examples/Github-App/Github-App/View/RootView.swift

@@ -13,13 +13,13 @@ public protocol ActionSendable<Reducer> {
 public extension ActionSendable {
     /// Send an action to the store
     @discardableResult
-    func send(_ action: consuming Reducer.Action) -> SendTask {
+    func send(_ action: consuming Reducer.ViewAction) -> SendTask {
         threadCheck()
         return store.send(action, target: self)
     }
 
     @discardableResult
-    func send(_ action: consuming Reducer.Action, animation: Animation?) -> SendTask {
+    func send(_ action: consuming Reducer.ViewAction, animation: Animation?) -> SendTask {
         threadCheck()
         return withAnimation(animation) {
             store.send(action, target: self)
@@ -28,7 +28,7 @@ public extension ActionSendable {
 
     /// Send an action to the store with transaction
     @discardableResult
-    func send(_ action: consuming Reducer.Action, transaction: Transaction) -> SendTask {
+    func send(_ action: consuming Reducer.ViewAction, transaction: Transaction) -> SendTask {
         threadCheck()
         return withTransaction(transaction) {
             store.send(action, target: self)
@@ -88,41 +88,4 @@ public extension ActionSendable {
         store.pullback(to: casePath, parent: parent, id: id)
         return self
     }
-
-    /// Pullbacks the `Action` to the specified case path in the parent's reducer.
-    ///
-    /// - Parameters:
-    ///   - casePath: The case path to which the action will be pulled back.
-    ///   - parent: The parent `ActionSendable` to which the action will be sent.
-    /// - Returns: Self
-    @_disfavoredOverload
-    @inlinable
-    @discardableResult
-    func pullback<Parent: ActionSendable>(
-        to casePath: CasePath<Parent.Reducer.Action, Reducer.ReducerAction>,
-        parent: Parent
-    ) -> Self where Reducer.ReducerState == Never {
-        store.pullback(to: casePath, parent: parent)
-        return self
-    }
-
-    /// Pullbacks the `ReducerAction`  to the specified case path with an associated identifier in the parent's reducer.
-    /// This specifies an id to identify which View sent the Action in the ForEach.
-    ///
-    /// - Parameters:
-    ///   - casePath: The case path with an associated identifier to which the action will be pulled back.
-    ///   - parent: The parent `ActionSendable` to which the action will be sent.
-    ///   - id: The identifier associated with the action.
-    /// - Returns: Self.
-    @_disfavoredOverload
-    @inlinable
-    @discardableResult
-    func pullback<Parent: ActionSendable, ID: Hashable>(
-        to casePath: CasePath<Parent.Reducer.Action, (id: ID, action: Reducer.ReducerAction)>,
-        parent: Parent,
-        id: ID
-    ) -> Self where Reducer.ReducerState == Never {
-        store.pullback(to: casePath, parent: parent, id: id)
-        return self
-    }
 }

README.md

@@ -17,7 +17,7 @@ struct ActionTransition<Reducer: ReducerProtocol> {
     /// The unique effect context that represents root effect.
     let effectContext: UUID
     /// The Action that cause a change of state
-    let action: CombineAction<Reducer>
+    let action: Reducer.Action
 
     /// - Parameters:
     ///   - previous: The previous state.
@@ -30,7 +30,7 @@ struct ActionTransition<Reducer: ReducerProtocol> {
         next: Self.State,
         effect: SideEffect<Reducer>,
         effectContext: UUID,
-        for action: CombineAction<Reducer>
+        for action: Reducer.Action
     ) {
         self.previous = previous
         self.next = next

Sources/SimplexArchitecture/ActionSendable.swift

@@ -21,9 +21,9 @@
 ///         Text("MyView")
 ///     }
 /// }
-///
-/// struct MyReducer: ReducerProtocol {
-///     enum Action {
+/// @Reducer
+/// struct MyReducer {
+///     enum ViewAction {
 ///         case someAction
 ///     }
 ///
@@ -55,9 +55,9 @@
 ///             }
 ///     }
 /// }
-///
-/// struct MyReducer: ReducerProtocol {
-///     enum Action {
+/// @Reducer
+/// struct MyReducer {
+///     enum ViewAction {
 ///         case someAction
 ///     }
 ///
@@ -78,3 +78,9 @@
 @attached(extension, conformances: ActionSendable)
 public macro ViewState() =
     #externalMacro(module: "SimplexArchitectureMacrosPlugin", type: "ViewStateMacro")
+
+/// Macro for creating Action from ViewAction and ReducerAction, and conforming Reducer to ReducerProtocol
+@attached(member, names: named(Action), named(ReducerAction))
+@attached(extension, conformances: ReducerProtocol)
+public macro Reducer() =
+    #externalMacro(module: "SimplexArchitectureMacrosPlugin", type: "ReducerMacro")

Sources/SimplexArchitecture/Effect/CombineAction.swift

@@ -17,13 +17,6 @@ public struct _DependenciesOverrideModifier<Base: ReducerProtocol>: ReducerModif
         }
     }
 
-    @inlinable
-    public func reduce(into state: StateContainer<Base.Target>, action: Base.ReducerAction) -> SideEffect<Base> {
-        withDependencies(override) {
-            base.reduce(into: state, action: action)
-        }
-    }
-
     @inlinable
     public func dependency<Value>(
         _ keyPath: WritableKeyPath<DependencyValues, Value>,