commit: navigator add servicelocator

Author: GIKI

Example/ModuleRouteExample/AppDelegate.swift

@@ -11,9 +11,10 @@ import ModuleRoute
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-    public lazy var myServiceLocator = startServiceLocator {
-        AppModule()
-    }
+    public lazy var myServiceLocator = startServiceLocator()
+//    {
+////      AppModule()
+//    }
     private var navigator: MRNavigator!
 
 
@@ -29,8 +30,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     private func setupRoute() {
         navigator = MRNavigator(serviceLocator:myServiceLocator)
-        navigator.register(moduleType: DetailModule.self)
-        navigator.register(moduleType: ChatModule.self)
+        navigator.register(DetailInterface.self, routes: DetailModule.supportedRoutes) {
+            DetailModule()
+        }
+        navigator.register(ChatInterface.self, routes: ChatModule.supportedRoutes) {
+            ChatModule()
+        }
+        
+//        navigator.register(interfaceType: DetailInterface.self, moduleType: DetailModule.self)
+//        navigator.register(moduleType: DetailModule.self)
+//        navigator.register(moduleType: ChatModule.self)
     }
 
 
@@ -58,9 +67,9 @@ class AppModule: ServiceLocatorModule {
         single(DetailInterface.self) {
             DetailModule()
         }
-        single {
-            ChatModule()
-        }
+//        single {
+//            ChatModule()
+//        }
         single(ChatInterface.self) {
             ChatModule()
         }

Example/ModuleRouteExample/Chat/ChatModule.swift

@@ -13,6 +13,7 @@ protocol ChatInterface: MRModule {
 }
 
 class ChatModule: ChatInterface {
+    
     static var supportedRoutes: [MRRoute.Type] = [
         ChatRoute.self
     ]

Example/ModuleRouteExample/Detail/DetailModule.swift

@@ -15,11 +15,13 @@ protocol DetailInterface: MRModule {
 
 class DetailModule: DetailInterface {
 
+    @MRInject var navigator: MRNavigator
+    
     static var supportedRoutes: [MRRoute.Type] = [
         DetailRoute.self
     ]
     public init() {
-
+        
     }
 
     public func handle(route: MRRoute) -> RouteResult {

Example/ModuleRouteExample/ViewController.swift

@@ -10,9 +10,9 @@ import ModuleRoute
 
 class ViewController: UIViewController {
 
-    @PluginInject var navigator: MRNavigator
+    @MRInject var navigator: MRNavigator
 //    @Inject(DetailInterface) var detail: DetailInterface
-    @PluginInject  var detail: DetailInterface
+    
 
     // MARK: - Properties
     private var collectionView: UICollectionView!
@@ -77,18 +77,19 @@ extension ViewController: UICollectionViewDelegate {
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let item = items[indexPath.item]
         if indexPath.item == 1 {
-//            navigator.navigate(to: DetailRoute(), from: self)
+            @MRInject var detail: DetailInterface
             let result = detail.handle(route: DetailRoute())
+            switch result {
+            case .navigator(let vc):
+                self.navigationController?.pushViewController(vc, animated: true)
+            default: break
+                
+            }
             print(result)
         } else {
             navigator.navigate(to: ChatRoute(), from: self)
         }
-        
-//
-//        // 创建详情页面并跳转
-//        let detailVC = DetailViewController()
-//        detailVC.item = item
-//        navigationController?.pushViewController(detailVC, animated: true)
+
     }
 }
 

Sources/ModuleRoute/MRDependencyContainer.swift

@@ -0,0 +1,33 @@
+//
+//  File.swift
+//  ModuleRoute
+//
+//  Created by GIKI on 2025/2/17.
+//
+
+import Foundation
+import UIKit
+
+public final class MRNavigatorLocator {
+    
+    static let shared = MRNavigatorLocator()
+    
+    var serviceLocator: ServiceLocator?
+    
+}
+
+@propertyWrapper
+public final class MRInject<T>: Dependency<T> {
+
+    
+    public var wrappedValue: T {
+        resolvedWrappedValue()
+    }
+
+    public init() {
+        guard let serviceLocator = MRNavigatorLocator.shared.serviceLocator else {
+            fatalError("Could not access AppDelegate or cast it to the correct type.")
+        }
+        super.init(serviceLocator)
+    }
+}

Sources/ModuleRoute/MRInject.swift

@@ -19,23 +19,33 @@ public class MRNavigator {
 
     public init(serviceLocator: ServiceLocator) {
         self.serviceLocator = serviceLocator
+        MRNavigatorLocator.shared.serviceLocator = serviceLocator
         serviceLocator.register {
             self
         }
-        if #available(iOS 13.0, *) {
-            Task{
-                await serviceLocator.build()
-            }
-        }
+        buildServiceLocator()
     }
 
     private var routeToModuleTypeMap: [ObjectIdentifier: (ServiceLocator) -> MRModule] = [:]
 
-    public func register<T: MRModule>(moduleType: T.Type) {
-        T.supportedRoutes.forEach { routeType in
+    public func register<T>(_ type: T.Type = T.self, routes: [MRRoute.Type], _ factory: @escaping () -> T) -> Void {
+        serviceLocator.single(type, factory)
+        routes.forEach { routeType in
             let key = ObjectIdentifier(routeType)
             routeToModuleTypeMap[key] = { locator in
-                return try! locator.resolve() as T
+                guard let instance = try? locator.resolve() as T else {
+                    fatalError("Failed to resolve type \(T.self)")
+                }
+                return instance as! MRModule
+            }
+        }
+        buildServiceLocator()
+    }
+    
+    private func buildServiceLocator() {
+        if #available(iOS 13.0, *) {
+            Task{
+                await serviceLocator.build()
             }
         }
     }

Sources/ModuleRoute/MRNavigator.swift

@@ -38,7 +38,7 @@ public class ServiceLocator {
     /// - Parameters:
     ///   - type: The type of the singleton service to register.
     ///   - factory: A closure that creates and returns a single instance of the service.
-    internal func single<T>(_ type: T.Type = T.self, _ factory: @escaping () -> T) {
+    public func single<T>(_ type: T.Type = T.self, _ factory: @escaping () -> T) {
         let key = String(describing: type)
         singleLock.lock()
         defer { singleLock.unlock() }