colors 1.2.4 → 1.3.2

package/examples/safe-string.js

@@ -37,7 +37,7 @@ console.log('Setting themes is useful');
 // Load theme with JSON literal
 colors.setTheme({
   silly: 'rainbow',
-  input: 'grey',
+  input: 'blue',
   verbose: 'cyan',
   prompt: 'grey',
   info: 'green',
@@ -54,14 +54,14 @@ console.log(colors.error('this is an error'));
 // outputs yellow text
 console.log(colors.warn('this is a warning'));
 
-// outputs grey text
+// outputs blue text
 console.log(colors.input('this is an input'));
 
 
 // console.log('Generic logging theme as file'.green.bold.underline);
 
 // Load a theme from file
-colors.setTheme(__dirname + '/../themes/generic-logging.js');
+colors.setTheme(require(__dirname + '/../themes/generic-logging.js'));
 
 // outputs red text
 console.log(colors.error('this is an error'));

package/index.d.ts

@@ -116,8 +116,8 @@ declare global {
         bgCyan: string;
         bgWhite: string;
 
-	reset: string;
-	// @ts-ignore
+        reset: string;
+        // @ts-ignore
         bold: string;
         dim: string;
         italic: string;

package/lib/colors.js

@@ -105,7 +105,11 @@ function applyStyle() {
   var args = Array.prototype.slice.call(arguments);
 
   var str = args.map(function(arg) {
-    return arg.constructor === String ? arg : util.inspect(arg);
+    if (arg != undefined && arg.constructor === String) {
+      return arg;
+    } else {
+      return util.inspect(arg);
+    }
   }).join(' ');
 
   if (!colors.enabled || !str) {
@@ -121,7 +125,9 @@ function applyStyle() {
     var code = ansiStyles[nestedStyles[i]];
     str = code.open + str.replace(code.closeRe, code.open) + code.close;
     if (newLinesPresent) {
-      str = str.replace(newLineRegex, code.close + '\n' + code.open);
+      str = str.replace(newLineRegex, function(match) {
+        return code.close + match + code.open;
+      });
     }
   }
 
@@ -179,10 +185,10 @@ colors.zalgo = require('./custom/zalgo');
 
 // maps
 colors.maps = {};
-colors.maps.america = require('./maps/america');
-colors.maps.zebra = require('./maps/zebra');
-colors.maps.rainbow = require('./maps/rainbow');
-colors.maps.random = require('./maps/random');
+colors.maps.america = require('./maps/america')(colors);
+colors.maps.zebra = require('./maps/zebra')(colors);
+colors.maps.rainbow = require('./maps/rainbow')(colors);
+colors.maps.random = require('./maps/random')(colors);
 
 for (var map in colors.maps) {
   (function(map) {

package/lib/extendStringPrototype.js

@@ -73,32 +73,30 @@ module['exports'] = function() {
       } else {
         if (typeof(theme[prop]) === 'string') {
           colors[prop] = colors[theme[prop]];
-          addProperty(prop, function() {
-            return colors[theme[prop]](this);
-          });
         } else {
-          addProperty(prop, function() {
-            var ret = this;
-            for (var t = 0; t < theme[prop].length; t++) {
-              ret = colors[theme[prop][t]](ret);
-            }
-            return ret;
-          });
+          var tmp = colors[theme[prop][0]];
+          for (var t = 1; t < theme[prop].length; t++) {
+            tmp = tmp[theme[prop][t]];
+          }
+          colors[prop] = tmp;
         }
+        addProperty(prop, function() {
+          return colors[prop](this);
+        });
       }
     });
   }
 
   colors.setTheme = function(theme) {
     if (typeof theme === 'string') {
-      try {
-        colors.themes[theme] = require(theme);
-        applyTheme(colors.themes[theme]);
-        return colors.themes[theme];
-      } catch (err) {
-        console.log(err);
-        return err;
-      }
+      console.log('colors.setTheme now only accepts an object, not a string. ' +
+        'If you are trying to set a theme from a file, it is now your (the ' +
+        'caller\'s) responsibility to require the file.  The old syntax ' +
+        'looked like colors.setTheme(__dirname + ' +
+        '\'/../themes/generic-logging.js\'); The new syntax looks like '+
+        'colors.setTheme(require(__dirname + ' +
+        '\'/../themes/generic-logging.js\'));');
+       return;
     } else {
       applyTheme(theme);
     }

package/lib/maps/america.js

@@ -1,6 +1,4 @@
-var colors = require('../colors');
-
-module['exports'] = (function() {
+module['exports'] = function(colors) {
   return function(letter, i, exploded) {
     if (letter === ' ') return letter;
     switch (i%3) {
@@ -9,4 +7,4 @@ module['exports'] = (function() {
       case 2: return colors.blue(letter);
     }
   };
-})();
+};

package/lib/maps/rainbow.js

@@ -1,6 +1,4 @@
-var colors = require('../colors');
-
-module['exports'] = (function() {
+module['exports'] = function(colors) {
   // RoY G BiV
   var rainbowColors = ['red', 'yellow', 'green', 'blue', 'magenta'];
   return function(letter, i, exploded) {
@@ -10,5 +8,5 @@ module['exports'] = (function() {
       return colors[rainbowColors[i++ % rainbowColors.length]](letter);
     }
   };
-})();
+};
 

package/lib/maps/random.js

@@ -1,6 +1,4 @@
-var colors = require('../colors');
-
-module['exports'] = (function() {
+module['exports'] = function(colors) {
   var available = ['underline', 'inverse', 'grey', 'yellow', 'red', 'green',
     'blue', 'white', 'cyan', 'magenta'];
   return function(letter, i, exploded) {
@@ -9,4 +7,4 @@ module['exports'] = (function() {
         available[Math.round(Math.random() * (available.length - 2))]
       ](letter);
   };
-})();
+};

package/lib/maps/zebra.js

@@ -1,5 +1,5 @@
-var colors = require('../colors');
-
-module['exports'] = function(letter, i, exploded) {
-  return i % 2 === 0 ? letter : colors.inverse(letter);
+module['exports'] = function(colors) {
+  return function(letter, i, exploded) {
+    return i % 2 === 0 ? letter : colors.inverse(letter);
+  };
 };

package/package.json

@@ -1,8 +1,14 @@
 {
     "name": "colors",
     "description": "get colors in your node.js console",
-    "version": "1.2.4",
+    "version": "1.3.2",
     "author": "Marak Squires",
+    "contributors": [
+        {
+            "name": "DABH",
+            "url": "https://github.com/DABH"
+        }
+    ],
     "homepage": "https://github.com/Marak/colors.js",
     "bugs": "https://github.com/Marak/colors.js/issues",
     "keywords": [
@@ -33,7 +39,7 @@
         "safe.d.ts"
     ],
     "devDependencies": {
-        "eslint": "^4.19.1",
-        "eslint-config-google": "^0.9.1"
+        "eslint-config-google": "^0.9.1",
+        "eslint": "^5.4.0"
     }
 }