@steroidsjs/core 3.0.0-beta.4 → 3.0.0-beta.41

package/reducers/fields.js

@@ -40,16 +40,16 @@ exports["default"] = (function (state, action) {
             return state;
     }
 });
-var isMetaFetched = function (state) { return get_1["default"](state, ['fields', 'meta']) !== null; };
+var isMetaFetched = function (state) { return (0, get_1["default"])(state, ['fields', 'meta']) !== null; };
 exports.isMetaFetched = isMetaFetched;
-var getEnumLabels = function (state, name) { return get_1["default"](state, ['fields', 'meta', name, 'labels']) || null; };
+var getEnumLabels = function (state, name) { return (0, get_1["default"])(state, ['fields', 'meta', name, 'labels']) || null; };
 exports.getEnumLabels = getEnumLabels;
 var warnings = {};
 var getModel = function (state, name) {
-    if (isString_1["default"](name)) {
-        name = exports.normalizeName(name);
-        var meta = get_1["default"](state, ['fields', 'meta', name]) || null;
-        if (!meta && exports.isMetaFetched(state) && !warnings[name]) {
+    if ((0, isString_1["default"])(name)) {
+        name = (0, exports.normalizeName)(name);
+        var meta = (0, get_1["default"])(state, ['fields', 'meta', name]) || null;
+        if (!meta && (0, exports.isMetaFetched)(state) && !warnings[name]) {
             warnings[name] = true;
             console.warn('Steroids: Not found model meta:', name); // eslint-disable-line no-console
         }

package/reducers/form.js

@@ -36,37 +36,40 @@ function reducerItem(state, action) {
     }
     switch (action.type) {
         case form_1.FORM_INITIALIZE:
-            return __assign(__assign({ errors: {}, isInvalid: false, isSubmitting: false }, state), { values: cloneDeep_1["default"](action.values) || (state === null || state === void 0 ? void 0 : state.values) || {}, initialValues: action.values || (state === null || state === void 0 ? void 0 : state.values) || null });
+            return __assign(__assign({ errors: {}, isInvalid: false, isSubmitting: false }, state), { values: (0, cloneDeep_1["default"])(action.values) || (state === null || state === void 0 ? void 0 : state.values) || {}, initialValues: action.values || (state === null || state === void 0 ? void 0 : state.values) || null });
         case form_1.FORM_CHANGE:
-            if (isObject_1["default"](action.nameOrObject)) {
+            if ((0, isObject_1["default"])(action.nameOrObject)) {
                 var newValues = __assign(__assign({}, state.values), action.nameOrObject);
-                if (!isEqual_1["default"](state.values, newValues)) {
+                if (!(0, isEqual_1["default"])(state.values, newValues)) {
                     return __assign(__assign({}, state), { values: __assign(__assign({}, state.values), action.nameOrObject) });
                 }
                 return state;
             }
-            return dot_prop_immutable_1.set(state, 'values.' + action.nameOrObject, action.value);
+            return (0, dot_prop_immutable_1.set)(state, 'values.' + action.nameOrObject, action.value);
         case form_1.FORM_SET_ERRORS:
-            return __assign(__assign({}, state), { errors: action.errors, isInvalid: !isEmpty_1["default"](action.errors) });
+            return __assign(__assign({}, state), { errors: action.errors, isInvalid: !(0, isEmpty_1["default"])(action.errors) });
         case form_1.FORM_SUBMIT:
-            return dot_prop_immutable_1.set(state, 'submitCounter', (state.submitCounter || 0) + 1);
+            return (0, dot_prop_immutable_1.set)(state, 'submitCounter', (state.submitCounter || 0) + 1);
         case form_1.FORM_SET_SUBMITTING:
-            return dot_prop_immutable_1.set(state, 'isSubmitting', action.isSubmitting);
+            return (0, dot_prop_immutable_1.set)(state, 'isSubmitting', action.isSubmitting);
         case form_1.FORM_RESET:
-            return __assign(__assign({}, state), { values: cloneDeep_1["default"](state.initialValues || {}) });
+            return __assign(__assign({}, state), { values: (0, cloneDeep_1["default"])(state.initialValues || {}) });
         case form_1.FORM_HARD_RESET:
             return __assign(__assign({}, state), { initialValues: null, values: {}, errors: {}, isInvalid: false, isSubmitting: false });
         case form_1.FORM_DESTROY:
             return null;
         case form_1.FORM_ARRAY_ADD:
             // eslint-disable-next-line no-case-declarations
-            var newValue = [].concat(get_1["default"](state, 'values.' + action.name) || []);
-            for (var i = 0; i < action.rowsCount; i += 1) {
-                newValue.push(cloneDeep_1["default"](action.initialValues || {}));
+            if (action.name) {
+                var newValue = [].concat((0, get_1["default"])(state, 'values.' + action.name) || []);
+                for (var i = 0; i < action.rowsCount; i += 1) {
+                    newValue.push((0, cloneDeep_1["default"])(action.initialValues || {}));
+                }
+                return (0, dot_prop_immutable_1.set)(state, 'values.' + action.name, newValue);
             }
-            return dot_prop_immutable_1.set(state, 'values.' + action.name, newValue);
+            return state;
         case form_1.FORM_ARRAY_REMOVE:
-            return dot_prop_immutable_1["delete"](state, 'values.' + action.name + '.' + action.index);
+            return (0, dot_prop_immutable_1["delete"])(state, 'values.' + action.name + '.' + action.index);
         default:
             return state;
     }
@@ -76,7 +79,7 @@ var initialState = {};
 exports["default"] = (function (state, action) {
     if (state === void 0) { state = initialState; }
     if (action.formId) {
-        return dot_prop_immutable_1.set(state, action.formId, reducerItem(state[action.formId], action));
+        return (0, dot_prop_immutable_1.set)(state, action.formId, reducerItem(state[action.formId], action));
     }
     return state;
 });

package/reducers/index.js

@@ -30,9 +30,4 @@ var modal_1 = __importDefault(require("./modal"));
 exports.modal = modal_1["default"];
 var router_1 = __importDefault(require("./router"));
 exports.router = router_1["default"];
-exports["default"] = (function (asyncReducers) { return redux_1.combineReducers(__assign(__assign({ form: form_1["default"],
-    auth: auth_1["default"],
-    fields: fields_1["default"],
-    list: list_1["default"],
-    notifications: notifications_1["default"],
-    modal: modal_1["default"] }, asyncReducers), { router: function (state, action) { return router_1["default"](asyncReducers.router ? asyncReducers.router(state, action) : {}, action); } })); });
+exports["default"] = (function (asyncReducers) { return (0, redux_1.combineReducers)(__assign(__assign({ form: form_1["default"], auth: auth_1["default"], fields: fields_1["default"], list: list_1["default"], notifications: notifications_1["default"], modal: modal_1["default"] }, asyncReducers), { router: function (state, action) { return (0, router_1["default"])(asyncReducers.router ? asyncReducers.router(state, action) : {}, action); } })); });

package/reducers/list.d.ts

@@ -7,6 +7,7 @@ export declare const isListInitialized: (state: any, listId: any) => boolean;
 export declare const getList: (state: any, listId: any) => any;
 export declare const getIds: (state: any, listId: any) => any;
 export declare const getListItems: (state: any, listId: any) => any;
+export declare const getSelectedIds: (state: any, listId: any) => any;
+export declare const isSelected: (state: any, listId: any, itemId: any) => any;
+export declare const isSelectedAll: (state: any, listId: any) => any;
 export declare const getCheckedIds: (state: any, listId: any) => any;
-export declare const isChecked: (state: any, listId: any, itemId: any) => any;
-export declare const isCheckedAll: (state: any, listId: any) => any;

package/reducers/list.js

@@ -10,17 +10,21 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 var _a;
 exports.__esModule = true;
-exports.isCheckedAll = exports.isChecked = exports.getCheckedIds = exports.getListItems = exports.getIds = exports.getList = exports.isListInitialized = void 0;
+exports.getCheckedIds = exports.isSelectedAll = exports.isSelected = exports.getSelectedIds = exports.getListItems = exports.getIds = exports.getList = exports.isListInitialized = void 0;
 var get_1 = __importDefault(require("lodash-es/get"));
 var isMatch_1 = __importDefault(require("lodash-es/isMatch"));
 var every_1 = __importDefault(require("lodash-es/every"));
@@ -79,15 +83,15 @@ var reducerMap = (_a = {},
     _a[list_1.LIST_ITEM_UPDATE] = function (state, action) {
         var _a;
         return (__assign(__assign({}, state), { lists: __assign(__assign({}, state.lists), (_a = {}, _a[action.listId] = __assign(__assign({}, state.lists[action.listId]), { items: state.lists[action.listId].items.map(function (item) {
-                    if (isMatch_1["default"](item, action.condition)) {
-                        item = extend_1["default"]({}, item, action.item);
+                    if ((0, isMatch_1["default"])(item, action.condition)) {
+                        item = (0, extend_1["default"])({}, item, action.item);
                     }
                     return item;
                 }) }), _a)) }));
     },
     _a[list_1.LIST_ITEM_DELETE] = function (state, action) {
         var _a;
-        return (__assign(__assign({}, state), { lists: __assign(__assign({}, state.lists), (_a = {}, _a[action.listId] = __assign(__assign({}, state.lists[action.listId]), { items: state.lists[action.listId].items.filter(function (item) { return !isMatch_1["default"](item, action.condition); }) }), _a)) }));
+        return (__assign(__assign({}, state), { lists: __assign(__assign({}, state.lists), (_a = {}, _a[action.listId] = __assign(__assign({}, state.lists[action.listId]), { items: state.lists[action.listId].items.filter(function (item) { return !(0, isMatch_1["default"])(item, action.condition); }) }), _a)) }));
     },
     _a[list_1.LIST_DESTROY] = function (state, action) {
         delete state.lists[action.listId];
@@ -95,10 +99,10 @@ var reducerMap = (_a = {},
     },
     _a[list_1.LIST_TOGGLE_ITEM] = function (state, action) {
         var _a;
-        var selectedIds = get_1["default"](state, ['selectedIds', action.listId]) || [];
+        var selectedIds = (0, get_1["default"])(state, ['selectedIds', action.listId]) || [];
         var index = selectedIds.indexOf(action.itemId);
         if (index === -1) {
-            selectedIds = __spreadArray(__spreadArray([], selectedIds), [action.itemId]);
+            selectedIds = __spreadArray(__spreadArray([], selectedIds, true), [action.itemId], false);
         }
         else {
             selectedIds = selectedIds.filter(function (selectedId) { return selectedId !== action.itemId; });
@@ -107,11 +111,11 @@ var reducerMap = (_a = {},
     },
     _a[list_1.LIST_TOGGLE_ALL] = function (state, action) {
         var _a;
-        var list4 = state.lists[action.listId];
-        if (list4) {
-            var ids = list4.items.map(function (item) { return item[list4.primaryKey]; }) || [];
+        var list = state.lists[action.listId];
+        if (list) {
+            var ids = list.items.map(function (item) { return item[list.primaryKey]; }) || [];
             var isAll = state.selectedIds[action.listId]
-                && every_1["default"](ids.map(function (id) { return state.selectedIds[action.listId].includes(id); }));
+                && (0, every_1["default"])(ids.map(function (id) { return state.selectedIds[action.listId].includes(id); }));
             return __assign(__assign({}, state), { selectedIds: __assign(__assign({}, state.selectedIds), (_a = {}, _a[action.listId] = isAll ? [] : ids, _a)) });
         }
         return [];
@@ -127,24 +131,27 @@ exports["default"] = (function (state, action) {
         ? reducerMap[action.type](state, action)
         : state;
 });
-var isListInitialized = function (state, listId) { return !!get_1["default"](state, ['list', 'lists', listId]); };
+var isListInitialized = function (state, listId) { return !!(0, get_1["default"])(state, ['list', 'lists', listId]); };
 exports.isListInitialized = isListInitialized;
-var getList = function (state, listId) { return get_1["default"](state, ['list', 'lists', listId]) || null; };
+var getList = function (state, listId) { return (0, get_1["default"])(state, ['list', 'lists', listId]) || null; };
 exports.getList = getList;
 var getIds = function (state, listId) {
-    var list = exports.getList(state, listId);
+    var list = (0, exports.getList)(state, listId);
     return ((list && list.items && list.items.map(function (item) { return item[list.primaryKey]; })) || []);
 };
 exports.getIds = getIds;
-var getListItems = function (state, listId) { return get_1["default"](state, ['list', 'lists', listId, 'items']); };
+var getListItems = function (state, listId) { return (0, get_1["default"])(state, ['list', 'lists', listId, 'items']) || null; };
 exports.getListItems = getListItems;
-var getCheckedIds = function (state, listId) { return get_1["default"](state, ['list', 'selectedIds', listId]) || []; };
-exports.getCheckedIds = getCheckedIds;
-var isChecked = function (state, listId, itemId) { return exports.getCheckedIds(state, listId).includes(itemId); };
-exports.isChecked = isChecked;
-var isCheckedAll = function (state, listId) {
-    var selectedIds = exports.getCheckedIds(state, listId);
+var getSelectedIds = function (state, listId) { return (0, get_1["default"])(state, ['list', 'selectedIds', listId]) || []; };
+exports.getSelectedIds = getSelectedIds;
+var isSelected = function (state, listId, itemId) { return (0, exports.getSelectedIds)(state, listId).includes(itemId); };
+exports.isSelected = isSelected;
+var isSelectedAll = function (state, listId) {
+    var selectedIds = (0, exports.getSelectedIds)(state, listId);
     return (selectedIds.length > 0
-        && every_1["default"](exports.getIds(state, listId).map(function (id) { return selectedIds.includes(id); })));
+        && (0, every_1["default"])((0, exports.getIds)(state, listId).map(function (id) { return selectedIds.includes(id); })));
 };
-exports.isCheckedAll = isCheckedAll;
+exports.isSelectedAll = isSelectedAll;
+// deprecated
+var getCheckedIds = function (state, listId) { return (0, get_1["default"])(state, ['list', 'selectedIds', listId]) || []; };
+exports.getCheckedIds = getCheckedIds;

package/reducers/modal.js

@@ -10,10 +10,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -33,37 +37,37 @@ exports["default"] = (function (state, action) {
         case modal_1.MODAL_OPEN:
             return (function () {
                 var group = action.group || exports.MODAL_DEFAULT_GROUP;
-                var items = get_1["default"](state, ['opened', group]) || [];
+                var items = (0, get_1["default"])(state, ['opened', group]) || [];
                 var index = items.findIndex(function (item) { return item.id === action.id; });
                 if (index !== -1) {
-                    return dot_prop_immutable_1.set(state, "opened." + group + "." + index + ".props", __assign(__assign({}, items[index].props), action.props));
+                    return (0, dot_prop_immutable_1.set)(state, "opened.".concat(group, ".").concat(index, ".props"), __assign(__assign({}, items[index].props), action.props));
                 }
-                return dot_prop_immutable_1.set(state, "opened." + group, __spreadArray(__spreadArray([], items), [
+                return (0, dot_prop_immutable_1.set)(state, "opened.".concat(group), __spreadArray(__spreadArray([], items, true), [
                     {
                         id: action.id,
                         modal: action.modal,
                         props: action.props,
                         isClosing: false
                     },
-                ]));
+                ], false));
             })();
         case modal_1.MODAL_MARK_CLOSING:
             return (function () {
                 var group = action.group || exports.MODAL_DEFAULT_GROUP;
-                var items = get_1["default"](state, ['opened', group]) || [];
+                var items = (0, get_1["default"])(state, ['opened', group]) || [];
                 var index = items.findIndex(function (item) { return item.id === action.id; });
                 if (index !== -1) {
-                    return dot_prop_immutable_1.set(state, "opened." + group + "." + index + ".isClosing", true);
+                    return (0, dot_prop_immutable_1.set)(state, "opened.".concat(group, ".").concat(index, ".isClosing"), true);
                 }
                 return state;
             })();
         case modal_1.MODAL_CLOSE:
             return (function () {
                 var group = action.group || exports.MODAL_DEFAULT_GROUP;
-                var items = get_1["default"](state, ['opened', group]) || [];
+                var items = (0, get_1["default"])(state, ['opened', group]) || [];
                 var index = items.findIndex(function (item) { return item.id === action.id; });
                 if (index !== -1) {
-                    return dot_prop_immutable_1["delete"](state, "opened." + group + "." + index);
+                    return (0, dot_prop_immutable_1["delete"])(state, "opened.".concat(group, ".").concat(index));
                 }
                 return state;
             })();
@@ -73,6 +77,6 @@ exports["default"] = (function (state, action) {
 });
 var getOpened = function (state, group) {
     if (group === void 0) { group = exports.MODAL_DEFAULT_GROUP; }
-    return get_1["default"](state, ['modal', 'opened', group]) || null;
+    return (0, get_1["default"])(state, ['modal', 'opened', group]) || null;
 };
 exports.getOpened = getOpened;

package/reducers/notifications.d.ts

@@ -1,4 +1,4 @@
-export declare type TNotificationsState = {
+export type TNotificationsState = {
     items: any[];
     position: string;
 };

package/reducers/router.d.ts

@@ -1,33 +1,70 @@
 import { IRouteItem } from '../ui/nav/Router/Router';
-interface IRouterInitialState {
+type TRouteIdArg = string | null;
+export interface IRouterInitialState {
     location: {
         pathname: string;
         search: string;
         hash: string;
-        query: Record<string, unknown>;
-    };
-    routesTree: IRouteItem;
+        query: Record<string, unknown> | null;
+    } | null;
+    routesTree: IRouteItem | null;
     routesMap: {
         [key: string]: IRouteItem;
-    };
-    activeIds: string[];
+    } | null;
+    activeIds: string[] | null;
     match: {
         path: string;
         url: string;
         isExact: string;
-        params: Record<string, unknown>;
-    };
+        params: Record<string, unknown> | null;
+    } | null;
     params: Record<string, unknown>;
     configs: any;
     data: Record<string, unknown>;
     counters: Record<string, unknown>;
 }
+type TUrlParams = {
+    [key: string]: unknown;
+} | null;
 /**
  * Generate url for route by path and params
  * @param path
  * @param params
  */
-export declare const buildUrl: (path: any, params?: any) => any;
+export declare const buildUrl: (path: any, params?: TUrlParams) => any;
+/**
+ * Return true, if item is 'active' - opened current route or it children
+ */
+export declare const checkIsActive: (state: any, item: any) => boolean;
+/**
+ * Normalize routes tree (convert object structure to items[])
+ */
+export declare const normalizeRoutes: (state: any, item: IRouteItem, activeIds: string[], routesMap: Record<string, unknown>) => {
+    id: string;
+    title: string;
+    label: string;
+    icon: any;
+    exact: boolean;
+    strict: boolean;
+    path: string;
+    isVisible: boolean;
+    isNavVisible: boolean;
+    component: any;
+    componentProps: any;
+    roles: string[];
+    items: any;
+    redirectTo?: string | boolean;
+    layout?: string;
+    models?: string | string[];
+    enums?: string | string[];
+    role?: string;
+    preloadData?: (match: Record<string, any>) => (import("../hooks/useFetch").IFetchConfig | import("../ui/list/List/List").IListProps)[];
+};
+/**
+ * Find route in routes tree
+ */
+export declare const findRecursive: (item: IRouteItem, predicate: string | any, pathItems?: IRouteItem[] | null) => IRouteItem | null;
+export declare const getMatch: (currentRoute: any, state: any) => any;
 declare const _default: (state: IRouterInitialState, action: any) => any;
 export default _default;
 export declare const isRouterInitialized: (state: any) => boolean;
@@ -35,15 +72,15 @@ export declare const getRouterParams: (state: any) => any;
 export declare const getActiveRouteIds: (state: any) => any;
 export declare const getRoutesMap: (state: any) => any;
 export declare const getRouteId: (state: any) => any;
-export declare const getRoute: (state: any, routeId?: any) => IRouteItem;
-export declare const getRouteProp: (state: any, routeId: any, param: any) => any;
+export declare const getRoute: (state: any, routeId?: TRouteIdArg) => IRouteItem;
+export declare const getRouteProp: (state: any, routeId: TRouteIdArg, propName: any) => any;
 export declare const getRouteParams: (state: any) => any;
-export declare const getRouteParam: (state: any, param: any) => any;
-export declare const getRouteBreadcrumbs: (state: any, routeId?: any) => IRouteItem[];
-export declare const getRouteChildren: (state: any, routeId?: any) => IRouteItem[] | {
+export declare const getRouteParam: (state: any, paramName: any) => any;
+export declare const getRouteBreadcrumbs: (state: any, routeId?: TRouteIdArg) => IRouteItem[];
+export declare const getRouteChildren: (state: any, routeId?: TRouteIdArg) => IRouteItem[] | {
     [key: string]: IRouteItem;
 };
-export declare const getRouteParent: (state: any, routeId?: any, level?: number) => IRouteItem;
+export declare const getRouteParent: (state: any, routeId?: TRouteIdArg, level?: number) => IRouteItem;
 export declare const getNavItems: (state: any, routeId: any) => IRouteItem[] | {
     [key: string]: IRouteItem;
 };

package/reducers/router.js

@@ -12,7 +12,11 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -34,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 exports.__esModule = true;
-exports.getNavItems = exports.getRouteParent = exports.getRouteChildren = exports.getRouteBreadcrumbs = exports.getRouteParam = exports.getRouteParams = exports.getRouteProp = exports.getRoute = exports.getRouteId = exports.getRoutesMap = exports.getActiveRouteIds = exports.getRouterParams = exports.isRouterInitialized = exports.buildUrl = void 0;
+exports.getNavItems = exports.getRouteParent = exports.getRouteChildren = exports.getRouteBreadcrumbs = exports.getRouteParam = exports.getRouteParams = exports.getRouteProp = exports.getRoute = exports.getRouteId = exports.getRoutesMap = exports.getActiveRouteIds = exports.getRouterParams = exports.isRouterInitialized = exports.getMatch = exports.findRecursive = exports.normalizeRoutes = exports.checkIsActive = exports.buildUrl = void 0;
 var path_to_regexp_1 = require("path-to-regexp");
 var react_router_1 = require("react-router");
 var queryString = __importStar(require("qs"));
@@ -50,7 +54,6 @@ var initialState = {
     routesTree: null,
     routesMap: null,
     activeIds: null,
-    currentId: null,
     match: null,
     params: {},
     configs: [],
@@ -68,10 +71,10 @@ var buildUrl = function (path, params) {
     var url = path;
     var pathKeys = [];
     try {
-        pathKeys = path_to_regexp_1.parse(path)
+        pathKeys = (0, path_to_regexp_1.parse)(path)
             .map(function (p) { return typeof p === 'object' && p.name; })
             .filter(Boolean);
-        url = path_to_regexp_1.compile(path)(__assign({}, params));
+        url = (0, path_to_regexp_1.compile)(path)(__assign({}, params));
     }
     catch (e) {
         // eslint-disable-line no-empty
@@ -84,7 +87,7 @@ var buildUrl = function (path, params) {
         queryObj[key] = params[key];
     });
     var query = queryString.stringify(queryObj);
-    if (!isEmpty_1["default"](query) && url) {
+    if (!(0, isEmpty_1["default"])(query) && url) {
         url = url + (url.indexOf('?') !== -1 ? '&' : '?') + query;
     }
     return url;
@@ -99,75 +102,77 @@ var checkIsActive = function (state, item) {
         ? window.location.hash
             .replace(/^#/, '')
             .replace(/\?.*$/, '')
-        : get_1["default"](state, 'location.pathname');
+        : (0, get_1["default"])(state, 'location.pathname');
     var checkActive = function (subPathname, subItem) {
-        var match = react_router_1.matchPath(subPathname, pick_1["default"](subItem, ['exact', 'strict', 'path']));
+        var match = (0, react_router_1.matchPath)(subPathname, (0, pick_1["default"])(subItem, ['exact', 'strict', 'path']));
         return !!(match || (subItem.items || []).find(function (sub) { return checkActive(subPathname, sub); }));
     };
     return checkActive(pathname, item);
 };
+exports.checkIsActive = checkIsActive;
 /**
  * Normalize routes tree (convert object structure to items[])
  */
 var normalizeRoutes = function (state, item, activeIds, routesMap) {
     var items = null;
     if (Array.isArray(item.items)) {
-        items = item.items.map(function (subItem) { return normalizeRoutes(state, subItem, activeIds, routesMap); });
+        items = item.items.map(function (subItem) { return (0, exports.normalizeRoutes)(state, subItem, activeIds, routesMap); });
     }
-    else if (isObject_1["default"](item.items)) {
+    else if ((0, isObject_1["default"])(item.items)) {
         items = Object.keys(item.items)
-            .map(function (id) { return normalizeRoutes(state, __assign(__assign({}, item.items[id]), { id: id }), activeIds, routesMap); });
+            .map(function (id) { return (0, exports.normalizeRoutes)(state, __assign(__assign({}, item.items[id]), { id: id }), activeIds, routesMap); });
     }
     var normalizedItem = __assign(__assign({}, item), { id: item.id, title: item.title || item.title === '' ? item.title : item.label, label: item.label || item.label === '' ? item.label : item.title, icon: item.icon || null, exact: !!item.exact, strict: !!item.strict, path: item.path || '', isVisible: item.isVisible !== false, isNavVisible: item.isNavVisible !== false, component: null, componentProps: null, roles: item.roles || [], items: items });
     routesMap[normalizedItem.id] = normalizedItem;
-    if (checkIsActive(state, normalizedItem)) {
+    if ((0, exports.checkIsActive)(state, normalizedItem)) {
         activeIds.push(normalizedItem.id);
     }
     return normalizedItem;
 };
+exports.normalizeRoutes = normalizeRoutes;
 /**
  * Find route in routes tree
  */
 var findRecursive = function (item, predicate, pathItems) {
     if (pathItems === void 0) { pathItems = null; }
-    if ((isFunction_1["default"](predicate) && predicate(item)) || predicate === item.id) {
+    if (((0, isFunction_1["default"])(predicate) && predicate(item)) || predicate === (item === null || item === void 0 ? void 0 : item.id)) {
         if (pathItems) {
             pathItems.push(item);
         }
         return item;
     }
-    if (Array.isArray((item.items))) {
-        var finedItem = item.items.find(function (subItem) { return findRecursive(subItem, predicate, pathItems); }) || null;
-        if (finedItem && pathItems) {
+    if (Array.isArray((item === null || item === void 0 ? void 0 : item.items))) {
+        var foundedItem = item.items.find(function (subItem) { return (0, exports.findRecursive)(subItem, predicate, pathItems); }) || null;
+        if (foundedItem && pathItems) {
             pathItems.push(item);
         }
-        return finedItem;
+        return foundedItem;
     }
     return null;
 };
+exports.findRecursive = findRecursive;
 var getMatch = function (currentRoute, state) {
     var match = currentRoute
-        ? react_router_1.matchPath(String(state.location.pathname), pick_1["default"](currentRoute, ['id', 'exact', 'strict', 'path']))
+        ? (0, react_router_1.matchPath)(String(state.location.pathname), (0, pick_1["default"])(currentRoute, ['id', 'exact', 'strict', 'path']))
         : null;
     return match && __assign(__assign({}, match), { params: __assign(__assign({}, state.location.query), match.params) });
 };
+exports.getMatch = getMatch;
 var reducerMap = (_a = {},
     _a[router_1.ROUTER_INIT_ROUTES] = function (state, action) {
         var routesMap = {};
         var activeIds = [];
-        var routesTree = normalizeRoutes(state, action.routes, activeIds, routesMap);
+        var routesTree = (0, exports.normalizeRoutes)(state, action.routes, activeIds, routesMap);
         var currentRoute = activeIds.length > 0 ? routesMap[activeIds[0]] : null;
-        return __assign(__assign({}, state), { routesTree: routesTree,
-            routesMap: routesMap,
-            activeIds: activeIds, match: getMatch(currentRoute, state) });
+        return __assign(__assign({}, state), { routesTree: routesTree, routesMap: routesMap, activeIds: activeIds, match: (0, exports.getMatch)(currentRoute, state) });
     },
     _a['@@router/LOCATION_CHANGE'] = function (state, action) {
-        var newActiveIds = Object.keys(state.routesMap).filter(function (id) { return checkIsActive(state, state.routesMap[id]); });
+        var newActiveIds = Object.keys(state.routesMap).filter(function (id) { return (0, exports.checkIsActive)(state, state.routesMap[id]); });
         var currentRoute = newActiveIds.length > 0 ? state.routesMap[newActiveIds[0]] : null;
-        if (!isEqual_1["default"](newActiveIds, state.activeIds)) {
+        if (!(0, isEqual_1["default"])(newActiveIds, state.activeIds)) {
             state.activeIds = newActiveIds;
         }
-        return __assign(__assign({}, state), { match: getMatch(currentRoute, state) });
+        return __assign(__assign({}, state), { match: (0, exports.getMatch)(currentRoute, state) });
     },
     _a[router_1.ROUTER_SET_PARAMS] = function (state, action) { return (__assign(__assign({}, state), { params: __assign(__assign(__assign({}, state.params), state.location.query), action.params) })); },
     _a);
@@ -179,52 +184,52 @@ exports["default"] = (function (state, action) {
 });
 var isRouterInitialized = function (state) { return !!state.router.routesTree; };
 exports.isRouterInitialized = isRouterInitialized;
-var getRouterParams = function (state) { return get_1["default"](state.router, 'params'); };
+var getRouterParams = function (state) { return (0, get_1["default"])(state.router, 'params'); };
 exports.getRouterParams = getRouterParams;
-var getActiveRouteIds = function (state) { return get_1["default"](state.router, 'activeIds') || null; };
+var getActiveRouteIds = function (state) { return (0, get_1["default"])(state.router, 'activeIds') || null; };
 exports.getActiveRouteIds = getActiveRouteIds;
-var getRoutesMap = function (state) { return get_1["default"](state.router, 'routesMap') || null; };
+var getRoutesMap = function (state) { return (0, get_1["default"])(state.router, 'routesMap') || null; };
 exports.getRoutesMap = getRoutesMap;
-var getRouteId = function (state) { return get_1["default"](state.router, 'activeIds.0') || null; };
+var getRouteId = function (state) { return (0, get_1["default"])(state.router, 'activeIds.0') || null; };
 exports.getRouteId = getRouteId;
 var getRoute = function (state, routeId) {
     if (routeId === void 0) { routeId = null; }
-    return get_1["default"](state.router, ['routesMap', routeId || exports.getRouteId(state)]) || null;
+    return (0, get_1["default"])(state.router, ['routesMap', routeId || (0, exports.getRouteId)(state)]) || null;
 };
 exports.getRoute = getRoute;
-var getRouteProp = function (state, routeId, param) {
+var getRouteProp = function (state, routeId, propName) {
     if (routeId === void 0) { routeId = null; }
-    return get_1["default"](exports.getRoute(state, routeId), param) || null;
+    return (0, get_1["default"])((0, exports.getRoute)(state, routeId), propName) || null;
 };
 exports.getRouteProp = getRouteProp;
-var getRouteParams = function (state) { return get_1["default"](state.router, 'match.params') || null; };
+var getRouteParams = function (state) { return (0, get_1["default"])(state.router, 'match.params') || null; };
 exports.getRouteParams = getRouteParams;
-var getRouteParam = function (state, param) { return get_1["default"](exports.getRouteParams(state), param) || null; };
+var getRouteParam = function (state, paramName) { return (0, get_1["default"])((0, exports.getRouteParams)(state), paramName) || null; };
 exports.getRouteParam = getRouteParam;
 var getRouteBreadcrumbs = function (state, routeId) {
     if (routeId === void 0) { routeId = null; }
     var items = [];
-    routeId = routeId || exports.getRouteId(state);
-    findRecursive(state.router.routesTree, routeId, items);
+    routeId = routeId || (0, exports.getRouteId)(state);
+    (0, exports.findRecursive)(state.router.routesTree, routeId, items);
     return items.reverse().filter(function (item) { return item.isVisible !== false && item.isNavVisible !== false; });
 };
 exports.getRouteBreadcrumbs = getRouteBreadcrumbs;
 var getRouteChildren = function (state, routeId) {
     if (routeId === void 0) { routeId = null; }
-    var route = exports.getRoute(state, routeId);
+    var route = (0, exports.getRoute)(state, routeId);
     return (route === null || route === void 0 ? void 0 : route.items) || null;
 };
 exports.getRouteChildren = getRouteChildren;
 var getRouteParent = function (state, routeId, level) {
     if (routeId === void 0) { routeId = null; }
     if (level === void 0) { level = 1; }
-    var route = exports.getRoute(state, routeId);
-    var breadcrumbs = route ? exports.getRouteBreadcrumbs(state, route.id) : [];
-    return breadcrumbs.length > level + 1
+    var route = (0, exports.getRoute)(state, routeId);
+    var breadcrumbs = route ? (0, exports.getRouteBreadcrumbs)(state, route.id) : [];
+    return breadcrumbs.length > level
         ? breadcrumbs[breadcrumbs.length - (level + 1)]
         : null;
 };
 exports.getRouteParent = getRouteParent;
 // TODO levels...
-var getNavItems = function (state, routeId /*, level = 1*/) { return exports.getRouteChildren(state, routeId); };
+var getNavItems = function (state, routeId /*, level = 1*/) { return (0, exports.getRouteChildren)(state, routeId); };
 exports.getNavItems = getNavItems;