@steroidsjs/core 3.0.94 → 3.1.1

package/ui/modal/Modal/Modal.js

@@ -10,31 +10,9 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 exports.__esModule = true;
-var react_1 = __importStar(require("react"));
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_1 = require("react");
 var hooks_1 = require("../../../hooks");
 function Modal(props) {
     var components = (0, hooks_1.useComponents)();
@@ -59,7 +37,7 @@ function Modal(props) {
         buttons: props.buttons,
         viewProps: props.viewProps
     }); }, [props.buttons, props.children, props.className, props.closeTimeoutMs, props.isClosing, props.onClose, props.shouldCloseOnEsc, props.shouldCloseOnOverlayClick, props.size, props.title, props.viewProps]);
-    return (react_1["default"].createElement(ModalView, __assign({}, viewProps), (ContentComponent && (react_1["default"].createElement(ContentComponent, __assign({}, props, props.componentProps)))) || (props.children)));
+    return ((0, jsx_runtime_1.jsx)(ModalView, __assign({}, viewProps, { children: (ContentComponent && ((0, jsx_runtime_1.jsx)(ContentComponent, __assign({}, props, props.componentProps)))) || (props.children) })));
 }
 Modal.defaultProps = {
     size: 'md',

package/ui/modal/ModalPortal/ModalPortal.js

@@ -10,35 +10,13 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+var jsx_runtime_1 = require("react/jsx-runtime");
 var orderBy_1 = __importDefault(require("lodash-es/orderBy"));
-var react_1 = __importStar(require("react"));
+var react_1 = require("react");
 var modal_1 = require("../../../actions/modal");
 var hooks_1 = require("../../../hooks");
 var useDispatch_1 = __importDefault(require("../../../hooks/useDispatch"));
@@ -67,7 +45,7 @@ function ModalPortal(props) {
     return (0, orderBy_1["default"])(opened, 'id').map(function (item, index) {
         var ModalComponent = item.modal;
         var modalProps = __assign(__assign({}, item.props), { index: index, group: group, isClosing: item.isClosing, onClose: function () { return onClose(item); }, closeTimeoutMs: item.props.closeTimeoutMs || props.animationDelayMc });
-        return (react_1["default"].createElement(ModalComponent, __assign({ key: item.id }, modalProps)));
+        return ((0, jsx_runtime_1.jsx)(ModalComponent, __assign({}, modalProps), item.id));
     });
 }
 ModalPortal.defaultProps = {

package/ui/modal/TwoFactorModal/TwoFactorModal.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var react_1 = __importDefault(require("react"));
+var jsx_runtime_1 = require("react/jsx-runtime");
 var useComponents_1 = __importDefault(require("../../../hooks/useComponents"));
 var useFetch_1 = __importDefault(require("../../../hooks/useFetch"));
 var Modal_1 = __importDefault(require("../Modal"));
@@ -24,7 +24,7 @@ function TwoFactorModal(props) {
         method: 'post',
         url: "/api/v1/auth/2fa/".concat(props.providerName, "/send")
     }).data;
-    if (!data || 'statusCode' in data) {
+    if (!data) {
         return null;
     }
     var providerData = data.providerData;
@@ -48,11 +48,10 @@ function TwoFactorModal(props) {
         }
     };
     var TwoFactorModalView = props.view || components.ui.getView('modal.TwoFactorModalView');
-    return (react_1["default"].createElement(Modal_1["default"], __assign({}, props, { onClose: props.onClose }),
-        react_1["default"].createElement(TwoFactorModalView, __assign({}, props, { formProps: {
+    return ((0, jsx_runtime_1.jsx)(Modal_1["default"], __assign({}, props, { onClose: props.onClose }, { children: (0, jsx_runtime_1.jsx)(TwoFactorModalView, __assign({}, props, { formProps: {
                 formId: 'TwoFactorModal',
                 action: "/api/v1/auth/2fa/".concat(props.providerName, "/confirm"),
                 onComplete: function () { return props.onClose(); }
-            }, description: getDescription() }))));
+            }, description: getDescription() })) })));
 }
 exports["default"] = TwoFactorModal;

