WIP: Storage protocol

CoreStore/Saving and Processing/AsynchronousDataTransaction.swift

@@ -189,24 +189,6 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
         super.delete(objects)
     }
     
-    /**
-     Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
-     */
-    @available(*, deprecated=1.3.4, obsoleted=2.0.0, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
-    public func rollback() {
-        
-        CoreStore.assert(
-            !self.isCommitted,
-            "Attempted to rollback an already committed \(typeName(self))."
-        )
-        CoreStore.assert(
-            self.transactionQueue.isCurrentExecutionContext(),
-            "Attempted to rollback a \(typeName(self)) outside its designated queue."
-        )
-        
-        self.context.reset()
-    }
-    
     
     // MARK: Internal
     
@@ -253,4 +235,22 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     // MARK: Private
     
     private let closure: (transaction: AsynchronousDataTransaction) -> Void
+    
+    
+    // MARK: Deprecated
+    
+    @available(*, deprecated=1.3.4, obsoleted=2.0.0, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
+    public func rollback() {
+        
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to rollback an already committed \(typeName(self))."
+        )
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to rollback a \(typeName(self)) outside its designated queue."
+        )
+        
+        self.context.reset()
+    }
 }

CoreStore/Saving and Processing/CoreStore+Transaction.swift

@@ -71,6 +71,9 @@ public extension CoreStore {
         self.defaultStack.refreshAllObjectsAsFaults()
     }
     
+    
+    // MARK: Deprecated
+    
     @available(*, deprecated=1.3.1, obsoleted=2.0.0, renamed="beginUnsafe")
     @warn_unused_result
     public static func beginDetached() -> UnsafeDataTransaction {

CoreStore/Saving and Processing/DataStack+Transaction.swift

@@ -93,6 +93,9 @@ public extension DataStack {
         self.mainContext.refreshAllObjectsAsFaults()
     }
     
+    
+    // MARK: Deprecated
+    
     @available(*, deprecated=1.3.1, obsoleted=2.0.0, renamed="beginUnsafe")
     @warn_unused_result
     public func beginDetached() -> UnsafeDataTransaction {

CoreStore/Saving and Processing/SynchronousDataTransaction.swift

@@ -184,30 +184,6 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
         super.delete(objects)
     }
     
-    /**
-     Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
-     */
-    @available(*, deprecated=1.3.4, obsoleted=2.0.0, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
-    public func rollback() {
-        
-        CoreStore.assert(
-            !self.isCommitted,
-            "Attempted to rollback an already committed \(typeName(self))."
-        )
-        CoreStore.assert(
-            self.transactionQueue.isCurrentExecutionContext(),
-            "Attempted to rollback a \(typeName(self)) outside its designated queue."
-        )
-        
-        self.context.reset()
-    }
-    
-    @available(*, deprecated=1.5.2, renamed="commitAndWait")
-    public func commit() {
-        
-        self.commitAndWait()
-    }
-    
     
     // MARK: Internal
     
@@ -239,4 +215,28 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     // MARK: Private
     
     private let closure: (transaction: SynchronousDataTransaction) -> Void
+    
+    
+    // MARK: Deprecated
+    
+    @available(*, deprecated=1.3.4, obsoleted=2.0.0, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
+    public func rollback() {
+        
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to rollback an already committed \(typeName(self))."
+        )
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to rollback a \(typeName(self)) outside its designated queue."
+        )
+        
+        self.context.reset()
+    }
+    
+    @available(*, deprecated=1.5.2, renamed="commitAndWait")
+    public func commit() {
+        
+        self.commitAndWait()
+    }
 }

CoreStore/Saving and Processing/UnsafeDataTransaction.swift

@@ -30,10 +30,6 @@ import CoreData
 #endif
 
 
-@available(*, deprecated=1.3.1, obsoleted=2.0.0, renamed="UnsafeDataTransaction")
-public typealias DetachedDataTransaction = UnsafeDataTransaction
-
-
 // MARK: - UnsafeDataTransaction
 
 /**
@@ -131,13 +127,6 @@ public final class UnsafeDataTransaction: BaseDataTransaction {
         return self.context
     }
     
-    @available(*, deprecated=1.3.1, obsoleted=2.0.0, renamed="beginUnsafe")
-    @warn_unused_result
-    public func beginDetached() -> UnsafeDataTransaction {
-        
-        return self.beginUnsafe()
-    }
-    
     
     // MARK: Internal
     
@@ -145,4 +134,20 @@ public final class UnsafeDataTransaction: BaseDataTransaction {
         
         super.init(mainContext: mainContext, queue: queue, supportsUndo: supportsUndo, bypassesQueueing: true)
     }
+    
+    
+    // MARK: Deprecated
+    
+    @available(*, deprecated=1.3.1, obsoleted=2.0.0, renamed="beginUnsafe")
+    @warn_unused_result
+    public func beginDetached() -> UnsafeDataTransaction {
+        
+        return self.beginUnsafe()
+    }
 }
+
+
+// MARK: Deprecated
+
+@available(*, deprecated=1.3.1, obsoleted=2.0.0, renamed="UnsafeDataTransaction")
+public typealias DetachedDataTransaction = UnsafeDataTransaction