@sima-land/isomorph 9.0.3 → 9.0.7

package/cache/local-storage.d.ts

@@ -1,14 +1,34 @@
-export function isAvailable(): boolean;
-export function getItem(key: string): any;
-export function setItem(key: string, value: any, duration?: number): void;
-export function isQuotaExceeded(error: Object): boolean;
-export default localStorageCache;
+/**
+ * Определяет доступен ли кэш.
+ * @return Флаг доступности кэш.
+ */
+export declare const isAvailable: () => boolean;
+/**
+ * Возвращает объект.
+ * @param key Ключ.
+ * @return Запрашиваемое значение.
+ */
+export declare const getItem: (key: string) => unknown;
+/**
+ * Добавляет значение.
+ * @param key Ключ.
+ * @param value Значение.
+ * @param duration Время жизни значения в секундах.
+ */
+export declare const setItem: (key: string, value: any, duration?: number) => void;
+/**
+ * Определяет, превышена ли квота.
+ * @param error Информация об ошибке.
+ * @return Признак превышения квоты.
+ */
+export declare const isQuotaExceeded: (error: any) => boolean;
 /**
  * Набор методов для работы с кэшем.
- * @type {{set: Function, get: Function, status: boolean}}
  */
-declare const localStorageCache: {
-    set: Function;
-    get: Function;
-    status: boolean;
+declare const LocalStorageCache: {
+    readonly get: (key: string) => unknown;
+    readonly set: (key: string, value: any, duration?: number) => void;
+    readonly status: boolean;
+    readonly quotaExceeded: (error: any) => boolean;
 };
+export default LocalStorageCache;

package/cache/local-storage.js

@@ -3,17 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isQuotaExceeded = exports.setItem = exports.getItem = exports.isAvailable = void 0;
 /**
  * Определяет доступен ли кэш.
- * @return {boolean} Флаг доступности кэш.
+ * @return Флаг доступности кэш.
  */
-const isAvailable = () => typeof window !== 'undefined' && typeof window.localStorage !== 'undefined';
+const isAvailable = () => {
+    try {
+        const testKey = `local_storage_test_key::${Date.now()}`;
+        window.localStorage.setItem(testKey, testKey);
+        window.localStorage.removeItem(testKey);
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+};
 exports.isAvailable = isAvailable;
 /**
- * Возвращает объект из кэша.
- * @param {string} key Ключ.
- * @return {*} Запрашиваемое значение из кэша.
+ * Возвращает объект.
+ * @param key Ключ.
+ * @return Запрашиваемое значение.
  */
-const getItem = key => {
-    const { value, expire } = JSON.parse(localStorage.getItem(key)) || {};
+const getItem = (key) => {
+    const { value, expire } = JSON.parse(localStorage.getItem(key) || '{}');
     const now = Date.now();
     const isExpired = expire
         ? now > expire
@@ -23,10 +33,10 @@ const getItem = key => {
 };
 exports.getItem = getItem;
 /**
- * Добавляет значение в кэш.
- * @param {string} key Ключ.
- * @param {*} value Значение.
- * @param {number} [duration=3600] Время жизни значения в кэше в секундах.
+ * Добавляет значение.
+ * @param key Ключ.
+ * @param value Значение.
+ * @param duration Время жизни значения в секундах.
  */
 const setItem = (key, value, duration = 3600) => {
     const now = Date.now();
@@ -39,11 +49,11 @@ const setItem = (key, value, duration = 3600) => {
 };
 exports.setItem = setItem;
 /**
- * Определяет, привышена ли квота.
- * @param {Object} error Информация об ошибке.
- * @return {boolean} Признак привышения квоты.
+ * Определяет, превышена ли квота.
+ * @param error Информация об ошибке.
+ * @return Признак превышения квоты.
  */
-const isQuotaExceeded = error => {
+const isQuotaExceeded = (error) => {
     let quotaExceeded = false;
     if (error) {
         if (error.code) {
@@ -60,7 +70,7 @@ const isQuotaExceeded = error => {
             }
         }
         else if (error.number === -2147024882) {
-            // Internet Explorer 8
+            // IE 8
             quotaExceeded = true;
         }
     }
@@ -69,13 +79,12 @@ const isQuotaExceeded = error => {
 exports.isQuotaExceeded = isQuotaExceeded;
 /**
  * Набор методов для работы с кэшем.
- * @type {{set: Function, get: Function, status: boolean}}
  */
-const localStorageCache = {
+const LocalStorageCache = {
     get: exports.getItem,
     set: exports.setItem,
     status: exports.isAvailable(),
     quotaExceeded: exports.isQuotaExceeded,
 };
-exports.default = localStorageCache;
+exports.default = LocalStorageCache;
 //# sourceMappingURL=local-storage.js.map

package/cache/local-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-storage.js","sourceRoot":"","sources":["../../src/cache/local-storage.js"],"names":[],"mappings":";;;AAAA;;;GAGG;AACI,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,WAAW,CAAC;AAAhG,QAAA,WAAW,eAAqF;AAE7G;;;;GAIG;AACI,MAAM,OAAO,GAAG,GAAG,CAAC,EAAE;IAC3B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACtE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,MAAM;QACtB,CAAC,CAAC,GAAG,GAAG,MAAM;QACd,CAAC,CAAC,IAAI,CAAC;IAET,SAAS,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAClC,CAAC,CAAC;AAVW,QAAA,OAAO,WAUlB;AAEF;;;;;GAKG;AACI,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE;IACrD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAC;IACnC,MAAM,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC;IAEhC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;QACvC,KAAK;QACL,MAAM;KACP,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AATW,QAAA,OAAO,WASlB;AAEF;;;;GAIG;AACI,MAAM,eAAe,GAAG,KAAK,CAAC,EAAE;IACrC,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,KAAK,EAAE;QACT,IAAI,KAAK,CAAC,IAAI,EAAE;YACd,QAAQ,KAAK,CAAC,IAAI,EAAE;gBAClB,KAAK,EAAE;oBACL,aAAa,GAAG,IAAI,CAAC;oBACrB,MAAM;gBACR,KAAK,IAAI;oBACP,UAAU;oBACV,IAAI,KAAK,CAAC,IAAI,KAAK,4BAA4B,EAAE;wBAC/C,aAAa,GAAG,IAAI,CAAC;qBACtB;oBACD,MAAM;aACT;SACF;aAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,UAAU,EAAE;YACvC,sBAAsB;YACtB,aAAa,GAAG,IAAI,CAAC;SACtB;KACF;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AArBW,QAAA,eAAe,mBAqB1B;AAEF;;;GAGG;AACH,MAAM,iBAAiB,GAAG;IACxB,GAAG,EAAE,eAAO;IACZ,GAAG,EAAE,eAAO;IACZ,MAAM,EAAE,mBAAW,EAAE;IACrB,aAAa,EAAE,uBAAe;CAC/B,CAAC;AAEF,kBAAe,iBAAiB,CAAC"}
+{"version":3,"file":"local-storage.js","sourceRoot":"","sources":["../../src/cache/local-storage.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACI,MAAM,WAAW,GAAG,GAAY,EAAE;IACvC,IAAI;QACF,MAAM,OAAO,GAAG,2BAA2B,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAExD,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAExC,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAA;AAXY,QAAA,WAAW,eAWvB;AAED;;;;GAIG;AACI,MAAM,OAAO,GAAG,CAAC,GAAW,EAAW,EAAE;IAC9C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC;IACxE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,MAAM;QACtB,CAAC,CAAC,GAAG,GAAG,MAAM;QACd,CAAC,CAAC,IAAI,CAAC;IAET,SAAS,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAClC,CAAC,CAAC;AAVW,QAAA,OAAO,WAUlB;AAEF;;;;;GAKG;AACI,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,KAAU,EAAE,QAAQ,GAAG,IAAI,EAAE,EAAE;IAClE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAC;IACnC,MAAM,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC;IAEhC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;QACvC,KAAK;QACL,MAAM;KACP,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AATW,QAAA,OAAO,WASlB;AAEF;;;;GAIG;AACI,MAAM,eAAe,GAAG,CAAC,KAAU,EAAW,EAAE;IACrD,IAAI,aAAa,GAAG,KAAK,CAAC;IAE1B,IAAI,KAAK,EAAE;QACT,IAAI,KAAK,CAAC,IAAI,EAAE;YACd,QAAQ,KAAK,CAAC,IAAI,EAAE;gBAClB,KAAK,EAAE;oBACL,aAAa,GAAG,IAAI,CAAC;oBACrB,MAAM;gBACR,KAAK,IAAI;oBACP,UAAU;oBACV,IAAI,KAAK,CAAC,IAAI,KAAK,4BAA4B,EAAE;wBAC/C,aAAa,GAAG,IAAI,CAAC;qBACtB;oBACD,MAAM;aACT;SACF;aAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,UAAU,EAAE;YACvC,OAAO;YACP,aAAa,GAAG,IAAI,CAAC;SACtB;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAvBW,QAAA,eAAe,mBAuB1B;AAEF;;GAEG;AACH,MAAM,iBAAiB,GAAG;IACxB,GAAG,EAAE,eAAO;IACZ,GAAG,EAAE,eAAO;IACZ,MAAM,EAAE,mBAAW,EAAE;IACrB,aAAa,EAAE,uBAAe;CACtB,CAAC;AAEX,kBAAe,iBAAiB,CAAC"}

package/cache/redis.d.ts

@@ -1,4 +1,4 @@
-export function createRedisCache(config: Object, reconnectAfterError?: Function, getRepeatStrategy?: Function, getOnJoinCallback?: Function, getAfterReconnectingCallback?: Function): Object;
+export function createRedisCache(config: Object, reconnectAfterError?: Function | undefined, getRepeatStrategy?: Function | undefined, getOnJoinCallback?: Function | undefined, getAfterReconnectingCallback?: Function | undefined): Object;
 export function mapServiceOptionsToArgs({ config, reconnectAfterError, getRepeatStrategy, getOnJoinCallback, getAfterReconnectingCallback, }: {
     config: Object;
     reconnectAfterError: Function;

package/config/helpers.d.ts

@@ -6,6 +6,6 @@ export function consoleError(errorText: string): void;
 export function callError({ property, value, error, type, }: {
     property: string;
     value: any;
-    error?: Function | string;
+    error?: string | Function | undefined;
     type: 'error' | 'warning';
 }): void;

package/container/get-dependencies.d.ts

@@ -10,4 +10,4 @@ export default getDependencies;
  * @param {string} serviceName Названия сервиса.
  * @return {Object} Объект зависимостей.
  */
-declare function getDependencies(container: Object, dependencies: Object, serviceName: string): Object;
+declare function getDependencies(container: Object, dependencies: Object | undefined, serviceName: string): Object;

package/create-proxy/create-proxy-middleware/index.d.ts

@@ -13,4 +13,4 @@ export function getRequestPathResolver(path: string): Function;
  * @param {string} url Url.
  * @return {string} Path или пустую строку.
  */
-export const getUrlPath: (urlString: string, parseQueryString: boolean, slashesDenoteHost?: boolean) => string;
+export const getUrlPath: (urlString: string, parseQueryString: boolean, slashesDenoteHost?: boolean | undefined) => string | null;

package/graceful-shutdown/index.d.ts

@@ -4,19 +4,19 @@
  */
 export const defaultExitTimeout: number;
 export function decorateGracefulShutdown(server: import('http').Server, options?: {
-    onSuccess?: Function;
-    onError?: Function;
-    timeout?: number;
-}): void;
+    onSuccess?: Function | undefined;
+    onError?: Function | undefined;
+    timeout?: number | undefined;
+} | undefined): void;
 export function createShutdownHandler(server: import('http').Server, { onError, onSuccess, timeout, }?: {
-    onSuccess?: Function;
-    onError?: Function;
-    timeout?: number;
-}): Function;
-export function createCloseHandler(exitCode?: number, onClose?: Function): Function;
+    onSuccess?: Function | undefined;
+    onError?: Function | undefined;
+    timeout?: number | undefined;
+} | undefined): Function;
+export function createCloseHandler(exitCode?: number | undefined, onClose?: Function | undefined): Function;
 export function onExitHandlerCreator({ logger, config, message }: {
     logger: Object;
-    config?: Object;
+    config?: Object | undefined;
     message: string;
 }): Function;
 export function gracefulShutdownCreator({ onExitError: onError, onExitSuccess: onSuccess, processExitTimeout: timeout, }: {

package/helpers/add-error-handling/index.d.ts

@@ -1 +1 @@
-export function addErrorHandling(handler: Function, errorHandler?: Function): Function;
+export function addErrorHandling(handler: Function, errorHandler?: Function | undefined): Function;

package/helpers/analytics/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/analytics/index.ts"],"names":[],"mappings":";;;AAAA,iCAA+B;AAC/B,gDAA0C;AAC1C,mCAA6C;AAI7C;;;GAGG;AACI,MAAM,OAAO,GAAG,CAAC,SAAmB,EAAE,EAAE;;IAC7C,qFAAqF;IACrF,mBAAU,CAAC,MAAC,MAAc,CAAC,GAAG,0CAAE,IAAI,CAAC,IAAK,MAAc,CAAC,GAAG,CAAC,IAAI,mBAAM,SAAS,EAAG,CAAC;AACtF,CAAC,CAAC;AAHW,QAAA,OAAO,WAGlB;AAEF;;;GAGG;AACH,QAAgB,CAAC,CAAC,aAAa,CAAE,IAAc;IAC7C,MAAM,cAAI,CAAC,eAAO,EAAE,IAAI,CAAC,CAAC;AAC5B,CAAC;AAFD,sCAEC;AAED;;;;GAIG;AACI,MAAM,YAAY,GAAG,CAAC,IAAc,EAAE,EAAE;IAC7C,MAAM,OAAO,GAAG,cAAM,EAAY,CAAC;IACnC,MAAM,KAAK,GAAG,cAAM,EAAc,CAAC;IAEnC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,qBAAQ,IAAI,CAAE,CAAC;KAC/B;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QAClB,KAAK,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,eAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAChD;IAED,IAAI,CAAC,gBAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,KAAK,CAAC;YACV,gDAAgD;YAChD,wFAAwF;SACzF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KACf;IAED,OAAO,KAAK,CAAC,OAAO,CAAC;AACvB,CAAC,CAAC;AApBW,QAAA,YAAY,gBAoBvB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/analytics/index.ts"],"names":[],"mappings":";;;AAAA,iCAA+B;AAC/B,gDAA0C;AAC1C,mCAA6C;AAI7C;;;GAGG;AACI,MAAM,OAAO,GAAG,CAAC,SAAmB,EAAE,EAAE;;IAC7C,qFAAqF;IACrF,mBAAU,CAAC,MAAC,MAAc,CAAC,GAAG,0CAAE,IAAI,CAAC,IAAK,MAAc,CAAC,GAAG,CAAC,IAAI,mBAAM,SAAS,EAAG,CAAC;AACtF,CAAC,CAAC;AAHW,QAAA,OAAO,WAGlB;AAEF;;;GAGG;AACH,QAAgB,CAAC,CAAC,aAAa,CAAE,IAAc;IAC7C,MAAM,cAAI,CAAC,eAAO,EAAE,IAAI,CAAC,CAAC;AAC5B,CAAC;AAFD,sCAEC;AAED;;;;GAIG;AACI,MAAM,YAAY,GAAG,CAAC,IAAc,EAAE,EAAE;IAC7C,MAAM,OAAO,GAAG,cAAM,EAAY,CAAC;IACnC,MAAM,KAAK,GAAG,cAAM,EAAc,CAAC;IAEnC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,qBAAQ,IAAI,CAAE,CAAC;KAC/B;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QAClB,KAAK,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,eAAO,CAAC,OAAO,CAAC,OAAmB,CAAC,CAAC;KAC5D;IAED,IAAI,CAAC,gBAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,KAAK,CAAC;YACV,gDAAgD;YAChD,wFAAwF;SACzF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KACf;IAED,OAAO,KAAK,CAAC,OAAO,CAAC;AACvB,CAAC,CAAC;AApBW,QAAA,YAAY,gBAoBvB"}

package/helpers/api/middlewares/error-handlers-middlewares.js

@@ -14,22 +14,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHandleExceptionMiddleware = exports.createAttachBreadcrumbsMiddleware = exports._deptToArg = exports._getLevelFromConfig = exports._sendHttpBreadcrumb = void 0;
 const container_1 = require("../../../container");
-const isFunction_1 = __importDefault(require("lodash/isFunction"));
-const pathOr_1 = __importDefault(require("lodash/fp/pathOr"));
 const pick_1 = __importDefault(require("lodash/pick"));
-const getStatusCode = pathOr_1.default('UNKNOWN', 'status');
-const getConfig = pathOr_1.default({}, 'config');
 /**
  * Отправляет крошки http запроса.
  * @param {Function} sendBreadcrumb Функция отправки крошек.
- * @param {Object} response Объект в формате ответа Axios, содержащий данные о запросе.
+ * @param {Object} response Объект в формате ответа Axios, содержащий данные об ответе.
  * @param {boolean} asRequest Обработать как событие запроса.
  * @private
  */
 const _sendHttpBreadcrumb = (sendBreadcrumb, response, asRequest = false) => {
-    const statusCode = asRequest ? 'FETCHING' : getStatusCode(response);
-    const { url, baseURL, method, params } = getConfig(response);
-    const fullURL = baseURL ? baseURL.replace(/\/$/, '') + url : url;
+    const statusCode = asRequest ? 'FETCHING' : (response === null || response === void 0 ? void 0 : response.status) || 'UNKNOWN';
+    const { url, baseURL, method, params } = (response === null || response === void 0 ? void 0 : response.config) || {};
+    const fullURL = baseURL ? `${baseURL.replace(/\/$/, '')}${url}` : url;
     const breadcrumb = {
         category: asRequest ? 'http.request' : 'http.response',
         type: 'http',
@@ -41,7 +37,7 @@ const _sendHttpBreadcrumb = (sendBreadcrumb, response, asRequest = false) => {
         },
         level: asRequest || (statusCode >= 200 && statusCode < 300) ? 'info' : 'error',
     };
-    isFunction_1.default(sendBreadcrumb) && sendBreadcrumb(breadcrumb);
+    sendBreadcrumb && sendBreadcrumb(breadcrumb);
 };
 exports._sendHttpBreadcrumb = _sendHttpBreadcrumb;
 /**
@@ -58,10 +54,10 @@ const _createAttachBreadcrumbsMiddleware = ({ captureBreadcrumb }) =>
  * @param {Function} next Функция для передачи контекста выполнения следующему middleware.
  * @return {Promise} Промис.
  */
-(requestConfig, next) => __awaiter(void 0, void 0, void 0, function* () {
+(config, next, defaults) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        exports._sendHttpBreadcrumb(captureBreadcrumb, { config: requestConfig }, true);
-        const apiResponse = yield next(requestConfig);
+        exports._sendHttpBreadcrumb(captureBreadcrumb, { config: Object.assign(Object.assign({}, defaults), config) }, true);
+        const apiResponse = yield next(config);
         exports._sendHttpBreadcrumb(captureBreadcrumb, apiResponse);
     }
     catch (error) {
@@ -76,21 +72,14 @@ const _createAttachBreadcrumbsMiddleware = ({ captureBreadcrumb }) =>
  * @return {function(Object, Function)} Middleware для захвата исключения.
  * @private
  */
-const _createHandleExceptionMiddleware = ({ captureExtendedException }) => 
-/**
- * Middleware для отправки исключения в сервис логирования.
- * @param {Object} requestConfig Конфигурация запроса API.
- * @param {Function} next Функция для передачи контекста выполнения следующему middleware.
- * @return {Promise} Промис.
- */
-(requestConfig, next) => __awaiter(void 0, void 0, void 0, function* () {
+const _createHandleExceptionMiddleware = ({ captureExtendedException }) => (config, next, defaults) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        yield next(requestConfig);
+        yield next(config);
     }
     catch (error) {
         const { status } = error.response || {};
-        const { logLevelConfig } = requestConfig;
-        isFunction_1.default(captureExtendedException) && captureExtendedException(error, pick_1.default(requestConfig, ['url', 'baseURL', 'method', 'headers', 'params', 'data']), {
+        const { logLevelConfig } = config;
+        captureExtendedException && captureExtendedException(error, pick_1.default(Object.assign(Object.assign({}, defaults), config), ['url', 'baseURL', 'method', 'headers', 'params', 'data']), {
             dataName: 'Request details',
             dataAsContext: true,
             level: exports._getLevelFromConfig(status, logLevelConfig),

package/helpers/api/middlewares/error-handlers-middlewares.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-handlers-middlewares.js","sourceRoot":"","sources":["../../../../src/helpers/api/middlewares/error-handlers-middlewares.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"error-handlers-middlewares.js","sourceRoot":"","sources":["../../../../src/helpers/api/middlewares/error-handlers-middlewares.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmD;AACnD,uDAA+B;AAE/B;;;;;;GAMG;AACI,MAAM,mBAAmB,GAAG,CAAC,cAAc,EAAE,QAAQ,EAAE,SAAS,GAAG,KAAK,EAAE,EAAE;IACjF,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,SAAS,CAAC;IAC1E,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,EAAE,CAAC;IAEhE,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IAEtE,MAAM,UAAU,GAAG;QACjB,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe;QACtD,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE;YACJ,GAAG,EAAE,OAAO;YACZ,WAAW,EAAE,UAAU;YACvB,MAAM,EAAE,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE;YACtC,MAAM;SACP;QACD,KAAK,EAAE,SAAS,IAAI,CAAC,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;KAC/E,CAAC;IAEF,cAAc,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC,CAAC;AAnBW,QAAA,mBAAmB,uBAmB9B;AAEF;;;;;;GAMG;AACH,MAAM,kCAAkC,GAAG,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE;AAEnE;;;;;GAKG;AACH,CAAO,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAC/B,IAAI;QACF,2BAAmB,CAAC,iBAAiB,EAAE,EAAE,MAAM,kCAAO,QAAQ,GAAK,MAAM,CAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAErF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;QAEvC,2BAAmB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;KACrD;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,QAAQ,IAAI,2BAAmB,CAAC,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE/F,MAAM,KAAK,CAAC;KACb;AACH,CAAC,CAAA,CAAC;AAEJ;;;;;;GAMG;AACH,MAAM,gCAAgC,GAAG,CAAC,EAAE,wBAAwB,EAAE,EAAE,EAAE,CACxE,CAAO,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAC/B,IAAI;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;KACpB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;QACxC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;QAElC,wBAAwB,IAAI,wBAAwB,CAClD,KAAK,EACL,cAAI,iCACG,QAAQ,GAAK,MAAM,GACxB,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,CAC1D,EACD;YACE,QAAQ,EAAE,iBAAiB;YAC3B,aAAa,EAAE,IAAI;YACnB,KAAK,EAAE,2BAAmB,CAAC,MAAM,EAAE,cAAc,CAAC;SACnD,CACF,CAAC;KACH;AACH,CAAC,CAAA,CAAC;AAEJ;;;;;;GAMG;AACI,MAAM,mBAAmB,GAAG,CAAC,UAAU,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE;IACrE,IAAI,KAAK,GAAG,cAAc,CAAC,OAAO,IAAI,SAAS,CAAC;IAEhD,IAAI,UAAU,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE;QAC5C,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;KACpC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AARW,QAAA,mBAAmB,uBAQ9B;AAEF;;;;;GAKG;AACI,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;AAAtC,QAAA,UAAU,cAA4B;AAEtC,QAAA,iCAAiC,GAAG,yBAAa,CAC5D,kCAAkC,EAClC,kBAAU,CACX,CAAC;AAEW,QAAA,+BAA+B,GAAG,yBAAa,CAC1D,gCAAgC,EAChC,kBAAU,CACX,CAAC"}

package/helpers/api/middlewares/helpers.d.ts

@@ -4,7 +4,7 @@
  * @param {Object} request.headers Заголовки запроса.
  * @return {Object.<string, string>} Коллекция сервисных заголовков.
  */
-export const getServiceHeaders: (object: any) => object;
+export const getServiceHeaders: (...args: any[]) => any;
 export function getServiceUserAgent({ serviceName, version }?: {
     serviceName: string;
     version: string;

package/helpers/api/middlewares/trace-request-middleware.d.ts

@@ -1,12 +1,24 @@
-export default createTraceRequestMiddleware;
+import type { Middleware } from 'middleware-axios';
+import { Tracer, SpanContext } from 'opentracing';
 /**
  * Создаёт middleware для трассировки запросов в API.
- * @param {Object} options Параметры для создания middleware.
- * @param {Object} options.context Объект родительского контекста.
- * @param {Object} options.tracer Объект трейсера.
- * @return {function(Object, Function): Promise} Middleware для трассироваки запросов в API.
+ * @param options Параметры для создания middleware.
+ * @param options.tracer Объект трейсера.
+ * @param options.context Объект родительского контекста.
+ * @return Middleware для трассировки запросов в API.
+ */
+declare const createTraceRequestMiddleware: ({ tracer, context }: {
+    tracer: Tracer;
+    context: SpanContext;
+}) => Middleware<any>;
+/**
+ * Преобразует строку вида:
+ * "/api/v2/something/123456/some-bff/123456"
+ * в строку вида:
+ * "/api/v2/something/{id}/some-bff/123456"
+ * и возвращает кортеж с этой строкой и вырезанным числом в случае если оно найдено.
+ * @param url Url.
+ * @return Кортеж со строкой и результатом поиска числа.
  */
-declare function createTraceRequestMiddleware({ context, tracer }: {
-    context: Object;
-    tracer: Object;
-}): (arg0: Object, arg1: Function) => Promise<any>;
+export declare const hideFirstId: (url: string) => [string, number | undefined];
+export default createTraceRequestMiddleware;

package/helpers/api/middlewares/trace-request-middleware.js

@@ -8,45 +8,62 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hideFirstId = void 0;
 const opentracing_1 = require("opentracing");
-const propOr_1 = __importDefault(require("lodash/fp/propOr"));
-const getParams = propOr_1.default({}, 'params');
 /**
  * Создаёт middleware для трассировки запросов в API.
- * @param {Object} options Параметры для создания middleware.
- * @param {Object} options.context Объект родительского контекста.
- * @param {Object} options.tracer Объект трейсера.
- * @return {function(Object, Function): Promise} Middleware для трассироваки запросов в API.
+ * @param options Параметры для создания middleware.
+ * @param options.tracer Объект трейсера.
+ * @param options.context Объект родительского контекста.
+ * @return Middleware для трассировки запросов в API.
  */
-const createTraceRequestMiddleware = ({ context, tracer }) => 
+const createTraceRequestMiddleware = ({ tracer, context }) => function (config, next, defaults) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { method, url, foundId } = getRequestInfo(config, defaults);
+        const span = tracer.startSpan(`HTTP ${method} ${url}`, {
+            childOf: context,
+        });
+        if (!config.headers) {
+            config.headers = {};
+        }
+        span.addTags(Object.assign({ [opentracing_1.Tags.HTTP_URL]: url, [opentracing_1.Tags.HTTP_METHOD]: method, 'request.params': Object.assign({}, config.params), 'request.headers': Object.assign({}, config.headers) }, (foundId && { 'request.id': foundId })));
+        tracer.inject(span, opentracing_1.FORMAT_HTTP_HEADERS, config.headers);
+        const response = yield next(config);
+        span.setTag(opentracing_1.Tags.HTTP_STATUS_CODE, response.status);
+        span.finish();
+    });
+};
 /**
- * Middleware для трассировки запросов в API.
- * @param {Object} requestConfig Параметры для создания middleware.
- * @param {Function} next Функция для получения данных.
- * @return {Promise} Promise.
+ * Формирует базовые данные запроса.
+ * Заменяет первое найденное число в url на "{id}", возвращая его в результате.
+ * @param config Axios-конфиг запроса.
+ * @param defaults Базовый конфиг экземпляра Axios.
+ * @return Базовые данные запроса.
  */
-(requestConfig, next) => __awaiter(void 0, void 0, void 0, function* () {
-    const fullUrl = `${requestConfig.baseURL}${requestConfig.url}`;
-    const span = tracer.startSpan(`HTTP ${requestConfig.method.toUpperCase()} ${fullUrl}`, {
-        childOf: context,
-    });
-    if (!requestConfig.headers) {
-        requestConfig.headers = {};
-    }
-    span.addTags({
-        [opentracing_1.Tags.HTTP_URL]: fullUrl,
-        [opentracing_1.Tags.HTTP_METHOD]: requestConfig.method.toUpperCase(),
-        'request.params': getParams(requestConfig),
-        'request.headers': Object.assign({}, requestConfig.headers),
-    });
-    tracer.inject(span, opentracing_1.FORMAT_HTTP_HEADERS, requestConfig.headers);
-    const response = yield next(requestConfig);
-    span.setTag(opentracing_1.Tags.HTTP_STATUS_CODE, response.status);
-    span.finish();
-});
+const getRequestInfo = (config, defaults) => {
+    const method = (config.method || 'GET').toUpperCase();
+    const baseURL = config.baseURL || defaults.baseURL || '';
+    // ВАЖНО: абстрагируем id только в url игнорируя baseURL
+    const [url, foundId] = exports.hideFirstId(config.url || defaults.url || '');
+    const readyUrl = `${baseURL}${url}`;
+    return { method, url: readyUrl, foundId };
+};
+/**
+ * Преобразует строку вида:
+ * "/api/v2/something/123456/some-bff/123456"
+ * в строку вида:
+ * "/api/v2/something/{id}/some-bff/123456"
+ * и возвращает кортеж с этой строкой и вырезанным числом в случае если оно найдено.
+ * @param url Url.
+ * @return Кортеж со строкой и результатом поиска числа.
+ */
+const hideFirstId = (url) => {
+    const found = /\d{2,}/.exec(url);
+    return found
+        ? [url.replace(found[0], '{id}'), Number(found[0])]
+        : [url, undefined];
+};
+exports.hideFirstId = hideFirstId;
 exports.default = createTraceRequestMiddleware;
 //# sourceMappingURL=trace-request-middleware.js.map

package/helpers/api/middlewares/trace-request-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"trace-request-middleware.js","sourceRoot":"","sources":["../../../../src/helpers/api/middlewares/trace-request-middleware.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6CAAwD;AACxD,8DAAsC;AAEtC,MAAM,SAAS,GAAG,gBAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;AAEvC;;;;;;GAMG;AACH,MAAM,4BAA4B,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;AAE3D;;;;;GAKG;AACH,CAAO,aAAa,EAAE,IAAI,EAAE,EAAE;IAC5B,MAAM,OAAO,GAAG,GAAG,aAAa,CAAC,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,CAAC;IAC/D,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE,EAAE;QACrF,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IACH,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;QAC1B,aAAa,CAAC,OAAO,GAAG,EAAE,CAAC;KAC5B;IAED,IAAI,CAAC,OAAO,CAAC;QACX,CAAC,kBAAI,CAAC,QAAQ,CAAC,EAAE,OAAO;QACxB,CAAC,kBAAI,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE;QACtD,gBAAgB,EAAE,SAAS,CAAC,aAAa,CAAC;QAC1C,iBAAiB,oBAAO,aAAa,CAAC,OAAO,CAAE;KAChD,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,iCAAmB,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM,CAAC,kBAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,CAAC,MAAM,EAAE,CAAC;AAChB,CAAC,CAAA,CAAC;AAEJ,kBAAe,4BAA4B,CAAC"}
+{"version":3,"file":"trace-request-middleware.js","sourceRoot":"","sources":["../../../../src/helpers/api/middlewares/trace-request-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6CAA6E;AAE7E;;;;;;GAMG;AACH,MAAM,4BAA4B,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAGtD,EAAmB,EAAE,CAAC,UAAgB,MAAM,EAAE,IAAI,EAAE,QAAQ;;QACzD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAElE,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,MAAM,IAAI,GAAG,EAAE,EAAE;YACrD,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;SACrB;QAED,IAAI,CAAC,OAAO,iBACV,CAAC,kBAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,EACpB,CAAC,kBAAI,CAAC,WAAW,CAAC,EAAE,MAAM,EAC1B,gBAAgB,oBAAO,MAAM,CAAC,MAAM,GACpC,iBAAiB,oBAAO,MAAM,CAAC,OAAO,KAGnC,CAAC,OAAO,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EACzC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,iCAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAEzD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,CAAC,kBAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;CAAA,CAAC;AAEJ;;;;;;GAMG;AACH,MAAM,cAAc,GAAG,CACrB,MAA0B,EAC1B,QAA4B,EAK5B,EAAE;IACF,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IAEzD,wDAAwD;IACxD,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,mBAAW,CAAC,MAAM,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IACrE,MAAM,QAAQ,GAAG,GAAG,OAAO,GAAG,GAAG,EAAE,CAAC;IAEpC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC5C,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACI,MAAM,WAAW,GAAG,CAAC,GAAW,EAAgC,EAAE;IACvE,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEjC,OAAO,KAAK;QACV,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;AACvB,CAAC,CAAC;AANW,QAAA,WAAW,eAMtB;AAEF,kBAAe,4BAA4B,CAAC"}

package/helpers/api/server-adapter/helpers.d.ts

@@ -18,7 +18,7 @@ export function createTransport({ url, baseURL, transport, maxRedirects, }: {
     transport: Object;
     maxRedirects: number;
 }): Object;
-export function buildRequestPath(url: URL, params?: Object | string | URLSearchParams, paramsSerializer?: Function): string;
+export function buildRequestPath(url: URL, params?: string | Object | URLSearchParams | undefined, paramsSerializer?: Function | undefined): string;
 export function createOptions({ url, baseURL, method, headers, httpAgent, httpsAgent, params, paramsSerializer, maxRedirects, maxContentLength, }: Object): Object;
 export function uncompressResponse(response: import('stream').Readable): import('stream').Readable;
 export function enhanceError(error: Error, config: Object, code: string, request: import('http').ClientRequest, response: import('http').IncomingMessage): Error;

package/helpers/get-params/index.d.ts

@@ -1,4 +1,4 @@
-export function getParams(request: Object, config: Object, getValue: Function, modify: Function, defaultValue: Object): Object;
+export function getParams(request: Object, config: Object, getValue: Function | undefined, modify: Function, defaultValue: Object): Object;
 export function parseHttpHeaders(request: Object): Object;
 declare var _default: Function;
 export default _default;

package/helpers/react/error-handlers/index.d.ts

@@ -27,7 +27,7 @@ export declare class ErrorBoundary extends React.Component<Props, {
      * Рендер.
      * @return Дочерний элемент либо запасное значение.
      */
-    render(): React.ReactNode;
+    render(): {} | null;
 }
 /**
  * Обертка над Suspense c перехватом ошибок.

package/helpers/redux/remote-data.d.ts

@@ -33,8 +33,8 @@ export function createReducer(initialState: any, createHandlers: (arg0: {
      */
     failure: Function;
 }) => Object, { createStatusAdder, }?: {
-    createStatusAdder?: Object;
-}): Function;
+    createStatusAdder?: Object | undefined;
+} | undefined): Function;
 export function createStateMaker(baseInitialState?: any, { createStatusAdder, }?: {
-    createStatusAdder?: Function;
-}): Function;
+    createStatusAdder?: Function | undefined;
+} | undefined): Function;

package/helpers/redux/selector/statuses.d.ts

@@ -10,7 +10,7 @@ export namespace StatusSelectors {
  * @param {Function} [selectSection=identity] Вернет раздел состояния, у которого есть статус.
  * @return {{ isInitial: Function, isFetching: Function, isSuccessful: Function, isFailed: Function }} Селекторы.
  */
-declare function create(selectSection?: Function): {
+declare function create(selectSection?: Function | undefined): {
     isInitial: Function;
     isFetching: Function;
     isSuccessful: Function;

package/helpers/saga/create-store.d.ts

@@ -6,8 +6,8 @@ export function createStore(reducer: Function, initialSaga: Function, { isReady,
     middleware: any[];
     onReady: Function;
     timeout: number;
-    onTimeout?: Function;
-    onSagasErrorHandler?: Function;
+    onTimeout?: Function | undefined;
+    onSagasErrorHandler?: Function | undefined;
 }): Object;
 export function mapServiceOptionsToArgs({ reducer, initialSaga, ...options }: {
     reducer: Function;

package/helpers/saga/do-safe-request.d.ts

@@ -13,8 +13,8 @@
  * @return {ServerResponse} Ответ сервера.
  */
 export default function doSafeRequest(performRequest: Function, options?: {
-    args?: any[];
-}): ServerResponse;
+    args?: any[] | undefined;
+} | undefined): ServerResponse;
 /**
  * Ответ сервера.
  */

package/helpers/tracer/create-child-tracing-middleware.d.ts

@@ -3,5 +3,5 @@ export function createChildTracingMiddleware({ spanName, tracer, startSubscriber
     tracer: Object;
     startSubscriber: Function;
     finishSubscriber: Function;
-    parentSpan?: string;
+    parentSpan?: string | undefined;
 }): Function;

package/helpers/tracer/index.d.ts

@@ -1,14 +1,14 @@
-export function traceIncomingRequest(tracer: Object, key: string, httpRequest: Object, payload?: Object): Object;
+export function traceIncomingRequest(tracer: Object, key: string, httpRequest: Object, payload?: Object | undefined): Object;
 export function getTracer({ tracerConfig: { version, serviceName, }, additionalConfig, }: {
     tracerConfig: {
         serviceName: string;
         version: number;
     };
-    additionalConfig?: Object;
+    additionalConfig?: Object | undefined;
 }): import('opentracing').Tracer;
 export function _createTracingMiddleware(createSpan: Function, onSpanFinish: Function, { spanKey }?: {
-    spanKey?: string;
-}): Function;
+    spanKey?: string | undefined;
+} | undefined): Function;
 export function getSpanContext({ response }: Object): Object | null;
 export function _deptToArg({ createSpan, onSpanFinish, options }: Object): any[];
 /**

package/logger/create-sentry-instance/index.d.ts

@@ -1,6 +1,6 @@
 export function createSentryInstance({ BrowserClient, NodeClient, Hub }: {
-    BrowserClient?: Function;
-    NodeClient?: Function;
+    BrowserClient?: Function | undefined;
+    NodeClient?: Function | undefined;
     Hub: Function;
 }): SentryInstance;
 export function deptToArg({ sentry }: Object): any[];

package/logger/initialize-sentry-creator/index.d.ts

@@ -12,6 +12,6 @@ export default initializeSentryCreator;
 declare function initializeSentryCreator({ sentryLoggerService, getSentryDsn, getSentryOptions, configureMainScope, }: {
     sentryLoggerService: Object;
     getSentryDsn: Function;
-    getSentryOptions?: Function;
-    configureMainScope?: Function;
+    getSentryOptions?: Function | undefined;
+    configureMainScope?: Function | undefined;
 }): Function;

package/logger/sentry-logger/index.d.ts

@@ -5,5 +5,5 @@
  * @return {Object} Сервис.
  */
 export default function sentryLogger({ sentryLoggerService }?: {
-    sentryLoggerService?: Object;
-}): Object;
+    sentryLoggerService?: Object | undefined;
+} | undefined): Object;

package/module-federation/__example__/webpack-config.example.d.ts

@@ -11,7 +11,7 @@ declare const _exports: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    };
+    } | undefined;
     push(...items: {
         entry: {};
         mode: string;
@@ -39,7 +39,7 @@ declare const _exports: {
         mode: string;
         plugins: ExtendedMFPlugin[];
     }[];
-    join(separator?: string): string;
+    join(separator?: string | undefined): string;
     reverse(): {
         entry: {};
         mode: string;
@@ -49,13 +49,13 @@ declare const _exports: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    };
-    slice(start?: number, end?: number): {
+    } | undefined;
+    slice(start?: number | undefined, end?: number | undefined): {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
     }[];
-    sort(compareFn?: (a: {
+    sort(compareFn?: ((a: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
@@ -63,12 +63,12 @@ declare const _exports: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    }) => number): {
+    }) => number) | undefined): {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
     }[];
-    splice(start: number, deleteCount?: number): {
+    splice(start: number, deleteCount?: number | undefined): {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
@@ -91,12 +91,12 @@ declare const _exports: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    }, fromIndex?: number): number;
+    }, fromIndex?: number | undefined): number;
     lastIndexOf(searchElement: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    }, fromIndex?: number): number;
+    }, fromIndex?: number | undefined): number;
     every<S extends {
         entry: {};
         mode: string;
@@ -294,7 +294,7 @@ declare const _exports: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    }[]) => value is S_2, thisArg?: any): S_2;
+    }[]) => value is S_2, thisArg?: any): S_2 | undefined;
     find(predicate: (value: {
         entry: {};
         mode: string;
@@ -307,7 +307,7 @@ declare const _exports: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    };
+    } | undefined;
     findIndex(predicate: (value: {
         entry: {};
         mode: string;
@@ -321,12 +321,12 @@ declare const _exports: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    }, start?: number, end?: number): {
+    }, start?: number | undefined, end?: number | undefined): {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
     }[];
-    copyWithin(target: number, start: number, end?: number): {
+    copyWithin(target: number, start: number, end?: number | undefined): {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
@@ -360,7 +360,7 @@ declare const _exports: {
         entry: {};
         mode: string;
         plugins: ExtendedMFPlugin[];
-    }, fromIndex?: number): boolean;
+    }, fromIndex?: number | undefined): boolean;
 };
 export = _exports;
 import ExtendedMFPlugin = require("../enhanced-module-federation-plugin");

