Merge pull request #39 from roanutil/feature/add-unmanagedId-property

Remove unmanagedIdAccessor in favor of unmanagedId property in IdentifiedUnmanagedModel

Author: r-jarvis

Sources/CoreDataRepository/IdentifiedUnmanagedModel.swift

@@ -8,14 +8,14 @@ import CoreData
 
 public protocol IdentifiedUnmanagedModel: ReadableUnmanagedModel {
     associatedtype UnmanagedId: Equatable
-    static var unmanagedIdAccessor: (Self) -> UnmanagedId { get }
+    var unmanagedId: UnmanagedId { get }
     static var managedIdExpression: NSExpression { get }
 }
 
 extension IdentifiedUnmanagedModel {
     @inlinable
     public func readManaged(from context: NSManagedObjectContext) throws -> ManagedModel {
-        try Self.readManaged(id: Self.unmanagedIdAccessor(self), from: context)
+        try Self.readManaged(id: unmanagedId, from: context)
     }
 
     @inlinable

Sources/Internal/ModelsWithIntId/IdentifiableModel_Int.swift

@@ -100,7 +100,10 @@ extension IdentifiableModel_IntId: IdentifiedUnmanagedModel {
     }
 
     @inlinable
-    package static var unmanagedIdAccessor: (IdentifiableModel_IntId) -> Int { \.id }
+    package var unmanagedId: Int {
+        id
+    }
+
     package nonisolated(unsafe) static let managedIdExpression = NSExpression(forKeyPath: \ManagedModel_IntId.id)
 }
 

Sources/Internal/ModelsWithUuidId/IdentifiableModel_Uuid.swift

@@ -100,7 +100,10 @@ extension IdentifiableModel_UuidId: IdentifiedUnmanagedModel {
     }
 
     @inlinable
-    package static var unmanagedIdAccessor: (IdentifiableModel_UuidId) -> UUID { \.id }
+    package var unmanagedId: UUID {
+        id
+    }
+
     package nonisolated(unsafe) static let managedIdExpression = NSExpression(forKeyPath: \ManagedModel_UuidId.id)
 }
 

Tests/CoreDataRepositoryTests/BatchRequestTests.swift

@@ -159,7 +159,7 @@ extension CoreDataRepositoryTests {
                 let count = try repositoryContext.count(for: fetchRequest)
                 expectNoDifference(count, 0, "Count of objects in CoreData should be zero at the start of each test.")
 
-                let _ = try values
+                _ = try values
                     .map(mapDictToManagedModel(_:))
                 try repositoryContext.save()
             }
@@ -207,7 +207,7 @@ extension CoreDataRepositoryTests {
                 let count = try repositoryContext.count(for: fetchRequest)
                 expectNoDifference(count, 0, "Count of objects in CoreData should be zero at the start of each test.")
 
-                let _ = try values
+                _ = try values
                     .map(mapDictToManagedModel(_:))
                 try repositoryContext.save()
             }