@naturalcycles/js-lib 14.149.0 → 14.149.2

package/dist/array/array.util.d.ts

@@ -1,4 +1,3 @@
-import type { RecursiveArray } from '../lodash.types';
 import type { FalsyValue, Mapper, Predicate, StringMap } from '../types';
 /**
  * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
@@ -13,24 +12,6 @@ import type { FalsyValue, Mapper, Predicate, StringMap } from '../types';
  * Based on: https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_chunk
  */
 export declare function _chunk<T>(array: readonly T[], size?: number): T[][];
-/**
- * Polyfill to Array.flat() with depth=1.
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flat
- *
- * @deprecated prefer native Array.flat(), it's supported since iOS 12
- */
-export declare function _flatten<T>(arrays: T[][]): T[];
-/**
- * Recursively flattens a nested array.
- *
- * @param arr The array to recursively flatten.
- * @return Returns the new flattened array.
- *
- * Based on: https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_flattendeep
- *
- * @deprecated prefer native Array.flat(), it's supported since iOS 12
- */
-export declare function _flattenDeep<T>(arr: RecursiveArray<T>): T[];
 /**
  * Removes duplicates from given array.
  */

package/dist/array/array.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._minByOrUndefined = exports._maxByOrUndefined = exports._minBy = exports._maxBy = exports._max = exports._maxOrUndefined = exports._min = exports._minOrUndefined = exports._lastOrUndefined = exports._last = exports._shuffle = exports._mapToObject = exports._sumBy = exports._sum = exports._difference = exports._intersection = exports._countBy = exports._dropRightWhile = exports._dropWhile = exports._takeRightWhile = exports._takeWhile = exports._findLast = exports._sortBy = exports._groupBy = exports._by = exports._uniqBy = exports._uniq = exports._flattenDeep = exports._flatten = exports._chunk = void 0;
+exports._minByOrUndefined = exports._maxByOrUndefined = exports._minBy = exports._maxBy = exports._max = exports._maxOrUndefined = exports._min = exports._minOrUndefined = exports._lastOrUndefined = exports._last = exports._shuffle = exports._mapToObject = exports._sumBy = exports._sum = exports._difference = exports._intersection = exports._countBy = exports._dropRightWhile = exports._dropWhile = exports._takeRightWhile = exports._takeWhile = exports._findLast = exports._sortBy = exports._groupBy = exports._by = exports._uniqBy = exports._uniq = exports._chunk = void 0;
 const is_util_1 = require("../is.util");
 /**
  * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
@@ -20,33 +20,6 @@ function _chunk(array, size = 1) {
     }, []);
 }
 exports._chunk = _chunk;
-/**
- * Polyfill to Array.flat() with depth=1.
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flat
- *
- * @deprecated prefer native Array.flat(), it's supported since iOS 12
- */
-function _flatten(arrays) {
-    // to flat single level array
-    return [].concat(...arrays);
-}
-exports._flatten = _flatten;
-/**
- * Recursively flattens a nested array.
- *
- * @param arr The array to recursively flatten.
- * @return Returns the new flattened array.
- *
- * Based on: https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_flattendeep
- *
- * @deprecated prefer native Array.flat(), it's supported since iOS 12
- */
-function _flattenDeep(arr) {
-    return Array.isArray(arr)
-        ? arr.reduce((a, b) => a.concat(_flattenDeep(b)), [])
-        : [arr];
-}
-exports._flattenDeep = _flattenDeep;
 /**
  * Removes duplicates from given array.
  */

package/dist/http/fetcher.js

