Add CoreDataManagedObject.store

PureSwift · Aug 17, 2023 · 563b2a1 · 563b2a1
1 parent 42487ee
commit 563b2a1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/Sources/CoreDataModel/NSManagedObject.swift b/Sources/CoreDataModel/NSManagedObject.swift
@@ -14,11 +14,14 @@ public final class CoreDataManagedObject: CoreModel.ManagedObject {
 
     internal let managedObject: NSManagedObject
 
-    internal init(_ managedObject: NSManagedObject) {
+    internal unowned let store: CoreDataStore
+
+    internal init(_ managedObject: NSManagedObject, store: CoreDataStore) {
         self.managedObject = managedObject
+        self.store = store
     }
 
-    public var store: NSManagedObjectContext? {
+    internal var context: NSManagedObjectContext? {
         return managedObject.managedObjectContext
     }
 
@@ -40,11 +43,11 @@ public final class CoreDataManagedObject: CoreModel.ManagedObject {
             else { return .null }
 
         if let managedObject = objectValue as? NSManagedObject {
-            return .toOne(CoreDataManagedObject(managedObject))
+            return .toOne(CoreDataManagedObject(managedObject, store: store))
         } else if let orderedSet = objectValue as? NSOrderedSet {
-            return .toMany(orderedSet.map { CoreDataManagedObject($0 as! NSManagedObject) })
+            return .toMany(orderedSet.map { CoreDataManagedObject($0 as! NSManagedObject, store: store) })
         } else if let managedObjects = objectValue as? Set<NSManagedObject> {
-            return .toMany(managedObjects.map { CoreDataManagedObject($0) })
+            return .toMany(managedObjects.map { CoreDataManagedObject($0, store: store) })
         } else {
             fatalError("Invalid CoreData relationship value \(objectValue)")
         }
@@ -60,6 +63,7 @@ public final class CoreDataManagedObject: CoreModel.ManagedObject {
         case let .toOne(value):
             objectValue = value.managedObject
         case let .toMany(value):
+            // TODO: Check if ordered
             objectValue = Set(value.map({ $0.managedObject })) as NSSet
         }
 

diff --git a/Sources/CoreDataModel/NSManagedObjectContext.swift b/Sources/CoreDataModel/NSManagedObjectContext.swift
@@ -22,18 +22,18 @@ public final class CoreDataStore: StoreProtocol {
 
     /// Fetch managed objects.
     public func fetch(_ fetchRequest: FetchRequest) throws -> [CoreDataManagedObject] {
-        return try context.fetch(fetchRequest).map { CoreDataManagedObject($0) }
+        return try context.fetch(fetchRequest).map { CoreDataManagedObject($0, store: self) }
     }
 
     /// Fetch and return result count.
-    public func count(for fetchRequest: FetchRequest) throws -> Int {
+    public func count(for fetchRequest: FetchRequest) throws -> UInt {
         return try context.count(for: fetchRequest)
     }
 
     /// Create new managed object.
-    public func create(_ entity: String) throws -> CoreDataManagedObject {
-        let managedObject = try context.create(entity)
-        return CoreDataManagedObject(managedObject)
+    public func create(_ entity: EntityName) throws -> CoreDataManagedObject {
+        let managedObject = try context.create(entity.rawValue)
+        return CoreDataManagedObject(managedObject, store: self)
     }
 
     /// Delete the specified managed object.
@@ -53,8 +53,8 @@ internal extension NSManagedObjectContext {
         return try self.fetch(fetchRequest.toFoundation())
     }
 
-    func count(for fetchRequest: FetchRequest) throws -> Int {
-        return try self.count(for: fetchRequest.toFoundation())
+    func count(for fetchRequest: FetchRequest) throws -> UInt {
+        return UInt(try self.count(for: fetchRequest.toFoundation()))
     }
 
     func create(_ entityName: String) throws -> NSManagedObject {

diff --git a/Sources/CoreModel/Store.swift b/Sources/CoreModel/Store.swift
@@ -15,10 +15,10 @@ public protocol StoreProtocol: AnyObject {
     func fetch(_ fetchRequest: FetchRequest) throws -> [ManagedObject]
 
     /// Fetch and return result count.
-    func count(_ fetchRequest: FetchRequest) throws -> Int
+    func count(_ fetchRequest: FetchRequest) throws -> UInt
 
     /// Create new managed object.
-    func create(_ entity: String) throws -> ManagedObject
+    func create(_ entity: EntityName) throws -> ManagedObject
 
     /// Delete the specified managed object. 
     func delete(_ managedObject: ManagedObject)
@@ -29,8 +29,8 @@ public protocol StoreProtocol: AnyObject {
 
 public extension StoreProtocol {
 
-    func count(_ fetchRequest: FetchRequest) throws -> Int {
-        return try fetch(fetchRequest).count
+    func count(_ fetchRequest: FetchRequest) throws -> UInt {
+        return try UInt(fetch(fetchRequest).count)
     }
 }