colors 1.2.0 → 1.2.4

package/examples/normal-usage.js

@@ -1,34 +1,36 @@
 var colors = require('../lib/index');
 
-console.log("First some yellow text".yellow);
+console.log('First some yellow text'.yellow);
 
-console.log("Underline that text".yellow.underline);
+console.log('Underline that text'.yellow.underline);
 
-console.log("Make it bold and red".red.bold);
+console.log('Make it bold and red'.red.bold);
 
-console.log(("Double Raindows All Day Long").rainbow)
+console.log(('Double Raindows All Day Long').rainbow);
 
-console.log("Drop the bass".trap)
+console.log('Drop the bass'.trap);
 
-console.log("DROP THE RAINBOW BASS".trap.rainbow)
+console.log('DROP THE RAINBOW BASS'.trap.rainbow);
 
+// styles not widely supported
+console.log('Chains are also cool.'.bold.italic.underline.red);
 
-console.log('Chains are also cool.'.bold.italic.underline.red); // styles not widely supported
-
-console.log('So '.green + 'are'.underline + ' ' + 'inverse'.inverse + ' styles! '.yellow.bold); // styles not widely supported
-console.log("Zebras are so fun!".zebra);
+// styles not widely supported
+console.log('So '.green + 'are'.underline + ' ' + 'inverse'.inverse
+  + ' styles! '.yellow.bold);
+console.log('Zebras are so fun!'.zebra);
 
 //
 // Remark: .strikethrough may not work with Mac OS Terminal App
 //
-console.log("This is " + "not".strikethrough + " fun.");
+console.log('This is ' + 'not'.strikethrough + ' fun.');
 
-console.log('Background color attack!'.black.bgWhite)
-console.log('Use random styles on everything!'.random)
-console.log('America, Heck Yeah!'.america)
+console.log('Background color attack!'.black.bgWhite);
+console.log('Use random styles on everything!'.random);
+console.log('America, Heck Yeah!'.america);
 
 
-console.log('Setting themes is useful')
+console.log('Setting themes is useful');
 
 //
 // Custom themes
@@ -45,17 +47,17 @@ colors.setTheme({
   help: 'cyan',
   warn: 'yellow',
   debug: 'blue',
-  error: 'red'
+  error: 'red',
 });
 
 // outputs red text
-console.log("this is an error".error);
+console.log('this is an error'.error);
 
 // outputs yellow text
-console.log("this is a warning".warn);
+console.log('this is a warning'.warn);
 
 // outputs grey text
-console.log("this is an input".input);
+console.log('this is an input'.input);
 
 console.log('Generic logging theme as file'.green.bold.underline);
 
@@ -67,12 +69,13 @@ try {
 }
 
 // outputs red text
-console.log("this is an error".error);
+console.log('this is an error'.error);
 
 // outputs yellow text
-console.log("this is a warning".warn);
+console.log('this is a warning'.warn);
 
 // outputs grey text
-console.log("this is an input".input);
+console.log('this is an input'.input);
+
+// console.log("Don't summon".zalgo)
 
-//console.log("Don't summon".zalgo)

package/examples/safe-string.js

@@ -1,37 +1,39 @@
 var colors = require('../safe');
 
-console.log(colors.yellow("First some yellow text"));
+console.log(colors.yellow('First some yellow text'));
 
-console.log(colors.yellow.underline("Underline that text"));
+console.log(colors.yellow.underline('Underline that text'));
 
-console.log(colors.red.bold("Make it bold and red"));
+console.log(colors.red.bold('Make it bold and red'));
 
-console.log(colors.rainbow("Double Raindows All Day Long"))
+console.log(colors.rainbow('Double Raindows All Day Long'));
 
-console.log(colors.trap("Drop the bass"))
+console.log(colors.trap('Drop the bass'));
 
-console.log(colors.rainbow(colors.trap("DROP THE RAINBOW BASS")));
+console.log(colors.rainbow(colors.trap('DROP THE RAINBOW BASS')));
 
