Hide CLI commands API with package access control

Sources/Basics/ProgressAnimation/NinjaProgressAnimation.swift

@@ -15,8 +15,7 @@ import protocol TSCBasic.WritableByteStream
 
 extension ProgressAnimation {
     /// A ninja-like progress animation that adapts to the provided output stream.
-    @_spi(SwiftPMInternal)
-    public static func ninja(
+    package static func ninja(
         stream: WritableByteStream,
         verbose: Bool
     ) -> any ProgressAnimationProtocol {

Sources/Basics/ProgressAnimation/PercentProgressAnimation.swift

@@ -15,8 +15,7 @@ import protocol TSCBasic.WritableByteStream
 
 extension ProgressAnimation {
     /// A percent-based progress animation that adapts to the provided output stream.
-    @_spi(SwiftPMInternal)
-    public static func percent(
+    package static func percent(
         stream: WritableByteStream,
         verbose: Bool,
         header: String

Sources/Basics/ProgressAnimation/ProgressAnimationProtocol.swift

@@ -15,12 +15,10 @@ import class TSCBasic.LocalFileOutputByteStream
 import protocol TSCBasic.WritableByteStream
 import protocol TSCUtility.ProgressAnimationProtocol
 
-@_spi(SwiftPMInternal)
-public typealias ProgressAnimationProtocol = TSCUtility.ProgressAnimationProtocol
+package typealias ProgressAnimationProtocol = TSCUtility.ProgressAnimationProtocol
 
 /// Namespace to nest public progress animations under.
-@_spi(SwiftPMInternal)
-public enum ProgressAnimation {
+package enum ProgressAnimation {
     /// Dynamically create a progress animation based on the current stream
     /// capabilities and desired verbosity.
     ///

Sources/Basics/ProgressAnimation/ThrottledProgressAnimation.swift

@@ -56,27 +56,23 @@ final class ThrottledProgressAnimation: ProgressAnimationProtocol {
     }
 }
 
-@_spi(SwiftPMInternal)
 extension ProgressAnimationProtocol {
-    @_spi(SwiftPMInternal)
-    public func throttled<C: Clock>(
+    package func throttled<C: Clock>(
         now: @escaping () -> C.Instant,
         interval: C.Duration,
         clock: C.Type = C.self
     ) -> some ProgressAnimationProtocol {
         ThrottledProgressAnimation(self, now: now, interval: interval, clock: clock)
     }
 
-    @_spi(SwiftPMInternal)
-    public func throttled<C: Clock>(
+    package func throttled<C: Clock>(
         clock: C,
         interval: C.Duration
     ) -> some ProgressAnimationProtocol {
         self.throttled(now: { clock.now }, interval: interval, clock: C.self)
     }
 
-    @_spi(SwiftPMInternal)
-    public func throttled(
+    package func throttled(
         interval: ContinuousClock.Duration
     )  -> some ProgressAnimationProtocol  {
         self.throttled(clock: ContinuousClock(), interval: interval)

Sources/Build/BuildDescription/ProductBuildDescription.swift

@@ -13,7 +13,6 @@
 import Basics
 import PackageGraph
 
-@_spi(SwiftPMInternal)
 import PackageModel
 
 import OrderedCollections

Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

@@ -17,7 +17,6 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 #if USE_IMPL_ONLY_IMPORTS

Sources/Build/BuildOperation.swift

@@ -10,18 +10,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_spi(SwiftPMInternal)
 import Basics
 
-@_spi(SwiftPMInternal)
 import Build
 
 import LLBuildManifest
 import PackageGraph
 import PackageLoading
 import PackageModel
 
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 import SPMLLBuild
@@ -43,8 +40,7 @@ import DriverSupport
 import SwiftDriver
 #endif
 
-@_spi(SwiftPMInternal)
-public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildSystem, BuildErrorAdviceProvider {
+package final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildSystem, BuildErrorAdviceProvider {
     /// The delegate used by the build system.
     public weak var delegate: SPMBuildCore.BuildSystemDelegate?
 

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

@@ -10,14 +10,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_spi(SwiftPMInternal)
 import Basics
 import Dispatch
 import Foundation
 import LLBuildManifest
 import PackageModel
 
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 import SPMLLBuild

Sources/Build/BuildPlan/BuildPlan+Product.swift

@@ -18,7 +18,6 @@ import struct PackageGraph.ResolvedTarget
 import class PackageModel.BinaryTarget
 import class PackageModel.ClangTarget
 
-@_spi(SwiftPMInternal)
 import class PackageModel.Target
 
 import class PackageModel.SwiftTarget

Sources/Build/BuildPlan/BuildPlan.swift

@@ -225,8 +225,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
     /// source files as well as directories to which any changes should cause us to reevaluate the build plan.
     public let prebuildCommandResults: [ResolvedTarget.ID: [PrebuildCommandResult]]
 
-    @_spi(SwiftPMInternal)
-    public private(set) var derivedTestTargetsMap: [ResolvedProduct.ID: [ResolvedTarget]] = [:]
+    package private(set) var derivedTestTargetsMap: [ResolvedProduct.ID: [ResolvedTarget]] = [:]
 
     /// Cache for pkgConfig flags.
     private var pkgConfigCache = [SystemLibraryTarget: (cFlags: [String], libs: [String])]()

Sources/Commands/CommandWorkspaceDelegate.swift

@@ -12,7 +12,6 @@
 
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import Dispatch
@@ -215,22 +214,22 @@ final class CommandWorkspaceDelegate: WorkspaceDelegate {
         }
     }
 
-    public func willUpdateDependencies() {
+    package func willUpdateDependencies() {
         self.observabilityScope.emit(debug: "Updating dependencies")
         os_signpost(.begin, name: SignpostName.updatingDependencies)
     }
 
-    public func didUpdateDependencies(duration: DispatchTimeInterval) {
+    package func didUpdateDependencies(duration: DispatchTimeInterval) {
         self.observabilityScope.emit(debug: "Dependencies updated in (\(duration.descriptionInSeconds))")
         os_signpost(.end, name: SignpostName.updatingDependencies)
     }
 
-    public func willResolveDependencies() {
+    package func willResolveDependencies() {
         self.observabilityScope.emit(debug: "Resolving dependencies")
         os_signpost(.begin, name: SignpostName.resolvingDependencies)
     }
 
-    public func didResolveDependencies(duration: DispatchTimeInterval) {
+    package func didResolveDependencies(duration: DispatchTimeInterval) {
         self.observabilityScope.emit(debug: "Dependencies resolved in (\(duration.descriptionInSeconds))")
         os_signpost(.end, name: SignpostName.resolvingDependencies)
     }
@@ -267,7 +266,7 @@ final class CommandWorkspaceDelegate: WorkspaceDelegate {
     func willLoadManifest(packageIdentity: PackageIdentity, packagePath: AbsolutePath, url: String, version: Version?, packageKind: PackageReference.Kind) {}
 }
 
-public extension _SwiftCommand {
+package extension _SwiftCommand {
     var workspaceDelegateProvider: WorkspaceDelegateProvider {
         return {
             CommandWorkspaceDelegate(

Sources/Commands/PackageCommands/APIDiff.swift

@@ -13,15 +13,13 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import Dispatch
 import PackageGraph
 import PackageModel
 import SourceControl
 
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 struct DeprecatedAPIDiff: ParsableCommand {

Sources/Commands/PackageCommands/ArchiveSource.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import SourceControl
@@ -62,7 +61,7 @@ extension SwiftPackageCommand {
         }
     }
 
-    public static func archiveSource(
+    package static func archiveSource(
         at packageDirectory: AbsolutePath,
         to archivePath: AbsolutePath,
         fileSystem: FileSystem,

Sources/Commands/PackageCommands/CompletionCommand.swift

@@ -12,7 +12,6 @@
 
 import ArgumentParser
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import var TSCBasic.stdoutStream

Sources/Commands/PackageCommands/ComputeChecksum.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import Workspace

Sources/Commands/PackageCommands/Config.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import Workspace

Sources/Commands/PackageCommands/Describe.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import Foundation

Sources/Commands/PackageCommands/DumpCommands.swift

@@ -13,13 +13,11 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import Foundation
 import PackageModel
 
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 import XCBuildSupport

Sources/Commands/PackageCommands/EditCommands.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import SourceControl

Sources/Commands/PackageCommands/Format.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import PackageModel

Sources/Commands/PackageCommands/Init.swift

@@ -13,15 +13,14 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import Workspace
 import SPMBuildCore
 
 extension SwiftPackageCommand {
     struct Init: SwiftCommand {
-        public static let configuration = CommandConfiguration(
+        package static let configuration = CommandConfiguration(
             abstract: "Initialize a new package")
 
         @OptionGroup(visibility: .hidden)

Sources/Commands/PackageCommands/InstalledPackages.swift

@@ -12,13 +12,11 @@
 
 import ArgumentParser
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import Foundation
 import PackageModel
 
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 import TSCBasic

Sources/Commands/PackageCommands/Learn.swift

@@ -13,7 +13,6 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import PackageGraph

Sources/Commands/PackageCommands/PluginCommand.swift

@@ -13,10 +13,8 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
-@_spi(SwiftPMInternal)
 import SPMBuildCore
 
 import Dispatch

Sources/Commands/PackageCommands/ResetCommands.swift

@@ -12,7 +12,6 @@
 
 import ArgumentParser
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 extension SwiftPackageCommand {

Sources/Commands/PackageCommands/Resolve.swift

@@ -12,7 +12,6 @@
 
 import ArgumentParser
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import TSCUtility

Sources/Commands/PackageCommands/ShowDependencies.swift

@@ -14,7 +14,6 @@
 import ArgumentParser
 import Basics
 
-@_spi(SwiftPMInternal)
 import CoreCommands
 
 import PackageGraph
@@ -69,7 +68,7 @@ extension SwiftPackageCommand {
         enum ShowDependenciesMode: String, RawRepresentable, CustomStringConvertible, ExpressibleByArgument {
             case text, dot, json, flatlist
 
-            public init?(rawValue: String) {
+            package init?(rawValue: String) {
                 switch rawValue.lowercased() {
                 case "text":
                     self = .text
@@ -84,7 +83,7 @@ extension SwiftPackageCommand {
                 }
             }
 
-            public var description: String {
+            package var description: String {
                 switch self {
                 case .text: return "text"
                 case .dot: return "dot"