colors 1.2.5 → 1.3.3

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

@@ -125,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;
+      });
     }
   }
 
@@ -183,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/custom/trap.js

@@ -8,7 +8,7 @@ module['exports'] = function runTheTrap(text, options) {
     c: ['\u00a9', '\u023b', '\u03fe'],
     d: ['\u00d0', '\u018a', '\u0500', '\u0501', '\u0502', '\u0503'],
     e: ['\u00cb', '\u0115', '\u018e', '\u0258', '\u03a3', '\u03be', '\u04bc',
-         '\u0a6c'],
+      '\u0a6c'],
     f: ['\u04fa'],
     g: ['\u0262'],
     h: ['\u0126', '\u0195', '\u04a2', '\u04ba', '\u04c7', '\u050a'],
@@ -19,7 +19,7 @@ module['exports'] = function runTheTrap(text, options) {
     m: ['\u028d', '\u04cd', '\u04ce', '\u0520', '\u0521', '\u0d69'],
     n: ['\u00d1', '\u014b', '\u019d', '\u0376', '\u03a0', '\u048a'],
     o: ['\u00d8', '\u00f5', '\u00f8', '\u01fe', '\u0298', '\u047a', '\u05dd',
-         '\u06dd', '\u0e4f'],
+      '\u06dd', '\u0e4f'],
     p: ['\u01f7', '\u048e'],
     q: ['\u09cd'],
     r: ['\u00ae', '\u01a6', '\u0210', '\u024c', '\u0280', '\u042f'],

package/lib/custom/zalgo.js

@@ -75,21 +75,21 @@ module['exports'] = function zalgo(text, options) {
       result = result + text[l];
       counts = {'up': 0, 'down': 0, 'mid': 0};
       switch (options.size) {
-      case 'mini':
-        counts.up = randomNumber(8);
-        counts.mid = randomNumber(2);
-        counts.down = randomNumber(8);
-        break;
-      case 'maxi':
-        counts.up = randomNumber(16) + 3;
-        counts.mid = randomNumber(4) + 1;
-        counts.down = randomNumber(64) + 3;
-        break;
-      default:
-        counts.up = randomNumber(8) + 1;
-        counts.mid = randomNumber(6) / 2;
-        counts.down = randomNumber(8) + 1;
-        break;
+        case 'mini':
+          counts.up = randomNumber(8);
+          counts.mid = randomNumber(2);
+          counts.down = randomNumber(8);
+          break;
+        case 'maxi':
+          counts.up = randomNumber(16) + 3;
+          counts.mid = randomNumber(4) + 1;
+          counts.down = randomNumber(64) + 3;
+          break;
+        default:
+          counts.up = randomNumber(8) + 1;
+          counts.mid = randomNumber(6) / 2;
+          counts.down = randomNumber(8) + 1;
+          break;
       }
 
       var arr = ['up', 'mid', 'down'];

package/lib/extendStringPrototype.js

@@ -74,16 +74,20 @@ module['exports'] = function() {
         if (typeof(theme[prop]) === 'string') {
           colors[prop] = colors[theme[prop]];
           addProperty(prop, function() {
-            return colors[theme[prop]](this);
+            return colors[prop](this);
           });
         } else {
-          addProperty(prop, function() {
-            var ret = this;
+          var themePropApplicator = function(str) {
+            var ret = str || this;
             for (var t = 0; t < theme[prop].length; t++) {
               ret = colors[theme[prop][t]](ret);
             }
             return ret;
-          });
+          };
+          addProperty(prop, themePropApplicator);
+          colors[prop] = function(str) {
+            return themePropApplicator(str);
+          };
         }
       }
     });
@@ -91,14 +95,14 @@ module['exports'] = function() {
 
   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,12 +1,10 @@
-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) {
     return letter === ' ' ? letter :
       colors[
-        available[Math.round(Math.random() * (available.length - 2))]
+          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.5",
+    "version": "1.3.3",
     "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": "^5.2.0",
+        "eslint-config-google": "^0.11.0"
     }
 }