fix ansi colour issue in output #66

75lb · Jun 11, 2024 · 22b0a34 · 22b0a34
1 parent be23854
commit 22b0a34
Show file tree

Hide file tree

Showing 8 changed files with 223 additions and 1,192 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18, 20, 21]
+        node-version: [18, 20, 22]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/lib/cli-options.js b/lib/cli-options.js
@@ -74,9 +74,9 @@ async function usageSections (allOptionDefinitions, plugins) {
       header: 'Replace chain',
       content: plugins.length
         ? plugins.map(p => ({
-            name: '↓ ' + p.constructor.name,
-            desc: p.description && p.description()
-          }))
+          name: '↓ ' + p.constructor.name,
+          desc: p.description && p.description()
+        }))
         : '{italic Replace chain empty, supply one or more plugins using --chain.}'
     }
   ]

diff --git a/lib/view/default.js b/lib/view/default.js
@@ -11,14 +11,18 @@ class DefaultView {
     this.log()
   }
 
-  logResult (result, options = {}) {
+  createResultLine (result) {
     const tick = process.platform === 'win32' ? '√' : '✔︎'
     const cross = process.platform === 'win32' ? '×' : '✖'
-    const symbol = chalk`{${result.renamed ? 'green' : 'red'} ${result.renamed ? tick : cross}}`
+    const symbol = chalk[result.renamed ? 'green' : 'red'](result.renamed ? tick : cross)
     const desc = result.from + (result.renamed ? chalk.bold(' → ') + result.to : '')
-    const errDesc = result.error ? chalk`({red ${result.error}})` : ''
+    const errDesc = result.error ? `(${chalk.red(result.error)})` : ''
+    return `${symbol} ${desc} ${errDesc}`
+  }
+
+  logResult (result, options = {}) {
     if (result.renamed || options.verbose) {
-      this.log(chalk`${symbol} ${desc} ${errDesc}`)
+      this.log(this.createResultLine(result))
     }
   }
 

diff --git a/lib/view/diff.js b/lib/view/diff.js
@@ -6,7 +6,7 @@ class DiffView extends DefaultView {
   logResult (result, options = {}) {
     const tick = process.platform === 'win32' ? '√' : '✔︎'
     const cross = process.platform === 'win32' ? '×' : '✖'
-    const symbol = chalk`{${result.renamed ? 'green' : 'red'} ${result.renamed ? tick : cross}}`
+    const symbol = chalk[result.renamed ? 'green' : 'red'](result.renamed ? tick : cross)
 
     const data = []
     if (result.renamed) {

diff --git a/lib/view/long.js b/lib/view/long.js
@@ -5,7 +5,7 @@ class LongView extends DefaultView {
   logResult (result, options = {}) {
     const tick = process.platform === 'win32' ? '√' : '✔︎'
     const cross = process.platform === 'win32' ? '×' : '✖'
-    const symbol = chalk`{${result.renamed ? 'green' : 'red'} ${result.renamed ? tick : cross}}`
+    const symbol = chalk[result.renamed ? 'green' : 'red'](result.renamed ? tick : cross)
 
     if (options.verbose) {
       this.log(`${'Renamed:'.padEnd(8)} ${symbol}`)