Merge pull request #47 from Ryu0118/refactor

Refactor

Author: Ryu0118

Examples/Github-App/Github-App/Client/GithubRepositoryClient.swift

@@ -1,21 +1,21 @@
-import Foundation
 import Dependencies
 import DependenciesMacro
+import Foundation
 
 @Dependencies
 struct RepositoryClient {
     var fetchRepositories: @Sendable (_ query: String) async throws -> [Repository]
 }
 
 extension RepositoryClient: DependencyKey {
-    static let liveValue: RepositoryClient = RepositoryClient(
+    static let liveValue: RepositoryClient = .init(
         fetchRepositories: { query in
             var component = URLComponents()
             component.scheme = "https"
             component.host = "api.github.com"
             component.path = "/search/repositories"
             component.queryItems = [
-                URLQueryItem(name: "q", value: query)
+                URLQueryItem(name: "q", value: query),
             ]
 
             guard let url = component.url else {

Examples/Github-App/Github-App/Model/Repository.swift

@@ -10,13 +10,13 @@ struct Repository: Identifiable, Equatable, Hashable {
     let stargazersCount: Int
 
     init(item: Response.Item) {
-        self.id = item.id
-        self.url = item.svnUrl
-        self.fullName = item.fullName
-        self.avatarUrl = item.owner.avatarUrl
-        self.description = item.description
-        self.language = item.language
-        self.stargazersCount = item.stargazersCount
+        id = item.id
+        url = item.svnUrl
+        fullName = item.fullName
+        avatarUrl = item.owner.avatarUrl
+        description = item.description
+        language = item.language
+        stargazersCount = item.stargazersCount
     }
 }
 

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

@@ -1,5 +1,5 @@
-import SwiftUI
 import SimplexArchitecture
+import SwiftUI
 
 @Reducer
 struct RepositoryReducer {

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

@@ -1,5 +1,5 @@
-import SwiftUI
 import SimplexArchitecture
+import SwiftUI
 
 @Reducer
 struct RootReducer {
@@ -19,16 +19,13 @@ struct RootReducer {
 
     @Dependency(\.repositoryClient.fetchRepositories) var fetchRepositories
 
-    func reduce(
-        into state: StateContainer<RootView>,
-        action: Action
-    ) -> SideEffect<Self> {
+    func reduce(into state: StateContainer<RootView>, action: Action) -> SideEffect<Self> {
         switch action {
         case .onSearchButtonTapped:
             state.isLoading = true
-            return fetchRepositories(query: state.text)
+            return fetchRepositories(query: state.searchText)
 
-        case .onTextChanged(let text):
+        case let .onTextChanged(text):
             if text.isEmpty {
                 state.repositories = []
             }
@@ -57,7 +54,7 @@ struct RootReducer {
 
         case .alert(.retry):
             state.isLoading = true
-            return fetchRepositories(query: state.text)
+            return fetchRepositories(query: state.searchText)
         }
     }
 
@@ -74,7 +71,7 @@ struct RootReducer {
 
 @ViewState
 struct RootView: View {
-    @State var text = ""
+    @State var searchText = ""
     @State var isLoading = false
     @State var repositories: [Repository] = []
     @State var alertState: AlertState<Reducer.ReducerAction>?
@@ -96,11 +93,11 @@ struct RootView: View {
                     ProgressView()
                 }
             }
-            .searchable(text: $text)
+            .searchable(text: $searchText)
             .onSubmit(of: .search) {
                 send(.onSearchButtonTapped)
             }
-            .onChange(of: text) { _, newValue in
+            .onChange(of: searchText) { _, newValue in
                 send(.onTextChanged(newValue))
             }
             .alert(target: self, unwrapping: $alertState)

Examples/Github-App/Github-AppTests/RepositoryReducerTests.swift

@@ -1,7 +1,7 @@
-import XCTest
 import Dependencies
-import SimplexArchitecture
 @testable import Github_App
+import SimplexArchitecture
+import XCTest
 
 @MainActor
 final class RepositoryReducerTests: XCTestCase {

Examples/Github-App/Github-AppTests/RootReducerTests.swift

@@ -1,6 +1,6 @@
-import XCTest
-import SimplexArchitecture
 @testable import Github_App
+import SimplexArchitecture
+import XCTest
 
 @MainActor
 final class RootReducerTests: XCTestCase {

Sources/SimplexArchitecture/Internal/Exported.swift

@@ -1,2 +1,2 @@
-@_exported import SwiftUINavigation
 @_exported import Dependencies
+@_exported import SwiftUINavigation

Sources/SimplexArchitecture/Internal/TestOnly.swift

@@ -10,17 +10,17 @@ struct TestOnly<T> {
     var wrappedValue: T {
         _read {
             #if DEBUG
-            if !isTesting {
-                runtimeWarning("\(Self.self) is accessible only during Unit tests")
-            }
+                if !isTesting {
+                    runtimeWarning("\(Self.self) is accessible only during Unit tests")
+                }
             #endif
             yield _value
         }
         set {
             #if DEBUG
-            if isTesting {
-                _value = newValue
-            }
+                if isTesting {
+                    _value = newValue
+                }
             #endif
         }
     }

Sources/SimplexArchitecture/Macros.swift

@@ -6,16 +6,7 @@
 /// ```
 /// @ViewState
 /// struct MyView: View {
-///     let store: Store<MyReducer>
-///
-///     init(authRepository: AuthRepository, selfRepository: SelfRepository) {
-///         store = Store(
-///             reducer: MyReducer(
-///                 authRepository: authRepository,
-///                 selfRepository: selfRepository
-///             )
-///         )
-///     }
+///     let store: Store<MyReducer> = Store(reducer: MyReducer())
 ///
 ///     var body: some View {
 ///         Text("MyView")

Sources/SimplexArchitecture/Reducer/DependenciesOverrideModifier.swift

@@ -22,7 +22,7 @@ public struct _DependenciesOverrideModifier<Base: ReducerProtocol>: ReducerModif
         _ keyPath: WritableKeyPath<DependencyValues, Value>,
         value: Value
     ) -> Self {
-        Self(base: self.base) { values in
+        Self(base: base) { values in
             values[keyPath: keyPath] = value
             override(&values)
         }