@vbarbarosh/node-helpers 3.23.0 → 3.23.2

package/package.json

@@ -2,7 +2,7 @@
     "author": "Vladimir Barbarosh <vladimir.barbarosh@gmail.com>",
     "license": "MIT",
     "name": "@vbarbarosh/node-helpers",
-    "version": "3.23.0",
+    "version": "3.23.2",
     "description": "A set of helpers for JavaScript/Node.js",
     "files": [
         "src"

package/src/format_percents.js

@@ -1,6 +1,6 @@
 function format_percents(v)
 {
-    return (v*100).toFixed(2).replace(/\.0+$/, '') + '%';
+    return (v*100).toFixed(2).replace(/^(0|100).00$/, '$1') + '%';
 }
 
 module.exports = format_percents;

package/src/format_percents.test.js

@@ -4,7 +4,12 @@ const format_percents = require('./format_percents');
 const items = [
     ['', '0%'],
     [0, '0%'],
-    [0.5, '50%'],
+    [0.01, '1.00%'],
+    [0.0101, '1.01%'],
+    [0.1, '10.00%'],
+    [0.5, '50.00%'],
+    [0.99, '99.00%'],
+    [0.9901, '99.01%'],
     [1, '100%'],
 ];
 

package/src/format_progress.js

@@ -6,6 +6,9 @@ const is_number_gt = require('./is_number_gt');
 function format_progress({percents, total, done, rate, eta, duration})
 {
     const bps = is_number_gt(rate, 0) ? `${format_bytes(rate)}/s` : '~';
+    if (done > total) {
+        return `${format_bytes(done)} at ${bps} duration=${format_seconds(duration)}`;
+    }
     if (is_number_gt(total, 0)) {
         const eta_str = is_number_gt(eta, 0) ? format_seconds(eta) : '~';
         return `${format_percents(percents)} | ${format_bytes(done)} of ${format_bytes(total)} at ${bps} ETA ${eta_str} duration=${format_seconds(duration)}`;

package/src/format_progress.test.js

@@ -6,6 +6,8 @@ const items = [
     ['~ duration=00:00:01', {percents: 0, total: 0, done: 0, rate: 0, eta: 0, duration: 1}],
     ['25.25% | 5.0MB of 15.0MB at ~ ETA ~ duration=00:00:01', {percents: 0.2525, total: 15*1024*1024, done: 5*1024*1024, rate: 0, eta: 0, duration: 1}],
     ['25.25% | 5.0MB of 15.0MB at 10.0MB/s ETA 00:00:05 duration=00:00:01', {percents: 0.2525, total: 15*1024*1024, done: 5*1024*1024, rate: 10*1024*1024, eta: 5, duration: 1}],
+    // edge case: done > total
+    ['15.0MB at 10.0MB/s duration=00:00:01', {percents: 5.2525, total: 5*1024*1024, done: 15*1024*1024, rate: 10*1024*1024, eta: 5, duration: 1}],
 ];
 
 describe('format_progress', function () {