@trojs/logger 0.5.9 → 0.5.11

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@trojs/logger",
     "description": "Winston logger for TroJS",
-    "version": "0.5.9",
+    "version": "0.5.11",
     "author": {
         "name": "Pieter Wigboldus",
         "url": "https://trojs.org/"
@@ -33,8 +33,8 @@
     ],
     "main": "src/logger.js",
     "devDependencies": {
-        "@trojs/error": "^4.0.0",
-        "@trojs/lint": "^0.3.4",
+        "@trojs/error": "^5.0.0",
+        "@trojs/lint": "^0.4.0",
         "eslint": "^9.24.0",
         "globals": "^16.0.0",
         "jscpd": "^4.0.0",
@@ -57,7 +57,7 @@
         "@sentry/integrations": "^7.117.0",
         "@sentry/node": "^7.117.0",
         "@sentry/tracing": "^7.117.0",
-        "@trojs/enum": "^4.0.0",
+        "@trojs/enum": "^5.0.0",
         "@trojs/mutator": "^1.0.0",
         "@trojs/objects": "^9.0.0",
         "compression": "^1.7.4",

package/src/helpers/stackdriver.js

@@ -19,14 +19,18 @@ const levels = {
 }
 
 const stackdriver
-    = ({ level, defaultLevel }) =>
-      (info) => ({
+  = ({ level = 'info', defaultLevel = 'info' } = {}) =>
+    (info) => {
+      const currentLevel = info?.level ?? level ?? defaultLevel ?? 'info'
+
+      return {
         ...info,
-        severity: levelToSeverity[level] || levelToSeverity[defaultLevel],
-        level: levels[level] || levels[defaultLevel],
+        severity: levelToSeverity[currentLevel] || levelToSeverity.info,
+        level: levels[currentLevel] || levels.info,
         time: Date.now(),
         pid: process.pid,
         hostname: os.hostname()
-      })
+      }
+    }
 
 export default stackdriver

package/src/loggers/console.js

@@ -5,21 +5,34 @@ export default ({ winston, logger }) => {
 
   const jsonFormatter = winston.format.combine(
     winston.format.errors({ stack: logger?.debug ?? false }),
+    winston.format((info) => {
+      const logInfo = { ...info }
+      if (logger?.debug && info.stack) {
+        logInfo.stacktrace = info.stack
+      }
+      return logInfo
+    })(),
     winston.format(
       stackDriver({ level: logger?.level, defaultLevel })
     )(),
     winston.format.json()
   )
 
+  const simpleLoggerWithStack = winston.format.printf(({ level, message, stack }) => {
+    const text = `${level.toUpperCase()}: ${message}`
+    return stack ? `${text}\n${stack}` : text
+  })
+
   const defaultFormatter = winston.format.combine(
     winston.format.errors({ stack: logger?.debug ?? false }),
-    winston.format.simple()
+    simpleLoggerWithStack
   )
+
   return new winston.transports.Console({
     level: logger?.level || defaultLevel,
     format:
-            logger.format === 'json'
-              ? jsonFormatter
-              : defaultFormatter
+    logger?.format === 'json'
+      ? jsonFormatter
+      : defaultFormatter
   })
 }