Update backgroundCommit (#481)

VergeGroup · Apr 28, 2024 · dadaed1 · dadaed1
1 parent b44a0f9
commit dadaed1
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 26 deletions.
diff --git a/Sources/Verge/Store/Store.swift b/Sources/Verge/Store/Store.swift
@@ -141,7 +141,7 @@ open class Store<State: Equatable, Activity>: EventEmitter<_StoreEvent<State, Ac
 
   public let taskManager: TaskManagerActor = .init()
 
-  private let writer: Writer = .init()
+  let writer: Writer = .init()
 
   // MARK: - Initializers
 
@@ -799,31 +799,6 @@ Latest Version (%d): (%@)
 
 }
 
-// MARK: - Mutation
-extension Store {
-
-  /// Run Mutation that created inline
-  ///
-  /// Throwable
-  public func backgroundCommit<Result>(
-    _ name: String = "",
-    _ file: StaticString = #file,
-    _ function: StaticString = #function,
-    _ line: UInt = #line,
-    mutation: (inout InoutRef<State>) throws -> Result
-  ) async rethrows -> Result {
-
-    let result = try await writer.perform { [self] _ in
-      try self.commit(mutation: mutation)
-    }
-
-    await self.waitUntilAllEventConsumed()
-
-    return result
-  }
-
-}
-
 // MARK: - Storage Implementation
 extension Store {
 

diff --git a/Sources/Verge/Store/StoreDriverType.swift b/Sources/Verge/Store/StoreDriverType.swift
@@ -434,6 +434,86 @@ extension StoreDriverType {
     )
   }
 
+  /// Run Mutation that created inline
+  ///
+  /// Throwable
+  public func backgroundCommit<Result>(
+    _ name: String = "",
+    _ file: StaticString = #file,
+    _ function: StaticString = #function,
+    _ line: UInt = #line,
+    mutation: (inout InoutRef<Scope>) throws -> Result
+  ) async rethrows -> Result {
+
+    let result = try await store.asStore().writer.perform { [self] _ in
+      try self.commit(mutation: mutation)
+    }
+
+    await self.waitUntilAllEventConsumed()
+
+    return result
+  }
+
+  /// Run Mutation that created inline
+  ///
+  /// Throwable
+  public func backgroundCommit<Result>(
+    _ name: String = "",
+    _ file: StaticString = #file,
+    _ function: StaticString = #function,
+    _ line: UInt = #line,
+    mutation: (inout InoutRef<Scope>, inout Transaction) throws -> Result
+  ) async rethrows -> Result {
+
+    let result = try await store.asStore().writer.perform { [self] _ in
+      try self.commit(mutation: mutation)
+    }
+
+    await self.waitUntilAllEventConsumed()
+
+    return result
+  }
+
+  /// Run Mutation that created inline
+  ///
+  /// Throwable
+  public func backgroundCommit<Result>(
+    _ name: String = "",
+    _ file: StaticString = #file,
+    _ function: StaticString = #function,
+    _ line: UInt = #line,
+    mutation: (inout InoutRef<Scope>) throws -> Result
+  ) async rethrows -> Result where Scope == TargetStore.State {
+
+    let result = try await store.asStore().writer.perform { [self] _ in
+      try self.commit(mutation: mutation)
+    }
+
+    await self.waitUntilAllEventConsumed()
+
+    return result
+  }
+
+  /// Run Mutation that created inline
+  ///
+  /// Throwable
+  public func backgroundCommit<Result>(
+    _ name: String = "",
+    _ file: StaticString = #file,
+    _ function: StaticString = #function,
+    _ line: UInt = #line,
+    mutation: (inout InoutRef<Scope>, inout Transaction) throws -> Result
+  ) async rethrows -> Result where Scope == TargetStore.State {
+
+    let result = try await store.asStore().writer.perform { [self] _ in
+      try self.commit(mutation: mutation)
+    }
+
+    await self.waitUntilAllEventConsumed()
+
+    return result
+  }
+
   public func detached<NewScope: Equatable>(from newScope: WritableKeyPath<TargetStore.State, NewScope>)
   -> DetachedDispatcher<TargetStore.State, TargetStore.Activity, NewScope> {
     .init(store: store.asStore(), scope: newScope)