Merge pull request #98 from SpryRocks/merge-cap2

Merge cap2
SpryRocks · Nov 29, 2023 · 992ae3d · 992ae3d
2 parents ef320d0 + e0650fc
commit 992ae3d
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 18 deletions.
diff --git a/ios/src/Plugin.swift b/ios/src/Plugin.swift
@@ -33,8 +33,8 @@ open class CorePlugin<TDelegate : CoreDelegate, TMappers: CoreMappers>: IPluginL
         wrapperDelegate.sendEvent(event.name, event.getData())
     }
 
-    public func sendLog(_ action: String?, _ tag: String?, _ type: LogType, _ message: String, _ params: LogParams) {
-        sendEvent(LogEvent<TDelegate, TMappers>(action: action, tag: tag, type: type, message: message, params: params))
+    public func sendLog(_ action: String?, _ tag: String?, _ level: LogLevel, _ message: String, _ params: LogParams) {
+        sendEvent(LogEvent<TDelegate, TMappers>(action: action, tag: tag, level: level, message: message, params: params))
     }
 
     public func call(_ actionType: CoreBaseAction<TDelegate, TMappers>.Type, _ call: CAPPluginCall) {

diff --git a/ios/src/actions/Mappers.swift b/ios/src/actions/Mappers.swift
@@ -86,7 +86,7 @@ open class CoreLogMapper {
         }
     }
 
-    internal func getLogTypeValue(_ type: LogType) -> String {
+    internal func getLogTypeValue(_ type: LogLevel) -> String {
         switch(type) {
         case .Warning:
             return "Warning"
@@ -96,6 +96,8 @@ open class CoreLogMapper {
             return "Info"
         case .Error:
             return "Error"
+        case .Trace:
+            return "Trace"
         }
     }
 

diff --git a/ios/src/logs/ILogger.swift b/ios/src/logs/ILogger.swift
@@ -5,15 +5,16 @@ public protocol WithLogger {
 
 public typealias LogParams = Dictionary<String, Any?>
 
-public enum LogType: Int {
+public enum LogLevel: Int {
     case Warning
     case Debug
     case Info
     case Error
+    case Trace
 }
 
 public protocol IPluginLogger {
-    func sendLog(_ action: String?, _ tag: String?, _ type: LogType, _ message: String, _ params: LogParams)
+    func sendLog(_ action: String?, _ tag: String?, _ type: LogLevel, _ message: String, _ params: LogParams)
 }
 
 public protocol ILogger {
@@ -25,6 +26,8 @@ public protocol ILogger {
     func info(message: String)
     func error(message: String, params: LogParams?)
     func error(message: String)
+    func trace(message: String, params: LogParams?)
+    func trace(message: String)
     func tag(_ tag: String) -> ILogger
     func child() -> ILogger
     func updateParams(_ params: LogParams)

diff --git a/ios/src/logs/ILoggerLegacy.swift b/ios/src/logs/ILoggerLegacy.swift
@@ -16,6 +16,8 @@ public protocol ILoggerLegacy {
     func info(message: String)
     func error(message: String, params: LogParamsLegacy?)
     func error(message: String)
+    func trace(message: String, params: LogParamsLegacy?)
+    func trace(message: String)
     func tag(_ tag: String) -> ILoggerLegacy
     func child() -> ILoggerLegacy
     func updateParams(_ params: LogParamsLegacy)

diff --git a/ios/src/logs/LogEvent.swift b/ios/src/logs/LogEvent.swift
@@ -1,14 +1,19 @@
 public class LogEvent<TDelegate, TMappers>: CoreBaseEvent<TDelegate, TMappers> where TDelegate : CoreDelegate, TMappers : CoreMappers {
     private let action: String?
     private let tag: String?
-    private let type: LogType
+    private let level: LogLevel
     private let message: String
     private let params: LogParams
 
-    init(action: String?, tag: String?, type: LogType, message: String, params: LogParams) {
+    init(action: String?,
+         tag: String?,
+         level: LogLevel,
+         message: String,
+         params: LogParams
+    ) {
         self.action = action
         self.tag = tag
-        self.type = type
+        self.level = level
         self.message = message
         self.params = params
         super.init(name: "log")
@@ -17,7 +22,7 @@ public class LogEvent<TDelegate, TMappers>: CoreBaseEvent<TDelegate, TMappers> w
     public override func getData() -> JsonObject {
         let logMapper = mappers.logMapper
         let data = mutableJsonObject()
-        data.put("type", logMapper.getLogTypeValue(type))
+        data.put("level", logMapper.getLogTypeValue(level))
         if let action = action {
             data.put("action", action)
         }

diff --git a/ios/src/logs/Logger.swift b/ios/src/logs/Logger.swift
@@ -12,37 +12,45 @@ public class Logger : NSObject, ILogger {
     }
 
     public func warning(message: String, params: LogParams?) {
-        pluginLogger.sendLog(action, tag, LogType.Warning, message, prepareParams(params))
+        pluginLogger.sendLog(action, tag, LogLevel.Warning, message, prepareParams(params))
     }
 
     public func warning(message: String) {
         warning(message: message, params: nil)
     }
 
     public func debug(message: String, params: LogParams?) {
-        pluginLogger.sendLog(action, tag, LogType.Debug, message, prepareParams(params))
+        pluginLogger.sendLog(action, tag, LogLevel.Debug, message, prepareParams(params))
     }
 
     public func debug(message: String) {
         debug(message: message, params: nil)
     }
 
     public func info(message: String, params: LogParams?) {
-        pluginLogger.sendLog(action, tag, LogType.Info, message, prepareParams(params))
+        pluginLogger.sendLog(action, tag, LogLevel.Info, message, prepareParams(params))
     }
 
     public func info(message: String) {
         info(message: message, params: nil)
     }
 
     public func error(message: String, params: LogParams?) {
-        pluginLogger.sendLog(action, tag, LogType.Error, message, prepareParams(params))
+        pluginLogger.sendLog(action, tag, LogLevel.Error, message, prepareParams(params))
     }
 
     public func error(message: String) {
         error(message: message, params: nil)
     }
 
+    public func trace(message: String, params: LogParams?) {
+        pluginLogger.sendLog(action, tag, LogLevel.Trace, message, prepareParams(params))
+    }
+
+    public func trace(message: String) {
+        trace(message: message, params: nil)
+    }
+
     public func tag(_ tag: String) -> ILogger {
         return Logger(action: action, tag: tag, params: nil, pluginLogger: pluginLogger)
     }

diff --git a/ios/src/logs/LoggerLegacy.swift b/ios/src/logs/LoggerLegacy.swift
@@ -13,37 +13,45 @@ public class LoggerLegacy : NSObject, ILoggerLegacy {
     }
 
     public func warning(message: String, params: LogParamsLegacy?) {
-        pluginLogger.sendLog(action, tag, LogType.Warning, message, prepareParams(params))
+        pluginLogger.sendLog(action, tag, LogLevel.Warning, message, prepareParams(params))
     }
 
     public func warning(message: String) {
         warning(message: message, params: nil)
     }
 
     public func debug(message: String, params: LogParamsLegacy?) {
-        pluginLogger.sendLog(action, tag, LogType.Debug, message, prepareParams(params))
+        pluginLogger.sendLog(action, tag, LogLevel.Debug, message, prepareParams(params))
     }
 
     public func debug(message: String) {
         debug(message: message, params: nil)
     }
 
     public func info(message: String, params: LogParamsLegacy?) {
-        pluginLogger.sendLog(action, tag, LogType.Info, message, prepareParams(params))
+        pluginLogger.sendLog(action, tag, LogLevel.Info, message, prepareParams(params))
     }
 
     public func info(message: String) {
         info(message: message, params: nil)
     }
 
     public func error(message: String, params: LogParamsLegacy?) {
-        pluginLogger.sendLog(action, tag, LogType.Error, message, prepareParams(params))
+        pluginLogger.sendLog(action, tag, LogLevel.Error, message, prepareParams(params))
     }
 
     public func error(message: String) {
         error(message: message, params: nil)
     }
 
+    public func trace(message: String, params: LogParamsLegacy?) {
+        pluginLogger.sendLog(action, tag, LogLevel.Trace, message, prepareParams(params))
+    }
+
+    public func trace(message: String) {
+        trace(message: message, params: nil)
+    }
+
     public func tag(_ tag: String) -> ILoggerLegacy {
         return LoggerLegacy(action: action, tag: tag, params: nil, pluginLogger: pluginLogger)
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spryrocks/capacitor-ionic-core-plugin",
-  "version": "2.5.5-alpha.0",
+  "version": "2.5.6-alpha.0",
   "description": "Ionic plugin core capacitor",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",