Async data storing (#10)

Author: 0xLeif

Sources/DataStore/DataStore.swift

@@ -63,7 +63,8 @@ open class DataStore<DataLoader: DataLoading>: ConsumingObservableObject, DataSt
 
      - Note: This method iterates through the data and sets each value in the cache using its ID as the key.
      */
-    open func store(data: [DeviceData]) throws {
+    @MainActor
+    open func store(data: [DeviceData]) async throws {
         for datum in data {
             cache.set(value: datum, forKey: datum.id)
         }
@@ -79,7 +80,8 @@ open class DataStore<DataLoader: DataLoading>: ConsumingObservableObject, DataSt
 
      - Note: This method iterates through the IDs and removes each value from the cache.
      */
-    open func delete(data: [DeviceData.ID]) throws {
+    @MainActor
+    open func delete(data: [DeviceData.ID]) async throws {
         for datum in data {
             cache.remove(datum)
         }
@@ -92,7 +94,7 @@ open class DataStore<DataLoader: DataLoading>: ConsumingObservableObject, DataSt
 
      - Note: This method retrieves all the values from the cache and returns them as an array.
      */
-    open func fetch() -> [DeviceData] {
+    open func fetch() async -> [DeviceData] {
         Array(cache.allValues.values)
     }
 
@@ -106,8 +108,8 @@ open class DataStore<DataLoader: DataLoading>: ConsumingObservableObject, DataSt
 
      - Note: This method filters the fetched data using the given filter closure and returns the filtered results.
      */
-    open func fetch(where filter: (DeviceData) -> Bool) -> [DeviceData] {
-        let allValues = fetch()
+    open func fetch(where filter: (DeviceData) -> Bool) async -> [DeviceData] {
+        let allValues = await fetch()
 
         let filteredValues = allValues.filter(filter)
 
@@ -126,7 +128,7 @@ open class DataStore<DataLoader: DataLoading>: ConsumingObservableObject, DataSt
 
      - Note: This method resolves the ID to the corresponding value in the cache.
      */
-    open func fetch(id: DeviceData.ID) throws -> DeviceData {
+    open func fetch(id: DeviceData.ID) async throws -> DeviceData {
         try cache.resolve(id, as: DeviceData.self)
     }
 
@@ -139,10 +141,7 @@ open class DataStore<DataLoader: DataLoading>: ConsumingObservableObject, DataSt
      */
     open func load() async throws {
         let loadedData: [DeviceData] = try await loader.load()
-        
-        try await MainActor.run {
-            try store(data: loadedData)
-        }
+        try await store(data: loadedData)
     }
 
     /**
@@ -157,10 +156,7 @@ open class DataStore<DataLoader: DataLoading>: ConsumingObservableObject, DataSt
     */
     open func load(id: DeviceData.ID) async throws {
         let loadedData: DeviceData = try await loader.load(id: id)
-
-        try await MainActor.run {
-            try store(data: [loadedData])
-        }
+        try await store(data: [loadedData])
     }
 }
 

Sources/DataStore/Protocols/DataStoring.swift

@@ -8,24 +8,24 @@ public protocol DataStoring {
 
     /// Stores an array of `DeviceData` objects.
     /// - Parameter data: The data to store or update.
-    func store(data: [DeviceData]) throws
+    func store(data: [DeviceData]) async throws
 
     /// Deletes an array of `DeviceData` objects based on their identifiers.
     /// - Parameter data: The identifiers of the data to delete.
-    func delete(data: [DeviceData.ID]) throws
+    func delete(data: [DeviceData.ID]) async throws
 
     /// Fetches all stored `DeviceData` objects.
     /// - Returns: An array of fetched device-specific data.
-    func fetch() -> [DeviceData]
+    func fetch() async -> [DeviceData]
 
     /// Fetches stored `DeviceData` objects that satisfy the given filter predicate.
     /// - Parameter where: A closure that takes a `DeviceData` object and returns a Boolean value indicating whether the object should be included in the result.
     /// - Returns: An array of fetched device-specific data that pass the filter.
-    func fetch(where filter: (DeviceData) -> Bool) -> [DeviceData]
+    func fetch(where filter: (DeviceData) -> Bool) async -> [DeviceData]
 
     /// Fetches a single stored `DeviceData` object based on its identifier.
     /// - Parameter id: The identifier of the data to fetch.
     /// - Returns: The fetched device-specific data.
     /// - Throws: An error if the data could not be found.
-    func fetch(id: DeviceData.ID) throws -> DeviceData
+    func fetch(id: DeviceData.ID) async throws -> DeviceData
 }

Tests/DataStoreTests/DataStoreSubscriptTests.swift

@@ -7,7 +7,7 @@ final class DataStoreSubscriptTests: XCTestCase {
 
         try await store.load()
 
-        let values = store.fetch()
+        let values = await store.fetch()
 
         XCTAssertEqual(values.count, 3)
 
@@ -23,7 +23,7 @@ final class DataStoreSubscriptTests: XCTestCase {
 
         try await store.load()
 
-        let values = store.fetch()
+        let values = await store.fetch()
 
         XCTAssertEqual(values.count, 3)
 
@@ -41,7 +41,7 @@ final class DataStoreSubscriptTests: XCTestCase {
 
         try await store.load()
 
-        let values = store.fetch()
+        let values = await store.fetch()
 
         XCTAssertEqual(values.count, 3)
 
@@ -57,7 +57,7 @@ final class DataStoreSubscriptTests: XCTestCase {
 
         try await store.load()
 
-        let values = store.fetch()
+        let values = await store.fetch()
 
         XCTAssertEqual(values.count, 3)
 
@@ -79,7 +79,7 @@ final class DataStoreSubscriptTests: XCTestCase {
 
         try await store.load()
 
-        let values = store.fetch()
+        let values = await store.fetch()
 
         XCTAssertEqual(values.count, 3)
 

Tests/DataStoreTests/DataStoreTests.swift

@@ -8,7 +8,7 @@ final class DataStoreTests: XCTestCase {
 
         try await store.load()
 
-        let values = store.fetch()
+        let values = await store.fetch()
 
         XCTAssertEqual(values.count, 3)
     }
@@ -20,7 +20,7 @@ final class DataStoreTests: XCTestCase {
 
         try await store.load(id: expectedID)
 
-        let value = try store.fetch(id: expectedID)
+        let value = try await store.fetch(id: expectedID)
 
         XCTAssertEqual(value.id, expectedID)
     }
@@ -30,7 +30,7 @@ final class DataStoreTests: XCTestCase {
 
         try await store.load()
 
-        let values = store.fetch { data in
+        let values = await store.fetch { data in
             data.color == Color(red: 0, green: 1, blue: 0)
         }
 
@@ -40,7 +40,7 @@ final class DataStoreTests: XCTestCase {
     func testStoreAndFetch() async throws {
         let store = DataStore(loader: TestDataLoader())
 
-        let values = store.fetch()
+        let values = await store.fetch()
 
         XCTAssertEqual(values.count, 0)
 
@@ -49,7 +49,7 @@ final class DataStoreTests: XCTestCase {
         let expectedColor = Color.green
         let expectedEnumValue = TestDeviceData.DeviceEnum.weirdCaseExample
 
-        try store.store(
+        try await store.store(
             data: [
                 TestDeviceData(
                     id: expectedID,
@@ -60,7 +60,7 @@ final class DataStoreTests: XCTestCase {
             ]
         )
 
-        let value = try store.fetch(id: expectedID)
+        let value = try await store.fetch(id: expectedID)
 
         XCTAssertEqual(value.id, expectedID)
         XCTAssertEqual(value.userName, expectedUserName)
@@ -73,12 +73,14 @@ final class DataStoreTests: XCTestCase {
 
         try await store.load()
 
-        let values = store.fetch()
+        let values = await store.fetch()
 
         XCTAssertEqual(values.count, 3)
 
-        try store.delete(data: values.map(\.id))
+        try await store.delete(data: values.map(\.id))
 
-        XCTAssertEqual(store.fetch().count, 0)
+        let fetchCount = await store.fetch().count
+
+        XCTAssertEqual(fetchCount, 0)
     }
 }