Update

VergeGroup · Dec 13, 2024 · d9b7af3 · d9b7af3
1 parent 30bcaf0
commit d9b7af3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Sources/Verge/Store/Store.swift b/Sources/Verge/Store/Store.swift
@@ -93,7 +93,7 @@ actor Writer {
 ///
 open class Store<State: Equatable, Activity: Sendable>: EventEmitter<_StoreEvent<State, Activity>>, CustomReflectable, StoreType, StoreDriverType, DerivedMaking, @unchecked Sendable {
 
-  public let scope: ScopeKeyPath<State> = \State.self
+  public let scope: any WritableKeyPath<State, State> & Sendable = \State.self
 
   private let tracker = VergeConcurrency.SynchronizationTracker()
 

diff --git a/Sources/Verge/Store/StoreDriverType.swift b/Sources/Verge/Store/StoreDriverType.swift
@@ -54,7 +54,7 @@ public protocol StoreDriverType<Scope>: ObservableObject where Activity == Targe
   associatedtype Scope: Equatable = TargetStore.State
 
   var store: TargetStore { get }
-  var scope: ScopeKeyPath<Scope> { get }
+  var scope: WritableKeyPath<TargetStore.State, Scope> & Sendable { get }
 
   var state: Changes<Scope> { get }
 
@@ -65,8 +65,6 @@ public protocol StoreDriverType<Scope>: ObservableObject where Activity == Targe
 
 extension StoreDriverType {
 
-  public typealias ScopeKeyPath<Scope> = WritableKeyPath<TargetStore.State, Scope> & Sendable
-
   public func statePublisher() -> some Combine.Publisher<Changes<TargetStore.State>, Never> {
     store.asStore()._statePublisher()
   }
@@ -91,7 +89,7 @@ extension StoreDriverType {
 
 extension StoreDriverType where Scope == TargetStore.State {
 
-  public var scope: ScopeKeyPath<TargetStore.State> {
+  public var scope: WritableKeyPath<TargetStore.State, TargetStore.State> & Sendable {
     \TargetStore.State.self
   }