ModuleScanner를 통해 생성한 Module에서 Instance를 캡처하여 재사용되던 문제 수정

Author: minsOne

Sources/DIContainer/Module/AutoModule.swift

@@ -2,6 +2,10 @@ import Foundation
 
 open class AutoModuleBase {
     public required init() {}
+
+    fileprivate func __newInstance() -> Self {
+        Self()
+    }
 }
 
 public protocol AutoModulable: AnyObject {
@@ -11,10 +15,17 @@ public protocol AutoModulable: AnyObject {
 public typealias AutoModule = AutoModuleBase & AutoModulable
 
 #if DEBUG
-public extension AutoModulable {
+extension AutoModulable {
     var module: Module? {
-        (self as? ModuleKeyType.Value)
-            .map { instance in Module(ModuleKeyType.self) { instance } }
+        guard
+            let instance = self as? ModuleKeyType.Value,
+            let autoModuleBase = instance as? AutoModuleBase
+        else { return nil }
+
+        return Module(ModuleKeyType.self) {
+            (autoModuleBase.__newInstance() as? ModuleKeyType.Value)
+                ?? instance
+        }
     }
 }
 #endif

…ainerTests/Tests/CachedModuleTests.swift …s/Tests/AutoModuleIsNotCachedTests.swiftTests/DIContainerTests/Tests/CachedModuleTests.swift renamed to Tests/DIContainerTests/Tests/AutoModuleIsNotCachedTests.swift Tests/DIContainerTests/Tests/CachedModuleTests.swift renamed to Tests/DIContainerTests/Tests/AutoModuleIsNotCachedTests.swift

@@ -1,5 +1,5 @@
 //
-//  CachedModuleTests.swift
+//  AutoModuleIsNotCachedTests.swift
 //  DIContainer
 //
 //  Created by minsOne on 1/23/25.
@@ -11,13 +11,13 @@ import Testing
 
 @MainActor
 @Suite(.serialized)
-struct CachedModuleTests {
+struct AutoModuleIsNotCachedTests {
     init() {
         Container.autoRegisterModules()
     }
 }
 
-extension CachedModuleTests {
+extension AutoModuleIsNotCachedTests {
     @Test
     func cachedModule() throws {
         let service1 = getMockService()
@@ -32,7 +32,7 @@ extension CachedModuleTests {
         service2.doSomething()
         do {
             let service = try #require(service2 as? MockServiceImpl)
-            #expect(service.count == 2)
+            #expect(service.count != 2)
         }
     }
 
@@ -59,7 +59,7 @@ extension CachedModuleTests {
     }
 }
 
-extension CachedModuleTests {
+private extension AutoModuleIsNotCachedTests {
     func getMockService() -> MockService {
         @Inject(MockServiceKey.self) var service
         return service

Tests/DIContainerTests/Tests/InjectTestsTests.swift

@@ -36,8 +36,15 @@ extension ContainerTests {
     }
 
     private func injectBehavior() {
-        @Inject(MockServiceKey.self) var service: MockService
-        service.doSomething()
-        #expect((service as? MockServiceImpl)?.count == 1)
+        @Inject(MockServiceKey.self) var service1: MockService
+        service1.doSomething()
+        #expect((service1 as? MockServiceImpl)?.count == 1)
+
+        service1.doSomething()
+        #expect((service1 as? MockServiceImpl)?.count == 2)
+
+        @Inject(MockServiceKey.self) var service2: MockService
+        service2.doSomething()
+        #expect((service2 as? MockServiceImpl)?.count == 1)
     }
 }