progress-str
Advanced tools
+15
-9
@@ -8,11 +8,12 @@ "use strict"; | ||
| case 'number': | ||
| if (hasDecimal(options.max)) { | ||
| const round = Math.trunc(options.max); | ||
| const max = options.max === undefined ? 1 : options.max; | ||
| if (hasDecimal(max)) { | ||
| const round = Math.trunc(max); | ||
| return `${addDigits(round, actualDigits)}`; | ||
| } | ||
| else if (options.max === 1) { | ||
| else if (max === 1) { | ||
| return `${addDigits(0, actualDigits)}`; | ||
| } | ||
| else { | ||
| return `${addDigits(options.max, actualDigits)}`; | ||
| return `${addDigits(max, actualDigits)}`; | ||
| } | ||
@@ -22,3 +23,3 @@ case 'ratio': | ||
| const round = Math.trunc(options.max); | ||
| return `${addDigits(round, actualDigits)}/${options.digits !== undefined ? options.max.toFixed(actualDigits) : options.max}`; | ||
| return `${addDigits(round, actualDigits)}/${options.max}`; | ||
| } | ||
@@ -29,3 +30,3 @@ else if (options.max === 1) { | ||
| else { | ||
| return `${addDigits(options.max, actualDigits)}/${options.max.toFixed(actualDigits)}`; | ||
| return `${addDigits(options.max, actualDigits)}/${options.max === undefined ? '---' : options.max.toFixed(actualDigits)}`; | ||
| } | ||
@@ -41,6 +42,7 @@ } | ||
| case 'ratio': | ||
| if (hasDecimal(options.max)) { | ||
| return options.digits || getDecimal(options.max) + 1; | ||
| const max = options.max === undefined ? 1 : options.max; | ||
| if (hasDecimal(max)) { | ||
| return options.digits || getDecimal(max) + 1; | ||
| } | ||
| else if (options.max === 1) { | ||
| else if (max === 1) { | ||
| return options.digits || 1; | ||
@@ -55,2 +57,4 @@ } | ||
| function addDigits(value, digits) { | ||
| if (value === undefined) | ||
| return '---'; | ||
| if (digits === 0) | ||
@@ -61,2 +65,4 @@ return value; | ||
| function hasDecimal(value) { | ||
| if (value === undefined) | ||
| return false; | ||
| return Math.trunc(value) !== value; | ||
@@ -63,0 +69,0 @@ } |
@@ -1,1 +0,1 @@ | ||
| {"version":3,"file":"calcDigits.js","sourceRoot":"","sources":["../src/calcDigits.ts"],"names":[],"mappings":";;AAEA,SAAgB,oBAAoB,CAAC,OAAqB,EAAE,YAAoB;IAC9E,QAAQ,OAAO,CAAC,SAAS,EAAE;QACzB,KAAK,YAAY;YACf,OAAO,GAAG,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAA;QAC3C,KAAK,QAAQ;YACX,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBACrC,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CAAA;aAC3C;iBACI,IAAI,OAAO,CAAC,GAAG,KAAK,CAAC,EAAE;gBAC1B,OAAO,GAAG,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAA;aACvC;iBACI;gBACH,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,CAAA;aACjD;QACH,KAAK,OAAO;YACV,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBACrC,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAA;aAC7H;iBACI,IAAI,OAAO,CAAC,GAAG,KAAK,CAAC,EAAE;gBAC1B,OAAO,GAAG,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,CAAA;aAC5E;iBACI;gBACH,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAA;aACtF;KACJ;AACH,CAAC;AA3BD,oDA2BC;AAED,SAAgB,aAAa,CAAC,OAAqB;IACjD,QAAQ,OAAO,CAAC,SAAS,EAAE;QACzB,KAAK,YAAY;YACf,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,CAAA;QAC5B,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO;YACV,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC3B,OAAO,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;aACrD;iBACI,IAAI,OAAO,CAAC,GAAG,KAAK,CAAC,EAAE;gBAC1B,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,CAAA;aAC3B;iBACI;gBACH,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,CAAA;aAC3B;KACJ;AACH,CAAC;AAhBD,sCAgBC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,MAAc;IAC9C,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAC9B,OAAO,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,MAAM,CAAA,CAAC,CAAC,CAAA;AACrC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,CAAA;AACpC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,CAAA;AAC1D,CAAC"} | ||
| {"version":3,"file":"calcDigits.js","sourceRoot":"","sources":["../src/calcDigits.ts"],"names":[],"mappings":";;AAEA,SAAgB,oBAAoB,CAAC,OAAqB,EAAE,YAAoB;IAC9E,QAAQ,OAAO,CAAC,SAAS,EAAE;QACzB,KAAK,YAAY;YACf,OAAO,GAAG,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAA;QAC3C,KAAK,QAAQ;YACX,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA;YACvD,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE;gBACnB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAC7B,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CAAA;aAC3C;iBACI,IAAI,GAAG,KAAK,CAAC,EAAE;gBAClB,OAAO,GAAG,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAA;aACvC;iBACI;gBACH,OAAO,GAAG,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,CAAA;aACzC;QACH,KAAK,OAAO;YACV,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAI,CAAC,CAAA;gBACtC,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;aAC1D;iBACI,IAAI,OAAO,CAAC,GAAG,KAAK,CAAC,EAAE;gBAC1B,OAAO,GAAG,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,CAAA;aAC5E;iBACI;gBACH,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,OAAO,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAA;aAC1H;KACJ;AACH,CAAC;AA5BD,oDA4BC;AAED,SAAgB,aAAa,CAAC,OAAqB;IACjD,QAAQ,OAAO,CAAC,SAAS,EAAE;QACzB,KAAK,YAAY;YACf,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,CAAA;QAC5B,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO;YACV,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA;YACvD,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE;gBACnB,OAAO,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;aAC7C;iBACI,IAAI,GAAG,KAAK,CAAC,EAAE;gBAClB,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,CAAA;aAC3B;iBACI;gBACH,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,CAAA;aAC3B;KACJ;AACH,CAAC;AAjBD,sCAiBC;AAED,SAAS,SAAS,CAAC,KAAyB,EAAE,MAAc;IAC1D,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAA;IACrC,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAC9B,OAAO,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,SAAA,EAAE,EAAI,MAAM,CAAA,CAAC,CAAC,CAAA;AACrC,CAAC;AAED,SAAS,UAAU,CAAC,KAAyB;IAC3C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAA;IACrC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,CAAA;AACpC,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,GAAG,CAAC,CAAA;AAC1D,CAAC"} |
@@ -1,3 +0,7 @@ | ||
| import { BaseOptions, ValueOptions } from './interfaces'; | ||
| import { BaseOptions, TextStyle } from './interfaces'; | ||
| export declare const defaultBaseOptions: BaseOptions; | ||
| export declare const defaultValueOptions: ValueOptions; | ||
| export declare const defaultValueOptions: { | ||
| max: number; | ||
| marker: string; | ||
| textStyle: TextStyle; | ||
| }; |
@@ -1,1 +0,1 @@ | ||
| {"version":3,"file":"defaultOptions.js","sourceRoot":"","sources":["../src/defaultOptions.ts"],"names":[],"mappings":";;AAEa,QAAA,kBAAkB,GAAgB;IAC7C,GAAG,EAAE;QACH,iBAAiB,EAAE,GAAG;QACtB,kBAAkB,EAAE,GAAG;QACvB,eAAe,EAAE,GAAG;QACpB,gBAAgB,EAAE,GAAG;KACtB;IACD,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,MAAM;IACjB,YAAY,EAAE,OAAO;CACtB,CAAA;AAEY,QAAA,mBAAmB,GAAiB;IAC/C,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,GAAG;IACX,SAAS,EAAE,YAAY;CACxB,CAAA"} | ||
| {"version":3,"file":"defaultOptions.js","sourceRoot":"","sources":["../src/defaultOptions.ts"],"names":[],"mappings":";;AAEa,QAAA,kBAAkB,GAAgB;IAC7C,GAAG,EAAE;QACH,iBAAiB,EAAE,GAAG;QACtB,kBAAkB,EAAE,GAAG;QACvB,eAAe,EAAE,GAAG;QACpB,gBAAgB,EAAE,GAAG;KACtB;IACD,MAAM,EAAE,EAAE;IACV,SAAS,EAAE,MAAM;IACjB,YAAY,EAAE,OAAO;CACtB,CAAA;AAEY,QAAA,mBAAmB,GAAG;IACjC,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,GAAG;IACX,SAAS,EAAE,YAAyB;CACrC,CAAA"} |
+3
-0
@@ -14,1 +14,4 @@ import { BaseError } from 'make-error'; | ||
| } | ||
| export declare class MissingMaxValue extends BaseError { | ||
| constructor(); | ||
| } |
+7
-1
@@ -20,3 +20,3 @@ "use strict"; | ||
| constructor(length, numberOfValues) { | ||
| super(`length ${length} is too short to render ${numberOfValues} value${numberOfValues > 1 ? 's' : ''}`); | ||
| super(`Length ${length} is too short to render ${numberOfValues} value${numberOfValues > 1 ? 's' : ''}`); | ||
| this.length = length; | ||
@@ -26,2 +26,8 @@ } | ||
| exports.LengthTooShort = LengthTooShort; | ||
| class MissingMaxValue extends make_error_1.BaseError { | ||
| constructor() { | ||
| super(`Value can only be 'undefined' if max is 'undefined'`); | ||
| } | ||
| } | ||
| exports.MissingMaxValue = MissingMaxValue; | ||
| //# sourceMappingURL=errors.js.map |
@@ -1,1 +0,1 @@ | ||
| {"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;AAAA,2CAAuC;AAEvC,MAAa,kBAAmB,SAAQ,sBAAS;IAC/C,YAAmB,KAAa;QAC9B,KAAK,CAAC,kBAAkB,KAAK,0BAA0B,CAAC,CAAA;QADvC,UAAK,GAAL,KAAK,CAAQ;IAEhC,CAAC;CACF;AAJD,gDAIC;AAED,MAAa,aAAc,SAAQ,sBAAS;IAC1C,YAAmB,MAAc;QAC/B,KAAK,CAAC,gDAAgD,MAAM,GAAG,CAAC,CAAA;QAD/C,WAAM,GAAN,MAAM,CAAQ;IAEjC,CAAC;CACF;AAJD,sCAIC;AAED,MAAa,cAAe,SAAQ,sBAAS;IAC3C,YAAmB,MAAc,EAAE,cAAsB;QACvD,KAAK,CAAC,UAAU,MAAM,2BAA2B,cAAc,SAAS,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QADvF,WAAM,GAAN,MAAM,CAAQ;IAEjC,CAAC;CACF;AAJD,wCAIC"} | ||
| {"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;AAAA,2CAAuC;AAEvC,MAAa,kBAAmB,SAAQ,sBAAS;IAC/C,YAAmB,KAAa;QAC9B,KAAK,CAAC,kBAAkB,KAAK,0BAA0B,CAAC,CAAA;QADvC,UAAK,GAAL,KAAK,CAAQ;IAEhC,CAAC;CACF;AAJD,gDAIC;AAED,MAAa,aAAc,SAAQ,sBAAS;IAC1C,YAAmB,MAAc;QAC/B,KAAK,CAAC,gDAAgD,MAAM,GAAG,CAAC,CAAA;QAD/C,WAAM,GAAN,MAAM,CAAQ;IAEjC,CAAC;CACF;AAJD,sCAIC;AAED,MAAa,cAAe,SAAQ,sBAAS;IAC3C,YAAmB,MAAc,EAAE,cAAsB;QACvD,KAAK,CAAC,UAAU,MAAM,2BAA2B,cAAc,SAAS,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QADvF,WAAM,GAAN,MAAM,CAAQ;IAEjC,CAAC;CACF;AAJD,wCAIC;AAED,MAAa,eAAgB,SAAQ,sBAAS;IAC5C;QACE,KAAK,CAAC,qDAAqD,CAAC,CAAA;IAC9D,CAAC;CACF;AAJD,0CAIC"} |
@@ -7,7 +7,8 @@ export declare type BarFormat = { | ||
| }; | ||
| export declare type TextStyle = 'percentage' | 'number' | 'ratio'; | ||
| export declare type ValueOptions = { | ||
| digits?: 0 | 1 | 2; | ||
| max: number; | ||
| max: number | undefined; | ||
| marker: string; | ||
| textStyle: 'percentage' | 'number' | 'ratio'; | ||
| textStyle: TextStyle; | ||
| textTransform?: (text: string) => string; | ||
@@ -14,0 +15,0 @@ }; |
+11
-2
@@ -9,5 +9,10 @@ "use strict"; | ||
| const string_length_1 = __importDefault(require("string-length")); | ||
| const errors_1 = require("./errors"); | ||
| function renderBar(baseOptions, entries) { | ||
| if (baseOptions.textPosition === 'none') | ||
| return toBar(baseOptions.length, baseOptions.bar, entries); | ||
| entries.forEach(e => { | ||
| if (e.max === undefined && e.value !== undefined) | ||
| throw new errors_1.MissingMaxValue(); | ||
| }); | ||
| const text = renderText_1.renderText(baseOptions, entries); | ||
@@ -21,3 +26,7 @@ const barLength = calcBarLength_1.calcBarLength(baseOptions.length, string_length_1.default(text)); | ||
| const barInsideLength = length - string_length_1.default(format.leftBracketMarker) - string_length_1.default(format.rightBracketMarker); | ||
| const normalizedEntries = entries.map(e => (Object.assign({}, e, { value: e.value === undefined ? undefined : Math.floor(Math.min(Math.max(e.value / e.max, 0), 1) * 100) / 100 }))); | ||
| const normalizedEntries = entries.map(e => (Object.assign({}, e, { value: e.max === undefined ? | ||
| e.value : | ||
| e.value === undefined ? | ||
| undefined : | ||
| Math.floor(Math.min(Math.max(e.value / e.max, 0), 1) * 100) / 100 }))); | ||
| const bar = createBarArray(normalizedEntries, format, barInsideLength); | ||
@@ -28,3 +37,3 @@ return `${format.leftBracketMarker}${bar.join('')}${format.rightBracketMarker}`; | ||
| const sortedEntries = entries | ||
| .filter(e => e.value !== undefined) | ||
| .filter(e => e.value !== undefined && e.max !== undefined) | ||
| .map(e => (Object.assign({}, e, { value: e.value * length }))) | ||
@@ -31,0 +40,0 @@ .sort((a, b) => a.value - b.value); |
@@ -1,1 +0,1 @@ | ||
| {"version":3,"file":"renderBar.js","sourceRoot":"","sources":["../src/renderBar.ts"],"names":[],"mappings":"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"} | ||
| {"version":3,"file":"renderBar.js","sourceRoot":"","sources":["../src/renderBar.ts"],"names":[],"mappings":"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"} |
@@ -20,4 +20,6 @@ "use strict"; | ||
| case 'percentage': | ||
| return entry.value === undefined ? | ||
| '---' : | ||
| if (entry.value === undefined) | ||
| return '---'; | ||
| return entry.max === undefined ? | ||
| entry.value.toFixed(entry.actualDigits) : | ||
| `${(entry.value / entry.max * 100).toFixed(entry.actualDigits)}%`; | ||
@@ -29,3 +31,5 @@ case 'number': | ||
| case 'ratio': | ||
| const max = entry.digits !== undefined ? entry.max.toFixed(entry.actualDigits) : entry.max; | ||
| const max = entry.max === undefined ? | ||
| '---' : | ||
| entry.digits !== undefined ? entry.max.toFixed(entry.actualDigits) : entry.max; | ||
| return entry.value === undefined ? | ||
@@ -32,0 +36,0 @@ `---/${max}` : |
@@ -1,1 +0,1 @@ | ||
| {"version":3,"file":"renderText.js","sourceRoot":"","sources":["../src/renderText.ts"],"names":[],"mappings":";;;;;AAEA,wDAA8B;AAC9B,0DAAgC;AAEhC,SAAgB,UAAU,CAAC,WAAwB,EAAE,OAAqB;IACxE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC1E,CAAC;AAFD,gCAEC;AACD,SAAS,WAAW,CAAC,KAAuB,EAAE,KAAiB;IAC7D,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,mBAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,kBAAO,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;AAC5F,CAAC;AAED,SAAS,UAAU,CAAC,KAAiB;IAEnC,QAAQ,KAAK,CAAC,SAAS,EAAE;QACvB,KAAK,YAAY;YACf,OAAO,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;gBAChC,KAAK,CAAC,CAAC;gBACP,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAA;QACrE,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;gBAChC,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC3C,KAAK,OAAO;YACV,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAA;YAC1F,OAAO,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;gBAChC,OAAO,GAAG,EAAE,CAAC,CAAC;gBACd,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,GAAG,EAAE,CAAA;KACxD;AACH,CAAC"} | ||
| {"version":3,"file":"renderText.js","sourceRoot":"","sources":["../src/renderText.ts"],"names":[],"mappings":";;;;;AAAA,wDAA+B;AAC/B,0DAAiC;AAIjC,SAAgB,UAAU,CAAC,WAAwB,EAAE,OAAqB;IACxE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC1E,CAAC;AAFD,gCAEC;AACD,SAAS,WAAW,CAAC,KAAuB,EAAE,KAAiB;IAC7D,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,mBAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,kBAAO,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;AAC5F,CAAC;AAED,SAAS,UAAU,CAAC,KAAiB;IACnC,QAAQ,KAAK,CAAC,SAAS,EAAE;QACvB,KAAK,YAAY;YACf,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;gBAAE,OAAO,KAAK,CAAA;YAE3C,OAAO,KAAK,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;gBAC9B,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;gBACzC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAA;QACrE,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;gBAChC,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC3C,KAAK,OAAO;YACV,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;gBACnC,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAA;YAChF,OAAO,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;gBAChC,OAAO,GAAG,EAAE,CAAC,CAAC;gBACd,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,GAAG,EAAE,CAAA;KACxD;AACH,CAAC"} |
+1
-1
| { | ||
| "name": "progress-str", | ||
| "version": "3.3.1", | ||
| "version": "3.4.0", | ||
| "description": "Create a progress string", | ||
@@ -5,0 +5,0 @@ "homepage": "https://github.com/unional/progress-str", |
+4
-1
@@ -48,3 +48,6 @@ # progress-str | ||
| // It defaults to different values depending on the max value. | ||
| max: 1, // Value that means 100% | ||
| max: 1, // Value that means 100%. | ||
| // It can be set to undefined, to indicate that value is not available. | ||
| // But the render value must also be undefined. | ||
| // If not it will throws MissingMaxValue. | ||
| marker: '|', // marker for the value | ||
@@ -51,0 +54,0 @@ textStyle: 'percentage', // 'percentage' | 'number' | 'ratio' |
34294
5.93%418
8.57%81
3.85%