code change for defaultValue

Author: chloe-yeo

Sources/FoundationEssentials/ProgressReporter/ProgressReporter.swift

@@ -173,7 +173,7 @@ internal struct AnyMetatypeWrapper: Hashable, Equatable, Sendable {
                 if let val = state.otherProperties[AnyMetatypeWrapper(metatype: P.self)] as? P.T {
                     return val
                 } else {
-                    return P.Type.defaultValue
+                    return P.defaultValue
                 }
             }
 

Sources/FoundationInternationalization/ProgressReporter/ProgressReporter+FileFormatStyle.swift

@@ -99,23 +99,15 @@ extension ProgressReporter.FileFormatStyle: FormatStyle {
 
             let properties = reporter.withProperties(\.self)
 
-            if let totalFileCount = properties.totalFileCount {
-                let completedFileCount = properties.completedFileCount ?? 0
-                fileCountLSR = LocalizedStringResource("\(completedFileCount, format: IntegerFormatStyle<Int>()) of \(totalFileCount, format: IntegerFormatStyle<Int>()) files", locale: self.locale, bundle: .forClass(ProgressReporter.self))
-            }
+            fileCountLSR = LocalizedStringResource("\(properties.completedFileCount, format: IntegerFormatStyle<Int>()) of \(properties.totalFileCount, format: IntegerFormatStyle<Int>()) files", locale: self.locale, bundle: .forClass(ProgressReporter.self))
 
-            if let totalByteCount = properties.totalByteCount {
-                let completedByteCount = properties.completedByteCount ?? 0
-                byteCountLSR = LocalizedStringResource("\(completedByteCount, format: ByteCountFormatStyle()) of \(totalByteCount, format: ByteCountFormatStyle())", locale: self.locale, bundle: .forClass(ProgressReporter.self))
-            }
 
-            if let throughput = properties.throughput {
-                throughputLSR = LocalizedStringResource("\(throughput, format: ByteCountFormatStyle())/s", locale: self.locale, bundle: .forClass(ProgressReporter.self))
-            }
+            byteCountLSR = LocalizedStringResource("\(properties.completedByteCount, format: ByteCountFormatStyle()) of \(properties.totalByteCount, format: ByteCountFormatStyle())", locale: self.locale, bundle: .forClass(ProgressReporter.self))
 
-            if let timeRemaining = properties.estimatedTimeRemaining {
-                timeRemainingLSR = LocalizedStringResource("\(timeRemaining, format: Duration.UnitsFormatStyle(allowedUnits: [.hours, .minutes], width: .wide)) remaining", locale: self.locale, bundle: .forClass(ProgressReporter.self))
-            }
+            
+            throughputLSR = LocalizedStringResource("\(properties.throughput, format: ByteCountFormatStyle())/s", locale: self.locale, bundle: .forClass(ProgressReporter.self))
+            
+            timeRemainingLSR = LocalizedStringResource("\(properties.estimatedTimeRemaining, format: Duration.UnitsFormatStyle(allowedUnits: [.hours, .minutes], width: .wide)) remaining", locale: self.locale, bundle: .forClass(ProgressReporter.self))
 
             return """
             \(String(localized: fileCountLSR ?? "")) 

Tests/FoundationEssentialsTests/ProgressReporter/ProgressReporterTests.swift

@@ -54,7 +54,6 @@ class TestProgressReporter: XCTestCase {
         }
 
         XCTAssertEqual(reporter.withProperties(\.totalFileCount), 100)
-        XCTAssertNil(reporter.withProperties(\.completedFileCount))
 
         reporter.complete(count: 100)
         XCTAssertEqual(reporter.fractionCompleted, 1.0)
@@ -248,13 +247,13 @@ class TestProgressReporter: XCTestCase {
         let childProgress1 = reporter1.subprogress(assigningCount: 3)
         let childReporter1 = childProgress1.reporter(totalCount: nil)
         childReporter1.withProperties { properties in
-            properties.totalFileCount = 10
+            properties.totalFileCount += 10
         }
 
         let childProgress2 = reporter1.subprogress(assigningCount: 2)
         let childReporter2 = childProgress2.reporter(totalCount: nil)
         childReporter2.withProperties { properties in
-            properties.totalFileCount = 10
+            properties.totalFileCount += 10
         }
 
         XCTAssertEqual(reporter1.withProperties(\.totalFileCount), 20)