Skip to content

Commit

Permalink
Merge pull request #9 from klauscfhq/master
Browse files Browse the repository at this point in the history
Added custom string end-padding method. Fixes klaudiosinani#46. (klaudiosinani#53)
  • Loading branch information
akadop committed Sep 2, 2018
2 parents f4f018c + b41cee3 commit 798a061
Showing 1 changed file with 22 additions and 7 deletions.
29 changes: 22 additions & 7 deletions signale.js
Expand Up @@ -195,15 +195,15 @@ class Signale {
}

if (this._config.displayBadge && type.badge) {
signale.push(chalk[type.color](type.badge.padEnd(type.badge.length + 1)));
signale.push(chalk[type.color](this._padEnd(type.badge, type.badge.length + 1)));
}

if (this._config.displayLabel && type.label) {
const label = this._config.uppercaseLabel ? type.label.toUpperCase() : type.label;
if (this._config.underlineLabel) {
signale.push(chalk[type.color].underline(label).padEnd(this._longestLabel + 20));
signale.push(this._padEnd(chalk[type.color].underline(label), this._longestLabel + 20));
} else {
signale.push(chalk[type.color](label.padEnd(this._longestLabel + 1)));
signale.push(chalk[type.color](this._padEnd(label, this._longestLabel + 1)));
}
}

Expand Down Expand Up @@ -257,6 +257,21 @@ class Signale {
this._log(this._buildSignale(this._types[type], ...messageObj), this._types[type].stream);
}

_padEnd(str, targetLength) {
str = String(str);
targetLength = parseInt(targetLength, 10) || 0;

if (str.length >= targetLength) {
return str;
}

if (String.prototype.padEnd) {
return str.padEnd(targetLength);
}
targetLength -= str.length;
return str + ' '.repeat(targetLength);
}

config(configObj) {
this.configuration = configObj;
}
Expand Down Expand Up @@ -289,8 +304,8 @@ class Signale {
const message = this._meta();

const report = [
chalk.green(this._types.start.badge.padEnd(2)),
chalk.green.underline(label).padEnd(this._longestLabel + 20),
chalk.green(this._padEnd(this._types.start.badge, 2)),
this._padEnd(chalk.green.underline(label), this._longestLabel + 20),
'Initialized timer...'
];

Expand All @@ -312,8 +327,8 @@ class Signale {

const message = this._meta();
const report = [
chalk.red(this._types.pause.badge.padEnd(2)),
chalk.red.underline(label).padEnd(this._longestLabel + 20),
chalk.red(this._padEnd(this._types.pause.badge, 2)),
this._padEnd(chalk.red.underline(label), this._longestLabel + 20),
'Timer run for:',
chalk.yellow(span < 1000 ? span + 'ms' : (span / 1000).toFixed(2) + 's')
];
Expand Down

0 comments on commit 798a061

Please sign in to comment.