Add swift-log support for OpenGestures

Package.swift

@@ -138,6 +138,7 @@ let compatibilityTestCondition = envBoolValue("COMPATIBILITY_TEST", default: fal
 
 let gesturesCondition = envBoolValue("OPENGESTURESSHIMS_GESTURES", default: false)
 let useLocalDeps = envBoolValue("USE_LOCAL_DEPS", default: false)
+let swiftLogCondition = envBoolValue("SWIFT_LOG", default: !buildForDarwinPlatform)
 
 let swiftCorelibsPath = envStringValue("LIB_SWIFT_PATH") ?? "\(Context.packageDirectory)/Sources/SwiftCorelibs/include"
 
@@ -191,6 +192,13 @@ extension Target {
         swiftSettings.append(.define("OPENGESTURES_GESTURES"))
         self.swiftSettings = swiftSettings
     }
+
+    func addSwiftLogSettings() {
+        dependencies.append(.product(name: "Logging", package: "swift-log"))
+        var swiftSettings = swiftSettings ?? []
+        swiftSettings.append(.define("OPENGESTURES_SWIFT_LOG"))
+        self.swiftSettings = swiftSettings
+    }
 }
 
 // MARK: - Targets
@@ -251,6 +259,13 @@ let package = Package(
     ]
 )
 
+if swiftLogCondition {
+    package.dependencies.append(
+        .package(url: "https://github.com/apple/swift-log", from: "1.5.3")
+    )
+    openGesturesTarget.addSwiftLogSettings()
+}
+
 private var hasSetupDPFDependency = false
 
 @MainActor

Sources/OpenGestures/Component/UpdateTracer.swift

@@ -95,12 +95,7 @@ package class UpdateTracer: @unchecked Sendable {
             return
         }
         let renderedTrace = traceHead.rendered(using: dataSnapshots)
-        #if canImport(os)
         Log.componentUpdates.log("\(renderedTrace)")
-        #else
-        // TODO: Add swift-log library support
-        print(renderedTrace)
-        #endif
     }
 
     /// Clears all recorded trace state.

Sources/OpenGestures/Log.swift

@@ -9,7 +9,46 @@ import Darwin
 #elseif canImport(Glibc)
 import Glibc
 #endif
-#if canImport(os)
+
+#if OPENGESTURES_SWIFT_LOG
+package import Logging
+
+extension Logger {
+    package init(subsystem: String, category: String) {
+        var logger = Logger(label: subsystem)
+        logger[metadataKey: "category"] = .string(category)
+        self = logger
+    }
+}
+
+extension Logger.Level {
+    #if DEBUG
+    package static let `default`: Logger.Level = .debug
+    #else
+    package static let `default`: Logger.Level = .info
+    #endif
+}
+
+extension Logger {
+    package func log(
+        _ message: @autoclosure () -> Logger.Message,
+        metadata: @autoclosure () -> Logger.Metadata? = nil,
+        file: String = #fileID,
+        function: String = #function,
+        line: UInt = #line
+    ) {
+        log(
+            level: .default,
+            message(),
+            metadata: metadata(),
+            source: nil,
+            file: file,
+            function: function,
+            line: line
+        )
+    }
+}
+#else
 package import os
 #endif
 
@@ -109,7 +148,6 @@ package enum Log {
         #endif
     }
 
-    #if canImport(os)
     private static let _nodes = Logger(subsystem: subsystem, category: "Nodes")
 
     package static var nodes: Logger {
@@ -124,7 +162,13 @@ package enum Log {
 
     package static let componentUpdates = Logger(subsystem: subsystem, category: "ComponentUpdates")
 
+    #if OPENGESTURES_SWIFT_LOG
+    private static let disabled = Logger(label: subsystem) { _ in
+        SwiftLogNoOpLogHandler()
+    }
+    #else
     private static let disabled = Logger(OSLog.disabled)
+    #endif
 
     @inline(__always)
     package static func logEnqueuedPhase(_ node: AnyGestureNode) {
@@ -135,12 +179,4 @@ package enum Log {
     package static func logFailedScheduledUpdate() {
         components.log("Failed to peform a scheduled update")
     }
-    #else
-    // TODO: Add swift-log support
-    @inline(__always)
-    package static func logEnqueuedPhase(_ node: AnyGestureNode) {}
-
-    @inline(__always)
-    package static func logFailedScheduledUpdate() {}
-    #endif
 }