package/ui/nav/Breadcrumbs/Breadcrumbs.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { IRouteItem } from '../Router/Router';
 /**
  * Breadcrumbs
@@ -46,7 +46,7 @@ export interface IBreadcrumbsProps {
     /**
      * Кастомная иконка, заменяющая первый роут
      */
-    customIcon?: string | React.ReactElement;
+    customIcon?: CustomIcon;
     /**
      * Переопределение view React компонента для кастомизации отображения
      * @example MyCustomView

package/ui/nav/Link/Link.js

@@ -10,36 +10,13 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var React = __importStar(require("react"));
+var jsx_runtime_1 = require("react/jsx-runtime");
 var Button_1 = __importDefault(require("../../form/Button"));
 function Link(props) {
-    return (React.createElement(Button_1["default"], __assign({ tag: 'a', link: true, color: 'link' }, props, { formId: false })));
+    return ((0, jsx_runtime_1.jsx)(Button_1["default"], __assign({ tag: 'a', link: true, color: 'link' }, props, { formId: false })));
 }
 exports["default"] = Link;

package/ui/nav/Nav/Nav.js

@@ -10,39 +10,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+var jsx_runtime_1 = require("react/jsx-runtime");
 var get_1 = __importDefault(require("lodash-es/get"));
 var has_1 = __importDefault(require("lodash-es/has"));
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var isObject_1 = __importDefault(require("lodash-es/isObject"));
-var react_1 = __importStar(require("react"));
+var react_1 = require("react");
 var hooks_1 = require("../../../hooks");
 var router_1 = require("../../../reducers/router");
 var defaultViewMap = {
@@ -74,7 +52,7 @@ function Nav(props) {
         }
         if ((0, isFunction_1["default"])(activeItem.content) || (0, isObject_1["default"])(activeItem.content)) {
             var ContentComponent = activeItem.content;
-            return (react_1["default"].createElement(ContentComponent, __assign({}, activeItem, activeItem.contentProps)));
+            return ((0, jsx_runtime_1.jsx)(ContentComponent, __assign({}, activeItem, activeItem.contentProps)));
         }
         return activeItem.content;
     }, [activeTab, props.items]);

package/ui/nav/Router/Router.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { ReactElement, ReactNode } from 'react';
 import { IFetchConfig } from '../../../hooks/useFetch';
 import { IListProps } from '../../list/List/List';
 export declare const ROUTER_ROLE_LOGIN = "login";
@@ -112,7 +112,7 @@ export interface IRouteItem {
      * Пользовательская иконка svg или название иконки
      * @example 'circle'
      */
