chalk 1.1.2 → 1.1.3

package/index.js

@@ -1,6 +1,8 @@
 'use strict';
 var escapeStringRegexp = require('escape-string-regexp');
 var ansiStyles = require('ansi-styles');
+var stripAnsi = require('strip-ansi');
+var hasAnsi = require('has-ansi');
 var supportsColor = require('supports-color');
 var defineProps = Object.defineProperties;
 var isSimpleWindowsTerm = process.platform === 'win32' && !/^xterm/i.test(process.env.TERM);
@@ -15,17 +17,21 @@ if (isSimpleWindowsTerm) {
 	ansiStyles.blue.open = '\u001b[94m';
 }
 
-var styles = {};
+var styles = (function () {
+	var ret = {};
 
-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');
 
-	styles[key] = {
-		get: function () {
-			return build.call(this, this._styles ? this._styles.concat(key) : [key]);
-		}
-	};
-});
+		ret[key] = {
+			get: function () {
+				return build.call(this, this._styles.concat(key));
+			}
+		};
+	});
+
+	return ret;
+})();
 
 var proto = defineProps(function chalk() {}, styles);
 
@@ -79,11 +85,6 @@ function applyStyle() {
 		// otherwise only the part of the string until said closing code
 		// will be colored, and the rest will simply be 'plain'.
 		str = code.open + str.replace(code.closeRe, code.open) + code.close;
-
-		// Close the styling before a linebreak and reopen
-		// after next line to fix a bleed issue on OS X
-		// https://github.com/chalk/chalk/pull/92
-		str = str.replace(/\r?\n/g, code.close + '$&' + code.open);
 	}
 
 	// Reset the original 'dim' if we changed it to work around the Windows dimmed gray issue.
@@ -92,8 +93,24 @@ function applyStyle() {
 	return str;
 }
 
-defineProps(Chalk.prototype, styles);
+function init() {
+	var ret = {};
+
+	Object.keys(styles).forEach(function (name) {
+		ret[name] = {
+			get: function () {
+				return build.call(this, [name]);
+			}
+		};
+	});
+
+	return ret;
+}
+
+defineProps(Chalk.prototype, init());
 
 module.exports = new Chalk();
 module.exports.styles = ansiStyles;
