코드 정리

Author: minsOne

Sources/DIContainer/Module/AutoModule.swift

@@ -12,11 +12,17 @@ public protocol AutoModulable: AnyObject {
     associatedtype ModuleKeyType: InjectionKeyType
 }
 
-public typealias AutoModule = AutoModuleBase & AutoModulable
+public typealias AutoModule = AutoModulable & AutoModuleBase
 
 #if DEBUG
+extension AutoModulable where Self: AutoModuleBase {
+    static var module: Module? {
+        Self().module
+    }
+}
+
 extension AutoModulable {
-    var module: Module? {
+    private var module: Module? {
         guard
             let instance = self as? ModuleKeyType.Value,
             let autoModuleBase = instance as? AutoModuleBase

Sources/DIContainer/Module/Module.swift

@@ -9,22 +9,29 @@ public struct Module: Hashable {
         _ keyType: T.Type,
         _ resolve: @escaping () -> U
     ) where T.Value == U {
-        name = KeyName(keyType).name
-        self.resolve = resolve
+        let name = KeyName(keyType).name
+        self.init(name: name, resolve: resolve)
     }
 
     public init<T: AutoModule>(_ moduleType: T.Type) {
-        name = KeyName(moduleType.ModuleKeyType.self).name
-        resolve = {
+        let name = KeyName(moduleType.ModuleKeyType.self).name
+        self.init(name: name, resolve: {
             moduleType.init()
-        }
+        })
+    }
+
+    init(name: String, resolve: @escaping () -> Any) {
+        self.name = name
+        self.resolve = resolve
     }
+}
 
-    public static func == (lhs: Module, rhs: Module) -> Bool {
+public extension Module {
+    static func == (lhs: Module, rhs: Module) -> Bool {
         lhs.name == rhs.name
     }
-    
-    public func hash(into hasher: inout Hasher) {
+
+    func hash(into hasher: inout Hasher) {
         hasher.combine(name)
     }
 }

…Loader/MachOLoader+SystemImagePath.swift …Loader/MachOLoader+SystemImagePath.swiftSources/DIContainer/Internals/MachOLoader/MachOLoader+SystemImagePath.swift renamed to Sources/DIContainer/Scanner/MachOLoader/MachOLoader+SystemImagePath.swift Sources/DIContainer/Internals/MachOLoader/MachOLoader+SystemImagePath.swift renamed to Sources/DIContainer/Scanner/MachOLoader/MachOLoader+SystemImagePath.swift

@@ -1,5 +1,5 @@
 //
-//  machOLoader.swift
+//  MachOLoader.swift
 //  DIContainer
 //
 //  Created by minsOne on 12/10/24.
@@ -60,7 +60,7 @@ public extension MachOLoader {
 
     var scanModuleList: [Module] {
         scanModuleTypeList
-            .compactMap { ($0 as? any AutoModule.Type)?.init().module }
+            .compactMap { ($0 as? any AutoModule.Type)?.module }
     }
 }
 

…/Internals/MachOLoader/MachOLoader.swift …er/Scanner/MachOLoader/MachOLoader.swiftSources/DIContainer/Internals/MachOLoader/MachOLoader.swift renamed to Sources/DIContainer/Scanner/MachOLoader/MachOLoader.swift Sources/DIContainer/Internals/MachOLoader/MachOLoader.swift renamed to Sources/DIContainer/Scanner/MachOLoader/MachOLoader.swift

@@ -81,7 +81,7 @@ public struct ModuleScanner {
 
         let start = Date()
         let (firstIndex, lastIndex) = (0, numberOfClasses)
-        var (keys, ptrIndex) = ([any AutoModulable.Type](), [Int]())
+        var (modules, ptrIndex) = ([any AutoModulable.Type](), [Int]())
         let superCls = AutoModuleBase.self
 
 // MARK: Case 1 - class_getSuperclass
@@ -90,7 +90,7 @@ public struct ModuleScanner {
             if class_getSuperclass(cls) == superCls,
                case let kcls as any AutoModulable.Type = cls {
                 ptrIndex.append(i)
-                keys.append(kcls)
+                modules.append(kcls)
             }
         }
 
@@ -119,16 +119,16 @@ public struct ModuleScanner {
         │ numberOfClasses : \(numberOfClasses)
         │ InjectionKey classPtr Index List : \(ptrIndex)
         │ AutoModule List :
-        │  - \(keys)
+        │  - \(modules)
         └────────────────────────────────────────────────
         """)
 
-        return keys
+        return modules
     }
 
     public var scanModuleList: [Module] {
         scanModuleTypeList
-            .compactMap { ($0 as? any AutoModule.Type)?.init().module }
+            .compactMap { ($0 as? any AutoModule.Type)?.module }
     }
 }
 #endif

…ces/DIContainer/Scan/ModuleScanner.swift …/Scanner/ObjcRuntime/ModuleScanner.swiftSources/DIContainer/Scan/ModuleScanner.swift renamed to Sources/DIContainer/Scanner/ObjcRuntime/ModuleScanner.swift Sources/DIContainer/Scan/ModuleScanner.swift renamed to Sources/DIContainer/Scanner/ObjcRuntime/ModuleScanner.swift

@@ -0,0 +1,27 @@
+//
+//  KeyNameTests.swift
+//  DIContainer
+//
+//  Created by minsOne on 1/26/25.
+//
+
+import Testing
+
+@testable import DIContainer
+
+@Suite(.serialized)
+struct KeyNameTests {
+    @Test
+    func compare() {
+        let lhs = KeyName(NestedType.NestedTypeServiceKey.self)
+        let rhs = KeyName(NestedTypeServiceKey.self)
+
+        #expect(lhs.name != rhs.name)
+    }
+}
+
+enum NestedType {
+    class NestedTypeServiceKey {}
+}
+
+class NestedTypeServiceKey {}