Add matching on-window-detected info to debug-windows command

closes #1326
closes #1340

Author: hieberr

Sources/AppBundle/command/impl/ConfigCommand.swift

@@ -135,12 +135,18 @@ extension ConfigMapValue {
     }
 }
 
+extension [Command] {
+    var prettyDescription: String {
+        map { $0.args.description }.joined(separator: "; ")
+    }
+}
+
 @MainActor func buildConfigMap() -> ConfigMapValue {
     let mode = config.modes.mapValues { (mode: Mode) -> ConfigMapValue in
         var keyNotationToScript: [String: ConfigMapValue] = [:]
         for binding in mode.bindings.values {
             keyNotationToScript[binding.descriptionWithKeyNotation] =
-                .scalar(.string(binding.commands.map { $0.args.description }.joined(separator: "; ")))
+                .scalar(.string(binding.commands.prettyDescription))
         }
         return .map(["binding": .map(keyNotationToScript)])
     }

Sources/AppBundle/command/impl/DebugWindowsCommand.swift

@@ -89,6 +89,12 @@ private func dumpWindowDebugInfo(_ window: Window) async throws -> String {
     result["Aero.AXApp"] = .dict(try await window.macApp.dumpAppAxInfo())
     // todo add app bundle version to debug log
 
+    var matchingCallbacks: [Json] = []
+    for callback in config.onWindowDetected where try await callback.matches(window) {
+        matchingCallbacks.append(callback.debugJson)
+    }
+    result["Aero.on-window-detected"] = .array(matchingCallbacks)
+
     return (JSONEncoder.aeroSpaceDefault.encodeToString(result) ?? "nil").prefixLines(with: "\(window.app.bundleId ?? "nil-bundle-id") ||| ")
 }
 

Sources/AppBundle/config/parseOnWindowDetected.swift

@@ -10,6 +10,15 @@ struct WindowDetectedCallback: ConvenienceCopyable, Equatable {
         rawRun ?? dieT("ID-46D063B2 should have discarded nil")
     }
 
+    var debugJson: Json {
+        var result: [String: Json] = [:]
+        result["matcher"] = matcher.debugJson
+        if let commands = rawRun {
+            result["commands"] = .string(commands.prettyDescription)
+        }
+        return .dict(result)
+    }
+
     static func == (lhs: WindowDetectedCallback, rhs: WindowDetectedCallback) -> Bool {
         return lhs.matcher == rhs.matcher && lhs.checkFurtherCallbacks == rhs.checkFurtherCallbacks &&
             zip(lhs.run, rhs.run).allSatisfy { $0.equals($1) }
@@ -23,6 +32,26 @@ struct WindowDetectedCallbackMatcher: ConvenienceCopyable, Equatable {
     var workspace: String?
     var duringAeroSpaceStartup: Bool?
 
+    var debugJson: Json {
+        var resultParts: [String] = []
+        if let appId {
+            resultParts.append("appId=\"\(appId)\"")
+        }
+        if appNameRegexSubstring != nil {
+            resultParts.append("appNameRegexSubstrin=Regex")
+        }
+        if windowTitleRegexSubstring != nil {
+            resultParts.append("windowTitleRegexSubstring=Regex")
+        }
+        if let workspace {
+            resultParts.append("workspace=\"\(workspace)\"")
+        }
+        if let duringAeroSpaceStartup {
+            resultParts.append("duringAeroSpaceStartup=\(duringAeroSpaceStartup)")
+        }
+        return .string(resultParts.joined(separator: ", "))
+    }
+
     static func == (lhs: WindowDetectedCallbackMatcher, rhs: WindowDetectedCallbackMatcher) -> Bool {
         check(
             lhs.appNameRegexSubstring == nil &&