xprogress 0.17.1 → 0.18.0

package/dist/index.js

@@ -24,35 +24,35 @@ var _speedometer = _interopRequireDefault(require("speedometer"));
 
 var _progressStream = _interopRequireDefault(require("progress-stream"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _createSuper(Derived) { return function () { var Super = _getPrototypeOf(Derived), result; if (_isNativeReflectConstruct()) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
@@ -60,17 +60,17 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(n); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -91,12 +91,12 @@ var globOpts = {
   flipper: ['|', '/', '-', '\\'],
   pulsate: !1,
   template: '',
-  variables: _objectSpread({
+  variables: _objectSpread(_objectSpread({
     tag: function tag(_ref) {
       var _tag = _ref.tag;
       return _tag && typeof _tag !== 'function' ? "".concat(_tag, "\n") : '';
     }
-  }, _stringdColors["default"].raw, {
+  }, _stringdColors["default"].raw), {}, {
     'color:bar:empty': ':{color:close}',
     'color:bar:header': ':{color(green)}',
     'color:bar:filled': ':{bgcolor(green)}:{color(black)}',
@@ -105,11 +105,11 @@ var globOpts = {
   forceFirst: !1
 };
 
-var defaultOptions = _objectSpread({}, globOpts, {
+var defaultOptions = _objectSpread(_objectSpread({}, globOpts), {}, {
   template: ':{tag}[:{bar}] :{flipper} :{label} :3{percentage}% [:{completed}/:{total}]'
 });
 
-var streamOpts = _objectSpread({}, globOpts, {
+var streamOpts = _objectSpread(_objectSpread({}, globOpts), {}, {
   pulsate: false,
   progress: {
     time: 100,
@@ -119,7 +119,7 @@ var streamOpts = _objectSpread({}, globOpts, {
     pulsateLength: 15
   },
   template: [':{label}', ' |:{slot:bar}| [:3{slot:percentage}%] (:{slot:eta}) [:{speed}] [:{slot:size}/:{slot:size:total}]', ' [:{bar}] [:3{percentage}%] (:{eta}) [:{size}/:{size:total}]'],
-  variables: _objectSpread({}, globOpts.variables, {
+  variables: _objectSpread(_objectSpread({}, globOpts.variables), {}, {
     eta: null,
     size: null,
     speed: null,
@@ -259,7 +259,7 @@ var ProgressGen = /*#__PURE__*/function (_EventEmitter) {
     return _super.apply(this, arguments);
   }
 
-  return ProgressGen;
+  return _createClass(ProgressGen);
 }(_events["default"]);
 
 var ProgressBar = /*#__PURE__*/function () {
@@ -284,9 +284,9 @@ var ProgressBar = /*#__PURE__*/function () {
       opts = _ref5[1];
     }
 
-    this.opts = _objectSpread({}, defaultOptions, {}, opts, {
-      bar: _objectSpread({}, defaultOptions.bar, {}, opts.bar),
-      variables: _objectSpread({}, defaultOptions.variables, {}, opts.variables)
+    this.opts = _objectSpread(_objectSpread(_objectSpread({}, defaultOptions), opts), {}, {
+      bar: _objectSpread(_objectSpread({}, defaultOptions.bar), opts.bar),
+      variables: _objectSpread(_objectSpread({}, defaultOptions.variables), opts.variables)
     });
     this.cores = {
       total: total,
@@ -571,20 +571,20 @@ var ProgressBar = /*#__PURE__*/function () {
       }() : forcedFirst : pulsateBar(this, this.cores.pulsateSlots, this.opts.bar.pulsateSkip, this.opts.bar.separator);
       var templateString = Array.isArray(this.opts.template) ? this.opts.template.join('\n') : this.opts.template;
       var average = this.average();
-      return this.parseString(templateString, _objectSpread({
+      return this.parseString(templateString, _objectSpread(_objectSpread({
         bar: bars.join(":{color:bar:separator}".concat(this.opts.bar.separator, ":{color:close}:{bgcolor:close}")),
         'bar:complete': forcedFirst.join(''),
         label: this.label(),
         total: this.total(),
         flipper: flipper(flipper.count += 1, this.opts.flipper)
-      }, average, {
+      }, average), {}, {
         percentage: average.percentage.toFixed(0)
       }, template));
     }
   }, {
     key: "parseString",
     value: function parseString(str, template) {
-      var variables = _objectSpread({}, template = _objectSpread({}, this.opts.variables, {}, template));
+      var variables = _objectSpread({}, template = _objectSpread(_objectSpread({}, this.opts.variables), template));
 
       Object.entries(this.opts.variables).forEach(function (_ref18) {
         var _ref19 = _slicedToArray(_ref18, 2),
@@ -611,14 +611,16 @@ var ProgressBar = /*#__PURE__*/function () {
       var cleanWrite = function cleanWrite(arr, dontClean) {
         var addons = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
         var ending = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+        var normie = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
 
         if (!dontClean) {
+          // check https://github.com/freeall/single-line-log/blob/515b3b99b699396c2ad5f937e4b490b6f9fbff0e/index.js#L1-L3
           self.cores.stdout.moveCursor(0, -addons);
           self.cores.stdout.cursorTo(0);
           self.cores.stdout.clearScreenDown();
         }
 
-        self.cores.stdout.write("".concat(dontClean && ending ? '\n' : '').concat(self.parseString(_util.format.apply(void 0, _toConsumableArray(arr))).replace(self.opts.bar.colorize ? '' : /\x1b\[\d+m/g, '')));
+        (normie ? process.stdout : self.cores.stdout).write("".concat(dontClean && ending && addons ? '\n' : '').concat(self.parseString(_util.format.apply(void 0, _toConsumableArray(arr))).replace(self.opts.bar.colorize ? '' : /\x1b\[\d+m/g, '')));
       };
 
       var addonPack;
@@ -628,7 +630,7 @@ var ProgressBar = /*#__PURE__*/function () {
         content[_key - 1] = arguments[_key];
       }
 
-      this.justLogged = type === 'bar' && content.length === 1 ? !!cleanWrite(content, this.justLogged, addons) : (addonPack = type.match(/^bar\+(\d+)/)) !== null ? !!cleanWrite(content, this.justLogged, this.hasBarredOnce ? addonPack[1] : addons) : type === 'end' ? !!cleanWrite(content, !this.opts.clean, addons, true) : !cleanWrite([type.startsWith(':') && "".concat(type.slice(1)) || type].concat(content, ['\n']), this.justLogged, addons);
+      this.justLogged = type === 'bar' && content.length === 1 ? !!cleanWrite(content, this.justLogged, addons) : (addonPack = type.match(/^bar\+(\d+)/)) !== null ? !!cleanWrite(content, this.justLogged, this.hasBarredOnce ? addonPack[1] : addons) : type === 'end' ? !!cleanWrite(content, !this.opts.clean, addons, true, true) : !cleanWrite([type.startsWith(':') && "".concat(type.slice(1)) || type].concat(content, ['\n']), this.justLogged, addons, false, true);
       if (this.justLogged && this.hasBarredOnce) this.draw(this.oldBar);
       return this;
     }
@@ -704,20 +706,6 @@ var ProgressBar = /*#__PURE__*/function () {
      * Find out the progressbar is appended to another
      */
 
-  }, {
-    key: "slotStreamify",
-
-    /**
-     * Prepare a raw generator for use
-     * @param {(slots:Number, total?:Number) => String} actor The performing function
-     * @returns {Generator} New ProgressBar Generator
-     * @yields The through instance or a cache model of the ProgressBar
-     */
-    value: function* slotStreamify(actor, args) {
-      for (var level = -1; (level += 1) <= (this.opts.progress.infinite ? Infinity : this.slots.length);) {
-        args = yield !level ? this : ((0, _lodash.merge)(this.opts, args[1]), actor(Math.floor(level - 1), args[0], this.opts.progress.infinite));
-      }
-    }
   }, {
     key: "isChild",
     get: function get() {
@@ -748,6 +736,20 @@ var ProgressBar = /*#__PURE__*/function () {
      * @param {ProgressBar} bar The progressbar to be checked
      */
 
+  }, {
+    key: "slotStreamify",
+    value:
+    /**
+     * Prepare a raw generator for use
+     * @param {(slots:Number, total?:Number) => String} actor The performing function
+     * @returns {Generator} New ProgressBar Generator
+     * @yields The through instance or a cache model of the ProgressBar
+     */
+    function* slotStreamify(actor, args) {
+      for (var level = -1; (level += 1) <= (this.opts.progress.infinite ? Infinity : this.slots.length);) {
+        args = yield !level ? this : ((0, _lodash.merge)(this.opts, args[1]), actor(Math.floor(level - 1), args[0], this.opts.progress.infinite));
+      }
+    }
   }], [{
     key: "isBar",
     value: function isBar(bar) {
@@ -836,10 +838,10 @@ var ProgressBar = /*#__PURE__*/function () {
         opts = _ref21[1];
       }
 
-      opts = _objectSpread({}, total === Infinity ? {
+      opts = _objectSpread(_objectSpread(_objectSpread({}, total === Infinity ? {
         pulsate: !0,
         template: ':{tag}[:{bar}] [:{flipper}] :{label} (:{slot:runtime}) :{slot:size}'
-      } : {}, {}, opts, {}, slots === Infinity ? (slots = total, {
+      } : {}), opts), slots === Infinity ? (slots = total, {
         progress: {
           infinite: !0
         }
@@ -878,41 +880,69 @@ var ProgressBar = /*#__PURE__*/function () {
       }), bar.opts.progress.pulsateSkip || bar.opts.bar.pulsateSkip],
           pulsateSlots = _ref23[0],
           pulsateSkips = _ref23[1];
-      var speed = (0, _speedometer["default"])(5000);
+
+      var _defaultUnit;
+
       var progressGen = new ProgressGen();
+
+      var buildBytesWith = function buildBytesWith(bytes) {
+        var byteOpts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+        return function (props, data) {
+          return _xbytes["default"].createRelativeSizer(data && (data.args[0] || data.matched.unit) || _defaultUnit, {
+            iec: data && 'iec' in data.matched ? data.matched.iec === 'true' : byteOpts.iec || !1,
+            bits: data && 'bits' in data.matched ? data.matched.bits === 'true' : byteOpts.bits || !1,
+            fixed: data && 'fixed' in data.matched ? parseInt(data.matched.fixed, 10) : byteOpts.fixed || 2,
+            "short": data && 'short' in data.matched ? data.matched["short"] === 'true' : byteOpts["short"] || !0,
+            space: data && 'space' in data.matched ? data.matched.space === 'true' : byteOpts.space || !0,
+            sticky: data && 'sticky' in data.matched ? data.matched.sticky === 'true' : byteOpts.sticky || !1
+          })(typeof bytes === 'function' ? bytes(props) : bytes);
+        };
+      };
+
+      var buildSpeedWith = function buildSpeedWith(speed) {
+        return function (_, data) {
+          return "".concat(buildBytesWith(speed, {
+            iec: !1,
+            bits: !0,
+            fixed: 2,
+            "short": !0,
+            space: !1,
+            sticky: !1
+          })(_, data)).concat(data && data.matched.metric || 'ps');
+        };
+      };
+
+      var totalSpeed = (0, _speedometer["default"])(5000);
       var streamGenerator = bar.slotStreamify(function (slotIndex, total, infinite) {
         var max = !infinite ? Math.round(bar.slots[slotIndex].level / 100 * bar.total()) : Infinity;
         total = typeof total === 'function' ? total(bar) : total || max;
         if (!infinite && total > max) throw Error("<size> slot must not be greater than maximum possible size for the slot [".concat(max, "], consider using infinite slots"));
         var through = (0, _progressStream["default"])(_objectSpread({
           length: total
-        }, bar.opts.progress)) // eslint-disable-next-line consistent-return
-        .on('progress', function (progress) {
-          var xpeed = speed(progress.delta);
-          if (bar.isEnded) return through.emit('error', Error('The <bar> being used has been ended'));
+        }, bar.opts.progress)).on('progress', function (progress) {
+          var speed = totalSpeed(progress.delta);
+
+          if (bar.isEnded) {
+            through.emit('error', Error('The <bar> being used has been ended'));
+            return;
+          }
+
           (actor || function (_bar, args, template) {
             return _bar.value.apply(_bar, _toConsumableArray(args)).draw(template);
           })(bar, bar.opts.progress.infinite ? [progress.delta + bar.average().completed] : [slotIndex, progress.transferred], {
             eta: function eta() {
-              return xprettyMs(1000 * bar.average().remaining / xpeed);
-            },
-            size: function size() {
-              return (0, _xbytes["default"])(bar.average().completed, {
-                "short": !0
-              });
+              return xprettyMs(1000 * bar.average().remaining / speed);
             },
-            speed: function speed(_, unit) {
-              if (!(unit && _xbytes["default"].parseUnit(unit))) unit = 'Mb'; // default to Megabits
-
-              return "".concat(_xbytes["default"].createRelativeSizer(unit)(xpeed, {
-                "short": !0,
-                space: !1
-              }), "ps");
-            },
-            'speed:raw': xpeed,
+            size: buildBytesWith(function () {
+              return bar.average().completed;
+            }),
+            speed: buildSpeedWith(speed),
+            'speed:raw': speed,
+            'slot:speed': buildSpeedWith(progress.speed),
+            'slot:speed:raw': progress.speed,
             progress: progress,
             'eta:raw': function etaRaw() {
-              return Math.round(bar.average().remaining / xpeed);
+              return Math.round(bar.average().remaining / speed);
             },
             'slot:bar': function slotBar() {
               return bar.opts.progress.pulsate ? pulsateBar(bar, pulsateSlots, pulsateSkips, bar.opts.bar.separator).join('') : function () {
@@ -930,21 +960,15 @@ var ProgressBar = /*#__PURE__*/function () {
             },
             'slot:eta': xprettyMs(1000 * progress.eta),
             'slot:eta:raw': progress.eta,
-            'slot:size': (0, _xbytes["default"])(progress.transferred, {
-              "short": !0
-            }),
+            'slot:size': buildBytesWith(progress.transferred),
             'slot:size:raw': progress.transferred,
-            'size:total': function sizeTotal() {
-              return (0, _xbytes["default"])(bar.total(), {
-                "short": !0
-              });
-            },
+            'size:total': buildBytesWith(function () {
+              return bar.total();
+            }),
             'slot:runtime': xprettyMs(1000 * progress.runtime),
             'slot:runtime:raw': progress.runtime,
             'slot:percentage': progress.percentage.toFixed(0),
-            'slot:size:total': (0, _xbytes["default"])(progress.length, {
-              "short": !0
-            }),
+            'slot:size:total': buildBytesWith(progress.length),
             'slot:size:total:raw': progress.length
           });
           [through, progressGen].map(function (emitter) {
@@ -990,6 +1014,17 @@ var ProgressBar = /*#__PURE__*/function () {
           return bar.print.apply(bar, arguments);
         },
 
+        /**
+         * Set the default unit
+         * @param {xbytes.AllUnitStacks} unit Preferred unit representation
+         * @returns {ProgressBar} The ProgressBar
+         */
+        defaultUnit: function defaultUnit(unit) {
+          if (!_xbytes["default"].isUnit(unit)) throw new Error("Invalid ByteString unit: ".concat(unit));
+          _defaultUnit = unit;
+          return this;
+        },
+
         /**
          * The ProgressBar Instance
          * @type {ProgressBar} The ProgresBar

package/package.json

@@ -1,14 +1,12 @@
 {
   "name": "xprogress",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "Dynamic, Flexible, extensible progressive CLI bar for the terminal built with NodeJS",
   "main": "dist/index.js",
   "types": "typings/index.d.ts",
   "scripts": {
-    "push": "git push github master && git push gitlab master",
     "build": "babel lib -d dist",
-    "version": "npm run build",
-    "postversion": "npm run push"
+    "version": "npm run build"
   },
   "engines": {
     "node": ">=6"
@@ -76,9 +74,9 @@
     "pretty-ms": "^5.1.0",
     "progress-stream": "^2.0.0",
     "speedometer": "^1.1.0",
-    "stringd": "^2.0.0",
-    "stringd-colors": "^1.8.0",
-    "xbytes": "^1.6.0"
+    "stringd": "^2.1.0",
+    "stringd-colors": "^1.9.0",
+    "xbytes": "^1.6.1"
   },
   "homepage": "https://github.com/miraclx/xprogress#readme",
   "directories": {

package/typings/index.d.ts

@@ -531,6 +531,8 @@ namespace ProgressBar {
     size: ByteString;
     speed: string;
     ['speed:raw']: string;
+    ['slot:speed']: string;
+    ['slot:speed:raw']: string;
     progress: ProgressStreamSlice;
     ['eta:raw']: number;
     ['slot:bar']: any;