@escapenavigator/services 1.2.7 → 1.4.2

package/dist/hooks/use-api-method/index.js

@@ -8,60 +8,100 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) 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]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useApiMethod = void 0;
-const react_1 = require("react");
-const axios_1 = __importDefault(require("axios"));
-const get_service_error_1 = require("../../utils/get-service-error");
-const api_1 = require("./actions/creators/api");
-const api_2 = require("./reducers/api");
-const useApiMethod = ({ api, successCallback, errorCallback, delay, }) => {
-    const mounted = (0, react_1.useRef)(false);
-    const source = (0, react_1.useRef)(null);
-    const [state, dispatch] = (0, react_1.useReducer)(api_2.apiReducer, api_2.initialState);
-    const fetch = (0, react_1.useCallback)((params) => __awaiter(void 0, void 0, void 0, function* () {
-        source.current = axios_1.default.CancelToken.source();
-        const startTime = Date.now();
-        try {
-            dispatch((0, api_1.fetchStart)());
-            const response = yield api(params);
-            const deltaTime = Date.now() - startTime;
-            const delta = delay && deltaTime < delay ? 500 - deltaTime : 0;
-            setTimeout(() => {
-                if (successCallback)
-                    successCallback(response);
-                dispatch((0, api_1.fetchSuccess)(response));
-            }, delta);
-        }
-        catch (error) {
-            if (!mounted.current)
-                return;
-            const err = (0, get_service_error_1.getServiceError)(error);
-            if (errorCallback)
-                errorCallback(err);
-            dispatch((0, api_1.fetchFailure)(err));
-            throw error;
-        }
-    }), [api, successCallback, errorCallback, delay]);
-    (0, react_1.useEffect)(() => {
+var react_1 = require("react");
+var axios_1 = __importDefault(require("axios"));
+var get_service_error_1 = require("../../utils/get-service-error");
+var api_1 = require("./actions/creators/api");
+var api_2 = require("./reducers/api");
+var useApiMethod = function (_a) {
+    var _b;
+    var api = _a.api, successCallback = _a.successCallback, errorCallback = _a.errorCallback, delay = _a.delay;
+    var mounted = (0, react_1.useRef)(false);
+    var source = (0, react_1.useRef)(null);
+    var _c = (0, react_1.useReducer)(api_2.apiReducer, api_2.initialState), state = _c[0], dispatch = _c[1];
+    var fetch = (0, react_1.useCallback)(function (params) { return __awaiter(void 0, void 0, void 0, function () {
+        var startTime, response_1, deltaTime, delta, error_1, err;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    source.current = axios_1.default.CancelToken.source();
+                    startTime = Date.now();
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    dispatch((0, api_1.fetchStart)());
+                    return [4 /*yield*/, api(params)];
+                case 2:
+                    response_1 = _a.sent();
+                    deltaTime = Date.now() - startTime;
+                    delta = delay && deltaTime < delay ? 500 - deltaTime : 0;
+                    setTimeout(function () {
+                        if (successCallback)
+                            successCallback(response_1);
+                        dispatch((0, api_1.fetchSuccess)(response_1));
+                    }, delta);
+                    return [3 /*break*/, 4];
+                case 3:
+                    error_1 = _a.sent();
+                    if (!mounted.current)
+                        return [2 /*return*/];
+                    err = (0, get_service_error_1.getServiceError)(error_1);
+                    if (errorCallback)
+                        errorCallback(err);
+                    dispatch((0, api_1.fetchFailure)(err));
+                    throw error_1;
+                case 4: return [2 /*return*/];
+            }
+        });
+    }); }, [api, successCallback, errorCallback, delay]);
+    (0, react_1.useEffect)(function () {
         mounted.current = true;
-        return () => {
+        return function () {
             var _a;
             mounted.current = false;
             (_a = source.current) === null || _a === void 0 ? void 0 : _a.cancel();
         };
     }, [mounted]);
-    const name = api.displayName;
-    const res = {
-        [`${name}Fetch`]: fetch,
-        [`${name}Data`]: state.data,
-        [`${name}Loading`]: state.loading,
-        [`${name}Error`]: state.error,
-        [`${name}StatusOk`]: state.statusOk,
-    };
+    var name = api.displayName;
+    var res = (_b = {},
+        _b["".concat(name, "Fetch")] = fetch,
+        _b["".concat(name, "Data")] = state.data,
+        _b["".concat(name, "Loading")] = state.loading,
+        _b["".concat(name, "Error")] = state.error,
+        _b["".concat(name, "StatusOk")] = state.statusOk,
+        _b);
     return res;
 };
 exports.useApiMethod = useApiMethod;

package/dist/hooks/use-api-method/reducers/api.js

@@ -1,7 +1,18 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiReducer = exports.initialState = void 0;
-const api_1 = require("../actions/types/api");
+var api_1 = require("../actions/types/api");
 exports.initialState = {
     data: null,
     loading: false,
@@ -9,14 +20,15 @@ exports.initialState = {
     response: null,
     statusOk: null,
 };
-const apiReducer = (state = exports.initialState, action) => {
+var apiReducer = function (state, action) {
+    if (state === void 0) { state = exports.initialState; }
     switch (action.type) {
         case api_1.ActionTypes.FETCH_START:
-            return Object.assign(Object.assign({}, exports.initialState), { loading: true });
+            return __assign(__assign({}, exports.initialState), { loading: true });
         case api_1.ActionTypes.FETCH_SUCCESS:
-            return Object.assign(Object.assign({}, state), { loading: false, data: action.payload.response.data, response: action.payload.response, statusOk: true });
+            return __assign(__assign({}, state), { loading: false, data: action.payload.response.data, response: action.payload.response, statusOk: true });
         case api_1.ActionTypes.FETCH_FAILURE:
-            return Object.assign(Object.assign({}, state), { loading: false, error: action.payload.error, statusOk: false });
+            return __assign(__assign({}, state), { loading: false, error: action.payload.error, statusOk: false });
         default:
             return state;
     }

package/dist/utils/convert-to-options.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToOptions = void 0;
-const convertToOptions = (data, field) => data.map((item) => ({
+var convertToOptions = function (data, field) { return data.map(function (item) { return ({
     key: item.id,
-    content: (field && item[field]) || item.title || item.name,
-}));
+    content: (field && item[field]) || item.title || item.surname ? "".concat(item.name, " ").concat(item.surname) : item.name,
+}); }); };
 exports.convertToOptions = convertToOptions;

package/dist/utils/define-status.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineStatusForOrder = exports.defineStatusForCertificate = void 0;
-const defineStatusForCertificate = (t) => ({
+var defineStatusForCertificate = function (t) { return ({
     new: {
         view: 'accent',
         text: t('statusComponent.new'),
@@ -26,9 +26,9 @@ const defineStatusForCertificate = (t) => ({
         view: 'negative',
         text: t('statusComponent.expired'),
     },
-});
+}); };
 exports.defineStatusForCertificate = defineStatusForCertificate;
-const defineStatusForOrder = (t) => ({
+var defineStatusForOrder = function (t) { return ({
     new: {
         view: 'accent',
         text: t('statusComponent.new'),
@@ -53,5 +53,5 @@ const defineStatusForOrder = (t) => ({
         view: 'negative',
         text: t('statusComponent.failed_payment'),
     },
-});
+}); };
 exports.defineStatusForOrder = defineStatusForOrder;

package/dist/utils/enum-to-options.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enumToOptions = void 0;
-const enumToOptions = (options, t, modelName) => Object.values(options).map((option) => ({
+var enumToOptions = function (options, t, modelName) { return Object.values(options).map(function (option) { return ({
     key: option,
-    content: t(`options.${modelName}.${option}`),
-}));
+    content: t("options.".concat(modelName, ".").concat(option)),
+}); }); };
 exports.enumToOptions = enumToOptions;

package/dist/utils/get-handled-error-message.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHandledErrorMessage = void 0;
-const getHandledErrorMessage = (error) => (error.response ? error.response.data.message : error.message);
+var getHandledErrorMessage = function (error) { return (error.response ? error.response.data.message : error.message); };
 exports.getHandledErrorMessage = getHandledErrorMessage;

package/dist/utils/get-many.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMany = void 0;
-function getMany(ids, records, field = 'title') {
+function getMany(ids, records, field) {
+    if (field === void 0) { field = 'title'; }
     if (!Array.isArray(ids) || !Array.isArray(records))
         return null;
-    const filtred = records.filter((r) => ids.includes(r.id));
+    var filtred = records.filter(function (r) { return ids.includes(r.id); });
     if (!filtred.length)
         return null;
-    return filtred.map((r) => r[field] || r.title);
+    return filtred.map(function (r) { return r[field] || r.title; });
 }
 exports.getMany = getMany;

package/dist/utils/get-one.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOne = void 0;
-function getOne(id, records, field = 'title') {
+function getOne(id, records, field) {
+    if (field === void 0) { field = 'title'; }
     if (!id || !Array.isArray(records))
         return null;
-    const [record] = records.filter((r) => r.id === id);
+    var record = records.filter(function (r) { return r.id === id; })[0];
     if (!record)
         return null;
     return record[field] || record.title;

package/dist/utils/get-service-error.js

@@ -1,23 +1,24 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceError = exports.ErrorType = void 0;
-const is_axios_error_1 = require("./is-axios-error");
-const is_network_error_1 = require("./is-network-error");
+var is_axios_error_1 = require("./is-axios-error");
+var is_network_error_1 = require("./is-network-error");
 var ErrorType;
 (function (ErrorType) {
     ErrorType["NETWORK"] = "NETWORK";
     ErrorType["BUSINESS"] = "BUSINESS";
     ErrorType["INTERNAL"] = "INTERNAL";
 })(ErrorType = exports.ErrorType || (exports.ErrorType = {}));
-const ERROR_CODES = {
-    [ErrorType.INTERNAL]: 'INTERNAL_ERROR',
-    [ErrorType.NETWORK]: 'NETWORK_ERROR',
-};
-const ERROR_MESSAGES = {
-    [ErrorType.INTERNAL]: 'Пожалуйста, попробуйте ещё раз позже.',
-    [ErrorType.NETWORK]: 'Проверьте подключение и попробуйте ещё раз позже.',
-};
-const INTERNAL_SERVICE_ERROR_CODES = [
+var ERROR_CODES = (_a = {},
+    _a[ErrorType.INTERNAL] = 'INTERNAL_ERROR',
+    _a[ErrorType.NETWORK] = 'NETWORK_ERROR',
+    _a);
+var ERROR_MESSAGES = (_b = {},
+    _b[ErrorType.INTERNAL] = 'Пожалуйста, попробуйте ещё раз позже.',
+    _b[ErrorType.NETWORK] = 'Проверьте подключение и попробуйте ещё раз позже.',
+    _b);
+var INTERNAL_SERVICE_ERROR_CODES = [
     'BAD_REQUEST',
     'INTERNAL_SERVER_ERROR',
     'INTERNAL_ERROR',
@@ -38,9 +39,9 @@ function getServiceError(error) {
         };
     }
     if ((0, is_axios_error_1.isAxiosError)(error)) {
-        const { errorCode, originalErrorCode, message } = error.response.data;
-        let code = errorCode;
-        let errorType = ErrorType.BUSINESS;
+        var _a = error.response.data, errorCode = _a.errorCode, originalErrorCode = _a.originalErrorCode, message = _a.message;
+        var code = errorCode;
+        var errorType = ErrorType.BUSINESS;
         if (INTERNAL_SERVICE_ERROR_CODES.includes(code)) {
             if (typeof originalErrorCode === 'undefined') {
                 errorType = ErrorType.INTERNAL;
@@ -50,9 +51,9 @@ function getServiceError(error) {
             }
         }
         return {
-            code,
-            message,
-            errorType,
+            code: code,
+            message: message,
+            errorType: errorType,
             originalError: error,
         };
     }

package/dist/utils/is-network-error.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNetworkError = void 0;
-const is_axios_error_1 = require("./is-axios-error");
-const NETWORK_ERROR_CODES = ['ENETUNREACH', 'ECONNABORTED', 'ENOTCONN'];
+var is_axios_error_1 = require("./is-axios-error");
+var NETWORK_ERROR_CODES = ['ENETUNREACH', 'ECONNABORTED', 'ENOTCONN'];
 /**
  * Возвращает `true`, если ошибка возникла из-за проблем с интернетом
  * @param error Ошибка от сервиса
  */
 function isNetworkError(error) {
     if ((0, is_axios_error_1.isAxiosError)(error)) {
-        const { response, code, message } = error;
+        var response = error.response, code = error.code, message = error.message;
         return (typeof response === 'undefined' &&
             (NETWORK_ERROR_CODES.includes(code) || message === 'Network Error'));
     }

package/dist/utils/redirect.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.redirect = void 0;
-const redirect = (url) => {
+var redirect = function (url) {
     window.location.assign(url);
 };
 exports.redirect = redirect;

package/dist/utils/serialize-record.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeRecord = void 0;
-const class_transformer_1 = require("class-transformer");
+var class_transformer_1 = require("class-transformer");
 // export const serializeRecord = <T extends ClassConstructor<unknown>>(Dto: T, data): T =>
 //     plainToClass(Dto, data, { strategy: 'excludeAll' }) as unknown as T;
-const serializeRecord = (Dto, data) => (0, class_transformer_1.plainToClass)(Dto, data, { strategy: 'excludeAll' });
+var serializeRecord = function (Dto, data) {
+    return (0, class_transformer_1.plainToClass)(Dto, data, { strategy: 'excludeAll' });
+};
 exports.serializeRecord = serializeRecord;

package/dist/utils/validate-by-dto.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateByDto = void 0;
-const class_validator_1 = require("class-validator");
+var class_validator_1 = require("class-validator");
 function validateByDto(t) {
-    const validate = (data) => {
-        const errors = (0, class_validator_1.validateSync)(typeof data === 'object' ? data : {});
-        return Object.fromEntries(errors.map(({ property, constraints }) => {
-            const err = (constraints === null || constraints === void 0 ? void 0 : constraints.IsNotEmpty) || Object.values(constraints)[0];
-            const errorText = err.substr(err.indexOf(' ') + 1);
-            return [property, `${t(`validationErrors.${errorText}`)}`];
+    var validate = function (data) {
+        var errors = (0, class_validator_1.validateSync)(typeof data === 'object' ? data : {});
+        return Object.fromEntries(errors.map(function (_a) {
+            var property = _a.property, constraints = _a.constraints;
+            var err = (constraints === null || constraints === void 0 ? void 0 : constraints.IsNotEmpty) || Object.values(constraints)[0];
+            var errorText = err.substr(err.indexOf(' ') + 1);
+            return [property, "".concat(t("validationErrors.".concat(errorText)))];
         }));
     };
     return validate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/services",
-  "version": "1.2.7",
+  "version": "1.4.2",
   "publishConfig": {
     "access": "public"
   },
@@ -10,11 +10,11 @@
     "dist"
   ],
   "scripts": {
-    "build": "rm -rf dist && tsc --project tsconfig.build.json"
+    "build": "rm -rf dist && tsc --project tsconfig.json"
   },
-  "gitHead": "f78cf6f1bbe5c6d9d51c42376c88eb38699c64a3",
+  "gitHead": "5f91449a5bddf892253dafeba5751354a0e7aff3",
   "dependencies": {
-    "@escapenavigator/types": "^1.2.5",
+    "@escapenavigator/types": "^1.4.2",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.1",

package/dist/api/cities-api/get-cities-by-country.d.ts

@@ -1,7 +0,0 @@
-import { CountriesEnum } from '@escapenavigator/types/dist/shared/enum/countries.enum';
-import { CityResponseObject } from '@escapenavigator/types/dist/city/city.ro';
-import { ApiMethodDeclaration } from '..';
-declare type ParamsData = CountriesEnum;
-declare type ResponseData = CityResponseObject[];
-export declare const getCitiesByCountry: ApiMethodDeclaration<ParamsData, ResponseData>;
-export {};

package/dist/api/cities-api/get-cities-by-country.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCitiesByCountry = void 0;
-const getCitiesByCountry = (country) => ({
-    url: '/cities/country/' + country,
-    method: 'GET'
-});
-exports.getCitiesByCountry = getCitiesByCountry;

package/dist/api/cities-api/get-city-by-ip.d.ts

@@ -1,6 +0,0 @@
-import { CityResponseObject } from '@escapenavigator/types/dist/city/city.ro';
-import { ApiMethodDeclaration } from '..';
-declare type ParamsData = string;
-declare type ResponseData = CityResponseObject;
-export declare const getCityByIp: ApiMethodDeclaration<ParamsData, ResponseData>;
-export {};

package/dist/api/cities-api/get-city-by-ip.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCityByIp = void 0;
-const getCityByIp = (ip) => ({
-    url: '/cities/current/' + ip,
-    method: 'GET'
-});
-exports.getCityByIp = getCityByIp;

package/dist/api/cities-api/get-city-by-slug.d.ts

@@ -1,6 +0,0 @@
-import { CityResponseObject } from '@escapenavigator/types/dist/city/city.ro';
-import { ApiMethodDeclaration } from '..';
-declare type ParamsData = string;
-declare type ResponseData = CityResponseObject;
-export declare const getCityBySlug: ApiMethodDeclaration<ParamsData, ResponseData>;
-export {};

package/dist/api/cities-api/get-city-by-slug.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCityBySlug = void 0;
-const getCityBySlug = (slug) => ({
-    url: '/cities/slug/' + slug,
-    method: 'GET'
-});
-exports.getCityBySlug = getCityBySlug;

package/dist/api/cities-api/get-popular-cities-near.d.ts

@@ -1,6 +0,0 @@
-import { CityResponseObject } from '@escapenavigator/types/dist/city/city.ro';
-import { ApiMethodDeclaration } from '..';
-declare type ParamsData = string;
-declare type ResponseData = CityResponseObject[];
-export declare const getPopularCitiesNear: ApiMethodDeclaration<ParamsData, ResponseData>;
-export {};

package/dist/api/cities-api/get-popular-cities-near.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPopularCitiesNear = void 0;
-const getPopularCitiesNear = (slug) => ({
-    url: '/cities/near/' + slug,
-    method: 'GET'
-});
-exports.getPopularCitiesNear = getPopularCitiesNear;