Refactoring

Author: ra1028

Sources/Atoms/AtomStore.swift

@@ -6,7 +6,7 @@ public final class AtomStore {
     internal var caches = [AtomKey: any AtomCacheProtocol]()
     internal var states = [AtomKey: any AtomStateProtocol]()
     internal var subscriptions = [AtomKey: [SubscriberKey: Subscription]]()
-    internal var subscribed = [SubscriberKey: Set<AtomKey>]()
+    internal var subscribes = [SubscriberKey: Set<AtomKey>]()
     internal var scopes = [ScopeKey: Scope]()
 
     /// Creates a new store.

Sources/Atoms/Core/StoreContext.swift

@@ -113,7 +113,7 @@ internal struct StoreContext {
         let (key, override) = lookupAtomKeyAndOverride(of: atom)
         let cache = lookupCache(of: atom, for: key)
         let value = cache?.value ?? initialize(of: atom, for: key, override: override)
-        let isNewSubscription = store.subscribed[subscriber.key, default: []].insert(key).inserted
+        let isNewSubscription = store.subscribes[subscriber.key, default: []].insert(key).inserted
 
         if isNewSubscription {
             store.subscriptions[key, default: [:]][subscriber.key] = subscription
@@ -224,7 +224,7 @@ internal struct StoreContext {
     func unwatch(_ atom: some Atom, subscriber: Subscriber) {
         let (key, _) = lookupAtomKeyAndOverride(of: atom)
 
-        store.subscribed[subscriber.key]?.remove(key)
+        store.subscribes[subscriber.key]?.remove(key)
         unsubscribe([key], for: subscriber.key)
     }
 
@@ -510,7 +510,7 @@ private extension StoreContext {
     }
 
     func unsubscribeAll(for subscriberKey: SubscriberKey) {
-        let keys = store.subscribed.removeValue(forKey: subscriberKey)
+        let keys = store.subscribes.removeValue(forKey: subscriberKey)
 
         if let keys {
             unsubscribe(keys, for: subscriberKey)

Tests/AtomsTests/Core/StoreContextTests.swift

@@ -214,7 +214,7 @@ final class StoreContextTests: XCTestCase {
         )
 
         XCTAssertEqual(initialValue, 0)
-        XCTAssertTrue(store.subscribed[subscriber.key]?.contains(key) ?? false)
+        XCTAssertTrue(store.subscribes[subscriber.key]?.contains(key) ?? false)
         XCTAssertNotNil(store.subscriptions[key]?[subscriber.key])
         XCTAssertEqual((store.caches[key] as? AtomCache<TestAtom>)?.value, 0)
         XCTAssertEqual((store.caches[dependencyKey] as? AtomCache<DependencyAtom>)?.value, 0)
@@ -228,7 +228,7 @@ final class StoreContextTests: XCTestCase {
         subscriberState = nil
 
         XCTAssertEqual(updateCount, 1)
-        XCTAssertNil(store.subscribed[subscriber.key])
+        XCTAssertNil(store.subscribes[subscriber.key])
         XCTAssertNil(store.caches[key])
         XCTAssertNil(store.states[key])
         XCTAssertNil(store.subscriptions[key])
@@ -399,7 +399,7 @@ final class StoreContextTests: XCTestCase {
         )
 
         XCTAssertEqual(
-            store.subscribed,
+            store.subscribes,
             [subscriber.key: [AtomKey(atom)]]
         )
 
@@ -411,7 +411,7 @@ final class StoreContextTests: XCTestCase {
         )
 
         XCTAssertEqual(
-            store.subscribed,
+            store.subscribes,
             [subscriber.key: []]
         )
     }
@@ -722,7 +722,7 @@ final class StoreContextTests: XCTestCase {
         )
 
         XCTAssertEqual(
-            store.subscribed,
+            store.subscribes,
             [
                 subscriber.key: [
                     AtomKey(atom),