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

Merge f4478dae69 into a6ad945452

Browse source
This commit is contained in:
mirefly 2018-07-14 05:24:14 +00:00 • committed by GitHub
commit 54ce540160
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
index.js
View file

@ -78,6 +78,7 @@ for (const model of Object.keys(ansiStyles.color.ansi)) {
styles[model] = { styles[model] = {
get() { get() {
const level = this.level; const level = this.level;
const self = this;
return function () { return function () {
const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments); const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
const codes = { const codes = {
@ -85,7 +86,7 @@ for (const model of Object.keys(ansiStyles.color.ansi)) {
close: ansiStyles.color.close, close: ansiStyles.color.close,
closeRe: ansiStyles.color.closeRe closeRe: ansiStyles.color.closeRe
}; };
return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model); return build.call(self, self._styles ? self._styles.concat(codes) : [codes], self._empty, model);
}; };
} }
}; };
@ -101,6 +102,7 @@ for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
styles[bgModel] = { styles[bgModel] = {
get() { get() {
const level = this.level; const level = this.level;
const self = this;
return function () { return function () {
const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments); const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
const codes = { const codes = {
@ -108,7 +110,7 @@ for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
close: ansiStyles.bgColor.close, close: ansiStyles.bgColor.close,
closeRe: ansiStyles.bgColor.closeRe closeRe: ansiStyles.bgColor.closeRe
}; };
return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model); return build.call(self, self._styles ? self._styles.concat(codes) : [codes], self._empty, model);
}; };
} }
}; };

7
test/chalk.js
View file

@ -98,3 +98,10 @@ test('don\'t emit RGB codes if level is 0', t => {
t.is(new m.constructor({level: 0}).hex('#FF0000')('hello'), 'hello'); t.is(new m.constructor({level: 0}).hex('#FF0000')('hello'), 'hello');
t.is(new m.constructor({level: 0}).bgHex('#FF0000')('hello'), 'hello'); t.is(new m.constructor({level: 0}).bgHex('#FF0000')('hello'), 'hello');
}); });
test('support destructure hex/bgHex function', t => {
const {hex} = m.constructor({level: 2});
t.is(hex('#FF0000')('hello'), '\u001B[38;5;196mhello\u001B[39m');
const {bgHex} = m.constructor({level: 2});
t.is(bgHex('#FF0000')('hello'), '\u001B[48;5;196mhello\u001B[49m');
});