Merge pull request #1284 from rgoldberg/1283-dependencies-and-cleanup

rgoldberg · web-flow · commit cff9e0dd7966 · 2026-07-24T09:22:05.000-04:00
Update dependencies &amp; code cleanup
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -25,7 +25,7 @@ _ = Package(
 		.package(url: "https://github.com/apple/swift-collections", from: "1.6.0"),
 		.package(url: "https://github.com/attaswift/BigInt", from: "6.0.0"),
 		.package(url: "https://github.com/rarestype/swift-json", from: "3.5.0"),
-		.package(url: "https://github.com/scinfu/SwiftSoup", from: "2.13.6"),
+		.package(url: "https://github.com/scinfu/SwiftSoup", from: "2.13.7"),
 		.package(url: "https://github.com/swiftlang/swift-subprocess", from: "0.5.0"),
 	],
 	targets: [
diff --git a/Sources/mas/Commands/MAS.List.swift b/Sources/mas/Commands/MAS.List.swift
@@ -48,7 +48,7 @@ extension MAS {
 				return
 			}
 
-			outputFormatOptionGroup.info(installedApps.map(String.init(describing:)).joined(separator: "\n"))
+			outputFormatOptionGroup.info(installedApps.map(String.init).joined(separator: "\n"))
 		}
 	}
 }
diff --git a/Sources/mas/Commands/MAS.Lookup.swift b/Sources/mas/Commands/MAS.Lookup.swift
@@ -29,7 +29,7 @@ extension MAS {
 		}
 
 		func run(catalogApps: [CatalogApp]) {
-			outputFormatOptionGroup.info(catalogApps.map(String.init(describing:)).joined(separator: "\n"))
+			outputFormatOptionGroup.info(catalogApps.map(String.init).joined(separator: "\n"))
 		}
 	}
 }
diff --git a/Sources/mas/Commands/MAS.Search.swift b/Sources/mas/Commands/MAS.Search.swift
@@ -36,7 +36,7 @@ extension MAS {
 				throw MASError.noCatalogAppsFound(for: searchTermOptionGroup.searchTerm)
 			}
 
-			outputFormatOptionGroup.info(catalogApps.map(String.init(describing:)).joined(separator: "\n"))
+			outputFormatOptionGroup.info(catalogApps.map(String.init).joined(separator: "\n"))
 		}
 	}
 }
diff --git a/Sources/mas/Models/AppStoreAction.swift b/Sources/mas/Models/AppStoreAction.swift
@@ -47,7 +47,7 @@ enum AppStoreAction: String {
 	}
 
 	func apps(withADAMIDs adamIDs: [ADAMID], force: Bool) async {
-		let installedApps = await installedApps(withAppIDs: adamIDs.map(AppID.adamID(_:)), withFullJSON: false) { _ in }
+		let installedApps = await installedApps(withAppIDs: adamIDs.map(AppID.adamID), withFullJSON: false) { _ in }
 		await apps(
 			withADAMIDs: force
 				? adamIDs
diff --git a/Sources/mas/Models/CatalogApp.swift b/Sources/mas/Models/CatalogApp.swift
@@ -309,7 +309,7 @@ private func lookup(appID: AppID, in region: Region) async throws -> CatalogApp
 	{
 		try .init(object: catalogAppJSONObject)
 	} else {
-		try await catalogAppJSONObjects(from: lookupURL, in: region).first.flatMap(CatalogApp.init(macDesktopAppObject:))
+		try await catalogAppJSONObjects(from: lookupURL, in: region).first.flatMap(CatalogApp.init)
 			?? { throw MASError.unknownAppID(appID) }()
 	}
 }
@@ -321,8 +321,7 @@ func search(for term: String) async throws -> [CatalogApp] {
 private func search(for term: String, in region: Region) async throws -> [CatalogApp] {
 	let searchURL = Environment.current.searchURL.appending(queryItems: [.init(name: "term", value: term)])
 	async let macCatalogAppsTask =
-		catalogAppJSONObjects(from: searchURL.appending(queryItems: macAppsURLQueryItem), in: region)
-			.map(CatalogApp.init(object:))
+		catalogAppJSONObjects(from: searchURL.appending(queryItems: macAppsURLQueryItem), in: region).map(CatalogApp.init)
 	async let anyCatalogAppsTask = catalogAppJSONObjects(from: searchURL, in: region)
 	let macCatalogApps = try await macCatalogAppsTask
 	let adamIDSet = Set(macCatalogApps.map(\.adamID))
diff --git a/Sources/mas/Models/InstalledApp.swift b/Sources/mas/Models/InstalledApp.swift
@@ -349,7 +349,7 @@ private func unsortedInstalledApps(matching appIDs: [AppID], withFullJSON: Bool)
 						],
 				)
 			}
-			.map(InstalledApp.init(for:))
+			.map(InstalledApp.init)
 	}
 }
 
