Migrate Service to latest TCA

Author: intitni

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -17,7 +17,9 @@ import ProChatTabs
 import ChatTabPersistent
 #endif
 
-struct GUI: ReducerProtocol {
+@Reducer
+struct GUI {
+    @ObservableState
     struct State: Equatable {
         var suggestionWidgetState = WidgetFeature.State()
 
@@ -75,15 +77,15 @@ struct GUI: ReducerProtocol {
         case updateChatTabOrder
     }
 
-    var body: some ReducerProtocol<State, Action> {
+    var body: some ReducerOf<Self> {
         CombineReducers {
-            Scope(state: \.suggestionWidgetState, action: /Action.suggestionWidget) {
+            Scope(state: \.suggestionWidgetState, action: \.suggestionWidget) {
                 WidgetFeature()
             }
 
             Scope(
                 state: \.chatTabGroup,
-                action: /Action.suggestionWidget .. /WidgetFeature.Action.chatPanel
+                action: \.suggestionWidget.chatPanel
             ) {
                 Reduce { _, action in
                     switch action {
@@ -115,7 +117,7 @@ struct GUI: ReducerProtocol {
             }
 
             #if canImport(ChatTabPersistent)
-            Scope(state: \.persistentState, action: /Action.persistent) {
+            Scope(state: \.persistentState, action: \.persistent) {
                 ChatTabPersistent()
             }
             #endif
@@ -251,10 +253,9 @@ struct GUI: ReducerProtocol {
 
 @MainActor
 public final class GraphicalUserInterfaceController {
-    private let store: StoreOf<GUI>
+    let store: StoreOf<GUI>
     let widgetController: SuggestionWidgetController
     let widgetDataSource: WidgetDataSource
-    let viewStore: ViewStoreOf<GUI>
     let chatTabPool: ChatTabPool
 
     class WeakStoreHolder {
@@ -289,18 +290,17 @@ public final class GraphicalUserInterfaceController {
         }
         let store = StoreOf<GUI>(
             initialState: .init(),
-            reducer: GUI(),
-            prepareDependencies: setupDependency
+            reducer: { GUI() },
+            withDependencies: setupDependency
         )
         self.store = store
         self.chatTabPool = chatTabPool
-        viewStore = ViewStore(store)
         widgetDataSource = .init()
 
         widgetController = SuggestionWidgetController(
             store: store.scope(
                 state: \.suggestionWidgetState,
-                action: GUI.Action.suggestionWidget
+                action: \.suggestionWidget
             ),
             chatTabPool: chatTabPool,
             dependency: suggestionDependency
@@ -309,8 +309,7 @@ public final class GraphicalUserInterfaceController {
         chatTabPool.createStore = { id in
             store.scope(
                 state: { state in
-                    state.chatTabGroup.tabInfo[id: id]
-                        ?? .init(id: id, title: "")
+                    state.chatTabGroup.tabInfo[id: id] ?? .init(id: id, title: "")
                 },
                 action: { childAction in
                     .suggestionWidget(.chatPanel(.chatTab(id: id, action: childAction)))
@@ -321,8 +320,8 @@ public final class GraphicalUserInterfaceController {
         suggestionDependency.suggestionWidgetDataSource = widgetDataSource
         suggestionDependency.onOpenChatClicked = { [weak self] in
             Task { [weak self] in
-                await self?.viewStore.send(.createChatGPTChatTabIfNeeded).finish()
-                self?.viewStore.send(.openChatPanel(forceDetach: false))
+                await self?.store.send(.createChatGPTChatTabIfNeeded).finish()
+                self?.store.send(.openChatPanel(forceDetach: false))
             }
         }
         suggestionDependency.onCustomCommandClicked = { command in
@@ -339,8 +338,8 @@ public final class GraphicalUserInterfaceController {
 
     public func openGlobalChat() {
         Task {
-            await self.viewStore.send(.createChatGPTChatTabIfNeeded).finish()
-            viewStore.send(.openChatPanel(forceDetach: true))
+            await self.store.send(.createChatGPTChatTabIfNeeded).finish()
+            store.send(.openChatPanel(forceDetach: true))
         }
     }
 }

Core/Sources/Service/GlobalShortcutManager.swift

@@ -25,12 +25,12 @@ final class GlobalShortcutManager {
             let isXCodeActive = XcodeInspector.shared.activeXcode != nil
 
             if !isXCodeActive,
-               !guiController.viewStore.state.suggestionWidgetState.chatPanelState.isPanelDisplayed,
+               !guiController.store.state.suggestionWidgetState.chatPanelState.isPanelDisplayed,
                UserDefaults.shared.value(for: \.showHideWidgetShortcutGlobally)
             {
-                guiController.viewStore.send(.openChatPanel(forceDetach: true))
+                guiController.store.send(.openChatPanel(forceDetach: true))
             } else {
-                guiController.viewStore.send(.toggleWidgetsHotkeyPressed)
+                guiController.store.send(.toggleWidgetsHotkeyPressed)
             }
         }
 

Core/Sources/Service/ScheduledCleaner.swift

@@ -52,7 +52,7 @@ public final class ScheduledCleaner {
             if workspace.isExpired, workspaceInfos[.url(url)] == nil {
                 Logger.service.info("Remove idle workspace")
                 _ = await Task { @MainActor in
-                    service.guiController.viewStore.send(
+                    service.guiController.store.send(
                         .promptToCodeGroup(.discardExpiredPromptToCode(documentURLs: Array(
                             workspace.filespaces.keys
                         )))
@@ -72,7 +72,7 @@ public final class ScheduledCleaner {
                     ) {
                         Logger.service.info("Remove idle filespace")
                         _ = await Task { @MainActor in
-                            service.guiController.viewStore.send(
+                            service.guiController.store.send(
                                 .promptToCodeGroup(.discardExpiredPromptToCode(documentURLs: [url]))
                             )
                         }.result

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -178,9 +178,9 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         var cursorPosition = editor.cursorPosition
         var extraInfo = SuggestionInjector.ExtraInfo()
 
-        let viewStore = Service.shared.guiController.viewStore
+        let store = Service.shared.guiController.store
 
-        if let promptToCode = viewStore.state.promptToCodeGroup.activePromptToCode {
+        if let promptToCode = store.state.promptToCodeGroup.activePromptToCode {
             if promptToCode.isAttachedToSelectionRange, promptToCode.documentURL != fileURL {
                 return nil
             }
@@ -214,13 +214,13 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
             )
 
             _ = await Task { @MainActor [cursorPosition] in
-                viewStore.send(
+                store.send(
                     .promptToCodeGroup(.updatePromptToCodeRange(
                         id: promptToCode.id,
                         range: .init(start: range.start, end: cursorPosition)
                     ))
                 )
-                viewStore.send(
+                store.send(
                     .promptToCodeGroup(.discardAcceptedPromptToCodeIfNotContinuous(
                         id: promptToCode.id
                     ))
@@ -264,9 +264,9 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
     func chatWithSelection(editor: EditorContent) async throws -> UpdatedContent? {
         Task { @MainActor in
-            let viewStore = Service.shared.guiController.viewStore
-            viewStore.send(.createChatGPTChatTabIfNeeded)
-            viewStore.send(.openChatPanel(forceDetach: false))
+            let store = Service.shared.guiController.store
+            store.send(.createChatGPTChatTabIfNeeded)
+            store.send(.openChatPanel(forceDetach: false))
         }
         return nil
     }
@@ -314,7 +314,7 @@ extension WindowBaseCommandHandler {
         switch command.feature {
         case .chatWithSelection, .customChat:
             Task { @MainActor in
-                Service.shared.guiController.viewStore
+                Service.shared.guiController.store
                     .send(.sendCustomCommandToActiveChat(command))
             }
         case let .promptToCode(extraSystemPrompt, prompt, continuousMode, generateDescription):
@@ -397,7 +397,7 @@ extension WindowBaseCommandHandler {
             )
         }() as (String, CursorRange)
 
-        let viewStore = Service.shared.guiController.viewStore
+        let store = Service.shared.guiController.store
 
         let customCommandTemplateProcessor = CustomCommandTemplateProcessor()
 
@@ -415,7 +415,7 @@ extension WindowBaseCommandHandler {
 
         _ = await Task { @MainActor in
             // if there is already a prompt to code presenting, we should not present another one
-            viewStore.send(.promptToCodeGroup(.activateOrCreatePromptToCode(.init(
+            store.send(.promptToCodeGroup(.activateOrCreatePromptToCode(.init(
                 code: code,
                 selectionRange: selection,
                 language: codeLanguage,