Merge pull request #1203 from rgoldberg/5.2.0/1202-parallelize

rgoldberg · web-flow · commit e84c0658e1df · 2026-02-17T17:54:58.000-05:00
diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml
@@ -4,7 +4,7 @@
 # .markdownlint-cli2.yaml
 # mas
 #
-# markdownlint-cli2 0.20.0 / markdownlint 0.40.0
+# markdownlint-cli2 0.21.0 / markdownlint 0.40.0
 #
 ---
 gitignore: true
diff --git a/Brewfile b/Brewfile
@@ -2,7 +2,7 @@ brew "actionlint"        # 1.7.11
 brew "gh"                # 2.86.0
 brew "git"               # 2.53.0
 brew "ipsw"              # 3.1.651
-brew "markdownlint-cli2" # 0.20.0
+brew "markdownlint-cli2" # 0.21.0
 brew "periphery" if MacOS.version >= :sequoia && `/usr/bin/arch` == "arm64" # 3.5.1
 brew "shellcheck"        # 0.11.0
 brew "swiftformat"       # 0.59.1
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,6 @@ _ = Package(
 	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-async-algorithms.git", from: "1.1.2"),
 		.package(url: "https://github.com/apple/swift-atomics.git", from: "1.3.0"),
 		.package(url: "https://github.com/apple/swift-collections.git", from: "1.3.0"),
 		.package(url: "https://github.com/attaswift/BigInt.git", from: "5.7.0"),
@@ -33,7 +32,6 @@ _ = Package(
 			name: "mas",
 			dependencies: [
 				.product(name: "ArgumentParser", package: "swift-argument-parser"),
-				.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
 				.product(name: "Atomics", package: "swift-atomics"),
 				.product(name: "OrderedCollections", package: "swift-collections"),
 				"BigInt",
diff --git a/Scripts/format b/Scripts/format
@@ -16,9 +16,6 @@ print_notice '🧹 Formatting' "${@}"
 
 ensure_command_available markdownlint-cli2 swiftformat swiftlint
 
-zmodload zsh/zutil
-zparseopts -D -A received_flag A
-
 export -r MAS_DISTRIBUTION=format
 
 printf -- $'--> 🕊​ SwiftFormat\n'
@@ -28,15 +25,8 @@ script -q /dev/null swiftformat --strict --markdown-files format-strict . |
 printf -- $'--> 🦅 SwiftLint\n'
 swiftlint --fix --quiet --reporter relative-path
 
-# shellcheck disable=SC1046,SC1047,SC1072,SC1073
-if ! [[ -v 'received_flag[-A]' ]]; then
-	printf -- $'--> 🔬 SwiftLint Analyze\n'
-	# shellcheck disable=SC1036
-	swiftlint analyze --fix --quiet --reporter relative-path --compiler-log-path\
-	 =(xcodebuild -scheme mas -destination "platform=macOS,arch=$(arch),variant=macos" 2>&1)
-fi
-
 printf -- $'--> 〽️ Markdown\n'
+# shellcheck disable=SC1036
 markdownlint-cli2 --fix -- ***/*.md(.)
 
 printf -- $'--> 🚷 Non-Executables\n'
diff --git a/Scripts/lint b/Scripts/lint
@@ -10,18 +10,19 @@
 # Please keep in sync with Scripts/format.
 #
 
+# shellcheck disable=SC1036,SC1056,SC1072
 . "${0:A:h}/_setup_script"
 
 print_notice '🚨 Linting' "${@}"
 
 ensure_command_available actionlint git markdownlint-cli2 shellcheck swiftformat swiftlint yamllint || exit
 [[ "$(/usr/bin/arch)" = arm64 && "${$(sw_vers -productVersion)%%.*}" -ge 15 ]]
 integer -r can_use_periphery="$((! ?))"
-# shellcheck disable=SC1083
+# shellcheck disable=SC1073,SC1083
 ((can_use_periphery)) && { ensure_command_available periphery || exit }
 
 zmodload zsh/zutil
-zparseopts -D -A received_flag A P
+zparseopts -D -A received_flag P
 
 export -r MAS_DISTRIBUTION=lint
 
@@ -36,15 +37,6 @@ printf -- $'--> 🦅 SwiftLint\n'
 swiftlint --strict --quiet --reporter relative-path
 ((exit_status |= ${?}))
 
-# shellcheck disable=SC1046,SC1047,SC1072,SC1073
-if ! [[ -v 'received_flag[-A]' ]]; then
-	printf -- $'--> 🔬 SwiftLint Analyze\n'
-	# shellcheck disable=SC1036
-	swiftlint analyze --strict --quiet --reporter relative-path --compiler-log-path\
-	 =(xcodebuild -scheme mas -destination "platform=macOS,arch=$(arch),variant=macos" 2>&1)
-	((exit_status |= ${?}))
-fi
-
 if ((can_use_periphery)) && ! [[ -v 'received_flag[-P]' ]]; then
 	printf -- $'--> 🌀 Periphery\n'
 	periphery scan --exclude-tests |
diff --git a/Sources/mas/AppStore/AppStoreAction+download.swift b/Sources/mas/AppStore/AppStoreAction+download.swift
@@ -356,16 +356,16 @@ private actor DownloadQueueObserver: CKDownloadQueueObserver {
 
 		guard
 			let appFolderURLSubstring = standardErrorString
-			.matches(of: unsafe appFolderURLRegex) // swiftformat:disable:next preferKeyPath
-			.compactMap({ $0.1 }) // swiftlint:disable:this prefer_key_path
+			.matches(of: unsafe appFolderURLRegex)
+			.compactMap(\.1)
 			.min(by: { $0.count < $1.count })
 		else {
 			throw MASError.error(
 				"Failed to find app folder URL in installer output for \(appNameAndVersion)",
 				error: standardErrorString,
 			)
 		}
-		guard let appFolderURL = URL(string: String(appFolderURLSubstring)) else {
+		guard let appFolderURL = URL(string: .init(appFolderURLSubstring)) else {
 			throw MASError.error(
 				"Failed to parse app folder URL for \(appNameAndVersion) from \(appFolderURLSubstring)",
 				error: standardErrorString,
diff --git a/Sources/mas/AppStore/AppStoreAction.swift b/Sources/mas/AppStore/AppStoreAction.swift
@@ -41,7 +41,7 @@ enum AppStoreAction: Sendable {
 		withAppIDs appIDs: [AppID],
 		force: Bool,
 		installedApps: [InstalledApp],
-		lookupAppFromAppID: (AppID) async throws -> CatalogApp,
+		lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp,
 	) async throws {
 		try await apps(
 			withADAMIDs: await appIDs.lookupCatalogApps(using: lookupAppFromAppID).map(\.adamID),
diff --git a/Sources/mas/Commands/Home.swift b/Sources/mas/Commands/Home.swift
@@ -26,7 +26,7 @@ extension MAS {
 			await run(lookupAppFromAppID: lookup(appID:))
 		}
 
-		private func run(lookupAppFromAppID: (AppID) async throws -> CatalogApp) async {
+		private func run(lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp) async {
 			await run(catalogApps: await catalogAppIDsOptionGroup.appIDs.lookupCatalogApps(using: lookupAppFromAppID))
 		}
 
diff --git a/Sources/mas/Commands/Lookup.swift b/Sources/mas/Commands/Lookup.swift
@@ -27,7 +27,7 @@ extension MAS {
 			await run(lookupAppFromAppID: lookup(appID:))
 		}
 
-		private func run(lookupAppFromAppID: (AppID) async throws -> CatalogApp) async {
+		private func run(lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp) async {
 			run(catalogApps: await catalogAppIDsOptionGroup.appIDs.lookupCatalogApps(using: lookupAppFromAppID))
 		}
 
diff --git a/Sources/mas/Commands/MAS.swift b/Sources/mas/Commands/MAS.swift
@@ -54,7 +54,7 @@ struct MAS: AsyncParsableCommand, Sendable {
 
 			let errorCount = printer.errorCount
 			if errorCount > 0 {
-				throw ExitCode(errorCount >= UInt64(Int32.max) ? Int32.max : Int32(errorCount))
+				throw ExitCode(errorCount >= UInt64(Int32.max) ? .max : .init(errorCount))
 			}
 		} catch {
 			exit(withError: error)
diff --git a/Sources/mas/Commands/Open.swift b/Sources/mas/Commands/Open.swift
@@ -23,7 +23,7 @@ extension MAS {
 
 		@OptionGroup
 		private var forceBundleIDOptionGroup: ForceBundleIDOptionGroup
-		@Argument(help: ArgumentHelp("App ID", valueName: "app-id"))
+		@Argument(help: .init("App ID", valueName: "app-id"))
 		private var appIDString: String?
 
 		func run() async throws {
@@ -67,7 +67,7 @@ private func openMacAppStore() async throws {
 		throw MASError.error("Failed to find app to open macappstore URLs")
 	}
 
-	try await workspace.openApplication(at: appURL, configuration: NSWorkspace.OpenConfiguration())
+	try await workspace.openApplication(at: appURL, configuration: .init())
 }
 
 private func openMacAppStorePage(forAppStorePageURLString appStorePageURLString: String) async throws {
diff --git a/Sources/mas/Commands/OptionGroups/CatalogAppIDsOptionGroup.swift b/Sources/mas/Commands/OptionGroups/CatalogAppIDsOptionGroup.swift
@@ -10,7 +10,7 @@ internal import ArgumentParser
 struct CatalogAppIDsOptionGroup: ParsableArguments {
 	@OptionGroup
 	private var forceBundleIDOptionGroup: ForceBundleIDOptionGroup
-	@Argument(help: ArgumentHelp("App ID", valueName: "app-id"))
+	@Argument(help: .init("App ID", valueName: "app-id"))
 	private var appIDStrings: [String]
 
 	var appIDs: [AppID] {
diff --git a/Sources/mas/Commands/OptionGroups/InstalledAppIDsOptionGroup.swift b/Sources/mas/Commands/OptionGroups/InstalledAppIDsOptionGroup.swift
@@ -10,7 +10,7 @@ internal import ArgumentParser
 struct InstalledAppIDsOptionGroup: ParsableArguments {
 	@OptionGroup
 	private var forceBundleIDOptionGroup: ForceBundleIDOptionGroup
-	@Argument(help: ArgumentHelp("App ID", valueName: "app-id"))
+	@Argument(help: .init("App ID", valueName: "app-id"))
 	private var appIDStrings = [String]()
 
 	var appIDs: [AppID] {
diff --git a/Sources/mas/Commands/OptionGroups/SearchTermOptionGroup.swift b/Sources/mas/Commands/OptionGroups/SearchTermOptionGroup.swift
@@ -8,7 +8,7 @@
 internal import ArgumentParser
 
 struct SearchTermOptionGroup: ParsableArguments {
-	@Argument(help: ArgumentHelp("Search terms are concatenated into a single search", valueName: "search-term"))
+	@Argument(help: .init("Search terms are concatenated into a single search", valueName: "search-term"))
 	private var searchTermElements: [String]
 
 	var searchTerm: String {
diff --git a/Sources/mas/Commands/Outdated.swift b/Sources/mas/Commands/Outdated.swift
@@ -27,10 +27,12 @@ extension MAS {
 			await run(installedApps: try await installedApps.filter(!\.isTestFlight), lookupAppFromAppID: lookup(appID:))
 		}
 
-		private func run(installedApps: [InstalledApp], lookupAppFromAppID: (AppID) async throws -> CatalogApp) async {
+		private func run(
+			installedApps: [InstalledApp],
+			lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp,
+		) async {
 			run(
-				outdatedApps: await outdatedApps(
-					from: installedApps,
+				outdatedApps: await installedApps.outdatedApps(
 					filterFor: installedAppIDsOptionGroup.appIDs,
 					lookupAppFromAppID: lookupAppFromAppID,
 					accuracy: accuracyOptionGroup.accuracy,
diff --git a/Sources/mas/Commands/Reset.swift b/Sources/mas/Commands/Reset.swift
@@ -64,7 +64,7 @@ extension MAS {
 				return
 			}
 
-			var executablePathBuffer = [CChar](repeating: 0, count: Int(PATH_MAX))
+			var executablePathBuffer = [CChar](repeating: 0, count: .init(PATH_MAX))
 			for pid in unsafe kinfoProcs.map(\.kp_proc.p_pid) {
 				guard
 					unsafe proc_pidpath(pid, &executablePathBuffer, UInt32(executablePathBuffer.count)) > 0,
diff --git a/Sources/mas/Commands/Seller.swift b/Sources/mas/Commands/Seller.swift
@@ -27,7 +27,7 @@ extension MAS {
 			await run(lookupAppFromAppID: lookup(appID:))
 		}
 
-		private func run(lookupAppFromAppID: (AppID) async throws -> CatalogApp) async {
+		private func run(lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp) async {
 			await run(catalogApps: await catalogAppIDsOptionGroup.appIDs.lookupCatalogApps(using: lookupAppFromAppID))
 		}
 
diff --git a/Sources/mas/Commands/Uninstall.swift b/Sources/mas/Commands/Uninstall.swift
@@ -115,7 +115,7 @@ extension MAS {
 
 				var uninstalledAppNSURL = NSURL?.none // swiftlint:disable:this legacy_objc_type
 				try unsafe fileManager.trashItem(
-					at: URL(filePath: appPath, directoryHint: .isDirectory),
+					at: .init(filePath: appPath, directoryHint: .isDirectory),
 					resultingItemURL: &uninstalledAppNSURL,
 				)
 				guard let uninstalledAppPath = uninstalledAppNSURL?.path else {
diff --git a/Sources/mas/Commands/Update.swift b/Sources/mas/Commands/Update.swift
@@ -30,13 +30,14 @@ extension MAS {
 			try await run(installedApps: try await installedApps.filter(!\.isTestFlight), lookupAppFromAppID: lookup(appID:))
 		}
 
-		private func run(installedApps: [InstalledApp], lookupAppFromAppID: (AppID) async throws -> CatalogApp)
-		async throws { // swiftformat:disable:this indent
+		private func run(
+			installedApps: [InstalledApp],
+			lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp,
+		) async throws {
 			try await run(
 				outdatedApps: forceOptionGroup.force // swiftformat:disable:next indent
 				? installedApps.filter(for: installedAppIDsOptionGroup.appIDs).map { ($0, "") }
-				: await outdatedApps(
-					from: installedApps,
+				: await installedApps.outdatedApps(
 					filterFor: installedAppIDsOptionGroup.appIDs,
 					lookupAppFromAppID: lookupAppFromAppID,
 					accuracy: accuracyOptionGroup.accuracy,
diff --git a/Sources/mas/Controllers/CatalogApp+ITunesSearch.swift b/Sources/mas/Controllers/CatalogApp+ITunesSearch.swift
@@ -5,7 +5,6 @@
 // Copyright © 2018 mas-cli. All rights reserved.
 //
 
-private import AsyncAlgorithms
 internal import Foundation
 private import Sextant
 private import SwiftSoup
@@ -33,7 +32,7 @@ func lookup(
 	let queryItem =
 		switch appID {
 		case let .adamID(adamID):
-			URLQueryItem(name: "id", value: String(adamID))
+			URLQueryItem(name: "id", value: .init(adamID))
 		case let .bundleID(bundleID):
 			URLQueryItem(name: "bundleId", value: bundleID)
 		}
@@ -63,7 +62,7 @@ private extension CatalogApp {
 		do {
 			return try await URL(string: appStorePageURLString)
 			.flatMap { url in // swiftformat:disable indent
-				try SwiftSoup.parse(try await dataFrom(url).0, appStorePageURLString)
+				try unsafe SwiftSoup.parse(try await dataFrom(url).0, appStorePageURLString)
 				.select("#serialized-server-data")
 				.first()?
 				.data()
@@ -109,9 +108,7 @@ func search(
 			dataFrom: dataSource,
 		)
 		.filter { ($0.supportedDevices?.contains("MacDesktop-MacDesktop") ?? false) && !adamIDSet.contains($0.adamID) }
-		.async
-		.map { $0.with(minimumOSVersion: await $0.minimumOSVersion(dataFrom: dataSource)) }
-		.array,
+		.concurrentMap { $0.with(minimumOSVersion: await $0.minimumOSVersion(dataFrom: dataSource)) },
 	) { $0.name.similarity(to: searchTerm) }
 }
 
@@ -142,7 +139,7 @@ async throws -> [CatalogApp] { // swiftformat:disable:this indent
 	do {
 		return try JSONDecoder().decode(CatalogAppResults.self, from: data).results
 	} catch {
-		throw MASError.error("Failed to parse JSON from response \(url)", error: String(data: data, encoding: .utf8) ?? "")
+		throw MASError.error("Failed to parse JSON from response \(url)", error: .init(data: data, encoding: .utf8) ?? "")
 	}
 }
 
diff --git a/Sources/mas/Models/AppID.swift b/Sources/mas/Models/AppID.swift
@@ -33,8 +33,9 @@ enum AppID: CustomStringConvertible, Sendable {
 }
 
 extension [AppID] { // swiftlint:disable:this file_types_order
-	func lookupCatalogApps(using lookupAppFromAppID: (AppID) async throws -> CatalogApp) async -> [CatalogApp] {
-		await compactMap(attemptingTo: "lookup app for", lookupAppFromAppID)
+	func lookupCatalogApps(using lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp)
+	async -> [CatalogApp] { // swiftformat:disable:this indent
+		await concurrentCompactMap(attemptingTo: "lookup app for", lookupAppFromAppID)
 	}
 }
 
diff --git a/Sources/mas/Models/OutdatedApp.swift b/Sources/mas/Models/OutdatedApp.swift
diff --git a/Sources/mas/Utilities/AsyncSequence.swift b/Sources/mas/Utilities/AsyncSequence.swift
diff --git a/Sources/mas/Utilities/Collection.swift b/Sources/mas/Utilities/Collection.swift
diff --git a/Sources/mas/Utilities/Sequence.swift b/Sources/mas/Utilities/Sequence.swift
diff --git a/Tests/MASTests/Models/MASTests+CatalogApp.swift b/Tests/MASTests/Models/MASTests+CatalogApp.swift
diff --git a/Tests/MASTests/Models/MASTests+CatalogAppResults.swift b/Tests/MASTests/Models/MASTests+CatalogAppResults.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.20.0 / markdownlint 0.40.0`
	`7`	`+# markdownlint-cli2 0.21.0 / markdownlint 0.40.0`
`8`	`8`	`#`
`9`	`9`	`---`
`10`	`10`	`gitignore: true`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ extension MAS {`
`26`	`26`	`await run(lookupAppFromAppID: lookup(appID:))`
`27`	`27`	`}`
`28`	`28`
`29`		`- private func run(lookupAppFromAppID: (AppID) async throws -> CatalogApp) async {`
	`29`	`+ private func run(lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp) async {`
`30`	`30`	`await run(catalogApps: await catalogAppIDsOptionGroup.appIDs.lookupCatalogApps(using: lookupAppFromAppID))`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ extension MAS {`
`27`	`27`	`await run(lookupAppFromAppID: lookup(appID:))`
`28`	`28`	`}`
`29`	`29`
`30`		`- private func run(lookupAppFromAppID: (AppID) async throws -> CatalogApp) async {`
	`30`	`+ private func run(lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp) async {`
`31`	`31`	`run(catalogApps: await catalogAppIDsOptionGroup.appIDs.lookupCatalogApps(using: lookupAppFromAppID))`
`32`	`32`	`}`
`33`	`33`