diff --git a/Sources/mas/Utilities/Output/Printer.swift b/Sources/mas/Utilities/Output/Printer.swift
@@ -119,7 +119,7 @@ struct Printer {
 		try? unsafe items.joined(separator: separator)
 			.appending(terminator)
 			.utf8
-			.withContiguousStorageIfAvailable(fileHandle.write(contentsOf:))
+			.withContiguousStorageIfAvailable(fileHandle.write)
 	}
 
 	private func print(
diff --git a/Sources/mas/Utilities/Resources/Environment.swift b/Sources/mas/Utilities/Resources/Environment.swift
@@ -21,9 +21,9 @@ struct Environment {
 
 	init(
 		dataFrom: @escaping @Sendable (URL) async throws -> (Data, URLResponse)
-			= URLSession(configuration: .ephemeral).data(from:),
-		lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp = lookup(appID:),
-		searchForAppsMatchingSearchTerm: @escaping @Sendable (String) async throws -> [CatalogApp] = search(for:),
+			= URLSession(configuration: .ephemeral).data,
+		lookupAppFromAppID: @escaping @Sendable (AppID) async throws -> CatalogApp = lookup,
+		searchForAppsMatchingSearchTerm: @escaping @Sendable (String) async throws -> [CatalogApp] = search,
 	) {
 		self.dataFrom = dataFrom
 		self.lookupAppFromAppID = lookupAppFromAppID
diff --git a/Sources/mas/Utilities/Versions/UniversalSemVer.swift b/Sources/mas/Utilities/Versions/UniversalSemVer.swift
@@ -50,7 +50,7 @@ private extension String {
 		locale: Locale? = nil,
 	) -> ComparisonResult {
 		let thatInteger = BigUInt(that)
-		return BigUInt(self).map { thatInteger.map($0.compare(to:)) ?? .orderedAscending }
+		return BigUInt(self).map { thatInteger.map($0.compare) ?? .orderedAscending }
 			?? thatInteger.map { _ in .orderedDescending }
 			?? compare(that, options: mask, range: range, locale: locale)
 	}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ extension MAS {`
`48`	`48`	`return`
`49`	`49`	`}`
`50`	`50`
`51`		`- outputFormatOptionGroup.info(installedApps.map(String.init(describing:)).joined(separator: "\n"))`
	`51`	`+ outputFormatOptionGroup.info(installedApps.map(String.init).joined(separator: "\n"))`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ extension MAS {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func run(catalogApps: [CatalogApp]) {`
`32`		`- outputFormatOptionGroup.info(catalogApps.map(String.init(describing:)).joined(separator: "\n"))`
	`32`	`+ outputFormatOptionGroup.info(catalogApps.map(String.init).joined(separator: "\n"))`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ extension MAS {`
`36`	`36`	`throw MASError.noCatalogAppsFound(for: searchTermOptionGroup.searchTerm)`
`37`	`37`	`}`
`38`	`38`
`39`		`- outputFormatOptionGroup.info(catalogApps.map(String.init(describing:)).joined(separator: "\n"))`
	`39`	`+ outputFormatOptionGroup.info(catalogApps.map(String.init).joined(separator: "\n"))`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ enum AppStoreAction: String {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func apps(withADAMIDs adamIDs: [ADAMID], force: Bool) async {`
`50`		`- let installedApps = await installedApps(withAppIDs: adamIDs.map(AppID.adamID(_:)), withFullJSON: false) { _ in }`
	`50`	`+ let installedApps = await installedApps(withAppIDs: adamIDs.map(AppID.adamID), withFullJSON: false) { _ in }`
`51`	`51`	`await apps(`
`52`	`52`	`withADAMIDs: force`
`53`	`53`	`? adamIDs`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ private func lookup(appID: AppID, in region: Region) async throws -> CatalogApp`
`309`	`309`	`{`
`310`	`310`	`try .init(object: catalogAppJSONObject)`
`311`	`311`	`} else {`
`312`		`- try await catalogAppJSONObjects(from: lookupURL, in: region).first.flatMap(CatalogApp.init(macDesktopAppObject:))`
	`312`	`+ try await catalogAppJSONObjects(from: lookupURL, in: region).first.flatMap(CatalogApp.init)`
`313`	`313`	`?? { throw MASError.unknownAppID(appID) }()`
`314`	`314`	`}`
`315`	`315`	`}`
`@@ -321,8 +321,7 @@ func search(for term: String) async throws -> [CatalogApp] {`
`321`	`321`	`private func search(for term: String, in region: Region) async throws -> [CatalogApp] {`
`322`	`322`	`let searchURL = Environment.current.searchURL.appending(queryItems: [.init(name: "term", value: term)])`
`323`	`323`	`async let macCatalogAppsTask =`
`324`		`- catalogAppJSONObjects(from: searchURL.appending(queryItems: macAppsURLQueryItem), in: region)`
`325`		`- .map(CatalogApp.init(object:))`
	`324`	`+ catalogAppJSONObjects(from: searchURL.appending(queryItems: macAppsURLQueryItem), in: region).map(CatalogApp.init)`
`326`	`325`	`async let anyCatalogAppsTask = catalogAppJSONObjects(from: searchURL, in: region)`
`327`	`326`	`let macCatalogApps = try await macCatalogAppsTask`
`328`	`327`	`let adamIDSet = Set(macCatalogApps.map(\.adamID))`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ private func unsortedInstalledApps(matching appIDs: [AppID], withFullJSON: Bool)`
`349`	`349`	`],`
`350`	`350`	`)`
`351`	`351`	`}`
`352`		`- .map(InstalledApp.init(for:))`
	`352`	`+ .map(InstalledApp.init)`
`353`	`353`	`}`
`354`	`354`	`}`
`355`	`355`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ struct Printer {`
`119`	`119`	`try? unsafe items.joined(separator: separator)`
`120`	`120`	`.appending(terminator)`
`121`	`121`	`.utf8`
`122`		`- .withContiguousStorageIfAvailable(fileHandle.write(contentsOf:))`
	`122`	`+ .withContiguousStorageIfAvailable(fileHandle.write)`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`private func print(`