Update package

Sources/Merge/Intermodular/Extensions/Combine/ObservableObject++.swift

@@ -88,7 +88,7 @@ extension ObservableObject {
         }
     }
 
-    public func _onReceiveOfValueEmittedBy<T: _ObservableObjectX>(
+    public func _onReceiveOfValueEmittedBy<T: ObjectDidChangeObservableObject>(
         _ object: T,
         perform action: @escaping () -> Void
     ) {
@@ -97,7 +97,7 @@ extension ObservableObject {
         }
     }
 
-    public func _onReceiveOfValueEmittedBy<T: _ObservableObjectX>(
+    public func _onReceiveOfValueEmittedBy<T: ObjectDidChangeObservableObject>(
         _ object: T,
         perform action: @escaping () async throws -> Void
     ) {

Sources/Merge/Intermodular/Helpers/Foundation/TaskOperation.swift

@@ -64,7 +64,7 @@ open class TaskOperation<Base: ObservableTask>: Operation, @unchecked Sendable {
             .outputPublisher
             .toResultPublisher()
             .sink { status in
-                switch TaskStatus(status) {
+                switch ObservableTaskStatus(status) {
                     case .idle:
                         self._executing = false
                         self._finished = false

Sources/Merge/Intermodular/Helpers/Swift/Process.Task.swift

@@ -32,15 +32,15 @@ extension Process {
             process.processIdentifier
         }
 
-        public var status: TaskStatus<Success, Error> {
+        public var status: ObservableTaskStatus<Success, Error> {
             base.status
         }
 
         public var objectWillChange: AnyObjectWillChangePublisher {
             .init(from: base)
         }
 
-        public var objectDidChange: AnyPublisher<TaskStatus<Success, Error>, Never> {
+        public var objectDidChange: AnyPublisher<ObservableTaskStatus<Success, Error>, Never> {
             base.objectDidChange
         }
 

Sources/Merge/Intramodular/Collections/ObservableArray.swift

@@ -10,7 +10,7 @@ import Swallow
 ///
 /// `ObservableObject` subscribes to the `objectWillChange` publishers of all elements contained within it and forwards them to its own `objectWillChange` publisher.
 @propertyWrapper
-public final class ObservableArray<Element: ObservableObject>: MutablePropertyWrapper, Sequence, _ObservableObjectX {
+public final class ObservableArray<Element: ObservableObject>: MutablePropertyWrapper, Sequence, ObjectDidChangeObservableObject {
     public let objectWillChange = ObservableObjectPublisher()
 
     private var cancellables: [ObjectIdentifier: AnyCancellable] = [:]

Sources/Merge/Intramodular/Observable Tasks/AnyTask.swift

@@ -9,7 +9,7 @@ import Swallow
 /// A task that performs type erasure by wrapping another task.
 public final class AnyTask<Success, Error: Swift.Error>: ObservableObject, ObservableTask, @unchecked Sendable {
     public typealias ID = AnyHashable
-    public typealias Status = TaskStatus<Success, Error>
+    public typealias Status = ObservableTaskStatus<Success, Error>
 
     public let base: any ObservableTask<Success, Error>
     public let objectDidChange: AnyPublisher<Status, Never>

Sources/Merge/Intramodular/Observable Tasks/EmptyObservableTask.swift

@@ -6,15 +6,15 @@ import Combine
 import Foundation
 
 public final class EmptyObservableTask<Success, Error: Swift.Error>: ObservableTask {
-    public var status: TaskStatus<Success, Error> {
+    public var status: ObservableTaskStatus<Success, Error> {
         .idle
     }
 
-    public var objectWillChange: AnyPublisher<TaskStatus<Success, Error>, Never>  {
+    public var objectWillChange: AnyPublisher<ObservableTaskStatus<Success, Error>, Never>  {
         Empty().eraseToAnyPublisher()
     }
 
-    public var objectDidChange: AnyPublisher<TaskStatus<Success, Error>, Never>  {
+    public var objectDidChange: AnyPublisher<ObservableTaskStatus<Success, Error>, Never>  {
         Empty().eraseToAnyPublisher()
     }
 

Sources/Merge/Intramodular/Observable Tasks/Foundation/ObservableTaskBase.swift

@@ -8,7 +8,7 @@ import Swift
 
 /// A base class to subclass when building observable tasks.
 open class ObservableTaskBase<Success, Error: Swift.Error>: ObservableTask {
-    public typealias Status = TaskStatus<Success, Error>
+    public typealias Status = ObservableTaskStatus<Success, Error>
 
     let statusValueSubject = CurrentValueSubject<Status, Never>(.idle)
 

Sources/Merge/Intramodular/Observable Tasks/Foundation/ObservableTasks.HandleEvents.swift

@@ -14,7 +14,7 @@ extension ObservableTasks {
         private let receiveStart: (() -> Void)?
         private let receiveCancel: (() -> Void)?
 
-        public var status: TaskStatus<Success, Error> {
+        public var status: ObservableTaskStatus<Success, Error> {
             base.status
         }
 

Sources/Merge/Intramodular/Observable Tasks/Foundation/ObservableTasks.Map.swift

@@ -10,7 +10,7 @@ extension ObservableTasks {
     public final class Map<Upstream: ObservableTask, Success>: ObservableTask {
         public typealias Success = Success
         public typealias Error = Upstream.Error
-        public typealias Status = TaskStatus<Success, Error>
+        public typealias Status = ObservableTaskStatus<Success, Error>
 
         private let upstream: Upstream
         private let transform: (Upstream.Success) -> Success
@@ -33,7 +33,7 @@ extension ObservableTasks {
             self.transform = transform
         }
 
-        public var status: TaskStatus<Success, Error> {
+        public var status: ObservableTaskStatus<Success, Error> {
             upstream.status.map(transform)
         }
 

Sources/Merge/Intramodular/Observable Tasks/Foundation/PassthroughTask.swift

@@ -11,7 +11,7 @@ import Swift
 /// A mutable task.
 open class PassthroughTask<Success, Error: Swift.Error>: ObservableTask {
     public typealias Body = (PassthroughTask) -> AnyCancellable
-    public typealias Status = TaskStatus<Success, Error>
+    public typealias Status = ObservableTaskStatus<Success, Error>
 
     private let lock = NSRecursiveLock()
 

Sources/Merge/Intramodular/Observable Tasks/ObservableTask.swift

@@ -8,12 +8,12 @@ import Foundation
 import Swallow
 
 /// An observable task is a token of activity with status-reporting.
-public protocol ObservableTask<Success, Error>: Cancellable, Identifiable, _ObservableObjectX where ObjectDidChangePublisher.Output == TaskStatus<Self.Success, Self.Error> {
+public protocol ObservableTask<Success, Error>: Cancellable, Identifiable, ObjectDidChangeObservableObject where ObjectDidChangePublisher.Output == ObservableTaskStatus<Self.Success, Self.Error> {
     associatedtype Success
     associatedtype Error: Swift.Error
 
     /// The status of this task.
-    var status: TaskStatus<Success, Error> { get }
+    var status: ObservableTaskStatus<Success, Error> { get }
 
     /// Start the task.
     func start()

Sources/Merge/Intramodular/Observable Tasks/OpaqueObservableTask.swift

@@ -17,15 +17,15 @@ public final class OpaqueObservableTask: CustomStringConvertible, ObjCObject, Ob
         (base as? CustomStringConvertible)?.description ?? "(Task)"
     }
 
-    public var status: TaskStatus<Success, Error> {
+    public var status: ObservableTaskStatus<Success, Error> {
         base._opaque_status
     }
 
     public var objectWillChange: AnyObjectWillChangePublisher  {
         .init(from: base)
     }
 
-    public var objectDidChange: AnyPublisher<TaskStatus<Success, Error>, Never>  {
+    public var objectDidChange: AnyPublisher<ObservableTaskStatus<Success, Error>, Never>  {
         base._opaque_objectDidChange
     }
 
@@ -98,11 +98,11 @@ extension OpaqueObservableTask: Equatable {
 // MARK: - Auxiliary
 
 extension ObservableTask {
-    fileprivate var _opaque_status: TaskStatus<Any, Swift.Error> {
+    fileprivate var _opaque_status: ObservableTaskStatus<Any, Swift.Error> {
         status.map({ $0 as Any }).mapError({ $0 as Swift.Error })
     }
 
-    fileprivate var _opaque_objectDidChange: AnyPublisher<TaskStatus<Any, Swift.Error>, Never> {
+    fileprivate var _opaque_objectDidChange: AnyPublisher<ObservableTaskStatus<Any, Swift.Error>, Never> {
         objectDidChange
             .map({ $0.map({ $0 as Any }).mapError({ $0 as Swift.Error }) })
             .eraseToAnyPublisher()

Sources/Merge/Intramodular/Observable Tasks/Status/TaskStatus.swift → Sources/Merge/Intramodular/Observable Tasks/Status/ObservableTaskStatus.swift

@@ -5,14 +5,14 @@
 import Combine
 import Swallow
 
-public protocol TaskStatusType<Success, Error> {
+public protocol ObservableTaskStatusType<Success, Error> {
     associatedtype Success
     associatedtype Error 
 }
 
 /// The status of a task.
 @frozen
-public enum TaskStatus<Success, Error: Swift.Error>: TaskStatusType {
+public enum ObservableTaskStatus<Success, Error: Swift.Error>: ObservableTaskStatusType {
     case idle
     case active
     case paused
@@ -23,7 +23,7 @@ public enum TaskStatus<Success, Error: Swift.Error>: TaskStatusType {
 
 // MARK: - Extensions
 
-extension TaskStatus {
+extension ObservableTaskStatus {
     public var isTerminal: Bool {
         switch self {
             case .success, .canceled, .error:
@@ -46,7 +46,7 @@ extension TaskStatus {
     }
 }
 
-extension TaskStatus {
+extension ObservableTaskStatus {
     public var successValue: Success? {
         if case let .success(success) = self {
             return success
@@ -64,7 +64,7 @@ extension TaskStatus {
     }
 }
 
-extension TaskStatus {
+extension ObservableTaskStatus {
     public var output: TaskOutput<Success, Error>? {
         switch self {
             case .active:
@@ -106,8 +106,8 @@ extension TaskStatus {
     }
 }
 
-extension TaskStatus {
-    public func map<T>(_ transform: (Success) -> T) -> TaskStatus<T, Error> {
+extension ObservableTaskStatus {
+    public func map<T>(_ transform: (Success) -> T) -> ObservableTaskStatus<T, Error> {
         switch self {
             case .idle:
                 return .idle
@@ -124,7 +124,7 @@ extension TaskStatus {
         }
     }
 
-    public func mapError<T: Swift.Error>(_ transform: (Error) -> T) -> TaskStatus<Success, T> {
+    public func mapError<T: Swift.Error>(_ transform: (Error) -> T) -> ObservableTaskStatus<Success, T> {
         switch self {
             case .idle:
                 return .idle
@@ -144,15 +144,15 @@ extension TaskStatus {
 
 // MARK: - Conformances
 
-extension TaskStatus: Equatable where Success: Equatable, Error: Equatable {
+extension ObservableTaskStatus: Equatable where Success: Equatable, Error: Equatable {
 
 }
 
-extension TaskStatus: Hashable where Success: Hashable, Error: Hashable {
+extension ObservableTaskStatus: Hashable where Success: Hashable, Error: Hashable {
 
 }
 
-extension TaskStatus: Sendable where Success: Sendable {
+extension ObservableTaskStatus: Sendable where Success: Sendable {
 
 }
 
@@ -287,7 +287,7 @@ extension ObservableTask {
     }
 }
 
-extension TaskStatus {
+extension ObservableTaskStatus {
     public init(_ status: Result<Success, Error>) {
         switch status {
             case .success(let value):
@@ -320,7 +320,7 @@ extension TaskStatus {
 }
 
 extension Result {
-    public init?(_ status: TaskStatus<Success, Failure>) {
+    public init?(_ status: ObservableTaskStatus<Success, Failure>) {
         switch status {
             case .success(let success):
                 self = .success(success)
@@ -331,3 +331,10 @@ extension Result {
         }
     }
 }
+
+// MARK: - Deprecated
+
+@available(*, deprecated, renamed: "ObservableTaskStatusType")
+public typealias TaskStatusType = ObservableTaskStatusType
+@available(*, deprecated, renamed: "ObservableTaskStatus")
+public typealias TaskStatus<T, U: Error> = ObservableTaskStatus<T, U>

Sources/Merge/Intramodular/Observable Tasks/Status/TaskFailure.swift

@@ -44,7 +44,7 @@ public enum TaskFailure<Error: Swift.Error>: _ErrorX, HashEquatable {
 // MARK: - Initializers
 
 extension TaskFailure {
-    public init?<Success>(_ status: TaskStatus<Success, Error>) {
+    public init?<Success>(_ status: ObservableTaskStatus<Success, Error>) {
         if let failure = status.failure {
             self = failure
         } else {

Sources/Merge/Intramodular/Observable Tasks/Status/TaskOutput.swift

@@ -13,7 +13,7 @@ public enum TaskOutput<Success, Error: Swift.Error> {
 
 extension TaskOutput {
     public var value: Success? {
-        TaskStatus(self).successValue
+        ObservableTaskStatus(self).successValue
     }
 
     public var isTerminal: Bool {

Sources/Merge/Intramodular/Observable Tasks/Status/TaskResult.swift

@@ -18,7 +18,7 @@ public enum TaskResult<Success, Error: Swift.Error> {
         }
     }
 
-    public init?(_ status: TaskStatus<Success, Error>) {
+    public init?(_ status: ObservableTaskStatus<Success, Error>) {
         switch status {
             case .idle:
                 return nil
@@ -91,7 +91,7 @@ extension TaskResult: Sendable where Success: Sendable {
 
 // MARK: - Supplementary
 
-extension TaskStatus {
+extension ObservableTaskStatus {
     public init(_ result: TaskResult<Success, Error>) {
         switch result {
             case .canceled:

Sources/Merge/Intramodular/Observable Tasks/Status/TaskStatusDescription.swift

@@ -88,7 +88,7 @@ extension TaskStatusDescription {
     }
 
     public init<Success, Error: Swift.Error>(
-        _ status: TaskStatus<Success, Error>
+        _ status: ObservableTaskStatus<Success, Error>
     ) {
         switch status {
             case .idle:
@@ -173,7 +173,7 @@ extension TaskStatusDescription {
     }
 }
 
-extension TaskStatus {
+extension ObservableTaskStatus {
     @_disfavoredOverload
     public static func == (lhs: Self, rhs: TaskStatusDescription.Comparison) -> Bool {
         TaskStatusDescription(lhs) == rhs