feat: showType option

unjs · Oct 9, 2018 · ed294e4 · ed294e4
1 parent 38a4729
commit ed294e4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/reporters/basic.js b/src/reporters/basic.js
@@ -5,7 +5,8 @@ export default class BasicReporter {
   constructor (options) {
     this.options = Object.assign({
       stream: process.stdout,
-      tagAlignment: 'left'
+      alignment: 'left',
+      showType: false
     }, options)
   }
 
@@ -71,13 +72,11 @@ export default class BasicReporter {
     const fields = this.getFields(logObj)
 
     // Print date
-    if (fields.type.length) {
-      this.write((`[${align(this.options.tagAlignment, fields.date, 8)}] `))
-    }
+    this.write((`[${align(this.options.alignment, fields.date, 8)}] `))
 
     // Print type
     if (fields.type.length) {
-      this.write((`[${align(this.options.tagAlignment, fields.type.toUpperCase(), 7)}] `))
+      this.write((`[${align(this.options.alignment, fields.type.toUpperCase(), 7)}] `))
     }
 
     // Print tag

diff --git a/src/reporters/fancy.js b/src/reporters/fancy.js
@@ -50,12 +50,16 @@ export default class FancyReporter extends BasicReporter {
     }
 
     // Print type
-    const type = align(this.options.tagAlignment, fields.type.toUpperCase(), 7)
+    const type = align(this.options.alignment, fields.type.toUpperCase(), 7)
     if (logObj.badge) {
       this.write('\n' + chalkBgColor(logObj.color).black(` ${type} `) + ' ')
     } else if (fields.type !== 'log') {
       const icon = logObj.icon || ICONS[fields.type] || ICONS.default
-      this.write(chalkColor(logObj.color)(`${icon} ${type} `))
+      if (this.showType) {
+        this.write(chalkColor(logObj.color)(`${icon} ${type} `))
+      } else {
+        this.write(chalkColor(logObj.color)(`${icon} `))
+      }
     }
 
     // Print tag
@@ -65,7 +69,7 @@ export default class FancyReporter extends BasicReporter {
 
     // Print message
     if (fields.message.length) {
-      this.write(fields.message)
+      this.write(chalkColor(logObj.color)(fields.message))
     }
 
     // Badge additional line