-console.log(colors.bold.italic.underline.red('Chains are also cool.')); // styles not widely supported
+// styles not widely supported
+console.log(colors.bold.italic.underline.red('Chains are also cool.'));
 
+// styles not widely supported
+console.log(colors.green('So ') + colors.underline('are') + ' '
+  + colors.inverse('inverse') + colors.yellow.bold(' styles! '));
 
-console.log(colors.green('So ') + colors.underline('are') + ' ' + colors.inverse('inverse') + colors.yellow.bold(' styles! ')); // styles not widely supported
+console.log(colors.zebra('Zebras are so fun!'));
 
-console.log(colors.zebra("Zebras are so fun!"));
-
-console.log("This is " + colors.strikethrough("not") + " fun.");
+console.log('This is ' + colors.strikethrough('not') + ' fun.');
 
 
 console.log(colors.black.bgWhite('Background color attack!'));
-console.log(colors.random('Use random styles on everything!'))
+console.log(colors.random('Use random styles on everything!'));
 console.log(colors.america('America, Heck Yeah!'));
 
-console.log('Setting themes is useful')
+console.log('Setting themes is useful');
 
 //
 // Custom themes
 //
-//console.log('Generic logging theme as JSON'.green.bold.underline);
+// console.log('Generic logging theme as JSON'.green.bold.underline);
 // Load theme with JSON literal
 colors.setTheme({
   silly: 'rainbow',
@@ -43,17 +45,17 @@ colors.setTheme({
   help: 'cyan',
   warn: 'yellow',
   debug: 'blue',
-  error: 'red'
+  error: 'red',
 });
 
 // outputs red text
-console.log(colors.error("this is an error"));
+console.log(colors.error('this is an error'));
 
 // outputs yellow text
-console.log(colors.warn("this is a warning"));
+console.log(colors.warn('this is a warning'));
 
 // outputs grey text
-console.log(colors.input("this is an input"));
+console.log(colors.input('this is an input'));
 
 
 // console.log('Generic logging theme as file'.green.bold.underline);
@@ -62,15 +64,14 @@ console.log(colors.input("this is an input"));
 colors.setTheme(__dirname + '/../themes/generic-logging.js');
 
 // outputs red text
-console.log(colors.error("this is an error"));
+console.log(colors.error('this is an error'));
 
 // outputs yellow text
-console.log(colors.warn("this is a warning"));
+console.log(colors.warn('this is a warning'));
 
 // outputs grey text
-console.log(colors.input("this is an input"));
+console.log(colors.input('this is an input'));
 
 // console.log(colors.zalgo("Don't summon him"))
 
 
-

package/index.d.ts

@@ -0,0 +1,136 @@
+// Type definitions for Colors.js 1.2
+// Project: https://github.com/Marak/colors.js
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Staffan Eketorp <https://github.com/staeke>
+// Definitions: https://github.com/Marak/colors.js
+
+export interface Color {
+    (text: string): string;
+
+    strip: Color;
+    stripColors: Color;
+
+    black: Color;
+    red: Color;
+    green: Color;
+    yellow: Color;
+    blue: Color;
+    magenta: Color;
+    cyan: Color;
+    white: Color;
+    gray: Color;
+    grey: Color;
+
+    bgBlack: Color;
+    bgRed: Color;
+    bgGreen: Color;
+    bgYellow: Color;
+    bgBlue: Color;
+    bgMagenta: Color;
+    bgCyan: Color;
+    bgWhite: Color;
+
+    reset: Color;
+    bold: Color;
+    dim: Color;
+    italic: Color;
+    underline: Color;
+    inverse: Color;
+    hidden: Color;
+    strikethrough: Color;
+
+    rainbow: Color;
+    zebra: Color;
+    america: Color;
+    trap: Color;
+    random: Color;
+    zalgo: Color;
+}
+
+export function enable(): void;
+export function disable(): void;
+export function setTheme(theme: any): void;
+
+export let enabled: boolean;
+
+export const strip: Color;
+export const stripColors: Color;
+
+export const black: Color;
+export const red: Color;
+export const green: Color;
+export const yellow: Color;
+export const blue: Color;
+export const magenta: Color;
+export const cyan: Color;
+export const white: Color;
+export const gray: Color;
+export const grey: Color;
+
+export const bgBlack: Color;
+export const bgRed: Color;
+export const bgGreen: Color;
+export const bgYellow: Color;
+export const bgBlue: Color;
+export const bgMagenta: Color;
+export const bgCyan: Color;
+export const bgWhite: Color;
+
+export const reset: Color;
+export const bold: Color;
+export const dim: Color;
+export const italic: Color;
+export const underline: Color;
+export const inverse: Color;
+export const hidden: Color;
+export const strikethrough: Color;
+
+export const rainbow: Color;
+export const zebra: Color;
+export const america: Color;
+export const trap: Color;
+export const random: Color;
+export const zalgo: Color;
+
+declare global {
+    interface String {
+        strip: string;
+        stripColors: string;
+
+        black: string;
+        red: string;
+        green: string;
+        yellow: string;
+        blue: string;
+        magenta: string;
+        cyan: string;
+        white: string;
+        gray: string;
+        grey: string;
+
+        bgBlack: string;
+        bgRed: string;
+        bgGreen: string;
+        bgYellow: string;
+        bgBlue: string;
+        bgMagenta: string;
+        bgCyan: string;
+        bgWhite: string;
+
+	reset: string;
+	// @ts-ignore
+        bold: string;
+        dim: string;
+        italic: string;
+        underline: string;
+        inverse: string;
+        hidden: string;
+        strikethrough: string;
+
+        rainbow: string;
+        zebra: string;
+        america: string;
+        trap: string;
+        random: string;
+        zalgo: string;
+    }
+}

package/lib/colors.js

@@ -2,7 +2,7 @@
 
 The MIT License (MIT)
 
-Original Library 
+Original Library
   - Copyright (c) Marak Squires
 
 Additional functionality
@@ -33,35 +33,45 @@ module['exports'] = colors;
 
 colors.themes = {};
 
+var util = require('util');
 var ansiStyles = colors.styles = require('./styles');
 var defineProps = Object.defineProperties;
+var newLineRegex = new RegExp(/[\r\n]+/g);
 
 colors.supportsColor = require('./system/supports-colors').supportsColor;
 
-if (typeof colors.enabled === "undefined") {
+if (typeof colors.enabled === 'undefined') {
   colors.enabled = colors.supportsColor() !== false;
 }
 
-colors.stripColors = colors.strip = function(str){
-  return ("" + str).replace(/\x1B\[\d+m/g, '');
+colors.enable = function() {
+  colors.enabled = true;
 };
 
+colors.disable = function() {
+  colors.enabled = false;
+};
+
+colors.stripColors = colors.strip = function(str) {
+  return ('' + str).replace(/\x1B\[\d+m/g, '');
+};
 
-var stylize = colors.stylize = function stylize (str, style) {
+// eslint-disable-next-line no-unused-vars
+var stylize = colors.stylize = function stylize(str, style) {
   if (!colors.enabled) {
     return str+'';
   }
 
   return ansiStyles[style].open + str + ansiStyles[style].close;
-}
+};
 
 var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
-var escapeStringRegexp = function (str) {
+var escapeStringRegexp = function(str) {
   if (typeof str !== 'string') {
     throw new TypeError('Expected a string');
   }
-  return str.replace(matchOperatorsRe,  '\\$&');
-}
+  return str.replace(matchOperatorsRe, '\\$&');
+};
 
 function build(_styles) {
   var builder = function builder() {
@@ -74,15 +84,16 @@ function build(_styles) {
   return builder;
 }
 
-var styles = (function () {
+var styles = (function() {
   var ret = {};
   ansiStyles.grey = ansiStyles.gray;
-  Object.keys(ansiStyles).forEach(function (key) {
-    ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+  Object.keys(ansiStyles).forEach(function(key) {
+    ansiStyles[key].closeRe =
+      new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
     ret[key] = {
-      get: function () {
+      get: function() {
         return build(this._styles.concat(key));
-      }
+      },
     };
   });
   return ret;
@@ -91,70 +102,75 @@ var styles = (function () {
 var proto = defineProps(function colors() {}, styles);
 
 function applyStyle() {
-  var args = arguments;
-  var argsLen = args.length;
-  var str = argsLen !== 0 && String(arguments[0]);
-  if (argsLen > 1) {
-    for (var a = 1; a < argsLen; a++) {
-      str += ' ' + args[a];
-    }
-  }
+  var args = Array.prototype.slice.call(arguments);
+
+  var str = args.map(function(arg) {
+    return arg.constructor === String ? arg : util.inspect(arg);
+  }).join(' ');
 
   if (!colors.enabled || !str) {
     return str;
   }
 
+  var newLinesPresent = str.indexOf('\n') != -1;
+
   var nestedStyles = this._styles;
 
   var i = nestedStyles.length;
   while (i--) {
     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);
+    }
   }
 
   return str;
 }
 
-colors.setTheme = function (theme) {
+colors.setTheme = function(theme) {
   if (typeof theme === 'string') {
     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\'));');
+      '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;
   }
   for (var style in theme) {
-    (function(style){
-      colors[style] = function(str){
-        if (typeof theme[style] === 'object'){
+    (function(style) {
+      colors[style] = function(str) {
+        if (typeof theme[style] === 'object') {
           var out = str;
-          for (var i in theme[style]){
+          for (var i in theme[style]) {
             out = colors[theme[style][i]](out);
           }
           return out;
         }
         return colors[theme[style]](str);
       };
-    })(style)
+    })(style);
   }
-}
+};
 
 function init() {
   var ret = {};
-  Object.keys(styles).forEach(function (name) {
+  Object.keys(styles).forEach(function(name) {
     ret[name] = {
-      get: function () {
+      get: function() {
         return build([name]);
-      }
+      },
     };
   });
   return ret;
 }
 
-var sequencer = function sequencer (map, str) {
-  var exploded = str.split(""), i = 0;
+var sequencer = function sequencer(map, str) {
+  var exploded = str.split('');
   exploded = exploded.map(map);
-  return exploded.join("");
+  return exploded.join('');
 };
 
 // custom formatter methods
@@ -166,14 +182,14 @@ 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.random = require('./maps/random');
 
 for (var map in colors.maps) {
-  (function(map){
-    colors[map] = function (str) {
+  (function(map) {
+    colors[map] = function(str) {
       return sequencer(colors.maps[map], str);
-    }
-  })(map)
+    };
+  })(map);
 }
 
 defineProps(colors, init());

package/lib/custom/trap.js

@@ -1,45 +1,46 @@
-module['exports'] = function runTheTrap (text, options) {
-  var result = "";
-  text = text || "Run the trap, drop the bass";
+module['exports'] = function runTheTrap(text, options) {
+  var result = '';
+  text = text || 'Run the trap, drop the bass';
   text = text.split('');
   var trap = {
-    a: ["\u0040", "\u0104", "\u023a", "\u0245", "\u0394", "\u039b", "\u0414"],
-    b: ["\u00df", "\u0181", "\u0243", "\u026e", "\u03b2", "\u0e3f"],
-    c: ["\u00a9", "\u023b", "\u03fe"],
-    d: ["\u00d0", "\u018a", "\u0500" , "\u0501" ,"\u0502", "\u0503"],
-    e: ["\u00cb", "\u0115", "\u018e", "\u0258", "\u03a3", "\u03be", "\u04bc", "\u0a6c"],
-    f: ["\u04fa"],
-    g: ["\u0262"],
-    h: ["\u0126", "\u0195", "\u04a2", "\u04ba", "\u04c7", "\u050a"],
-    i: ["\u0f0f"],
-    j: ["\u0134"],
-    k: ["\u0138", "\u04a0", "\u04c3", "\u051e"],
-    l: ["\u0139"],
-    m: ["\u028d", "\u04cd", "\u04ce", "\u0520", "\u0521", "\u0d69"],
-    n: ["\u00d1", "\u014b", "\u019d", "\u0376", "\u03a0", "\u048a"],
-    o: ["\u00d8", "\u00f5", "\u00f8", "\u01fe", "\u0298", "\u047a", "\u05dd", "\u06dd", "\u0e4f"],
-    p: ["\u01f7", "\u048e"],
-    q: ["\u09cd"],
-    r: ["\u00ae", "\u01a6", "\u0210", "\u024c", "\u0280", "\u042f"],
-    s: ["\u00a7", "\u03de", "\u03df", "\u03e8"],
-    t: ["\u0141", "\u0166", "\u0373"],
-    u: ["\u01b1", "\u054d"],
-    v: ["\u05d8"],
-    w: ["\u0428", "\u0460", "\u047c", "\u0d70"],
-    x: ["\u04b2", "\u04fe", "\u04fc", "\u04fd"],
-    y: ["\u00a5", "\u04b0", "\u04cb"],
-    z: ["\u01b5", "\u0240"]
-  }
-  text.forEach(function(c){
+    a: ['\u0040', '\u0104', '\u023a', '\u0245', '\u0394', '\u039b', '\u0414'],
+    b: ['\u00df', '\u0181', '\u0243', '\u026e', '\u03b2', '\u0e3f'],
+    c: ['\u00a9', '\u023b', '\u03fe'],
+    d: ['\u00d0', '\u018a', '\u0500', '\u0501', '\u0502', '\u0503'],
+    e: ['\u00cb', '\u0115', '\u018e', '\u0258', '\u03a3', '\u03be', '\u04bc',
+         '\u0a6c'],
+    f: ['\u04fa'],
+    g: ['\u0262'],
+    h: ['\u0126', '\u0195', '\u04a2', '\u04ba', '\u04c7', '\u050a'],
+    i: ['\u0f0f'],
+    j: ['\u0134'],
+    k: ['\u0138', '\u04a0', '\u04c3', '\u051e'],
+    l: ['\u0139'],
+    m: ['\u028d', '\u04cd', '\u04ce', '\u0520', '\u0521', '\u0d69'],
+    n: ['\u00d1', '\u014b', '\u019d', '\u0376', '\u03a0', '\u048a'],
+    o: ['\u00d8', '\u00f5', '\u00f8', '\u01fe', '\u0298', '\u047a', '\u05dd',
+         '\u06dd', '\u0e4f'],
+    p: ['\u01f7', '\u048e'],
+    q: ['\u09cd'],
+    r: ['\u00ae', '\u01a6', '\u0210', '\u024c', '\u0280', '\u042f'],
+    s: ['\u00a7', '\u03de', '\u03df', '\u03e8'],
+    t: ['\u0141', '\u0166', '\u0373'],
+    u: ['\u01b1', '\u054d'],
+    v: ['\u05d8'],
+    w: ['\u0428', '\u0460', '\u047c', '\u0d70'],
+    x: ['\u04b2', '\u04fe', '\u04fc', '\u04fd'],
+    y: ['\u00a5', '\u04b0', '\u04cb'],
+    z: ['\u01b5', '\u0240'],
+  };
+  text.forEach(function(c) {
     c = c.toLowerCase();
-    var chars = trap[c] || [" "];
+    var chars = trap[c] || [' '];
     var rand = Math.floor(Math.random() * chars.length);
-    if (typeof trap[c] !== "undefined") {
+    if (typeof trap[c] !== 'undefined') {
       result += trap[c][rand];
     } else {
       result += c;
     }
   });
   return result;
-
-}
+};