dev-classes 1.4.32 → 1.4.34

package/README.md

@@ -72,7 +72,13 @@ interface ColorProps{
     rgb: () => number[];
     hex: () => string;
     hexMultiple: () => string[];
-    pastelColor: () => string;
+    pastelColor: (config: {      
+      baseColor?: string;
+      saturation?: number;
+      lightness?: number;
+      hueShift?: number;
+      randomize?: boolean;
+    }) => string;
     neonColor: () => string;
     brightColor: (factor?: number) => string;
   };

package/dist/classes/Color/Color.d.ts

@@ -3,13 +3,11 @@ export declare class Color {
     private static componentToHex;
     static rgbToHex: ColorProps["rgbToHex"];
     /**
-     * https://stackoverflow.com/a/54070620/6758968
      * r, g, b in [0, 255]
      * @returns h in [0,360) and s, v in [0,1]
      */
     static rgbToHsv: ColorProps["rgbToHsv"];
     /**
-     * https://stackoverflow.com/a/54024653/6758968
      * @param h [0, 360]
      * @param s [0, 1]
      * @param v [0, 1]
@@ -20,7 +18,6 @@ export declare class Color {
      * @returns h [0, 360], s [0, 100], l [0, 100], a [0, 1]
      */
     static rgbaToHsla: ColorProps["rgbaToHsla"];
-    private static rgbToHsl;
     /**
      * Converts an HSL color value to RGB. Conversion formula
      * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
@@ -53,7 +50,6 @@ export declare class Color {
     static rgbaToRgb: ColorProps["rgbaToRgb"];
     static calculateBrightness: ColorProps["calculateBrightness"];
     static getTextColor: ColorProps["getTextColor"];
-    private static readonly MIN_BRIGHTNESS;
     private static readonly MIN_SATURATION;
     private static readonly MIN_LIGHTNESS;
     static isBrightAndVivid(color: string): boolean;
@@ -63,15 +59,16 @@ export declare class Color {
     static isHex: (color: string) => boolean;
     private static generateHex;
     private static generateHexMultiple;
-    private static generatePastel;
     private static generateNeon;
     private static generateRGB;
     private static brightColor;
+    static hslToHex(hue: number, saturation: number, lightness: number): string;
+    private static generatePleasantColor;
     static generate: {
         rgb: typeof Color.generateRGB;
         hex: () => string;
         hexMultiple: (count: number) => string[];
-        pastelColor: typeof Color.generatePastel;
+        pastelColor: typeof Color.generatePleasantColor;
         neonColor: typeof Color.generateNeon;
         brightColor: typeof Color.brightColor;
     };

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

@@ -39,7 +39,13 @@ export interface ColorProps {
         rgb: () => number[];
         hex: () => string;
         hexMultiple: () => string[];
-        pastelColor: () => string;
+        pastelColor: (config: {
+            baseColor?: string;
+            saturation?: number;
+            lightness?: number;
+            hueShift?: number;
+            randomize?: boolean;
+        }) => string;
         neonColor: () => string;
         brightColor: (factor?: number) => string;
     };

package/dist/index.js

@@ -1,37 +1,11 @@
-var v = Object.defineProperty;
-var P = (r, e, t) => e in r ? v(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
+var k = Object.defineProperty;
+var P = (r, e, t) => e in r ? k(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
 var c = (r, e, t) => (P(r, typeof e != "symbol" ? e + "" : e, t), t);
 const m = class m {
-  static rgbToHsl(e, t, s) {
-    e /= 255, t /= 255, s /= 255;
-    const n = Math.max(e, t, s), o = Math.min(e, t, s);
-    let i = 0, a = 0;
-    const u = (n + o) / 2;
-    if (n !== o) {
-      const l = n - o;
-      switch (a = u > 0.5 ? l / (2 - n - o) : l / (n + o), n) {
-        case e:
-          i = (t - s) / l + (t < s ? 6 : 0);
-          break;
-        case t:
-          i = (s - e) / l + 2;
-          break;
-        case s:
-          i = (e - t) / l + 4;
-          break;
-      }
-      i /= 6;
-    }
-    return { h: i, s: a, l: u };
-  }
   static isBrightAndVivid(e) {
-    const [t, s, n] = this.hexToRgb(e), o = this.rgbToHsl(t, s, n);
+    const [t, s, n] = this.hexToRgb(e), o = this.rgbaToHsla(t, s, n, 1);
     return o.l >= this.MIN_LIGHTNESS && o.s >= this.MIN_SATURATION;
   }
-  static generatePastel() {
-    const [e, t, s] = this.generateRGB(), n = Math.floor((e + 255) / 2), o = Math.floor((t + 255) / 2), i = Math.floor((s + 255) / 2);
-    return `#${n.toString(16).padStart(2, "0")}${o.toString(16).padStart(2, "0")}${i.toString(16).padStart(2, "0")}`;
-  }
   static generateNeon() {
     const e = [
       Math.floor(Math.random() * 128 + 128),
@@ -59,20 +33,28 @@ const m = class m {
     } while (!m.isBrightAndVivid(s));
     return s;
   }
+  static hslToHex(e, t, s) {
+    const n = m.hslaToRgba(e, t, s, 1), [o, i, a] = n.slice(0, 3);
+    return m.rgbToHex(o, i, a);
+  }
+  static generatePleasantColor(e = {}) {
+    const { baseColor: t, saturation: s = 50, lightness: n = 50, hueShift: o = 0, randomize: i = !1 } = e;
+    let a, u, l;
+    return t ? (a = (m.hexaToHsla(t).h + o) % 360, i ? (u = Math.max(30, Math.min(90, s + (Math.random() * 40 - 20))), l = Math.max(40, Math.min(80, n + (Math.random() * 30 - 15)))) : (u = s, l = n)) : (a = Math.floor(Math.random() * 360), u = s + Math.random() * 20, l = n + Math.random() * 20), (a >= 20 && a <= 50 || a >= 60 && a <= 140) && (a = (a + 100) % 360), n < 100 && (u = Math.max(u, 15), l > 95 && (l = 95 - Math.random() * 10), u < 20 && l > 90 && (a = (a + 180) % 360, u = Math.max(25, u))), m.hslToHex(a, u, l);
+  }
 };
 /*Проверить свои методы и возможно исключить т.к. функционал возможно повторяется */
 c(m, "componentToHex", (e) => {
-  const t = e.toString(16);
-  return t.length == 1 ? "0" + t : t;
-}), // static getNumberRGB = (getComputedStyleRGB) => {
-//   const arrSTRNumber = getComputedStyleRGB.match(/\d+/gi);
-//   if (arrSTRNumber?.length) {
-//     return arrSTRNumber.map((i) => Number(i));
-//   }
-//   return arrSTRNumber ? arrSTRNumber : [255, 255, 255];
-// };
-c(m, "rgbToHex", (e, t, s) => "#" + m.componentToHex(e) + m.componentToHex(t) + m.componentToHex(s)), /**
- * https://stackoverflow.com/a/54070620/6758968
+  const s = Math.max(0, Math.min(255, Math.round(e))).toString(16);
+  return s.length == 1 ? "0" + s : s;
+}), c(m, "rgbToHex", (e, t, s) => "#" + m.componentToHex(e) + m.componentToHex(t) + m.componentToHex(s)), // static rgbToHex: ColorProps["rgbToHex"] = (r: number, g: number, b: number) => {
+//   const toHex = (n: number): string => {
+//     const hex = Math.round(n).toString(16);
+//     return hex.length === 1 ? "0" + hex : hex;
+//   };
+//   return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
+// }
+/**
  * r, g, b in [0, 255]
  * @returns h in [0,360) and s, v in [0,1]
  */
@@ -81,7 +63,6 @@ c(m, "rgbToHsv", (e, t, s) => {
   const n = Math.max(e, t, s), o = n - Math.min(e, t, s), i = o && (n === e ? (t - s) / o : n == t ? 2 + (s - e) / o : 4 + (e - t) / o);
   return [60 * (i < 0 ? i + 6 : i), n && o / n, n];
 }), /**
- * https://stackoverflow.com/a/54024653/6758968
  * @param h [0, 360]
  * @param s [0, 1]
  * @param v [0, 1]
@@ -121,8 +102,7 @@ c(m, "rgbaToHsla", (e, t, s, n = 1) => {
     l: l * 100,
     a: n
   };
-}), // * https://stackoverflow.com/a/9493060/6758968
-/**
+}), /**
  * Converts an HSL color value to RGB. Conversion formula
  * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
  *
@@ -137,8 +117,8 @@ c(m, "hslaToRgba", (e, t, s, n) => {
   if (t === 0)
     o = i = a = s;
   else {
-    const u = function(b, w, d) {
-      return d < 0 && (d += 1), d > 1 && (d -= 1), d < 0.16666666666666666 ? b + (w - b) * 6 * d : d < 0.5 ? w : d < 0.6666666666666666 ? b + (w - b) * (0.6666666666666666 - d) * 6 : b;
+    const u = function(w, b, d) {
+      return d < 0 && (d += 1), d > 1 && (d -= 1), d < 0.16666666666666666 ? w + (b - w) * 6 * d : d < 0.5 ? b : d < 0.6666666666666666 ? w + (b - w) * (0.6666666666666666 - d) * 6 : w;
     }, 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);
   }
@@ -191,8 +171,8 @@ c(m, "mixColors", (e, t, s) => {
   let u = m.hsvToRgb(...o);
   const l = m.calculateBrightness(s), f = m.calculateBrightness(u);
   if (n ? l > f : l < f) {
-    const w = 0.4 * l / f + 0.6;
-    u = m.changeBrightness(u, w);
+    const b = 0.4 * l / f + 0.6;
+    u = m.changeBrightness(u, b);
   }
   return u;
 }), c(m, "changeBrightness", (e, t) => e.map((s) => m.clamp(Math.round(s * t), 0, 255))), c(m, "hexBrightness", (e, t) => {
@@ -201,26 +181,13 @@ c(m, "mixColors", (e, t, s) => {
 }), c(m, "getHexColorFromTelegramColor", (e) => {
   const t = (e < 0 ? 16777215 + e : e).toString(16);
   return "#" + (t.length >= 6 ? t : "0".repeat(6 - t.length) + t);
-}), c(m, "getRgbColorFromTelegramColor", (e) => m.hexToRgb(m.getHexColorFromTelegramColor(e))), // static getColorsFromWallPaper(wallPaper) {
-//   return wallPaper.settings
-//     ? [
-//         wallPaper.settings.background_color,
-//         wallPaper.settings.second_background_color,
-//         wallPaper.settings.third_background_color,
-//         wallPaper.settings.fourth_background_color,
-//       ]
-//         .filter(Boolean)
-//         .map(Color.getHexColorFromTelegramColor)
-//         .join(",")
-//     : "";
-// }
-c(m, "rgbaToRgb", (e, t) => {
+}), c(m, "getRgbColorFromTelegramColor", (e) => m.hexToRgb(m.getHexColorFromTelegramColor(e))), c(m, "rgbaToRgb", (e, t) => {
   const s = e[3];
   return e.slice(0, 3).map((n, o) => m.clamp(Math.round((s * (n / 255) + s * (t[o] / 255)) * 255), 0, 255));
 }), c(m, "calculateBrightness", (e, t = "BT709") => {
   const [s, n, o] = e, i = m.getRgbByTypeBrightness(t);
   return i[0] * s / 255 + i[1] * n / 255 + i[2] * o / 255;
-}), c(m, "getTextColor", (e) => e > 0.5 ? [0, 0, 0] : [255, 255, 255]), c(m, "MIN_BRIGHTNESS", 0.6), c(m, "MIN_SATURATION", 0.5), c(m, "MIN_LIGHTNESS", 0.4), c(m, "calculateOpacity", (e, t) => {
+}), c(m, "getTextColor", (e) => e > 0.5 ? [0, 0, 0] : [255, 255, 255]), c(m, "MIN_SATURATION", 50), c(m, "MIN_LIGHTNESS", 44), c(m, "calculateOpacity", (e, t) => {
   const s = e > 0.5 ? 0 : 1, n = (e - s + t) / t;
   return +Math.max(0.5, Math.min(0.64, n)).toFixed(2);
 }), c(m, "increaseSaturation", (e, t = 1.3) => {
@@ -240,7 +207,7 @@ c(m, "rgbaToRgb", (e, t) => {
   rgb: m.generateRGB,
   hex: m.generateHex,
   hexMultiple: m.generateHexMultiple,
-  pastelColor: m.generatePastel,
+  pastelColor: m.generatePleasantColor,
   neonColor: m.generateNeon,
   brightColor: m.brightColor
 });
@@ -386,17 +353,17 @@ class DelaysPromise {
       };
       let o = !0, i, a, u;
       const l = (h = !0) => {
-        const b = "Ручное завершение startActionEvery";
-        o = !1, clearInterval(i), s(null), h ? a && a({ status: h, msg: b + ": (true)" }) : u && u({ status: h, msg: b + ": (false)" });
+        const w = "Ручное завершение startActionEvery";
+        o = !1, clearInterval(i), s(null), h ? a && a({ status: h, msg: w + ": (true)" }) : u && u({ status: h, msg: w + ": (false)" });
       };
       return {
-        promise: new Promise((h, b) => {
-          a = h, u = b;
-          let w = 0, d = 0;
+        promise: new Promise((h, w) => {
+          a = h, u = w;
+          let b = 0, d = 0;
           i = setInterval(
             () => {
-              if (w += t.interval, d += 1, t != null && t.cutoffTime && w > t.cutoffTime || t != null && t.countAction && (t == null ? void 0 : t.countAction) < d) {
-                o = !1, clearInterval(i), s(null), b({ status: !1, msg: Error("Время загрузки истекло") });
+              if (b += t.interval, d += 1, t != null && t.cutoffTime && b > t.cutoffTime || t != null && t.countAction && (t == null ? void 0 : t.countAction) < d) {
+                o = !1, clearInterval(i), s(null), w({ status: !1, msg: Error("Время загрузки истекло") });
                 return;
               }
               e() && (o = !1, clearInterval(i), s(null), h({ status: !0, msg: "cb вернул true" }));
@@ -818,12 +785,12 @@ function toFormData(r, e, t) {
     }
     return isVisitable(d) ? !0 : (e.append(renderKey(p, g, o), l(d)), !1);
   }
-  const h = [], b = Object.assign(predicates, {
+  const h = [], w = Object.assign(predicates, {
     defaultVisitor: f,
     convertValue: l,
     isVisitable
   });
-  function w(d, g) {
+  function b(d, g) {
     if (!utils$1.isUndefined(d)) {
       if (h.indexOf(d) !== -1)
         throw Error("Circular reference detected in " + g.join("."));
@@ -833,14 +800,14 @@ function toFormData(r, e, t) {
           D,
           utils$1.isString(A) ? A.trim() : A,
           g,
-          b
-        )) === !0 && w(D, g ? g.concat(A) : [A]);
+          w
+        )) === !0 && b(D, g ? g.concat(A) : [A]);
       }), h.pop();
     }
   }
   if (!utils$1.isObject(r))
     throw new TypeError("data must be an object");
-  return w(r), e;
+  return b(r), e;
 }
 function encode$1(r) {
   const e = {
@@ -1308,13 +1275,13 @@ function speedometer(r, e) {
   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, b = 0;
+    let h = o, w = 0;
     for (; h !== n; )
-      b += t[h++], h = h % r;
+      w += t[h++], h = h % r;
     if (n = (n + 1) % r, n === o && (o = (o + 1) % r), l - i < e)
       return;
-    const w = f && l - f;
-    return w ? Math.round(b * 1e3 / w) : void 0;
+    const b = f && l - f;
+    return b ? Math.round(w * 1e3 / b) : void 0;
   };
 }
 function throttle(r, e) {
@@ -1485,8 +1452,8 @@ function mergeConfig(r, e) {
     headers: (l, f) => n(headersToObject(l), headersToObject(f), !0)
   };
   return utils$1.forEach(Object.keys(Object.assign({}, r, e)), function(f) {
-    const h = u[f] || n, b = h(r[f], e[f], f);
-    utils$1.isUndefined(b) && h !== a || (t[f] = b);
+    const h = u[f] || n, w = h(r[f], e[f], f);
+    utils$1.isUndefined(w) && h !== a || (t[f] = w);
   }), t;
 }
 const resolveConfig = (r) => {
@@ -1515,9 +1482,9 @@ const resolveConfig = (r) => {
     const n = resolveConfig(r);
     let o = n.data;
     const i = AxiosHeaders$1.from(n.headers).normalize();
-    let { responseType: a, onUploadProgress: u, onDownloadProgress: l } = n, f, h, b, w, d;
+    let { responseType: a, onUploadProgress: u, onDownloadProgress: l } = n, f, h, w, b, d;
     function g() {
-      w && w(), d && d(), n.cancelToken && n.cancelToken.unsubscribe(f), n.signal && n.signal.removeEventListener("abort", f);
+      b && b(), d && d(), n.cancelToken && n.cancelToken.unsubscribe(f), n.signal && n.signal.removeEventListener("abort", f);
     }
     let p = new XMLHttpRequest();
     p.open(n.method.toUpperCase(), n.url, !0), p.timeout = n.timeout;
@@ -1526,7 +1493,7 @@ const resolveConfig = (r) => {
         return;
       const S = AxiosHeaders$1.from(
         "getAllResponseHeaders" in p && p.getAllResponseHeaders()
-      ), x = {
+      ), R = {
         data: !a || a === "text" || a === "json" ? p.responseText : p.response,
         status: p.status,
         statusText: p.statusText,
@@ -1538,7 +1505,7 @@ const resolveConfig = (r) => {
         t(C), g();
       }, function(C) {
         s(C), g();
-      }, x), p = null;
+      }, R), p = null;
     }
     "onloadend" in p ? p.onloadend = D : p.onreadystatechange = function() {
       !p || p.readyState !== 4 || p.status === 0 && !(p.responseURL && p.responseURL.indexOf("file:") === 0) || setTimeout(D);
@@ -1548,16 +1515,16 @@ const resolveConfig = (r) => {
       s(new AxiosError("Network Error", AxiosError.ERR_NETWORK, r, p)), p = null;
     }, p.ontimeout = function() {
       let O = n.timeout ? "timeout of " + n.timeout + "ms exceeded" : "timeout exceeded";
-      const x = n.transitional || transitionalDefaults;
+      const R = n.transitional || transitionalDefaults;
       n.timeoutErrorMessage && (O = n.timeoutErrorMessage), s(new AxiosError(
         O,
-        x.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED,
+        R.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED,
         r,
         p
       )), p = null;
-    }, o === void 0 && i.setContentType(null), "setRequestHeader" in p && utils$1.forEach(i.toJSON(), function(O, x) {
-      p.setRequestHeader(x, O);
-    }), utils$1.isUndefined(n.withCredentials) || (p.withCredentials = !!n.withCredentials), a && a !== "json" && (p.responseType = n.responseType), l && ([b, d] = progressEventReducer(l, !0), p.addEventListener("progress", b)), u && p.upload && ([h, w] = progressEventReducer(u), p.upload.addEventListener("progress", h), p.upload.addEventListener("loadend", w)), (n.cancelToken || n.signal) && (f = (S) => {
+    }, o === void 0 && i.setContentType(null), "setRequestHeader" in p && utils$1.forEach(i.toJSON(), function(O, R) {
+      p.setRequestHeader(R, O);
+    }), utils$1.isUndefined(n.withCredentials) || (p.withCredentials = !!n.withCredentials), a && a !== "json" && (p.responseType = n.responseType), l && ([w, d] = progressEventReducer(l, !0), p.addEventListener("progress", w)), u && p.upload && ([h, b] = progressEventReducer(u), p.upload.addEventListener("progress", h), p.upload.addEventListener("loadend", b)), (n.cancelToken || n.signal) && (f = (S) => {
       p && (s(!S || S.type ? new CanceledError(null, r, p) : S), p.abort(), p = null);
     }, n.cancelToken && n.cancelToken.subscribe(f), n.signal && (n.signal.aborted ? f() : n.signal.addEventListener("abort", f)));
     const A = parseProtocol(n.url);
@@ -1633,8 +1600,8 @@ const resolveConfig = (r) => {
         }
         let h = f.byteLength;
         if (t) {
-          let b = o += h;
-          t(b);
+          let w = o += h;
+          t(w);
         }
         u.enqueue(new Uint8Array(f));
       } catch (l) {
@@ -1703,34 +1670,34 @@ const getBodyLength = async (r) => {
     responseType: l,
     headers: f,
     withCredentials: h = "same-origin",
-    fetchOptions: b
+    fetchOptions: w
   } = resolveConfig(r);
   l = l ? (l + "").toLowerCase() : "text";
-  let w = composeSignals$1([n, o && o.toAbortSignal()], i), d;
-  const g = w && w.unsubscribe && (() => {
-    w.unsubscribe();
+  let b = composeSignals$1([n, o && o.toAbortSignal()], i), d;
+  const g = b && b.unsubscribe && (() => {
+    b.unsubscribe();
   });
   let p;
   try {
     if (u && supportsRequestStream && t !== "get" && t !== "head" && (p = await resolveBodyLength(f, s)) !== 0) {
-      let x = new Request(e, {
+      let R = new Request(e, {
         method: "POST",
         body: s,
         duplex: "half"
       }), T;
-      if (utils$1.isFormData(s) && (T = x.headers.get("content-type")) && f.setContentType(T), x.body) {
+      if (utils$1.isFormData(s) && (T = R.headers.get("content-type")) && f.setContentType(T), R.body) {
         const [C, N] = progressEventDecorator(
           p,
           progressEventReducer(asyncDecorator(u))
         );
-        s = trackStream(x.body, DEFAULT_CHUNK_SIZE, C, N);
+        s = trackStream(R.body, DEFAULT_CHUNK_SIZE, C, N);
       }
     }
     utils$1.isString(h) || (h = h ? "include" : "omit");
     const D = "credentials" in Request.prototype;
     d = new Request(e, {
-      ...b,
-      signal: w,
+      ...w,
+      signal: b,
       method: t.toUpperCase(),
       headers: f.normalize().toJSON(),
       body: s,
@@ -1740,9 +1707,9 @@ const getBodyLength = async (r) => {
     let A = await fetch(d);
     const S = supportsResponseStream && (l === "stream" || l === "response");
     if (supportsResponseStream && (a || S && g)) {
-      const x = {};
-      ["status", "statusText", "headers"].forEach((k) => {
-        x[k] = A[k];
+      const R = {};
+      ["status", "statusText", "headers"].forEach((v) => {
+        R[v] = A[v];
       });
       const T = utils$1.toFiniteNumber(A.headers.get("content-length")), [C, N] = a && progressEventDecorator(
         T,
@@ -1752,13 +1719,13 @@ const getBodyLength = async (r) => {
         trackStream(A.body, DEFAULT_CHUNK_SIZE, C, () => {
           N && N(), g && g();
         }),
-        x
+        R
       );
     }
     l = l || "text";
     let O = await resolvers[utils$1.findKey(resolvers, l) || "text"](A, r);
-    return !S && g && g(), await new Promise((x, T) => {
-      settle(x, T, {
+    return !S && g && g(), await new Promise((R, T) => {
+      settle(R, T, {
         data: O,
         headers: AxiosHeaders$1.from(A.headers),
         status: A.status,
@@ -1952,30 +1919,30 @@ class Axios {
     this.interceptors.response.forEach(function(g) {
       l.push(g.fulfilled, g.rejected);
     });
-    let f, h = 0, b;
+    let f, h = 0, w;
     if (!u) {
       const d = [dispatchRequest.bind(this), void 0];
-      for (d.unshift.apply(d, a), d.push.apply(d, l), b = d.length, f = Promise.resolve(t); h < b; )
+      for (d.unshift.apply(d, a), d.push.apply(d, l), w = d.length, f = Promise.resolve(t); h < w; )
         f = f.then(d[h++], d[h++]);
       return f;
     }
-    b = a.length;
-    let w = t;
-    for (h = 0; h < b; ) {
+    w = a.length;
+    let b = t;
+    for (h = 0; h < w; ) {
       const d = a[h++], g = a[h++];
       try {
-        w = d(w);
+        b = d(b);
       } catch (p) {
         g.call(this, p);
         break;
       }
     }
     try {
-      f = dispatchRequest.call(this, w);
+      f = dispatchRequest.call(this, b);
     } catch (d) {
       return Promise.reject(d);
     }
-    for (h = 0, b = l.length; h < b; )
+    for (h = 0, w = l.length; h < w; )
       f = f.then(l[h++], l[h++]);
     return f;
   }
@@ -2302,29 +2269,29 @@ class SaveRequest {
     return t.some((s) => s.url === e);
   }
 }
-const R = class R {
+const x = class x {
 };
-c(R, "events", (e, t, s, n = "") => new Promise((o, i) => {
+c(x, "events", (e, t, s, n = "") => new Promise((o, i) => {
   let a = 0;
   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) => {
-}), c(R, "splitDateFromTime", (e) => e.split(" ")), c(R, "reverseDate", (e) => {
-  let [t, s] = R.splitDateFromTime(e);
+})), c(x, "sortDataByAlphabet", (e, t) => e.sort((s, n) => n[t].trim() < s[t].trim() ? 1 : -1)), c(x, "sortDataByDate", (e, t) => {
+  e.sort((s, n) => x.hasDateLessPeriod(n[t], s[t]) ? 1 : -1);
+}), c(x, "sortDataByDateAndTime", (e, t) => {
+}), c(x, "splitDateFromTime", (e) => e.split(" ")), c(x, "reverseDate", (e) => {
+  let [t, s] = x.splitDateFromTime(e);
   return t.split(".").reverse().join("-");
-}), c(R, "correctionDataISO8601", (e) => {
+}), c(x, "correctionDataISO8601", (e) => {
   let t = "";
   if (/^\d{2}\.\d{2}\.\d{4}$/.test(e) || /^\d{2}\.\d{2}\.\d{4}\s\d{2}:\d{2}$/.test(e))
-    t = R.reverseDate(e);
+    t = x.reverseDate(e);
   else if (/^\d{4}-\d{2}-\d{2}$/.test(e))
     t = e;
   else
     throw new Error(`функция correctionDataISO8601 >> date не корректна: ${e}. Требуется один из форматов: дд.мм.гггг | дд.мм.гггг мм:чч | гггг-мм-дд `);
   return t;
-}), c(R, "hasDateLessPeriod", (e, t, s) => {
-  if (e = R.correctionDataISO8601(e), t = R.correctionDataISO8601(t), !s || s && !s.dateMinMax || (s == null ? void 0 : s.dateMinMax) === "<=")
+}), c(x, "hasDateLessPeriod", (e, t, s) => {
+  if (e = x.correctionDataISO8601(e), t = x.correctionDataISO8601(t), !s || s && !s.dateMinMax || (s == null ? void 0 : s.dateMinMax) === "<=")
     return Math.floor(Number(new Date(e))) <= Math.floor(Number(new Date(t)));
   if (s && (s == null ? void 0 : s.dateMinMax) === ">=")
     return Math.floor(Number(new Date(e))) >= Math.floor(Number(new Date(t)));
@@ -2332,31 +2299,31 @@ c(R, "events", (e, t, s, n = "") => new Promise((o, i) => {
     return Math.floor(Number(new Date(e))) < Math.floor(Number(new Date(t)));
   if (s && (s == null ? void 0 : s.dateMinMax) === ">")
     return Math.floor(Number(new Date(e))) > Math.floor(Number(new Date(t)));
-}), c(R, "getEndsWithArr", (e, t) => e.slice(-t)), c(R, "deepMerge", (...e) => {
+}), c(x, "getEndsWithArr", (e, t) => e.slice(-t)), c(x, "deepMerge", (...e) => {
   const t = {}, s = (n) => {
     for (const o in n)
-      Object.prototype.hasOwnProperty.call(n, o) && (Object.prototype.toString.call(n[o]) === "[object Object]" ? t[o] = R.deepMerge(t[o], n[o]) : t[o] = n[o]);
+      Object.prototype.hasOwnProperty.call(n, o) && (Object.prototype.toString.call(n[o]) === "[object Object]" ? t[o] = x.deepMerge(t[o], n[o]) : t[o] = n[o]);
   };
   for (let n = 0; n < e.length; n++)
     s(e[n]);
   return t;
-}), c(R, "isJSON", (e) => {
+}), c(x, "isJSON", (e) => {
   try {
     JSON.parse(e);
   } catch {
     return !1;
   }
   return !0;
-}), c(R, "filterItems", (e, t) => e.filter((s) => s.name.toLowerCase().includes(t.toLowerCase()))), c(R, "sortByOnline", (e) => {
+}), c(x, "filterItems", (e, t) => e.filter((s) => s.name.toLowerCase().includes(t.toLowerCase()))), c(x, "sortByOnline", (e) => {
   const t = [], s = [];
   for (let i = 0; e.length > i; i++) {
     const a = e[i];
     a.online ? t.push(a) : s.push(a);
   }
-  const n = R.sortDataByAlphabet(t, "name"), o = R.sortDataByAlphabet(s, "name");
+  const n = x.sortDataByAlphabet(t, "name"), o = x.sortDataByAlphabet(s, "name");
   return [...n, ...o];
 });
-let Utils = R;
+let Utils = x;
 const E = class E {
   constructor() {
     c(this, "getDecodingError", () => ({
@@ -2376,7 +2343,7 @@ const E = class E {
 c(E, "keyCookie", "AuthCookie"), c(E, "cookieOptions", {}), c(E, "registerRequest", new SaveRequest()), c(E, "registerFailedRequests", new SaveRequest()), c(E, "requestUploadToken", null), c(E, "errorsHandler", new ErrorsHandler()), c(E, "setMethodUploadToken", (e) => {
   E.requestUploadToken = e;
 }), c(E, "requestInServer", (e, t = {}) => new Promise((s, n) => {
-  var b;
+  var w;
   let o = { url: e, statusCode: 0, data: {}, res: {} };
   const i = {
     method: "get",
@@ -2392,9 +2359,9 @@ c(E, "keyCookie", "AuthCookie"), c(E, "cookieOptions", {}), c(E, "registerReques
     request: a,
     errExt: { message: l, status: u }
   }, { cordova: h } = window;
-  if (h != null && h.cordova && ((b = h == null ? void 0 : h.plugin) != null && b.http)) {
-    const { http: w } = h == null ? void 0 : h.plugin;
-    "Content-Type" in (a == null ? void 0 : a.headers) && ((a == null ? void 0 : a.headers["Content-Type"]) === "multipart/form-data" && w.setDataSerializer("urlencoded"), (a == null ? void 0 : a.headers["Content-Type"]) === "application/json" && w.setDataSerializer("json")), w.setRequestTimeout(Number(a.timeout) / 1e3), E.registerRequest.setList({ url: e, options: a }), w.sendRequest(
+  if (h != null && h.cordova && ((w = h == null ? void 0 : h.plugin) != null && w.http)) {
+    const { http: b } = h == null ? void 0 : h.plugin;
+    "Content-Type" in (a == null ? void 0 : a.headers) && ((a == null ? void 0 : a.headers["Content-Type"]) === "multipart/form-data" && b.setDataSerializer("urlencoded"), (a == null ? void 0 : a.headers["Content-Type"]) === "application/json" && b.setDataSerializer("json")), b.setRequestTimeout(Number(a.timeout) / 1e3), E.registerRequest.setList({ url: e, options: a }), b.sendRequest(
       e,
       a,
       (d) => {
@@ -2403,12 +2370,12 @@ c(E, "keyCookie", "AuthCookie"), c(E, "cookieOptions", {}), c(E, "registerReques
         o = { ...o, statusCode: p, data: D, res: d }, p === 200 && g && (E.saveToken(g), o.data = { ...o.data, token: g }), s(o);
       },
       (d) => {
-        const g = E.errorsHandler.handleError(d), { url: p, status: D, headers: A, error: S, ...O } = d, x = typeof S == "string" ? Utils.isJSON(S.trim()) : !1, T = {
+        const g = E.errorsHandler.handleError(d), { url: p, status: D, headers: A, error: S, ...O } = d, R = typeof S == "string" ? Utils.isJSON(S.trim()) : !1, T = {
           headers: A,
           status: D,
           message: ""
         };
-        if (x) {
+        if (R) {
           const C = JSON.parse(S.trim()), N = E.errorsHandler.getErrorMessageFromData(D, C);
           T.message = N, T.data = C, g.msg = E.errorsHandler.gerErrorByStatusCordovaHttp(D, p);
         } else
@@ -2417,12 +2384,12 @@ c(E, "keyCookie", "AuthCookie"), c(E, "cookieOptions", {}), c(E, "registerReques
       }
     );
   } else
-    E.registerRequest.setList({ url: e, options: a }), axios({ url: e, ...a }).then((w) => {
+    E.registerRequest.setList({ url: e, options: a }), axios({ url: e, ...a }).then((b) => {
       E.registerRequest.removeItem(e);
-      const d = w.status, g = w == null ? void 0 : w.data;
-      o = { ...o, statusCode: d, data: g, res: w }, s(o);
-    }).catch((w) => {
-      const d = E.errorsHandler.handleError(w), { code: g, config: p, status: D, message: A, response: S, stack: O } = w, x = {
+      const d = b.status, g = b == null ? void 0 : b.data;
+      o = { ...o, statusCode: d, data: g, res: b }, s(o);
+    }).catch((b) => {
+      const d = E.errorsHandler.handleError(b), { code: g, config: p, status: D, message: A, response: S, stack: O } = b, R = {
         code: g,
         config: p,
         status: D || u,
@@ -2432,7 +2399,7 @@ c(E, "keyCookie", "AuthCookie"), c(E, "cookieOptions", {}), c(E, "registerReques
         data: S == null ? void 0 : S.data,
         stack: O
       };
-      n({ ...f, ...d, errExt: x });
+      n({ ...f, ...d, errExt: R });
     });
 })), c(E, "getAuthCookies", () => {
   var s;
@@ -2735,8 +2702,8 @@ class NetworkStatusTracker {
     }, { signal: (a = s.online) == null ? void 0 : a.signal }), window.addEventListener("offline", () => {
       this.updateState(!1, e);
     }, { signal: (u = s.offline) == null ? void 0 : u.signal }), (l = this.getConnection()) != null && l.addEventListener && this.getConnection().addEventListener("change", () => {
-      const h = this.getConnection(), b = this.getTypeNetwork(h, null), w = this.getIsNetwork(b);
-      this.updateState(w, e);
+      const h = this.getConnection(), w = this.getTypeNetwork(h, null), b = this.getIsNetwork(w);
+      this.updateState(b, e);
     }, { signal: (f = s.change) == null ? void 0 : f.signal });
   }
   stopEvents() {

package/package.json

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