mas-cli · rgoldberg · May 6, 2025 · May 6, 2025 · May 6, 2025
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -42,8 +42,6 @@ number_separator:
   minimum_length: 6
 opening_brace:
   ignore_multiline_statement_conditions: true
-sorted_imports:
-  grouping: attributes
 type_contents_order:
   order:
   - case

diff --git a/Package.swift b/Package.swift
@@ -1,6 +1,6 @@
 // swift-tools-version:5.9
 
-import PackageDescription
+internal import PackageDescription
 
 let package = Package(
 	name: "mas",

diff --git a/Sources/mas/AppStore/Downloader.swift b/Sources/mas/AppStore/Downloader.swift
@@ -6,7 +6,7 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import CommerceKit
+private import CommerceKit
 
 /// Sequentially downloads apps, printing progress to the console.
 ///

diff --git a/Sources/mas/AppStore/ISORegion.swift b/Sources/mas/AppStore/ISORegion.swift
@@ -6,8 +6,8 @@
 // Copyright © 2024 mas-cli. All rights reserved.
 //
 
-import IsoCountryCodes
-import StoreKit
+private import IsoCountryCodes
+private import StoreKit
 
 // periphery:ignore
 protocol ISORegion {

diff --git a/Sources/mas/AppStore/ISStoreAccount.swift b/Sources/mas/AppStore/ISStoreAccount.swift
@@ -6,7 +6,7 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import CommerceKit
+internal import CommerceKit
 
 extension ISStoreAccount: @unchecked Sendable {
 	@MainActor // swiftlint:disable:next attributes

diff --git a/Sources/mas/AppStore/PurchaseDownloadObserver.swift b/Sources/mas/AppStore/PurchaseDownloadObserver.swift
@@ -6,7 +6,7 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import CommerceKit
+internal import CommerceKit
 
 private let downloadingPhaseType = 0 as Int64
 private let installingPhaseType = 1 as Int64

diff --git a/Sources/mas/AppStore/SSPurchase.swift b/Sources/mas/AppStore/SSPurchase.swift
@@ -6,7 +6,7 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import CommerceKit
+private import CommerceKit
 
 extension SSPurchase {
 	convenience init(appID: AppID, purchasing: Bool) async {

diff --git a/Sources/mas/Commands/Account.swift b/Sources/mas/Commands/Account.swift
@@ -6,8 +6,8 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
-import StoreFoundation
+internal import ArgumentParser
+private import StoreFoundation
 
 extension MAS {
 	struct Account: AsyncParsableCommand {

diff --git a/Sources/mas/Commands/Config.swift b/Sources/mas/Commands/Config.swift
@@ -6,8 +6,8 @@
 // Copyright © 2025 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
-import Foundation
+internal import ArgumentParser
+private import Foundation
 
 private let unknown = "unknown"
 

diff --git a/Sources/mas/Commands/Home.swift b/Sources/mas/Commands/Home.swift
@@ -6,8 +6,8 @@
 // Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
-import Foundation
+internal import ArgumentParser
+private import Foundation
 
 extension MAS {
 	/// Opens app page on MAS Preview. Uses the iTunes Lookup API:

diff --git a/Sources/mas/Commands/Info.swift b/Sources/mas/Commands/Info.swift
@@ -6,7 +6,7 @@
 // Copyright © 2016 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
+internal import ArgumentParser
 
 extension MAS {
 	/// Displays app details. Uses the iTunes Lookup API:

diff --git a/Sources/mas/Commands/Install.swift b/Sources/mas/Commands/Install.swift
@@ -6,8 +6,8 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
-import Foundation
+internal import ArgumentParser
+private import Foundation
 
 extension MAS {
 	/// Installs previously purchased apps from the Mac App Store.

diff --git a/Sources/mas/Commands/List.swift b/Sources/mas/Commands/List.swift
@@ -6,7 +6,7 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
+internal import ArgumentParser
 
 extension MAS {
 	/// Command which lists all installed apps.

diff --git a/Sources/mas/Commands/Lucky.swift b/Sources/mas/Commands/Lucky.swift
@@ -6,8 +6,8 @@
 // Copyright © 2017 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
-import Foundation
+internal import ArgumentParser
+private import Foundation
 
 extension MAS {
 	/// Command which installs the first search result.

diff --git a/Sources/mas/Commands/Open.swift b/Sources/mas/Commands/Open.swift
@@ -6,8 +6,8 @@
 // Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import AppKit
-import ArgumentParser
+private import AppKit
+internal import ArgumentParser
 
 private let masScheme = "macappstore"
 

diff --git a/Sources/mas/Commands/Outdated.swift b/Sources/mas/Commands/Outdated.swift
@@ -6,7 +6,7 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
+internal import ArgumentParser
 
 extension MAS {
 	/// Command which displays a list of installed apps which have available updates

diff --git a/Sources/mas/Commands/Purchase.swift b/Sources/mas/Commands/Purchase.swift
@@ -6,8 +6,8 @@
 // Copyright © 2017 Jakob Rieck. All rights reserved.
 //
 
-import ArgumentParser
-import Foundation
+internal import ArgumentParser
+private import Foundation
 
 extension MAS {
 	struct Purchase: AsyncParsableCommand {

diff --git a/Sources/mas/Commands/Region.swift b/Sources/mas/Commands/Region.swift
@@ -6,7 +6,7 @@
 // Copyright © 2024 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
+internal import ArgumentParser
 
 extension MAS {
 	/// Command which interacts with the current region for the Mac App Store.

diff --git a/Sources/mas/Commands/Reset.swift b/Sources/mas/Commands/Reset.swift
@@ -6,8 +6,8 @@
 // Copyright © 2016 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
-import CommerceKit
+internal import ArgumentParser
+private import CommerceKit
 
 extension MAS {
 	/// Kills several macOS processes as a means to reset the app store.

diff --git a/Sources/mas/Commands/Search.swift b/Sources/mas/Commands/Search.swift
@@ -6,7 +6,7 @@
 // Copyright © 2016 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
+internal import ArgumentParser
 
 extension MAS {
 	/// Search the Mac App Store. Uses the iTunes Search API:

diff --git a/Sources/mas/Commands/SignIn.swift b/Sources/mas/Commands/SignIn.swift
@@ -6,7 +6,7 @@
 // Copyright © 2016 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
+internal import ArgumentParser
 
 extension MAS {
 	struct SignIn: ParsableCommand {
@@ -17,7 +17,6 @@ extension MAS {
 
 		@Flag(help: "Provide password via graphical dialog")
 		var dialog = false
-		// periphery:ignore
 		@Argument(help: "Apple Account")
 		var appleAccount: String
 		@Argument(help: "Password")

diff --git a/Sources/mas/Commands/SignOut.swift b/Sources/mas/Commands/SignOut.swift
@@ -6,8 +6,8 @@
 // Copyright © 2016 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
-import CommerceKit
+internal import ArgumentParser
+private import CommerceKit
 
 extension MAS {
 	struct SignOut: ParsableCommand {

diff --git a/Sources/mas/Commands/Uninstall.swift b/Sources/mas/Commands/Uninstall.swift
@@ -6,8 +6,8 @@
 // Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
-import ScriptingBridge
+internal import ArgumentParser
+private import ScriptingBridge
 
 extension MAS {
 	/// Command which uninstalls apps managed by the Mac App Store.

diff --git a/Sources/mas/Commands/Upgrade.swift b/Sources/mas/Commands/Upgrade.swift
@@ -6,8 +6,8 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
-import Foundation
+internal import ArgumentParser
+private import Foundation
 
 extension MAS {
 	/// Command which upgrades apps with new versions available in the Mac App Store.

diff --git a/Sources/mas/Commands/Vendor.swift b/Sources/mas/Commands/Vendor.swift
@@ -6,8 +6,8 @@
 // Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
-import Foundation
+internal import ArgumentParser
+private import Foundation
 
 extension MAS {
 	/// Opens vendor's app page in a browser. Uses the iTunes Lookup API:

diff --git a/Sources/mas/Commands/Version.swift b/Sources/mas/Commands/Version.swift
@@ -6,7 +6,7 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import ArgumentParser
+internal import ArgumentParser
 
 extension MAS {
 	/// Command which displays the version of the mas tool.

diff --git a/Sources/mas/Controllers/ITunesSearchAppStoreSearcher.swift b/Sources/mas/Controllers/ITunesSearchAppStoreSearcher.swift
@@ -6,7 +6,7 @@
 // Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import Foundation
+private import Foundation
 
 /// Manages searching the MAS catalog. Uses the iTunes Search and Lookup APIs:
 /// https://performance-partners.apple.com/search-api

diff --git a/Sources/mas/Controllers/SpotlightInstalledApps.swift b/Sources/mas/Controllers/SpotlightInstalledApps.swift
@@ -6,7 +6,7 @@
 // Copyright © 2025 mas-cli. All rights reserved.
 //
 
-import Foundation
+private import Foundation
 
 @MainActor // swiftlint:disable:next attributes
 var installedApps: [InstalledApp] {

diff --git a/Sources/mas/Errors/MASError.swift b/Sources/mas/Errors/MASError.swift
@@ -6,7 +6,7 @@
 // Copyright © 2015 Andrew Naylor. All rights reserved.
 //
 
-import Foundation
+internal import Foundation
 
 enum MASError: Error, Equatable {
 	case notSupported

diff --git a/Sources/mas/Formatters/AppInfoFormatter.swift b/Sources/mas/Formatters/AppInfoFormatter.swift
@@ -6,7 +6,7 @@
 // Copyright © 2019 mas-cli. All rights reserved.
 //
 
-import Foundation
+private import Foundation
 
 /// Formats text output for the info command.
 enum AppInfoFormatter {

diff --git a/Sources/mas/Formatters/Printing.swift b/Sources/mas/Formatters/Printing.swift
@@ -6,7 +6,7 @@
 // Copyright © 2016 Andrew Naylor. All rights reserved.
 //
 
-import Foundation
+internal import Foundation
 
 // A collection of output formatting helpers
 

diff --git a/Sources/mas/MAS.swift b/Sources/mas/MAS.swift
@@ -6,7 +6,7 @@
 // Copyright © 2021 mas-cli. All rights reserved.
 //
 
-import ArgumentParser
+internal import ArgumentParser
 
 @main
 struct MAS: AsyncParsableCommand {

diff --git a/Sources/mas/Models/InstalledApp.swift b/Sources/mas/Models/InstalledApp.swift
@@ -6,13 +6,12 @@
 // Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import Foundation
-import Version
+private import Foundation
+private import Version
 
 struct InstalledApp: Sendable {
 	let id: AppID
 	let name: String
-	// periphery:ignore
 	let bundleID: String
 	let path: String
 	let version: String

diff --git a/Sources/mas/Network/NetworkSession.swift b/Sources/mas/Network/NetworkSession.swift
@@ -6,7 +6,7 @@
 // Copyright © 2019 mas-cli. All rights reserved.
 //
 
-import Foundation
+internal import Foundation
 
 protocol NetworkSession {
 	func data(from url: URL) async throws -> (Data, URLResponse)

diff --git a/Sources/mas/Network/URL.swift b/Sources/mas/Network/URL.swift
@@ -6,7 +6,7 @@
 // Copyright © 2024 mas-cli. All rights reserved.
 //
 
-import AppKit
+private import AppKit
 
 extension URL {
 	func open() async throws {

diff --git a/Sources/mas/Network/URLSession+NetworkSession.swift b/Sources/mas/Network/URLSession+NetworkSession.swift
@@ -6,6 +6,6 @@
 // Copyright © 2019 mas-cli. All rights reserved.
 //
 
-import Foundation
+private import Foundation
 
 extension URLSession: NetworkSession {}