PackageRegistryCommand: make some of the private API more public

This extends the visibility of some of the private implementation to the
package level to allow use for testing without `@testable` imports.

Author: compnerd

Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift

@@ -97,9 +97,9 @@ private func readpassword(_ prompt: String) throws -> String {
 #endif
 
 extension PackageRegistryCommand {
-    struct Login: AsyncSwiftCommand {
+    package struct Login: AsyncSwiftCommand {
 
-        static func loginURL(from registryURL: URL, loginAPIPath: String?) throws -> URL {
+        package static func loginURL(from registryURL: URL, loginAPIPath: String?) throws -> URL {
             // Login URL must be HTTPS
             var loginURLComponents = URLComponents(url: registryURL, resolvingAgainstBaseURL: true)
             loginURLComponents?.scheme = "https"
@@ -112,7 +112,7 @@ extension PackageRegistryCommand {
             return loginURL
         }
 
-        static let configuration = CommandConfiguration(
+        package static let configuration = CommandConfiguration(
             abstract: "Log in to a registry."
         )
 
@@ -123,7 +123,7 @@ extension PackageRegistryCommand {
         static let passwordBufferSize = Self.maxPasswordLength + 2
 
         @OptionGroup(visibility: .hidden)
-        var globalOptions: GlobalOptions
+        package var globalOptions: GlobalOptions
 
         @Argument(help: "The registry URL.")
         var url: URL?
@@ -152,7 +152,9 @@ extension PackageRegistryCommand {
 
         private static let PLACEHOLDER_TOKEN_USER = "token"
 
-        func run(_ swiftCommandState: SwiftCommandState) async throws {
+        package init() {}
+
+        package func run(_ swiftCommandState: SwiftCommandState) async throws {
             // We need to be able to read/write credentials
             // Make sure credentials store is available before proceeding
             let authorizationProvider: AuthorizationProvider?

Sources/PackageRegistryCommand/PackageRegistryCommand+Publish.swift

@@ -34,15 +34,15 @@ import struct TSCBasic.SHA256
 import struct TSCUtility.Version
 
 extension PackageRegistryCommand {
-    struct Publish: AsyncSwiftCommand {
-        static let metadataFilename = "package-metadata.json"
+    package struct Publish: AsyncSwiftCommand {
+        package static let metadataFilename = "package-metadata.json"
 
-        static let configuration = CommandConfiguration(
+        package static let configuration = CommandConfiguration(
             abstract: "Publish to a registry."
         )
 
         @OptionGroup(visibility: .hidden)
-        var globalOptions: GlobalOptions
+        package var globalOptions: GlobalOptions
 
         @Argument(help: .init("The package identifier.", valueName: "package-id"))
         var packageIdentity: PackageIdentity
@@ -89,7 +89,9 @@ extension PackageRegistryCommand {
         @Flag(help: "Dry run only; prepare the archive and sign it but do not publish to the registry.")
         var dryRun: Bool = false
 
-        func run(_ swiftCommandState: SwiftCommandState) async throws {
+        package init() {}
+
+        package func run(_ swiftCommandState: SwiftCommandState) async throws {
             // Require both local and user-level registries config
             let configuration = try getRegistriesConfig(swiftCommandState, global: false).configuration
 
@@ -460,8 +462,8 @@ enum PackageArchiveSigner {
     }
 }
 
-enum PackageArchiver {
-    static func archive(
+package enum PackageArchiver {
+    package static func archive(
         packageIdentity: PackageIdentity,
         packageVersion: Version,
         packageDirectory: AbsolutePath,

Sources/PackageRegistryCommand/PackageRegistryCommand.swift

@@ -166,7 +166,7 @@ public struct PackageRegistryCommand: AsyncParsableCommand {
 }
 
 extension URL {
-    func validateRegistryURL(allowHTTP: Bool = false) throws {
+    package func validateRegistryURL(allowHTTP: Bool = false) throws {
         guard self.scheme == "https" || (self.scheme == "http" && allowHTTP) else {
             throw PackageRegistryCommand.ValidationError.invalidURL(self)
         }