@naturalcycles/js-lib 14.177.1 → 14.178.0

package/dist/decorators/logMethod.decorator.js

@@ -77,7 +77,7 @@ function logFinished(logger, callSignature, started, sma, logResultFn, res, err)
     const millis = Date.now() - started;
     const t = ['<<', callSignature, 'took', (0, time_util_1._ms)(millis)];
     if (sma) {
-        t.push(`(avg ${(0, time_util_1._ms)(sma.push(millis))})`);
+        t.push(`(avg ${(0, time_util_1._ms)(sma.pushGetAvg(millis))})`);
     }
     if (err !== undefined) {
         t.push('ERROR:', err);

package/dist/math/sma.d.ts

@@ -10,14 +10,17 @@ export declare class SimpleMovingAverage {
      */
     private nextIndex;
     /**
-     * Current average (calculated, cached).
+     * Current average (calculated on the fly).
      * Returns 0 (not undefined) for empty data.
      */
-    avg: number;
+    get avg(): number;
     /**
      * Push new value.
      * Returns newly calculated average (using newly pushed value).
      */
-    push(n: number): number;
-    private calculateAvg;
+    pushGetAvg(n: number): number;
+    /**
+     * Push new value.
+     */
+    push(n: number): void;
 }

package/dist/math/sma.js

@@ -12,28 +12,33 @@ class SimpleMovingAverage {
          * Next index of array to push to
          */
         this.nextIndex = 0;
-        /**
-         * Current average (calculated, cached).
-         * Returns 0 (not undefined) for empty data.
-         */
-        this.avg = 0;
+    }
+    /**
+     * Current average (calculated on the fly).
+     * Returns 0 (not undefined) for empty data.
+     */
+    get avg() {
+        if (this.data.length === 0)
+            return 0;
+        return this.data.reduce((total, n) => total + n, 0) / this.data.length;
     }
     /**
      * Push new value.
      * Returns newly calculated average (using newly pushed value).
      */
+    pushGetAvg(n) {
+        this.push(n);
+        return this.avg;
+    }
+    /**
+     * Push new value.
+     */
     push(n) {
         this.data[this.nextIndex] = n;
         this.nextIndex =
             this.nextIndex === this.size - 1
                 ? 0 // reset
                 : this.nextIndex + 1;
-        return this.calculateAvg();
-    }
-    calculateAvg() {
-        return (this.avg = this.data.length
-            ? this.data.reduce((total, n) => total + n, 0) / this.data.length
-            : 0);
     }
 }
 exports.SimpleMovingAverage = SimpleMovingAverage;

package/dist/unit/size.util.js

@@ -18,7 +18,7 @@ exports._kb = _kb;
  */
 function _hb(b = 0) {
     if (b < 1024)
-        return `${Math.round(b)} byte`;
+        return `${Math.round(b)} byte(s)`;
     if (b < 1024 ** 2)
         return `${(b / 1024).toPrecision(3)} Kb`;
     if (b < 1024 ** 3)

package/dist-esm/decorators/logMethod.decorator.js

@@ -73,7 +73,7 @@ function logFinished(logger, callSignature, started, sma, logResultFn, res, err)
     const millis = Date.now() - started;
     const t = ['<<', callSignature, 'took', _ms(millis)];
     if (sma) {
-        t.push(`(avg ${_ms(sma.push(millis))})`);
+        t.push(`(avg ${_ms(sma.pushGetAvg(millis))})`);
     }
     if (err !== undefined) {
         t.push('ERROR:', err);

package/dist-esm/http/fetcher.js

@@ -79,7 +79,7 @@ export class Fetcher {
         return this;
     }
     static create(cfg = {}) {
-        return new Fetcher(cfg);
+        return new _a(cfg);
     }
     // responseType=readableStream
     /**
@@ -183,7 +183,7 @@ export class Fetcher {
             }
             try {
                 // Calls cfg.fetchFn if set, otherwise Fetcher.callNativeFetch
-                res.fetchResponse = await (this.cfg.fetchFn || Fetcher.callNativeFetch)(req.fullUrl, req.init);
+                res.fetchResponse = await (this.cfg.fetchFn || _a.callNativeFetch)(req.fullUrl, req.init);
                 res.ok = res.fetchResponse.ok;
                 // important to set it to undefined, otherwise it can keep the previous value (from previous try)
                 res.err = undefined;
@@ -506,7 +506,7 @@ export class Fetcher {
             retry: Object.assign({}, defRetryOptions),
             init: {
                 method: cfg.method || 'GET',
-                headers: _filterNullishValues(Object.assign({ 'user-agent': Fetcher.userAgent }, cfg.headers)),
+                headers: _filterNullishValues(Object.assign({ 'user-agent': _a.userAgent }, cfg.headers)),
                 credentials: cfg.credentials,
                 redirect: cfg.redirect,
             },

package/dist-esm/math/sma.js

@@ -9,27 +9,32 @@ export class SimpleMovingAverage {
          * Next index of array to push to
          */
         this.nextIndex = 0;
-        /**
-         * Current average (calculated, cached).
-         * Returns 0 (not undefined) for empty data.
-         */
-        this.avg = 0;
+    }
+    /**
+     * Current average (calculated on the fly).
+     * Returns 0 (not undefined) for empty data.
+     */
+    get avg() {
+        if (this.data.length === 0)
+            return 0;
+        return this.data.reduce((total, n) => total + n, 0) / this.data.length;
     }
     /**
      * Push new value.
      * Returns newly calculated average (using newly pushed value).
      */
+    pushGetAvg(n) {
+        this.push(n);
+        return this.avg;
+    }
+    /**
+     * Push new value.
+     */
     push(n) {
         this.data[this.nextIndex] = n;
         this.nextIndex =
             this.nextIndex === this.size - 1
                 ? 0 // reset
                 : this.nextIndex + 1;
-        return this.calculateAvg();
-    }
-    calculateAvg() {
-        return (this.avg = this.data.length
-            ? this.data.reduce((total, n) => total + n, 0) / this.data.length
-            : 0);
     }
 }

