🔀 :: [#128] Feature 모듈의 Interface 전체 분리

Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift

@@ -106,3 +106,7 @@ public extension MicroTargetPathConvertable where Self: RawRepresentable {
         "\(self.rawValue)\(type.rawValue)"
     }
 }
+
+// MARK: - For DI
+extension ModulePaths.Feature: CaseIterable {}
+extension ModulePaths.Domain: CaseIterable {}

Projects/App/Project.swift

@@ -28,31 +28,16 @@ let targets: [Target] = [
         resources: ["Resources/**"],
         entitlements: "Support/Dotori.entitlements",
         scripts: scripts,
-        dependencies: [
-            .feature(target: .RootFeature),
-            .feature(target: .SplashFeature),
-            .feature(target: .SigninFeature),
-            .feature(target: .MainTabFeature),
-            .feature(target: .SignupFeature),
-            .feature(target: .RenewalPasswordFeature),
-            .feature(target: .ConfirmationDialogFeature),
-            .feature(target: .InputDialogFeature),
-            .feature(target: .FilterSelfStudyFeature),
-            .domain(target: .AuthDomain),
-            .domain(target: .UserDomain),
-            .domain(target: .SelfStudyDomain),
-            .domain(target: .MassageDomain),
-            .domain(target: .MealDomain),
-            .domain(target: .NoticeDomain),
-            .domain(target: .ViolationDomain),
-            .domain(target: .MusicDomain),
-            .core(target: .JwtStore),
-            .core(target: .KeyValueStore),
-            .core(target: .Networking),
-            .core(target: .Database),
-            .core(target: .Timer),
-            .target(name: "\(env.name)ShareExtension")
-        ],
+        dependencies: ModulePaths.Feature.allCases.map { TargetDependency.feature(target: $0) }
+            + ModulePaths.Domain.allCases.map { TargetDependency.domain(target: $0) }
+            + [
+                .core(target: .JwtStore),
+                .core(target: .KeyValueStore),
+                .core(target: .Networking),
+                .core(target: .Database),
+                .core(target: .Timer),
+                .target(name: "\(env.name)ShareExtension")
+            ],
         settings: .settings(
             base: env.baseSetting
         )

Projects/Feature/ConfirmationDialogFeature/Sources/Factory/ConfirmationDialogFactory.swift → Projects/Feature/ConfirmationDialogFeature/Interface/Factory/ConfirmationDialogFactory.swift

@@ -1,10 +1,10 @@
-import BaseFeature
+import BaseFeatureInterface
 import UIKit
 
 public protocol ConfirmationDialogFactory {
     func makeViewController(
         title: String,
         description: String,
         confirmAction: @escaping () async -> Void
-    ) -> any StoredViewControllable
+    ) -> any RoutedViewControllable
 }

Projects/Feature/ConfirmationDialogFeature/Project.swift

