orbit-oss/chalk
5
4
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use supportsColor.level instead of an enabled bool

Browse source
This commit is contained in:
Josh Junon 2017-01-17 00:52:59 -08:00
parent 5a69476142
commit 7d69b22f29
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
index.js
View file

@ -7,8 +7,8 @@ var defineProps = Object.defineProperties;
var isSimpleWindowsTerm = process.platform === 'win32' && !/^xterm/i.test(process.env.TERM); var isSimpleWindowsTerm = process.platform === 'win32' && !/^xterm/i.test(process.env.TERM);
function Chalk(options) { function Chalk(options) {
// detect mode if not set manually // detect level if not set manually
this.enabled = !options || options.enabled === undefined ? supportsColor : options.enabled; this.level = !options || options.level === undefined ? supportsColor.level : options.level;
} }
// use bright blue on Windows as the normal blue color is illegible // use bright blue on Windows as the normal blue color is illegible
@ -37,7 +37,7 @@ function build(_styles) {
}; };
builder._styles = _styles; builder._styles = _styles;
builder.enabled = this.enabled; builder.level = this.level;
// __proto__ is used because we must return a function, but there is // __proto__ is used because we must return a function, but there is
// no way to create a function with a different prototype. // no way to create a function with a different prototype.
/* eslint-disable no-proto */ /* eslint-disable no-proto */
@ -59,7 +59,7 @@ function applyStyle() {
} }
} }
if (!this.enabled || !str) { if (!this.level || !str) {
return str; return str;
} }

4
package.json
View file

@ -44,9 +44,9 @@
"text" "text"
], ],
"dependencies": { "dependencies": {
"ansi-styles": "^2.1.0", "ansi-styles": "^3.0.0",
"escape-string-regexp": "^1.0.2", "escape-string-regexp": "^1.0.2",
"supports-color": "^3.1.2" "supports-color": "^3.2.3"
}, },
"devDependencies": { "devDependencies": {
"coveralls": "^2.11.2", "coveralls": "^2.11.2",

9
test.js
View file

@ -132,17 +132,18 @@ describe('chalk on windows', function () {
}); });
}); });
describe('chalk.enabled', function () { describe('chalk.level', function () {
it('should not output colors when manually disabled', function () { it('should not output colors when manually disabled', function () {
chalk.enabled = false; var oldLevel = chalk.level;
chalk.level = 0;
assert.equal(chalk.red('foo'), 'foo'); assert.equal(chalk.red('foo'), 'foo');
chalk.enabled = true; chalk.level = oldLevel;
}); });
}); });
describe('chalk.constructor', function () { describe('chalk.constructor', function () {
it('should create a isolated context where colors can be disabled', function () { it('should create a isolated context where colors can be disabled', function () {
var ctx = new chalk.constructor({enabled: false}); var ctx = new chalk.constructor({level: 0});
assert.equal(ctx.red('foo'), 'foo'); assert.equal(ctx.red('foo'), 'foo');
assert.equal(chalk.red('foo'), '\u001b[31mfoo\u001b[39m'); assert.equal(chalk.red('foo'), '\u001b[31mfoo\u001b[39m');
}); });