forked from orbit-oss/chalk
Require Node.js 8
This commit is contained in:
Sindre Sorhus
parent
de2f4cd606
commit
3ef170b457
6 changed files with 56 additions and 54 deletions
|
|
@ -2,6 +2,5 @@ language: node_js
|
|||
node_js:
|
||||
- '10'
|
||||
- '8'
|
||||
- '6'
|
||||
after_success:
|
||||
- './node_modules/.bin/nyc report --reporter=text-lcov | ./node_modules/.bin/coveralls'
|
||||
|
|
|
|||
|
|
@ -3,36 +3,39 @@ const chalk = require('..');
|
|||
|
||||
const ignoreChars = /[^!-~]/g;
|
||||
|
||||
function rainbow(str, offset) {
|
||||
if (!str || str.length === 0) {
|
||||
return str;
|
||||
const delay = milliseconds => new Promise(resolve => setTimeout(resolve, milliseconds));
|
||||
|
||||
function rainbow(string, offset) {
|
||||
if (!string || string.length === 0) {
|
||||
return string;
|
||||
}
|
||||
|
||||
const hueStep = 360 / str.replace(ignoreChars, '').length;
|
||||
const hueStep = 360 / string.replace(ignoreChars, '').length;
|
||||
|
||||
let hue = offset % 360;
|
||||
const chars = [];
|
||||
for (const c of str) {
|
||||
if (c.match(ignoreChars)) {
|
||||
chars.push(c);
|
||||
const characters = [];
|
||||
for (const character of string) {
|
||||
if (character.match(ignoreChars)) {
|
||||
characters.push(character);
|
||||
} else {
|
||||
chars.push(chalk.hsl(hue, 100, 50)(c));
|
||||
characters.push(chalk.hsl(hue, 100, 50)(character));
|
||||
hue = (hue + hueStep) % 360;
|
||||
}
|
||||
}
|
||||
|
||||
return chars.join('');
|
||||
return characters.join('');
|
||||
}
|
||||
|
||||
const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
|
||||
|
||||
async function animateString(str) {
|
||||
async function animateString(string) {
|
||||
console.log();
|
||||
for (let i = 0; i < 360 * 5; i++) {
|
||||
console.log('\u001B[1F\u001B[G ', rainbow(str, i));
|
||||
await sleep(2); // eslint-disable-line no-await-in-loop
|
||||
console.log('\u001B[1F\u001B[G', rainbow(string, i));
|
||||
await delay(2); // eslint-disable-line no-await-in-loop
|
||||
}
|
||||
}
|
||||
|
||||
console.log();
|
||||
animateString('We hope you enjoy the new version of Chalk 2! <3').then(() => console.log());
|
||||
(async () => {
|
||||
console.log();
|
||||
await animateString('We hope you enjoy Chalk! <3');
|
||||
console.log();
|
||||
})();
|
||||
|
|
|
|||
2
index.d.ts
vendored
2
index.d.ts
vendored
|
|
@ -271,6 +271,6 @@ export interface Chalk {
|
|||
* Order doesn't matter, and later styles take precedent in case of a conflict.
|
||||
* This simply means that `chalk.red.yellow.green` is equivalent to `chalk.green`.
|
||||
*/
|
||||
declare const chalk: Chalk & { supportsColor: ColorSupport };
|
||||
declare const chalk: Chalk & {supportsColor: ColorSupport};
|
||||
|
||||
export default chalk;
|
||||
|
|
|
|||
33
index.js
33
index.js
|
|
@ -7,7 +7,12 @@ const template = require('./templates.js');
|
|||
const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
|
||||
|
||||
// `supportsColor.level` → `ansiStyles.color[name]` mapping
|
||||
const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
|
||||
const levelMapping = [
|
||||
'ansi',
|
||||
'ansi',
|
||||
'ansi256',
|
||||
'ansi16m'
|
||||
];
|
||||
|
||||
// `color-convert` models to exclude from the Chalk API due to conflicts and such
|
||||
const skipModels = new Set(['gray']);
|
||||
|
|
@ -35,7 +40,7 @@ function chalkFactory(options) {
|
|||
const chalk = {};
|
||||
applyOptions(chalk, options);
|
||||
|
||||
chalk.template = (...args) => chalkTag(chalk.template, ...args);
|
||||
chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_);
|
||||
|
||||
Object.setPrototypeOf(chalk, Chalk.prototype);
|
||||
Object.setPrototypeOf(chalk.template, chalk);
|
||||
|
|
@ -43,6 +48,7 @@ function chalkFactory(options) {
|
|||
chalk.template.constructor = () => {
|
||||
throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.');
|
||||
};
|
||||
|
||||
chalk.template.Instance = ChalkClass;
|
||||
|
||||
return chalk.template;
|
||||
|
|
@ -57,13 +63,12 @@ if (isSimpleWindowsTerm) {
|
|||
ansiStyles.blue.open = '\u001B[94m';
|
||||
}
|
||||
|
||||
for (const key of Object.keys(ansiStyles)) {
|
||||
ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
|
||||
for (const [styleName, style] of Object.entries(ansiStyles)) {
|
||||
style.closeRe = new RegExp(escapeStringRegexp(style.close), 'g');
|
||||
|
||||
styles[key] = {
|
||||
styles[styleName] = {
|
||||
get() {
|
||||
const codes = ansiStyles[key];
|
||||
return build.call(this, [...(this._styles || []), codes], this._empty, key);
|
||||
return build.call(this, [...(this._styles || []), style], this._empty, styleName);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -106,8 +111,8 @@ for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
|
|||
styles[bgModel] = {
|
||||
get() {
|
||||
const {level} = this;
|
||||
return function (...args) {
|
||||
const open = ansiStyles.bgColor[levelMapping[level]][model](...args);
|
||||
return function (...arguments_) {
|
||||
const open = ansiStyles.bgColor[levelMapping[level]][model](...arguments_);
|
||||
const codes = {
|
||||
open,
|
||||
close: ansiStyles.bgColor.close,
|
||||
|
|
@ -122,7 +127,7 @@ for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
|
|||
const proto = Object.defineProperties(() => {}, styles);
|
||||
|
||||
function build(_styles, _empty, key) {
|
||||
const builder = (...args) => applyStyle.call(builder, ...args);
|
||||
const builder = (...arguments_) => applyStyle.call(builder, ...arguments_);
|
||||
builder._styles = _styles;
|
||||
builder._empty = _empty;
|
||||
|
||||
|
|
@ -158,8 +163,8 @@ function build(_styles, _empty, key) {
|
|||
return builder;
|
||||
}
|
||||
|
||||
function applyStyle(...args) {
|
||||
let string = args.join(' ');
|
||||
function applyStyle(...arguments_) {
|
||||
let string = arguments_.join(' ');
|
||||
|
||||
if (!this.enabled || this.level <= 0 || !string) {
|
||||
return this._empty ? '' : string;
|
||||
|
|
@ -200,12 +205,12 @@ function chalkTag(chalk, ...strings) {
|
|||
return strings.join(' ');
|
||||
}
|
||||
|
||||
const args = strings.slice(1);
|
||||
const arguments_ = strings.slice(1);
|
||||
const parts = [firstString.raw[0]];
|
||||
|
||||
for (let i = 1; i < firstString.length; i++) {
|
||||
parts.push(
|
||||
String(args[i - 1]).replace(/[{}\\]/g, '\\$&'),
|
||||
String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'),
|
||||
String(firstString.raw[i])
|
||||
);
|
||||
}
|
||||
|
|
|
|||
16
package.json
16
package.json
|
|
@ -5,7 +5,7 @@
|
|||
"license": "MIT",
|
||||
"repository": "chalk/chalk",
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
"node": ">=8"
|
||||
},
|
||||
"scripts": {
|
||||
"test": "xo && nyc ava && tsd-check && flow",
|
||||
|
|
@ -43,20 +43,20 @@
|
|||
"dependencies": {
|
||||
"ansi-styles": "^3.2.1",
|
||||
"escape-string-regexp": "^1.0.5",
|
||||
"supports-color": "^6.0.0"
|
||||
"supports-color": "^6.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sindresorhus/tsconfig": "^0.1.1",
|
||||
"ava": "^1.0.1",
|
||||
"coveralls": "^3.0.2",
|
||||
"@sindresorhus/tsconfig": "^0.2.1",
|
||||
"ava": "^1.3.1",
|
||||
"coveralls": "^3.0.3",
|
||||
"execa": "^1.0.0",
|
||||
"flow-bin": "^0.89.0",
|
||||
"flow-bin": "^0.94.0",
|
||||
"import-fresh": "^3.0.0",
|
||||
"matcha": "^0.7.0",
|
||||
"nyc": "^13.1.0",
|
||||
"nyc": "^13.3.0",
|
||||
"resolve-from": "^4.0.0",
|
||||
"tsd-check": "^0.3.0",
|
||||
"xo": "^0.23.0"
|
||||
"xo": "^0.24.0"
|
||||
},
|
||||
"types": "index.d.ts",
|
||||
"xo": {
|
||||
|
|
|
|||
21
templates.js
21
templates.js
|
|
@ -25,9 +25,9 @@ function unescape(c) {
|
|||
return ESCAPES.get(c) || c;
|
||||
}
|
||||
|
||||
function parseArguments(name, args) {
|
||||
function parseArguments(name, arguments_) {
|
||||
const results = [];
|
||||
const chunks = args.trim().split(/\s*,\s*/g);
|
||||
const chunks = arguments_.trim().split(/\s*,\s*/g);
|
||||
let matches;
|
||||
|
||||
for (const chunk of chunks) {
|
||||
|
|
@ -51,7 +51,7 @@ function parseStyle(style) {
|
|||
let matches;
|
||||
|
||||
while ((matches = STYLE_REGEX.exec(style)) !== null) {
|
||||
const name = matches[1]; // eslint-disable-line prefer-destructuring
|
||||
const name = matches[1];
|
||||
|
||||
if (matches[2]) {
|
||||
const args = parseArguments(name, matches[2]);
|
||||
|
|
@ -74,9 +74,8 @@ function buildStyle(chalk, styles) {
|
|||
}
|
||||
|
||||
let current = chalk;
|
||||
// TODO: Use `Object.entries` when targeting Node.js 8
|
||||
for (const styleName of Object.keys(enabled)) {
|
||||
if (!Array.isArray(enabled[styleName])) {
|
||||
for (const [styleName, styles] of Object.entries(enabled)) {
|
||||
if (!Array.isArray(styles)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -84,23 +83,19 @@ function buildStyle(chalk, styles) {
|
|||
throw new Error(`Unknown Chalk style: ${styleName}`);
|
||||
}
|
||||
|
||||
if (enabled[styleName].length > 0) {
|
||||
current = current[styleName](...enabled[styleName]);
|
||||
} else {
|
||||
current = current[styleName];
|
||||
}
|
||||
current = styles.length > 0 ? current[styleName](...styles) : current[styleName];
|
||||
}
|
||||
|
||||
return current;
|
||||
}
|
||||
|
||||
module.exports = (chalk, tmp) => {
|
||||
module.exports = (chalk, temporary) => {
|
||||
const styles = [];
|
||||
const chunks = [];
|
||||
let chunk = [];
|
||||
|
||||
// eslint-disable-next-line max-params
|
||||
tmp.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => {
|
||||
temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => {
|
||||
if (escapeCharacter) {
|
||||
chunk.push(unescape(escapeCharacter));
|
||||
} else if (style) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue