Json, cleanup: get rid of different explicit numeric types, leave only one (Int64)

64 bits will be enough for everyone ©

Author: nikitabobko

Sources/AppBundle/command/impl/DebugWindowsCommand.swift

@@ -80,7 +80,7 @@ private func dumpWindowDebugInfo(_ window: Window) async throws -> String {
     let windowLevel = getWindowLevel(for: window.windowId)
     let windowLevelJson = windowLevel?.toJson() ?? .null
     result["Aero.windowLevel"] = windowLevelJson
-    result["Aero.axWindowId"] = .uint32(window.windowId)
+    result["Aero.axWindowId"] = .int(window.windowId)
     result["Aero.workspace"] = .stringOrNull(window.nodeWorkspace?.name)
     result["Aero.treeNodeParent"] = .string(String(describing: window.parent))
     result["Aero.macOS.version"] = .string(ProcessInfo().operatingSystemVersionString) // because built-in apps might behave differently depending on the OS version

Sources/AppBundle/model/Json.swift

@@ -9,8 +9,7 @@ enum Json: Encodable, Equatable {
     // scalar
     case null
     case string(String)
-    case int(Int)
-    case uint32(UInt32)
+    case int(Int64)
     case bool(Bool)
 
     typealias JsonDict = [String: Json]
@@ -22,7 +21,6 @@ enum Json: Encodable, Equatable {
             case .dict(let value): try value.encode(to: encoder)
             case .string(let value): try value.encode(to: encoder)
             case .int(let value): try value.encode(to: encoder)
-            case .uint32(let value): try value.encode(to: encoder)
             case .bool(let value): try value.encode(to: encoder)
             case .null: try (nil as String?).encode(to: encoder)
         }
@@ -40,9 +38,10 @@ enum Json: Encodable, Equatable {
 
     static func newScalarOrNil(_ value: Any?) -> Json? {
         switch value {
-            case let value as Int: .int(value)
-            case let value as Int64: Int(exactly: value).map(Json.int)
-            case let value as UInt32: .uint32(value)
+            case let value as Int64: .int(value)
+            case let value as Int: .int(Int64(value))
+            case let value as UInt32: .int(Int64(value))
+            case let value as UInt: .int(Int64(value))
             case let value as Bool: .bool(value)
             case let value as String: .string(value)
             case nil, is NSNull: .null
@@ -52,6 +51,9 @@ enum Json: Encodable, Equatable {
 
     static func stringOrNull(_ str: String?) -> Json { str.map(Json.string) ?? .null }
 
+    static func int(_ int: Int) -> Json { .int(Int64(exactly: int).orDie()) }
+    static func int(_ int: UInt32) -> Json { .int(Int64(exactly: int).orDie()) }
+
     var rawValue: Any? {
         switch self {
             case .null: nil
@@ -62,16 +64,19 @@ enum Json: Encodable, Equatable {
             case .bool(let x): x
             case .int(let x): x
             case .string(let x): x
-            case .uint32(let x): x
         }
     }
 
     var asDictOrDie: [String: Json] { asDictOrNil.orDie("\(self) is not a dict") }
 
-    var asIntOrNil: Int? {
+    var asInt64OrNil: Int64? {
         if case .int(let value) = self { value } else { nil }
     }
 
+    var asIntOrNil: Int? {
+        asInt64OrNil.flatMap { Int.init(exactly: $0) }
+    }
+
     var asStringOrNil: String? {
         if case .string(let value) = self { value } else { nil }
     }
@@ -95,7 +100,6 @@ enum Json: Encodable, Equatable {
             case .null: return .null
             case .string: return .string
             case .int: return .int
-            case .uint32: return .uint32
             case .bool: return .bool
         }
     }
@@ -108,6 +112,5 @@ enum TomlType: String {
     case null
     case string
     case int
-    case uint32
     case bool
 }

Sources/AppBundle/util/accessibility.swift

@@ -301,7 +301,7 @@ private func castToAxUiElementMock(_ a: AnyObject) -> AxUiElementMock {
             let windowId = UInt32.init(String(str.prefix(upTo: commaIndex)).removePrefix("AXUIElement(AxWindowId="))
             if let windowId {
                 return castToAxUiElementMock([
-                    "Aero.axWindowId": Json.uint32(windowId),
+                    "Aero.axWindowId": Json.int(windowId),
                     kAXAeroSynthetic: Json.bool(true),
                 ] as AnyObject)
             }

Sources/AppBundle/util/dumpAxRecursive.swift

@@ -50,7 +50,7 @@ private func prettyValue(_ value: Any?, recursionDepth: Int) -> Json {
         return .int(value)
     }
     if let value = value as? UInt32 {
-        return .uint32(value)
+        return .int(value)
     }
     if let value = value as? Bool {
         return .bool(value)

Sources/AppBundle/windowLevelCache.swift

@@ -43,7 +43,7 @@ enum MacOsWindowLevel: Sendable, Equatable {
         switch json {
             case .string("normalWindow"): .normalWindow
             case .string("alwaysOnTopWindow"): .alwaysOnTopWindow
-            case .int(let int): .new(windowLevel: int)
+            case .int(let int): .new(windowLevel: Int(exactly: int).orDie())
             default: nil
         }
     }

Sources/AppBundleTests/AxUiElementWindowTypeTest.swift

@@ -53,12 +53,8 @@ extension [String: Json]: AxUiElementMock {
     public func containingWindowId() -> CGWindowID? { _containingWindowId() }
 
     private func _containingWindowId() -> CGWindowID {
-        let windowId = self["Aero.axWindowId"]?.rawValue ?? dieT()
-        if let windowId = windowId as? Int {
-            return UInt32.init(windowId)
-        } else {
-            return windowId as? UInt32 ?? dieT()
-        }
+        let windowId = self["Aero.axWindowId"]?.asInt64OrNil ?? dieT()
+        return UInt32.init(exactly: windowId).orDie()
     }
 }