dev-classes 1.4.18 → 1.4.22

package/README.md

@@ -92,6 +92,7 @@ interface DateProcessingProps{
   hasDateLessPeriods(a:string, b: string, c:string, d?:{dateMinMax: '<=' | '>=' | '<' | '>'}):Record<'one' | 'two', boolean>
   getDi(a:string, b: string):number
   getDifferenceDates(a:string, b: string):number
+  calculateTimeDifference(a:string, b: string):Record<'days' | 'hours' | 'minutes' | 'seconds' | 'totalSeconds', number> & Record<'formatted' | 'formattedShort', string>
   hasDateLessInNumber(a:string, b: string, c:number):boolean
   correctionCurrentYear(a:[string], b?:number):string[]
   getChunkFromDate(a:string, b:'day' | 'month' | 'year', c?:{isBeforeZero:boolean}):string

package/dist/classes/DateProcessing/DateProcessing.d.ts

@@ -1,38 +1,49 @@
 import { DateProcessingProps } from './DateProcessing.types';
 export declare class DateProcessing {
-    static getActiveColorClassInDiffDate: DateProcessingProps['getActiveColorClassInDiffDate'];
-    static getClassByDifferenceDay: DateProcessingProps['getClassByDifferenceDay'];
-    static getMinMaxDate: DateProcessingProps['getMinMaxDate'];
-    static splitDateFromTime: DateProcessingProps['splitDateFromTime'];
-    static getCorrectDateAndTime: DateProcessingProps['getCorrectDateAndTime'];
-    static reverseDate: DateProcessingProps['reverseDate'];
-    static correctionDataISO8601: DateProcessingProps['correctionDataISO8601'];
-    static isDateDMY: DateProcessingProps['isDateDMY'];
+    static getActiveColorClassInDiffDate: DateProcessingProps["getActiveColorClassInDiffDate"];
+    static getClassByDifferenceDay: DateProcessingProps["getClassByDifferenceDay"];
+    static getMinMaxDate: DateProcessingProps["getMinMaxDate"];
+    static splitDateFromTime: DateProcessingProps["splitDateFromTime"];
+    static getCorrectDateAndTime: DateProcessingProps["getCorrectDateAndTime"];
+    static reverseDate: DateProcessingProps["reverseDate"];
+    static correctionDataISO8601: DateProcessingProps["correctionDataISO8601"];
+    static isDateDMY: DateProcessingProps["isDateDMY"];
     static isDateISO8601: (date: string) => boolean;
-    static correctionDateAndRemoveYear: DateProcessingProps['correctionDateAndRemoveYear'];
-    static correctionDateWithOutCurrentYear: DateProcessingProps['correctionDateWithOutCurrentYear'];
-    static correctionShortYear: DateProcessingProps['correctionShortYear'];
-    static correctionDate: DateProcessingProps['correctionDate'];
-    static hasDateLessPeriod: DateProcessingProps['hasDateLessPeriod'];
-    static hasDateLessPeriods: DateProcessingProps['hasDateLessPeriods'];
-    static getDifferenceDates: DateProcessingProps['getDifferenceDates'];
-    static hasDateLessInNumber: DateProcessingProps['hasDateLessInNumber'];
-    static correctionCurrentYear: DateProcessingProps['correctionCurrentYear'];
-    static getChunkFromDate: DateProcessingProps['getChunkFromDate'];
-    static getNameMonthByNumber: DateProcessingProps['getNameMonthByNumber'];
-    static minMaxMountStr: DateProcessingProps['minMaxMountStr'];
-    static getDatesToCurrentDate: DateProcessingProps['getDatesToCurrentDate'];
-    static getDayOfWeek: DateProcessingProps['getDayOfWeek'];
-    static cropSecond: DateProcessingProps['cropSecond'];
-    static getRenderDate: DateProcessingProps['getRenderDate'];
-    static getCurrentDate: DateProcessingProps['getCurrentDate'];
-    static getCurrentYear: DateProcessingProps['getCurrentYear'];
-    static getDaysInMonth: DateProcessingProps['getDaysInMonth'];
+    static correctionDateAndRemoveYear: DateProcessingProps["correctionDateAndRemoveYear"];
+    static correctionDateWithOutCurrentYear: DateProcessingProps["correctionDateWithOutCurrentYear"];
+    static correctionShortYear: DateProcessingProps["correctionShortYear"];
+    static correctionDate: DateProcessingProps["correctionDate"];
+    static hasDateLessPeriod: DateProcessingProps["hasDateLessPeriod"];
+    static hasDateLessPeriods: DateProcessingProps["hasDateLessPeriods"];
+    static getDifferenceDates: DateProcessingProps["getDifferenceDates"];
+    /**
+    * @param {string} startISODateTime - Начальная дата и время в ISO формате или формате 'YYYY-MM-DD HH:mm:ss'
+    *                                     Пример: '2024-01-15T11:20:00' или '2024-01-15 11:20:00'
+    * @param {string} endISODateTime   - Конечная дата и время в ISO формате или формате 'YYYY-MM-DD HH:mm:ss'
+    *                                     Пример: '2024-02-16T11:27:36' или '2024-02-16 11:27:36'
+    * @returns {TimeDifferenceResult} Объект с результатами
+    * @example
+    * // Разница в 32 дня, 0 часов, 7 минут, 36 секунд
+    * getTimeDifference('2024-01-15T11:20:00', '2024-02-16T11:27:36');
+    */
+    static calculateTimeDifference: DateProcessingProps["calculateTimeDifference"];
+    static hasDateLessInNumber: DateProcessingProps["hasDateLessInNumber"];
+    static correctionCurrentYear: DateProcessingProps["correctionCurrentYear"];
+    static getChunkFromDate: DateProcessingProps["getChunkFromDate"];
+    static getNameMonthByNumber: DateProcessingProps["getNameMonthByNumber"];
+    static minMaxMountStr: DateProcessingProps["minMaxMountStr"];
+    static getDatesToCurrentDate: DateProcessingProps["getDatesToCurrentDate"];
+    static getDayOfWeek: DateProcessingProps["getDayOfWeek"];
+    static cropSecond: DateProcessingProps["cropSecond"];
+    static getRenderDate: DateProcessingProps["getRenderDate"];
+    static getCurrentDate: DateProcessingProps["getCurrentDate"];
+    static getCurrentYear: DateProcessingProps["getCurrentYear"];
+    static getDaysInMonth: DateProcessingProps["getDaysInMonth"];
     /**
      *
      * @param date example: '2022-01-01'
      * @param config example: {day: 1, month: 1, year: 1}
      * @returns example: '2023-02-02'
      */
-    static getDateDeviation: DateProcessingProps['getDateDeviation'];
+    static getDateDeviation: DateProcessingProps["getDateDeviation"];
 }

package/dist/classes/DateProcessing/DateProcessing.types.d.ts

@@ -28,6 +28,7 @@ export interface DateProcessingProps {
     }): Record<'one' | 'two', boolean>;
     getDi(a: string, b: string): number;
     getDifferenceDates(a: string, b: string): number;
