Merge pull request #5 from willowtreeapps/feature/prep-for-release

Preparing for 1.0.1 release

README.md

@@ -1,6 +1,6 @@
 # Grove
 Simple Swift Dependency Injection Container.
-Somewhat like grove is a group of trees, Grove's container represents a group of dependencies, and it provides you with tools to easily manage them.
+Somewhat like a grove is a group of trees, Grove's container represents a group of dependencies, and it provides you with tools to easily manage them.
 
 ## Description
 Grove is a super simple and lightweight Dependency Injection library available for Swift. It's designed to help you manage a group of dependencies in a container, and easily resolve them when needed, thus helping make your project more modular, testable, and maintainable.
@@ -21,8 +21,6 @@ dependencies: [
 ]
 ```
 
-(Note: Until it's public, use this repository address: `git@github.com:willowtreeapps/grove.git`, version "1.0.0-beta.3")
-
 ## Usage
 Grove simplifies dependency registration and resolving. Here's an example:
 
@@ -31,6 +29,9 @@ Grove simplifies dependency registration and resolving. Here's an example:
 ```swift
 let container = Grove.defaultContainer // You can use the default container or create your own
 
+// Register specifying a type to use for resolution
+container.register(as: NASARepositoryProtocol.self, NASARepository())
+
 // Register a reference type dependency as a singleton 
 container.register(JSONEncoder())
 

Sources/Grove/PropertyWrapper.swift

@@ -21,28 +21,28 @@ import Foundation
 ///  ```
 ///
 @propertyWrapper
-public struct Resolve<Dependency> {
-    private var container: Grove
+public class Resolve<Dependency>: @unchecked Sendable {
+    private let container: Grove
+    private let transientInstanceLock = NSLock()
     private var transientInstance: Dependency?
 
     public init(_ type: Dependency.Type, container: Grove = .defaultContainer) {
         self.container = container
-
-        switch container.scope(for: type) {
-        case .singleton:
-            break
-        case .transient:
-            transientInstance = (container.resolve() as Dependency)
-        }
     }
 
     public var wrappedValue: Dependency {
         switch container.scope(for: Dependency.self) {
         case .singleton:
             return container.resolve()
         case .transient:
+            transientInstanceLock.lock()
+            defer {
+                transientInstanceLock.unlock()
+            }
             guard let transientInstance else {
-                preconditionFailure("Grove: Error resolving transient dependency: '\(String(describing: Dependency.self))'")
+                let transientInstance = (container.resolve() as Dependency)
+                self.transientInstance = transientInstance
+                return transientInstance
             }
             return transientInstance
         }

Tests/GroveTests/GrovePropertyWrapperTests.swift

@@ -50,3 +50,18 @@ final class GrovePropertyWrapperTests: XCTestCase {
         XCTAssertEqual(testClass2.value, 100)
     }
 }
+
+final class GrovePropertyWrapperAsClassTests: XCTestCase {
+    @Resolve(TestProtocol.self) var testClass
+
+    func testUpdatedRegistration() {
+        // Given
+        Grove.defaultContainer.register(as: TestProtocol.self, scope: .singleton, TestClass(value: 10))
+
+        // When
+        Grove.defaultContainer.register(as: TestProtocol.self, scope: .singleton, TestClass(value: 20))
+
+        // Then
+        XCTAssertEqual(testClass.value, 20)
+    }
+}