diff --git a/node_modules/colors/LICENSE b/node_modules/colors/LICENSE index 17880ff02972..3de4e33b4824 100644 --- a/node_modules/colors/LICENSE +++ b/node_modules/colors/LICENSE @@ -1,5 +1,3 @@ -MIT License - Original Library - Copyright (c) Marak Squires @@ -22,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +THE SOFTWARE. \ No newline at end of file diff --git a/node_modules/colors/README.md b/node_modules/colors/README.md index 4bebb6c92b07..0326aab340af 100644 --- a/node_modules/colors/README.md +++ b/node_modules/colors/README.md @@ -1,10 +1,4 @@ -# colors.js -[![Build Status](https://travis-ci.org/Marak/colors.js.svg?branch=master)](https://travis-ci.org/Marak/colors.js) -[![version](https://img.shields.io/npm/v/colors.svg)](https://www.npmjs.org/package/colors) -[![dependencies](https://david-dm.org/Marak/colors.js.svg)](https://david-dm.org/Marak/colors.js) -[![devDependencies](https://david-dm.org/Marak/colors.js/dev-status.svg)](https://david-dm.org/Marak/colors.js#info=devDependencies) - -Please check out the [roadmap](ROADMAP.md) for upcoming features and releases. Please open Issues to provide feedback, and check the `develop` branch for the latest bleeding-edge updates. +# colors.js [![Build Status](https://travis-ci.org/Marak/colors.js.svg?branch=master)](https://travis-ci.org/Marak/colors.js) ## get color and style in your node.js console @@ -169,7 +163,7 @@ console.log(colors.warn("this is a warning")); ``` -### Combining Colors +You can also combine them: ```javascript var colors = require('colors'); diff --git a/node_modules/colors/examples/normal-usage.js b/node_modules/colors/examples/normal-usage.js index cc8d05ff4f23..2818741e1f97 100644 --- a/node_modules/colors/examples/normal-usage.js +++ b/node_modules/colors/examples/normal-usage.js @@ -1,36 +1,34 @@ var colors = require('../lib/index'); -console.log('First some yellow text'.yellow); +console.log("First some yellow text".yellow); -console.log('Underline that text'.yellow.underline); +console.log("Underline that text".yellow.underline); -console.log('Make it bold and red'.red.bold); +console.log("Make it bold and red".red.bold); -console.log(('Double Raindows All Day Long').rainbow); +console.log(("Double Raindows All Day Long").rainbow) -console.log('Drop the bass'.trap); +console.log("Drop the bass".trap) -console.log('DROP THE RAINBOW BASS'.trap.rainbow); +console.log("DROP THE RAINBOW BASS".trap.rainbow) -// styles not widely supported -console.log('Chains are also cool.'.bold.italic.underline.red); -// styles not widely supported -console.log('So '.green + 'are'.underline + ' ' + 'inverse'.inverse - + ' styles! '.yellow.bold); -console.log('Zebras are so fun!'.zebra); +console.log('Chains are also cool.'.bold.italic.underline.red); // styles not widely supported + +console.log('So '.green + 'are'.underline + ' ' + 'inverse'.inverse + ' styles! '.yellow.bold); // styles not widely supported +console.log("Zebras are so fun!".zebra); // // Remark: .strikethrough may not work with Mac OS Terminal App // -console.log('This is ' + 'not'.strikethrough + ' fun.'); +console.log("This is " + "not".strikethrough + " fun."); -console.log('Background color attack!'.black.bgWhite); -console.log('Use random styles on everything!'.random); -console.log('America, Heck Yeah!'.america); +console.log('Background color attack!'.black.bgWhite) +console.log('Use random styles on everything!'.random) +console.log('America, Heck Yeah!'.america) -console.log('Setting themes is useful'); +console.log('Setting themes is useful') // // Custom themes @@ -47,35 +45,30 @@ colors.setTheme({ help: 'cyan', warn: 'yellow', debug: 'blue', - error: 'red', + error: 'red' }); // outputs red text -console.log('this is an error'.error); +console.log("this is an error".error); // outputs yellow text -console.log('this is a warning'.warn); +console.log("this is a warning".warn); // outputs grey text -console.log('this is an input'.input); +console.log("this is an input".input); console.log('Generic logging theme as file'.green.bold.underline); // Load a theme from file -try { - colors.setTheme(require(__dirname + '/../themes/generic-logging.js')); -} catch (err) { - console.log(err); -} +colors.setTheme(__dirname + '/../themes/generic-logging.js'); // outputs red text -console.log('this is an error'.error); +console.log("this is an error".error); // outputs yellow text -console.log('this is a warning'.warn); +console.log("this is a warning".warn); // outputs grey text -console.log('this is an input'.input); - -// console.log("Don't summon".zalgo) +console.log("this is an input".input); +//console.log("Don't summon".zalgo) \ No newline at end of file diff --git a/node_modules/colors/examples/safe-string.js b/node_modules/colors/examples/safe-string.js index 7a836537c5d5..111b363a4a7a 100644 --- a/node_modules/colors/examples/safe-string.js +++ b/node_modules/colors/examples/safe-string.js @@ -1,39 +1,37 @@ var colors = require('../safe'); -console.log(colors.yellow('First some yellow text')); +console.log(colors.yellow("First some yellow text")); -console.log(colors.yellow.underline('Underline that text')); +console.log(colors.yellow.underline("Underline that text")); -console.log(colors.red.bold('Make it bold and red')); +console.log(colors.red.bold("Make it bold and red")); -console.log(colors.rainbow('Double Raindows All Day Long')); +console.log(colors.rainbow("Double Raindows All Day Long")) -console.log(colors.trap('Drop the bass')); +console.log(colors.trap("Drop the bass")) -console.log(colors.rainbow(colors.trap('DROP THE RAINBOW BASS'))); +console.log(colors.rainbow(colors.trap("DROP THE RAINBOW BASS"))); -// styles not widely supported -console.log(colors.bold.italic.underline.red('Chains are also cool.')); +console.log(colors.bold.italic.underline.red('Chains are also cool.')); // styles not widely supported -// styles not widely supported -console.log(colors.green('So ') + colors.underline('are') + ' ' - + colors.inverse('inverse') + colors.yellow.bold(' styles! ')); -console.log(colors.zebra('Zebras are so fun!')); +console.log(colors.green('So ') + colors.underline('are') + ' ' + colors.inverse('inverse') + colors.yellow.bold(' styles! ')); // styles not widely supported -console.log('This is ' + colors.strikethrough('not') + ' fun.'); +console.log(colors.zebra("Zebras are so fun!")); + +console.log("This is " + colors.strikethrough("not") + " fun."); console.log(colors.black.bgWhite('Background color attack!')); -console.log(colors.random('Use random styles on everything!')); +console.log(colors.random('Use random styles on everything!')) console.log(colors.america('America, Heck Yeah!')); -console.log('Setting themes is useful'); +console.log('Setting themes is useful') // // Custom themes // -// console.log('Generic logging theme as JSON'.green.bold.underline); +//console.log('Generic logging theme as JSON'.green.bold.underline); // Load theme with JSON literal colors.setTheme({ silly: 'rainbow', @@ -45,17 +43,17 @@ colors.setTheme({ help: 'cyan', warn: 'yellow', debug: 'blue', - error: 'red', + error: 'red' }); // outputs red text -console.log(colors.error('this is an error')); +console.log(colors.error("this is an error")); // outputs yellow text -console.log(colors.warn('this is a warning')); +console.log(colors.warn("this is a warning")); // outputs grey text -console.log(colors.input('this is an input')); +console.log(colors.input("this is an input")); // console.log('Generic logging theme as file'.green.bold.underline); @@ -64,14 +62,15 @@ console.log(colors.input('this is an input')); colors.setTheme(__dirname + '/../themes/generic-logging.js'); // outputs red text -console.log(colors.error('this is an error')); +console.log(colors.error("this is an error")); // outputs yellow text -console.log(colors.warn('this is a warning')); +console.log(colors.warn("this is a warning")); // outputs grey text -console.log(colors.input('this is an input')); +console.log(colors.input("this is an input")); // console.log(colors.zalgo("Don't summon him")) + diff --git a/node_modules/colors/index.d.ts b/node_modules/colors/index.d.ts deleted file mode 100644 index faa9ab691b0a..000000000000 --- a/node_modules/colors/index.d.ts +++ /dev/null @@ -1,136 +0,0 @@ -// Type definitions for Colors.js 1.2 -// Project: https://github.com/Marak/colors.js -// Definitions by: Bart van der Schoor , Staffan Eketorp -// Definitions: https://github.com/Marak/colors.js - -export interface Color { - (text: string): string; - - strip: Color; - stripColors: Color; - - black: Color; - red: Color; - green: Color; - yellow: Color; - blue: Color; - magenta: Color; - cyan: Color; - white: Color; - gray: Color; - grey: Color; - - bgBlack: Color; - bgRed: Color; - bgGreen: Color; - bgYellow: Color; - bgBlue: Color; - bgMagenta: Color; - bgCyan: Color; - bgWhite: Color; - - reset: Color; - bold: Color; - dim: Color; - italic: Color; - underline: Color; - inverse: Color; - hidden: Color; - strikethrough: Color; - - rainbow: Color; - zebra: Color; - america: Color; - trap: Color; - random: Color; - zalgo: Color; -} - -export function enable(): void; -export function disable(): void; -export function setTheme(theme: any): void; - -export let enabled: boolean; - -export const strip: Color; -export const stripColors: Color; - -export const black: Color; -export const red: Color; -export const green: Color; -export const yellow: Color; -export const blue: Color; -export const magenta: Color; -export const cyan: Color; -export const white: Color; -export const gray: Color; -export const grey: Color; - -export const bgBlack: Color; -export const bgRed: Color; -export const bgGreen: Color; -export const bgYellow: Color; -export const bgBlue: Color; -export const bgMagenta: Color; -export const bgCyan: Color; -export const bgWhite: Color; - -export const reset: Color; -export const bold: Color; -export const dim: Color; -export const italic: Color; -export const underline: Color; -export const inverse: Color; -export const hidden: Color; -export const strikethrough: Color; - -export const rainbow: Color; -export const zebra: Color; -export const america: Color; -export const trap: Color; -export const random: Color; -export const zalgo: Color; - -declare global { - interface String { - strip: string; - stripColors: string; - - black: string; - red: string; - green: string; - yellow: string; - blue: string; - magenta: string; - cyan: string; - white: string; - gray: string; - grey: string; - - bgBlack: string; - bgRed: string; - bgGreen: string; - bgYellow: string; - bgBlue: string; - bgMagenta: string; - bgCyan: string; - bgWhite: string; - - reset: string; - // @ts-ignore - bold: string; - dim: string; - italic: string; - underline: string; - inverse: string; - hidden: string; - strikethrough: string; - - rainbow: string; - zebra: string; - america: string; - trap: string; - random: string; - zalgo: string; - } -} diff --git a/node_modules/colors/lib/colors.js b/node_modules/colors/lib/colors.js index bbc5ac126253..790ffd43ef51 100644 --- a/node_modules/colors/lib/colors.js +++ b/node_modules/colors/lib/colors.js @@ -2,7 +2,7 @@ The MIT License (MIT) -Original Library +Original Library - Copyright (c) Marak Squires Additional functionality @@ -33,45 +33,35 @@ module['exports'] = colors; colors.themes = {}; -var util = require('util'); var ansiStyles = colors.styles = require('./styles'); var defineProps = Object.defineProperties; -var newLineRegex = new RegExp(/[\r\n]+/g); -colors.supportsColor = require('./system/supports-colors').supportsColor; +colors.supportsColor = require('./system/supports-colors'); -if (typeof colors.enabled === 'undefined') { - colors.enabled = colors.supportsColor() !== false; +if (typeof colors.enabled === "undefined") { + colors.enabled = colors.supportsColor; } -colors.enable = function() { - colors.enabled = true; +colors.stripColors = colors.strip = function(str){ + return ("" + str).replace(/\x1B\[\d+m/g, ''); }; -colors.disable = function() { - colors.enabled = false; -}; - -colors.stripColors = colors.strip = function(str) { - return ('' + str).replace(/\x1B\[\d+m/g, ''); -}; -// eslint-disable-next-line no-unused-vars -var stylize = colors.stylize = function stylize(str, style) { +var stylize = colors.stylize = function stylize (str, style) { if (!colors.enabled) { return str+''; } return ansiStyles[style].open + str + ansiStyles[style].close; -}; +} var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g; -var escapeStringRegexp = function(str) { +var escapeStringRegexp = function (str) { if (typeof str !== 'string') { throw new TypeError('Expected a string'); } - return str.replace(matchOperatorsRe, '\\$&'); -}; + return str.replace(matchOperatorsRe, '\\$&'); +} function build(_styles) { var builder = function builder() { @@ -84,16 +74,15 @@ function build(_styles) { return builder; } -var styles = (function() { +var styles = (function () { var ret = {}; ansiStyles.grey = ansiStyles.gray; - Object.keys(ansiStyles).forEach(function(key) { - ansiStyles[key].closeRe = - new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g'); + Object.keys(ansiStyles).forEach(function (key) { + ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g'); ret[key] = { - get: function() { + get: function () { return build(this._styles.concat(key)); - }, + } }; }); return ret; @@ -102,79 +91,78 @@ var styles = (function() { var proto = defineProps(function colors() {}, styles); function applyStyle() { - var args = Array.prototype.slice.call(arguments); - - var str = args.map(function(arg) { - if (arg !== undefined && arg.constructor === String) { - return arg; - } else { - return util.inspect(arg); + var args = arguments; + var argsLen = args.length; + var str = argsLen !== 0 && String(arguments[0]); + if (argsLen > 1) { + for (var a = 1; a < argsLen; a++) { + str += ' ' + args[a]; } - }).join(' '); + } if (!colors.enabled || !str) { return str; } - var newLinesPresent = str.indexOf('\n') != -1; - var nestedStyles = this._styles; var i = nestedStyles.length; while (i--) { var code = ansiStyles[nestedStyles[i]]; str = code.open + str.replace(code.closeRe, code.open) + code.close; - if (newLinesPresent) { - str = str.replace(newLineRegex, code.close + '\n' + code.open); - } } return str; } -colors.setTheme = function(theme) { - if (typeof theme === 'string') { - console.log('colors.setTheme now only accepts an object, not a string. ' + - 'If you are trying to set a theme from a file, it is now your (the ' + - 'caller\'s) responsibility to require the file. The old syntax ' + - 'looked like colors.setTheme(__dirname + ' + - '\'/../themes/generic-logging.js\'); The new syntax looks like '+ - 'colors.setTheme(require(__dirname + ' + - '\'/../themes/generic-logging.js\'));'); - return; - } +function applyTheme (theme) { for (var style in theme) { - (function(style) { - colors[style] = function(str) { - if (typeof theme[style] === 'object') { + (function(style){ + colors[style] = function(str){ + if (typeof theme[style] === 'object'){ var out = str; - for (var i in theme[style]) { + for (var i in theme[style]){ out = colors[theme[style][i]](out); } return out; } return colors[theme[style]](str); }; - })(style); + })(style) + } +} + +colors.setTheme = function (theme) { + if (typeof theme === 'string') { + try { + colors.themes[theme] = require(theme); + applyTheme(colors.themes[theme]); + return colors.themes[theme]; + } catch (err) { + console.log(err); + return err; + } + } else { + applyTheme(theme); } }; function init() { var ret = {}; - Object.keys(styles).forEach(function(name) { + Object.keys(styles).forEach(function (name) { ret[name] = { - get: function() { + get: function () { return build([name]); - }, + } }; }); return ret; } -var sequencer = function sequencer(map, str) { - var exploded = str.split(''); +var sequencer = function sequencer (map, str) { + var exploded = str.split(""), i = 0; exploded = exploded.map(map); - return exploded.join(''); + return exploded.join(""); }; // custom formatter methods @@ -186,14 +174,14 @@ colors.maps = {}; colors.maps.america = require('./maps/america'); colors.maps.zebra = require('./maps/zebra'); colors.maps.rainbow = require('./maps/rainbow'); -colors.maps.random = require('./maps/random'); +colors.maps.random = require('./maps/random') for (var map in colors.maps) { - (function(map) { - colors[map] = function(str) { + (function(map){ + colors[map] = function (str) { return sequencer(colors.maps[map], str); - }; - })(map); + } + })(map) } -defineProps(colors, init()); +defineProps(colors, init()); \ No newline at end of file diff --git a/node_modules/colors/lib/custom/trap.js b/node_modules/colors/lib/custom/trap.js index 1f97b2e623c1..3f0914373817 100644 --- a/node_modules/colors/lib/custom/trap.js +++ b/node_modules/colors/lib/custom/trap.js @@ -1,46 +1,45 @@ -module['exports'] = function runTheTrap(text, options) { - var result = ''; - text = text || 'Run the trap, drop the bass'; +module['exports'] = function runTheTrap (text, options) { + var result = ""; + text = text || "Run the trap, drop the bass"; text = text.split(''); var trap = { - a: ['\u0040', '\u0104', '\u023a', '\u0245', '\u0394', '\u039b', '\u0414'], - b: ['\u00df', '\u0181', '\u0243', '\u026e', '\u03b2', '\u0e3f'], - c: ['\u00a9', '\u023b', '\u03fe'], - d: ['\u00d0', '\u018a', '\u0500', '\u0501', '\u0502', '\u0503'], - e: ['\u00cb', '\u0115', '\u018e', '\u0258', '\u03a3', '\u03be', '\u04bc', - '\u0a6c'], - f: ['\u04fa'], - g: ['\u0262'], - h: ['\u0126', '\u0195', '\u04a2', '\u04ba', '\u04c7', '\u050a'], - i: ['\u0f0f'], - j: ['\u0134'], - k: ['\u0138', '\u04a0', '\u04c3', '\u051e'], - l: ['\u0139'], - m: ['\u028d', '\u04cd', '\u04ce', '\u0520', '\u0521', '\u0d69'], - n: ['\u00d1', '\u014b', '\u019d', '\u0376', '\u03a0', '\u048a'], - o: ['\u00d8', '\u00f5', '\u00f8', '\u01fe', '\u0298', '\u047a', '\u05dd', - '\u06dd', '\u0e4f'], - p: ['\u01f7', '\u048e'], - q: ['\u09cd'], - r: ['\u00ae', '\u01a6', '\u0210', '\u024c', '\u0280', '\u042f'], - s: ['\u00a7', '\u03de', '\u03df', '\u03e8'], - t: ['\u0141', '\u0166', '\u0373'], - u: ['\u01b1', '\u054d'], - v: ['\u05d8'], - w: ['\u0428', '\u0460', '\u047c', '\u0d70'], - x: ['\u04b2', '\u04fe', '\u04fc', '\u04fd'], - y: ['\u00a5', '\u04b0', '\u04cb'], - z: ['\u01b5', '\u0240'], - }; - text.forEach(function(c) { + a: ["\u0040", "\u0104", "\u023a", "\u0245", "\u0394", "\u039b", "\u0414"], + b: ["\u00df", "\u0181", "\u0243", "\u026e", "\u03b2", "\u0e3f"], + c: ["\u00a9", "\u023b", "\u03fe"], + d: ["\u00d0", "\u018a", "\u0500" , "\u0501" ,"\u0502", "\u0503"], + e: ["\u00cb", "\u0115", "\u018e", "\u0258", "\u03a3", "\u03be", "\u04bc", "\u0a6c"], + f: ["\u04fa"], + g: ["\u0262"], + h: ["\u0126", "\u0195", "\u04a2", "\u04ba", "\u04c7", "\u050a"], + i: ["\u0f0f"], + j: ["\u0134"], + k: ["\u0138", "\u04a0", "\u04c3", "\u051e"], + l: ["\u0139"], + m: ["\u028d", "\u04cd", "\u04ce", "\u0520", "\u0521", "\u0d69"], + n: ["\u00d1", "\u014b", "\u019d", "\u0376", "\u03a0", "\u048a"], + o: ["\u00d8", "\u00f5", "\u00f8", "\u01fe", "\u0298", "\u047a", "\u05dd", "\u06dd", "\u0e4f"], + p: ["\u01f7", "\u048e"], + q: ["\u09cd"], + r: ["\u00ae", "\u01a6", "\u0210", "\u024c", "\u0280", "\u042f"], + s: ["\u00a7", "\u03de", "\u03df", "\u03e8"], + t: ["\u0141", "\u0166", "\u0373"], + u: ["\u01b1", "\u054d"], + v: ["\u05d8"], + w: ["\u0428", "\u0460", "\u047c", "\u0d70"], + x: ["\u04b2", "\u04fe", "\u04fc", "\u04fd"], + y: ["\u00a5", "\u04b0", "\u04cb"], + z: ["\u01b5", "\u0240"] + } + text.forEach(function(c){ c = c.toLowerCase(); - var chars = trap[c] || [' ']; + var chars = trap[c] || [" "]; var rand = Math.floor(Math.random() * chars.length); - if (typeof trap[c] !== 'undefined') { + if (typeof trap[c] !== "undefined") { result += trap[c][rand]; } else { result += c; } }); return result; -}; + +} diff --git a/node_modules/colors/lib/custom/zalgo.js b/node_modules/colors/lib/custom/zalgo.js index f16846808359..1538c3b49388 100644 --- a/node_modules/colors/lib/custom/zalgo.js +++ b/node_modules/colors/lib/custom/zalgo.js @@ -1,8 +1,8 @@ // please no module['exports'] = function zalgo(text, options) { - text = text || ' he is here '; + text = text || " he is here "; var soul = { - 'up': [ + "up" : [ '̍', '̎', '̄', '̅', '̿', '̑', '̆', '̐', '͒', '͗', '͑', '̇', @@ -15,9 +15,9 @@ module['exports'] = function zalgo(text, options) { 'ͦ', 'ͧ', 'ͨ', 'ͩ', 'ͪ', 'ͫ', 'ͬ', 'ͭ', 'ͮ', 'ͯ', '̾', '͛', - '͆', '̚', + '͆', '̚' ], - 'down': [ + "down" : [ '̖', '̗', '̘', '̙', '̜', '̝', '̞', '̟', '̠', '̤', '̥', '̦', @@ -27,53 +27,48 @@ module['exports'] = function zalgo(text, options) { '̺', '̻', '̼', 'ͅ', '͇', '͈', '͉', '͍', '͎', '͓', '͔', '͕', - '͖', '͙', '͚', '̣', + '͖', '͙', '͚', '̣' ], - 'mid': [ + "mid" : [ '̕', '̛', '̀', '́', '͘', '̡', '̢', '̧', '̨', '̴', '̵', '̶', '͜', '͝', '͞', '͟', '͠', '͢', '̸', - '̷', '͡', ' ҉', - ], - }; - var all = [].concat(soul.up, soul.down, soul.mid); + '̷', '͡', ' ҉' + ] + }, + all = [].concat(soul.up, soul.down, soul.mid), + zalgo = {}; function randomNumber(range) { var r = Math.floor(Math.random() * range); return r; } - function isChar(character) { + function is_char(character) { var bool = false; - all.filter(function(i) { + all.filter(function (i) { bool = (i === character); }); return bool; } - + function heComes(text, options) { - var result = ''; - var counts; - var l; + var result = '', counts, l; options = options || {}; - options['up'] = - typeof options['up'] !== 'undefined' ? options['up'] : true; - options['mid'] = - typeof options['mid'] !== 'undefined' ? options['mid'] : true; - options['down'] = - typeof options['down'] !== 'undefined' ? options['down'] : true; - options['size'] = - typeof options['size'] !== 'undefined' ? options['size'] : 'maxi'; + options["up"] = typeof options["up"] !== 'undefined' ? options["up"] : true; + options["mid"] = typeof options["mid"] !== 'undefined' ? options["mid"] : true; + options["down"] = typeof options["down"] !== 'undefined' ? options["down"] : true; + options["size"] = typeof options["size"] !== 'undefined' ? options["size"] : "maxi"; text = text.split(''); for (l in text) { - if (isChar(l)) { + if (is_char(l)) { continue; } result = result + text[l]; - counts = {'up': 0, 'down': 0, 'mid': 0}; + counts = {"up" : 0, "down" : 0, "mid" : 0}; switch (options.size) { case 'mini': counts.up = randomNumber(8); @@ -92,10 +87,10 @@ module['exports'] = function zalgo(text, options) { break; } - var arr = ['up', 'mid', 'down']; + var arr = ["up", "mid", "down"]; for (var d in arr) { var index = arr[d]; - for (var i = 0; i <= counts[index]; i++) { + for (var i = 0 ; i <= counts[index]; i++) { if (options[index]) { result = result + soul[index][randomNumber(soul[index].length)]; } @@ -106,5 +101,4 @@ module['exports'] = function zalgo(text, options) { } // don't summon him return heComes(text, options); -}; - +} diff --git a/node_modules/colors/lib/extendStringPrototype.js b/node_modules/colors/lib/extendStringPrototype.js index 0d486147ee58..67374a1c22d1 100644 --- a/node_modules/colors/lib/extendStringPrototype.js +++ b/node_modules/colors/lib/extendStringPrototype.js @@ -1,42 +1,51 @@ var colors = require('./colors'); -module['exports'] = function() { +module['exports'] = function () { + // // Extends prototype of native string object to allow for "foo".red syntax // - var addProperty = function(color, func) { + var addProperty = function (color, func) { String.prototype.__defineGetter__(color, func); }; - addProperty('strip', function() { + var sequencer = function sequencer (map, str) { + return function () { + var exploded = this.split(""), i = 0; + exploded = exploded.map(map); + return exploded.join(""); + } + }; + + addProperty('strip', function () { return colors.strip(this); }); - addProperty('stripColors', function() { + addProperty('stripColors', function () { return colors.strip(this); }); - addProperty('trap', function() { + addProperty("trap", function(){ return colors.trap(this); }); - addProperty('zalgo', function() { + addProperty("zalgo", function(){ return colors.zalgo(this); }); - addProperty('zebra', function() { + addProperty("zebra", function(){ return colors.zebra(this); }); - addProperty('rainbow', function() { + addProperty("rainbow", function(){ return colors.rainbow(this); }); - addProperty('random', function() { + addProperty("random", function(){ return colors.random(this); }); - addProperty('america', function() { + addProperty("america", function(){ return colors.america(this); }); @@ -44,8 +53,8 @@ module['exports'] = function() { // Iterate through all default styles and colors // var x = Object.keys(colors.styles); - x.forEach(function(style) { - addProperty(style, function() { + x.forEach(function (style) { + addProperty(style, function () { return colors.stylize(this, style); }); }); @@ -56,28 +65,25 @@ module['exports'] = function() { // on String that you should not overwrite. // var stringPrototypeBlacklist = [ - '__defineGetter__', '__defineSetter__', '__lookupGetter__', - '__lookupSetter__', 'charAt', 'constructor', 'hasOwnProperty', - 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', - 'valueOf', 'charCodeAt', 'indexOf', 'lastIndexOf', 'length', - 'localeCompare', 'match', 'repeat', 'replace', 'search', 'slice', - 'split', 'substring', 'toLocaleLowerCase', 'toLocaleUpperCase', - 'toLowerCase', 'toUpperCase', 'trim', 'trimLeft', 'trimRight', + '__defineGetter__', '__defineSetter__', '__lookupGetter__', '__lookupSetter__', 'charAt', 'constructor', + 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'valueOf', 'charCodeAt', + 'indexOf', 'lastIndexof', 'length', 'localeCompare', 'match', 'replace', 'search', 'slice', 'split', 'substring', + 'toLocaleLowerCase', 'toLocaleUpperCase', 'toLowerCase', 'toUpperCase', 'trim', 'trimLeft', 'trimRight' ]; - Object.keys(theme).forEach(function(prop) { + Object.keys(theme).forEach(function (prop) { if (stringPrototypeBlacklist.indexOf(prop) !== -1) { - console.log('warn: '.red + ('String.prototype' + prop).magenta + - ' is probably something you don\'t want to override. ' + - 'Ignoring style name'); - } else { + console.log('warn: '.red + ('String.prototype' + prop).magenta + ' is probably something you don\'t want to override. Ignoring style name'); + } + else { if (typeof(theme[prop]) === 'string') { colors[prop] = colors[theme[prop]]; - addProperty(prop, function() { + addProperty(prop, function () { return colors[theme[prop]](this); }); - } else { - addProperty(prop, function() { + } + else { + addProperty(prop, function () { var ret = this; for (var t = 0; t < theme[prop].length; t++) { ret = colors[theme[prop][t]](ret); @@ -89,18 +95,19 @@ module['exports'] = function() { }); } - colors.setTheme = function(theme) { + colors.setTheme = function (theme) { if (typeof theme === 'string') { - console.log('colors.setTheme now only accepts an object, not a string. ' + - 'If you are trying to set a theme from a file, it is now your (the ' + - 'caller\'s) responsibility to require the file. The old syntax ' + - 'looked like colors.setTheme(__dirname + ' + - '\'/../themes/generic-logging.js\'); The new syntax looks like '+ - 'colors.setTheme(require(__dirname + ' + - '\'/../themes/generic-logging.js\'));'); - return; + try { + colors.themes[theme] = require(theme); + applyTheme(colors.themes[theme]); + return colors.themes[theme]; + } catch (err) { + console.log(err); + return err; + } } else { applyTheme(theme); } }; -}; + +}; \ No newline at end of file diff --git a/node_modules/colors/lib/index.js b/node_modules/colors/lib/index.js index 9df5ab7df307..fd0956d03adb 100644 --- a/node_modules/colors/lib/index.js +++ b/node_modules/colors/lib/index.js @@ -1,13 +1,12 @@ var colors = require('./colors'); module['exports'] = colors; -// Remark: By default, colors will add style properties to String.prototype. +// Remark: By default, colors will add style properties to String.prototype // -// If you don't wish to extend String.prototype, you can do this instead and -// native String will not be touched: +// If you don't wish to extend String.prototype you can do this instead and native String will not be touched // // var colors = require('colors/safe); // colors.red("foo") // // -require('./extendStringPrototype')(); +require('./extendStringPrototype')(); \ No newline at end of file diff --git a/node_modules/colors/lib/maps/america.js b/node_modules/colors/lib/maps/america.js index 86700529273e..a07d8327ff2f 100644 --- a/node_modules/colors/lib/maps/america.js +++ b/node_modules/colors/lib/maps/america.js @@ -1,12 +1,12 @@ var colors = require('../colors'); module['exports'] = (function() { - return function(letter, i, exploded) { - if (letter === ' ') return letter; - switch (i%3) { + return function (letter, i, exploded) { + if(letter === " ") return letter; + switch(i%3) { case 0: return colors.red(letter); - case 1: return colors.white(letter); - case 2: return colors.blue(letter); + case 1: return colors.white(letter) + case 2: return colors.blue(letter) } - }; -})(); + } +})(); \ No newline at end of file diff --git a/node_modules/colors/lib/maps/rainbow.js b/node_modules/colors/lib/maps/rainbow.js index 4e7ef006369b..a7ce24e6c15b 100644 --- a/node_modules/colors/lib/maps/rainbow.js +++ b/node_modules/colors/lib/maps/rainbow.js @@ -1,10 +1,9 @@ var colors = require('../colors'); -module['exports'] = (function() { - // RoY G BiV - var rainbowColors = ['red', 'yellow', 'green', 'blue', 'magenta']; - return function(letter, i, exploded) { - if (letter === ' ') { +module['exports'] = (function () { + var rainbowColors = ['red', 'yellow', 'green', 'blue', 'magenta']; //RoY G BiV + return function (letter, i, exploded) { + if (letter === " ") { return letter; } else { return colors[rainbowColors[i++ % rainbowColors.length]](letter); diff --git a/node_modules/colors/lib/maps/random.js b/node_modules/colors/lib/maps/random.js index 88219dafeb3a..5cd101fae2b3 100644 --- a/node_modules/colors/lib/maps/random.js +++ b/node_modules/colors/lib/maps/random.js @@ -1,12 +1,8 @@ var colors = require('../colors'); -module['exports'] = (function() { - var available = ['underline', 'inverse', 'grey', 'yellow', 'red', 'green', - 'blue', 'white', 'cyan', 'magenta']; +module['exports'] = (function () { + var available = ['underline', 'inverse', 'grey', 'yellow', 'red', 'green', 'blue', 'white', 'cyan', 'magenta']; return function(letter, i, exploded) { - return letter === ' ' ? letter : - colors[ - available[Math.round(Math.random() * (available.length - 2))] - ](letter); + return letter === " " ? letter : colors[available[Math.round(Math.random() * (available.length - 1))]](letter); }; -})(); +})(); \ No newline at end of file diff --git a/node_modules/colors/lib/maps/zebra.js b/node_modules/colors/lib/maps/zebra.js index 28938c02d401..bf7dcdead072 100644 --- a/node_modules/colors/lib/maps/zebra.js +++ b/node_modules/colors/lib/maps/zebra.js @@ -1,5 +1,5 @@ var colors = require('../colors'); -module['exports'] = function(letter, i, exploded) { +module['exports'] = function (letter, i, exploded) { return i % 2 === 0 ? letter : colors.inverse(letter); -}; +}; \ No newline at end of file diff --git a/node_modules/colors/lib/styles.js b/node_modules/colors/lib/styles.js index 02db9acf7c7d..067d59070c2a 100644 --- a/node_modules/colors/lib/styles.js +++ b/node_modules/colors/lib/styles.js @@ -65,13 +65,13 @@ var codes = { blueBG: [44, 49], magentaBG: [45, 49], cyanBG: [46, 49], - whiteBG: [47, 49], + whiteBG: [47, 49] }; -Object.keys(codes).forEach(function(key) { +Object.keys(codes).forEach(function (key) { var val = codes[key]; var style = styles[key] = []; style.open = '\u001b[' + val[0] + 'm'; style.close = '\u001b[' + val[1] + 'm'; -}); +}); \ No newline at end of file diff --git a/node_modules/colors/lib/system/has-flag.js b/node_modules/colors/lib/system/has-flag.js deleted file mode 100644 index a347dd4d7a69..000000000000 --- a/node_modules/colors/lib/system/has-flag.js +++ /dev/null @@ -1,35 +0,0 @@ -/* -MIT License - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -'use strict'; - -module.exports = function(flag, argv) { - argv = argv || process.argv; - - var terminatorPos = argv.indexOf('--'); - var prefix = /^-{1,2}/.test(flag) ? '' : '--'; - var pos = argv.indexOf(prefix + flag); - - return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos); -}; diff --git a/node_modules/colors/lib/system/supports-colors.js b/node_modules/colors/lib/system/supports-colors.js index f1f9c8ff3da2..3e008aa93a6a 100644 --- a/node_modules/colors/lib/system/supports-colors.js +++ b/node_modules/colors/lib/system/supports-colors.js @@ -23,129 +23,39 @@ THE SOFTWARE. */ -'use strict'; +var argv = process.argv; -var os = require('os'); -var hasFlag = require('./has-flag.js'); - -var env = process.env; - -var forceColor = void 0; -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) { +module.exports = (function () { + if (argv.indexOf('--no-color') !== -1 || + argv.indexOf('--color=false') !== -1) { return false; } - return { - level: level, - hasBasic: true, - has256: level >= 2, - has16m: level >= 3, - }; -} - -function supportsColor(stream) { - if (forceColor === false) { - return 0; - } - - if (hasFlag('color=16m') || hasFlag('color=full') - || hasFlag('color=truecolor')) { - return 3; + if (argv.indexOf('--color') !== -1 || + argv.indexOf('--color=true') !== -1 || + argv.indexOf('--color=always') !== -1) { + return true; } - if (hasFlag('color=256')) { - return 2; - } - - if (stream && !stream.isTTY && forceColor !== true) { - return 0; + if (process.stdout && !process.stdout.isTTY) { + return false; } - var 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. Windows 10 build 14931 is the - // first release that supports 16m/TrueColor. - var osRelease = os.release().split('.'); - if (Number(process.versions.node.split('.')[0]) >= 8 - && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) { - return Number(osRelease[2]) >= 14931 ? 3 : 2; - } - - return 1; - } - - if ('CI' in env) { - if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(function(sign) { - return sign in env; - }) || env.CI_NAME === 'codeship') { - return 1; - } - - return min; - } - - if ('TEAMCITY_VERSION' in env) { - return (/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0 - ); - } - - if ('TERM_PROGRAM' in env) { - var version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10); - - switch (env.TERM_PROGRAM) { - case 'iTerm.app': - return version >= 3 ? 3 : 2; - case 'Hyper': - return 3; - case 'Apple_Terminal': - return 2; - // No default - } - } - - if (/-256(color)?$/i.test(env.TERM)) { - return 2; + return true; } - if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) { - return 1; + if ('COLORTERM' in process.env) { + return true; } - if ('COLORTERM' in env) { - return 1; + if (process.env.TERM === 'dumb') { + return false; } - if (env.TERM === 'dumb') { - return min; + if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) { + return true; } - return min; -} - -function getSupportLevel(stream) { - var level = supportsColor(stream); - return translateLevel(level); -} - -module.exports = { - supportsColor: getSupportLevel, - stdout: getSupportLevel(process.stdout), - stderr: getSupportLevel(process.stderr), -}; + return false; +})(); \ No newline at end of file diff --git a/node_modules/colors/package.json b/node_modules/colors/package.json index 433bbb00340c..554cbd22e19d 100644 --- a/node_modules/colors/package.json +++ b/node_modules/colors/package.json @@ -1,40 +1,40 @@ { - "_from": "colors@^1.1.2", - "_id": "colors@1.3.0", + "_args": [ + [ + "colors@1.1.2", + "/Users/rebecca/code/npm" + ] + ], + "_from": "colors@1.1.2", + "_id": "colors@1.1.2", "_inBundle": false, - "_integrity": "sha512-EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==", + "_integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", "_location": "/colors", + "_optional": true, "_phantomChildren": {}, "_requested": { - "type": "range", + "type": "version", "registry": true, - "raw": "colors@^1.1.2", + "raw": "colors@1.1.2", "name": "colors", "escapedName": "colors", - "rawSpec": "^1.1.2", + "rawSpec": "1.1.2", "saveSpec": null, - "fetchSpec": "^1.1.2" + "fetchSpec": "1.1.2" }, "_requiredBy": [ - "/cli-table2" + "/cli-table3" ], - "_resolved": "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz", - "_shasum": "5f20c9fef6945cb1134260aab33bfbdc8295e04e", - "_spec": "colors@^1.1.2", - "_where": "/Users/rebecca/code/npm/node_modules/cli-table2", + "_resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "_spec": "1.1.2", + "_where": "/Users/rebecca/code/npm", "author": { "name": "Marak Squires" }, "bugs": { "url": "https://github.com/Marak/colors.js/issues" }, - "bundleDependencies": false, - "deprecated": false, "description": "get colors in your node.js console", - "devDependencies": { - "eslint": "^4.19.1", - "eslint-config-google": "^0.9.1" - }, "engines": { "node": ">=0.1.90" }, @@ -43,9 +43,7 @@ "lib", "LICENSE", "safe.js", - "themes", - "index.d.ts", - "safe.d.ts" + "themes" ], "homepage": "https://github.com/Marak/colors.js", "keywords": [ @@ -54,15 +52,14 @@ "colors" ], "license": "MIT", - "main": "lib/index.js", + "main": "lib", "name": "colors", "repository": { "type": "git", "url": "git+ssh://git@github.com/Marak/colors.js.git" }, "scripts": { - "lint": "eslint . --fix", "test": "node tests/basic-test.js && node tests/safe-test.js" }, - "version": "1.3.0" + "version": "1.1.2" } diff --git a/node_modules/colors/safe.d.ts b/node_modules/colors/safe.d.ts deleted file mode 100644 index 2bafc27984e0..000000000000 --- a/node_modules/colors/safe.d.ts +++ /dev/null @@ -1,48 +0,0 @@ -// Type definitions for Colors.js 1.2 -// Project: https://github.com/Marak/colors.js -// Definitions by: Bart van der Schoor , Staffan Eketorp -// Definitions: https://github.com/Marak/colors.js - -export const enabled: boolean; -export function enable(): void; -export function disable(): void; -export function setTheme(theme: any): void; - -export function strip(str: string): string; -export function stripColors(str: string): string; - -export function black(str: string): string; -export function red(str: string): string; -export function green(str: string): string; -export function yellow(str: string): string; -export function blue(str: string): string; -export function magenta(str: string): string; -export function cyan(str: string): string; -export function white(str: string): string; -export function gray(str: string): string; -export function grey(str: string): string; - -export function bgBlack(str: string): string; -export function bgRed(str: string): string; -export function bgGreen(str: string): string; -export function bgYellow(str: string): string; -export function bgBlue(str: string): string; -export function bgMagenta(str: string): string; -export function bgCyan(str: string): string; -export function bgWhite(str: string): string; - -export function reset(str: string): string; -export function bold(str: string): string; -export function dim(str: string): string; -export function italic(str: string): string; -export function underline(str: string): string; -export function inverse(str: string): string; -export function hidden(str: string): string; -export function strikethrough(str: string): string; - -export function rainbow(str: string): string; -export function zebra(str: string): string; -export function america(str: string): string; -export function trap(str: string): string; -export function random(str: string): string; -export function zalgo(str: string): string; diff --git a/node_modules/colors/safe.js b/node_modules/colors/safe.js index a013d5424648..a6a1f3ab47f0 100644 --- a/node_modules/colors/safe.js +++ b/node_modules/colors/safe.js @@ -1,10 +1,9 @@ // -// Remark: Requiring this file will use the "safe" colors API, -// which will not touch String.prototype. +// Remark: Requiring this file will use the "safe" colors API which will not touch String.prototype // -// var colors = require('colors/safe'); +// var colors = require('colors/safe); // colors.red("foo") // // var colors = require('./lib/colors'); -module['exports'] = colors; +module['exports'] = colors; \ No newline at end of file diff --git a/node_modules/colors/themes/generic-logging.js b/node_modules/colors/themes/generic-logging.js index 63adfe4ac31f..571972c1baa8 100644 --- a/node_modules/colors/themes/generic-logging.js +++ b/node_modules/colors/themes/generic-logging.js @@ -8,5 +8,5 @@ module['exports'] = { help: 'cyan', warn: 'yellow', debug: 'blue', - error: 'red', -}; + error: 'red' +}; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2ac468584f54..20aaf8eb8df4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -679,9 +679,9 @@ "dev": true }, "colors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz", - "integrity": "sha512-EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", "optional": true }, "columnify": {