temporarily change availability back to 6.2 + add typealias for ProgressReporter

Author: chloe-yeo

Sources/FoundationEssentials/ProgressManager/ProgressManager+Interop.swift

@@ -15,7 +15,7 @@ internal import _ForSwiftFoundation
 internal import Synchronization
 
 //MARK: Progress Parent - Subprogress / ProgressReporter Child Interop
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension Progress {
 
     /// Returns a Subprogress which can be passed to any method that reports progress
@@ -91,7 +91,7 @@ extension Progress {
     }
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 //MARK: ProgressManager Parent - Progress Child Interop
 extension ProgressManager {
 
@@ -117,7 +117,7 @@ extension ProgressManager {
     }
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 internal final class SubprogressBridge: Sendable {
 
     internal let progressBridge: Progress
@@ -142,7 +142,7 @@ internal final class SubprogressBridge: Sendable {
     }
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 internal final class ProgressReporterBridge: Sendable {
 
     internal let progressBridge: Progress
@@ -174,7 +174,7 @@ internal final class ProgressReporterBridge: Sendable {
 
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 internal final class NSProgressBridge: Progress, @unchecked Sendable {
 
     internal let manager: ProgressManager
@@ -211,7 +211,7 @@ internal final class NSProgressBridge: Progress, @unchecked Sendable {
     }
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager {
     // Keeping this as an enum in case we have other states to track in the future.
     internal enum ObserverState {
@@ -275,7 +275,7 @@ extension ProgressManager {
     }
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager.State {
     internal func notifyObservers(with observerState: ProgressManager.ObserverState) {
         for observer in observers {
@@ -284,7 +284,7 @@ extension ProgressManager.State {
     }
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager {
     //MARK: Interop Methods
     /// Adds `observer` to list of `_observers` in `self`.

Sources/FoundationEssentials/ProgressManager/ProgressManager+Properties+Accessors.swift

@@ -12,7 +12,7 @@
 
 internal import Synchronization
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager {
 
     // MARK: Methods to Read & Write Additional Properties of single ProgressManager node

Sources/FoundationEssentials/ProgressManager/ProgressManager+Properties+Definitions.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager {
 
     /// A type that conveys additional task-specific information on progress.
@@ -100,11 +100,11 @@ extension ProgressManager {
     }
 
     // Namespace for properties specific to operations reported on
-    public struct Properties: Sendable {
+    public enum Properties: Sendable {
 
         /// The total number of files.
         public var totalFileCount: TotalFileCount.Type { TotalFileCount.self }
-        public struct TotalFileCount: Sendable, Property {
+        public enum TotalFileCount: Sendable, Property {
 
             public typealias Value = Int
 
@@ -131,7 +131,7 @@ extension ProgressManager {
 
         /// The number of completed files.
         public var completedFileCount: CompletedFileCount.Type { CompletedFileCount.self }
-        public struct CompletedFileCount: Sendable, Property {
+        public enum CompletedFileCount: Sendable, Property {
 
             public typealias Value = Int
 
@@ -158,7 +158,7 @@ extension ProgressManager {
 
         /// The total number of bytes.
         public var totalByteCount: TotalByteCount.Type { TotalByteCount.self }
-        public struct TotalByteCount: Sendable, Property {
+        public enum TotalByteCount: Sendable, Property {
 
             public typealias Value = UInt64
 
@@ -185,7 +185,7 @@ extension ProgressManager {
 
         /// The number of completed bytes.
         public var completedByteCount: CompletedByteCount.Type { CompletedByteCount.self }
-        public struct CompletedByteCount: Sendable, Property {
+        public enum CompletedByteCount: Sendable, Property {
 
             public typealias Value = UInt64
 
@@ -212,7 +212,7 @@ extension ProgressManager {
 
         /// The throughput, in bytes per second.
         public var throughput: Throughput.Type { Throughput.self }
-        public struct Throughput: Sendable, Property {
+        public enum Throughput: Sendable, Property {
             public typealias Value = UInt64
 
             public typealias Summary = [UInt64]
@@ -238,7 +238,7 @@ extension ProgressManager {
 
         /// The amount of time remaining in the processing of files.
         public var estimatedTimeRemaining: EstimatedTimeRemaining.Type { EstimatedTimeRemaining.self }
-        public struct EstimatedTimeRemaining: Sendable, Property {
+        public enum EstimatedTimeRemaining: Sendable, Property {
 
             public typealias Value = Duration
 

Sources/FoundationEssentials/ProgressManager/ProgressManager+Properties+Helpers.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 internal import Synchronization
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager {
 
     internal enum CountType {

Sources/FoundationEssentials/ProgressManager/ProgressManager+State.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 internal import Synchronization
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager {
 
     internal struct MetatypeWrapper<V: Sendable, S: Sendable>: Hashable, Equatable, Sendable {

Sources/FoundationEssentials/ProgressManager/ProgressManager.swift

@@ -22,7 +22,7 @@ internal import _FoundationCollections
 #endif
 
 /// An object that conveys ongoing progress to the user for a specified task.
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 @Observable public final class ProgressManager: Sendable {
 
     internal let state: Mutex<State>
@@ -395,7 +395,7 @@ internal import _FoundationCollections
     }
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager: Hashable, Equatable {
     public func hash(into hasher: inout Hasher) {
         hasher.combine(ObjectIdentifier(self))
@@ -407,7 +407,7 @@ extension ProgressManager: Hashable, Equatable {
     }
 }
 
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 extension ProgressManager: CustomStringConvertible, CustomDebugStringConvertible {
     /// A description.
     public var description: String {

Sources/FoundationEssentials/ProgressManager/ProgressReporter.swift

@@ -15,9 +15,12 @@ import Observation
 /// ProgressReporter is a wrapper for ProgressManager that carries information about ProgressManager.
 ///
 /// It is read-only and can be added as a child of another ProgressManager.
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 @Observable public final class ProgressReporter: Sendable, Hashable, Equatable, CustomStringConvertible, CustomDebugStringConvertible {
 
+    public typealias Values = ProgressManager.Values
+    public typealias Property = ProgressManager.Property
+    
     /// The total units of work.
     public var totalCount: Int? {
         manager.totalCount
@@ -81,7 +84,7 @@ import Observation
 
     /// Reads properties that convey additional information about progress.
     public func withProperties<T, E: Error>(
-        _ closure: (sending ProgressManager.Values) throws(E) -> sending T
+        _ closure: (sending Values) throws(E) -> sending T
     ) throws(E) -> T {
         return try manager.getProperties(closure)
     }
@@ -94,7 +97,7 @@ import Observation
     /// - Parameter property: The type of the integer property to summarize. Must be a property
     ///   where both the value and summary types are `Int`.
     /// - Returns: The aggregated summary value for the specified property across the entire subtree.
-    public func summary<P: ProgressManager.Property>(of property: P.Type) -> Int where P.Value == Int, P.Summary == Int {
+    public func summary<P: Property>(of property: P.Type) -> Int where P.Value == Int, P.Summary == Int {
         manager.summary(of: property)
     }
 
@@ -106,7 +109,7 @@ import Observation
     /// - Parameter property: The type of the unsigned property to summarize. Must be a property
     ///   where both the value and summary types are `UInt64`.
     /// - Returns: The aggregated summary value for the specified property across the entire subtree.
-    public func summary<P: ProgressManager.Property>(of property: P.Type) -> UInt64 where P.Value == UInt64, P.Summary == UInt64 {
+    public func summary<P: Property>(of property: P.Type) -> UInt64 where P.Value == UInt64, P.Summary == UInt64 {
         manager.summary(of: property)
     }
 
@@ -118,7 +121,7 @@ import Observation
     /// - Parameter property: The type of the double property to summarize. Must be a property
     ///   where both the value and summary types are `Double`.
     /// - Returns: The aggregated summary value for the specified property across the entire subtree.
-    public func summary<P: ProgressManager.Property>(of property: P.Type) -> Double where P.Value == Double, P.Summary == Double {
+    public func summary<P: Property>(of property: P.Type) -> Double where P.Value == Double, P.Summary == Double {
         manager.summary(of: property)
     }
 
@@ -130,7 +133,7 @@ import Observation
     /// - Parameter property: The type of the string property to summarize. Must be a property
     ///   where both the value and summary types are `String`.
     /// - Returns: The aggregated summary value for the specified property across the entire subtree.
-    public func summary<P: ProgressManager.Property>(of property: P.Type) -> [String?] where P.Value == String?, P.Summary == [String?] {
+    public func summary<P: Property>(of property: P.Type) -> [String?] where P.Value == String?, P.Summary == [String?] {
         return manager.summary(of: property)
     }
 
@@ -142,7 +145,7 @@ import Observation
     /// - Parameter property: The type of the URL property to summarize. Must be a property
     ///   where both the value and summary types are `URL?` and `[URL?]` respectively.
     /// - Returns: The aggregated summary value for the specified property across the entire subtree.
-    public func summary<P: ProgressManager.Property>(of property: P.Type) -> [URL?] where P.Value == URL?, P.Summary == [URL?] {
+    public func summary<P: Property>(of property: P.Type) -> [URL?] where P.Value == URL?, P.Summary == [URL?] {
         return manager.summary(of: property)
     }
 
@@ -154,7 +157,7 @@ import Observation
     /// - Parameter property: The type of the unsigned integer property to summarize. Must be a property
     ///   where the value type is `UInt64` and the summary type is `[UInt64]`.
     /// - Returns: The aggregated summary value for the specified property across the entire subtree.
-    public func summary<P: ProgressManager.Property>(of property: P.Type) -> [UInt64] where P.Value == UInt64, P.Summary == [UInt64] {
+    public func summary<P: Property>(of property: P.Type) -> [UInt64] where P.Value == UInt64, P.Summary == [UInt64] {
         return manager.summary(of: property)
     }
 
@@ -166,7 +169,7 @@ import Observation
     /// - Parameter property: The type of the duration property to summarize. Must be a property
     ///   where both the value and summary types are `Duration`.
     /// - Returns: The aggregated summary value for the specified property across the entire subtree.
-    public func summary<P: ProgressManager.Property>(of property: P.Type) -> Duration where P.Value == Duration, P.Summary == Duration {
+    public func summary<P: Property>(of property: P.Type) -> Duration where P.Value == Duration, P.Summary == Duration {
         return manager.summary(of: property)
     }
 

Sources/FoundationEssentials/ProgressManager/Subprogress.swift

@@ -14,7 +14,7 @@
 ///
 /// Subprogress is returned from a call to `subprogress(assigningCount:)` by a parent ProgressManager.
 /// A child ProgressManager is then returned by calling `start(totalCount:)` on a Subprogress.
-@available(FoundationPreview 6.3, *)
+@available(FoundationPreview 6.2, *)
 public struct Subprogress: ~Copyable, Sendable {
     internal var parent: ProgressManager
     internal var portionOfParent: Int

Tests/FoundationEssentialsTests/ProgressManager/ProgressManagerPropertiesTests.swift

@@ -384,7 +384,7 @@ import Testing
 extension ProgressManager.Properties {
 
     var counter: Counter.Type { Counter.self }
-    struct Counter: Sendable, ProgressManager.Property {
+    struct Counter: Sendable, Property {
 
         typealias Value = Int
 
@@ -488,7 +488,7 @@ extension ProgressManager.Properties {
 
 extension ProgressManager.Properties {
     var byteSize: ByteSize.Type { ByteSize.self }
-    struct ByteSize: Sendable, ProgressManager.Property {
+    struct ByteSize: Sendable, Property {
 
         typealias Value = UInt64
 
@@ -594,7 +594,7 @@ func doSomethingTwoLevels(subprogress: consuming Subprogress) async {
 extension ProgressManager.Properties {
 
     var justADouble: JustADouble.Type { JustADouble.self }
-    struct JustADouble: Sendable, ProgressManager.Property {
+    struct JustADouble: Sendable, Property {
 
         typealias Value = Double
 
@@ -697,7 +697,7 @@ extension ProgressManager.Properties {
 extension ProgressManager.Properties {
 
     var downloadedFile: DownloadedFile.Type { DownloadedFile.self }
-    struct DownloadedFile: Sendable, ProgressManager.Property {
+    struct DownloadedFile: Sendable, Property {
 
         typealias Value = String?
 
@@ -797,7 +797,7 @@ extension ProgressManager.Properties {
 extension ProgressManager.Properties {
 
     var processingFile: ProcessingFile.Type { ProcessingFile.self }
-    struct ProcessingFile: Sendable, ProgressManager.Property {
+    struct ProcessingFile: Sendable, Property {
 
         typealias Value = String?
 
@@ -896,7 +896,7 @@ extension ProgressManager.Properties {
 
 extension ProgressManager.Properties {
     var imageURL: ImageURL.Type { ImageURL.self }
-    struct ImageURL: Sendable, ProgressManager.Property {
+    struct ImageURL: Sendable, Property {
 
         typealias Value = URL?
 
@@ -989,7 +989,7 @@ extension ProgressManager.Properties {
 
 extension ProgressManager.Properties {
     var totalPixelCount: TotalPixelCount.Type { TotalPixelCount.self }
-    struct TotalPixelCount: Sendable, ProgressManager.Property {
+    struct TotalPixelCount: Sendable, Property {
         typealias Value = UInt64
 
         typealias Summary = [UInt64]
@@ -1082,7 +1082,7 @@ extension ProgressManager.Properties {
 
 extension ProgressManager.Properties {
     var viralIndeterminate: ViralIndeterminate.Type { ViralIndeterminate.self }
-    struct ViralIndeterminate: Sendable, ProgressManager.Property {
+    struct ViralIndeterminate: Sendable, Property {
         typealias Value = Int
 
         typealias Summary = Int
@@ -1183,7 +1183,7 @@ extension ProgressManager.Properties {
 
 extension ProgressManager.Properties {
     var processTime: ProcessTime.Type { ProcessTime.self }
-    struct ProcessTime: Sendable, ProgressManager.Property {
+    struct ProcessTime: Sendable, Property {
 
         typealias Value = Duration