Merge pull request #1217 from rgoldberg/7.0.0/997-dependency-injection

rgoldberg · web-flow · commit d3fef252c947 · 2026-03-22T10:05:19.000-04:00
Inject dependencies; cleanup; update dependency comments
diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml
@@ -4,7 +4,7 @@
 # .markdownlint-cli2.yaml
 # mas
 #
-# markdownlint-cli2 0.21.0 / markdownlint 0.40.0
+# markdownlint-cli2 0.22.0 / markdownlint 0.40.0
 #
 ---
 gitignore: true
diff --git a/.swiftformat b/.swiftformat
@@ -14,6 +14,7 @@
 #--enable markTypes
 #--enable preferExplicitFalse
 #--enable testSuiteAccessControl
+#--enable wrapMultilineConditionalAssignment
 
 # Enabled rules (disabled by default)
 --enable acronyms
@@ -34,7 +35,6 @@
 --enable validateTestCases
 --enable wrapConditionalBodies
 --enable wrapEnumCases
---enable wrapMultilineConditionalAssignment
 --enable wrapMultilineFunctionChains
 --enable wrapSwitchCases
 
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -34,7 +34,7 @@ disabled_rules:
 - strict_fileprivate
 - type_body_length
 attributes:
-  always_on_line_above: ['@Flag', '@MainActor', '@OptionGroup']
+  always_on_line_above: ['@Flag', '@MainActor', '@OptionGroup', '@TaskLocal']
 deployment_target:
   macOS_deployment_target: 13
   macOSApplicationExtension_deployment_target: 13
diff --git a/Brewfile b/Brewfile
@@ -1,8 +1,8 @@
 brew "actionlint"        # 1.7.11
-brew "gh"                # 2.87.3
+brew "gh"                # 2.88.1
 brew "git"               # 2.53.0
-brew "ipsw"              # 3.1.660
-brew "markdownlint-cli2" # 0.21.0
+brew "ipsw"              # 3.1.665
+brew "markdownlint-cli2" # 0.22.0
 brew "periphery" if MacOS.version >= :sequoia && `/usr/bin/arch` == "arm64" # 3.6.0
 brew "shellcheck"        # 0.11.0
 brew "swiftformat"       # 0.60.1
diff --git a/Documentation/Sample.swift b/Documentation/Sample.swift
@@ -29,7 +29,7 @@ final class Sample {
 }
 
 /// Use `()` for void arguments & `Void` for void return types.
