Merge branch 'release/v0.18.2'

holtwick · Mar 15, 2024 · 8a35bca · 8a35bca
2 parents b1f0266 + f30e839
commit 8a35bca
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zeed",
   "type": "module",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "🌱 Simple foundation library",
   "author": {
     "name": "Dirk Holtwick",

diff --git a/src/browser/log/log-browser-factory.ts b/src/browser/log/log-browser-factory.ts
@@ -18,6 +18,9 @@ export function LoggerBrowserSetupDebugFactory(opt: LogHandlerOptions = {}) {
   const useColors = browserSupportsColors()
   const noop: any = () => {}
 
+  // logCaptureConsole will override the console methods, so we need to get the original ones
+  const originalConsole = getGlobalConsole()
+
   /**
    * The trick is, that console called directly provides a reference to the source code.
    * For the regular implementation this information is lost. But this approach has other
@@ -50,9 +53,6 @@ export function LoggerBrowserSetupDebugFactory(opt: LogHandlerOptions = {}) {
         return () => {}
       }
 
-      // logCaptureConsole will override the console methods, so we need to get the original ones
-      const originalConsole = getGlobalConsole()
-
       log = defineForLogLevel(LogLevelDebug, originalConsole.debug.bind(originalConsole.console, ...fixedArgs) as LoggerInterface)
       log.debug = defineForLogLevel(LogLevelDebug, originalConsole.debug.bind(originalConsole.console, ...fixedArgs))
       log.info = defineForLogLevel(LogLevelInfo, originalConsole.info.bind(originalConsole.console, ...fixedArgs))

diff --git a/src/browser/log/log-browser.ts b/src/browser/log/log-browser.ts
@@ -25,6 +25,10 @@ export function LoggerBrowserHandler(opt: LogHandlerOptions = {}): LogHandler {
   } = opt
   const matchesNamespace = useNamespaceFilter(filter)
   const matchesLevel = useLevelFilter(level)
+
+  // logCaptureConsole will override the console methods, so we need to get the original ones
+  const originalConsole = getGlobalConsole()
+
   return (msg: LogMessage) => {
     if (!matchesLevel(msg.level))
       return
@@ -77,28 +81,26 @@ export function LoggerBrowserHandler(opt: LogHandlerOptions = {}): LogHandler {
       return arg
     }) as any
 
-    const console = getGlobalConsole()
-
     switch (msg.level) {
       case LogLevelInfo:
         if (opt.levelHelper)
           args[0] = `I|*   ${args[0]}`
-        console.info(...args)
+        originalConsole.info(...args)
         break
       case LogLevelWarn:
         if (opt.levelHelper)
           args[0] = `W|**  ${args[0]}`
-        console.warn(...args)
+        originalConsole.warn(...args)
         break
       case LogLevelError:
         if (opt.levelHelper)
           args[0] = `E|*** ${args[0]}`
-        console.error(...args)
+        originalConsole.error(...args)
         break
       default:
         if (opt.levelHelper)
           args[0] = `D|    ${args[0]}`
-        console.debug(...args)
+        originalConsole.debug(...args)
         break
     }
   }

diff --git a/src/common/log/log-console.ts b/src/common/log/log-console.ts
@@ -1,7 +1,6 @@
-/* eslint-disable no-console */
-
 import type { LogHandler, LogHandlerOptions, LogMessage } from './log-base'
 import { LogLevelError, LogLevelInfo, LogLevelWarn } from './log-base'
+import { getGlobalConsole } from './log-console-original'
 import { joinLogStrings, useLevelFilter, useNamespaceFilter } from './log-filter'
 
 /**
@@ -19,6 +18,10 @@ export function LoggerConsoleHandler(opt: LogHandlerOptions = {}): LogHandler {
   } = opt
   const matchesNamespace = useNamespaceFilter(filter)
   const matchesLevel = useLevelFilter(level)
+
+  // logCaptureConsole will override the console methods, so we need to get the original ones
+  const originalConsole = getGlobalConsole()
+
   return (msg: LogMessage) => {
     if (!matchesLevel(msg.level))
       return
@@ -27,16 +30,16 @@ export function LoggerConsoleHandler(opt: LogHandlerOptions = {}): LogHandler {
     const name = msg.name ? `[${msg.name}]` : ''
     switch (msg.level) {
       case LogLevelInfo:
-        console.info(...joinLogStrings(`I|*   ${name}`, ...msg.messages))
+        originalConsole.info(...joinLogStrings(`I|*   ${name}`, ...msg.messages))
         break
       case LogLevelWarn:
-        console.warn(...joinLogStrings(`W|**  ${name}`, ...msg.messages))
+        originalConsole.warn(...joinLogStrings(`W|**  ${name}`, ...msg.messages))
         break
       case LogLevelError:
-        console.error(...joinLogStrings(`E|*** ${name}`, ...msg.messages))
+        originalConsole.error(...joinLogStrings(`E|*** ${name}`, ...msg.messages))
         break
       default:
-        console.debug(...joinLogStrings(`D|    ${name}`, ...msg.messages))
+        originalConsole.debug(...joinLogStrings(`D|    ${name}`, ...msg.messages))
         break
     }
   }