+module.exports.hasColor = hasAnsi;
+module.exports.stripColor = stripAnsi;
 module.exports.supportsColor = supportsColor;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "chalk",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Terminal string styling done right. Much color.",
   "license": "MIT",
   "repository": "chalk/chalk",
   "maintainers": [
     "Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
-    "Joshua Boy Nicolai Appelman <joshua@jbna.nl> (jbna.nl)",
+    "Joshua Appelman <jappelman@xebia.com> (jbnicolai.com)",
     "JD Ballard <i.am.qix@gmail.com> (github.com/qix-)"
   ],
   "engines": {
@@ -47,16 +47,18 @@
   "dependencies": {
     "ansi-styles": "^2.2.1",
     "escape-string-regexp": "^1.0.2",
-    "supports-color": "^3.1.2"
+    "has-ansi": "^2.0.0",
+    "strip-ansi": "^3.0.0",
+    "supports-color": "^2.0.0"
   },
   "devDependencies": {
     "coveralls": "^2.11.2",
     "matcha": "^0.6.0",
     "mocha": "*",
-    "nyc": "^5.2.0",
+    "nyc": "^3.0.0",
     "require-uncached": "^1.0.2",
-    "resolve-from": "^2.0.0",
-    "semver": "^5.1.0",
+    "resolve-from": "^1.0.0",
+    "semver": "^4.3.3",
     "xo": "*"
   },
   "xo": {

package/readme.md

@@ -11,7 +11,7 @@
 
 [![Build Status](https://travis-ci.org/chalk/chalk.svg?branch=master)](https://travis-ci.org/chalk/chalk)
 [![Coverage Status](https://coveralls.io/repos/chalk/chalk/badge.svg?branch=master)](https://coveralls.io/r/chalk/chalk?branch=master)
-[![](https://img.shields.io/badge/unicorn-approved-ff69b4.svg)](https://www.youtube.com/watch?v=9auOCbH5Ns4)
+[![](http://img.shields.io/badge/unicorn-approved-ff69b4.svg)](https://www.youtube.com/watch?v=9auOCbH5Ns4)
 
 
 [colors.js](https://github.com/Marak/colors.js) used to be the most popular string styling module, but it has serious deficiencies like extending `String.prototype` which causes all kinds of [problems](https://github.com/yeoman/yo/issues/68). Although there are other ones, they either do too much or not enough.
@@ -30,7 +30,7 @@
 - Clean and focused
 - Auto-detects color support
 - Actively maintained
-- [Used by ~7700 modules](https://www.npmjs.com/browse/depended/chalk) as of March 15, 2016
+- [Used by ~4500 modules](https://www.npmjs.com/browse/depended/chalk) as of July 15, 2015
 
 
 ## Install
@@ -42,18 +42,13 @@ $ npm install --save chalk
 
 ## Usage
 
-```js
-const chalk = require('chalk');
-
-console.log(chalk.blue('Hello world!'));
-```
-
 Chalk comes with an easy to use composable API where you just chain and nest the styles you want.
 
-Here without `console.log` for purity.
-
 ```js
-const chalk = require('chalk');
+var chalk = require('chalk');
+
+// style a string
+chalk.blue('Hello world!');
 
 // combine styled and normal strings
 chalk.blue('Hello') + 'World' + chalk.red('!');
@@ -73,29 +68,22 @@ chalk.green(
 	chalk.blue.underline.bold('with a blue substring') +
 	' that becomes green again!'
 );
-
-// ES2015 template literal
-const systemStats = `
-CPU: ${chalk.red('90%')}
-RAM: ${chalk.green('40%')}
-DISK: ${chalk.yellow('70%')}
-`;
 ```
 
 Easily define your own themes.
 
 ```js
-const chalk = require('chalk');
-const error = chalk.bold.red;
+var chalk = require('chalk');
+var error = chalk.bold.red;
 console.log(error('Error!'));
 ```
 
 Take advantage of console.log [string substitution](http://nodejs.org/docs/latest/api/console.html#console_console_log_data).
 
 ```js
-const name = 'Sindre';
+var name = 'Sindre';
 console.log(chalk.green('Hello %s'), name);
-//=> 'Hello Sindre'
+//=> Hello Sindre
 ```
 
 
@@ -116,7 +104,7 @@ Color support is automatically detected, but you can override it by setting the
 If you need to change this in a reusable module create a new instance:
 
 ```js
-const ctx = new chalk.constructor({enabled: false});
+var ctx = new chalk.constructor({enabled: false});
 ```
 
 ### chalk.supportsColor
@@ -132,7 +120,7 @@ Exposes the styles as [ANSI escape codes](https://github.com/chalk/ansi-styles).
 Generally not useful, but you might need just the `.open` or `.close` escape code if you're mixing externally styled strings with your own.
 
 ```js
-const chalk = require('chalk');
+var chalk = require('chalk');
 
 console.log(chalk.styles.red);
 //=> {open: '\u001b[31m', close: '\u001b[39m'}
@@ -140,6 +128,27 @@ console.log(chalk.styles.red);
 console.log(chalk.styles.red.open + 'Hello' + chalk.styles.red.close);
 ```
 
+### chalk.hasColor(string)
+
+Check whether a string [has color](https://github.com/chalk/has-ansi).
+
+### chalk.stripColor(string)
+
+[Strip color](https://github.com/chalk/strip-ansi) from a string.
+
+Can be useful in combination with `.supportsColor` to strip color on externally styled text when it's not supported.
+
+Example:
+
+```js
+var chalk = require('chalk');
+var styledString = getText();
+
+if (!chalk.supportsColor) {
+	styledString = chalk.stripColor(styledString);
+}
+```
+
 
 ## Styles
 
@@ -185,7 +194,7 @@ Chalk does not support anything other than the base eight colors, which guarante
 
 ## Windows
 
-If you're on Windows, do yourself a favor and use [`cmder`](http://cmder.net/) instead of `cmd.exe`.
+If you're on Windows, do yourself a favor and use [`cmder`](http://bliker.github.io/cmder/) instead of `cmd.exe`.
 
 
 ## Related
@@ -197,7 +206,6 @@ If you're on Windows, do yourself a favor and use [`cmder`](http://cmder.net/) i
 - [has-ansi](https://github.com/chalk/has-ansi) - Check if a string has ANSI escape codes
 - [ansi-regex](https://github.com/chalk/ansi-regex) - Regular expression for matching ANSI escape codes
 - [wrap-ansi](https://github.com/chalk/wrap-ansi) - Wordwrap a string with ANSI escape codes
-- [slice-ansi](https://github.com/chalk/slice-ansi) - Slice a string with ANSI escape codes
 
 
 ## License