+    calculateTimeDifference(a: string, b: string): Record<'days' | 'hours' | 'minutes' | 'seconds' | 'totalSeconds', number> & Record<'formatted' | 'formattedShort', string>;
     hasDateLessInNumber(a: string, b: string, c: number): boolean;
     correctionCurrentYear(a: [string], b?: number): string[];
     getChunkFromDate(a: string, b: 'day' | 'month' | 'year', c?: {

package/dist/index.js

@@ -39,28 +39,28 @@ c(p, "hsvToRgb", (e, t, s) => {
 c(p, "rgbaToHsla", (e, t, s, n = 1) => {
   e /= 255, t /= 255, s /= 255;
   const o = Math.max(e, t, s), i = Math.min(e, t, s);
-  let a = 0, f;
+  let a = 0, u;
   const l = (o + i) / 2;
   if (o === i)
-    a = f = 0;
+    a = u = 0;
   else {
-    const u = o - i;
-    switch (f = l > 0.5 ? u / (2 - o - i) : u / (o + i), o) {
+    const f = o - i;
+    switch (u = l > 0.5 ? f / (2 - o - i) : f / (o + i), o) {
       case e:
-        a = (t - s) / u + (t < s ? 6 : 0);
+        a = (t - s) / f + (t < s ? 6 : 0);
         break;
       case t:
-        a = (s - e) / u + 2;
+        a = (s - e) / f + 2;
         break;
       case s:
-        a = (e - t) / u + 4;
+        a = (e - t) / f + 4;
         break;
     }
     a /= 6;
   }
   return {
     h: a * 360,
-    s: f * 100,
+    s: u * 100,
     l: l * 100,
     a: n
   };
@@ -80,12 +80,12 @@ c(p, "hslaToRgba", (e, t, s, n) => {
   if (t === 0)
     o = i = a = s;
   else {
-    const f = function(y, w, d) {
+    const u = function(y, w, d) {
       return d < 0 && (d += 1), d > 1 && (d -= 1), d < 0.16666666666666666 ? y + (w - y) * 6 * d : d < 0.5 ? w : d < 0.6666666666666666 ? y + (w - y) * (0.6666666666666666 - d) * 6 : y;
-    }, l = s < 0.5 ? s * (1 + t) : s + t - s * t, u = 2 * s - l;
-    o = f(u, l, e + 1 / 3), i = f(u, l, e), a = f(u, l, e - 1 / 3);
+    }, l = s < 0.5 ? s * (1 + t) : s + t - s * t, f = 2 * s - l;
+    o = u(f, l, e + 1 / 3), i = u(f, l, e), a = u(f, l, e - 1 / 3);
   }
-  return [o, i, a, n].map((f) => Math.round(f * 255));
+  return [o, i, a, n].map((u) => Math.round(u * 255));
 }), c(p, "hslaStringToRgba", (e) => {
   const t = e.slice(5, -1).split(", "), s = Number(t.pop()), n = t.map((o) => o.endsWith("%") ? +o.slice(0, -1) : +o);
   return p.hslaToRgba(n[0], n[1], n[2], s);
@@ -131,13 +131,13 @@ c(p, "mixColors", (e, t, s) => {
     return s;
   const a = e[1] ? Math.min(1.5 * o[1] / e[1], 1) : 0;
   o[0] = Math.min(360, o[0] + t[0] - e[0]), o[1] = e[1] ? Math.min(1, o[1] * t[1] / e[1]) : 0, o[2] = e[2] ? Math.min(1, o[2] * (1 - a + a * t[2] / e[2])) : 0;
-  let f = p.hsvToRgb(...o);
-  const l = p.calculateBrightness(s), u = p.calculateBrightness(f);
-  if (n ? l > u : l < u) {
-    const w = 0.4 * l / u + 0.6;
-    f = p.changeBrightness(f, w);
+  let u = p.hsvToRgb(...o);
+  const l = p.calculateBrightness(s), f = p.calculateBrightness(u);
+  if (n ? l > f : l < f) {
+    const w = 0.4 * l / f + 0.6;
+    u = p.changeBrightness(u, w);
   }
-  return f;
+  return u;
 }), c(p, "changeBrightness", (e, t) => e.map((s) => p.clamp(Math.round(s * t), 0, 255))), c(p, "hexBrightness", (e, t) => {
   const s = p.hexToRgb(e), n = p.changeBrightness(s, t), [o, i, a] = n;
   return p.rgbToHex(o, i, a);
@@ -231,6 +231,27 @@ c(_DateProcessing, "getActiveColorClassInDiffDate", (r, e, t) => {
 })), c(_DateProcessing, "getDifferenceDates", (r, e) => {
   const t = new Date(_DateProcessing.correctionDataISO8601(r)), s = new Date(_DateProcessing.correctionDataISO8601(e)), n = 1e3 * 60 * 60 * 24, o = s.getTime() - t.getTime();
   return Math.round(o / n);
+}), /**
+* @param {string} startISODateTime - Начальная дата и время в ISO формате или формате 'YYYY-MM-DD HH:mm:ss'
+*                                     Пример: '2024-01-15T11:20:00' или '2024-01-15 11:20:00'
+* @param {string} endISODateTime   - Конечная дата и время в ISO формате или формате 'YYYY-MM-DD HH:mm:ss'
+*                                     Пример: '2024-02-16T11:27:36' или '2024-02-16 11:27:36'
+* @returns {TimeDifferenceResult} Объект с результатами
+* @example
+* // Разница в 32 дня, 0 часов, 7 минут, 36 секунд
+* getTimeDifference('2024-01-15T11:20:00', '2024-02-16T11:27:36');
+*/
+c(_DateProcessing, "calculateTimeDifference", (r, e) => {
+  const t = new Date(r), n = new Date(e) - t, o = Math.floor(n / 1e3), i = Math.floor(o / (3600 * 24)), a = Math.floor(o % (3600 * 24) / 3600), u = Math.floor(o % 3600 / 60), l = o % 60;
+  return {
+    totalSeconds: o,
+    formatted: `${i} дней ${a.toString().padStart(2, "0")}:${u.toString().padStart(2, "0")}:${l.toString().padStart(2, "0")}`,
+    formattedShort: `${a.toString().padStart(2, "0")}:${u.toString().padStart(2, "0")}:${l.toString().padStart(2, "0")}`,
+    days: i,
+    hours: a,
+    minutes: u,
+    seconds: l
+  };
 }), c(_DateProcessing, "hasDateLessInNumber", (r, e, t) => {
   const s = _DateProcessing.getDifferenceDates(r, e);
   return t <= s;
@@ -249,11 +270,7 @@ c(_DateProcessing, "getActiveColorClassInDiffDate", (r, e, t) => {
       return s[0];
   }
 }), c(_DateProcessing, "getNameMonthByNumber", (r) => r > 0 && r < 13 ? itemsMonths[Number(r) - 1] : itemsMonths[0]), c(_DateProcessing, "minMaxMountStr", (r) => ({
-  minMaxMonth: _DateProcessing.getNameMonthByNumber(
-    Number(_DateProcessing.getChunkFromDate(r.minDate, "month", { isBeforeZero: !1 }))
-  ) + " - " + _DateProcessing.getNameMonthByNumber(
-    Number(_DateProcessing.getChunkFromDate(r.maxDate, "month", { isBeforeZero: !1 }))
-  )
+  minMaxMonth: _DateProcessing.getNameMonthByNumber(Number(_DateProcessing.getChunkFromDate(r.minDate, "month", { isBeforeZero: !1 }))) + " - " + _DateProcessing.getNameMonthByNumber(Number(_DateProcessing.getChunkFromDate(r.maxDate, "month", { isBeforeZero: !1 })))
 })), c(_DateProcessing, "getDatesToCurrentDate", (r) => r.filter((e) => _DateProcessing.hasDateLessPeriod(e, _DateProcessing.getCurrentDate()))), c(_DateProcessing, "getDayOfWeek", (r) => {
   let e = _DateProcessing.correctionDataISO8601(r);
   const t = new Date(e).getDay();
@@ -274,7 +291,7 @@ c(_DateProcessing, "getActiveColorClassInDiffDate", (r, e, t) => {
   const r = /* @__PURE__ */ new Date(), e = _DateProcessing.getCurrentYear(), t = r.toJSON().split("T")[0].slice(5);
   return `${e}-${t}`;
 }), c(_DateProcessing, "getCurrentYear", () => (/* @__PURE__ */ new Date()).getFullYear()), c(_DateProcessing, "getDaysInMonth", (r, e) => new Date(e, r, 0).getDate()), /**
- * 
+ *
  * @param date example: '2022-01-01'
  * @param config example: {day: 1, month: 1, year: 1}
  * @returns example: '2023-02-02'
@@ -295,14 +312,14 @@ class DelaysPromise {
       }, n = (h) => {
         t != null && t.controlAction && (t == null || t.controlAction(h));
       };
-      let o = !0, i, a, f;
+      let o = !0, i, a, u;
       const l = (h = !0) => {
         const y = "Ручное завершение startActionEvery";
-        o = !1, clearInterval(i), s(null), h ? a && a({ status: h, msg: y + ": (true)" }) : f && f({ status: h, msg: y + ": (false)" });
+        o = !1, clearInterval(i), s(null), h ? a && a({ status: h, msg: y + ": (true)" }) : u && u({ status: h, msg: y + ": (false)" });
       };
       return {
         promise: new Promise((h, y) => {
-          a = h, f = y;
+          a = h, u = y;
           let w = 0, d = 0;
           i = setInterval(
             () => {
@@ -337,7 +354,7 @@ class DelaysPromise {
       }).catch((l) => {
         i === 1 && (i = 0, a.msg = l, o(l));
       });
-      let f = setInterval(() => {
+      let u = setInterval(() => {
         if (i === 1) {
           if (i = 0, typeof t == "function") {
             o({ status: !1, msg: "", ...t(a) });
@@ -345,7 +362,7 @@ class DelaysPromise {
           }
           o({ status: !1, msg: "oneOfPromise reject" });
         }
-        clearInterval(f);
+        clearInterval(u);
       }, s * 1e3);
     }));
   }
@@ -548,8 +565,8 @@ const toJSONObject = (r) => {
         e[n] = s;
         const o = isArray(s) ? [] : {};
         return forEach(s, (i, a) => {
-          const f = t(i, n + 1);
-          !isUndefined(f) && (o[a] = f);
+          const u = t(i, n + 1);
+          !isUndefined(u) && (o[a] = u);
         }), e[n] = void 0, o;
       }
     }
@@ -669,8 +686,8 @@ Object.defineProperties(AxiosError, descriptors);
 Object.defineProperty(prototype$1, "isAxiosError", { value: !0 });
 AxiosError.from = (r, e, t, s, n, o) => {
   const i = Object.create(prototype$1);
-  return utils$1.toFlatObject(r, i, function(f) {
-    return f !== Error.prototype;
+  return utils$1.toFlatObject(r, i, function(u) {
+    return u !== Error.prototype;
   }, (a) => a !== "isAxiosError"), AxiosError.call(i, r.message, e, t, s, n), i.cause = r, i.name = r.name, o && Object.assign(i, o), i;
 };
 const httpAdapter = null;
@@ -701,7 +718,7 @@ function toFormData(r, e, t) {
   }, !1, function(g, m) {
     return !utils$1.isUndefined(m[g]);
   });
-  const s = t.metaTokens, n = t.visitor || u, o = t.dots, i = t.indexes, f = (t.Blob || typeof Blob < "u" && Blob) && utils$1.isSpecCompliantForm(e);
+  const s = t.metaTokens, n = t.visitor || f, o = t.dots, i = t.indexes, u = (t.Blob || typeof Blob < "u" && Blob) && utils$1.isSpecCompliantForm(e);
   if (!utils$1.isFunction(n))
     throw new TypeError("visitor must be a function");
   function l(d) {
@@ -709,11 +726,11 @@ function toFormData(r, e, t) {
       return "";
     if (utils$1.isDate(d))
       return d.toISOString();
-    if (!f && utils$1.isBlob(d))
+    if (!u && utils$1.isBlob(d))
       throw new AxiosError("Blob is not supported. Use a Buffer instead.");
-    return utils$1.isArrayBuffer(d) || utils$1.isTypedArray(d) ? f && typeof Blob == "function" ? new Blob([d]) : Buffer.from(d) : d;
+    return utils$1.isArrayBuffer(d) || utils$1.isTypedArray(d) ? u && typeof Blob == "function" ? new Blob([d]) : Buffer.from(d) : d;
   }
-  function u(d, g, m) {
+  function f(d, g, m) {
     let D = d;
     if (d && !m && typeof d == "object") {
       if (utils$1.endsWith(g, "{}"))
@@ -730,7 +747,7 @@ function toFormData(r, e, t) {
     return isVisitable(d) ? !0 : (e.append(renderKey(m, g, o), l(d)), !1);
   }
   const h = [], y = Object.assign(predicates, {
-    defaultVisitor: u,
+    defaultVisitor: f,
     convertValue: l,
     isVisitable
   });
@@ -898,8 +915,8 @@ function formDataToJSON(r) {
     let i = t[o++];
     if (i === "__proto__")
       return !0;
-    const a = Number.isFinite(+i), f = o >= t.length;
-    return i = !i && utils$1.isArray(n) ? n.length : i, f ? (utils$1.hasOwnProp(n, i) ? n[i] = [n[i], s] : n[i] = s, !a) : ((!n[i] || !utils$1.isObject(n[i])) && (n[i] = []), e(t, s, n[i], o) && utils$1.isArray(n[i]) && (n[i] = arrayToObject(n[i])), !a);
+    const a = Number.isFinite(+i), u = o >= t.length;
+    return i = !i && utils$1.isArray(n) ? n.length : i, u ? (utils$1.hasOwnProp(n, i) ? n[i] = [n[i], s] : n[i] = s, !a) : ((!n[i] || !utils$1.isObject(n[i])) && (n[i] = []), e(t, s, n[i], o) && utils$1.isArray(n[i]) && (n[i] = arrayToObject(n[i])), !a);
   }
   if (utils$1.isFormData(r) && utils$1.isFunction(r.entries)) {
     const t = {};
@@ -937,10 +954,10 @@ const defaults = {
       if (s.indexOf("application/x-www-form-urlencoded") > -1)
         return toURLEncodedForm(e, this.formSerializer).toString();
       if ((a = utils$1.isFileList(e)) || s.indexOf("multipart/form-data") > -1) {
-        const f = this.env && this.env.FormData;
+        const u = this.env && this.env.FormData;
         return toFormData(
           a ? { "files[]": e } : e,
-          f && new f(),
+          u && new u(),
           this.formSerializer
         );
       }
@@ -1058,21 +1075,21 @@ class AxiosHeaders {
   }
   set(e, t, s) {
     const n = this;
-    function o(a, f, l) {
-      const u = normalizeHeader(f);
-      if (!u)
+    function o(a, u, l) {
+      const f = normalizeHeader(u);
+      if (!f)
         throw new Error("header name must be a non-empty string");
-      const h = utils$1.findKey(n, u);
-      (!h || n[h] === void 0 || l === !0 || l === void 0 && n[h] !== !1) && (n[h || f] = normalizeValue(a));
+      const h = utils$1.findKey(n, f);
+      (!h || n[h] === void 0 || l === !0 || l === void 0 && n[h] !== !1) && (n[h || u] = normalizeValue(a));
     }
-    const i = (a, f) => utils$1.forEach(a, (l, u) => o(l, u, f));
+    const i = (a, u) => utils$1.forEach(a, (l, f) => o(l, f, u));
     if (utils$1.isPlainObject(e) || e instanceof this.constructor)
       i(e, t);
     else if (utils$1.isString(e) && (e = e.trim()) && !isValidHeaderName(e))
       i(parseHeaders(e), t);
     else if (utils$1.isHeaders(e))
-      for (const [a, f] of e.entries())
-        o(f, a, s);
+      for (const [a, u] of e.entries())
+        o(u, a, s);
     else
       e != null && o(t, e, s);
     return this;
@@ -1216,26 +1233,26 @@ function speedometer(r, e) {
   r = r || 10;
   const t = new Array(r), s = new Array(r);
   let n = 0, o = 0, i;
-  return e = e !== void 0 ? e : 1e3, function(f) {
-    const l = Date.now(), u = s[o];
-    i || (i = l), t[n] = f, s[n] = l;
+  return e = e !== void 0 ? e : 1e3, function(u) {
+    const l = Date.now(), f = s[o];
+    i || (i = l), t[n] = u, s[n] = l;
     let h = o, y = 0;
     for (; h !== n; )
       y += t[h++], h = h % r;
     if (n = (n + 1) % r, n === o && (o = (o + 1) % r), l - i < e)
       return;
-    const w = u && l - u;
+    const w = f && l - f;
     return w ? Math.round(y * 1e3 / w) : void 0;
   };
 }
 function throttle(r, e) {
   let t = 0, s = 1e3 / e, n, o;
-  const i = (l, u = Date.now()) => {
-    t = u, n = null, o && (clearTimeout(o), o = null), r.apply(null, l);
+  const i = (l, f = Date.now()) => {
+    t = f, n = null, o && (clearTimeout(o), o = null), r.apply(null, l);
   };
   return [(...l) => {
-    const u = Date.now(), h = u - t;
-    h >= s ? i(l, u) : (n = l, o || (o = setTimeout(() => {
+    const f = Date.now(), h = f - t;
+    h >= s ? i(l, f) : (n = l, o || (o = setTimeout(() => {
       o = null, i(n);
     }, s - h)));
   }, () => n && i(n)];
@@ -1244,15 +1261,15 @@ const progressEventReducer = (r, e, t = 3) => {
   let s = 0;
   const n = speedometer(50, 250);
   return throttle((o) => {
-    const i = o.loaded, a = o.lengthComputable ? o.total : void 0, f = i - s, l = n(f), u = i <= a;
+    const i = o.loaded, a = o.lengthComputable ? o.total : void 0, u = i - s, l = n(u), f = i <= a;
     s = i;
     const h = {
       loaded: i,
       total: a,
       progress: a ? i / a : void 0,
-      bytes: f,
+      bytes: u,
       rate: l || void 0,
-      estimated: l && a && u ? (a - i) / l : void 0,
+      estimated: l && a && f ? (a - i) / l : void 0,
       event: o,
       lengthComputable: a != null,
       [e ? "download" : "upload"]: !0
@@ -1337,34 +1354,34 @@ const headersToObject = (r) => r instanceof AxiosHeaders$1 ? { ...r } : r;
 function mergeConfig(r, e) {
   e = e || {};
   const t = {};
-  function s(l, u, h) {
-    return utils$1.isPlainObject(l) && utils$1.isPlainObject(u) ? utils$1.merge.call({ caseless: h }, l, u) : utils$1.isPlainObject(u) ? utils$1.merge({}, u) : utils$1.isArray(u) ? u.slice() : u;
+  function s(l, f, h) {
+    return utils$1.isPlainObject(l) && utils$1.isPlainObject(f) ? utils$1.merge.call({ caseless: h }, l, f) : utils$1.isPlainObject(f) ? utils$1.merge({}, f) : utils$1.isArray(f) ? f.slice() : f;
   }
-  function n(l, u, h) {
-    if (utils$1.isUndefined(u)) {
+  function n(l, f, h) {
+    if (utils$1.isUndefined(f)) {
       if (!utils$1.isUndefined(l))
         return s(void 0, l, h);
     } else
-      return s(l, u, h);
+      return s(l, f, h);
   }
-  function o(l, u) {
-    if (!utils$1.isUndefined(u))
-      return s(void 0, u);
+  function o(l, f) {
+    if (!utils$1.isUndefined(f))
+      return s(void 0, f);
   }
-  function i(l, u) {
-    if (utils$1.isUndefined(u)) {
+  function i(l, f) {
+    if (utils$1.isUndefined(f)) {
       if (!utils$1.isUndefined(l))
         return s(void 0, l);
     } else
-      return s(void 0, u);
+      return s(void 0, f);
   }
-  function a(l, u, h) {
+  function a(l, f, h) {
     if (h in e)
-      return s(l, u);
+      return s(l, f);
     if (h in r)
       return s(void 0, l);
   }
-  const f = {
+  const u = {
     url: o,
     method: o,
     data: o,
@@ -1393,11 +1410,11 @@ function mergeConfig(r, e) {
     socketPath: i,
     responseEncoding: i,
     validateStatus: a,
-    headers: (l, u) => n(headersToObject(l), headersToObject(u), !0)
+    headers: (l, f) => n(headersToObject(l), headersToObject(f), !0)
   };
-  return utils$1.forEach(Object.keys(Object.assign({}, r, e)), function(u) {
-    const h = f[u] || n, y = h(r[u], e[u], u);
-    utils$1.isUndefined(y) && h !== a || (t[u] = y);
+  return utils$1.forEach(Object.keys(Object.assign({}, r, e)), function(f) {
+    const h = u[f] || n, y = h(r[f], e[f], f);
+    utils$1.isUndefined(y) && h !== a || (t[f] = y);
   }), t;
 }
 const resolveConfig = (r) => {
@@ -1407,13 +1424,13 @@ const resolveConfig = (r) => {
     "Authorization",
     "Basic " + btoa((a.username || "") + ":" + (a.password ? unescape(encodeURIComponent(a.password)) : ""))
   );
-  let f;
+  let u;
   if (utils$1.isFormData(t)) {
     if (platform.hasStandardBrowserEnv || platform.hasStandardBrowserWebWorkerEnv)
       i.setContentType(void 0);
-    else if ((f = i.getContentType()) !== !1) {
-      const [l, ...u] = f ? f.split(";").map((h) => h.trim()).filter(Boolean) : [];
-      i.setContentType([l || "multipart/form-data", ...u].join("; "));
+    else if ((u = i.getContentType()) !== !1) {
+      const [l, ...f] = u ? u.split(";").map((h) => h.trim()).filter(Boolean) : [];
+      i.setContentType([l || "multipart/form-data", ...f].join("; "));
     }
   }
   if (platform.hasStandardBrowserEnv && (s && utils$1.isFunction(s) && (s = s(e)), s || s !== !1 && isURLSameOrigin(e.url))) {
@@ -1426,9 +1443,9 @@ const resolveConfig = (r) => {
     const n = resolveConfig(r);
     let o = n.data;
     const i = AxiosHeaders$1.from(n.headers).normalize();
-    let { responseType: a, onUploadProgress: f, onDownloadProgress: l } = n, u, h, y, w, d;
+    let { responseType: a, onUploadProgress: u, onDownloadProgress: l } = n, f, h, y, w, d;
     function g() {
-      w && w(), d && d(), n.cancelToken && n.cancelToken.unsubscribe(u), n.signal && n.signal.removeEventListener("abort", u);
+      w && w(), d && d(), n.cancelToken && n.cancelToken.unsubscribe(f), n.signal && n.signal.removeEventListener("abort", f);
     }
     let m = new XMLHttpRequest();
     m.open(n.method.toUpperCase(), n.url, !0), m.timeout = n.timeout;
@@ -1468,9 +1485,9 @@ const resolveConfig = (r) => {
       )), m = null;
     }, o === void 0 && i.setContentType(null), "setRequestHeader" in m && utils$1.forEach(i.toJSON(), function(T, x) {
       m.setRequestHeader(x, T);
-    }), utils$1.isUndefined(n.withCredentials) || (m.withCredentials = !!n.withCredentials), a && a !== "json" && (m.responseType = n.responseType), l && ([y, d] = progressEventReducer(l, !0), m.addEventListener("progress", y)), f && m.upload && ([h, w] = progressEventReducer(f), m.upload.addEventListener("progress", h), m.upload.addEventListener("loadend", w)), (n.cancelToken || n.signal) && (u = (E) => {
+    }), utils$1.isUndefined(n.withCredentials) || (m.withCredentials = !!n.withCredentials), a && a !== "json" && (m.responseType = n.responseType), l && ([y, d] = progressEventReducer(l, !0), m.addEventListener("progress", y)), u && m.upload && ([h, w] = progressEventReducer(u), m.upload.addEventListener("progress", h), m.upload.addEventListener("loadend", w)), (n.cancelToken || n.signal) && (f = (E) => {
       m && (s(!E || E.type ? new CanceledError(null, r, m) : E), m.abort(), m = null);
-    }, n.cancelToken && n.cancelToken.subscribe(u), n.signal && (n.signal.aborted ? u() : n.signal.addEventListener("abort", u)));
+    }, n.cancelToken && n.cancelToken.subscribe(f), n.signal && (n.signal.aborted ? f() : n.signal.addEventListener("abort", f)));
     const A = parseProtocol(n.url);
     if (A && platform.protocols.indexOf(A) === -1) {
       s(new AxiosError("Unsupported protocol " + A + ":", AxiosError.ERR_BAD_REQUEST, r));
@@ -1485,8 +1502,8 @@ const resolveConfig = (r) => {
     const o = function(l) {
       if (!n) {
         n = !0, a();
-        const u = l instanceof Error ? l : this.reason;
-        s.abort(u instanceof AxiosError ? u : new CanceledError(u instanceof Error ? u.message : u));
+        const f = l instanceof Error ? l : this.reason;
+        s.abort(f instanceof AxiosError ? f : new CanceledError(f instanceof Error ? f.message : f));
       }
     };
     let i = e && setTimeout(() => {
@@ -1498,8 +1515,8 @@ const resolveConfig = (r) => {
       }), r = null);
     };
     r.forEach((l) => l.addEventListener("abort", o));
-    const { signal: f } = s;
-    return f.unsubscribe = () => utils$1.asap(a), f;
+    const { signal: u } = s;
+    return u.unsubscribe = () => utils$1.asap(a), u;
   }
 }, composeSignals$1 = composeSignals, streamChunk = function* (r, e) {
   let t = r.byteLength;
@@ -1531,29 +1548,29 @@ const resolveConfig = (r) => {
   }
 }, trackStream = (r, e, t, s) => {
   const n = readBytes(r, e);
-  let o = 0, i, a = (f) => {
-    i || (i = !0, s && s(f));
+  let o = 0, i, a = (u) => {
+    i || (i = !0, s && s(u));
   };
   return new ReadableStream({
-    async pull(f) {
+    async pull(u) {
       try {
-        const { done: l, value: u } = await n.next();
+        const { done: l, value: f } = await n.next();
         if (l) {
-          a(), f.close();
+          a(), u.close();
           return;
         }
-        let h = u.byteLength;
+        let h = f.byteLength;
         if (t) {
           let y = o += h;
           t(y);
         }
-        f.enqueue(new Uint8Array(u));
+        u.enqueue(new Uint8Array(f));
       } catch (l) {
         throw a(l), l;
       }
     },
-    cancel(f) {
-      return a(f), n.return();
+    cancel(u) {
+      return a(u), n.return();
     }
   }, {
     highWaterMark: 2
@@ -1610,9 +1627,9 @@ const getBodyLength = async (r) => {
     cancelToken: o,
     timeout: i,
     onDownloadProgress: a,
-    onUploadProgress: f,
+    onUploadProgress: u,
     responseType: l,
-    headers: u,
+    headers: f,
     withCredentials: h = "same-origin",
     fetchOptions: y
   } = resolveConfig(r);
@@ -1623,16 +1640,16 @@ const getBodyLength = async (r) => {
   });
   let m;
   try {
-    if (f && supportsRequestStream && t !== "get" && t !== "head" && (m = await resolveBodyLength(u, s)) !== 0) {
+    if (u && supportsRequestStream && t !== "get" && t !== "head" && (m = await resolveBodyLength(f, s)) !== 0) {
       let x = new Request(e, {
         method: "POST",
         body: s,
         duplex: "half"
       }), O;
-      if (utils$1.isFormData(s) && (O = x.headers.get("content-type")) && u.setContentType(O), x.body) {
+      if (utils$1.isFormData(s) && (O = x.headers.get("content-type")) && f.setContentType(O), x.body) {
         const [$, k] = progressEventDecorator(
           m,
-          progressEventReducer(asyncDecorator(f))
+          progressEventReducer(asyncDecorator(u))
         );
         s = trackStream(x.body, DEFAULT_CHUNK_SIZE, $, k);
       }
@@ -1643,7 +1660,7 @@ const getBodyLength = async (r) => {
       ...y,
       signal: w,
       method: t.toUpperCase(),
-      headers: u.normalize().toJSON(),
+      headers: f.normalize().toJSON(),
       body: s,
       duplex: "half",
       credentials: D ? h : void 0
@@ -1717,7 +1734,7 @@ const renderReason = (r) => `- ${r}`, isResolvedHandle = (r) => utils$1.isFuncti
     }
     if (!s) {
       const o = Object.entries(n).map(
-        ([a, f]) => `adapter ${a} ` + (f === !1 ? "is not supported by the environment" : "is not available in the build")
+        ([a, u]) => `adapter ${a} ` + (u === !1 ? "is not supported by the environment" : "is not available in the build")
       );
       let i = e ? o.length > 1 ? `since :
 ` + o.map(renderReason).join(`
@@ -1786,9 +1803,9 @@ function assertOptions(r, e, t) {
   for (; n-- > 0; ) {
     const o = s[n], i = e[o];
     if (i) {
-      const a = r[o], f = a === void 0 || i(a, o, r);
-      if (f !== !0)
-        throw new AxiosError("option " + o + " must be " + f, AxiosError.ERR_BAD_OPTION_VALUE);
+      const a = r[o], u = a === void 0 || i(a, o, r);
+      if (u !== !0)
+        throw new AxiosError("option " + o + " must be " + u, AxiosError.ERR_BAD_OPTION_VALUE);
       continue;
     }
     if (t !== !0)
@@ -1855,20 +1872,20 @@ class Axios {
       }
     ), t.headers = AxiosHeaders$1.concat(i, o);
     const a = [];
-    let f = !0;
+    let u = !0;
     this.interceptors.request.forEach(function(g) {
-      typeof g.runWhen == "function" && g.runWhen(t) === !1 || (f = f && g.synchronous, a.unshift(g.fulfilled, g.rejected));
+      typeof g.runWhen == "function" && g.runWhen(t) === !1 || (u = u && g.synchronous, a.unshift(g.fulfilled, g.rejected));
     });
     const l = [];
     this.interceptors.response.forEach(function(g) {
       l.push(g.fulfilled, g.rejected);
     });
-    let u, h = 0, y;
-    if (!f) {
+    let f, h = 0, y;
+    if (!u) {
       const d = [dispatchRequest.bind(this), void 0];
-      for (d.unshift.apply(d, a), d.push.apply(d, l), y = d.length, u = Promise.resolve(t); h < y; )
-        u = u.then(d[h++], d[h++]);
-      return u;
+      for (d.unshift.apply(d, a), d.push.apply(d, l), y = d.length, f = Promise.resolve(t); h < y; )
+        f = f.then(d[h++], d[h++]);
+      return f;
     }
     y = a.length;
     let w = t;
@@ -1882,13 +1899,13 @@ class Axios {
       }
     }
     try {
-      u = dispatchRequest.call(this, w);
+      f = dispatchRequest.call(this, w);
     } catch (d) {
       return Promise.reject(d);
     }
     for (h = 0, y = l.length; h < y; )
-      u = u.then(l[h++], l[h++]);
-    return u;
+      f = f.then(l[h++], l[h++]);
+    return f;
   }
   getUri(e) {
     e = mergeConfig(this.defaults, e);
@@ -2124,18 +2141,18 @@ function init(r, e) {
     if (!(typeof document > "u")) {
       i = assign({}, e, i), typeof i.expires == "number" && (i.expires = new Date(Date.now() + i.expires * 864e5)), i.expires && (i.expires = i.expires.toUTCString()), n = encodeURIComponent(n).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
       var a = "";
-      for (var f in i)
-        i[f] && (a += "; " + f, i[f] !== !0 && (a += "=" + i[f].split(";")[0]));
+      for (var u in i)
+        i[u] && (a += "; " + u, i[u] !== !0 && (a += "=" + i[u].split(";")[0]));
       return document.cookie = n + "=" + r.write(o, n) + a;
     }
   }
   function s(n) {
     if (!(typeof document > "u" || arguments.length && !n)) {
       for (var o = document.cookie ? document.cookie.split("; ") : [], i = {}, a = 0; a < o.length; a++) {
-        var f = o[a].split("="), l = f.slice(1).join("=");
+        var u = o[a].split("="), l = u.slice(1).join("=");
         try {
-          var u = decodeURIComponent(f[0]);
-          if (i[u] = r.read(l, u), n === u)
+          var f = decodeURIComponent(u[0]);
+          if (i[f] = r.read(l, f), n === f)
             break;
         } catch {
         }
@@ -2217,8 +2234,8 @@ const R = class R {
 };
 c(R, "events", (e, t, s, n = "") => new Promise((o, i) => {
   let a = 0;
-  for (let [f, l] of s)
-    a++, e === "add" ? t.addEventListener(f, l) : t.removeEventListener(f, l), a === s.length && o("");
+  for (let [u, l] of s)
+    a++, e === "add" ? t.addEventListener(u, l) : t.removeEventListener(u, l), a === s.length && o("");
 })), c(R, "sortDataByAlphabet", (e, t) => e.sort((s, n) => n[t].trim() < s[t].trim() ? 1 : -1)), c(R, "sortDataByDate", (e, t) => {
   e.sort((s, n) => R.hasDateLessPeriod(n[t], s[t]) ? 1 : -1);
 }), c(R, "sortDataByDateAndTime", (e, t) => {
@@ -2295,13 +2312,13 @@ c(S, "keyCookie", "AuthCookie"), c(S, "cookieOptions", {}), c(S, "registerReques
       cookie: S.getAuthCookies()
     },
     timeout: 6e4
-  }, a = Utils.deepMerge(i, t), f = 520, l = "", u = {
+  }, a = Utils.deepMerge(i, t), u = 520, l = "", f = {
     url: e,
-    statusCode: f,
+    statusCode: u,
     msg: l,
     isErr: !0,
     request: a,
-    errExt: { message: l, status: f }
+    errExt: { message: l, status: u }
   }, { cordova: h } = window;
   if (h != null && h.cordova && ((y = h == null ? void 0 : h.plugin) != null && y.http)) {
     const { http: w } = h == null ? void 0 : h.plugin;
@@ -2324,7 +2341,7 @@ c(S, "keyCookie", "AuthCookie"), c(S, "cookieOptions", {}), c(S, "registerReques
           O.message = k, O.data = $, g.msg = S.errorsHandler.gerErrorByStatusCordovaHttp(D, m);
         } else
           typeof E == "string" && (O.message = E);
-        n({ ...u, ...g, errExt: O });
+        n({ ...f, ...g, errExt: O });
       }
     );
   } else
@@ -2336,14 +2353,14 @@ c(S, "keyCookie", "AuthCookie"), c(S, "cookieOptions", {}), c(S, "registerReques
       const d = S.errorsHandler.handleError(w), { code: g, config: m, status: D, message: A, response: E, stack: T } = w, x = {
         code: g,
         config: m,
-        status: D || f,
+        status: D || u,
         message: A,
         headers: E == null ? void 0 : E.headers,
         statusText: E == null ? void 0 : E.statusText,
         data: E == null ? void 0 : E.data,
         stack: T
       };
-      n({ ...u, ...d, errExt: x });
+      n({ ...f, ...d, errExt: x });
     });
 })), c(S, "getAuthCookies", () => {
   var s;
@@ -2497,33 +2514,33 @@ const b = class b {
     const { url: s, ...n } = t;
     return new Promise((o, i) => {
       b.getIsInit() || b.init();
-      const f = b.getIsNetwork(), l = {
+      const u = b.getIsNetwork(), l = {
         url: s,
         keyAction: e,
-        isErr: !f,
-        msg: f ? "" : "Нет интернета",
-        isReq: f,
-        statusCode: f ? 0 : 520,
+        isErr: !u,
+        msg: u ? "" : "Нет интернета",
+        isReq: u,
+        statusCode: u ? 0 : 520,
         isReload: !1
       };
-      if (b.events.publish("fetch", l), f) {
-        apiRequest.requestInServer(s, n).then((u) => {
+      if (b.events.publish("fetch", l), u) {
+        apiRequest.requestInServer(s, n).then((f) => {
           const h = {
             isReq: !1,
             isReload: !0,
             isErr: !1,
             keyAction: e,
             msg: "",
-            ...u
+            ...f
           };
           b.events.publish("fetch", h), o(h);
-        }).catch((u) => {
+        }).catch((f) => {
           const h = {
             //TODO: Проверить. dataErr не верно возвращает
             isReq: !1,
             isReload: !1,
             keyAction: e,
-            ...u
+            ...f
           };
           b.events.publish("fetch", h), i(h);
         });
@@ -2629,7 +2646,7 @@ class NetworkStatusTracker {
     this.controllersEvents = { ...this.controllersEvents, ...e };
   }
   startEvents(e) {
-    var a, f, l, u;
+    var a, u, l, f;
     const { isActiveEvents: t } = this.getState();
     if (t)
       return;
@@ -2645,10 +2662,10 @@ class NetworkStatusTracker {
       this.updateState(!0, e);
     }, { signal: (a = s.online) == null ? void 0 : a.signal }), window.addEventListener("offline", () => {
       this.updateState(!1, e);
-    }, { signal: (f = s.offline) == null ? void 0 : f.signal }), (l = this.getConnection()) != null && l.addEventListener && this.getConnection().addEventListener("change", () => {
+    }, { signal: (u = s.offline) == null ? void 0 : u.signal }), (l = this.getConnection()) != null && l.addEventListener && this.getConnection().addEventListener("change", () => {
       const h = this.getConnection(), y = this.getTypeNetwork(h, null), w = this.getIsNetwork(y);
       this.updateState(w, e);
-    }, { signal: (u = s.change) == null ? void 0 : u.signal });
+    }, { signal: (f = s.change) == null ? void 0 : f.signal });
   }
   stopEvents() {
     const { isActiveEvents: e } = this.getState();

package/package.json

@@ -11,7 +11,7 @@
     "url": "git+https://github.com/SinGlEBW/dev-classes.git"
   },
   "license": "MIT",
-  "version": "1.4.18",
+  "version": "1.4.22",
   "type": "module",
   "module": "./dist/index.js",
   "main": "./dist/index.js",