colors 1.3.0 → 1.4.0

package/README.md

@@ -29,6 +29,16 @@ Please check out the [roadmap](ROADMAP.md) for upcoming features and releases.
   - gray
   - grey
 
+### bright text colors
+
+  - brightRed
+  - brightGreen
+  - brightYellow
+  - brightBlue
+  - brightMagenta
+  - brightCyan
+  - brightWhite
+
 ### background colors
 
   - bgBlack
@@ -39,6 +49,18 @@ Please check out the [roadmap](ROADMAP.md) for upcoming features and releases.
   - bgMagenta
   - bgCyan
   - bgWhite
+  - bgGray
+  - bgGrey
+
+### bright background colors
+
+  - bgBrightRed
+  - bgBrightGreen
+  - bgBrightYellow
+  - bgBrightBlue
+  - bgBrightMagenta
+  - bgBrightCyan
+  - bgBrightWhite
 
 ### styles
 
@@ -94,12 +116,27 @@ I prefer the first way. Some people seem to be afraid of extending `String.proto
 
 If you are writing good code you will never have an issue with the first approach. If you really don't want to touch `String.prototype`, the second usage will not touch `String` native object.
 
-## Disabling Colors
+## Enabling/Disabling Colors
 
-To disable colors you can pass the following arguments in the command line to your application:
+The package will auto-detect whether your terminal can use colors and enable/disable accordingly. When colors are disabled, the color functions do nothing. You can override this with a command-line flag:
 
 ```bash
 node myapp.js --no-color
+node myapp.js --color=false
+
+node myapp.js --color
+node myapp.js --color=true
+node myapp.js --color=always
+
+FORCE_COLOR=1 node myapp.js
+```
+
+Or in code:
+
+```javascript
+var colors = require('colors');
+colors.enable();
+colors.disable();
 ```
 
 ## Console.log [string substitution](http://nodejs.org/docs/latest/api/console.html#console_console_log_data)

package/examples/normal-usage.js

@@ -29,6 +29,7 @@ console.log('Background color attack!'.black.bgWhite);
 console.log('Use random styles on everything!'.random);
 console.log('America, Heck Yeah!'.america);
 
+console.log('Blindingly '.brightCyan + 'bright? '.brightRed + 'Why '.brightYellow + 'not?!'.brightGreen);
 
 console.log('Setting themes is useful');
 

package/examples/safe-string.js

@@ -28,6 +28,8 @@ console.log(colors.black.bgWhite('Background color attack!'));
 console.log(colors.random('Use random styles on everything!'));
 console.log(colors.america('America, Heck Yeah!'));
 
+console.log(colors.brightCyan('Blindingly ') + colors.brightRed('bright? ') + colors.brightYellow('Why ') + colors.brightGreen('not?!'));
+
 console.log('Setting themes is useful');
 
 //
@@ -37,7 +39,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 +56,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

@@ -62,7 +62,16 @@ var stylize = colors.stylize = function stylize(str, style) {
     return str+'';
   }
 
-  return ansiStyles[style].open + str + ansiStyles[style].close;
+  var styleMap = ansiStyles[style];
+
+  // Stylize should work for non-ANSI styles, too
+  if(!styleMap && style in colors){
+    // Style maps like trap operate as functions on strings;
+    // they don't have properties like open or close.
+    return colors[style](str);
+  }
+
+  return styleMap.open + str + styleMap.close;
 };
 
 var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
@@ -105,7 +114,8 @@ function applyStyle() {
   var args = Array.prototype.slice.call(arguments);
 
   var str = args.map(function(arg) {
-    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);
@@ -125,7 +135,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 +195,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);
+          };
         }
       }
     });
@@ -98,7 +102,7 @@ module['exports'] = function() {
         '\'/../themes/generic-logging.js\'); The new syntax looks like '+
         'colors.setTheme(require(__dirname + ' +
         '\'/../themes/generic-logging.js\'));');
-       return;
+      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,11 @@
-var colors = require('../colors');
-
-module['exports'] = (function() {
+module['exports'] = function(colors) {
   var available = ['underline', 'inverse', 'grey', 'yellow', 'red', 'green',
-    'blue', 'white', 'cyan', 'magenta'];
+    'blue', 'white', 'cyan', 'magenta', 'brightYellow', 'brightRed',
+    'brightGreen', 'brightBlue', 'brightWhite', 'brightCyan', 'brightMagenta'];
   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/lib/styles.js

@@ -48,6 +48,14 @@ var codes = {
   gray: [90, 39],
   grey: [90, 39],
 
+  brightRed: [91, 39],
+  brightGreen: [92, 39],
+  brightYellow: [93, 39],
+  brightBlue: [94, 39],
+  brightMagenta: [95, 39],
+  brightCyan: [96, 39],
+  brightWhite: [97, 39],
+
   bgBlack: [40, 49],
   bgRed: [41, 49],
   bgGreen: [42, 49],
@@ -56,6 +64,16 @@ var codes = {
   bgMagenta: [45, 49],
   bgCyan: [46, 49],
   bgWhite: [47, 49],
+  bgGray: [100, 49],
+  bgGrey: [100, 49],
+
+  bgBrightRed: [101, 49],
+  bgBrightGreen: [102, 49],
+  bgBrightYellow: [103, 49],
+  bgBrightBlue: [104, 49],
+  bgBrightMagenta: [105, 49],
+  bgBrightCyan: [106, 49],
+  bgBrightWhite: [107, 49],
 
   // legacy styles for colors pre v1.0.0
   blackBG: [40, 49],

package/package.json

@@ -1,8 +1,14 @@
 {
     "name": "colors",
     "description": "get colors in your node.js console",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "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"
     }
 }