fix: Support Structs and Protocols as Weak Objects

mcgaryp · mcgaryp · commit ca24cb7ce4c2 · 2025-05-20T21:47:43.000-06:00
diff --git a/Sources/AstrojectCore/Instances/Weak.swift b/Sources/AstrojectCore/Instances/Weak.swift
@@ -12,9 +12,14 @@ import Foundation
 /// The `Weak` class implements the `Instance` protocol and represents a weak reference scope for dependency injection.
 /// It holds a weak reference to the product instance, allowing it to be deallocated when
 /// no longer strongly referenced elsewhere.
-class Weak<Product: AnyObject>: Instance {
+class Weak<Product>: Instance {
     /// The weak reference to the product instance.
-    weak var product: Product?
+    weak var object: AnyObject?
+    
+    var product: Product? {
+        get { object as? Product }
+        set { object = newValue as AnyObject }
+    }
     
     /// Initializes a new `Weak` instance.
     init() {}
diff --git a/Sources/AstrojectCore/Registration/Registrable.swift b/Sources/AstrojectCore/Registration/Registrable.swift
@@ -90,7 +90,7 @@ public extension Registrable {
     ///
     /// - Returns: The modified `Registration` instance.
     @discardableResult
-    func asWeak() -> Self where Product: AnyObject {
+    func asWeak() -> Self {
         return self.as(Weak())
     }
     
diff --git a/Tests/CoreTests/ContainerTests.swift b/Tests/CoreTests/ContainerTests.swift
@@ -966,7 +966,6 @@ extension ContainerTests {
             
             #expect(object3Count == 10)
         }
-        
     }
 }
 
diff --git a/Tests/CoreTests/InstanceTests.swift b/Tests/CoreTests/InstanceTests.swift
@@ -85,6 +85,16 @@ struct InstanceTests {
             dog = nil
             #expect(instance.get(for: context) == nil)
         }
+        
+        @Test("Instance can hold structs")
+        func weakStruct() {
+            let instance = Weak<StructAnimal>()
+            let context = Context.fresh()
+            let animal = StructAnimal()
+            instance.set(animal, for: context)
+            instance.release(for: context)
+            #expect(instance.get(for: context) == nil)
+        }
     }
     
     @Suite("Graph")

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public extension Registrable {`
`90`	`90`	`///`
`91`	`91`	/// - Returns: The modified `Registration` instance.
`92`	`92`	`@discardableResult`
`93`		`- func asWeak() -> Self where Product: AnyObject {`
	`93`	`+ func asWeak() -> Self {`
`94`	`94`	`return self.as(Weak())`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,6 @@ extension ContainerTests {`
`966`	`966`
`967`	`967`	`#expect(object3Count == 10)`
`968`	`968`	`}`
`969`		`-`
`970`	`969`	`}`
`971`	`970`	`}`
`972`	`971`