Treat package path as authoritative for package init

Author: neonichu

Sources/Commands/PackageTools/Init.swift

@@ -54,6 +54,10 @@ extension SwiftPackageTool {
         @Option(name: .customLong("name"), help: "Provide custom package name")
         var packageName: String?
 
+        var packagePathIsAuthoritative: Bool {
+            return true
+        }
+
         func run(_ swiftTool: SwiftTool) throws {
             guard let cwd = swiftTool.fileSystem.currentWorkingDirectory else {
                 throw InternalError("Could not find the current working directory")

Sources/CoreCommands/SwiftTool.swift

@@ -81,21 +81,23 @@ public typealias WorkspaceLoaderProvider = (_ fileSystem: FileSystem, _ observab
     -> WorkspaceLoader
 
 public protocol _SwiftCommand {
+    var globalOptions: GlobalOptions { get }
+    // Most commands will search upwards from package path until they find a package manifest. Commands which set this to true will instead stick to the defined package path.
+    var packagePathIsAuthoritative: Bool { get }
     var toolWorkspaceConfiguration: ToolWorkspaceConfiguration { get }
     var workspaceDelegateProvider: WorkspaceDelegateProvider { get }
     var workspaceLoaderProvider: WorkspaceLoaderProvider { get }
     func buildSystemProvider(_ swiftTool: SwiftTool) throws -> BuildSystemProvider
 }
 
 extension _SwiftCommand {
+    public var packagePathIsAuthoritative: Bool { false }
     public var toolWorkspaceConfiguration: ToolWorkspaceConfiguration {
         return .init()
     }
 }
 
 public protocol SwiftCommand: ParsableCommand, _SwiftCommand {
-    var globalOptions: GlobalOptions { get }
-
     func run(_ swiftTool: SwiftTool) throws
 }
 
@@ -115,6 +117,7 @@ extension SwiftCommand {
     public func run() throws {
         let swiftTool = try SwiftTool(
             options: globalOptions,
+            packagePathIsAuthoritative: self.packagePathIsAuthoritative,
             toolWorkspaceConfiguration: self.toolWorkspaceConfiguration,
             workspaceDelegateProvider: self.workspaceDelegateProvider,
             workspaceLoaderProvider: self.workspaceLoaderProvider
@@ -153,8 +156,6 @@ extension SwiftCommand {
 }
 
 public protocol AsyncSwiftCommand: AsyncParsableCommand, _SwiftCommand {
-    var globalOptions: GlobalOptions { get }
-
     func run(_ swiftTool: SwiftTool) async throws
 }
 
@@ -164,6 +165,7 @@ extension AsyncSwiftCommand {
     public func run() async throws {
         let swiftTool = try SwiftTool(
             options: globalOptions,
+            packagePathIsAuthoritative: self.packagePathIsAuthoritative,
             toolWorkspaceConfiguration: self.toolWorkspaceConfiguration,
             workspaceDelegateProvider: self.workspaceDelegateProvider,
             workspaceLoaderProvider: self.workspaceLoaderProvider
@@ -283,6 +285,7 @@ public final class SwiftTool {
     /// - parameter options: The command line options to be passed to this tool.
     public convenience init(
         options: GlobalOptions,
+        packagePathIsAuthoritative: Bool,
         toolWorkspaceConfiguration: ToolWorkspaceConfiguration = .init(),
         workspaceDelegateProvider: @escaping WorkspaceDelegateProvider,
         workspaceLoaderProvider: @escaping WorkspaceLoaderProvider
@@ -295,6 +298,7 @@ public final class SwiftTool {
         try self.init(
             outputStream: TSCBasic.stderrStream,
             options: options,
+            packagePathIsAuthoritative: packagePathIsAuthoritative,
             toolWorkspaceConfiguration: toolWorkspaceConfiguration,
             workspaceDelegateProvider: workspaceDelegateProvider,
             workspaceLoaderProvider: workspaceLoaderProvider
@@ -305,6 +309,7 @@ public final class SwiftTool {
     internal init(
         outputStream: OutputByteStream,
         options: GlobalOptions,
+        packagePathIsAuthoritative: Bool,
         toolWorkspaceConfiguration: ToolWorkspaceConfiguration,
         workspaceDelegateProvider: @escaping WorkspaceDelegateProvider,
         workspaceLoaderProvider: @escaping WorkspaceLoaderProvider
@@ -348,7 +353,12 @@ public final class SwiftTool {
         }
 
         // Create local variables to use while finding build path to avoid capture self before init error.
-        let packageRoot = findPackageRoot(fileSystem: fileSystem)
+        let packageRoot: AbsolutePath?
+        if packagePathIsAuthoritative {
+            packageRoot = fileSystem.currentWorkingDirectory
+        } else {
+            packageRoot = findPackageRoot(fileSystem: fileSystem)
+        }
 
         self.packageRoot = packageRoot
         self.scratchDirectory =

Tests/CommandsTests/SwiftToolTests.swift

@@ -325,6 +325,7 @@ extension SwiftTool {
         return try SwiftTool(
             outputStream: outputStream,
             options: options,
+            packagePathIsAuthoritative: false,
             toolWorkspaceConfiguration: .init(shouldInstallSignalHandlers: false),
             workspaceDelegateProvider: {
                 ToolWorkspaceDelegate(