Merge branch 'develop' of github.com:Marak/colors.js into develop

Marak · Sep 22, 2019 · acb7f66 · acb7f66
2 parents 9bfb136 + 5d9eb90
commit acb7f66
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/lib/colors.js b/lib/colors.js
@@ -105,8 +105,8 @@ function applyStyle() {
   var args = Array.prototype.slice.call(arguments);
 
   var str = args.map(function(arg) {
-    // Use weak equality check so we can colorize null in safe mode
-    if (arg != undefined && arg.constructor === String) {
+    // Use weak equality check so we can colorize null/undefined in safe mode
+    if (arg != null && arg.constructor === String) {
       return arg;
     } else {
       return util.inspect(arg);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "colors",
     "description": "get colors in your node.js console",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "author": "Marak Squires",
     "contributors": [
         {

diff --git a/tests/safe-test.js b/tests/safe-test.js
@@ -66,3 +66,10 @@ colors.setTheme({custom: ['red', 'italic', 'inverse']});
 assert.equal(colors.custom(s),
     '\x1b[7m' + '\x1b[3m' + '\x1b[31m' + s +
   '\x1b[39m' + '\x1b[23m' + '\x1b[27m' );
+
+// should not throw error on null or undefined values
+var undef;
+assert.equal(colors.yellow(undef), '\x1b[33mundefined\x1b[39m');
+
+// was failing:
+assert.equal(colors.red(null), '\x1b[31mnull\x1b[39m');