@steroidsjs/core 3.0.0-beta.99 → 3.0.1

package/actions/notifications.js

@@ -26,7 +26,13 @@ var showNotification = function (message, level, params) {
     return function (dispatch) {
         var _a = params, position = _a.position, timeOut = _a.timeOut;
         var id = (0, uniqueId_1["default"])();
-        dispatch({ type: exports.NOTIFICATIONS_SHOW, id: id, message: message, level: level || 'success', position: position });
+        dispatch({
+            type: exports.NOTIFICATIONS_SHOW,
+            id: id,
+            message: message,
+            level: level || 'success',
+            position: position
+        });
         if (timeOut > 0) {
             setTimeout(function () { return dispatch((0, exports.closeNotification)(id)); }, timeOut);
         }

package/actions/router.js

@@ -2,6 +2,7 @@
 exports.__esModule = true;
 exports.goToParent = exports.goToRoute = exports.initParams = exports.initRoutes = exports.ROUTER_SET_DATA = exports.ROUTER_SET_PARAMS = exports.ROUTER_INIT_ROUTES = void 0;
 var connected_react_router_1 = require("connected-react-router");
+var path_to_regexp_1 = require("path-to-regexp");
 exports.ROUTER_INIT_ROUTES = 'ROUTER_INIT_ROUTES';
 exports.ROUTER_SET_PARAMS = 'ROUTER_SET_PARAMS';
 exports.ROUTER_SET_DATA = 'ROUTER_SET_DATA';
@@ -15,6 +16,17 @@ var initParams = function (params) { return ({
     params: params
 }); };
 exports.initParams = initParams;
+// Include in the result only those parameters that are present as route parameters in the path
+// For example, given the path '/users/:id' and the parameters { id: 1, page: 3, totalPages: 10 }, the function will return { id: 1 }.
+var filterParamsForPath = function (path, params) {
+    var parsedPath = (0, path_to_regexp_1.parse)(path);
+    return parsedPath.reduce(function (filteredParams, param) {
+        if (typeof param === 'object' && params[param.name]) {
+            filteredParams[param.name] = params[param.name];
+        }
+        return filteredParams;
+    }, {});
+};
 var goToRoute = function (routeId, params, isReplace) {
     if (params === void 0) { params = null; }
     if (isReplace === void 0) { isReplace = false; }
@@ -27,8 +39,10 @@ var goToRoute = function (routeId, params, isReplace) {
         var getRouteProp = require('../reducers/router').getRouteProp;
         var buildUrl = require('../reducers/router').buildUrl;
         var path = getRouteProp(getState(), routeId, 'path');
-        var method = isReplace ? connected_react_router_1.replace : connected_react_router_1.push;
-        return dispatch(method(buildUrl(path, params)));
+        var filteredParams = filterParamsForPath(path, params);
+        var routeUrl = buildUrl(path, filteredParams);
+        var reduxAction = isReplace ? (0, connected_react_router_1.replace)(routeUrl) : (0, connected_react_router_1.push)(routeUrl);
+        return dispatch(reduxAction);
     };
 };
 exports.goToRoute = goToRoute;

package/components/HttpComponent.d.ts

@@ -100,10 +100,10 @@ export interface IHttpComponent extends IHttpComponentConfig {
  * Обертка над Axios для запросов на бекенд. Поддерживает токен авторизации, CSRF и обработку ошибок.
  */
 export default class HttpComponent implements IHttpComponent {
-    accessTokenKey: string;
-    apiUrl: string;
-    clientStorageName: string;
-    clientStorageExpiresIn: number;
+    accessTokenKey?: string;
+    apiUrl?: string;
+    clientStorageName?: string;
+    clientStorageExpiresIn?: number;
     _accessToken: any;
     _axios: any;
     _components: any;
@@ -131,9 +131,9 @@ export default class HttpComponent implements IHttpComponent {
     post(url: any, params?: {}, options?: IHttpRequestOptions): any;
     delete(url: any, params?: {}, options?: IHttpRequestOptions): any;
     send(method: any, url: any, params?: {}, options?: IHttpRequestOptions): any;
-    private _send;
-    private _sendAxios;
+    protected _send(method: any, config: any, options: IHttpRequestOptions): any;
+    protected _sendAxios(config: any, options: IHttpRequestOptions): any;
     afterRequest(response: any, config: any, options: IHttpRequestOptions): any;
-    private _onTwoFactor;
+    protected _onTwoFactor(providerName: any): Promise<unknown>;
 }
 export {};

package/components/JwtHttpComponent.d.ts

@@ -18,8 +18,8 @@ export interface IJwtHttpComponentConfig {
  * Вариация HttpComponent с функционалом обновления токена авторизации
  */
 export default class JwtHttpComponent extends BaseHttpComponent implements IJwtHttpComponentConfig {
-    refreshTokenRequest: IRefreshTokenRequest;
-    refreshTokenKey: string;
+    refreshTokenRequest?: IRefreshTokenRequest;
+    refreshTokenKey?: string;
     _refreshToken: any;
     constructor(components: any, config?: any);
     getAxiosConfig(): Promise<{

package/components/LocaleComponent.d.ts

@@ -55,15 +55,15 @@ export interface ILocaleComponent extends ILocaleComponentConfig {
  * Компонент для локализации приложения. Поддерживает конфигурацию языка и временной зоны
  */
 export default class LocaleComponent implements ILocaleComponent {
-    backendTimeDiff: null;
-    backendTimeZone: any;
+    backendTimeDiff?: null;
+    backendTimeZone?: any;
     /**
      * Язык приложения
      * @example ru
      */
-    language: string;
-    sourceLanguage: string;
-    translations: any;
+    language?: string;
+    sourceLanguage?: string;
+    translations?: any;
     constructor(components: any, config: any);
     /**
      * Получение экземпляра `dayjs` с учетом временной зоны бекенда
@@ -73,5 +73,5 @@ export default class LocaleComponent implements ILocaleComponent {
     dayjs(date?: string, format?: string): dayjs.Dayjs;
     t(message: any, params?: {}): any;
     translate(message: any, params?: {}): any;
-    private _pasteComponents;
+    protected _pasteComponents(message: any, components: any): any;
 }

package/components/MetaComponent.d.ts

@@ -69,5 +69,94 @@ export default class MetaComponent implements IMetaComponent {
         primaryKey: any;
         attributes: any[];
     };
-    private _defaultTypes;
+    protected _defaultTypes(): {
+        autoTime: {
+            jsType: string;
+            field: string;
+            formatter: string;
+        };
+        boolean: {
+            jsType: string;
+            field: string;
+            formatter: string;
+        };
+        dateTime: {
+            jsType: string;
+            field: string;
+            formatter: string;
+        };
+        date: {
+            jsType: string;
+            field: string;
+            formatter: string;
+        };
+        double: {
+            jsType: string;
+            field: string;
+        };
+        email: {
+            jsType: string;
+            field: string;
+            fieldProps: {
+                type: string;
+            };
+        };
+        enum: {
+            jsType: string;
+            field: string;
+            formatter: string;
+        };
+        file: {
+            jsType: string;
+            field: string;
+        };
+        files: {
+            jsType: string;
+            field: string;
+            fieldProps: {
+                multiple: boolean;
+            };
+        };
+        html: {
+            jsType: string;
+            field: string;
+        };
+        integer: {
+            jsType: string;
+            field: string;
+        };
+        password: {
+            jsType: string;
+            field: string;
+        };
+        phone: {
+            jsType: string;
+            field: string;
+            fieldProps: {
+                type: string;
+            };
+        };
+        primaryKey: {
+            jsType: string;
+            field: string;
+            fieldProps: {
+                type: string;
+            };
+            searchFieldProps: {
+                type: string;
+            };
+        };
+        string: {
+            jsType: string;
+            field: string;
+        };
+        text: {
+            jsType: string;
+            field: string;
+        };
+        time: {
+            jsType: string;
+            field: string;
+        };
+    };
 }

package/components/MetricsComponent.js

@@ -84,7 +84,8 @@ var MetricsComponent = /** @class */ (function () {
         (function (w, d, s, l, i) {
             w[l] = w[l] || [];
             w[l].push({
-                'gtm.start': new Date().getTime(), event: 'gtm.js'
+                'gtm.start': new Date().getTime(),
+                event: 'gtm.js'
             });
             var f = d.getElementsByTagName(s)[0];
             var j = d.createElement(s);

package/components/ResourceComponent.d.ts

@@ -87,11 +87,11 @@ export interface IResourceComponent extends IResourceComponentConfig {
  * Компонент для подгрузки внешних API: Google Maps, Yandex Maps, Twitter, ...
  */
 export default class ResourceComponent implements IResourceComponent {
-    private _callbacks;
-    private _components;
-    googleApiKey: string;
+    protected _callbacks: any;
+    protected _components: any;
+    googleApiKey?: string;
     googleCaptchaSiteKey: string;
-    language: string;
+    language?: string;
     readonly RESOURCE_GOOGLE_MAP_API = "//maps.googleapis.com/maps/api/js";
     readonly RESOURCE_YANDEX_MAP_API = "https://api-maps.yandex.ru/2.1/";
     readonly RESOURCE_TWITTER_WIDGET = "https://platform.twitter.com/widgets.js";

package/components/UiComponent.d.ts

@@ -127,15 +127,15 @@ export interface IUiApplicationComponent {
  */
 export default class UiComponent implements IUiApplicationComponent {
     components: IComponents;
-    private _components;
-    private _models;
+    protected _components: any;
+    protected _models: any;
     icons: {
         [name: string]: string | number | ReactNode;
     } | any;
     fields: any;
     formatters: any;
-    private _registeredFields;
-    private _portalElement;
+    protected _registeredFields: any;
+    protected _portalElement: HTMLDivElement;
     constructor(components: any);
     addViews(components: any): void;
     renderView(Component: any, props: any, forceNode?: boolean): any;
@@ -151,9 +151,9 @@ export default class UiComponent implements IUiApplicationComponent {
     addModels(models: any): void;
     registerField(formId: any, attribute: any, type: any): void;
     getRegisteredFields(formId: any): any;
-    private _add;
-    private _getComponent;
-    private _getPropsConfig;
+    protected _add(group: any, items: any, defaultNamespace?: any): void;
+    protected _getComponent(group: any, path: any): any;
+    protected _getPropsConfig(group: any, path: any): any;
     setPortalElement(element: any): void;
     getPortalElement(): HTMLDivElement;
 }

package/components/WebSocketComponent.d.ts

@@ -63,12 +63,12 @@ export interface IWebSocketComponent extends IWebSocketComponentConfig {
  * Компонент для создания websocket взаимодействия
  */
 export default class WebSocketComponent implements IWebSocketComponent {
-    wsUrl: string;
-    streams: TStreams;
-    authHandler: (components: IComponents) => Promise<string>;
-    onOpen: (event: any, components: IComponents) => any;
-    onClose: (event: any, components: IComponents) => any;
-    onMessage: (data: Record<string, unknown>, components: IComponents) => any;
+    wsUrl?: string;
+    streams?: TStreams;
+    authHandler?: (components: IComponents) => Promise<string>;
+    onOpen?: (event: any, components: IComponents) => any;
+    onClose?: (event: any, components: IComponents) => any;
+    onMessage?: (data: Record<string, unknown>, components: IComponents) => any;
     _components: IComponents;
     _connection: any;
     _tryCount: any;
@@ -81,10 +81,10 @@ export default class WebSocketComponent implements IWebSocketComponent {
     subscribe(streams: any): void;
     unsubscribeStream(stream: any, id: any): void;
     unsubscribe(streams: any): void;
-    private _connect;
-    private _reConnect;
-    private _onOpen;
-    private _onMessage;
-    private _onClose;
+    protected _connect(): Promise<void>;
+    protected _reConnect(): void;
+    protected _onOpen(event: any): void;
+    protected _onMessage(message: any): void;
+    protected _onClose(event: any): void;
 }
 export {};