Refactoring: welcome to Composable

Author: Kyome22

LocalPackage/Sources/DataSource/Entities/ShiftPattern.swift

@@ -21,7 +21,7 @@
 import SpiceKey
 import SwiftUI
 
-public struct ShiftPattern: Codable, Identifiable, Sendable {
+public struct ShiftPattern: Sendable, Codable, Identifiable {
     enum CodingKeys: String, CodingKey {
         case shiftType
         case spiceKeyData

LocalPackage/Sources/DataSource/Entities/ShiftType.swift

@@ -20,7 +20,7 @@
 
 import Foundation
 
-public enum ShiftType: Int, Codable, Identifiable, Sendable, CaseIterable {
+public enum ShiftType: Int, Sendable, Codable, Identifiable, CaseIterable {
     case topHalf
     case bottomHalf
     case leftHalf

LocalPackage/Sources/Model/Composable.swift

@@ -0,0 +1,39 @@
+/*
+ Composable.swift
+ Model
+
+ Created by Takuto Nakamura on 2025/08/13.
+ Copyright 2022 Takuto Nakamura (Kyome22)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Observation
+
+@MainActor
+public protocol Composable: AnyObject {
+    associatedtype Action: Sendable
+
+    var action: (Action) async -> Void { get }
+
+    func reduce(_ action: Action) async
+}
+
+public extension Composable {
+    func reduce(_ action: Action) async {}
+
+    func send(_ action: Action) async {
+        await self.action(action)
+        await reduce(action)
+    }
+}

LocalPackage/Sources/Model/Extensions/String+Extension.swift

@@ -22,7 +22,7 @@ import Foundation
 
 extension String {
     static let screenNumber = "NSScreenNumber"
+    static let kAXFullScreen = "AXFullScreen"
     public static let shortcutPanel = "shortcutPanel"
-    public static let kAXFullScreen = "AXFullScreen"
     public static let keyEquivalent = "keyEquivalent"
 }

LocalPackage/Sources/Model/Services/LogService.swift

@@ -22,16 +22,16 @@ import Foundation
 import DataSource
 import Logging
 
-public struct LogService {
+struct LogService {
     private let appStateClient: AppStateClient
     private let loggingSystemClient: LoggingSystemClient
 
-    public init(_ appDependencies: AppDependencies) {
+    init(_ appDependencies: AppDependencies) {
         self.appStateClient = appDependencies.appStateClient
         self.loggingSystemClient = appDependencies.loggingSystemClient
     }
 
-    public func bootstrap() {
+    func bootstrap() {
         guard !appStateClient.withLock(\.hasAlreadyBootstrap) else {
             return
         }
@@ -43,7 +43,7 @@ public struct LogService {
         appStateClient.withLock { $0.hasAlreadyBootstrap = true }
     }
 
-    public nonisolated func notice(
+    nonisolated func notice(
         _ event: NoticeEvent,
         source: @autoclosure () -> String? = nil,
         file: String = #fileID,
@@ -60,7 +60,7 @@ public struct LogService {
         )
     }
 
-    public nonisolated func error(
+    nonisolated func error(
         _ event: ErrorEvent,
         source: @autoclosure () -> String? = nil,
         file: String = #fileID,
@@ -77,7 +77,7 @@ public struct LogService {
         )
     }
 
-    public nonisolated func critical(
+    nonisolated func critical(
         _ event: CriticalEvent,
         source: @autoclosure () -> String? = nil,
         file: String = #fileID,

LocalPackage/Sources/Model/Services/ShiftService.swift

@@ -22,14 +22,14 @@ import AppKit
 import Foundation
 import DataSource
 
-public struct ShiftService {
+actor ShiftService {
     private let cgDirectDisplayClient: CGDirectDisplayClient
     private let hiServicesClient: HIServicesClient
     private let nsAppClient: NSAppClient
     private let nsScreenClient: NSScreenClient
     private let nsWorkspaceClient: NSWorkspaceClient
 
-    public init(_ appDependencies: AppDependencies) {
+    init(_ appDependencies: AppDependencies) {
         self.cgDirectDisplayClient = appDependencies.cgDirectDisplayClient
         self.hiServicesClient = appDependencies.hiServicesClient
         self.nsAppClient = appDependencies.nsAppClient

LocalPackage/Sources/Model/Services/ShortcutService.swift

@@ -22,13 +22,13 @@ import Foundation
 import DataSource
 import SpiceKey
 
-public struct ShortcutService {
+struct ShortcutService {
     private let appStateClient: AppStateClient
     private let spiceKeyClient: SpiceKeyClient
     private let windowSceneMessengerClient: WindowSceneMessengerClient
     private let userDefaultsRepository: UserDefaultsRepository
 
-    public init(_ appDependencies: AppDependencies) {
+    init(_ appDependencies: AppDependencies) {
         self.appStateClient = appDependencies.appStateClient
         self.spiceKeyClient = appDependencies.spiceKeyClient
         self.windowSceneMessengerClient = appDependencies.windowSceneMessengerClient

LocalPackage/Sources/Model/Services/UpdateService.swift

@@ -21,14 +21,14 @@
 import Combine
 import DataSource
 
-public struct UpdateService {
+struct UpdateService {
     private let spuUpdaterClient: SPUUpdaterClient
 
     var canChecksForUpdates: AsyncPublisher<AnyPublisher<Bool, Never>> {
         spuUpdaterClient.canCheckForUpdatesPublisher().values
     }
 
-    public init(_ appDependencies: AppDependencies) {
+    init(_ appDependencies: AppDependencies) {
         self.spuUpdaterClient = appDependencies.spuUpdaterClient
     }
 

LocalPackage/Sources/Model/Stores/ExtraMenu.swift

@@ -22,7 +22,7 @@ import Foundation
 import DataSource
 import Observation
 
-@MainActor @Observable public final class ExtraMenu {
+@MainActor @Observable public final class ExtraMenu: Composable {
     private let appStateClient: AppStateClient
     private let executeClient: ExecuteClient
     private let nsAppClient: NSAppClient
@@ -36,12 +36,14 @@ import Observation
     public var shiftPatterns: [ShiftPattern]
     public var hideIcons: Bool
     public var canChecksForUpdates: Bool
+    public let action: (Action) async -> Void
 
     public init(
         _ appDependencies: AppDependencies,
         shiftPatterns: [ShiftPattern] = [],
         hideIcons: Bool = false,
-        canChecksForUpdates: Bool = false
+        canChecksForUpdates: Bool = false,
+        action: @escaping (Action) async -> Void = { _ in }
     ) {
         self.appStateClient = appDependencies.appStateClient
         self.executeClient = appDependencies.executeClient
@@ -53,9 +55,10 @@ import Observation
         self.shiftPatterns = shiftPatterns
         self.hideIcons = (try? executeClient.checkIconsVisible()) ?? hideIcons
         self.canChecksForUpdates = canChecksForUpdates
+        self.action = action
     }
 
-    public func send(_ action: Action) async {
+    public func reduce(_ action: Action) async {
         switch action {
         case let .task(screenName):
             logService.notice(.screenView(name: screenName))
@@ -77,9 +80,7 @@ import Observation
             }
 
         case let .shiftPatternButtonTapped(shiftType):
-            await Task { @MainActor [shiftService] in
-                await shiftService.shiftWindow(shiftType: shiftType)
-            }.value
+            await shiftService.shiftWindow(shiftType: shiftType)
 
         case let .hideDesktopIconsButtonTapped(isOn):
             do {
@@ -112,7 +113,7 @@ import Observation
         self.canChecksForUpdates = canChecksForUpdates
     }
 
-    public enum Action {
+    public enum Action: Sendable {
         case task(String)
         case shiftPatternButtonTapped(ShiftType)
         case hideDesktopIconsButtonTapped(Bool)

LocalPackage/Sources/Model/Stores/GeneralSettings.swift

@@ -22,31 +22,34 @@ import Foundation
 import DataSource
 import Observation
 
-@MainActor @Observable public final class GeneralSettings {
+@MainActor @Observable public final class GeneralSettings: Composable {
     private let nsWorkspaceClient: NSWorkspaceClient
     private let checkForUpdatesRepository: CheckForUpdatesRepository
     private let launchAtLoginRepository: LaunchAtLoginRepository
     private let logService: LogService
 
     public var launchAtLogin: Bool
     public var checkForUpdates: Bool
+    public let action: (Action) async -> Void
 
     public init(
         _ appDependencies: AppDependencies,
         launchAtLogin: Bool? = nil,
-        checkForUpdates: Bool? = nil
+        checkForUpdates: Bool? = nil,
+        action: @escaping (Action) async -> Void = { _ in }
     ) {
         self.nsWorkspaceClient = appDependencies.nsWorkspaceClient
         self.checkForUpdatesRepository = .init(appDependencies.spuUpdaterClient)
         self.launchAtLoginRepository = .init(appDependencies.smAppServiceClient)
         self.logService = .init(appDependencies)
         self.launchAtLogin = launchAtLogin ?? launchAtLoginRepository.isEnabled
         self.checkForUpdates = checkForUpdates ?? checkForUpdatesRepository.isEnabled
+        self.action = action
     }
 
-    public func send(_ action: Action) {
+    public func reduce(_ action: Action) async {
         switch action {
-        case let .onAppear(screenName):
+        case let .task(screenName):
             logService.notice(.screenView(name: screenName))
 
         case .openSystemSettingsButtonTapped:
@@ -67,8 +70,8 @@ import Observation
         }
     }
 
-    public enum Action {
-        case onAppear(String)
+    public enum Action: Sendable {
+        case task(String)
         case openSystemSettingsButtonTapped
         case launchAtLoginToggleSwitched(Bool)
         case checkForUpdatesToggleSwitched(Bool)