package/dist-esm/unit/size.util.js

@@ -12,7 +12,7 @@ export function _kb(b) {
  */
 export function _hb(b = 0) {
     if (b < 1024)
-        return `${Math.round(b)} byte`;
+        return `${Math.round(b)} byte(s)`;
     if (b < 1024 ** 2)
         return `${(b / 1024).toPrecision(3)} Kb`;
     if (b < 1024 ** 3)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.177.1",
+  "version": "14.178.0",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/decorators/logMethod.decorator.ts

@@ -151,7 +151,7 @@ function logFinished(
   const t = ['<<', callSignature, 'took', _ms(millis)]
 
   if (sma) {
-    t.push(`(avg ${_ms(sma.push(millis))})`)
+    t.push(`(avg ${_ms(sma.pushGetAvg(millis))})`)
   }
 
   if (err !== undefined) {

package/src/math/sma.ts

@@ -13,28 +13,31 @@ export class SimpleMovingAverage {
   private nextIndex = 0
 
   /**
-   * Current average (calculated, cached).
+   * Current average (calculated on the fly).
    * Returns 0 (not undefined) for empty data.
    */
-  avg = 0
+  get avg(): number {
+    if (this.data.length === 0) return 0
+    return this.data.reduce((total, n) => total + n, 0) / this.data.length
+  }
 
   /**
    * Push new value.
    * Returns newly calculated average (using newly pushed value).
    */
-  push(n: number): number {
+  pushGetAvg(n: number): number {
+    this.push(n)
+    return this.avg
+  }
+
+  /**
+   * Push new value.
+   */
+  push(n: number): void {
     this.data[this.nextIndex] = n
     this.nextIndex =
       this.nextIndex === this.size - 1
         ? 0 // reset
         : this.nextIndex + 1
-
-    return this.calculateAvg()
-  }
-
-  private calculateAvg(): number {
-    return (this.avg = this.data.length
-      ? this.data.reduce((total, n) => total + n, 0) / this.data.length
-      : 0)
   }
 }

package/src/unit/size.util.ts

@@ -14,7 +14,7 @@ export function _kb(b: number): number {
  * Byte size to Human byte size string
  */
 export function _hb(b = 0): string {
-  if (b < 1024) return `${Math.round(b)} byte`
+  if (b < 1024) return `${Math.round(b)} byte(s)`
   if (b < 1024 ** 2) return `${(b / 1024).toPrecision(3)} Kb`
   if (b < 1024 ** 3) return `${(b / 1024 ** 2).toPrecision(3)} Mb`
   if (b < 1024 ** 4) return `${(b / 1024 ** 3).toPrecision(3)} Gb`