@@ -297,23 +297,24 @@ class Fetcher {
         if (retryStatus.retryAttempt >= count) {
             retryStatus.retryStopped = true;
         }
-        if (retryStatus.retryStopped)
-            return;
-        // Here we know that more retries will be attempted
         // We don't log "last error", because it will be thrown and logged by consumer,
         // but we should log all previous errors, otherwise they are lost.
-        // Here is the right place where we know it's not the "last error"
-        if (res.err) {
+        // Here is the right place where we know it's not the "last error".
+        // lastError = retryStatus.retryStopped
+        // We need to log the response "anyway" if logResponse is true
+        if (res.err && (!retryStatus.retryStopped || res.req.logResponse)) {
             this.cfg.logger.error([
                 ' <<',
                 res.fetchResponse?.status || 0,
                 res.signature,
-                `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
+                count && `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
                 (0, time_util_1._since)(res.req.started),
             ]
                 .filter(Boolean)
                 .join(' '), res.err.cause || res.err);
         }
+        if (retryStatus.retryStopped)
+            return;
         retryStatus.retryAttempt++;
         retryStatus.retryTimeout = (0, number_util_1._clamp)(retryStatus.retryTimeout * timeoutMultiplier, 0, timeoutMax);
         await (0, pDelay_1.pDelay)(this.getRetryTimeout(res));
@@ -440,21 +441,26 @@ class Fetcher {
         return norm;
     }
     normalizeOptions(opt) {
-        const { timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
         const req = {
+            ...(0, object_util_1._pick)(this.cfg, [
+                'timeoutSeconds',
+                'throwHttpErrors',
+                'retryPost',
+                'retry4xx',
+                'retry5xx',
+                'mode',
+                'jsonReviver',
+                'logRequest',
+                'logRequestBody',
+                'logResponse',
+                'logResponseBody',
+            ]),
             started: Date.now(),
-            mode,
-            timeoutSeconds,
-            throwHttpErrors,
-            retryPost,
-            retry4xx,
-            retry5xx,
-            jsonReviver,
             ...(0, object_util_1._omit)(opt, ['method', 'headers', 'credentials']),
             inputUrl: opt.url || '',
             fullUrl: opt.url || '',
             retry: {
-                ...retry,
+                ...this.cfg.retry,
                 ...(0, object_util_1._filterUndefinedValues)(opt.retry || {}),
             },
             init: (0, object_util_1._merge)({

package/dist/http/fetcher.model.d.ts

@@ -2,7 +2,7 @@ import type { CommonLogger } from '../log/commonLogger';
 import type { Promisable } from '../typeFest';
 import type { Reviver, UnixTimestampMillisNumber } from '../types';
 import type { HttpMethod, HttpStatusFamily } from './http.model';
-export interface FetcherNormalizedCfg extends Required<FetcherCfg>, Omit<FetcherRequest, 'started' | 'fullUrl'> {
+export interface FetcherNormalizedCfg extends Required<FetcherCfg>, Omit<FetcherRequest, 'started' | 'fullUrl' | 'logRequest' | 'logRequestBody' | 'logResponse' | 'logResponseBody'> {
     logger: CommonLogger;
     searchParams: Record<string, any>;
 }
@@ -148,6 +148,10 @@ export interface FetcherOptions {
      */
     retry5xx?: boolean;
     jsonReviver?: Reviver;
+    logRequest?: boolean;
+    logRequestBody?: boolean;
+    logResponse?: boolean;
+    logResponseBody?: boolean;
 }
 export type RequestInitNormalized = Omit<RequestInit, 'method' | 'headers'> & {
     method: HttpMethod;

package/dist/types.d.ts

@@ -137,10 +137,6 @@ export interface InstanceId {
  * @example '2019-06-21'
  */
 export type IsoDateString = string;
-/**
- * @deprecated use IsoDateString
- */
-export type IsoDate = string;
 /**
  * Interface explicitly states that the value is an ISO DateTime string (with time).
  *
@@ -159,10 +155,6 @@ export type UnixTimestampNumber = number;
  * @example 1628945450000
  */
 export type UnixTimestampMillisNumber = number;
-/**
- * @deprecated use UnixTimestampNumber
- */
-export type UnixTimestamp = number;
 export type NumberOfSeconds = number;
 export type NumberOfMilliseconds = number;
 /**

package/dist-esm/array/array.util.js

@@ -16,31 +16,6 @@ export function _chunk(array, size = 1) {
         return idx % size === 0 ? [...arr, [item]] : [...arr.slice(0, -1), [...arr.slice(-1)[0], item]];
     }, []);
 }
-/**
- * Polyfill to Array.flat() with depth=1.
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flat
- *
- * @deprecated prefer native Array.flat(), it's supported since iOS 12
- */
-export function _flatten(arrays) {
-    // to flat single level array
-    return [].concat(...arrays);
-}
-/**
- * Recursively flattens a nested array.
- *
- * @param arr The array to recursively flatten.
- * @return Returns the new flattened array.
- *
- * Based on: https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_flattendeep
- *
- * @deprecated prefer native Array.flat(), it's supported since iOS 12
- */
-export function _flattenDeep(arr) {
-    return Array.isArray(arr)
-        ? arr.reduce((a, b) => a.concat(_flattenDeep(b)), [])
-        : [arr];
-}
 /**
  * Removes duplicates from given array.
  */

package/dist-esm/http/fetcher.js

@@ -3,7 +3,7 @@ import { isServerSide } from '../env';
 import { _anyToError, _anyToErrorObject, _errorToErrorObject } from '../error/error.util';
 import { HttpRequestError } from '../error/httpRequestError';
 import { _clamp } from '../number/number.util';
-import { _filterNullishValues, _filterUndefinedValues, _mapKeys, _merge, _omit, } from '../object/object.util';
+import { _filterNullishValues, _filterUndefinedValues, _mapKeys, _merge, _omit, _pick, } from '../object/object.util';
 import { pDelay } from '../promise/pDelay';
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util';
 import { _since } from '../time/time.util';
@@ -284,23 +284,24 @@ export class Fetcher {
         if (retryStatus.retryAttempt >= count) {
             retryStatus.retryStopped = true;
         }
-        if (retryStatus.retryStopped)
-            return;
-        // Here we know that more retries will be attempted
         // We don't log "last error", because it will be thrown and logged by consumer,
         // but we should log all previous errors, otherwise they are lost.
-        // Here is the right place where we know it's not the "last error"
-        if (res.err) {
+        // Here is the right place where we know it's not the "last error".
+        // lastError = retryStatus.retryStopped
+        // We need to log the response "anyway" if logResponse is true
+        if (res.err && (!retryStatus.retryStopped || res.req.logResponse)) {
             this.cfg.logger.error([
                 ' <<',
                 ((_a = res.fetchResponse) === null || _a === void 0 ? void 0 : _a.status) || 0,
                 res.signature,
-                `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
+                count && `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
                 _since(res.req.started),
             ]
                 .filter(Boolean)
                 .join(' '), res.err.cause || res.err);
         }
+        if (retryStatus.retryStopped)
+            return;
         retryStatus.retryAttempt++;
         retryStatus.retryTimeout = _clamp(retryStatus.retryTimeout * timeoutMultiplier, 0, timeoutMax);
         await pDelay(this.getRetryTimeout(res));
@@ -431,14 +432,19 @@ export class Fetcher {
     }
     normalizeOptions(opt) {
         var _a, _b;
-        const { timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
-        const req = Object.assign(Object.assign({ started: Date.now(), mode,
-            timeoutSeconds,
-            throwHttpErrors,
-            retryPost,
-            retry4xx,
-            retry5xx,
-            jsonReviver }, _omit(opt, ['method', 'headers', 'credentials'])), { inputUrl: opt.url || '', fullUrl: opt.url || '', retry: Object.assign(Object.assign({}, retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials, redirect: ((_b = (_a = opt.followRedirects) !== null && _a !== void 0 ? _a : this.cfg.followRedirects) !== null && _b !== void 0 ? _b : true) ? 'follow' : 'error' }), {
+        const req = Object.assign(Object.assign(Object.assign(Object.assign({}, _pick(this.cfg, [
+            'timeoutSeconds',
+            'throwHttpErrors',
+            'retryPost',
+            'retry4xx',
+            'retry5xx',
+            'mode',
+            'jsonReviver',
+            'logRequest',
+            'logRequestBody',
+            'logResponse',
+            'logResponseBody',
+        ])), { started: Date.now() }), _omit(opt, ['method', 'headers', 'credentials'])), { inputUrl: opt.url || '', fullUrl: opt.url || '', retry: Object.assign(Object.assign({}, this.cfg.retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials, redirect: ((_b = (_a = opt.followRedirects) !== null && _a !== void 0 ? _a : this.cfg.followRedirects) !== null && _b !== void 0 ? _b : true) ? 'follow' : 'error' }), {
                 headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),
             }) });
         // setup url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.149.0",
+  "version": "14.149.2",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",
@@ -39,6 +39,7 @@
     "node": ">=18.12.0"
   },
   "publishConfig": {
+    "provenance": true,
     "access": "public"
   },
   "repository": {

package/src/array/array.util.ts

@@ -1,5 +1,4 @@
 import { _isNotNullish } from '../is.util'
-import type { RecursiveArray } from '../lodash.types'
 import type { FalsyValue, Mapper, Predicate, StringMap } from '../types'
 
 /**
@@ -20,33 +19,6 @@ export function _chunk<T>(array: readonly T[], size = 1): T[][] {
   }, [] as T[][])
 }
 
-/**
- * Polyfill to Array.flat() with depth=1.
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flat
- *
- * @deprecated prefer native Array.flat(), it's supported since iOS 12
- */
-export function _flatten<T>(arrays: T[][]): T[] {
-  // to flat single level array
-  return ([] as T[]).concat(...arrays)
-}
-
-/**
- * Recursively flattens a nested array.
- *
- * @param arr The array to recursively flatten.
- * @return Returns the new flattened array.
- *
- * Based on: https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_flattendeep
- *
- * @deprecated prefer native Array.flat(), it's supported since iOS 12
- */
-export function _flattenDeep<T>(arr: RecursiveArray<T>): T[] {
-  return Array.isArray(arr)
-    ? arr.reduce((a: RecursiveArray<T>, b) => a.concat(_flattenDeep(b as RecursiveArray<T>)), [])
-    : ([arr] as any)
-}
-
 /**
  * Removes duplicates from given array.
  */

package/src/http/fetcher.model.ts

@@ -5,7 +5,10 @@ import type { HttpMethod, HttpStatusFamily } from './http.model'
 
 export interface FetcherNormalizedCfg
   extends Required<FetcherCfg>,
-    Omit<FetcherRequest, 'started' | 'fullUrl'> {
+    Omit<
+      FetcherRequest,
+      'started' | 'fullUrl' | 'logRequest' | 'logRequestBody' | 'logResponse' | 'logResponseBody'
+    > {
   logger: CommonLogger
   searchParams: Record<string, any>
 }
@@ -181,6 +184,11 @@ export interface FetcherOptions {
   retry5xx?: boolean
 
   jsonReviver?: Reviver
+
+  logRequest?: boolean
+  logRequestBody?: boolean
+  logResponse?: boolean
+  logResponseBody?: boolean
 }
 
 export type RequestInitNormalized = Omit<RequestInit, 'method' | 'headers'> & {

package/src/http/fetcher.ts

@@ -11,6 +11,7 @@ import {
   _mapKeys,
   _merge,
   _omit,
+  _pick,
 } from '../object/object.util'
 import { pDelay } from '../promise/pDelay'
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util'
@@ -385,19 +386,18 @@ export class Fetcher {
       retryStatus.retryStopped = true
     }
 
-    if (retryStatus.retryStopped) return
-
-    // Here we know that more retries will be attempted
     // We don't log "last error", because it will be thrown and logged by consumer,
     // but we should log all previous errors, otherwise they are lost.
-    // Here is the right place where we know it's not the "last error"
-    if (res.err) {
+    // Here is the right place where we know it's not the "last error".
+    // lastError = retryStatus.retryStopped
+    // We need to log the response "anyway" if logResponse is true
+    if (res.err && (!retryStatus.retryStopped || res.req.logResponse)) {
       this.cfg.logger.error(
         [
           ' <<',
           res.fetchResponse?.status || 0,
           res.signature,
-          `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
+          count && `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
           _since(res.req.started),
         ]
           .filter(Boolean)
@@ -406,6 +406,8 @@ export class Fetcher {
       )
     }
 
+    if (retryStatus.retryStopped) return
+
     retryStatus.retryAttempt++
     retryStatus.retryTimeout = _clamp(retryStatus.retryTimeout * timeoutMultiplier, 0, timeoutMax)
 
@@ -545,31 +547,26 @@ export class Fetcher {
   }
 
   private normalizeOptions(opt: FetcherOptions): FetcherRequest {
-    const {
-      timeoutSeconds,
-      throwHttpErrors,
-      retryPost,
-      retry4xx,
-      retry5xx,
-      retry,
-      mode,
-      jsonReviver,
-    } = this.cfg
-
     const req: FetcherRequest = {
+      ..._pick(this.cfg, [
+        'timeoutSeconds',
+        'throwHttpErrors',
+        'retryPost',
+        'retry4xx',
+        'retry5xx',
+        'mode',
+        'jsonReviver',
+        'logRequest',
+        'logRequestBody',
+        'logResponse',
+        'logResponseBody',
+      ]),
       started: Date.now(),
-      mode,
-      timeoutSeconds,
-      throwHttpErrors,
-      retryPost,
-      retry4xx,
-      retry5xx,
-      jsonReviver,
       ..._omit(opt, ['method', 'headers', 'credentials']),
       inputUrl: opt.url || '',
       fullUrl: opt.url || '',
       retry: {
-        ...retry,
+        ...this.cfg.retry,
         ..._filterUndefinedValues(opt.retry || {}),
       },
       init: _merge(
@@ -584,7 +581,6 @@ export class Fetcher {
         } as RequestInit,
       ),
     }
-
     // setup url
     const baseUrl = opt.baseUrl || this.cfg.baseUrl
     if (baseUrl) {

package/src/types.ts

@@ -191,11 +191,6 @@ export interface InstanceId {
  */
 export type IsoDateString = string
 
-/**
- * @deprecated use IsoDateString
- */
-export type IsoDate = string
-
 /**
  * Interface explicitly states that the value is an ISO DateTime string (with time).
  *
@@ -217,11 +212,6 @@ export type UnixTimestampNumber = number
  */
 export type UnixTimestampMillisNumber = number
 
-/**
- * @deprecated use UnixTimestampNumber
- */
-export type UnixTimestamp = number
-
 export type NumberOfSeconds = number
 export type NumberOfMilliseconds = number