Move helpers into private extension

Author: allendav

WooCommerce/Classes/Tools/VersionHelpers.swift

@@ -11,73 +11,74 @@ final class VersionHelpers {
     /// Returns `orderedDescending` if the lhs version is newer than the rhs
     ///
     static func compare(_ lhs: String, _ rhs: String) -> ComparisonResult {
+        let leftComponents = versionComponents(of: lhs)
+        let rightComponents = versionComponents(of: rhs)
+        let maxComponents = max(leftComponents.count, rightComponents.count)
 
-        /// Replace _ - and + with a .
-        ///
-        func replaceUnderscoreDashAndPlusWithDot(_ string: String) -> String {
-            string.replacingOccurrences(of: "([_\\-+]+)", with: ".", options: .regularExpression)
-        }
+        for index in 0..<maxComponents {
+            /// Treat missing components (e.g. 1.2 being compared to 1.1.3 as "0", i.e. 1.2.0)
+            let leftComponent = index < leftComponents.count ? leftComponents[index] : "0"
+            let rightComponent = index < rightComponents.count ? rightComponents[index] : "0"
 
-        /// Insert a . before and after any non number
-        ///
-        func insertDotsBeforeAndAfterAnyNonNumber(_ string: String) -> String {
-            string.replacingOccurrences(of: "([^0-9.]+)", with: ".$1.", options: .regularExpression)
+            let comparisonResult = compareStringComponents(leftComponent, rightComponent)
+            if comparisonResult != .orderedSame {
+                return comparisonResult
+            }
         }
 
-        /// Score and compare two string components
-        ///
-        func compareStringComponents(_ lhs: String, _ rhs: String) -> ComparisonResult {
-            /// Score each component
-            let lhsScore = VersionComponentScore(from: lhs)
-            let rhsScore = VersionComponentScore(from: rhs)
-
-            if lhsScore < rhsScore {
-                return .orderedAscending
-            }
+        return .orderedSame
+    }
+}
 
-            if lhsScore > rhsScore {
-                return .orderedDescending
-            }
+// MARK: - Private Helpers
+//
+private extension VersionHelpers {
+    /// Replace _ - and + with a .
+    ///
+    static func replaceUnderscoreDashAndPlusWithDot(_ string: String) -> String {
+        string.replacingOccurrences(of: "([_\\-+]+)", with: ".", options: .regularExpression)
+    }
 
-            if lhsScore == .number && rhsScore == .number {
-                let lhsAsNumber = NSNumber(value: Int(lhs) ?? 0)
-                let rhsAsNumber = NSNumber(value: Int(rhs) ?? 0)
+    /// Insert a . before and after any non number
+    ///
+    static func insertDotsBeforeAndAfterAnyNonNumber(_ string: String) -> String {
+        string.replacingOccurrences(of: "([^0-9.]+)", with: ".$1.", options: .regularExpression)
+    }
 
-                let comparisonResult = lhsAsNumber.compare(rhsAsNumber)
-                if comparisonResult != .orderedSame {
-                    return comparisonResult
-                }
-            }
+    /// Score and compare two string components
+    ///
+    static func compareStringComponents(_ lhs: String, _ rhs: String) -> ComparisonResult {
+        let lhsScore = VersionComponentScore(from: lhs)
+        let rhsScore = VersionComponentScore(from: rhs)
 
-            return .orderedSame
+        if lhsScore < rhsScore {
+            return .orderedAscending
         }
 
-        /// Process the given string into version components
-        ///
-        func versionComponents(of string: String) -> [String] {
-            var stringToComponentize = replaceUnderscoreDashAndPlusWithDot(string)
-            stringToComponentize = insertDotsBeforeAndAfterAnyNonNumber(stringToComponentize)
-            return stringToComponentize.components(separatedBy: ".")
+        if lhsScore > rhsScore {
+            return .orderedDescending
         }
 
-        let leftComponents = versionComponents(of: lhs)
-        let rightComponents = versionComponents(of: rhs)
-
-        let maxComponents = max(leftComponents.count, rightComponents.count)
+        if lhsScore == .number && rhsScore == .number {
+            let lhsAsNumber = NSNumber(value: Int(lhs) ?? 0)
+            let rhsAsNumber = NSNumber(value: Int(rhs) ?? 0)
 
-        for index in 0..<maxComponents {
-            /// Treat missing components (e.g. 1.2 being compared to 1.1.3 as "0", i.e. 1.2.0
-            let leftComponent = index < leftComponents.count ? leftComponents[index] : "0"
-            let rightComponent = index < rightComponents.count ? rightComponents[index] : "0"
-
-            let comparisonResult = compareStringComponents(leftComponent, rightComponent)
+            let comparisonResult = lhsAsNumber.compare(rhsAsNumber)
             if comparisonResult != .orderedSame {
                 return comparisonResult
             }
         }
 
         return .orderedSame
     }
+
+    /// Process the given string into version components
+    ///
+    static func versionComponents(of string: String) -> [String] {
+        var stringToComponentize = replaceUnderscoreDashAndPlusWithDot(string)
+        stringToComponentize = insertDotsBeforeAndAfterAnyNonNumber(stringToComponentize)
+        return stringToComponentize.components(separatedBy: ".")
+    }
 }
 
 /// Defines the score (rank) of a component string within a version string.
@@ -89,7 +90,7 @@ final class VersionHelpers {
 ///
 /// Ranked per https://www.php.net/manual/en/function.version-compare.php
 ///
-fileprivate enum VersionComponentScore: Comparable {
+private enum VersionComponentScore: Comparable {
     case other
     case dev
     case alpha
@@ -99,7 +100,7 @@ fileprivate enum VersionComponentScore: Comparable {
     case patch
 }
 
-fileprivate extension VersionComponentScore {
+private extension VersionComponentScore {
     init(from: String) {
         if from == "dev" {
             self = .dev