Refactoring

Author: ra1028

Sources/Atoms/AtomRoot.swift

@@ -187,7 +187,7 @@ private extension AtomRoot {
         var body: some View {
             let scopeKey = state.token.key
             let store = StoreContext.registerRoot(
-                store: store,
+                in: store,
                 scopeKey: scopeKey,
                 overrides: overrides,
                 observers: observers

Sources/Atoms/AtomScope.swift

@@ -104,7 +104,7 @@ public struct AtomScope<Content: View>: View {
     /// Note that unlike ``AtomRoot/observe(_:)``, this observes only the state changes caused by atoms
     /// used in this scope.
     ///
-    /// - Note: If this scope inherits the parent context, the observers are ignored.
+    /// - Note: It ignores the observers if this scope inherits the parent scope.
     ///
     /// - Parameter onUpdate: A closure to handle a snapshot of recent updates.
     ///
@@ -120,7 +120,7 @@ public struct AtomScope<Content: View>: View {
     ///
     /// This only overrides atoms used in this scope and never be inherited to a nested scopes.
     ///
-    /// - Note: If this scope inherits the parent context, the overrides are ignored.
+    /// - Note: It ignores the overrides if this scope inherits the parent scope.
     ///
     /// - Parameters:
     ///   - atom: An atom to be overridden.
@@ -140,7 +140,7 @@ public struct AtomScope<Content: View>: View {
     ///
     /// This only overrides atoms used in this scope and never be inherited to a nested scopes.
     ///
-    /// - Note: If this scope inherits the parent context, the overrides are ignored.
+    /// - Note: It ignores the overrides if this scope inherits the parent scope.
     ///
     /// - Parameters:
     ///   - atomType: An atom type to be overridden.

Sources/Atoms/Context/AtomCurrentContext.swift

@@ -3,12 +3,9 @@
 public struct AtomCurrentContext: AtomContext {
     @usableFromInline
     internal let _store: StoreContext
-    @usableFromInline
-    internal let _transactionScopeKey: ScopeKey?
 
-    internal init(store: StoreContext, transactionScopeKey: ScopeKey?) {
+    internal init(store: StoreContext) {
         self._store = store
-        self._transactionScopeKey = transactionScopeKey
     }
 
     /// Accesses the value associated with the given atom without watching it.
@@ -27,7 +24,7 @@ public struct AtomCurrentContext: AtomContext {
     /// - Returns: The value associated with the given atom.
     @inlinable
     public func read<Node: Atom>(_ atom: Node) -> Node.Produced {
-        _store.read(atom, transactionScopeKey: _transactionScopeKey)
+        _store.read(atom)
     }
 
     /// Sets the new value for the given writable atom.
@@ -49,7 +46,7 @@ public struct AtomCurrentContext: AtomContext {
     ///   - atom: A writable atom to update.
     @inlinable
     public func set<Node: StateAtom>(_ value: Node.Produced, for atom: Node) {
-        _store.set(value, for: atom, transactionScopeKey: _transactionScopeKey)
+        _store.set(value, for: atom)
     }
 
     /// Modifies the cached value of the given writable atom.
@@ -73,7 +70,7 @@ public struct AtomCurrentContext: AtomContext {
     ///   - body: A value modification body.
     @inlinable
     public func modify<Node: StateAtom>(_ atom: Node, body: (inout Node.Produced) -> Void) {
-        _store.modify(atom, transactionScopeKey: _transactionScopeKey, body: body)
+        _store.modify(atom, body: body)
     }
 
     /// Refreshes and then returns the value associated with the given refreshable atom.
@@ -97,7 +94,7 @@ public struct AtomCurrentContext: AtomContext {
     @_disfavoredOverload
     @discardableResult
     public func refresh<Node: AsyncAtom>(_ atom: Node) async -> Node.Produced {
-        await _store.refresh(atom, transactionScopeKey: _transactionScopeKey)
+        await _store.refresh(atom)
     }
 
     /// Refreshes and then returns the value associated with the given refreshable atom.
@@ -119,7 +116,7 @@ public struct AtomCurrentContext: AtomContext {
     @inlinable
     @discardableResult
     public func refresh<Node: Refreshable>(_ atom: Node) async -> Node.Produced {
-        await _store.refresh(atom, transactionScopeKey: _transactionScopeKey)
+        await _store.refresh(atom)
     }
 
     /// Resets the value associated with the given atom, and then notifies.
@@ -140,7 +137,7 @@ public struct AtomCurrentContext: AtomContext {
     @inlinable
     @_disfavoredOverload
     public func reset<Node: Atom>(_ atom: Node) {
-        _store.reset(atom, transactionScopeKey: _transactionScopeKey)
+        _store.reset(atom)
     }
 
     /// Calls arbitrary reset function of the given atom.
@@ -160,6 +157,6 @@ public struct AtomCurrentContext: AtomContext {
     /// - Parameter atom: An atom to reset.
     @inlinable
     public func reset<Node: Resettable>(_ atom: Node) {
-        _store.reset(atom, transactionScopeKey: _transactionScopeKey)
+        _store.reset(atom)
     }
 }

Sources/Atoms/Context/AtomTestContext.swift

@@ -438,7 +438,7 @@ internal extension AtomTestContext {
     @usableFromInline
     var _store: StoreContext {
         .registerRoot(
-            store: _state.store,
+            in: _state.store,
             scopeKey: _state.token.key,
             overrides: _state.overrides,
             observers: []

Sources/Atoms/Context/AtomTransactionContext.swift

@@ -33,7 +33,7 @@ public struct AtomTransactionContext: AtomWatchableContext {
     /// - Returns: The value associated with the given atom.
     @inlinable
     public func read<Node: Atom>(_ atom: Node) -> Node.Produced {
-        _store.read(atom, transactionScopeKey: _transactionState.scopeKey)
+        _store.read(atom)
     }
 
     /// Sets the new value for the given writable atom.
@@ -56,7 +56,7 @@ public struct AtomTransactionContext: AtomWatchableContext {
     ///   - atom: A writable atom to update.
     @inlinable
     public func set<Node: StateAtom>(_ value: Node.Produced, for atom: Node) {
-        _store.set(value, for: atom, transactionScopeKey: _transactionState.scopeKey)
+        _store.set(value, for: atom)
     }
 
     /// Modifies the cached value of the given writable atom.
@@ -80,7 +80,7 @@ public struct AtomTransactionContext: AtomWatchableContext {
     ///   - body: A value modification body.
     @inlinable
     public func modify<Node: StateAtom>(_ atom: Node, body: (inout Node.Produced) -> Void) {
-        _store.modify(atom, transactionScopeKey: _transactionState.scopeKey, body: body)
+        _store.modify(atom, body: body)
     }
 
     /// Refreshes and then returns the value associated with the given refreshable atom.
@@ -104,7 +104,7 @@ public struct AtomTransactionContext: AtomWatchableContext {
     @_disfavoredOverload
     @discardableResult
     public func refresh<Node: AsyncAtom>(_ atom: Node) async -> Node.Produced {
-        await _store.refresh(atom, transactionScopeKey: _transactionState.scopeKey)
+        await _store.refresh(atom)
     }
 
     /// Refreshes and then returns the value associated with the given refreshable atom.
@@ -126,7 +126,7 @@ public struct AtomTransactionContext: AtomWatchableContext {
     @inlinable
     @discardableResult
     public func refresh<Node: Refreshable>(_ atom: Node) async -> Node.Produced {
-        await _store.refresh(atom, transactionScopeKey: _transactionState.scopeKey)
+        await _store.refresh(atom)
     }
 
     /// Resets the value associated with the given atom, and then notifies.
@@ -148,7 +148,7 @@ public struct AtomTransactionContext: AtomWatchableContext {
     @inlinable
     @_disfavoredOverload
     public func reset<Node: Atom>(_ atom: Node) {
-        _store.reset(atom, transactionScopeKey: _transactionState.scopeKey)
+        _store.reset(atom)
     }
 
     /// Calls arbitrary reset function of the given atom.
@@ -168,7 +168,7 @@ public struct AtomTransactionContext: AtomWatchableContext {
     /// - Parameter atom: An atom to reset.
     @inlinable
     public func reset<Node: Resettable>(_ atom: Node) {
-        _store.reset(atom, transactionScopeKey: _transactionState.scopeKey)
+        _store.reset(atom)
     }
 
     /// Accesses the value associated with the given atom for reading and initiates watch to

Sources/Atoms/Core/AtomCache.swift

@@ -3,13 +3,21 @@ internal protocol AtomCacheProtocol {
 
     var atom: Node { get }
     var value: Node.Produced { get }
+    var initScopeKey: ScopeKey? { get }
+
+    func updated(value: Node.Produced) -> Self
 }
 
 internal struct AtomCache<Node: Atom>: AtomCacheProtocol, CustomStringConvertible {
-    var atom: Node
-    var value: Node.Produced
+    let atom: Node
+    let value: Node.Produced
+    let initScopeKey: ScopeKey?
 
     var description: String {
         "\(value)"
     }
+
+    func updated(value: Node.Produced) -> Self {
+        AtomCache(atom: atom, value: value, initScopeKey: initScopeKey)
+    }
 }

Sources/Atoms/Core/AtomKey.swift

@@ -1,10 +1,9 @@
 internal struct AtomKey: Hashable, Sendable, CustomStringConvertible {
     private let key: UnsafeUncheckedSendable<AnyHashable>
     private let type: ObjectIdentifier
+    private let scopeKey: ScopeKey?
     private let anyAtomType: Any.Type
 
-    let scopeKey: ScopeKey?
-
     var description: String {
         let atomLabel = String(describing: anyAtomType)
 
@@ -16,6 +15,10 @@ internal struct AtomKey: Hashable, Sendable, CustomStringConvertible {
         }
     }
 
+    var isScoped: Bool {
+        scopeKey != nil
+    }
+
     init<Node: Atom>(_ atom: Node, scopeKey: ScopeKey?) {
         self.key = UnsafeUncheckedSendable(atom.key)
         self.type = ObjectIdentifier(Node.self)

Sources/Atoms/Core/AtomState.swift

@@ -3,18 +3,15 @@ internal protocol AtomStateProtocol: AnyObject {
     associatedtype Effect: AtomEffect
 
     var effect: Effect { get }
-    var initializedScopeKey: ScopeKey? { get }
     var transactionState: TransactionState? { get set }
 }
 
 @MainActor
 internal final class AtomState<Effect: AtomEffect>: AtomStateProtocol {
     let effect: Effect
-    let initializedScopeKey: ScopeKey?
     var transactionState: TransactionState?
 
-    init(effect: Effect, initializedScopeKey: ScopeKey?) {
+    init(effect: Effect) {
         self.effect = effect
-        self.initializedScopeKey = initializedScopeKey
     }
 }