Rename core classes

Author: ra1028

README.md

@@ -994,7 +994,7 @@ struct BooksView: View {
 
 Context available through the `@ViewContext` property wrapper when using atoms from a view. There is no specific API for this context.
 
-#### [AtomRelationContext](https://ra1028.github.io/swiftui-atom-properties/documentation/atoms/atomrelationcontext)
+#### [AtomNodeContext](https://ra1028.github.io/swiftui-atom-properties/documentation/atoms/atomnodecontext)
 
 <details><summary><code>📖 Click to expand example code</code></summary>
 
@@ -1028,8 +1028,8 @@ Context passed as a parameter to the primary function of each atom type.
 
 |API|Use|
 |:--|:--|
-|[addTermination(_:)](https://ra1028.github.io/swiftui-atom-properties/documentation/atoms/atomrelationcontext/addtermination(_:))|Calls the passed closure when the atom is updated or is no longer used.|
-|[keepUntilTermination(_:)](https://ra1028.github.io/swiftui-atom-properties/documentation/atoms/atomrelationcontext/keepuntiltermination(_:))|Retains the given object instance until the atom is updated or is no longer used.|
+|[addTermination(_:)](https://ra1028.github.io/swiftui-atom-properties/documentation/atoms/atomnodecontext/addtermination(_:))|Calls the passed closure when the atom is updated or is no longer used.|
+|[keepUntilTermination(_:)](https://ra1028.github.io/swiftui-atom-properties/documentation/atoms/atomnodecontext/keepuntiltermination(_:))|Retains the given object instance until the atom is updated or is no longer used.|
 
 #### [AtomTestContext](https://ra1028.github.io/swiftui-atom-properties/documentation/atoms/atomtestcontext)
 

Sources/Atoms/Atom/AsyncSequenceAtom.swift

@@ -44,7 +44,7 @@
 /// }
 /// ```
 ///
-public protocol AsyncSequenceAtom: Atom where State == AsyncSequenceAtomValue<Sequence> {
+public protocol AsyncSequenceAtom: Atom where Loader == AsyncSequenceAtomLoader<Sequence> {
     /// The type of asynchronous sequence that this atom manages.
     associatedtype Sequence: AsyncSequence
 
@@ -64,7 +64,7 @@ public protocol AsyncSequenceAtom: Atom where State == AsyncSequenceAtomValue<Se
 
 public extension AsyncSequenceAtom {
     @MainActor
-    var value: State {
-        State(makeSequence: sequence)
+    func makeLoader() -> Loader {
+        Loader(makeSequence: sequence)
     }
 }

Sources/Atoms/Atom/Atom.swift

@@ -9,12 +9,11 @@ public protocol Atom {
     /// A type representing the stable identity of this atom.
     associatedtype Key: Hashable
 
-    // TODO: Rename
-    associatedtype State: AtomValue
+    associatedtype Loader: AtomLoader
 
     /// A type of the context structure that to read, watch, and otherwise interacting
     /// with other atoms.
-    typealias Context = AtomRelationContext
+    typealias Context = AtomNodeContext
 
     /// A boolean value indicating whether the atom value should be preserved even if
     /// no longer watched to.
@@ -31,11 +30,8 @@ public protocol Atom {
     /// If this atom conforms to `Hashable`, it will adopt itself as the `key` by default.
     var key: Key { get }
 
-    /// Creates a new state that is an actual implementation of this atom.
-    ///
-    /// - Returns: A state object that handles internal process and a value.
     @MainActor
-    var value: State { get }
+    func makeLoader() -> Loader
 }
 
 public extension Atom {

Sources/Atoms/Atom/ModifiedAtom.swift

@@ -1,7 +1,7 @@
 /// An atom type that applies a modifier to an atom.
 ///
 /// Use ``Atom/modifier(_:)`` instead of using this atom directly.
-public struct ModifiedAtom<Node: Atom, Modifier: AtomModifier>: Atom where Node.State.Value == Modifier.Value {
+public struct ModifiedAtom<Node: Atom, Modifier: AtomModifier>: Atom where Node.Loader.Value == Modifier.Value {
     /// A type representing the stable identity of this atom.
     public struct Key: Hashable {
         private let atomKey: Node.Key
@@ -29,7 +29,7 @@ public struct ModifiedAtom<Node: Atom, Modifier: AtomModifier>: Atom where Node.
         Key(atomKey: atom.key, modifierKey: modifier.key)
     }
 
-    public var value: ModifiedAtomValue<Node, Modifier> {
-        State(atom: atom, modifier: modifier)
+    public func makeLoader() -> ModifiedAtomLoader<Node, Modifier> {
+        Loader(atom: atom, modifier: modifier)
     }
 }

Sources/Atoms/Atom/ObservableObjectAtom.swift

@@ -48,7 +48,7 @@ import Combine
 /// }
 /// ```
 ///
-public protocol ObservableObjectAtom: Atom where State == ObservableObjectAtomValue<ObjectType> {
+public protocol ObservableObjectAtom: Atom where Loader == ObservableObjectAtomLoader<ObjectType> {
     /// The type of observable object that this atom produces.
     associatedtype ObjectType: ObservableObject
 
@@ -67,7 +67,7 @@ public protocol ObservableObjectAtom: Atom where State == ObservableObjectAtomVa
 
 public extension ObservableObjectAtom {
     @MainActor
-    var value: State {
-        State(makeObject: object)
+    func makeLoader() -> Loader {
+        Loader(makeObject: object)
     }
 }

Sources/Atoms/Atom/PublisherAtom.swift

@@ -37,7 +37,7 @@ import Combine
 /// }
 /// ```
 ///
-public protocol PublisherAtom: Atom where State == PublisherAtomValue<Publisher> {
+public protocol PublisherAtom: Atom where Loader == PublisherAtomLoader<Publisher> {
     /// The type of publisher that this atom manages.
     associatedtype Publisher: Combine.Publisher
 
@@ -57,7 +57,7 @@ public protocol PublisherAtom: Atom where State == PublisherAtomValue<Publisher>
 
 public extension PublisherAtom {
     @MainActor
-    var value: State {
-        State(makePublisher: publisher)
+    func makeLoader() -> Loader {
+        Loader(makePublisher: publisher)
     }
 }

Sources/Atoms/Atom/StateAtom.swift

@@ -36,7 +36,7 @@
 /// }
 /// ```
 ///
-public protocol StateAtom: Atom where State == SyncAtomValue<Value> {
+public protocol StateAtom: Atom where Loader == ValueAtomLoader<Value> {
     /// The type of state value that this atom produces.
     associatedtype Value
 
@@ -77,8 +77,8 @@ public protocol StateAtom: Atom where State == SyncAtomValue<Value> {
 
 public extension StateAtom {
     @MainActor
-    var value: State {
-        State(getValue: defaultValue)
+    func makeLoader() -> Loader {
+        Loader(getValue: defaultValue)
     }
 
     @MainActor

Sources/Atoms/Atom/TaskAtom.swift

@@ -34,7 +34,7 @@
 /// }
 /// ```
 ///
-public protocol TaskAtom: Atom where State == AsyncAtomValue<Value, Never> {
+public protocol TaskAtom: Atom where Loader == TaskAtomLoader<Value> {
     /// The type of value that this atom produces.
     associatedtype Value
 
@@ -53,11 +53,7 @@ public protocol TaskAtom: Atom where State == AsyncAtomValue<Value, Never> {
 
 public extension TaskAtom {
     @MainActor
-    var value: State {
-        State { context in
-            Task {
-                await context.withAtomContext(value)
-            }
-        }
+    func makeLoader() -> Loader {
+        Loader(getValue: value)
     }
 }

Sources/Atoms/Atom/ThrowingTaskAtom.swift

@@ -36,7 +36,7 @@
 /// }
 /// ```
 ///
-public protocol ThrowingTaskAtom: Atom where State == AsyncAtomValue<Value, Error> {
+public protocol ThrowingTaskAtom: Atom where Loader == ThrowingTaskAtomLoader<Value> {
     /// The type of value that this atom produces.
     associatedtype Value
 
@@ -57,11 +57,7 @@ public protocol ThrowingTaskAtom: Atom where State == AsyncAtomValue<Value, Erro
 
 public extension ThrowingTaskAtom {
     @MainActor
-    var value: State {
-        State { context in
-            Task {
-                try await context.withAtomContext(value)
-            }
-        }
+    func makeLoader() -> Loader {
+        Loader(getValue: value)
     }
 }

Sources/Atoms/Atom/ValueAtom.swift

@@ -29,7 +29,7 @@
 /// }
 /// ```
 ///
-public protocol ValueAtom: Atom where State == SyncAtomValue<Value> {
+public protocol ValueAtom: Atom where Loader == ValueAtomLoader<Value> {
     /// The type of value that this atom produces.
     associatedtype Value
 
@@ -48,7 +48,7 @@ public protocol ValueAtom: Atom where State == SyncAtomValue<Value> {
 
 public extension ValueAtom {
     @MainActor
-    var value: State {
-        State(getValue: value)
+    func makeLoader() -> Loader {
+        Loader(getValue: value)
     }
 }