-let closure: () -> Void = {
+func x(_: () -> Void) {
 	// Do nothing
 }
 
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -19,11 +19,11 @@ _ = Package(
 	products: [.executable(name: "mas", targets: ["mas"])],
 	dependencies: [
 		.package(url: "https://github.com/KittyMac/Sextant.git", from: "0.4.38"),
-		.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.7.0"),
+		.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.7.1"),
 		.package(url: "https://github.com/apple/swift-atomics.git", from: "1.3.0"),
-		.package(url: "https://github.com/apple/swift-collections.git", from: "1.4.0"),
+		.package(url: "https://github.com/apple/swift-collections.git", from: "1.4.1"),
 		.package(url: "https://github.com/attaswift/BigInt.git", from: "5.7.0"),
-		.package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.13.0"),
+		.package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.13.2"),
 	],
 	targets: [
 		.plugin(name: "MASBuildToolPlugin", capability: .buildTool()),
diff --git a/Scripts/lint b/Scripts/lint
@@ -78,7 +78,7 @@ shellcheck -s bash -o all -e SC1009,SC1088,SC2296,SC2298,SC2299,SC2300,SC2301,SC
 printf -- $'--> 🚷 Non-Executables\n'
 readonly -a non_executables=(Scripts/***/*(N.^f+111))
 if (("${#non_executables[@]}")); then
-	printf $'%s\n' "${non_executables[@]}"
+	printf $'\e[1;91m%s\e[0m\n' "${non_executables[@]}"
 	((exit_status |= 1))
 fi
 
diff --git a/Sources/PrivateFrameworks/include/CommerceKit/CKDownloadQueue.h b/Sources/PrivateFrameworks/include/CommerceKit/CKDownloadQueue.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/CommerceKit/CKPurchaseController.h b/Sources/PrivateFrameworks/include/CommerceKit/CKPurchaseController.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/CommerceKit/CKServiceInterface.h b/Sources/PrivateFrameworks/include/CommerceKit/CKServiceInterface.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/CommerceKit/CommerceKit.h b/Sources/PrivateFrameworks/include/CommerceKit/CommerceKit.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/ISAccountService-Protocol.h b/Sources/PrivateFrameworks/include/StoreFoundation/ISAccountService-Protocol.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/ISServiceProxy.h b/Sources/PrivateFrameworks/include/StoreFoundation/ISServiceProxy.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/ISStoreAccount.h b/Sources/PrivateFrameworks/include/StoreFoundation/ISStoreAccount.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/SSDownload.h b/Sources/PrivateFrameworks/include/StoreFoundation/SSDownload.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/SSDownloadMetadata.h b/Sources/PrivateFrameworks/include/StoreFoundation/SSDownloadMetadata.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/SSDownloadPhase.h b/Sources/PrivateFrameworks/include/StoreFoundation/SSDownloadPhase.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/SSDownloadStatus.h b/Sources/PrivateFrameworks/include/StoreFoundation/SSDownloadStatus.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/SSPurchase.h b/Sources/PrivateFrameworks/include/StoreFoundation/SSPurchase.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/SSPurchaseResponse.h b/Sources/PrivateFrameworks/include/StoreFoundation/SSPurchaseResponse.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/PrivateFrameworks/include/StoreFoundation/StoreFoundation.h b/Sources/PrivateFrameworks/include/StoreFoundation/StoreFoundation.h
@@ -1,5 +1,5 @@
 //
-// Generated by https://github.com/blacktop/ipsw (Version: 3.1.660, BuildCommit: Homebrew)
+// Generated by https://github.com/blacktop/ipsw (Version: 3.1.665, BuildCommit: Homebrew)
 //
 // - LC_BUILD_VERSION:  Platform: macOS, MinOS: 26.2, SDK: 26.2, Tool: ld (1230.3)
 // - LC_SOURCE_VERSION: 716.2.2.0.0
diff --git a/Sources/mas/AppStore/AppStoreAction+download.swift b/Sources/mas/AppStore/AppStoreAction+download.swift
@@ -146,7 +146,7 @@ private actor DownloadQueueObserver: CKDownloadQueueObserver {
 			return
 		}
 		guard let continuation = unsafe continuation else {
-			MAS.printer.error("Failed to obtain download continuation for ADAM ID \(adamID)")
+			MAS.printer.error("Failed to get download continuation for ADAM ID \(adamID)")
 			return
 		}
 
@@ -204,7 +204,8 @@ private actor DownloadQueueObserver: CKDownloadQueueObserver {
 		case
 			.downloading where prevPhaseType == .processing,
 			.downloaded where prevPhaseType == .downloading,
-			.performing:
+			.performing
+		: // swiftformat:disable:this indent
 			MAS.printer.clearCurrentLine(of: .standardOutput)
 			MAS.printer.notice(snapshot.activePhaseType, snapshot.appNameAndVersion)
 		default:
@@ -469,17 +470,16 @@ private enum PhaseType: Equatable { // swiftlint:disable:this one_declaration_pe
 	}
 
 	init(_ action: AppStoreAction, rawValue: Int64?) {
-		self =
-			switch rawValue {
-			case 0:
-				.downloading
-			case 1:
-				.performing(action)
-			case 5:
-				.downloaded
-			default:
-				.processing
-			}
+		self = switch rawValue {
+		case 0:
+			.downloading
+		case 1:
+			.performing(action)
+		case 5:
+			.downloaded
+		default:
+			.processing
+		}
 	}
 }
 
diff --git a/Sources/mas/AppStore/AppStoreAction.swift b/Sources/mas/AppStore/AppStoreAction.swift
@@ -37,17 +37,8 @@ enum AppStoreAction {
 		}
 	}
 
-	func apps(
-		withAppIDs appIDs: [AppID],
-		force: Bool,
-		installedApps: [InstalledApp],
-		lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp,
-	) async throws {
-		try await apps(
-			withADAMIDs: await appIDs.lookupCatalogApps(using: lookupAppFromAppID).map(\.adamID),
-			force: force,
-			installedApps: installedApps,
-		)
+	func apps(withAppIDs appIDs: [AppID], force: Bool, installedApps: [InstalledApp]) async throws {
+		try await apps(withADAMIDs: await appIDs.catalogApps.map(\.adamID), force: force, installedApps: installedApps)
 	}
 
 	func apps(withADAMIDs adamIDs: [ADAMID], force: Bool, installedApps: [InstalledApp]) async throws {
diff --git a/Sources/mas/Commands/Config.swift b/Sources/mas/Commands/Config.swift
@@ -42,7 +42,7 @@ extension MAS {
 private var runningSliceArchitecture: String {
 	var info = utsname()
 	return unsafe uname(&info) == 0
-	? withUnsafePointer(to: &info.machine) { pointer in // swiftformat:disable indent
+	? unsafe withUnsafePointer(to: &info.machine) { pointer in // swiftformat:disable indent
 		unsafe pointer.withMemoryRebound(
 			to: CChar.self,
 			capacity: unsafe MemoryLayout.size(ofValue: unsafe pointer),
diff --git a/Sources/mas/Commands/Get.swift b/Sources/mas/Commands/Get.swift
@@ -26,7 +26,6 @@ extension MAS {
 				withAppIDs: catalogAppIDsOptionGroup.appIDs,
 				force: forceOptionGroup.force,
 				installedApps: try await installedApps,
-				lookupAppFromAppID: lookup(appID:),
 			)
 		}
 	}
diff --git a/Sources/mas/Commands/Home.swift b/Sources/mas/Commands/Home.swift
@@ -23,18 +23,14 @@ extension MAS {
 		private var catalogAppIDsOptionGroup: CatalogAppIDsOptionGroup
 
 		func run() async {
-			await run(lookupAppFromAppID: lookup(appID:))
+			await run(catalogApps: await catalogAppIDsOptionGroup.appIDs.catalogApps)
 		}
 
-		private func run(lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp) async {
-			await run(catalogApps: await catalogAppIDsOptionGroup.appIDs.lookupCatalogApps(using: lookupAppFromAppID))
-		}
-
-		func run(catalogApps: [CatalogApp]) async { // swiftformat:disable:this organizeDeclarations
+		func run(catalogApps: [CatalogApp]) async {
 			await run(appStorePageURLStrings: catalogApps.map(\.appStorePageURLString))
 		}
 
-		private func run(appStorePageURLStrings: [String]) async { // swiftformat:disable:this organizeDeclarations
+		private func run(appStorePageURLStrings: [String]) async {
 			await appStorePageURLStrings.forEach(attemptTo: "open") { appStorePageURLString in
 				guard let url = URL(string: appStorePageURLString) else {
 					throw MASError.unparsableURL(appStorePageURLString)
diff --git a/Sources/mas/Commands/Install.swift b/Sources/mas/Commands/Install.swift
@@ -25,7 +25,6 @@ extension MAS {
 				withAppIDs: catalogAppIDsOptionGroup.appIDs,
 				force: forceOptionGroup.force,
 				installedApps: try await installedApps,
-				lookupAppFromAppID: lookup(appID:),
 			)
 		}
 	}
diff --git a/Sources/mas/Commands/Lookup.swift b/Sources/mas/Commands/Lookup.swift
@@ -24,14 +24,10 @@ extension MAS {
 		private var catalogAppIDsOptionGroup: CatalogAppIDsOptionGroup
 
 		func run() async {
-			await run(lookupAppFromAppID: lookup(appID:))
+			run(catalogApps: await catalogAppIDsOptionGroup.appIDs.catalogApps)
 		}
 
-		private func run(lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp) async {
-			run(catalogApps: await catalogAppIDsOptionGroup.appIDs.lookupCatalogApps(using: lookupAppFromAppID))
-		}
-
-		func run(catalogApps: [CatalogApp]) { // swiftformat:disable:this organizeDeclarations
+		func run(catalogApps: [CatalogApp]) {
 			printer.info(
 				catalogApps.map { catalogApp in
 					"""
diff --git a/Sources/mas/Commands/Lucky.swift b/Sources/mas/Commands/Lucky.swift
@@ -27,15 +27,12 @@ extension MAS {
 		private var searchTermOptionGroup: SearchTermOptionGroup
 
 		func run() async throws {
-			try await run(installedApps: try await installedApps, searchForAppsMatchingSearchTerm: search(for:))
+			try await run(installedApps: try await installedApps)
 		}
 
-		private func run(
-			installedApps: [InstalledApp],
-			searchForAppsMatchingSearchTerm: (String) async throws -> [CatalogApp],
-		) async throws {
+		private func run(installedApps: [InstalledApp]) async throws {
 			let searchTerm = searchTermOptionGroup.searchTerm
-			guard let adamID = try await searchForAppsMatchingSearchTerm(searchTerm).first?.adamID else {
+			guard let adamID = try await Dependencies.current.searchForAppsMatchingSearchTerm(searchTerm).first?.adamID else {
 				throw MASError.noCatalogAppsFound(for: searchTerm)
 			}
 
diff --git a/Sources/mas/Commands/Open.swift b/Sources/mas/Commands/Open.swift
@@ -27,11 +27,13 @@ extension MAS {
 		private var appIDString: String?
 
 		func run() async throws {
-			try await run(lookupAppFromAppID: lookup(appID:))
-		}
-
-		private func run(lookupAppFromAppID: (AppID) async throws -> CatalogApp) async throws {
-			try await run(appStorePageURLString: appStorePageURLString(lookupAppFromAppID: lookupAppFromAppID))
+			try await run(
+				appStorePageURLString: appIDString.map { appIDString in
+					try await Dependencies.current // swiftformat:disable:next indent
+					.lookupAppFromAppID(AppID(from: appIDString, forceBundleID: forceBundleIDOptionGroup.forceBundleID))
+					.appStorePageURLString // swiftformat:disable:this indent
+				},
+			)
 		}
 
 		private func run(appStorePageURLString: String?) async throws {
@@ -43,17 +45,6 @@ extension MAS {
 
 			try await openMacAppStorePage(forAppStorePageURLString: appStorePageURLString)
 		}
-
-		private func appStorePageURLString(lookupAppFromAppID: (AppID) async throws -> CatalogApp) async throws -> String? {
-			guard let appIDString else {
-				return nil
-			}
-
-			return try await lookupAppFromAppID(
-				AppID(from: appIDString, forceBundleID: forceBundleIDOptionGroup.forceBundleID),
-			)
-			.appStorePageURLString
-		}
 	}
 }
 
diff --git a/Sources/mas/Commands/Outdated.swift b/Sources/mas/Commands/Outdated.swift
diff --git a/Sources/mas/Commands/Search.swift b/Sources/mas/Commands/Search.swift
diff --git a/Sources/mas/Commands/Seller.swift b/Sources/mas/Commands/Seller.swift
diff --git a/Sources/mas/Commands/Uninstall.swift b/Sources/mas/Commands/Uninstall.swift
diff --git a/Sources/mas/Commands/Update.swift b/Sources/mas/Commands/Update.swift
diff --git a/Sources/mas/Controllers/CatalogApp+ITunesSearch.swift b/Sources/mas/Controllers/CatalogApp+ITunesSearch.swift
diff --git a/Sources/mas/Models/AppID.swift b/Sources/mas/Models/AppID.swift
diff --git a/Sources/mas/Models/OutdatedApp.swift b/Sources/mas/Models/OutdatedApp.swift
diff --git a/Sources/mas/Utilities/Dependencies.swift b/Sources/mas/Utilities/Dependencies.swift
diff --git a/Sources/mas/Utilities/Sequence.swift b/Sources/mas/Utilities/Sequence.swift
diff --git a/Tests/MASTests/Controllers/MASTests+CatalogApp+ITunesSearch.swift b/Tests/MASTests/Controllers/MASTests+CatalogApp+ITunesSearch.swift
diff --git a/Tests/MASTests/Utilities/Consequences.swift b/Tests/MASTests/Utilities/Consequences.swift

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# .markdownlint-cli2.yaml`
`5`	`5`	`# mas`
`6`	`6`	`#`
`7`		`-# markdownlint-cli2 0.21.0 / markdownlint 0.40.0`
	`7`	`+# markdownlint-cli2 0.22.0 / markdownlint 0.40.0`
`8`	`8`	`#`
`9`	`9`	`---`
`10`	`10`	`gitignore: true`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ final class Sample {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	/// Use `()` for void arguments & `Void` for void return types.
`32`		`-let closure: () -> Void = {`
	`32`	`+func x(_: () -> Void) {`
`33`	`33`	`// Do nothing`
`34`	`34`	`}`
`35`	`35`