fix: show error stack or message like hexo-log@1.0.0 (#110)

hexojs · Aug 19, 2022 · b58e269 · b58e269
1 parent 2d03ea3
commit b58e269
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/lib/log.js b/lib/log.js
@@ -51,12 +51,11 @@ class Logger {
   }
 
   _writeLogOutput(level, consoleArgs) {
-    const fields = consoleArgs[0];
-    if (typeof fields === 'object') {
-      if (fields && consoleArgs.length === 1 && fields.err && fields.err instanceof Error) {
-        consoleArgs = [fields.err.message];
-      } else {
-        consoleArgs.shift();
+    let errArg;
+    if (typeof consoleArgs[0] === 'object') {
+      errArg = consoleArgs.shift();
+      if (errArg.err && errArg.err instanceof Error) {
+        errArg = errArg.err;
       }
     }
 
@@ -89,6 +88,19 @@ class Logger {
       } else {
         console.error(...consoleArgs);
       }
+
+      if (errArg) {
+        const err = errArg.stack || errArg.message;
+        if (err) {
+          const str = picocolors.yellow(err) + '\n';
+
+          if (level === TRACE || level >= WARN) {
+            process.stderr.write(str);
+          } else {
+            process.stdout.write(str);
+          }
+        }
+      }
     }
   }
 

diff --git a/test/index.js b/test/index.js
@@ -323,8 +323,7 @@ describe('hexo-log', () => {
       log.warn({err: new Error('test')});
       log.error({err: new Error('test')}, 'test: %s', 'test');
     });
-
-    consoleWarnSpy.args[0][0].should.eql('test');
+    consoleWarnSpy.args[0].length.should.eql(0);
     consoleErrorSpy.args[0][0].should.eql('test: %s');
   });
 });