package/module-federation/__example__/webpack-config.example.js

@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Пример конфигурации webpack c использованием EnhancedModuleFederationPlugin.
  */

package/module-federation/__example__/webpack-config.example.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-config.example.js","sourceRoot":"","sources":["../../../src/module-federation/__example__/webpack-config.example.js"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;AAEzE;;GAEG;AACH,MAAM,mBAAmB,GAAG;IAC1B,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;IAC1E,OAAO,EAAE;QACP,IAAI,gBAAgB,CAClB;YACE,IAAI,EAAE,qBAAqB;YAC3B,QAAQ,EACJ,uBAAuB,OAAO,CAAC,GAAG,CAAC,kBAAkB,gBAAgB,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK;YAC7G,OAAO,EAAE;gBACP,SAAS,EAAE,yBAAyB;gBACpC,UAAU,EAAE,wBAAwB;aACrC;SACF,CACF;KACF;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,iBAAiB,GAAG;IACxB,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;IAC1E,OAAO,EAAE;QACP,IAAI,gBAAgB,CAClB;YACE,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE;gBACP,aAAa,EAAE,qBAAqB;aACrC;SACF,CACF;KACF;IACD,OAAO,EAAE;QACP;;WAEG;QACH,QAAQ,EAAE;YACR,qBAAqB,EAAE,mCAAmC;YAC1D,sBAAsB,EAAE,mCAAmC;SAC5D;KACF;CACF,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG;IACf,mBAAmB;IACnB,iBAAiB;CAClB,CAAC"}
+{"version":3,"file":"webpack-config.example.js","sourceRoot":"","sources":["../../../src/module-federation/__example__/webpack-config.example.js"],"names":[],"mappings":";AAAA;;GAEG;AACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;AAEzE;;GAEG;AACH,MAAM,mBAAmB,GAAG;IAC1B,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;IAC1E,OAAO,EAAE;QACP,IAAI,gBAAgB,CAClB;YACE,IAAI,EAAE,qBAAqB;YAC3B,QAAQ,EACJ,uBAAuB,OAAO,CAAC,GAAG,CAAC,kBAAkB,gBAAgB,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK;YAC7G,OAAO,EAAE;gBACP,SAAS,EAAE,yBAAyB;gBACpC,UAAU,EAAE,wBAAwB;aACrC;SACF,CACF;KACF;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,iBAAiB,GAAG;IACxB,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;IAC1E,OAAO,EAAE;QACP,IAAI,gBAAgB,CAClB;YACE,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE;gBACP,aAAa,EAAE,qBAAqB;aACrC;SACF,CACF;KACF;IACD,OAAO,EAAE;QACP;;WAEG;QACH,QAAQ,EAAE;YACR,qBAAqB,EAAE,mCAAmC;YAC1D,sBAAsB,EAAE,mCAAmC;SAC5D;KACF;CACF,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG;IACf,mBAAmB;IACnB,iBAAiB;CAClB,CAAC"}

