Rearrange arguments

Author: stevapple

Sources/Commands/SwiftScriptTool.swift

@@ -18,16 +18,13 @@ import Workspace
 
 protocol ScriptCommand: ParsableCommand {
     var swiftOptions: SwiftToolOptions { get }
-    var options: ScriptToolOptions { get }
+    var file: String { get }
 
     func run(_ swiftTool: SwiftTool, as productName: String, at cacheDirPath: AbsolutePath) throws
 }
 
 extension ScriptCommand {
     public func run() throws {
-        guard let file = options.file else {
-            throw ScriptError.fileNotFound("")
-        }
         let (productName, cacheDirPath) = try checkAndPerformCache(for: file)
 
         var swiftOptions = swiftOptions
@@ -51,10 +48,6 @@ struct ScriptToolOptions: ParsableArguments {
 
     var shouldBuild: Bool { !shouldSkipBuild }
 
-    /// The script file to run.
-    @Argument(help: "The script file to run")
-    var file: String?
-
     /// The arguments to pass to the executable.
     @Argument(parsing: .unconditionalRemaining,
               help: "The arguments to pass to the executable")
@@ -84,14 +77,16 @@ public struct SwiftScriptTool: ParsableCommand {
     public static var _errorLabel: String { "error" }
 }
 
-/// swift-run tool namespace
 extension SwiftScriptTool {
     struct Run: ScriptCommand {
         static let configuration = CommandConfiguration(
             abstract: "Runs a script")
 
         @OptionGroup(_hiddenFromHelp: true)
         var swiftOptions: SwiftToolOptions
+        
+        @Argument(help: "The script file to run")
+        var file: String
 
         @OptionGroup()
         var options: ScriptToolOptions
@@ -136,6 +131,9 @@ extension SwiftScriptTool {
 
         @OptionGroup(_hiddenFromHelp: true)
         var swiftOptions: SwiftToolOptions
+        
+        @Argument(help: "The script file to build")
+        var file: String
 
         @OptionGroup()
         var options: ScriptToolOptions
@@ -177,8 +175,8 @@ extension SwiftScriptTool {
         @OptionGroup(_hiddenFromHelp: true)
         var swiftOptions: SwiftToolOptions
 
-        @OptionGroup()
-        var options: ScriptToolOptions
+        @Argument(help: "The script file to clean build cache")
+        var file: String
 
         func run(_ swiftTool: SwiftTool, as productName: String, at cacheDirPath: AbsolutePath) throws {
             try swiftTool.getActiveWorkspace().clean(with: swiftTool.diagnostics)
@@ -192,8 +190,8 @@ extension SwiftScriptTool {
         @OptionGroup(_hiddenFromHelp: true)
         var swiftOptions: SwiftToolOptions
 
-        @OptionGroup()
-        var options: ScriptToolOptions
+        @Argument(help: "The script file to reset build cache")
+        var file: String
 
         func run(_ swiftTool: SwiftTool, as productName: String, at cacheDirPath: AbsolutePath) throws {
             try localFileSystem.removeFileTree(cacheDirPath)
@@ -207,8 +205,8 @@ extension SwiftScriptTool {
         @OptionGroup(_hiddenFromHelp: true)
         var swiftOptions: SwiftToolOptions
 
-        @OptionGroup()
-        var options: ScriptToolOptions
+        @Argument(help: "The script file to update dependencies")
+        var file: String
 
         @Flag(name: [.long, .customShort("n")],
               help: "Display the list of dependencies that can be updated")
@@ -251,35 +249,6 @@ extension SwiftScriptTool {
     }
 }
 
-extension SwiftScriptTool {
-    struct List: ParsableCommand {
-        static let configuration = CommandConfiguration(
-            abstract: "List script caches")
-
-        @OptionGroup(_hiddenFromHelp: true)
-        var swiftOptions: SwiftToolOptions
-
-        func run() throws {
-            let cacheDir = try localFileSystem.getOrCreateSwiftScriptCacheDirectory()
-            let scripts = try localFileSystem.getDirectoryContents(cacheDir)
-            let resolved = try scripts.map { script -> (String, AbsolutePath) in
-                let sourceDir = cacheDir.appending(components: script, "Sources")
-                guard localFileSystem.isDirectory(sourceDir),
-                      let name = try localFileSystem.getDirectoryContents(sourceDir).first,
-                      case let realpath = resolveSymlinks(sourceDir.appending(components: name, "main.swift")) else {
-                          throw Diagnostics.fatalError
-                      }
-                return (script, realpath)
-            }
-            print("\(scripts.count) script\(scripts.count > 1 ? "s" : "") cached at \(cacheDir)")
-            guard let maxLength = resolved.map(\.0.count).max() else { return }
-            resolved.forEach { (name, path) in
-                print(name + String(repeating: " ", count: maxLength - name.count + 2) + path.pathString)
-            }
-        }
-    }
-}
-
 extension SwiftScriptTool {
     struct ResolveOptions: ParsableArguments {
         @Option(help: "The version to resolve at", transform: { Version(string: $0) })
@@ -302,8 +271,8 @@ extension SwiftScriptTool {
         @OptionGroup(_hiddenFromHelp: true)
         var swiftOptions: SwiftToolOptions
 
-        @OptionGroup()
-        var options: ScriptToolOptions
+        @Argument(help: "The script file to clean")
+        var file: String
 
         @OptionGroup()
         var resolveOptions: ResolveOptions
@@ -330,6 +299,35 @@ extension SwiftScriptTool {
     }
 }
 
+extension SwiftScriptTool {
+    struct List: ParsableCommand {
+        static let configuration = CommandConfiguration(
+            abstract: "List script caches")
+
+        @OptionGroup(_hiddenFromHelp: true)
+        var swiftOptions: SwiftToolOptions
+
+        func run() throws {
+            let cacheDir = try localFileSystem.getOrCreateSwiftScriptCacheDirectory()
+            let scripts = try localFileSystem.getDirectoryContents(cacheDir)
+            let resolved = try scripts.map { script -> (String, AbsolutePath) in
+                let sourceDir = cacheDir.appending(components: script, "Sources")
+                guard localFileSystem.isDirectory(sourceDir),
+                      let name = try localFileSystem.getDirectoryContents(sourceDir).first,
+                      case let realpath = resolveSymlinks(sourceDir.appending(components: name, "main.swift")) else {
+                          throw Diagnostics.fatalError
+                      }
+                return (script, realpath)
+            }
+            print("\(scripts.count) script\(scripts.count > 1 ? "s" : "") cached at \(cacheDir)")
+            guard let maxLength = resolved.map(\.0.count).max() else { return }
+            resolved.forEach { (name, path) in
+                print(name + String(repeating: " ", count: maxLength - name.count + 2) + path.pathString)
+            }
+        }
+    }
+}
+
 /// Executes the executable at the specified path.
 fileprivate func run(
     _ executablePath: AbsolutePath,