-    icon?: React.ReactElement | string;
+    icon?: ReactElement | string;
 }
 export interface IRouterProps {
     /**
@@ -146,7 +146,7 @@ export interface IRouterProps {
      * Контент, который отобразится под каждой страницей приложения
      * @example SomeComponent
      */
-    children?: React.ReactNode;
+    children?: ReactNode;
     /**
      * Флаг, который позволяет использовать вложенные роуты c указанием вложенного пути
      * @example true

package/ui/nav/Router/Router.js

@@ -10,38 +10,16 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
 exports.ROUTER_ROLE_404 = exports.ROUTER_ROLE_MODAL = exports.ROUTER_ROLE_LOGIN = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
 var connected_react_router_1 = require("connected-react-router");
 var get_1 = __importDefault(require("lodash-es/get"));
 var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
-var react_1 = __importStar(require("react"));
+var react_1 = require("react");
 var react_router_1 = require("react-router");
 var react_router_dom_1 = require("react-router-dom");
 var react_use_1 = require("react-use");
@@ -73,14 +51,14 @@ var renderComponent = function (route, activePath, routeProps, alwaysAppendParen
             ? redirectPath
             : (0, router_2.buildUrl)(redirectPath, (_b = routeProps === null || routeProps === void 0 ? void 0 : routeProps.match) === null || _b === void 0 ? void 0 : _b.params));
         if (activePath !== toPath) {
-            return (react_1["default"].createElement(react_router_1.Redirect, __assign({}, routeProps, { to: toPath }, route.componentProps)));
+            return ((0, jsx_runtime_1.jsx)(react_router_1.Redirect, __assign({}, routeProps, { to: toPath }, route.componentProps)));
         }
     }
     if (!route.component) {
         return null;
     }
     var Component = route.component;
-    return (react_1["default"].createElement(Component, __assign({}, routeProps, route.componentProps)));
+    return ((0, jsx_runtime_1.jsx)(Component, __assign({}, routeProps, route.componentProps)));
 };
 function Router(props) {
     var _a;
@@ -166,16 +144,19 @@ function Router(props) {
     });
     var renderItem = function (routeItem, routeProps) {
         var children = null;
+        var hasExact = false;
         activeRouteIds.find(function (activeRouteId) {
             if (activeRouteId === routeItem.id) {
                 // Stop
                 return true;
             }
             var activeRoute = routes.find(function (r) { return r.id === activeRouteId; });
-            children = renderComponent(activeRoute, activePath, __assign(__assign({}, routeProps), { children: children }), props.alwaysAppendParentRoutePath) || children;
+            if (!hasExact && activeRoute.component && !activeRoute.redirectTo) {
+                children = renderComponent(activeRoute, activePath, __assign(__assign({}, routeProps), { children: children }), props.alwaysAppendParentRoutePath) || children;
+            }
             // Stop, if route is exact
             if (activeRoute.exact) {
-                return true;
+                hasExact = true;
             }
             return false;
         });
@@ -191,11 +172,9 @@ function Router(props) {
     };
     var renderContent = function () {
         var WrapperComponent = props.wrapperView;
-        var routeNodes = (react_1["default"].createElement(react_router_1.Switch, null,
-            routes.map(function (routeItem, index) { return (react_1["default"].createElement(react_router_1.Route, __assign({ key: index, render: function (routeProps) { return renderItem(routeItem, routeProps); } }, routeItem, { component: null }))); }),
-            props.children));
+        var routeNodes = ((0, jsx_runtime_1.jsxs)(react_router_1.Switch, { children: [routes.map(function (routeItem, index) { return ((0, jsx_runtime_1.jsx)(react_router_1.Route, __assign({ render: function (routeProps) { return renderItem(routeItem, routeProps); } }, routeItem, { component: null }), index)); }), props.children] }));
         if (WrapperComponent) {
-            return (react_1["default"].createElement(WrapperComponent, __assign({}, props.wrapperProps), routeNodes));
+            return ((0, jsx_runtime_1.jsx)(WrapperComponent, __assign({}, props.wrapperProps, { children: routeNodes })));
         }
         return routeNodes;
     };
@@ -203,12 +182,12 @@ function Router(props) {
         return null;
     }
     if (process.env.IS_SSR) {
-        return (react_1["default"].createElement(SsrProvider_1.SsrProviderContext.Consumer, null, function (context) { return (react_1["default"].createElement(react_router_1.StaticRouter, { location: components.store.history.location, context: context.staticContext }, renderContent())); }));
+        return ((0, jsx_runtime_1.jsx)(SsrProvider_1.SsrProviderContext.Consumer, { children: function (context) { return ((0, jsx_runtime_1.jsx)(react_router_1.StaticRouter, __assign({ location: components.store.history.location, context: context.staticContext }, { children: renderContent() }))); } }));
     }
     if (window.location.protocol === 'file:') {
-        return (react_1["default"].createElement(react_router_dom_1.HashRouter, null, renderContent()));
+        return ((0, jsx_runtime_1.jsx)(react_router_dom_1.HashRouter, { children: renderContent() }));
     }
-    return (react_1["default"].createElement(connected_react_router_1.ConnectedRouter, { history: components.store.history }, renderContent()));
+    return ((0, jsx_runtime_1.jsx)(connected_react_router_1.ConnectedRouter, __assign({ history: components.store.history }, { children: renderContent() })));
 }
 Router.defaultProps = {
     autoScrollTop: true,

package/ui/nav/Tree/Tree.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { ReactElement, MouseEvent } from 'react';
 import { IPreparedTreeItem, ITreeConfig, ITreeItem } from '../../../hooks/useTree';
 export interface ITreeViewProps extends ITreeProps {
     items: IPreparedTreeItem[];
@@ -38,7 +38,7 @@ export interface ITreeProps extends Omit<ITreeConfig, 'currentPage' | 'itemsOnPa
      * Обработчик на клик по узлу
      * @param args
      */
-    onItemClick?: (event: React.MouseEvent, item: ITreeItem) => any;
+    onItemClick?: (event: MouseEvent, item: ITreeItem) => any;
     /**
      * Отображать раскрытыми узлы из LocalStorage
      * @example true
@@ -57,7 +57,7 @@ export interface ITreeProps extends Omit<ITreeConfig, 'currentPage' | 'itemsOnPa
     /**
      * Кастомная иконка, заменяющая иконку раскрытия по умолчанию
      */
-    customIcon?: string | React.ReactElement;
+    customIcon?: CustomIcon;
     /**
      * Флаг, определяющий раскрывать вложенные элементы по клику на весь элемент или только на иконку
      * @example false
@@ -65,7 +65,7 @@ export interface ITreeProps extends Omit<ITreeConfig, 'currentPage' | 'itemsOnPa
     hasIconExpandOnly?: boolean;
     [key: string]: any;
 }
-declare function Tree(props: ITreeProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+declare function Tree(props: ITreeProps): ReactElement<any, string | import("react").JSXElementConstructor<any>>;
 declare namespace Tree {
     var defaultProps: {
         itemsKey: string;

package/ui/typography/Text/Text.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { ReactNode } from 'react';
 /**
 * Text
 *
@@ -8,7 +8,7 @@ export interface ITextProps extends IUiComponent {
     /**
     * Дочерние элементы
     */
-    children?: React.ReactNode;
+    children?: ReactNode;
     /**
      * Тип текста
      * @example 'body'

package/ui/typography/Title/Title.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { ReactNode } from 'react';
 /**
 * Title
 *
@@ -8,7 +8,7 @@ export interface ITitleProps extends IUiComponent {
     /**
     * Дочерние элементы
     */
-    children?: React.ReactNode;
+    children?: ReactNode;
     /**
      * Тип заголовка
      * @example 'h1'

package/utils/createAxiosError.d.ts

@@ -0,0 +1,9 @@
+import { AxiosError } from 'axios';
+import { IFetchConfig } from '../hooks/useFetch';
+export interface IApiErrorPayload {
+    statusCode: number;
+    error?: string;
+    message?: string;
+    errors?: Record<string, unknown>;
+}
+export default function createAxiosError(apiErrorPayload: IApiErrorPayload, fetchConfig: IFetchConfig): AxiosError<IApiErrorPayload>;

package/utils/createAxiosError.js

@@ -0,0 +1,39 @@
+"use strict";
+exports.__esModule = true;
+function createAxiosError(apiErrorPayload, fetchConfig) {
+    var _a;
+    var message = apiErrorPayload.message
+        || apiErrorPayload.error
+        || 'Request failed';
+    var config = {
+        url: fetchConfig.url,
+        method: fetchConfig.method,
+        params: (_a = fetchConfig.params) !== null && _a !== void 0 ? _a : {}
+    };
+    var response = {
+        data: apiErrorPayload,
+        status: apiErrorPayload.statusCode,
+        statusText: message,
+        headers: {},
+        config: config
+    };
+    var error = new Error(message);
+    error.name = 'AxiosError';
+    error.config = config;
+    error.request = {};
+    error.response = response;
+    error.isAxiosError = true;
+    error.toJSON = function () {
+        var _a;
+        return ({
+            message: error.message,
+            name: error.name,
+            code: error.code,
+            config: error.config,
+            status: (_a = error.response) === null || _a === void 0 ? void 0 : _a.status,
+            stack: error.stack
+        });
+    };
+    return error;
+}
+exports["default"] = createAxiosError;