From 4878a60404f7e22292d72e75c07836f1eaa9d79f Mon Sep 17 00:00:00 2001 From: kizdolf Date: Wed, 14 Dec 2022 10:30:42 +0100 Subject: [PATCH 1/3] fix: --no-colorize is checked --- bin.js | 2 ++ src/diff.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bin.js b/bin.js index 3ba0e3b..8ee279b 100755 --- a/bin.js +++ b/bin.js @@ -20,6 +20,8 @@ sade('uvu [dir] [pattern]') .action(async (dir, pattern, opts) => { try { if (opts.color) process.env.FORCE_COLOR = '1'; + else process.env.FORCE_COLOR = '1'; + let ctx = await parse(dir, pattern, opts); if (!ctx.requires && hasImport) { diff --git a/src/diff.js b/src/diff.js index c16f7b5..ef343ff 100644 --- a/src/diff.js +++ b/src/diff.js @@ -7,6 +7,8 @@ const colors = { '++': kleur.green, }; +if(process.env.FORCE_COLOR === '0') kleur.enabled = false; + const TITLE = kleur.dim().italic; const TAB=kleur.dim('→'), SPACE=kleur.dim('·'), NL=kleur.dim('↵'); const LOG = (sym, str) => colors[sym](sym + PRETTY(str)) + '\n'; From 2d5509b06518cd8e05303e91dd47c11dc7ac7c63 Mon Sep 17 00:00:00 2001 From: kizdolf Date: Wed, 14 Dec 2022 10:46:22 +0100 Subject: [PATCH 2/3] add test for colorize --- test/diff.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/diff.js b/test/diff.js index 8b9d09e..08ded25 100644 --- a/test/diff.js +++ b/test/diff.js @@ -1182,3 +1182,36 @@ if (!isNode8) { } stringify.run(); + +// --- + +const colorize = suite('colorize'); +colorize.before((ctx) => { + ctx.prior_colorize_env = process.env.FORCE_COLOR; +}); + +colorize.after((ctx) => { + process.env.FORCE_COLOR = ctx.prior_colorize_env; +}); + +colorize('shloud not colorize when `process.env.FORCE_COLOR === "0"`', () => { + process.env.FORCE_COLOR = '0'; + assert.is( + $.chars('foo', 'fo'), + '++fo (Expected)\n' + + '--foo (Actual)\n'+ + ' ^' + ); +}); + +colorize('shloud colorize when `process.env.FORCE_COLOR !== "0"`', () => { + process.env.FORCE_COLOR = '1'; + assert.is( + strip($.chars('foo', 'fo')), + '++fo (Expected)\n' + + '--foo (Actual)\n'+ + ' ^' + ); +}); + +colorize.run(); From 3e7e7d4277f8f45629969a8df5225e73c7782836 Mon Sep 17 00:00:00 2001 From: kizdolf Date: Wed, 14 Dec 2022 10:59:23 +0100 Subject: [PATCH 3/3] fix: pass 0 when no opts.color --- bin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin.js b/bin.js index 8ee279b..96eca26 100755 --- a/bin.js +++ b/bin.js @@ -20,7 +20,7 @@ sade('uvu [dir] [pattern]') .action(async (dir, pattern, opts) => { try { if (opts.color) process.env.FORCE_COLOR = '1'; - else process.env.FORCE_COLOR = '1'; + else process.env.FORCE_COLOR = '0'; let ctx = await parse(dir, pattern, opts);