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

Minor refactoring

Browse source
This commit is contained in:
Sindre Sorhus 2019-03-14 23:53:22 +07:00
parent cd5de7a2f6
commit 7b9211be50
1 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
index.js
View file

@ -17,7 +17,7 @@ const skipModels = new Set(['gray']);
const styles = Object.create(null); const styles = Object.create(null);
function applyOptions(object, options = {}) { const applyOptions = (object, options = {}) => {
if (options.level > 3 || options.level < 0) { if (options.level > 3 || options.level < 0) {
throw new Error('The `level` option should be an integer from 0 to 3'); throw new Error('The `level` option should be an integer from 0 to 3');
} }
@ -26,7 +26,7 @@ function applyOptions(object, options = {}) {
const colorLevel = stdoutColor ? stdoutColor.level : 0; const colorLevel = stdoutColor ? stdoutColor.level : 0;
object.level = options.level === undefined ? colorLevel : options.level; object.level = options.level === undefined ? colorLevel : options.level;
object.enabled = 'enabled' in options ? options.enabled : object.level > 0; object.enabled = 'enabled' in options ? options.enabled : object.level > 0;
} };
class ChalkClass { class ChalkClass {
constructor(options) { constructor(options) {
@ -34,7 +34,7 @@ class ChalkClass {
} }
} }
function chalkFactory(options) { const chalkFactory = options => {
const chalk = {}; const chalk = {};
applyOptions(chalk, options); applyOptions(chalk, options);
@ -50,7 +50,7 @@ function chalkFactory(options) {
chalk.template.Instance = ChalkClass; chalk.template.Instance = ChalkClass;
return chalk.template; return chalk.template;
} };
function Chalk(options) { function Chalk(options) {
return chalkFactory(options); return chalkFactory(options);
@ -61,14 +61,14 @@ for (const [styleName, style] of Object.entries(ansiStyles)) {
styles[styleName] = { styles[styleName] = {
get() { get() {
return build.call(this, [...(this._styles || []), style], this._empty); return createBuilder(this, [...(this._styles || []), style], this._isEmpty);
} }
}; };
} }
styles.visible = { styles.visible = {
get() { get() {
return build.call(this, this._styles || [], true); return createBuilder(this, this._styles || [], true);
} }
}; };
@ -81,14 +81,14 @@ for (const model of Object.keys(ansiStyles.color.ansi)) {
styles[model] = { styles[model] = {
get() { get() {
const {level} = this; const {level} = this;
return function (...args) { return function (...arguments_) {
const open = ansiStyles.color[levelMapping[level]][model](...args); const open = ansiStyles.color[levelMapping[level]][model](...arguments_);
const codes = { const codes = {
open, open,
close: ansiStyles.color.close, close: ansiStyles.color.close,
closeRe: ansiStyles.color.closeRe closeRe: ansiStyles.color.closeRe
}; };
return build.call(this, [...(this._styles || []), codes], this._empty); return createBuilder(this, [...(this._styles || []), codes], this._isEmpty);
}; };
} }
}; };
@ -111,7 +111,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 || []), codes], this._empty); return createBuilder(this, [...(this._styles || []), codes], this._isEmpty);
}; };
} }
}; };
@ -119,12 +119,10 @@ for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
const proto = Object.defineProperties(() => {}, styles); const proto = Object.defineProperties(() => {}, styles);
function build(_styles, _empty) { const createBuilder = (self, _styles, _isEmpty) => {
const builder = (...arguments_) => applyStyle.call(builder, ...arguments_); const builder = (...arguments_) => applyStyle(builder, ...arguments_);
builder._styles = _styles; builder._styles = _styles;
builder._empty = _empty; builder._isEmpty = _isEmpty;
const self = this;
Object.defineProperty(builder, 'level', { Object.defineProperty(builder, 'level', {
enumerable: true, enumerable: true,
@ -151,16 +149,16 @@ function build(_styles, _empty) {
builder.__proto__ = proto; // eslint-disable-line no-proto builder.__proto__ = proto; // eslint-disable-line no-proto
return builder; return builder;
} };
function applyStyle(...arguments_) { const applyStyle = (self, ...arguments_) => {
let string = arguments_.join(' '); let string = arguments_.join(' ');
if (!this.enabled || this.level <= 0 || !string) { if (!self.enabled || self.level <= 0 || !string) {
return this._empty ? '' : string; return self._isEmpty ? '' : string;
} }
for (const code of this._styles.slice().reverse()) { for (const code of self._styles.slice().reverse()) {
// Replace any instances already present with a re-opening code // Replace any instances already present with a re-opening code
// otherwise only the part of the string until said closing code // otherwise only the part of the string until said closing code
// will be colored, and the rest will simply be 'plain'. // will be colored, and the rest will simply be 'plain'.
@ -173,9 +171,9 @@ function applyStyle(...arguments_) {
} }
return string; return string;
} };
function chalkTag(chalk, ...strings) { const chalkTag = (chalk, ...strings) => {
const [firstString] = strings; const [firstString] = strings;
if (!Array.isArray(firstString)) { if (!Array.isArray(firstString)) {
@ -195,7 +193,7 @@ function chalkTag(chalk, ...strings) {
} }
return template(chalk, parts.join('')); return template(chalk, parts.join(''));
} };
Object.defineProperties(Chalk.prototype, styles); Object.defineProperties(Chalk.prototype, styles);