feat: Update reactor logger

Author: matusklasovity

GoodReactor-Sample/GoodReactor-Sample/Application/AppDelegate.swift

@@ -22,18 +22,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         UINavigationBar.configureAppearance()
 
         AppCoordinator(window: window).start()
-        
-        ReactorConfiguration.logger = SampleLogger()
 
         return true
     }
 
 }
-
-struct SampleLogger: ReactorLogger {
-    
-    func logReactorEvent(_ message: Any, level: LogLevel, fileName: String, lineNumber: Int) {
-        print("[\(level)] \(message) (\(fileName):\(lineNumber))")
-    }
-    
-}

GoodReactor-Sample/goodreactor-swiftui-sample/Logger/SampleLogger.swift

@@ -0,0 +1,16 @@
+//
+//  SampleLogger.swift
+//  goodreactor-swiftui-sample
+//
+//  Created by Matus Klasovity on 23/06/2025.
+//
+
+import GoodReactor
+
+struct SampleLogger: ReactorLogger {
+
+    func logReactorEvent(_ message: Any, level: GoodReactor.LogLevel, fileName: String, lineNumber: Int) {
+        print("\(level): \(message) [\(fileName):\(lineNumber)]")
+    }
+    
+}

GoodReactor-Sample/goodreactor-swiftui-sample/Screens/Content/ContentViewModel.swift

@@ -71,5 +71,9 @@ import SwiftUI
     func fetchData() async -> Mutation {
         return .didFetchData
     }
+    
+    func makeLogger() -> (any ReactorLogger)? {
+        SampleLogger()
+    }
 
 }

README.md

@@ -181,6 +181,7 @@ reactor.stateStream
 
 ## Logging
 ```swift
+// 1. Create a logger conforming to ReactorLogger protocol
 struct SampleLogger: ReactorLogger {
 
     func logReactorEvent(_ message: Any, level: LogLevel, fileName: String, lineNumber: Int) {
@@ -189,7 +190,16 @@ struct SampleLogger: ReactorLogger {
 
 }
 
-ReactorConfiguration.logger = SampleLogger()
+// 2. Set the logger to the Reactor
+@Observable final class ContentViewModel: Reactor {
+
+    // ...
+    
+    func makeLogger() -> (any ReactorLogger)? {
+        SampleLogger()
+    }
+
+}
 ```
 
 # License

Sources/GoodReactor/Reactor.swift

@@ -101,7 +101,7 @@ import SwiftUI
     associatedtype State
 
     /// Logger used for logging reactor events
-    static var logger: ReactorLogger? { get }
+    var logger: ReactorLogger? { get }
 
     /// Initial state of the reactor
     ///
@@ -117,13 +117,9 @@ import SwiftUI
 
     /// Constructor for this reactor's logger. Gets called only once during the lifetime
     /// of a Reactor.
-    ///
-    /// Default logger is `OSLogLogger` in iOS 14 and newer, or
-    /// `PrintLogger` in older iOS versions.
-    ///
-    /// - Returns: Logger used for logging reactor events. See `GoodLogger` package
+    /// - Returns: Logger used for logging reactor events. See `ReactorLogger` protocol
     /// for more information.
-    static func makeLogger() -> ReactorLogger?
+    func makeLogger() -> ReactorLogger?
 
     /// Constructor for this reactor's initial state.
     ///
@@ -235,8 +231,8 @@ public extension Reactor {
 
     typealias Event = GoodReactor.Event<Action, Mutation, Destination>
 
-    static var logger: ReactorLogger? {
-        MapTables.loggers.forceCastedValue(forKey: self, default: makeLogger())
+    var logger: ReactorLogger? {
+        MapTables.loggers.optionalCastedValue(forKey: self, default: makeLogger())
     }
 
     var state: State {
@@ -252,8 +248,8 @@ public extension Reactor {
         MapTables.initialState.forceCastedValue(forKey: self, default: makeInitialState())
     }
 
-    static func makeLogger() -> ReactorLogger? {
-        ReactorConfiguration.logger
+    func makeLogger() -> ReactorLogger? {
+        nil
     }
 
     func transform() {}
@@ -481,7 +477,7 @@ public extension Reactor {
                 _send(event: event)
             }
 
-            Self._debugLog(message: "Subscription finished")
+            self?._debugLog(message: "Subscription finished")
         }
 
         subscription.store(in: &MapTables.subscriptions[key: self, default: []])
@@ -526,10 +522,6 @@ private extension Reactor {
     }
 
     private func _debugLog(message: String) {
-        Self._debugLog(message: message)
-    }
-
-    private static func _debugLog(message: String) {
         logger?.logReactorEvent("[GoodReactor] \(Self.name) - \(message)", level: .debug, fileName: #file, lineNumber: #line)
     }
 

Sources/GoodReactor/ReactorConfiguration.swift

@@ -47,7 +47,7 @@ final public class WeakMapTable<Key, Value>: @unchecked Sendable where Key: AnyO
     ///   - key: The key for which to retrieve the associated value.
     ///   - default: A closure that provides a default value if the key is not present.
     /// - Returns: The value associated with the given key or the default value if the key is not present.
-    public func value(forKey key: Key, default: @autoclosure () -> Value) -> Value {
+    public func value(forKey key: Key, default: @autoclosure () -> Value?) -> Value? {
         let weakKey = Weak(key)
 
         self.lock.lock()
@@ -73,9 +73,18 @@ final public class WeakMapTable<Key, Value>: @unchecked Sendable where Key: AnyO
     ///   - default: A closure that returns the default value to be returned if the key is not found.
     /// - Returns: The value associated with key, cast to type T, or the default value if the key is not found.
     public func forceCastedValue<T>(forKey key: Key, default: @autoclosure () -> T) -> T {
-        return self.value(forKey: key, default: `default`() as! Value) as! T
+        return self.value(forKey: key, default: `default`() as? Value) as! T
     }
-
+    
+    /// Retrieves the value associated with the given key, cast to the desired type T.
+    /// - Parameters:
+    ///   - key: The key whose associated value is to be retrieved
+    ///   - default: A closure that returns the default value to be returned if the key is not found.
+    /// - Returns: The value associated with key, cast to type T?, or the default value if the key is not found.
+    public func optionalCastedValue<T>(forKey key: Key, default: @autoclosure () -> Value?) -> T? {
+        return (self.value(forKey: key, default: `default`()) as? T)
+    }
+    
     /// This method is used to set the value for a given key in the dictionary.
     /// - Parameters:
     ///   - value: The value to be stored.