supports-color 4.5.0 → 5.2.0

package/browser.js

@@ -1,2 +1,5 @@
 'use strict';
-module.exports = false;
+module.exports = {
+	stdout: false,
+	stderr: false
+};

package/index.js

@@ -4,7 +4,22 @@ const hasFlag = require('has-flag');
 
 const env = process.env;
 
-const support = level => {
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false')) {
+	forceColor = false;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = true;
+}
+if ('FORCE_COLOR' in env) {
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+}
+
+function translateLevel(level) {
 	if (level === 0) {
 		return false;
 	}
@@ -15,12 +30,10 @@ const support = level => {
 		has256: level >= 2,
 		has16m: level >= 3
 	};
-};
+}
 
-let supportLevel = (() => {
-	if (hasFlag('no-color') ||
-		hasFlag('no-colors') ||
-		hasFlag('color=false')) {
+function supportsColor(stream) {
+	if (forceColor === false) {
 		return 0;
 	}
 
@@ -34,30 +47,26 @@ let supportLevel = (() => {
 		return 2;
 	}
 
-	if (hasFlag('color') ||
-		hasFlag('colors') ||
-		hasFlag('color=true') ||
-		hasFlag('color=always')) {
-		return 1;
-	}
-
-	if (process.stdout && !process.stdout.isTTY) {
+	if (stream && !stream.isTTY && forceColor !== true) {
 		return 0;
 	}
 
+	const min = forceColor ? 1 : 0;
+
 	if (process.platform === 'win32') {
 		// Node.js 7.5.0 is the first version of Node.js to include a patch to
 		// libuv that enables 256 color output on Windows. Anything earlier and it
 		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
 		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
-		// release that supports 256 colors.
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
 		const osRelease = os.release().split('.');
 		if (
 			Number(process.versions.node.split('.')[0]) >= 8 &&
 			Number(osRelease[0]) >= 10 &&
 			Number(osRelease[2]) >= 10586
 		) {
-			return 2;
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
 		}
 
 		return 1;
@@ -68,7 +77,7 @@ let supportLevel = (() => {
 			return 1;
 		}
 
-		return 0;
+		return min;
 	}
 
 	if ('TEAMCITY_VERSION' in env) {
@@ -102,14 +111,19 @@ let supportLevel = (() => {
 	}
 
 	if (env.TERM === 'dumb') {
-		return 0;
+		return min;
 	}
 
-	return 0;
-})();
+	return min;
+}
 
-if ('FORCE_COLOR' in env) {
-	supportLevel = parseInt(env.FORCE_COLOR, 10) === 0 ? 0 : (supportLevel || 1);
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
 }
 
-module.exports = process && support(supportLevel);
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supports-color",
-  "version": "4.5.0",
+  "version": "5.2.0",
   "description": "Detect whether a terminal supports color",
   "license": "MIT",
   "repository": "chalk/supports-color",
@@ -42,7 +42,7 @@
     "16m"
   ],
   "dependencies": {
-    "has-flag": "^2.0.0"
+    "has-flag": "^3.0.0"
   },
   "devDependencies": {
     "ava": "*",

package/readme.md

@@ -15,25 +15,25 @@ $ npm install supports-color
 ```js
 const supportsColor = require('supports-color');
 
-if (supportsColor) {
-	console.log('Terminal supports color');
+if (supportsColor.stdout) {
+	console.log('Terminal stdout supports color');
 }
 
-if (supportsColor.has256) {
-	console.log('Terminal supports 256 colors');
+if (supportsColor.stdout.has256) {
+	console.log('Terminal stdout supports 256 colors');
 }
 
-if (supportsColor.has16m) {
-	console.log('Terminal supports 16 million colors (truecolor)');
+if (supportsColor.stderr.has16m) {
+	console.log('Terminal stderr supports 16 million colors (truecolor)');
 }
 ```
 
 
 ## API
 
-Returns an `Object`, or `false` if color is not supported.
+Returns an `Object` with a `stdout` and `stderr` property for testing either streams. Each property is an `Object`, or `false` if color is not supported.
 
-The returned object specifies a level of support for color through a `.level` property and a corresponding flag:
+The `stdout`/`stderr` objects specifies a level of support for color through a `.level` property and a corresponding flag:
 
 - `.level = 1` and `.hasBasic = true`: Basic color support (16 colors)
 - `.level = 2` and `.has256 = true`: 256 color support