Simplify parameter merge

Author: sebsto

Sources/xcodeinstall/CLI-driver/CLIMain.swift

@@ -79,74 +79,44 @@ struct MainCommand: AsyncParsableCommand {
     ) async throws -> XCodeInstall {
 
         var logger = Logger(label: "xcodeinstall")
-        if verbose {
-            logger.logLevel = .debug
-        } else {
-            logger.logLevel = .error
-        }
+        logger.logLevel = verbose ? .debug : .error
 
         if let deps {
             return await XCodeInstall(log: logger, deps: deps)
         }
 
-        // Load saved config
+        // Resolve config: merge CLI args with saved settings, display info, persist
         let baseDirectory = FileManager.default.homeDirectoryForCurrentUser
             .appendingPathComponent(".xcodeinstall")
         let configHandler = await ConfigHandler(log: logger, baseDirectory: baseDirectory)
-        let savedConfig = await configHandler.loadConfig()
-
-        // Merge CLI args with saved config (CLI takes precedence)
-        let effectiveRegion = region ?? savedConfig?.secretManagerRegion
-        let effectiveProfile = profileName ?? savedConfig?.profileName
-
-        // Display info message for loaded (non-overridden) settings
         let display = NooraDisplay()
-        if effectiveRegion != nil || effectiveProfile != nil {
-            var savedParts: [String] = []
-            if let r = effectiveRegion, region == nil {
-                savedParts.append("-s \(r)")
-            }
-            if let p = effectiveProfile, profileName == nil {
-                savedParts.append("-p \(p)")
-            }
-            if !savedParts.isEmpty {
-                await display.display(
-                    "Using saved settings: \(savedParts.joined(separator: " "))",
-                    style: .info
-                )
-            }
-        }
-
-        // Save config if CLI args provided (merge with existing)
-        if region != nil || profileName != nil {
-            let newConfig = PersistentConfig(
-                secretManagerRegion: region ?? savedConfig?.secretManagerRegion,
-                profileName: profileName ?? savedConfig?.profileName
-            )
-            try? await configHandler.saveConfig(newConfig)
-            logger.debug("Saved config")
-        }
+        let resolved = try await configHandler.resolvedConfig(
+            cliRegion: region,
+            cliProfile: profileName,
+            display: display
+        )
 
+        // Wire dependencies using resolved values
         let fileHandler = await FileHandler(log: logger)
         let urlSession = URLSession.shared
 
-        var secrets: SecretsHandlerProtocol
-        var authenticator: AppleAuthenticatorProtocol
-        var downloader: AppleDownloaderProtocol
-
-        if let effectiveRegion {
-            let awsSecrets = try await SecretsStorageAWS(
+        let secrets: SecretsHandlerProtocol
+        if let effectiveRegion = resolved.secretManagerRegion {
+            secrets = try await SecretsStorageAWS(
                 region: effectiveRegion,
-                profileName: effectiveProfile,
+                profileName: resolved.profileName,
                 log: logger
             )
-            secrets = awsSecrets
         } else {
             secrets = await SecretsStorageFile(log: logger)
         }
 
-        authenticator = await AppleAuthenticator(secrets: secrets, urlSession: urlSession, log: logger)
-        downloader = await AppleDownloader(
+        let authenticator: AppleAuthenticatorProtocol = await AppleAuthenticator(
+            secrets: secrets,
+            urlSession: urlSession,
+            log: logger
+        )
+        let downloader: AppleDownloaderProtocol = await AppleDownloader(
             secrets: secrets,
             urlSession: urlSession,
             fileHandler: fileHandler,

Sources/xcodeinstall/Utilities/ConfigHandler.swift

@@ -18,6 +18,7 @@ protocol ConfigHandlerProtocol: Sendable {
     func saveConfig(_ config: PersistentConfig) throws
     func loadConfig() -> PersistentConfig?
     nonisolated func configPath() -> URL
+    func resolvedConfig(cliRegion: String?, cliProfile: String?, display: DisplayProtocol) async throws -> PersistentConfig
 }
 
 // Config data model
@@ -41,7 +42,6 @@ struct ConfigHandler: ConfigHandlerProtocol {
     }
 
     func saveConfig(_ config: PersistentConfig) throws {
-        // Create directory if needed
         let fm = FileManager.default
         if !fm.fileExists(atPath: baseDirectory.path) {
             do {
@@ -51,23 +51,17 @@ struct ConfigHandler: ConfigHandlerProtocol {
                 throw error
             }
         }
-
-        // Encode and save
         let data = try JSONEncoder().encode(config)
         try data.write(to: configPath())
         log.debug("Saved config to \(configPath().path)")
     }
 
     func loadConfig() -> PersistentConfig? {
         let path = configPath()
-
-        // Return nil if file doesn't exist (not an error)
         guard FileManager.default.fileExists(atPath: path.path) else {
             log.debug("No config file found at \(path.path)")
             return nil
         }
-
-        // Try to load and decode
         do {
             let data = try Data(contentsOf: path)
             let config = try JSONDecoder().decode(PersistentConfig.self, from: data)
@@ -78,4 +72,42 @@ struct ConfigHandler: ConfigHandlerProtocol {
             return nil
         }
     }
+
+    /// Merges CLI arguments with saved config, displays an info message for
+    /// values that were loaded from disk (not provided on the CLI), and
+    /// saves back when CLI arguments were provided.
+    /// Returns the effective config to use for this invocation.
+    func resolvedConfig(
+        cliRegion: String?,
+        cliProfile: String?,
+        display: DisplayProtocol
+    ) async throws -> PersistentConfig {
+        let saved = loadConfig()
+
+        let effectiveRegion = cliRegion ?? saved?.secretManagerRegion
+        let effectiveProfile = cliProfile ?? saved?.profileName
+
+        // Show info message for values coming from saved config
+        var savedParts: [String] = []
+        if let r = effectiveRegion, cliRegion == nil { savedParts.append("-s \(r)") }
+        if let p = effectiveProfile, cliProfile == nil { savedParts.append("-p \(p)") }
+        if !savedParts.isEmpty {
+            display.display(
+                "Using saved settings: \(savedParts.joined(separator: " "))",
+                style: .info
+            )
+        }
+
+        // Persist when CLI provided new values, merging with existing
+        if cliRegion != nil || cliProfile != nil {
+            let updated = PersistentConfig(
+                secretManagerRegion: effectiveRegion,
+                profileName: effectiveProfile
+            )
+            try? saveConfig(updated)
+            log.debug("Saved config")
+        }
+
+        return PersistentConfig(secretManagerRegion: effectiveRegion, profileName: effectiveProfile)
+    }
 }