From e3d53f999da3072b09098aa6dfcd62cd66012430 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 8 Jun 2020 20:30:20 +0200 Subject: [PATCH] util: gracefully handle unknown colors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes sure colors that are unknown won't cause an error. This is especially important in case a library wants to use colors defined by Node.js core, if available and fall back to the default otherwise. Signed-off-by: Ruben Bridgewater PR-URL: https://github.com/nodejs/node/pull/33797 Reviewed-By: Anna Henningsen Reviewed-By: Luigi Pinca Reviewed-By: Michaƫl Zasso Reviewed-By: James M Snell Reviewed-By: Evan Lucas Reviewed-By: Yongsheng Zhang Reviewed-By: Trivikram Kamat --- lib/internal/util/inspect.js | 3 ++- test/parallel/test-util-inspect.js | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js index 40ed7ef75637b0..e398eb168f3369 100644 --- a/lib/internal/util/inspect.js +++ b/lib/internal/util/inspect.js @@ -478,7 +478,8 @@ function stylizeWithColor(str, styleType) { const style = inspect.styles[styleType]; if (style !== undefined) { const color = inspect.colors[style]; - return `\u001b[${color[0]}m${str}\u001b[${color[1]}m`; + if (color !== undefined) + return `\u001b[${color[0]}m${str}\u001b[${color[1]}m`; } return str; } diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js index 5ec3959f502c1f..1a38904e09e670 100644 --- a/test/parallel/test-util-inspect.js +++ b/test/parallel/test-util-inspect.js @@ -2245,6 +2245,12 @@ assert.strictEqual( assert.deepStrictEqual(inspect.colors[bgColor], [40 + i, 49]); assert.deepStrictEqual(inspect.colors[`${bgColor}Bright`], [100 + i, 49]); }); + + // Unknown colors are handled gracefully: + const stringStyle = inspect.styles.string; + inspect.styles.string = 'UNKNOWN'; + assert.strictEqual(inspect('foobar', { colors: true }), "'foobar'"); + inspect.styles.string = stringStyle; } assert.strictEqual(