Renamed Action to AsyncAction to be more clear about what it actually is

kaulex99 · kaulex99 · commit cc409ba39841 · 2025-03-03T18:49:16.000+01:00
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Reactor.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Reactor.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1620"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Reactor"
+               BuildableName = "Reactor"
+               BlueprintName = "Reactor"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Reactor"
+            BuildableName = "Reactor"
+            BlueprintName = "Reactor"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Example/AsyncReactorExample.xcodeproj/xcshareddata/xcschemes/AsyncReactorExample.xcscheme b/Example/AsyncReactorExample.xcodeproj/xcshareddata/xcschemes/AsyncReactorExample.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1620"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B4ECB0AB2A1250AE00B0CAAE"
+               BuildableName = "AsyncReactorExample.app"
+               BlueprintName = "AsyncReactorExample"
+               ReferencedContainer = "container:AsyncReactorExample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B4ECB0AB2A1250AE00B0CAAE"
+            BuildableName = "AsyncReactorExample.app"
+            BlueprintName = "AsyncReactorExample"
+            ReferencedContainer = "container:AsyncReactorExample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B4ECB0AB2A1250AE00B0CAAE"
+            BuildableName = "AsyncReactorExample.app"
+            BlueprintName = "AsyncReactorExample"
+            ReferencedContainer = "container:AsyncReactorExample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Example/AsyncReactorExample/Features/Repository/Search/RepositorySearchReactor.swift b/Example/AsyncReactorExample/Features/Repository/Search/RepositorySearchReactor.swift
@@ -29,7 +29,7 @@ enum SortOptions: String, CaseIterable, Identifiable {
 }
 
 class RepositorySearchReactor: AsyncReactor {
-    enum Action {
+    enum AsyncAction {
         case onHidePrivateToggle
         case enterQuery(String)
         case load
@@ -66,7 +66,7 @@ class RepositorySearchReactor: AsyncReactor {
         }
     }
     
-    func action(_ action: Action) async {
+    func action(_ action: AsyncAction) async {
         switch action {
         case .onHidePrivateToggle:
             state.hidePrivate.toggle()
diff --git a/Example/AsyncReactorExample/Features/Repository/Search/RepositorySearchView.swift b/Example/AsyncReactorExample/Features/Repository/Search/RepositorySearchView.swift
@@ -13,13 +13,26 @@ struct RepositorySearchView: View {
     @EnvironmentObject
     private var reactor: RepositorySearchReactor
     
-    @ActionBinding(RepositorySearchReactor.self, keyPath: \.hidePrivate, action: RepositorySearchReactor.SyncAction.toggleHidePrivate)
+    @ActionBinding(
+        RepositorySearchReactor.self,
+        keyPath: \.hidePrivate,
+        action: RepositorySearchReactor.SyncAction.toggleHidePrivate
+    )
     private var hidePrivate: Bool
     
-    @ActionBinding(RepositorySearchReactor.self, keyPath: \.query, cancelId: .init(id: "enterQuery", mode: .inFlight), action: RepositorySearchReactor.Action.enterQuery)
+    @ActionBinding(
+        RepositorySearchReactor.self,
+        keyPath: \.query,
+        cancelId: .init(id: "enterQuery", mode: .inFlight),
+        action: RepositorySearchReactor.AsyncAction.enterQuery
+    )
     private var query: String
     
-    @ActionBinding(RepositorySearchReactor.self, keyPath: \.sortBy, action: RepositorySearchReactor.Action.onSortOptionSelected)
+    @ActionBinding(
+        RepositorySearchReactor.self,
+        keyPath: \.sortBy,
+        action: RepositorySearchReactor.AsyncAction.onSortOptionSelected
+    )
     private var sortOption: SortOptions
     
     var body: some View {
diff --git a/Sources/AsyncReactor/AsyncReactor+SwiftUI.swift b/Sources/AsyncReactor/AsyncReactor+SwiftUI.swift
@@ -21,25 +21,48 @@ public struct ActionBinding<Reactor: AsyncReactor, Action, Value>: DynamicProper
     
     let cancelId: CancelId?
     
-    public init(_ reactorType: Reactor.Type, keyPath: KeyPath<Reactor.State, Value>, cancelId: CancelId? = nil, action: @escaping (Value) -> Reactor.Action) where Action == Reactor.Action {
+    public init(
+        _ reactorType: Reactor.Type,
+        keyPath: KeyPath<Reactor.State, Value>,
+        cancelId: CancelId? = nil,
+        action: @escaping (Value) -> Reactor.AsyncAction
+    ) where Action == Reactor.AsyncAction {
         target = EnvironmentObject()
         self.keyPath = keyPath
         self.action = action
         self.cancelId = cancelId
     }
     
-    public init(_ reactorType: Reactor.Type, keyPath: KeyPath<Reactor.State, Value>, cancelId: CancelId? = nil, action: @escaping @autoclosure () -> Reactor.Action) where Action == Reactor.Action {
-        self.init(reactorType, keyPath: keyPath, cancelId: cancelId, action: { _ in action() })
+    public init(
+        _ reactorType: Reactor.Type,
+        keyPath: KeyPath<Reactor.State, Value>,
+        cancelId: CancelId? = nil,
+        action: @escaping @autoclosure () -> Reactor.AsyncAction
+    ) where Action == Reactor.AsyncAction {
+        self.init(
+            reactorType,
+            keyPath: keyPath,
+            cancelId: cancelId,
+            action: { _ in action() }
+        )
     }
     
-    public init(_ reactorType: Reactor.Type, keyPath: KeyPath<Reactor.State, Value>, action: @escaping (Value) -> Reactor.SyncAction) where Action == Reactor.SyncAction {
+    public init(
+        _ reactorType: Reactor.Type,
+        keyPath: KeyPath<Reactor.State, Value>,
+        action: @escaping (Value) -> Reactor.SyncAction
+    ) where Action == Reactor.SyncAction {
         target = EnvironmentObject()
         self.keyPath = keyPath
         self.action = action
         cancelId = nil
     }
     
-    public init(_ reactorType: Reactor.Type, keyPath: KeyPath<Reactor.State, Value>, action: @escaping @autoclosure () -> Reactor.SyncAction) where Action == Reactor.SyncAction {
+    public init(
+        _ reactorType: Reactor.Type,
+        keyPath: KeyPath<Reactor.State, Value>,
+        action: @escaping @autoclosure () -> Reactor.SyncAction
+    ) where Action == Reactor.SyncAction {
         self.init(reactorType, keyPath: keyPath, action: { _ in action() })
     }
     
@@ -51,7 +74,7 @@ public struct ActionBinding<Reactor: AsyncReactor, Action, Value>: DynamicProper
     public var projectedValue: Binding<Value> {
         get {
             func bindAction() -> Binding<Value> {
-                target.wrappedValue.bind(keyPath, cancelId: cancelId, action: action as! (Value) -> Reactor.Action)
+                target.wrappedValue.bind(keyPath, cancelId: cancelId, action: action as! (Value) -> Reactor.AsyncAction)
             }
             
             func bindSyncAction() -> Binding<Value> {
@@ -60,7 +83,7 @@ public struct ActionBinding<Reactor: AsyncReactor, Action, Value>: DynamicProper
             
             if Action.self == Reactor.SyncAction.self {
                 return bindSyncAction()
-            } else if Action.self == Reactor.Action.self {
+            } else if Action.self == Reactor.AsyncAction.self {
                 return bindAction()
             } else {
                 fatalError("this should never happen :)")
@@ -76,7 +99,11 @@ public struct ReactorView<Content: View, R: AsyncReactor>: View {
     @StateObject
     private var reactor: R
     
-    public init(_ reactor: @escaping @autoclosure () -> R, definesLifecycle: Bool = true, @ViewBuilder content: () -> Content) {
+    public init(
+        _ reactor: @escaping @autoclosure () -> R,
+        definesLifecycle: Bool = true,
+        @ViewBuilder content: () -> Content
+    ) {
         _reactor = StateObject(wrappedValue: reactor())
         self.content = content()
         self.definesLifecycle = definesLifecycle
diff --git a/Sources/Reactor/Reactor+SwiftUI.swift b/Sources/Reactor/Reactor+SwiftUI.swift
@@ -22,25 +22,43 @@ public struct ActionBinding<R: Reactor, Action, Value>: DynamicProperty {
     
     let cancelId: CancelId?
     
-    public init(_ reactorType: R.Type, keyPath: KeyPath<R.State, Value>, cancelId: CancelId? = nil, action: @escaping (Value) -> R.Action) where Action == R.Action {
+    public init(
+        _ reactorType: R.Type,
+        keyPath: KeyPath<R.State, Value>,
+        cancelId: CancelId? = nil,
+        action: @escaping (Value) -> R.AsyncAction
+    ) where Action == R.AsyncAction {
         target = Environment(R.self)
         self.keyPath = keyPath
         self.action = action
         self.cancelId = cancelId
     }
     
-    public init(_ reactorType: R.Type, keyPath: KeyPath<R.State, Value>, cancelId: CancelId? = nil, action: @escaping @autoclosure () -> R.Action) where Action == R.Action {
+    public init(
+        _ reactorType: R.Type,
+        keyPath: KeyPath<R.State, Value>,
+        cancelId: CancelId? = nil,
+        action: @escaping @autoclosure () -> R.AsyncAction
+    ) where Action == R.AsyncAction {
         self.init(reactorType, keyPath: keyPath, cancelId: cancelId, action: { _ in action() })
     }
     
-    public init(_ reactorType: R.Type, keyPath: KeyPath<R.State, Value>, action: @escaping (Value) -> R.SyncAction) where Action == R.SyncAction {
+    public init(
+        _ reactorType: R.Type,
+        keyPath: KeyPath<R.State, Value>,
+        action: @escaping (Value) -> R.SyncAction
+    ) where Action == R.SyncAction {
         target = Environment(R.self)
         self.keyPath = keyPath
         self.action = action
         cancelId = nil
     }
     
-    public init(_ reactorType: R.Type, keyPath: KeyPath<R.State, Value>, action: @escaping @autoclosure () -> R.SyncAction) where Action == R.SyncAction {
+    public init(
+        _ reactorType: R.Type,
+        keyPath: KeyPath<R.State, Value>,
+        action: @escaping @autoclosure () -> R.SyncAction
+    ) where Action == R.SyncAction {
         self.init(reactorType, keyPath: keyPath, action: { _ in action() })
     }
     
@@ -52,7 +70,7 @@ public struct ActionBinding<R: Reactor, Action, Value>: DynamicProperty {
     public var projectedValue: Binding<Value> {
         get {
             func bindAction() -> Binding<Value> {
-                target.wrappedValue.bind(keyPath, cancelId: cancelId, action: action as! (Value) -> R.Action)
+                target.wrappedValue.bind(keyPath, cancelId: cancelId, action: action as! (Value) -> R.AsyncAction)
             }
             
             func bindSyncAction() -> Binding<Value> {
@@ -61,7 +79,7 @@ public struct ActionBinding<R: Reactor, Action, Value>: DynamicProperty {
             
             if Action.self == R.SyncAction.self {
                 return bindSyncAction()
-            } else if Action.self == R.Action.self {
+            } else if Action.self == R.AsyncAction.self {
                 return bindAction()
             } else {
                 fatalError("this should never happen :)")
@@ -78,7 +96,11 @@ public struct ReactorView<Content: View, R: Reactor>: View {
     @State
     private var reactor: R
     
-    public init(_ reactor: @escaping @autoclosure () -> R, definesLifecycle: Bool = true, @ViewBuilder content: () -> Content) {
+    public init(
+        _ reactor: @escaping @autoclosure () -> R,
+        definesLifecycle: Bool = true,
+        @ViewBuilder content: () -> Content
+    ) {
         _reactor = State(initialValue: reactor())
         self.content = content()
         self.definesLifecycle = definesLifecycle
diff --git a/Sources/ReactorBase/ReactorBase+SwiftUI.swift b/Sources/ReactorBase/ReactorBase+SwiftUI.swift
diff --git a/Sources/ReactorBase/ReactorBase.swift b/Sources/ReactorBase/ReactorBase.swift

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ enum SortOptions: String, CaseIterable, Identifiable {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`class RepositorySearchReactor: AsyncReactor {`
`32`		`- enum Action {`
	`32`	`+ enum AsyncAction {`
`33`	`33`	`case onHidePrivateToggle`
`34`	`34`	`case enterQuery(String)`
`35`	`35`	`case load`
`@@ -66,7 +66,7 @@ class RepositorySearchReactor: AsyncReactor {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- func action(_ action: Action) async {`
	`69`	`+ func action(_ action: AsyncAction) async {`
`70`	`70`	`switch action {`
`71`	`71`	`case .onHidePrivateToggle:`
`72`	`72`	`state.hidePrivate.toggle()`