Referenced object store refactoring (#12)

* updated StoreProtocol to inherit from AnyObject * updated referenced store to use StoreNode directly * minor refactoring
KazaiMazai · Apr 2, 2024 · 61057ff · 61057ff
1 parent a8bb586
commit 61057ff
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 53 deletions.
diff --git a/Sources/Puredux/Store/Core/StoreNodeExtensions.swift b/Sources/Puredux/Store/Core/StoreNodeExtensions.swift
@@ -29,21 +29,7 @@ extension StoreNode where LocalState == State {
         )
     }
 }
-
-extension StoreNode {
-    func weakRefStore() -> Store<State, Action> {
-        Store(dispatch: { [weak self] in self?.dispatch($0) },
-              subscribe: { [weak self] in self?.subscribe(observer: $0) }
-        )
-    }
-
-    func strongRefStore() -> Store<State, Action> {
-        Store.referencedStore(dispatch: { [self] in self.dispatch($0) },
-                              subscribe: { [self] in self.subscribe(observer: $0) }
-        )
-    }
-}
-
+
 extension StoreNode {
 
     func createChildStore<NodeState, ResultState>(initialState: NodeState,

diff --git a/Sources/Puredux/Store/Core/StoreProtocol.swift b/Sources/Puredux/Store/Core/StoreProtocol.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-protocol StoreProtocol {
+protocol StoreProtocol<State, Action>: AnyObject {
     associatedtype Action
     associatedtype State
 
@@ -23,3 +23,19 @@ protocol StoreProtocol {
 
     func dispatch(scopedAction: ScopedAction<Action>)
 }
+
+extension StoreProtocol {
+    func subscribe(observer: Observer<State>) {
+        subscribe(observer: observer, receiveCurrentState: true)
+    }
+
+    func weakRefStore() -> Store<State, Action> {
+        Store(dispatch: { [weak self] in self?.dispatch($0) },
+              subscribe: { [weak self] in self?.subscribe(observer: $0) }
+        )
+    }
+
+    func strongRefStore() -> Store<State, Action> {
+        Store<State, Action>(storeObject: self)
+    }
+}
diff --git a/Sources/Puredux/Store/Core/VoidStore.swift b/Sources/Puredux/Store/Core/VoidStore.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct VoidStore<Action>: StoreProtocol {
+final class VoidStore<Action>: StoreProtocol {
     let currentState: Void = Void()
     let actionsInterceptor: ActionsInterceptor<Action>?
 
@@ -18,4 +18,8 @@ struct VoidStore<Action>: StoreProtocol {
     func subscribe(observer: Observer<()>, receiveCurrentState: Bool) { }
 
     func dispatch(scopedAction: ScopedAction<Action>) { }
+
+    init(actionsInterceptor: ActionsInterceptor<Action>? = nil) {
+        self.actionsInterceptor = actionsInterceptor
+    }
 }
diff --git a/Sources/Puredux/Store/Store.swift b/Sources/Puredux/Store/Store.swift
@@ -134,16 +134,11 @@ extension Store {
             return self
         }
     }
-
-    static func referencedStore(dispatch: @escaping Dispatch,
-                                subscribe: @escaping Subscribe) -> Store {
-
-        Store(
-            .storeObject(StoreObject(
-                dispatch: dispatch,
-                subscribe: subscribe)
-            )
-        )
+}
+
+extension Store {
+    init(storeObject: any StoreProtocol<State, Action>) {
+        self.storeType = .storeObject(storeObject)
     }
 }
 
@@ -153,35 +148,11 @@ private extension Store {
     }
 }
 
+
 private extension Store {
     enum StoreType {
-        case storeObject(StoreObject)
+        case storeObject(any StoreProtocol<State, Action>)
         case store(Dispatch, Subscribe)
     }
-
-    final class StoreObject {
-        private let dispatch: Dispatch
-        private let subscribe: Subscribe
-
-        func dispatch(_ action: Action) {
-            dispatch(action)
-        }
-
-        func subscribe(observer: Observer<State>) {
-            subscribe(observer)
-        }
-
-        init(dispatch: @escaping Dispatch,
-             subscribe: @escaping Subscribe) {
-            self.dispatch = dispatch
-            self.subscribe = subscribe
-        }
-
-        func weakRefStore() -> Store<State, Action> {
-            Store(dispatch: { [weak self] in self?.dispatch($0) },
-                  subscribe: { [weak self] in self?.subscribe(observer: $0) }
-            )
-        }
-    }
 }