Merge 11feae3 into 307affc

pinojs · Mar 5, 2021 · 7afa9e6 · 7afa9e6
2 parents 307affc + 11feae3
commit 7afa9e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -132,8 +132,8 @@ module.exports = function prettyFactory (options) {
       }
     }
 
-    if (line.length > 0) {
-      line += (singleLine ? ' ' : EOL)
+    if (line.length > 0 && !singleLine) {
+      line += EOL
     }
 
     if (log.type === 'Error' && log.stack) {
@@ -157,6 +157,11 @@ module.exports = function prettyFactory (options) {
         singleLine,
         colorizer
       })
+
+      // In single line mode, include a space only if prettified version isn't empty
+      if (singleLine && !/^\s$/.test(prettifiedObject)) {
+        line += ' '
+      }
       line += prettifiedObject
     }
 

diff --git a/test/basic.test.js b/test/basic.test.js
@@ -724,7 +724,7 @@ test('basic prettifier tests', (t) => {
     const log = pino({}, new Writable({
       write (chunk, enc, cb) {
         const formatted = pretty(chunk.toString())
-        t.is(formatted, `[${epoch}] INFO (${pid} on ${hostname}): message \n`)
+        t.is(formatted, `[${epoch}] INFO (${pid} on ${hostname}): message\n`)
         cb()
       }
     }))