@steroidsjs/core 3.0.93 → 3.0.94

package/actions/auth.js

@@ -34,6 +34,7 @@ var init = function (skipInitialized) {
 exports.init = init;
 var reInit = function () { return (0, exports.init)(); };
 exports.reInit = reInit;
+// eslint-disable-next-line default-param-last
 var login = function (token, redirectPageId, params) {
     if (redirectPageId === void 0) { redirectPageId = 'root'; }
     return function (dispatch, getState, _a) {

package/actions/list.js

@@ -15,17 +15,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.selectItem = exports.toggleAll = exports.toggleItem = exports.deleteItem = exports.update = exports.add = exports.listDestroy = exports.listRefresh = exports.listLazyFetch = exports.listFetch = exports.listChangeAction = exports.listSetLayout = exports.listSetItems = exports.listInit = exports.localFetchHandler = exports.httpFetchHandler = exports.LIST_SELECT_ITEM = exports.LIST_CHANGE_ACTION = exports.LIST_SET_LAYOUT = exports.LIST_TOGGLE_ALL = exports.LIST_TOGGLE_ITEM = exports.LIST_DESTROY = exports.LIST_ITEM_DELETE = exports.LIST_ITEM_UPDATE = exports.LIST_ITEM_ADD = exports.LIST_AFTER_FETCH = exports.LIST_BEFORE_FETCH = exports.LIST_SET_ITEMS = exports.LIST_INIT = void 0;
+var axios_1 = __importDefault(require("axios"));
 var get_1 = __importDefault(require("lodash-es/get"));
 var isArray_1 = __importDefault(require("lodash-es/isArray"));
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
-var orderBy_1 = __importDefault(require("lodash-es/orderBy"));
-var trimStart_1 = __importDefault(require("lodash-es/trimStart"));
-var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
+var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var isNil_1 = __importDefault(require("lodash-es/isNil"));
-var axios_1 = __importDefault(require("axios"));
-var form_1 = require("../reducers/form");
-var form_2 = require("../actions/form");
+var orderBy_1 = __importDefault(require("lodash-es/orderBy"));
+var trimStart_1 = __importDefault(require("lodash-es/trimStart"));
+var form_1 = require("../actions/form");
+var form_2 = require("../reducers/form");
 var data_1 = require("../utils/data");
 exports.LIST_INIT = '@list/init';
 exports.LIST_SET_ITEMS = '@list/set_items';
@@ -148,7 +148,7 @@ var listFetch = function (listId, query) {
             return [];
         }
         var toDispatch = [];
-        var formValues = (0, form_1.formSelector)(state, list.formId, function (_a) {
+        var formValues = (0, form_2.formSelector)(state, list.formId, function (_a) {
             var values = _a.values;
             return values;
         }) || {};
@@ -156,7 +156,7 @@ var listFetch = function (listId, query) {
         // Change query
         Object.keys(query || {}).forEach(function (key) {
             formValues[key] = query[key];
-            toDispatch.push((0, form_2.formChange)(list.formId, key, query[key]));
+            toDispatch.push((0, form_1.formChange)(list.formId, key, query[key]));
         });
         // Отменяем предыдущий запрос для этого listId (если есть)
         components.http._promises = components.http._promises || {};
@@ -172,7 +172,9 @@ var listFetch = function (listId, query) {
         // Создаем новый источник отмены
         var source = axios_1["default"].CancelToken.source();
         components.http._promises[listId] = source;
-        var options = { cancelToken: source.token };
+        var options = {
+            cancelToken: source.token
+        };
         // Set `Loading...`
         if (list.isRemote) {
             toDispatch.push({
@@ -205,7 +207,7 @@ var listFetch = function (listId, query) {
             var totalPages = Math.ceil(((list === null || list === void 0 ? void 0 : list.total) || 0) / (pageSize || 1));
             var hasNextPage = (_a = data === null || data === void 0 ? void 0 : data.hasNextPage) !== null && _a !== void 0 ? _a : (page !== totalPages || null);
             return [
-                (0, form_2.formSetErrors)(list.formId, data.errors || null),
+                (0, form_1.formSetErrors)(list.formId, data.errors || null),
                 {
                     items: items,
                     total: total,

package/actions/notifications.d.ts

@@ -12,5 +12,5 @@ export declare const closeNotification: (id?: string | null) => {
 export declare const showNotification: (message: string | {
     message: string;
     description?: string;
-}, level?: ColorName, params?: IShowNotificationParameters) => (dispatch: any) => void;
+}, notificationType?: AlertColorName, params?: IShowNotificationParameters) => (dispatch: any) => void;
 export declare const setFlashes: (flashes: any) => ((dispatch: any) => void)[][];

package/actions/notifications.js

@@ -31,8 +31,10 @@ var closeNotification = function (id) {
     });
 };
 exports.closeNotification = closeNotification;
-var showNotification = function (message, level, params) {
-    if (level === void 0) { level = null; }
+var showNotification = function (message, 
+// eslint-disable-next-line default-param-last
+notificationType, params) {
+    if (notificationType === void 0) { notificationType = null; }
     return function (dispatch) {
         var _a = __assign(__assign({}, showNotificationDefaults), params), position = _a.position, timeOut = _a.timeOut;
         var id = (0, uniqueId_1["default"])();
@@ -40,7 +42,7 @@ var showNotification = function (message, level, params) {
             type: exports.NOTIFICATIONS_SHOW,
             id: id,
             message: message,
-            level: level || 'success',
+            notificationType: notificationType || 'success',
             position: position
         });
         if (timeOut > 0) {

package/components/ClientStorageComponent.js

@@ -28,8 +28,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-unused-expressions */
-var cookie = __importStar(require("js-cookie"));
 var dayjs_1 = __importDefault(require("dayjs"));
+var cookie = __importStar(require("js-cookie"));
 /**
  * Client Storage Component
  * Слой хранения данных в браузере (cookie, local/session storage) или ReactNative

package/components/HttpComponent.js

@@ -50,11 +50,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var trimStart_1 = __importDefault(require("lodash-es/trimStart"));
-var trimEnd_1 = __importDefault(require("lodash-es/trimEnd"));
+var axios_1 = __importDefault(require("axios"));
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
+var trimEnd_1 = __importDefault(require("lodash-es/trimEnd"));
+var trimStart_1 = __importDefault(require("lodash-es/trimStart"));
 var set_cookie_parser_1 = __importDefault(require("set-cookie-parser"));
-var axios_1 = __importDefault(require("axios"));
 var notifications_1 = require("../actions/notifications");
 /**
  * Http Component

package/components/JwtHttpComponent.js

@@ -54,9 +54,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var axios_1 = __importDefault(require("axios"));
-var HttpComponent_1 = __importDefault(require("@steroidsjs/core/components/HttpComponent"));
 var auth_1 = require("@steroidsjs/core/actions/auth");
+var HttpComponent_1 = __importDefault(require("@steroidsjs/core/components/HttpComponent"));
+var axios_1 = __importDefault(require("axios"));
 /**
  * JwtHttpComponent
  * Вариация HttpComponent с функционалом обновления токена авторизации

package/components/LocaleComponent.js

@@ -27,10 +27,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 /* eslint-disable import/no-extraneous-dependencies */
-var React = __importStar(require("react"));
-var intl_messageformat_1 = __importDefault(require("intl-messageformat"));
 var dayjs_1 = __importDefault(require("dayjs"));
+var intl_messageformat_1 = __importDefault(require("intl-messageformat"));
 var isObject_1 = __importDefault(require("lodash-es/isObject"));
+var React = __importStar(require("react"));
 require("dayjs/locale/it");
 require("dayjs/locale/ru");
 /**
@@ -42,7 +42,8 @@ var LocaleComponent = /** @class */ (function () {
         this.language = config.language || 'en';
         this.sourceLanguage = config.sourceLanguage || 'ru';
         this.backendTimeZone = null;
-        this.backendTimeDiff = null; // in microseconds
+        // in microseconds
+        this.backendTimeDiff = null;
         this.translations = {};
         // Publish to global
         if (process.env.IS_SSR) {

package/components/MetricsComponent.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var upperFirst_1 = __importDefault(require("lodash-es/upperFirst"));
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
+var upperFirst_1 = __importDefault(require("lodash-es/upperFirst"));
 var auth_1 = require("../reducers/auth");
 /**
  * Metrics Component

package/components/ResourceComponent.d.ts

@@ -85,6 +85,8 @@ export interface IResourceComponent extends IResourceComponentConfig {
 /**
  * Resource Component
  * Компонент для подгрузки внешних API: Google Maps, Yandex Maps, Twitter, ...
+ *
+ * @deprecated
  */
 export default class ResourceComponent implements IResourceComponent {
     protected _callbacks: any;

package/components/ResourceComponent.js

@@ -27,11 +27,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-var queryString = __importStar(require("qs"));
 var isArray_1 = __importDefault(require("lodash-es/isArray"));
+var queryString = __importStar(require("qs"));
 /**
  * Resource Component
  * Компонент для подгрузки внешних API: Google Maps, Yandex Maps, Twitter, ...
+ *
+ * @deprecated
  */
 var ResourceComponent = /** @class */ (function () {
     function ResourceComponent(components, config) {
@@ -50,7 +52,9 @@ var ResourceComponent = /** @class */ (function () {
         if (window.grecaptcha) {
             return Promise.resolve(window.grecaptcha);
         }
-        return this.loadScript(this.RESOURCE_GOOGLE_CAPTCHA, { render: this.googleCaptchaSiteKey }, function () { return window.grecaptcha; });
+        return this.loadScript(this.RESOURCE_GOOGLE_CAPTCHA, {
+            render: this.googleCaptchaSiteKey
+        }, function () { return window.grecaptcha; });
     };
     ResourceComponent.prototype.loadGoogleMapApi = function () {
         var locale = this._components.locale;
@@ -73,7 +77,7 @@ var ResourceComponent = /** @class */ (function () {
         if (window.ymaps) {
             return new Promise(function (resolve) {
                 // @ts-ignore
-                // eslint-disable-next-line implicit-arrow-linebreak
+                // eslint-disable-next-line implicit-arrow-linebreak,no-promise-executor-return
                 return window.ymaps.ready(function () { return resolve(window.ymaps); });
             });
         }
@@ -81,6 +85,7 @@ var ResourceComponent = /** @class */ (function () {
             lang: this.language || locale.language
         }, 
         // @ts-ignore
+        // eslint-disable-next-line no-promise-executor-return
         function () { return new Promise(function (resolve) { return window.ymaps.ready(function () { return resolve(window.ymaps); }); }); });
     };
     ResourceComponent.prototype.loadTwitterWidget = function () {
@@ -91,6 +96,7 @@ var ResourceComponent = /** @class */ (function () {
         }
         return this.loadScript(this.RESOURCE_TWITTER_WIDGET, {}, 
         // @ts-ignore
+        // eslint-disable-next-line no-promise-executor-return
         function () { return new Promise(function (resolve) { return window.twttr.ready(function () { return resolve(window.twttr); }); }); });
     };
     ResourceComponent.prototype.loadGeetest = function () {

package/components/SocialComponent.js

@@ -18,7 +18,9 @@ var SocialComponent = /** @class */ (function () {
         var _this = this;
         Object.keys(this.providers).forEach(function (name) {
             if ((0, isFunction_1["default"])(_this.providers[name])) {
-                _this.providers[name] = { className: _this.providers[name] };
+                _this.providers[name] = {
+                    className: _this.providers[name]
+                };
             }
             var ProviderClass = _this.providers[name].className;
             delete _this.providers[name].className;

package/components/StoreComponent.d.ts

@@ -1,3 +1,7 @@
+import { IComponents } from '@steroidsjs/core/providers/ComponentsProvider';
+import { RouterState } from 'connected-react-router';
+import { History, LocationState } from 'history';
+import { Store, Dispatch, Unsubscribe, Reducer, AnyAction } from 'redux';
 declare global {
     interface Window {
         APP_REDUX_PRELOAD_STATES?: any;
@@ -5,26 +9,34 @@ declare global {
     }
 }
 interface IStoreComponentConfig {
-    initialState: any;
-    history: any;
+    initialState: Record<string, any>;
+    history: History;
 }
+type AsyncReducersMap = {
+    router?: Reducer<RouterState<LocationState>, AnyAction>;
+    [key: string]: Reducer<any, AnyAction> | undefined;
+};
+type RootState<R extends AsyncReducersMap> = {
+    [K in keyof R]: R[K] extends Reducer<infer S, AnyAction> ? S : never;
+};
+type CreateRootReducer = <R extends AsyncReducersMap>(reducers: R) => Reducer<RootState<R>, AnyAction>;
 export interface IStoreComponent {
     /**
      * Редьюсеры
      */
-    reducers: any;
+    reducers: CreateRootReducer;
     /**
      * Хранилище
      */
-    store: any;
+    store: Store;
     /**
      * Инициализация
      */
-    init(): void;
+    init(config: IStoreComponentConfig): void;
     /**
      * Инициализация хранилища
      */
-    initStore(): void;
+    initStore(config: IStoreComponentConfig): void;
     /**
      * Конфигурация
      */
@@ -33,16 +45,16 @@ export interface IStoreComponent {
      * Метод для dispatch
      * @param action Экшен для изменения состояния.
      */
-    dispatch(action: any): void;
+    dispatch: Dispatch<any>;
     /**
      * Получение состояния
      */
-    getState(): void;
+    getState(): Record<string, any>;
     /**
      * Подписка
      * @param handler Обработчик изменения состояния.
      */
-    subscribe(handler: any): void;
+    subscribe(handler: () => void): Unsubscribe;
     /**
      * Добавление редьюсеров
      * @param asyncReducers Коллекция редьюсеров.
@@ -61,23 +73,23 @@ export interface IStoreComponent {
  * Обертка над Redux Store со встроенными middleware (thunk, multi, promise..) и react-router.
  */
 export default class StoreComponent implements IStoreComponent {
-    _asyncReducers: any;
-    _components: any;
-    reducers: any;
-    _routerReducer: any;
-    history: any;
+    _asyncReducers: AsyncReducersMap;
+    _components: IComponents;
+    reducers: CreateRootReducer;
+    _routerReducer: Reducer<RouterState<LocationState>>;
+    history: History | null;
     navigationNative: any;
-    store: any;
+    store: Store | null;
     lastAction: string;
-    constructor(components: any, config: any, lazyInit?: boolean);
-    init(config?: IStoreComponentConfig): void;
-    initStore(config?: IStoreComponentConfig): void;
+    constructor(components: IComponents, config: any, lazyInit?: boolean);
+    init(config: IStoreComponentConfig): void;
+    initStore(config: IStoreComponentConfig): void;
     configurate(): void;
     dispatch(action: any): any;
     getState(): any;
-    subscribe(handler: any): any;
-    addReducers(asyncReducers: any): void;
+    subscribe(handler: any): Unsubscribe;
+    addReducers(asyncReducers: AsyncReducersMap): void;
     errorHandler(error: any, action: any): void;
-    _prepare(action: any, dispatch: any, getState: any): any;
+    _prepare(action: any, dispatch: Dispatch<any>, getState: Record<string, any>): any;
 }
 export {};

package/components/StoreComponent.js

@@ -14,13 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-/* eslint-disable no-restricted-globals */
-var redux_1 = require("redux");
 var connected_react_router_1 = require("connected-react-router");
 var history_1 = require("history");
 var get_1 = __importDefault(require("lodash-es/get"));
-var merge_1 = __importDefault(require("lodash-es/merge"));
 var isPlainObject_1 = __importDefault(require("lodash-es/isPlainObject"));
+var merge_1 = __importDefault(require("lodash-es/merge"));
+var redux_1 = require("redux");
 /**
  * Store Component
  * Обертка над Redux Store со встроенными middleware (thunk, multi, promise..) и react-router.
@@ -28,10 +27,11 @@ var isPlainObject_1 = __importDefault(require("lodash-es/isPlainObject"));
 var StoreComponent = /** @class */ (function () {
     function StoreComponent(components, config, lazyInit) {
         if (lazyInit === void 0) { lazyInit = false; }
+        var _a;
         this._components = components;
         this.reducers = config.reducers;
         this.history = null;
-        this.store = config.store || null;
+        this.store = (_a = config.store) !== null && _a !== void 0 ? _a : null;
         this.lastAction = null;
         this._asyncReducers = {};
         this.getState = this.getState.bind(this);
@@ -42,13 +42,11 @@ var StoreComponent = /** @class */ (function () {
         }
     }
     StoreComponent.prototype.init = function (config) {
-        if (config === void 0) { config = {}; }
         this.initStore(config);
         this.configurate();
     };
     StoreComponent.prototype.initStore = function (config) {
         var _this = this;
-        if (config === void 0) { config = {}; }
         var initialState = __assign(__assign({}, (process.env.IS_WEB
             ? merge_1["default"].apply(void 0, (window.APP_REDUX_PRELOAD_STATES || [{}])) : {})), config.initialState);
         if (window === null || window === void 0 ? void 0 : window.APP_REDUX_PRELOAD_STATES) {
@@ -68,10 +66,7 @@ var StoreComponent = /** @class */ (function () {
             this._routerReducer = (0, connected_react_router_1.connectRouter)(this.history);
         }
         if (!this.store) {
-            this.store = (0, redux_1.createStore)(
-            //TODO TYPES
-            //@ts-ignore
-            this.reducers(this._routerReducer ? {
+            this.store = (0, redux_1.createStore)(this.reducers(this._routerReducer ? {
                 router: this._routerReducer
             } : {}), initialState, (0, redux_1.compose)((0, redux_1.applyMiddleware)(function (_a) {
                 var getState = _a.getState;

package/components/UiComponent.js

@@ -37,10 +37,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var React = __importStar(require("react"));
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var isObject_1 = __importDefault(require("lodash-es/isObject"));
 var isString_1 = __importDefault(require("lodash-es/isString"));
+var React = __importStar(require("react"));
 /**
  * Ui Component
  * Компонент для подгрузки и конфигурации UI компонентов приложения

package/components/social/GitlabProvider.js

@@ -83,7 +83,9 @@ var GitlabProvider = /** @class */ (function () {
                             // ?provider=gitlab_kozhindev#access_token=7b87e3de0...5518198d885d&token_type=Bearer
                             var token = (/access_token=(\w+)/.exec(link) || [])[1];
                             if (token) {
-                                resolve({ token: token });
+                                resolve({
+                                    token: token
+                                });
                             }
                             else {
                                 reject();