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

package/hooks/useFetch.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -63,7 +63,7 @@ var getConfigId = function (config) {
     if (config === null) {
         return null;
     }
-    var result = trim_1["default"](config.id || config.url, '/');
+    var result = (0, trim_1["default"])(config.id || config.url, '/');
     if (!result) {
         // eslint-disable-next-line no-console
         console.warn('Please set id for fetch config, it`s necessary for SSR to work properly');
@@ -97,28 +97,28 @@ exports.fetchData = fetchData;
 function useFetch(rawConfig) {
     var _this = this;
     if (rawConfig === void 0) { rawConfig = null; }
-    var components = index_1.useComponents();
+    var components = (0, index_1.useComponents)();
     // Store config in state
-    var _a = react_1.useState(exports.normalizeConfig(rawConfig)), config = _a[0], setConfig = _a[1];
+    var _a = (0, react_1.useState)((0, exports.normalizeConfig)(rawConfig)), config = _a[0], setConfig = _a[1];
     // Update config in state on raw config updated
-    react_use_1.useUpdateEffect(function () {
-        setConfig(exports.normalizeConfig(rawConfig));
+    (0, react_use_1.useUpdateEffect)(function () {
+        setConfig((0, exports.normalizeConfig)(rawConfig));
     }, [rawConfig]);
     // Get preloaded data
-    var configId = exports.getConfigId(config);
-    var ssrValueContext = index_1.useSsr();
+    var configId = (0, exports.getConfigId)(config);
+    var ssrValueContext = (0, index_1.useSsr)();
     var preloadedData = process.env.IS_SSR ? ssrValueContext.preloadedData : window.APP_PRELOADED_DATA;
     var preloadedDataByConfigId = (preloadedData && configId) ? preloadedData[configId] : null;
     // State for data and loading flag
-    var _b = react_1.useState(preloadedDataByConfigId || null), data = _b[0], setData = _b[1];
-    var _c = react_1.useState(null), axiosError = _c[0], setAxiosError = _c[1];
-    var _d = react_1.useState(!!config && !data), isLoading = _d[0], setIsLoading = _d[1];
+    var _b = (0, react_1.useState)(preloadedDataByConfigId || null), data = _b[0], setData = _b[1];
+    var _c = (0, react_1.useState)(null), axiosError = _c[0], setAxiosError = _c[1];
+    var _d = (0, react_1.useState)(!!config && !data), isLoading = _d[0], setIsLoading = _d[1];
     // Cancel tokens
-    var cancelTokens = react_1.useRef([]);
+    var cancelTokens = (0, react_1.useRef)([]);
     var addCancelToken = function (token) { return cancelTokens.current.push(token); };
-    react_use_1.useUnmount(function () { return cancelTokens.current.forEach(function (cancel) { return cancel('Canceled on unmount component'); }); });
+    (0, react_use_1.useUnmount)(function () { return cancelTokens.current.forEach(function (cancel) { return cancel('Canceled on unmount component'); }); });
     // Fetch handler
-    var fetch = react_1.useCallback(function (newConfig) {
+    var fetch = (0, react_1.useCallback)(function (newConfig) {
         if (newConfig === void 0) { newConfig = null; }
         return __awaiter(_this, void 0, void 0, function () {
             var _a, error_1;
@@ -136,7 +136,7 @@ function useFetch(rawConfig) {
                     case 1:
                         _b.trys.push([1, 3, , 4]);
                         _a = setData;
-                        return [4 /*yield*/, exports.fetchData(config, components, addCancelToken)];
+                        return [4 /*yield*/, (0, exports.fetchData)(config, components, addCancelToken)];
                     case 2:
                         _a.apply(void 0, [_b.sent()]);
                         return [3 /*break*/, 4];
@@ -154,13 +154,13 @@ function useFetch(rawConfig) {
             });
         });
     }, [components, config]);
-    react_use_1.useEffectOnce(function () {
+    (0, react_use_1.useEffectOnce)(function () {
         if (!data) {
             fetch();
         }
     });
     // Fetch data on config update
-    react_use_1.useUpdateEffect(function () {
+    (0, react_use_1.useUpdateEffect)(function () {
         fetch();
     }, [fetch]);
     return { data: data, isLoading: isLoading, fetch: fetch, axiosError: axiosError };

package/hooks/useFile.d.ts

@@ -1,2 +1,23 @@
-import { IFileHocInput, IFileHocOutput } from '../hoc/file';
-export default function useFile(props: IFileHocInput): IFileHocOutput;
+export interface IFileInput {
+    input?: FormInputType;
+    multiple?: boolean;
+    uploader?: any;
+    backendUrl?: any;
+    mimeTypes?: any;
+    imagesOnly?: any;
+    imagesProcessor?: any;
+    imagesExactSize?: any;
+    initialFiles?: any;
+    uploaderConfig?: {
+        useFormData?: boolean;
+        fileFieldName?: string;
+    } | any;
+}
+export interface IFileOutput {
+    uploader?: any;
+    files?: any[];
+    onBrowse?: any;
+    onRemove?: any;
+    onAdd?: any;
+}
+export default function useFile(props: IFileInput): IFileOutput;

package/hooks/useFile.js

@@ -36,16 +36,16 @@ var imagesMimeTypes = [
     'image/heic-sequence',
 ];
 function generateBackendUrl(props) {
-    return buildURL_1["default"](props.backendUrl, {
+    return (0, buildURL_1["default"])(props.backendUrl, {
         mimeTypes: props.imagesOnly ? imagesMimeTypes : props.mimeTypes,
         imagesProcessor: props.imagesProcessor,
         imagesExactSize: props.imagesExactSize
     });
 }
 function useFile(props) {
-    var http = index_1.useComponents().http;
+    var http = (0, index_1.useComponents)().http;
     http.getAccessToken(); // TODO Run promise..
-    var uploader = useInitial_1["default"](function () {
+    var uploader = (0, useInitial_1["default"])(function () {
         var _a;
         return new fileup_core_1["default"](__assign(__assign({ dropArea: {}, backendUrl: generateBackendUrl(props), uploaderConfig: __assign(__assign({}, props.uploaderConfig), { headers: __assign(__assign({}, (_a = props.uploaderConfig) === null || _a === void 0 ? void 0 : _a.headers), { Authorization: 'Bearer ' + http._accessToken }) }) }, props.uploader), { form: __assign(__assign({}, (props.uploader && props.uploader.form)), { multiple: props.multiple, accept: props.imagesOnly ? imagesMimeTypes.join(', ') : '' }) }));
     });
@@ -53,15 +53,15 @@ function useFile(props) {
      * Force component update when file status or progress changes
      * @private
      */
-    var forceUpdate = react_use_1.useUpdate();
+    var forceUpdate = (0, react_use_1.useUpdate)();
     // Check for initial files
-    var form = index_1.useForm();
+    var form = (0, index_1.useForm)();
     var initialFiles = props.initialFiles;
     if (!initialFiles) {
         // Find in form values
-        initialFiles = form.formSelector(function (state) { return get_1["default"](state, 'values.' + props.input.name.replace(/Ids?$/, '')); });
+        initialFiles = form.formSelector(function (state) { return (0, get_1["default"])(state, 'values.' + props.input.name.replace(/Ids?$/, '')); });
     }
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         if (initialFiles) {
             var normalizedInitialFiles_1 = [].concat(initialFiles || [])
                 .filter(function (item) { return !!item.uid; });
@@ -103,14 +103,14 @@ function useFile(props) {
      * @param {File} file
      * @private
      */
-    var onQueueItemEnd = react_1.useCallback(function (file) {
+    var onQueueItemEnd = (0, react_1.useCallback)(function (file) {
         forceUpdate();
         // Check successfully
         if (file.getResult() !== File_1["default"].RESULT_SUCCESS) {
             return;
         }
         // Check file id exists
-        var id = get_1["default"](file.getResultHttpMessage(), 'id');
+        var id = (0, get_1["default"])(file.getResultHttpMessage(), 'id');
         if (!id) {
             return;
         }
@@ -122,14 +122,14 @@ function useFile(props) {
             props.input.onChange(id);
         }
     }, [forceUpdate, props.input, props.multiple]);
-    var prevOnQueueItemEnd = react_use_1.usePrevious(onQueueItemEnd);
-    react_1.useEffect(function () {
+    var prevOnQueueItemEnd = (0, react_use_1.usePrevious)(onQueueItemEnd);
+    (0, react_1.useEffect)(function () {
         if (prevOnQueueItemEnd) {
             uploader.queue.off(QueueCollection_1["default"].EVENT_ITEM_END, prevOnQueueItemEnd);
         }
         uploader.queue.on(QueueCollection_1["default"].EVENT_ITEM_END, onQueueItemEnd);
     }, [onQueueItemEnd, prevOnQueueItemEnd, uploader.queue]);
-    react_use_1.useUnmount(function () {
+    (0, react_use_1.useUnmount)(function () {
         uploader.queue.off(QueueCollection_1["default"].EVENT_ITEM_END, onQueueItemEnd);
     });
     /**
@@ -137,9 +137,9 @@ function useFile(props) {
      * @param {File[]} removedFiles
      * @private
      */
-    var onQueueRemove = react_1.useCallback(function (removedFiles) {
+    var onQueueRemove = (0, react_1.useCallback)(function (removedFiles) {
         var toRemove = removedFiles
-            .map(function (file) { return get_1["default"](file.getResultHttpMessage(), 'id'); })
+            .map(function (file) { return (0, get_1["default"])(file.getResultHttpMessage(), 'id'); })
             .filter(Boolean);
         if (toRemove.length === 0) {
             return;
@@ -155,26 +155,26 @@ function useFile(props) {
         }
         forceUpdate();
     }, [forceUpdate, props.input, props.multiple]);
-    var prevOnQueueRemove = react_use_1.usePrevious(onQueueRemove);
-    react_1.useEffect(function () {
+    var prevOnQueueRemove = (0, react_use_1.usePrevious)(onQueueRemove);
+    (0, react_1.useEffect)(function () {
         if (prevOnQueueRemove) {
             uploader.queue.off(QueueCollection_1["default"].EVENT_REMOVE, prevOnQueueRemove);
         }
         uploader.queue.on(QueueCollection_1["default"].EVENT_REMOVE, onQueueRemove);
     }, [onQueueRemove, prevOnQueueRemove, uploader.queue]);
-    react_use_1.useUnmount(function () {
+    (0, react_use_1.useUnmount)(function () {
         uploader.queue.off(QueueCollection_1["default"].EVENT_REMOVE, onQueueRemove);
     });
-    react_use_1.useMount(function () {
+    (0, react_use_1.useMount)(function () {
         uploader.queue.on(QueueCollection_1["default"].EVENT_ITEM_STATUS, forceUpdate);
         uploader.queue.on(QueueCollection_1["default"].EVENT_ITEM_PROGRESS, forceUpdate);
     });
-    react_use_1.useUnmount(function () {
+    (0, react_use_1.useUnmount)(function () {
         uploader.queue.off(QueueCollection_1["default"].EVENT_ITEM_STATUS, forceUpdate);
         uploader.queue.off(QueueCollection_1["default"].EVENT_ITEM_PROGRESS, forceUpdate);
     });
     // Check backend url changes
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         uploader.backendUrl = generateBackendUrl({
             backendUrl: props.backendUrl,
             imagesOnly: props.imagesOnly,
@@ -185,7 +185,7 @@ function useFile(props) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [props.backendUrl, props.imagesExactSize, props.imagesOnly, props.imagesProcessor, props.mimeTypes]);
     // Check multiple flag update
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         uploader.form.multiple = props.multiple;
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [props.multiple]);
@@ -194,13 +194,13 @@ function useFile(props) {
     //    _merge(uploader, props.uploader);
     //}, [props.uploader, uploader]);
     // Check remove keys from value
-    var prevInputValue = react_use_1.usePrevious(props.input.value);
+    var prevInputValue = (0, react_use_1.usePrevious)(props.input.value);
     //todo refactoring
-    react_1.useEffect(function () {
-        if (prevInputValue && !isEqual_1["default"](prevInputValue !== props.input.value)) {
-            var toRemove_1 = difference_1["default"]([].concat(prevInputValue || []), [].concat(props.input.value || []));
+    (0, react_1.useEffect)(function () {
+        if (prevInputValue && !(0, isEqual_1["default"])(prevInputValue !== props.input.value)) {
+            var toRemove_1 = (0, difference_1["default"])([].concat(prevInputValue || []), [].concat(props.input.value || []));
             if (toRemove_1.length > 0) {
-                uploader.queue.remove(uploader.queue.getFiles().filter(function (file) { return (toRemove_1.indexOf(get_1["default"](file.getResultHttpMessage(), 'id')) !== -1); }));
+                uploader.queue.remove(uploader.queue.getFiles().filter(function (file) { return (toRemove_1.indexOf((0, get_1["default"])(file.getResultHttpMessage(), 'id')) !== -1); }));
             }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps

package/hooks/useForm.d.ts

@@ -3,7 +3,6 @@ export default function useForm(): {
     model: any;
     prefix: string | boolean;
     size: string;
-    layout: FormLayout;
     formDispatch: any;
     formSelector: (selector: (state: any, setValue: any) => any) => any;
 };

package/hooks/useForm.js

@@ -3,14 +3,13 @@ exports.__esModule = true;
 var react_1 = require("react");
 var Form_1 = require("../ui/form/Form/Form");
 function useForm() {
-    var context = react_1.useContext(Form_1.FormContext);
-    return react_1.useMemo(function () { return (context
+    var context = (0, react_1.useContext)(Form_1.FormContext);
+    return (0, react_1.useMemo)(function () { return (context
         ? {
             formId: context.formId,
             model: context.model,
             prefix: context.prefix,
             size: context.size,
-            layout: context.layout,
             formDispatch: context === null || context === void 0 ? void 0 : context.dispatch,
             formSelector: function (selector) { var _a; return (_a = context === null || context === void 0 ? void 0 : context.provider) === null || _a === void 0 ? void 0 : _a.select(context.formId, selector); }
         }

package/hooks/useInitial.js

@@ -2,7 +2,7 @@
 exports.__esModule = true;
 var react_1 = require("react");
 function useInitial(creator) {
-    var initialRef = react_1.useRef(null);
+    var initialRef = (0, react_1.useRef)(null);
     if (!initialRef.current) {
         initialRef.current = creator();
     }

package/hooks/useLayout.js

@@ -38,20 +38,20 @@ exports.HTTP_STATUS_CODES = (_a = {},
 var runInitAction = function (initAction, components, dispatch) { return (initAction(null, dispatch, components)
     .then(function (result) {
     // Configure components
-    if (isObject_1["default"](result.config)) {
+    if ((0, isObject_1["default"])(result.config)) {
         Object.keys(result.config).forEach(function (name) {
             if (!components[name]) {
                 return;
             }
             Object.keys(result.config[name]).forEach(function (key) {
                 var value = result.config[name][key];
-                var setter = 'set' + upperFirst_1["default"](key);
-                if (isFunction_1["default"](components[name][setter])) {
+                var setter = 'set' + (0, upperFirst_1["default"])(key);
+                if ((0, isFunction_1["default"])(components[name][setter])) {
                     components[name][setter](value);
                 }
-                else if (isObject_1["default"](components[name][key])
-                    && isObject_1["default"](value)) {
-                    merge_1["default"](components[name][key], value);
+                else if ((0, isObject_1["default"])(components[name][key])
+                    && (0, isObject_1["default"])(value)) {
+                    (0, merge_1["default"])(components[name][key], value);
                 }
                 else {
                     components[name][key] = value;
@@ -72,53 +72,50 @@ var runInitAction = function (initAction, components, dispatch) { return (initAc
     }
     dispatch([
         // Meta models & enums
-        Boolean(resultMeta) && fields_1.setMeta(resultMeta),
+        Boolean(resultMeta) && (0, fields_1.setMeta)(resultMeta),
         // User auth
-        auth_2.setData(result),
+        (0, auth_2.setData)(result),
         // User auth
-        auth_2.setUser(resultUser),
+        (0, auth_2.setUser)(resultUser),
     ].filter(Boolean));
 })); };
 exports.runInitAction = runInitAction;
 function useLayout(initAction) {
     if (initAction === void 0) { initAction = null; }
-    var _a = useSelector_1["default"](function (state) {
-        var routesMap = router_1.getRoutesMap(state);
+    var _a = (0, useSelector_1["default"])(function (state) {
+        var routesMap = (0, router_1.getRoutesMap)(state);
         return {
-            route: router_1.getRoute(state),
-            user: auth_1.getUser(state),
-            data: auth_1.getData(state),
-            isInitialized: auth_1.isInitialized(state),
-            initializeCounter: auth_1.getInitializeCounter(state),
+            route: (0, router_1.getRoute)(state),
+            user: (0, auth_1.getUser)(state),
+            data: (0, auth_1.getData)(state),
+            isInitialized: (0, auth_1.isInitialized)(state),
+            initializeCounter: (0, auth_1.getInitializeCounter)(state),
             redirectPageId: state.auth.redirectPageId,
             loginRouteId: routesMap && Object.keys(routesMap).find(function (name) { return routesMap[name].role === Router_1.ROUTER_ROLE_LOGIN; })
         };
     }), route = _a.route, user = _a.user, data = _a.data, isInitialized = _a.isInitialized, initializeCounter = _a.initializeCounter, redirectPageId = _a.redirectPageId, loginRouteId = _a.loginRouteId;
-    var _b = react_1.useState(null), error = _b[0], setError = _b[1];
-    var dispatch = useDispatch_1["default"]();
-    var components = useComponents_1["default"]();
-    react_use_1.useMount(function () {
+    var _b = (0, react_1.useState)(null), error = _b[0], setError = _b[1];
+    var dispatch = (0, useDispatch_1["default"])();
+    var components = (0, useComponents_1["default"])();
+    (0, react_use_1.useMount)(function () {
         // Callback for load initial page data (return promise)
-        if (isFunction_1["default"](initAction)) {
-            //TODO Remove @ts-ignore
-            //@ts-ignore
-            dispatch(auth_2.init(true));
+        if ((0, isFunction_1["default"])(initAction)) {
+            dispatch((0, auth_2.init)(true));
         }
         else {
-            dispatch(auth_2.setUser(null));
+            dispatch((0, auth_2.setUser)(null));
         }
     });
-    var initializeCounterPrev = react_use_1.usePrevious(initializeCounter);
-    react_use_1.useUpdateEffect(function () {
-        if (!isFunction_1["default"](initAction) || initializeCounter <= initializeCounterPrev) {
+    var initializeCounterPrev = (0, react_use_1.usePrevious)(initializeCounter);
+    (0, react_use_1.useUpdateEffect)(function () {
+        if (!(0, isFunction_1["default"])(initAction) || initializeCounter <= initializeCounterPrev) {
             return;
         }
-        exports.runInitAction(initAction, components, dispatch)
+        //@ts-ignore
+        (0, exports.runInitAction)(initAction, components, dispatch)
             .then(function () {
             if (redirectPageId) {
-                //TODO Remove @ts-ignore
-                //@ts-ignore
-                dispatch(router_2.goToRoute(redirectPageId));
+                dispatch((0, router_2.goToRoute)(redirectPageId));
             }
         })["catch"](function (e) {
             setError(e);
@@ -141,11 +138,9 @@ function useLayout(initAction) {
         if (userRoles.length === 0) {
             userRoles.push(null); // Guest
         }
-        if (intersection_1["default"](pageRoles, userRoles).length === 0) {
+        if ((0, intersection_1["default"])(pageRoles, userRoles).length === 0) {
             if (loginRouteId && route.id !== loginRouteId) {
-                //TODO Remove @ts-ignore
-                //@ts-ignore
-                dispatch(router_2.goToRoute(loginRouteId));
+                dispatch((0, router_2.goToRoute)(loginRouteId));
             }
             else {
                 status = exports.STATUS_ACCESS_DENIED;
@@ -157,7 +152,7 @@ function useLayout(initAction) {
         }
     }
     //save status code for ssr
-    var ssrContextValue = useSsr_1["default"]();
+    var ssrContextValue = (0, useSsr_1["default"])();
     if (process.env.IS_SSR) {
         ssrContextValue.staticContext.statusCode = exports.HTTP_STATUS_CODES[status];
     }

package/hooks/useList.d.ts

@@ -7,8 +7,8 @@ import { IPaginationSizeProps } from '../ui/list/PaginationSize/PaginationSize';
 import { IEmptyProps } from '../ui/list/Empty/Empty';
 import { IFormProps } from '../ui/form/Form/Form';
 import { Model } from '../components/MetaComponent';
-export declare type ListControlPosition = 'top' | 'bottom' | 'both' | string;
-interface ISortProps {
+export type ListControlPosition = 'top' | 'bottom' | 'both' | string;
+export interface ISortConfig {
     /**
      * Включить сортировку
      * @example false
@@ -61,7 +61,7 @@ export interface IListConfig {
      * Подключение сортировки
      * @example {enable: true, defaultSort: 'startDate'}
      */
-    sort?: boolean | ISortProps;
+    sort?: boolean | ISortConfig;
     /**
      * Варианты расположения элементов коллекции
      * @example {items: [{id: 'list', label: 'List'}, {id: 'grid', label: 'Grid'}]}
@@ -203,4 +203,3 @@ export declare const createInitialValues: ({ paginationProps, paginationSizeProp
  * Выбранные фильтры синхронизируются с адресной строкой.
  */
 export default function useList(config: IListConfig): IListOutput;
-export {};