Extract Array, Math, NotificationCenter, and IncrementalDelay to WordPressShared

jkmassel · jkmassel · commit 9c4ff763a492 · 2026-07-22T09:29:10.000-06:00
Move the Array and Math extensions and NotificationCenter.observeOnce into
WordPressShared, and split IncrementalDelay out of Delay.swift (leaving the GCD
DispatchDelayedAction/DelayStateWrapper helpers in the app). Relocate their
tests into WordPressSharedTests and add the WordPressShared import to the
remaining callers.
diff --git a/Modules/Sources/WordPressShared/Utility/Array.swift b/Modules/Sources/WordPressShared/Utility/Array.swift
diff --git a/Modules/Sources/WordPressShared/Utility/IncrementalDelay.swift b/Modules/Sources/WordPressShared/Utility/IncrementalDelay.swift
@@ -0,0 +1,27 @@
+import Foundation
+
+/// Provides a sequence of incremental delays, repeating the last one
+/// indefinitely.
+///
+public struct IncrementalDelay<Element> {
+    public var current: Element
+
+    private let delaySequence: AnySequence<Element>
+    private var iterator: AnyIterator<Element>
+
+    public init(_ sequence: [Element]) {
+        precondition(!sequence.isEmpty, "IncrementalDelay sequence can't be empty")
+        delaySequence = sequence.repeatingLast()
+        iterator = delaySequence.makeIterator()
+        current = iterator.next()!
+    }
+
+    public mutating func increment() {
+        current = iterator.next()!
+    }
+
+    public mutating func reset() {
+        iterator = delaySequence.makeIterator()
+        current = iterator.next()!
+    }
+}
diff --git a/Modules/Sources/WordPressShared/Utility/Math.swift b/Modules/Sources/WordPressShared/Utility/Math.swift
@@ -10,7 +10,7 @@ extension Int {
     /// - Precondition: divisor must be > 0
     /// - returns: an Int rounded to the nearest integer that's a multiple of the argument.
     ///
-    func round(_ divisor: UInt) -> Int {
+    public func round(_ divisor: UInt) -> Int {
         assert(divisor > 0)
         if self == 0 || divisor == 0 {
             return self
@@ -30,39 +30,39 @@ extension Comparable {
     ///     - max if self > max
     ///     - otherwise it returns self
     ///
-    func clamp(min minValue: Self, max maxValue: Self) -> Self {
+    public func clamp(min minValue: Self, max maxValue: Self) -> Self {
         return Swift.min(Swift.max(self, minValue), maxValue)
     }
 }
 
 extension CGSize {
-    func clamp(min minValue: CGSize, max maxValue: CGSize) -> CGSize {
+    public func clamp(min minValue: CGSize, max maxValue: CGSize) -> CGSize {
         let width = self.width.clamp(min: minValue.width, max: maxValue.width)
         let height = self.height.clamp(min: minValue.height, max: maxValue.height)
         return CGSize(width: width, height: height)
     }
 
-    func clamp(min minValue: CGFloat, max maxValue: CGFloat) -> CGSize {
+    public func clamp(min minValue: CGFloat, max maxValue: CGFloat) -> CGSize {
         let minSize = CGSize(width: minValue, height: minValue)
         let maxSize = CGSize(width: maxValue, height: maxValue)
         return clamp(min: minSize, max: maxSize)
     }
 
-    func clamp(min minValue: Int, max maxValue: Int) -> CGSize {
+    public func clamp(min minValue: Int, max maxValue: Int) -> CGSize {
         return clamp(min: CGFloat(minValue), max: CGFloat(maxValue))
     }
 
-    func scaled(by scale: CGFloat) -> CGSize {
+    public func scaled(by scale: CGFloat) -> CGSize {
         CGSize(width: width * scale, height: height * scale)
     }
 
-    func rounded() -> CGSize {
+    public func rounded() -> CGSize {
         CGSize(width: width.rounded(), height: height.rounded())
     }
 }
 
 extension CGFloat {
-    func zeroIfNaN() -> CGFloat {
+    public func zeroIfNaN() -> CGFloat {
         return self.isNaN ? 0.0 : self
     }
 }
diff --git a/Modules/Sources/WordPressShared/Utility/NotificationCenter+ObserveOnce.swift b/Modules/Sources/WordPressShared/Utility/NotificationCenter+ObserveOnce.swift
@@ -26,7 +26,7 @@ extension NotificationCenter {
     ///
     @discardableResult
     @objc
-    func observeOnce(forName name: NSNotification.Name?, object: Any?, queue: OperationQueue?, using block: @escaping (Foundation.Notification) -> Swift.Void, filter: ((Foundation.Notification) -> Bool)? = nil) -> NSObjectProtocol {
+    public func observeOnce(forName name: NSNotification.Name?, object: Any?, queue: OperationQueue?, using block: @escaping (Foundation.Notification) -> Swift.Void, filter: ((Foundation.Notification) -> Bool)? = nil) -> NSObjectProtocol {
         let oneTimeObserver = OneTimeObserver(action: block)
 
         let observer = NotificationCenter.default.addObserver(
diff --git a/Modules/Tests/WordPressSharedTests/ArrayTests.swift b/Modules/Tests/WordPressSharedTests/ArrayTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-import WordPress
+@testable import WordPressShared
 
 class ArrayTests: XCTestCase {
     func testRepeatLast() {
diff --git a/Modules/Tests/WordPressSharedTests/DelayTests.swift b/Modules/Tests/WordPressSharedTests/DelayTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-import WordPress
+@testable import WordPressShared
 
 class DelayTests: XCTestCase {
     func testIncrementalDelay() {
diff --git a/Modules/Tests/WordPressSharedTests/MathTest.swift b/Modules/Tests/WordPressSharedTests/MathTest.swift
@@ -1,5 +1,5 @@
 import XCTest
-@testable import WordPress
+@testable import WordPressShared
 
 class MathTest: XCTestCase {
 
diff --git a/Modules/Tests/WordPressSharedTests/NotificationCenterObserveOnceTests.swift b/Modules/Tests/WordPressSharedTests/NotificationCenterObserveOnceTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-@testable import WordPress
+@testable import WordPressShared
 
 private let counterKey = "counter"
 
diff --git a/Tests/KeystoneTests/Tests/Models/MediaImageServiceTests.swift b/Tests/KeystoneTests/Tests/Models/MediaImageServiceTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import WordPressShared
 import OHHTTPStubs
 import OHHTTPStubsSwift
 import AsyncImageKit
diff --git a/WordPress/Classes/Utility/Delay.swift b/WordPress/Classes/Utility/Delay.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 /// A delayed action implemented using GCD
 ///
@@ -61,32 +62,6 @@ struct DispatchDelayedAction {
     }
 }
 
-/// Provides a sequence of incremental delays, repeating the last one
-/// indefinitely.
-///
-public struct IncrementalDelay<Element> {
-    public var current: Element
-
-    private let delaySequence: AnySequence<Element>
-    private var iterator: AnyIterator<Element>
-
-    public init(_ sequence: [Element]) {
-        precondition(!sequence.isEmpty, "IncrementalDelay sequence can't be empty")
-        delaySequence = sequence.repeatingLast()
-        iterator = delaySequence.makeIterator()
-        current = iterator.next()!
-    }
-
-    public mutating func increment() {
-        current = iterator.next()!
-    }
-
-    public mutating func reset() {
-        iterator = delaySequence.makeIterator()
-        current = iterator.next()!
-    }
-}
-
 /// A helper struct that encapsulates an IncrementalDelay and DispatchDelayedAction, keeping track of current retryAttempt.
 ///
 struct DelayStateWrapper {
diff --git a/WordPress/Classes/Utility/In-App Feedback/ZendeskAttachmentsSection.swift b/WordPress/Classes/Utility/In-App Feedback/ZendeskAttachmentsSection.swift
@@ -1,4 +1,5 @@
 import SwiftUI
+import WordPressShared
 import Photos
 import PhotosUI
 import SupportProvidersSDK
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Activity Log/DashboardActivityLogViewModel.swift b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Activity Log/DashboardActivityLogViewModel.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 import WordPressKit
 
 class DashboardActivityLogViewModel {
diff --git a/WordPress/Classes/ViewRelated/Media/StockPhotos/StockPhotosDataSource.swift b/WordPress/Classes/ViewRelated/Media/StockPhotos/StockPhotosDataSource.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 
 /// Data Source for Stock Photos
 final class StockPhotosDataSource: ExternalMediaDataSource {
diff --git a/WordPress/Classes/ViewRelated/Pages/Views/PageListCell.swift b/WordPress/Classes/ViewRelated/Pages/Views/PageListCell.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 import UIKit
 import Combine
 import AsyncImageKit
diff --git a/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginListViewModel.swift b/WordPress/Classes/ViewRelated/Plugins/ViewModels/PluginListViewModel.swift
@@ -1,4 +1,5 @@
 import WordPressKit
+import WordPressShared
 import WordPressFlux
 import WordPressUI
 
diff --git a/WordPress/Classes/ViewRelated/Post/Search/PostSearchService.swift b/WordPress/Classes/ViewRelated/Post/Search/PostSearchService.swift
@@ -1,4 +1,5 @@
 import CoreData
+import WordPressShared
 import Foundation
 import WordPressData
 
diff --git a/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift b/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift
@@ -1,4 +1,5 @@
 import Foundation
+import WordPressShared
 import UIKit
 import AsyncImageKit
 import WordPressData

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ extension Int {`
`10`	`10`	`/// - Precondition: divisor must be > 0`
`11`	`11`	`/// - returns: an Int rounded to the nearest integer that's a multiple of the argument.`
`12`	`12`	`///`
`13`		`- func round(_ divisor: UInt) -> Int {`
	`13`	`+ public func round(_ divisor: UInt) -> Int {`
`14`	`14`	`assert(divisor > 0)`
`15`	`15`	`if self == 0 \|\| divisor == 0 {`
`16`	`16`	`return self`
`@@ -30,39 +30,39 @@ extension Comparable {`
`30`	`30`	`/// - max if self > max`
`31`	`31`	`/// - otherwise it returns self`
`32`	`32`	`///`
`33`		`- func clamp(min minValue: Self, max maxValue: Self) -> Self {`
	`33`	`+ public func clamp(min minValue: Self, max maxValue: Self) -> Self {`
`34`	`34`	`return Swift.min(Swift.max(self, minValue), maxValue)`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`extension CGSize {`
`39`		`- func clamp(min minValue: CGSize, max maxValue: CGSize) -> CGSize {`
	`39`	`+ public func clamp(min minValue: CGSize, max maxValue: CGSize) -> CGSize {`
`40`	`40`	`let width = self.width.clamp(min: minValue.width, max: maxValue.width)`
`41`	`41`	`let height = self.height.clamp(min: minValue.height, max: maxValue.height)`
`42`	`42`	`return CGSize(width: width, height: height)`
`43`	`43`	`}`
`44`	`44`
`45`		`- func clamp(min minValue: CGFloat, max maxValue: CGFloat) -> CGSize {`
	`45`	`+ public func clamp(min minValue: CGFloat, max maxValue: CGFloat) -> CGSize {`
`46`	`46`	`let minSize = CGSize(width: minValue, height: minValue)`
`47`	`47`	`let maxSize = CGSize(width: maxValue, height: maxValue)`
`48`	`48`	`return clamp(min: minSize, max: maxSize)`
`49`	`49`	`}`
`50`	`50`
`51`		`- func clamp(min minValue: Int, max maxValue: Int) -> CGSize {`
	`51`	`+ public func clamp(min minValue: Int, max maxValue: Int) -> CGSize {`
`52`	`52`	`return clamp(min: CGFloat(minValue), max: CGFloat(maxValue))`
`53`	`53`	`}`
`54`	`54`
`55`		`- func scaled(by scale: CGFloat) -> CGSize {`
	`55`	`+ public func scaled(by scale: CGFloat) -> CGSize {`
`56`	`56`	`CGSize(width: width * scale, height: height * scale)`
`57`	`57`	`}`
`58`	`58`
`59`		`- func rounded() -> CGSize {`
	`59`	`+ public func rounded() -> CGSize {`
`60`	`60`	`CGSize(width: width.rounded(), height: height.rounded())`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`extension CGFloat {`
`65`		`- func zeroIfNaN() -> CGFloat {`
	`65`	`+ public func zeroIfNaN() -> CGFloat {`
`66`	`66`	`return self.isNaN ? 0.0 : self`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import XCTest`
	`2`	`+import WordPressShared`
`2`	`3`	`import OHHTTPStubs`
`3`	`4`	`import OHHTTPStubsSwift`
`4`	`5`	`import AsyncImageKit`