@@ -5,10 +5,14 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Feature.ConfirmationDialogFeature.rawValue,
     targets: [
+        .interface(module: .feature(.ConfirmationDialogFeature), dependencies: [
+            .feature(target: .BaseFeature, type: .interface)
+        ]),
         .implements(
             module: .feature(.ConfirmationDialogFeature),
             dependencies: [
-                .feature(target: .BaseFeature)
+                .feature(target: .BaseFeature),
+                .feature(target: .ConfirmationDialogFeature, type: .interface)
             ]
         ),
         .tests(

Projects/Feature/ConfirmationDialogFeature/Sources/Assembly/ConfirmationDialogAssembly.swift

@@ -1,3 +1,4 @@
+import ConfirmationDialogFeatureInterface
 import Swinject
 
 public final class ConfirmationDialogAssembly: Assembly {

Projects/Feature/ConfirmationDialogFeature/Sources/Factory/ConfirmationDialogFactoryImpl.swift

@@ -1,12 +1,14 @@
 import BaseFeature
+import BaseFeatureInterface
+import ConfirmationDialogFeatureInterface
 import UIKit
 
 final class ConfirmationDialogFactoryImpl: ConfirmationDialogFactory {
     func makeViewController(
         title: String,
         description: String,
         confirmAction: @escaping () async -> Void
-    ) -> any StoredViewControllable {
+    ) -> any RoutedViewControllable {
         let store = ConfirmationDialogStore(confirmAction: confirmAction)
         return ConfirmationDialogViewController(
             title: title,

Projects/Feature/DetailNoticeFeature/Interface/Factory/DetailNoticeFactory.swift

@@ -0,0 +1,6 @@
+import BaseFeatureInterface
+import UIKit
+
+public protocol DetailNoticeFactory {
+    func makeViewController(noticeID: Int) -> any RoutedViewControllable
+}

Projects/Feature/DetailNoticeFeature/Project.swift

@@ -5,8 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Feature.DetailNoticeFeature.rawValue,
     targets: [
+        .interface(module: .feature(.DetailNoticeFeature), dependencies: [
+            .feature(target: .BaseFeature, type: .interface)
+        ]),
         .implements(module: .feature(.DetailNoticeFeature), dependencies: [
             .feature(target: .BaseFeature),
+            .feature(target: .DetailNoticeFeature, type: .interface),
             .domain(target: .NoticeDomain, type: .interface),
             .domain(target: .UserDomain, type: .interface)
         ]),

Projects/Feature/DetailNoticeFeature/Sources/Assembly/DetailNoticeAssembly.swift

@@ -1,3 +1,4 @@
+import DetailNoticeFeatureInterface
 import NoticeDomainInterface
 import Swinject
 import UserDomainInterface

Projects/Feature/DetailNoticeFeature/Sources/Factory/DetailNoticeFactoryImpl.swift

@@ -1,4 +1,6 @@
 import BaseFeature
+import BaseFeatureInterface
+import DetailNoticeFeatureInterface
 import NoticeDomainInterface
 import UIKit
 import UserDomainInterface
@@ -18,7 +20,7 @@ struct DetailNoticeFactoryImpl: DetailNoticeFactory {
         self.loadCurrentUserRoleUseCase = loadCurrentUserRoleUseCase
     }
 
-    func makeViewController(noticeID: Int) -> any StoredViewControllable {
+    func makeViewController(noticeID: Int) -> any RoutedViewControllable {
         let store = DetailNoticeStore(
             noticeID: noticeID,
             fetchNoticeUseCase: fetchNoticeUseCase,

Projects/Feature/HomeFeature/Sources/Factory/HomeFactory.swift → Projects/Feature/HomeFeature/Interface/Factory/HomeFactory.swift

@@ -1,3 +1,4 @@
+import BaseFeatureInterface
 import Moordinator
 import UIKit
 

Projects/Feature/HomeFeature/Project.swift

@@ -5,12 +5,16 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Feature.HomeFeature.rawValue,
     targets: [
+        .interface(module: .feature(.HomeFeature), dependencies: [
+            .feature(target: .BaseFeature, type: .interface)
+        ]),
         .implements(
             module: .feature(.HomeFeature),
             dependencies: [
                 .feature(target: .BaseFeature),
-                .feature(target: .ConfirmationDialogFeature),
-                .feature(target: .MyViolationListFeature),
+                .feature(target: .HomeFeature, type: .interface),
+                .feature(target: .ConfirmationDialogFeature, type: .interface),
+                .feature(target: .MyViolationListFeature, type: .interface),
                 .feature(target: .InputDialogFeature, type: .interface),
                 .domain(target: .SelfStudyDomain, type: .interface),
                 .domain(target: .MassageDomain, type: .interface),

Projects/Feature/HomeFeature/Sources/Assembly/HomeAssembly.swift

@@ -1,9 +1,10 @@
-import ConfirmationDialogFeature
+import ConfirmationDialogFeatureInterface
+import HomeFeatureInterface
 import InputDialogFeatureInterface
 import MassageDomainInterface
 import MealDomainInterface
 import Moordinator
-import MyViolationListFeature
+import MyViolationListFeatureInterface
 import SelfStudyDomainInterface
 import Swinject
 import TimerInterface

Projects/Feature/HomeFeature/Sources/Factory/HomeFactoryImpl.swift

@@ -1,9 +1,10 @@
-import ConfirmationDialogFeature
+import ConfirmationDialogFeatureInterface
+import HomeFeatureInterface
 import InputDialogFeatureInterface
 import MassageDomainInterface
 import MealDomainInterface
 import Moordinator
-import MyViolationListFeature
+import MyViolationListFeatureInterface
 import SelfStudyDomainInterface
 import TimerInterface
 import UserDomainInterface

Projects/Feature/HomeFeature/Sources/Moordinator/HomeMoordinator.swift

@@ -1,11 +1,11 @@
 import BaseFeature
 import BaseFeatureInterface
-import ConfirmationDialogFeature
+import ConfirmationDialogFeatureInterface
 import DWebKit
 import InputDialogFeatureInterface
 import Localization
 import Moordinator
-import MyViolationListFeature
+import MyViolationListFeatureInterface
 import TimerInterface
 import UIKit
 import UIKitUtil
@@ -90,7 +90,7 @@ private extension HomeMoordinator {
         self.rootVC.topViewController?.modalPresent(viewController)
         return .one(.contribute(
             withNextPresentable: viewController,
-            withNextRouter: viewController.store
+            withNextRouter: viewController.router
         ))
     }
 
@@ -108,7 +108,7 @@ private extension HomeMoordinator {
         return .one(
             .contribute(
                 withNextPresentable: viewController,
-                withNextRouter: viewController.store
+                withNextRouter: viewController.router
             )
         )
     }

Projects/Feature/MainTabFeature/Sources/Factory/MainFactory.swift → Projects/Feature/MainTabFeature/Interface/Factory/MainFactory.swift

@@ -1,3 +1,4 @@
+import BaseFeatureInterface
 import Moordinator
 
 public protocol MainFactory {

Projects/Feature/MainTabFeature/Project.swift

@@ -5,13 +5,17 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Feature.MainTabFeature.rawValue,
     targets: [
+        .interface(module: .feature(.MainTabFeature), dependencies: [
+            .feature(target: .BaseFeature, type: .interface)
+        ]),
         .implements(module: .feature(.MainTabFeature), dependencies: [
             .feature(target: .BaseFeature),
-            .feature(target: .HomeFeature),
-            .feature(target: .NoticeFeature),
-            .feature(target: .SelfStudyFeature),
-            .feature(target: .MassageFeature),
-            .feature(target: .MusicFeature)
+            .feature(target: .MainTabFeature, type: .interface),
+            .feature(target: .HomeFeature, type: .interface),
+            .feature(target: .NoticeFeature, type: .interface),
+            .feature(target: .SelfStudyFeature, type: .interface),
+            .feature(target: .MassageFeature, type: .interface),
+            .feature(target: .MusicFeature, type: .interface)
         ]),
         .tests(module: .feature(.MainTabFeature), dependencies: [
             .feature(target: .MainTabFeature)

Projects/Feature/MainTabFeature/Sources/Assembly/MainAssembly.swift

@@ -1,8 +1,9 @@
-import HomeFeature
-import MassageFeature
-import MusicFeature
-import NoticeFeature
-import SelfStudyFeature
+import HomeFeatureInterface
+import MainTabFeatureInterface
+import MassageFeatureInterface
+import MusicFeatureInterface
+import NoticeFeatureInterface
+import SelfStudyFeatureInterface
 import Swinject
 
 public final class MainAssembly: Assembly {

Projects/Feature/MainTabFeature/Sources/Factory/MainFactoryImpl.swift

@@ -1,9 +1,10 @@
-import HomeFeature
-import MassageFeature
+import HomeFeatureInterface
+import MainTabFeatureInterface
+import MassageFeatureInterface
 import Moordinator
-import MusicFeature
-import NoticeFeature
-import SelfStudyFeature
+import MusicFeatureInterface
+import NoticeFeatureInterface
+import SelfStudyFeatureInterface
 
 struct MainFactoryImpl: MainFactory {
     private let homeFactory: any HomeFactory

Projects/Feature/MainTabFeature/Sources/Moordinator/MainTabMoordinator.swift

@@ -1,10 +1,10 @@
 import BaseFeature
-import HomeFeature
-import MassageFeature
+import HomeFeatureInterface
+import MassageFeatureInterface
 import Moordinator
-import MusicFeature
-import NoticeFeature
-import SelfStudyFeature
+import MusicFeatureInterface
+import NoticeFeatureInterface
+import SelfStudyFeatureInterface
 import UIKit
 
 final class MainTabMoordinator: Moordinator {

Projects/Feature/MassageFeature/Sources/Factory/MassageFactory.swift → Projects/Feature/MassageFeature/Interface/Factory/MassageFactory.swift

@@ -1,3 +1,4 @@
+import BaseFeatureInterface
 import Moordinator
 
 public protocol MassageFactory {

Projects/Feature/MassageFeature/Project.swift

@@ -5,8 +5,12 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Feature.MassageFeature.rawValue,
     targets: [
+        .interface(module: .feature(.MassageFeature), dependencies: [
+            .feature(target: .BaseFeature, type: .interface)
+        ]),
         .implements(module: .feature(.MassageFeature), dependencies: [
             .feature(target: .BaseFeature),
+            .feature(target: .MassageFeature, type: .interface),
             .domain(target: .MassageDomain, type: .interface),
             .domain(target: .UserDomain, type: .interface)
         ]),

Projects/Feature/MassageFeature/Sources/Assembly/MassageAssembly.swift

@@ -1,4 +1,5 @@
 import MassageDomainInterface
+import MassageFeatureInterface
 import Swinject
 import UserDomainInterface
 

Projects/Feature/MassageFeature/Sources/Factory/MassageFactoryImpl.swift

@@ -1,4 +1,5 @@
 import MassageDomainInterface
+import MassageFeatureInterface
 import Moordinator
 import UserDomainInterface
 

Projects/Feature/MusicFeature/Sources/Factory/MusicFactory.swift → Projects/Feature/MusicFeature/Interface/Factory/MusicFactory.swift

@@ -1,3 +1,4 @@
+import BaseFeatureInterface
 import Moordinator
 
 public protocol MusicFactory {

Projects/Feature/MusicFeature/Project.swift

@@ -5,9 +5,13 @@ import ProjectDescriptionHelpers
 let project = Project.module(
     name: ModulePaths.Feature.MusicFeature.rawValue,
     targets: [
+        .interface(module: .feature(.MusicFeature), dependencies: [
+            .feature(target: .BaseFeature, type: .interface)
+        ]),
         .implements(module: .feature(.MusicFeature), dependencies: [
             .feature(target: .BaseFeature),
-            .feature(target: .ProposeMusicFeature),
+            .feature(target: .MusicFeature, type: .interface),
+            .feature(target: .ProposeMusicFeature, type: .interface),
             .domain(target: .MusicDomain, type: .interface),
             .domain(target: .UserDomain, type: .interface)
         ]),

Projects/Feature/MusicFeature/Sources/Assembly/MusicAssembly.swift

@@ -1,5 +1,6 @@
 import MusicDomainInterface
-import ProposeMusicFeature
+import MusicFeatureInterface
+import ProposeMusicFeatureInterface
 import Swinject
 import UserDomainInterface
 

Projects/Feature/MusicFeature/Sources/Factory/MusicFactoryImpl.swift

@@ -1,6 +1,8 @@
 import Moordinator
 import MusicDomainInterface
+import MusicFeatureInterface
 import ProposeMusicFeature
+import ProposeMusicFeatureInterface
 import UserDomainInterface
 
 struct MusicFactoryImpl: MusicFactory {

Projects/Feature/MusicFeature/Sources/Moordinator/MusicMoordinator.swift

@@ -1,7 +1,7 @@
 import BaseFeature
 import Localization
 import Moordinator
-import ProposeMusicFeature
+import ProposeMusicFeatureInterface
 import UIKit
 import UIKitUtil
 
@@ -85,7 +85,7 @@ private extension MusicMoordinator {
         return .one(
             .contribute(
                 withNextPresentable: viewController,
-                withNextRouter: viewController.store
+                withNextRouter: viewController.router
             )
         )
     }

Projects/Feature/MyViolationListFeature/Interface/MyViolationListFactory.swift

@@ -0,0 +1,5 @@
+import BaseFeatureInterface
+
+public protocol MyViolationListFactory {
+    func makeViewController() -> any RoutedViewControllable
+}