package/module-federation/enhanced-module-federation-plugin.js

@@ -1,3 +1,4 @@
+"use strict";
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

package/module-federation/enhanced-module-federation-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"enhanced-module-federation-plugin.js","sourceRoot":"","sources":["../../src/module-federation/enhanced-module-federation-plugin.js"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC;AAChE,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC;AACrD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEpD,MAAM,kBAAkB,GAAG;IACzB,mEAAmE;IACnE,uEAAuE;IACvE,yDAAyD;CAC1D,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,yFAAyF;AACzF,gGAAgG;AAEhG;;;;;;;;;;;;GAYG;AAEH;;;GAGG;AACH,MAAM,8BAA8B;IAClC;;OAEG;IACH,YAAa,OAAO;QAClB,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,sBAAsB,GAAG,uBAAuB,EAChD,mBAAmB,GAAG,0BAA0B,GACjD,GAAG,OAAO,CAAC;QAEZ,IAAI,OAAO,EAAE;YACX,MAAM,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,QAAQ,mCACR,OAAO,KACV,sBAAsB;YACtB,mBAAmB,EACnB,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC;aAClC,GACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAE,QAAQ;QACb,MAAM,KAMF,IAAI,CAAC,QAAQ,EANX,EACJ,OAAO,EACP,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,GAAG,KAAK,OAET,EADZ,eAAe,cALd,gFAML,CAAgB,CAAC;QAElB,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAE7B,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC5C,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,oBAAoB,CACvD,OAAO,CAAC,GAAG,CAAC,EACZ,sBAAsB,EACtB,mBAAmB,CACpB,EAAE,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACpE,IAAI,gBAAgB,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE;gBAC9D,IAAI,sBAAsB,iCACrB,OAAO,IAAI,EAAE,OAAO,EAAE,iBAAiB,EAAE,GACzC,eAAe,EAClB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,8BAA8B,CAAC"}
+{"version":3,"file":"enhanced-module-federation-plugin.js","sourceRoot":"","sources":["../../src/module-federation/enhanced-module-federation-plugin.js"],"names":[],"mappings":";;;;;;;;;;;;AAAA,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC;AAChE,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC;AACrD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEpD,MAAM,kBAAkB,GAAG;IACzB,mEAAmE;IACnE,uEAAuE;IACvE,yDAAyD;CAC1D,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,yFAAyF;AACzF,gGAAgG;AAEhG;;;;;;;;;;;;GAYG;AAEH;;;GAGG;AACH,MAAM,8BAA8B;IAClC;;OAEG;IACH,YAAa,OAAO;QAClB,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,sBAAsB,GAAG,uBAAuB,EAChD,mBAAmB,GAAG,0BAA0B,GACjD,GAAG,OAAO,CAAC;QAEZ,IAAI,OAAO,EAAE;YACX,MAAM,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,QAAQ,mCACR,OAAO,KACV,sBAAsB;YACtB,mBAAmB,EACnB,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC;aAClC,GACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAE,QAAQ;QACb,MAAM,KAMF,IAAI,CAAC,QAAQ,EANX,EACJ,OAAO,EACP,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,GAAG,KAAK,OAET,EADZ,eAAe,cALd,gFAML,CAAgB,CAAC;QAElB,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAE7B,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC5C,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,oBAAoB,CACvD,OAAO,CAAC,GAAG,CAAC,EACZ,sBAAsB,EACtB,mBAAmB,CACpB,EAAE,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACpE,IAAI,gBAAgB,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE;gBAC9D,IAAI,sBAAsB,iCACrB,OAAO,IAAI,EAAE,OAAO,EAAE,iBAAiB,EAAE,GACzC,eAAe,EAClB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,8BAA8B,CAAC"}

package/module-federation/utils/index.js

@@ -1,3 +1,4 @@
+"use strict";
 /**
  * Возвращает скрипт инициализации удаленного модуля.
  * @param {string} serviceName Имя сервиса, содержащего удаленные модули.

package/module-federation/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/module-federation/utils/index.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,oBAAoB,GAAG,CAC3B,WAAW,EACX,sBAAsB,EACtB,mBAAmB,EACnB,EAAE,CACA;gBACY,sBAAsB;;;;wBAId,mBAAmB,OAAO,WAAW;;;;0DAIH,WAAW;;kCAEnC,sBAAsB,OAAO,WAAW;;;;yCAIjC,sBAAsB;;GAE5D,CAAC;AAEJ,MAAM,CAAC,OAAO,GAAG,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/module-federation/utils/index.js"],"names":[],"mappings":";AAAA;;;;;;GAMG;AACH,MAAM,oBAAoB,GAAG,CAC3B,WAAW,EACX,sBAAsB,EACtB,mBAAmB,EACnB,EAAE,CACA;gBACY,sBAAsB;;;;wBAId,mBAAmB,OAAO,WAAW;;;;0DAIH,WAAW;;kCAEnC,sBAAsB,OAAO,WAAW;;;;yCAIjC,sBAAsB;;GAE5D,CAAC;AAEJ,MAAM,CAAC,OAAO,GAAG,EAAE,oBAAoB,EAAE,CAAC"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@sima-land/isomorph",
-  "version": "9.0.3",
+  "version": "9.0.7",
   "description": "Set of utils that are not directly related to UI",
   "repository": "ssh://git@github.com:sima-land/isomorph.git",
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",
   "private": false,
   "engines": {
-    "node": ">=10.15.3"
+    "node": ">=14.17.0"
   },
   "scripts": {
     "prepare": "",
@@ -26,7 +26,7 @@
     "express-http-proxy": "^1.5.1",
     "ioredis": "^4.10.0",
     "jaeger-client": "^3.15.0",
-    "middleware-axios": "^2.0.0",
+    "middleware-axios": "^2.1.1",
     "opentracing": "^0.14.3",
     "pino": "^5.13.1",
     "pino-pretty": "^3.2.0",
@@ -34,15 +34,16 @@
   },
   "devDependencies": {
     "@babel/core": "^7.14.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.2",
     "@babel/preset-env": "^7.14.2",
     "@babel/preset-react": "^7.13.13",
+    "@babel/preset-typescript": "^7.16.5",
     "@sentry/browser": "^5.15.5",
     "@sentry/node": "5.10.2",
     "@sima-land/linters": "^1.0.12",
     "@types/enzyme": "^3.10.8",
     "@types/express": "^4.17.13",
-    "@types/jest": "^26.0.24",
+    "@types/jaeger-client": "^3.18.2",
+    "@types/jest": "^27.0.3",
     "@types/lodash": "^4.14.171",
     "@types/node": "^16.4.5",
     "@types/react": "^16.14.0",
@@ -51,7 +52,7 @@
     "@types/webpack": "^5.28.0",
     "@typescript-eslint/eslint-plugin": "^4.23.0",
     "@typescript-eslint/parser": "^4.23.0",
-    "babel-jest": "^27.0.6",
+    "babel-jest": "^27.4.5",
     "copyfiles": "^2.4.1",
     "dotenv": "^8.2.0",
     "enzyme": "3.8.x",
@@ -59,29 +60,28 @@
     "enzyme-to-json": "3.3.x",
     "husky": "^7.0.1",
     "identity-obj-proxy": "3.0.x",
-    "jest": "^27.0.6",
+    "jest": "^27.4.5",
     "lint-staged": "^11.1.1",
     "lodash": "^4.17.21",
-    "react": "16.12.0",
-    "react-dom": "16.12.0",
-    "react-redux": "7.1.3",
-    "redux": "4.0.5",
-    "redux-saga": "1.1.3",
-    "reduxsauce": "1.1.2",
-    "reselect": "4.0.0",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-redux": "^7.1.3",
+    "redux": "^4.0.5",
+    "redux-saga": "^1.1.3",
+    "reduxsauce": "^1.1.2",
+    "reselect": "^4.0.0",
     "rimraf": "^3.0.2",
     "sentry-testkit": "^3.2.1",
-    "ts-jest": "^27.0.4",
     "typescript": "^4.2.4"
   },
   "peerDependencies": {
-    "lodash": "4.17.15",
-    "react": "16.12.0",
-    "react-dom": "16.12.0",
-    "react-redux": "7.1.3",
-    "redux": "4.0.5",
-    "redux-saga": "1.1.3",
-    "reduxsauce": "1.1.2",
-    "reselect": "4.0.0"
+    "lodash": "^4.17.21",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-redux": "^7.1.3",
+    "redux": "^4.0.5",
+    "redux-saga": "^1.1.3",
+    "reduxsauce": "^1.1.2",
+    "reselect": "^4.0.0"
   }
 }

package/set-header-middleware/create.d.ts

@@ -6,5 +6,5 @@ export default createSetHeaderMiddleware;
  * @return {Function} Промежуточный слой приложения для установки заголовков со ссылками на клиентские ресурсы.
  */
 declare function createSetHeaderMiddleware({ headers, }: {
-    headers?: Object;
+    headers?: Object | undefined;
 }): Function;

package/src/cache/{local-storage.js → local-storage.ts}

@@ -1,16 +1,27 @@
 /**
  * Определяет доступен ли кэш.
- * @return {boolean} Флаг доступности кэш.
+ * @return Флаг доступности кэш.
  */
-export const isAvailable = () => typeof window !== 'undefined' && typeof window.localStorage !== 'undefined';
+export const isAvailable = (): boolean => {
+  try {
+    const testKey = `local_storage_test_key::${Date.now()}`;
+
+    window.localStorage.setItem(testKey, testKey);
+    window.localStorage.removeItem(testKey);
+
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 /**
- * Возвращает объект из кэша.
- * @param {string} key Ключ.
- * @return {*} Запрашиваемое значение из кэша.
+ * Возвращает объект.
+ * @param key Ключ.
+ * @return Запрашиваемое значение.
  */
-export const getItem = key => {
-  const { value, expire } = JSON.parse(localStorage.getItem(key)) || {};
+export const getItem = (key: string): unknown => {
+  const { value, expire } = JSON.parse(localStorage.getItem(key) || '{}');
   const now = Date.now();
   const isExpired = expire
     ? now > expire
@@ -22,12 +33,12 @@ export const getItem = key => {
 };
 
 /**
- * Добавляет значение в кэш.
- * @param {string} key Ключ.
- * @param {*} value Значение.
- * @param {number} [duration=3600] Время жизни значения в кэше в секундах.
+ * Добавляет значение.
+ * @param key Ключ.
+ * @param value Значение.
+ * @param duration Время жизни значения в секундах.
  */
-export const setItem = (key, value, duration = 3600) => {
+export const setItem = (key: string, value: any, duration = 3600) => {
   const now = Date.now();
   const durationMs = duration * 1000;
   const expire = now + durationMs;
@@ -39,12 +50,13 @@ export const setItem = (key, value, duration = 3600) => {
 };
 
 /**
- * Определяет, привышена ли квота.
- * @param {Object} error Информация об ошибке.
- * @return {boolean} Признак привышения квоты.
+ * Определяет, превышена ли квота.
+ * @param error Информация об ошибке.
+ * @return Признак превышения квоты.
  */
-export const isQuotaExceeded = error => {
+export const isQuotaExceeded = (error: any): boolean => {
   let quotaExceeded = false;
+
   if (error) {
     if (error.code) {
       switch (error.code) {
@@ -59,22 +71,22 @@ export const isQuotaExceeded = error => {
           break;
       }
     } else if (error.number === -2147024882) {
-      // Internet Explorer 8
+      // IE 8
       quotaExceeded = true;
     }
   }
+
   return quotaExceeded;
 };
 
 /**
  * Набор методов для работы с кэшем.
- * @type {{set: Function, get: Function, status: boolean}}
  */
-const localStorageCache = {
+const LocalStorageCache = {
   get: getItem,
   set: setItem,
   status: isAvailable(),
   quotaExceeded: isQuotaExceeded,
-};
+} as const;
 
-export default localStorageCache;
+export default LocalStorageCache;

package/src/helpers/analytics/index.ts

@@ -35,7 +35,7 @@ export const useAnalytics = (data: OkoEvent) => {
   }
 
   if (!fnRef.current) {
-    fnRef.current = () => okoPush(dataRef.current);
+    fnRef.current = () => okoPush(dataRef.current as OkoEvent);
   }
 
   if (!isEqual(data, dataRef.current)) {

package/src/helpers/api/middlewares/error-handlers-middlewares.js

@@ -1,22 +1,19 @@
 import { createService } from '../../../container';
-import isFunction from 'lodash/isFunction';
-import pathOr from 'lodash/fp/pathOr';
 import pick from 'lodash/pick';
 
-const getStatusCode = pathOr('UNKNOWN', 'status');
-const getConfig = pathOr({}, 'config');
-
 /**
  * Отправляет крошки http запроса.
  * @param {Function} sendBreadcrumb Функция отправки крошек.
- * @param {Object} response Объект в формате ответа Axios, содержащий данные о запросе.
+ * @param {Object} response Объект в формате ответа Axios, содержащий данные об ответе.
  * @param {boolean} asRequest Обработать как событие запроса.
  * @private
  */
 export const _sendHttpBreadcrumb = (sendBreadcrumb, response, asRequest = false) => {
-  const statusCode = asRequest ? 'FETCHING' : getStatusCode(response);
-  const { url, baseURL, method, params } = getConfig(response);
-  const fullURL = baseURL ? baseURL.replace(/\/$/, '') + url : url;
+  const statusCode = asRequest ? 'FETCHING' : response?.status || 'UNKNOWN';
+  const { url, baseURL, method, params } = response?.config || {};
+
+  const fullURL = baseURL ? `${baseURL.replace(/\/$/, '')}${url}` : url;
+
   const breadcrumb = {
     category: asRequest ? 'http.request' : 'http.response',
     type: 'http',
@@ -29,7 +26,7 @@ export const _sendHttpBreadcrumb = (sendBreadcrumb, response, asRequest = false)
     level: asRequest || (statusCode >= 200 && statusCode < 300) ? 'info' : 'error',
   };
 
-  isFunction(sendBreadcrumb) && sendBreadcrumb(breadcrumb);
+  sendBreadcrumb && sendBreadcrumb(breadcrumb);
 };
 
 /**
@@ -47,10 +44,12 @@ const _createAttachBreadcrumbsMiddleware = ({ captureBreadcrumb }) =>
    * @param {Function} next Функция для передачи контекста выполнения следующему middleware.
    * @return {Promise} Промис.
    */
-  async (requestConfig, next) => {
+  async (config, next, defaults) => {
     try {
-      _sendHttpBreadcrumb(captureBreadcrumb, { config: requestConfig }, true);
-      const apiResponse = await next(requestConfig);
+      _sendHttpBreadcrumb(captureBreadcrumb, { config: { ...defaults, ...config } }, true);
+
+      const apiResponse = await next(config);
+
       _sendHttpBreadcrumb(captureBreadcrumb, apiResponse);
     } catch (error) {
       error.isAxiosError && error.response && _sendHttpBreadcrumb(captureBreadcrumb, error.response);
@@ -67,23 +66,17 @@ const _createAttachBreadcrumbsMiddleware = ({ captureBreadcrumb }) =>
  * @private
  */
 const _createHandleExceptionMiddleware = ({ captureExtendedException }) =>
-
-  /**
-   * Middleware для отправки исключения в сервис логирования.
-   * @param {Object} requestConfig Конфигурация запроса API.
-   * @param {Function} next Функция для передачи контекста выполнения следующему middleware.
-   * @return {Promise} Промис.
-   */
-  async (requestConfig, next) => {
+  async (config, next, defaults) => {
     try {
-      await next(requestConfig);
+      await next(config);
     } catch (error) {
       const { status } = error.response || {};
-      const { logLevelConfig } = requestConfig;
-      isFunction(captureExtendedException) && captureExtendedException(
+      const { logLevelConfig } = config;
+
+      captureExtendedException && captureExtendedException(
         error,
         pick(
-          requestConfig,
+          { ...defaults, ...config },
           ['url', 'baseURL', 'method', 'headers', 'params', 'data']
         ),
         {
@@ -104,6 +97,7 @@ const _createHandleExceptionMiddleware = ({ captureExtendedException }) =>
  */
 export const _getLevelFromConfig = (statusCode, logLevelConfig = {}) => {
   let level = logLevelConfig.default || 'warning';
+
   if (statusCode && logLevelConfig[statusCode]) {
     level = logLevelConfig[statusCode];
   }

package/src/helpers/api/middlewares/trace-request-middleware.ts

@@ -0,0 +1,86 @@
+import type { AxiosRequestConfig } from 'axios';
+import type { Middleware } from 'middleware-axios';
+import { Tracer, Tags, FORMAT_HTTP_HEADERS, SpanContext } from 'opentracing';
+
+/**
+ * Создаёт middleware для трассировки запросов в API.
+ * @param options Параметры для создания middleware.
+ * @param options.tracer Объект трейсера.
+ * @param options.context Объект родительского контекста.
+ * @return Middleware для трассировки запросов в API.
+ */
+const createTraceRequestMiddleware = ({ tracer, context }: {
+  tracer: Tracer;
+  context: SpanContext;
+}): Middleware<any> => async function (config, next, defaults) {
+    const { method, url, foundId } = getRequestInfo(config, defaults);
+
+    const span = tracer.startSpan(`HTTP ${method} ${url}`, {
+      childOf: context,
+    });
+
+    if (!config.headers) {
+      config.headers = {};
+    }
+
+    span.addTags({
+      [Tags.HTTP_URL]: url,
+      [Tags.HTTP_METHOD]: method,
+      'request.params': { ...config.params },
+      'request.headers': { ...config.headers },
+
+      // если нашли id - добавляем в теги
+      ...(foundId && { 'request.id': foundId }),
+    });
+
+    tracer.inject(span, FORMAT_HTTP_HEADERS, config.headers);
+
+    const response = await next(config);
+
+    span.setTag(Tags.HTTP_STATUS_CODE, response.status);
+    span.finish();
+  };
+
+/**
+ * Формирует базовые данные запроса.
+ * Заменяет первое найденное число в url на "{id}", возвращая его в результате.
+ * @param config Axios-конфиг запроса.
+ * @param defaults Базовый конфиг экземпляра Axios.
+ * @return Базовые данные запроса.
+ */
+const getRequestInfo = (
+  config: AxiosRequestConfig,
+  defaults: AxiosRequestConfig
+): {
+  method: string;
+  url: string;
+  foundId?: number;
+} => {
+  const method = (config.method || 'GET').toUpperCase();
+  const baseURL = config.baseURL || defaults.baseURL || '';
+
+  // ВАЖНО: абстрагируем id только в url игнорируя baseURL
+  const [url, foundId] = hideFirstId(config.url || defaults.url || '');
+  const readyUrl = `${baseURL}${url}`;
+
+  return { method, url: readyUrl, foundId };
+};
+
+/**
+ * Преобразует строку вида:
+ * "/api/v2/something/123456/some-bff/123456"
+ * в строку вида:
+ * "/api/v2/something/{id}/some-bff/123456"
+ * и возвращает кортеж с этой строкой и вырезанным числом в случае если оно найдено.
+ * @param url Url.
+ * @return Кортеж со строкой и результатом поиска числа.
+ */
+export const hideFirstId = (url: string): [string, number | undefined] => {
+  const found = /\d{2,}/.exec(url);
+
+  return found
+    ? [url.replace(found[0], '{id}'), Number(found[0])]
+    : [url, undefined];
+};
+
+export default createTraceRequestMiddleware;

package/src/helpers/api/middlewares/trace-request-middleware.js

@@ -1,43 +0,0 @@
-import { Tags, FORMAT_HTTP_HEADERS } from 'opentracing';
-import propOr from 'lodash/fp/propOr';
-
-const getParams = propOr({}, 'params');
-
-/**
- * Создаёт middleware для трассировки запросов в API.
- * @param {Object} options Параметры для создания middleware.
- * @param {Object} options.context Объект родительского контекста.
- * @param {Object} options.tracer Объект трейсера.
- * @return {function(Object, Function): Promise} Middleware для трассироваки запросов в API.
- */
-const createTraceRequestMiddleware = ({ context, tracer }) =>
-
-  /**
-   * Middleware для трассировки запросов в API.
-   * @param {Object} requestConfig Параметры для создания middleware.
-   * @param {Function} next Функция для получения данных.
-   * @return {Promise} Promise.
-   */
-  async (requestConfig, next) => {
-    const fullUrl = `${requestConfig.baseURL}${requestConfig.url}`;
-    const span = tracer.startSpan(`HTTP ${requestConfig.method.toUpperCase()} ${fullUrl}`, {
-      childOf: context,
-    });
-    if (!requestConfig.headers) {
-      requestConfig.headers = {};
-    }
-
-    span.addTags({
-      [Tags.HTTP_URL]: fullUrl,
-      [Tags.HTTP_METHOD]: requestConfig.method.toUpperCase(),
-      'request.params': getParams(requestConfig),
-      'request.headers': { ...requestConfig.headers },
-    });
-
-    tracer.inject(span, FORMAT_HTTP_HEADERS, requestConfig.headers);
-    const response = await next(requestConfig);
-    span.setTag(Tags.HTTP_STATUS_CODE, response.status);
-    span.finish();
-  };
-
-export default createTraceRequestMiddleware;