Add windowId and workspace properties to all CmdArgs

#186
nikitabobko · Sep 21, 2024 · c078a63 · c078a63
1 parent 75bd6cf
commit c078a63
Show file tree

Hide file tree

Showing 35 changed files with 127 additions and 60 deletions.
diff --git a/Sources/Common/cmdArgs/BalanceSizesCmdArgs.swift b/Sources/Common/cmdArgs/BalanceSizesCmdArgs.swift
@@ -2,4 +2,6 @@ public struct BalanceSizesCmdArgs: RawCmdArgs, CmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = noArgsParser(.balanceSizes, allowInConfig: true)
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/CloseAllWindowsButCurrentCmdArgs.swift b/Sources/Common/cmdArgs/CloseAllWindowsButCurrentCmdArgs.swift
@@ -18,6 +18,8 @@ public struct CloseAllWindowsButCurrentCmdArgs: RawCmdArgs, CmdArgs {
     )
 
     public var closeArgs = CloseCmdArgs(rawArgs: [])
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
 
 public func parseCloseAllWindowsButCurrentCmdArgs(_ args: [String]) -> ParsedCmd<CloseAllWindowsButCurrentCmdArgs> {

diff --git a/Sources/Common/cmdArgs/CloseCmdArgs.swift b/Sources/Common/cmdArgs/CloseCmdArgs.swift
@@ -18,4 +18,6 @@ public struct CloseCmdArgs: RawCmdArgs, CmdArgs {
     )
 
     public var quitIfLastWindow: Bool = false
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/EnableCmdArgs.swift b/Sources/Common/cmdArgs/EnableCmdArgs.swift
@@ -1,4 +1,6 @@
 public struct EnableCmdArgs: RawCmdArgs {
+    public let rawArgs: EquatableNoop<[String]>
+    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .enable,
         allowInConfig: true,
@@ -16,12 +18,11 @@ public struct EnableCmdArgs: RawCmdArgs {
         ],
         arguments: [newArgParser(\.targetState, parseState, mandatoryArgPlaceholder: EnableCmdArgs.State.unionLiteral)]
     )
+    public var windowId: UInt32?
+    public var workspaceName: String?
     public var targetState: Lateinit<State> = .uninitialized
     public var failIfNoop: Bool = false
 
-    public let rawArgs: EquatableNoop<[String]>
-    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
-
     public init(rawArgs: [String], targetState: State) {
         self.rawArgs = .init(rawArgs)
         self.targetState = .initialized(targetState)

diff --git a/Sources/Common/cmdArgs/ExecAndForgetCmdArgs.swift b/Sources/Common/cmdArgs/ExecAndForgetCmdArgs.swift
@@ -1,13 +1,16 @@
 public struct ExecAndForgetCmdArgs: CmdArgs {
-    public let bashScript: String
+    public var rawArgs: EquatableNoop<[String]> { .init([bashScript]) }
     public static let info: CmdStaticInfo = CmdStaticInfo(
         help: "USAGE: exec-and-forget <bash-script>",
         kind: .execAndForget,
         allowInConfig: true
     )
 
-    public var rawArgs: EquatableNoop<[String]> { .init([bashScript]) }
     public init(bashScript: String) {
         self.bashScript = bashScript
     }
+
+    public let bashScript: String
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/FlattenWorkspaceTreeCmdArgs.swift b/Sources/Common/cmdArgs/FlattenWorkspaceTreeCmdArgs.swift
@@ -2,4 +2,7 @@ public struct FlattenWorkspaceTreeCmdArgs: RawCmdArgs, CmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = noArgsParser(.flattenWorkspaceTree, allowInConfig: true)
+
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/FocusBackAndForthCmdArgs.swift b/Sources/Common/cmdArgs/FocusBackAndForthCmdArgs.swift
@@ -2,4 +2,7 @@ public struct FocusBackAndForthCmdArgs: RawCmdArgs, CmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = noArgsParser(.focusBackAndForth, allowInConfig: true)
+
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/FocusCmdArgs.swift b/Sources/Common/cmdArgs/FocusCmdArgs.swift
@@ -2,6 +2,8 @@ private let boundar = "<boundary>"
 private let actio = "<action>"
 
 public struct FocusCmdArgs: CmdArgs, RawCmdArgs, Equatable, AeroAny {
+    public let rawArgs: EquatableNoop<[String]>
+    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .focus,
         allowInConfig: true,
@@ -37,13 +39,11 @@ public struct FocusCmdArgs: CmdArgs, RawCmdArgs, Equatable, AeroAny {
 
     public var rawBoundaries: Boundaries? = nil // todo cover boundaries wrapping with tests
     public var rawBoundariesAction: WhenBoundariesCrossed? = nil
-    public var windowId: UInt32? = nil
     public var dfsIndex: UInt32? = nil
     public var direction: CardinalDirection? = nil
     public var floatingAsTiling: Bool = true
-
-    public let rawArgs: EquatableNoop<[String]>
-    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
+    public var windowId: UInt32?
+    public var workspaceName: String?
 
     public init(rawArgs: [String], direction: CardinalDirection) {
         self.rawArgs = .init(rawArgs)

diff --git a/Sources/Common/cmdArgs/FocusMonitorCmdArgs.swift b/Sources/Common/cmdArgs/FocusMonitorCmdArgs.swift
@@ -29,6 +29,8 @@ public struct FocusMonitorCmdArgs: RawCmdArgs, CmdArgs {
 
     public var wrapAround: Bool = false
     public var target: Lateinit<MonitorTarget> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
 
 public func parseFocusMonitorCmdArgs(_ args: [String]) -> ParsedCmd<FocusMonitorCmdArgs> {

diff --git a/Sources/Common/cmdArgs/FullscreenCmdArgs.swift b/Sources/Common/cmdArgs/FullscreenCmdArgs.swift
@@ -28,6 +28,8 @@ public struct FullscreenCmdArgs: CmdArgs, RawCmdArgs {
     public var toggle: ToggleEnum = .toggle
     public var noOuterGaps: Bool = false
     public var failIfNoop: Bool = false
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
 
 public func parseFullscreenCmdArgs(_ args: [String]) -> ParsedCmd<FullscreenCmdArgs> {

diff --git a/Sources/Common/cmdArgs/JoinWithCmdArgs.swift b/Sources/Common/cmdArgs/JoinWithCmdArgs.swift
@@ -1,4 +1,6 @@
 public struct JoinWithCmdArgs: CmdArgs, RawCmdArgs {
+    public let rawArgs: EquatableNoop<[String]>
+    init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .joinWith,
         allowInConfig: true,
@@ -11,10 +13,10 @@ public struct JoinWithCmdArgs: CmdArgs, RawCmdArgs {
         options: [:],
         arguments: [newArgParser(\.direction, parseCardinalDirectionArg, mandatoryArgPlaceholder: CardinalDirection.unionLiteral)]
     )
-    public var direction: Lateinit<CardinalDirection> = .uninitialized
 
-    public let rawArgs: EquatableNoop<[String]>
-    init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
+    public var direction: Lateinit<CardinalDirection> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 
     public init(rawArgs: [String], direction: CardinalDirection) {
         self.rawArgs = .init(rawArgs)

diff --git a/Sources/Common/cmdArgs/LayoutCmdArgs.swift b/Sources/Common/cmdArgs/LayoutCmdArgs.swift
@@ -1,4 +1,6 @@
 public struct LayoutCmdArgs: CmdArgs, RawCmdArgs, Equatable {
+    public let rawArgs: EquatableNoop<[String]>
+    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .layout,
         allowInConfig: true,
@@ -11,10 +13,10 @@ public struct LayoutCmdArgs: CmdArgs, RawCmdArgs, Equatable {
         options: [:],
         arguments: [newArgParser(\.toggleBetween, parseToggleBetween, mandatoryArgPlaceholder: LayoutDescription.unionLiteral)]
     )
-    public var toggleBetween: Lateinit<[LayoutDescription]> = .uninitialized
 
-    public let rawArgs: EquatableNoop<[String]>
-    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
+    public var toggleBetween: Lateinit<[LayoutDescription]> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 
     public init(rawArgs: [String], toggleBetween: [LayoutDescription]) {
         self.rawArgs = .init(rawArgs)

diff --git a/Sources/Common/cmdArgs/ListExecEnvVarsCmdArgs.swift b/Sources/Common/cmdArgs/ListExecEnvVarsCmdArgs.swift
@@ -2,4 +2,7 @@ public struct ListExecEnvVarsCmdArgs: RawCmdArgs, CmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = noArgsParser(.listExecEnvVars, allowInConfig: true)
+
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/MacosNativeFullscreen.swift b/Sources/Common/cmdArgs/MacosNativeFullscreen.swift
@@ -1,7 +1,5 @@
 public struct MacosNativeFullscreenCmdArgs: CmdArgs, RawCmdArgs {
     public let rawArgs: EquatableNoop<[String]>
-    public var failIfNoop: Bool = false
-
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .macosNativeFullscreen,
@@ -24,7 +22,11 @@ public struct MacosNativeFullscreenCmdArgs: CmdArgs, RawCmdArgs {
         ],
         arguments: [ArgParser(\.toggle, parseToggleEnum)]
     )
+
     public var toggle: ToggleEnum = .toggle
+    public var failIfNoop: Bool = false
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
 
 public func parseMacosNativeFullscreenCmdArgs(_ args: [String]) -> ParsedCmd<MacosNativeFullscreenCmdArgs> {

diff --git a/Sources/Common/cmdArgs/MacosNativeMinimize.swift b/Sources/Common/cmdArgs/MacosNativeMinimize.swift
@@ -2,4 +2,7 @@ public struct MacosNativeMinimizeCmdArgs: RawCmdArgs, CmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = noArgsParser(.macosNativeMinimize, allowInConfig: true)
+
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/ModeCmdArgs.swift b/Sources/Common/cmdArgs/ModeCmdArgs.swift
@@ -16,7 +16,10 @@ public struct ModeCmdArgs: RawCmdArgs {
         options: [:],
         arguments: [newArgParser(\.targetMode, parseTargetMode, mandatoryArgPlaceholder: "<binding-mode>")]
     )
+
     public var targetMode: Lateinit<String> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
 
 private func parseTargetMode(arg: String, nextArgs: inout [String]) -> Parsed<String> {

diff --git a/Sources/Common/cmdArgs/MoveCmdArgs.swift b/Sources/Common/cmdArgs/MoveCmdArgs.swift
@@ -1,4 +1,6 @@
 public struct MoveCmdArgs: CmdArgs, RawCmdArgs {
+    public let rawArgs: EquatableNoop<[String]>
+    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .move,
         allowInConfig: true,
@@ -11,10 +13,10 @@ public struct MoveCmdArgs: CmdArgs, RawCmdArgs {
         options: [:],
         arguments: [newArgParser(\.direction, parseCardinalDirectionArg, mandatoryArgPlaceholder: CardinalDirection.unionLiteral)]
     )
-    public var direction: Lateinit<CardinalDirection> = .uninitialized
 
-    public let rawArgs: EquatableNoop<[String]>
-    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
+    public var direction: Lateinit<CardinalDirection> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 
     public init(rawArgs: [String], _ direction: CardinalDirection) {
         self.rawArgs = .init(rawArgs)

diff --git a/Sources/Common/cmdArgs/MoveMouseCmdArgs.swift b/Sources/Common/cmdArgs/MoveMouseCmdArgs.swift
@@ -22,6 +22,8 @@ public struct MoveMouseCmdArgs: CmdArgs, RawCmdArgs {
 
     public var failIfNoop: Bool = false
     public var mouseTarget: Lateinit<MouseTarget> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
 
 func parseMouseTarget(arg: String, nextArgs: inout [String]) -> Parsed<MouseTarget> {

diff --git a/Sources/Common/cmdArgs/MoveNodeToMonitorCmdArgs.swift b/Sources/Common/cmdArgs/MoveNodeToMonitorCmdArgs.swift
@@ -29,6 +29,8 @@ public struct MoveNodeToMonitorCmdArgs: RawCmdArgs, CmdArgs, Equatable {
 
     public var wrapAround: Bool = false
     public var target: Lateinit<MonitorTarget> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
 
 public func parseMoveNodeToMonitorCmdArgs(_ args: [String]) -> ParsedCmd<MoveNodeToMonitorCmdArgs> {

diff --git a/Sources/Common/cmdArgs/MoveNodeToWorkspaceCmdArgs.swift b/Sources/Common/cmdArgs/MoveNodeToWorkspaceCmdArgs.swift
@@ -1,14 +1,6 @@
 public struct MoveNodeToWorkspaceCmdArgs: CmdArgs, RawCmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public var target: Lateinit<WorkspaceTarget> = .uninitialized
-
-    public var _wrapAround: Bool?
-    public var failIfNoop: Bool = false
-
-    public init(rawArgs: [String]) {
-        self.rawArgs = .init(rawArgs)
-    }
-
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .moveNodeToWorkspace,
         allowInConfig: true,
@@ -31,6 +23,15 @@ public struct MoveNodeToWorkspaceCmdArgs: CmdArgs, RawCmdArgs {
         ],
         arguments: [newArgParser(\.target, parseWorkspaceTarget, mandatoryArgPlaceholder: workspaceTargetPlaceholder)]
     )
+
+    public var _wrapAround: Bool?
+    public var failIfNoop: Bool = false
+    public var windowId: UInt32?
+    public var workspaceName: String?
+
+    public init(rawArgs: [String]) {
+        self.rawArgs = .init(rawArgs)
+    }
 }
 
 public extension MoveNodeToWorkspaceCmdArgs {

diff --git a/Sources/Common/cmdArgs/MoveWorkspaceToMonitor.swift b/Sources/Common/cmdArgs/MoveWorkspaceToMonitor.swift
@@ -17,6 +17,8 @@ public struct MoveWorkspaceToMonitorCmdArgs: RawCmdArgs {
         arguments: [newArgParser(\.target, parseMonitorTarget, mandatoryArgPlaceholder: "(next|prev)")]
     )
 
+    public var windowId: UInt32?
+    public var workspaceName: String?
     public var wrapAround: Bool = false
     public var target: Lateinit<MoveWorkspaceToMonitorCmdArgs.MonitorTarget> = .uninitialized
     public enum MonitorTarget: String, CaseIterable {

diff --git a/Sources/Common/cmdArgs/ReloadConfigCmdArgs.swift b/Sources/Common/cmdArgs/ReloadConfigCmdArgs.swift
@@ -1,7 +1,6 @@
 public struct ReloadConfigCmdArgs: RawCmdArgs, CmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
-
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .reloadConfig,
         allowInConfig: true,
@@ -22,4 +21,6 @@ public struct ReloadConfigCmdArgs: RawCmdArgs, CmdArgs {
 
     public var noGui: Bool = false
     public var dryRun: Bool = false
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/ResizeCmdArgs.swift b/Sources/Common/cmdArgs/ResizeCmdArgs.swift
@@ -1,4 +1,6 @@
 public struct ResizeCmdArgs: RawCmdArgs, Equatable {
+    public let rawArgs: EquatableNoop<[String]>
+    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .resize,
         allowInConfig: true,
@@ -21,8 +23,9 @@ public struct ResizeCmdArgs: RawCmdArgs, Equatable {
 
     public var dimension: Lateinit<ResizeCmdArgs.Dimension> = .uninitialized
     public var units: Lateinit<ResizeCmdArgs.Units> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 
-    public let rawArgs: EquatableNoop<[String]>
     public init(
         rawArgs: [String],
         dimension: Dimension,
@@ -33,8 +36,6 @@ public struct ResizeCmdArgs: RawCmdArgs, Equatable {
         self.units = .initialized(units)
     }
 
-    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
-
     public enum Dimension: String, CaseIterable, Equatable {
         case width, height, smart
     }

diff --git a/Sources/Common/cmdArgs/ServerVersionInternalCommandCmdArgs.swift b/Sources/Common/cmdArgs/ServerVersionInternalCommandCmdArgs.swift
@@ -2,4 +2,7 @@ public struct ServerVersionInternalCommandCmdArgs: RawCmdArgs, CmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = noArgsParser(.serverVersionInternalCommand, allowInConfig: false)
+
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
diff --git a/Sources/Common/cmdArgs/SplitCmdArgs.swift b/Sources/Common/cmdArgs/SplitCmdArgs.swift
@@ -1,4 +1,6 @@
 public struct SplitCmdArgs: RawCmdArgs {
+    public let rawArgs: EquatableNoop<[String]>
+    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = cmdParser(
         kind: .split,
         allowInConfig: true,
@@ -11,10 +13,10 @@ public struct SplitCmdArgs: RawCmdArgs {
         options: [:],
         arguments: [newArgParser(\.arg, parseSplitArg, mandatoryArgPlaceholder: SplitArg.unionLiteral)]
     )
-    public var arg: Lateinit<SplitArg> = .uninitialized
 
-    public let rawArgs: EquatableNoop<[String]>
-    fileprivate init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
+    public var arg: Lateinit<SplitArg> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 
     public init(rawArgs: [String], _ arg: SplitArg) {
         self.rawArgs = .init(rawArgs)

diff --git a/Sources/Common/cmdArgs/TriggerBindingCmdArgs.swift b/Sources/Common/cmdArgs/TriggerBindingCmdArgs.swift
@@ -21,6 +21,8 @@ public struct TriggerBindingCmdArgs: RawCmdArgs, CmdArgs {
 
     public var _mode: String? = nil
     public var binding: Lateinit<String> = .uninitialized
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }
 
 public extension TriggerBindingCmdArgs {

diff --git a/Sources/Common/cmdArgs/WorkspaceBackAndForthCmdArgs.swift b/Sources/Common/cmdArgs/WorkspaceBackAndForthCmdArgs.swift
@@ -2,4 +2,7 @@ public struct WorkspaceBackAndForthCmdArgs: RawCmdArgs, CmdArgs {
     public let rawArgs: EquatableNoop<[String]>
     public init(rawArgs: [String]) { self.rawArgs = .init(rawArgs) }
     public static let parser: CmdParser<Self> = noArgsParser(.workspaceBackAndForth, allowInConfig: true)
+
+    public var windowId: UInt32?
+    public var workspaceName: String?
 }