Expose architecture filters in CLI lists

Uses shared XcodesKit filtering support adapted from #470 by wmehanna.

Author: MattKiazyk

Sources/XcodesKit/RuntimeInstaller.swift

@@ -16,7 +16,7 @@ public final class RuntimeInstaller: Sendable {
         self.sessionService = sessionService
     }
 
-    public func printAvailableRuntimes(includeBetas: Bool) async throws {
+    public func printAvailableRuntimes(includeBetas: Bool, architectures: [Architecture] = []) async throws {
         let presentationService = RuntimeListPresentationService()
         let downloadableRuntimeList = try await runtimeList.updateDownloadableRuntimeList()
         let installedRuntimes = try await runtimeList.installedRuntimes()
@@ -25,7 +25,8 @@ public final class RuntimeInstaller: Sendable {
             downloadableRuntimes: downloadableRuntimeList.runtimes,
             installedRuntimes: installedRuntimes,
             includeBetas: includeBetas,
-            sdkToSeedMappings: downloadableRuntimeList.sdkToSeedMappings
+            sdkToSeedMappings: downloadableRuntimeList.sdkToSeedMappings,
+            architectures: architectures
         ) {
             Current.logging.log("-- \(platform.shortName) --")
             runtimes.forEach { Current.logging.log(presentationService.line(for: $0)) }

Sources/XcodesKit/XcodeInstaller.swift

@@ -491,21 +491,22 @@ public final class XcodeInstaller: Sendable {
         return try await xcodeList.updateAvailableXcodes(dataSource: dataSource)
     }
 
-    public func updateAndPrint(dataSource: DataSource, directory: Path) async throws {
+    public func updateAndPrint(dataSource: DataSource, directory: Path, architectures: [Architecture] = []) async throws {
         let xcodes = try await update(dataSource: dataSource)
-        try await printAvailableXcodes(xcodes, installed: Current.files.installedXcodes(directory), dataSource: dataSource)
+        try await printAvailableXcodes(xcodes, installed: Current.files.installedXcodes(directory), dataSource: dataSource, architectures: architectures)
         Current.shell.exit(0)
     }
 
-    public func printAvailableXcodes(_ xcodes: [Xcode], installed installedXcodes: [InstalledXcode], dataSource: DataSource = .xcodeReleases) async throws {
+    public func printAvailableXcodes(_ xcodes: [Xcode], installed installedXcodes: [InstalledXcode], dataSource: DataSource = .xcodeReleases, architectures: [Architecture] = []) async throws {
         let output = try await Current.shell.xcodeSelectPrintPath()
 
         XcodeListPresentationService()
             .availableRows(
                 availableXcodes: xcodes,
                 installedXcodes: installedXcodes,
                 selectedXcodePath: output.out,
-                dataSource: dataSource
+                dataSource: dataSource,
+                architectures: architectures
             )
             .forEach { row in
                 var output = row.versionDescription

Sources/xcodes/App.swift

@@ -55,6 +55,8 @@ struct GlobalColorOption: ParsableArguments {
     var color: Bool = true
 }
 
+extension Architecture: @retroactive ExpressibleByArgument {}
+
 @main
 struct Xcodes: AsyncParsableCommand {
     static let configuration = CommandConfiguration(
@@ -361,6 +363,9 @@ struct Xcodes: AsyncParsableCommand {
             abstract: "List all versions of Xcode that are available to install"
         )
 
+        @Option(help: "Only list Xcodes that support the specified architecture: arm64 or x86_64. Can be used multiple times.")
+        var architecture: [Architecture] = []
+
         @OptionGroup
         var globalDirectory: GlobalDirectoryOption
 
@@ -378,10 +383,10 @@ struct Xcodes: AsyncParsableCommand {
 
             do {
                 if services.xcodeList.shouldUpdateBeforeListingVersions {
-                    try await services.xcodeInstaller.updateAndPrint(dataSource: globalDataSource.dataSource, directory: directory)
+                    try await services.xcodeInstaller.updateAndPrint(dataSource: globalDataSource.dataSource, directory: directory, architectures: architecture)
                 }
                 else {
-                    try await services.xcodeInstaller.printAvailableXcodes(services.xcodeList.availableXcodes, installed: Current.files.installedXcodes(directory))
+                    try await services.xcodeInstaller.printAvailableXcodes(services.xcodeList.availableXcodes, installed: Current.files.installedXcodes(directory), architectures: architecture)
                 }
                 List.exit()
             } catch {
@@ -399,9 +404,12 @@ struct Xcodes: AsyncParsableCommand {
         @Flag(help: "Include beta runtimes available to install")
         var includeBetas: Bool = false
 
+        @Option(help: "Only list runtimes that support the specified architecture: arm64 or x86_64. Can be used multiple times.")
+        var architecture: [Architecture] = []
+
         func run() async throws {
             let services = Xcodes.makeServices()
-            try await services.runtimeInstaller.printAvailableRuntimes(includeBetas: includeBetas)
+            try await services.runtimeInstaller.printAvailableRuntimes(includeBetas: includeBetas, architectures: architecture)
         }
 
         struct Install: AsyncParsableCommand {