dev-classes 1.4.30 → 1.4.32

package/README.md

@@ -67,13 +67,14 @@ interface ColorProps{
   clamp(v: number, min: number, max: number): number;
   isHex(color:string):boolean;
   isBrightAndVivid: (color: string) => boolean;
+  increaseSaturation: (color: string | number[], factor?: number) => string | number[];
   generate: {
     rgb: () => number[];
     hex: () => string;
     hexMultiple: () => string[];
     pastelColor: () => string;
     neonColor: () => string;
-    brightColor: () => string;
+    brightColor: (factor?: number) => string;
   };
 }
 

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

@@ -1,13 +1,13 @@
 import { ColorProps } from './Color.types';
 export declare class Color {
     private static componentToHex;
-    static rgbToHex: ColorProps['rgbToHex'];
+    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'];
+    static rgbToHsv: ColorProps["rgbToHsv"];
     /**
      * https://stackoverflow.com/a/54024653/6758968
      * @param h [0, 360]
@@ -15,11 +15,11 @@ export declare class Color {
      * @param v [0, 1]
      * @returns r, g, b in [0, 255]
      */
-    static hsvToRgb: ColorProps['hsvToRgb'];
+    static hsvToRgb: ColorProps["hsvToRgb"];
     /**
      * @returns h [0, 360], s [0, 100], l [0, 100], a [0, 1]
      */
-    static rgbaToHsla: ColorProps['rgbaToHsla'];
+    static rgbaToHsla: ColorProps["rgbaToHsla"];
     private static rgbToHsl;
     /**
      * Converts an HSL color value to RGB. Conversion formula
@@ -30,35 +30,36 @@ export declare class Color {
      * @param   {number}  l       The lightness [0, 1]
      * @return  {Array}           The RGB representation [0, 255]
      */
-    static hslaToRgba: ColorProps['hslaToRgba'];
-    static hslaStringToRgba: ColorProps['hslaStringToRgba'];
-    static hexaToRgba: ColorProps['hexaToRgba'];
-    static hexaToHsla: ColorProps['hexaToHsla'];
-    static hexToRgb: ColorProps['hexToRgb'];
-    static rgbaToHexa: ColorProps['rgbaToHexa'];
-    static hslaStringToHexa: ColorProps['hslaStringToHexa'];
-    static hslaStringToHex: ColorProps['hslaStringToHex'];
+    static hslaToRgba: ColorProps["hslaToRgba"];
+    static hslaStringToRgba: ColorProps["hslaStringToRgba"];
+    static hexaToRgba: ColorProps["hexaToRgba"];
+    static hexaToHsla: ColorProps["hexaToHsla"];
+    static hexToRgb: ColorProps["hexToRgb"];
+    static rgbaToHexa: ColorProps["rgbaToHexa"];
+    static hslaStringToHexa: ColorProps["hslaStringToHexa"];
+    static hslaStringToHex: ColorProps["hslaStringToHex"];
     /**
      * @param weight [0, 1]
      */
-    static mixColors: ColorProps['mixColors'];
-    static getRgbByTypeBrightness: ColorProps['getRgbByTypeBrightness'];
-    static getAverageColor: ColorProps['getAverageColor'];
-    static getAccentColor: ColorProps['getAccentColor'];
-    static changeColorAccent: ColorProps['changeColorAccent'];
-    static changeBrightness: ColorProps['changeBrightness'];
-    static hexBrightness: ColorProps['hexBrightness'];
-    static getHexColorFromTelegramColor: ColorProps['getHexColorFromTelegramColor'];
-    static getRgbColorFromTelegramColor: ColorProps['getRgbColorFromTelegramColor'];
-    static rgbaToRgb: ColorProps['rgbaToRgb'];
-    static calculateBrightness: ColorProps['calculateBrightness'];
-    static getTextColor: ColorProps['getTextColor'];
+    static mixColors: ColorProps["mixColors"];
+    static getRgbByTypeBrightness: ColorProps["getRgbByTypeBrightness"];
+    static getAverageColor: ColorProps["getAverageColor"];
+    static getAccentColor: ColorProps["getAccentColor"];
+    static changeColorAccent: ColorProps["changeColorAccent"];
+    static changeBrightness: ColorProps["changeBrightness"];
+    static hexBrightness: ColorProps["hexBrightness"];
+    static getHexColorFromTelegramColor: ColorProps["getHexColorFromTelegramColor"];
+    static getRgbColorFromTelegramColor: ColorProps["getRgbColorFromTelegramColor"];
+    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;
-    static calculateOpacity: ColorProps['calculateOpacity'];
-    static clamp: ColorProps['clamp'];
+    static calculateOpacity: ColorProps["calculateOpacity"];
+    static increaseSaturation: ColorProps["increaseSaturation"];
+    static clamp: ColorProps["clamp"];
     static isHex: (color: string) => boolean;
     private static generateHex;
     private static generateHexMultiple;

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

@@ -32,6 +32,7 @@ export interface ColorProps {
     calculateBrightness(rgb: Color_P["ColorRgb"], type?: Color_P["TypeBrightness_OR"]): number;
     getTextColor(luminance: number): Color_P["ColorRgb"];
     calculateOpacity(luminance: number, targetContrast: number): number;
+    increaseSaturation: (color: string | number[], factor?: number) => string | number[];
     clamp(v: number, min: number, max: number): number;
     isBrightAndVivid: (color: string) => boolean;
     generate: {
@@ -40,6 +41,6 @@ export interface ColorProps {
         hexMultiple: () => string[];
         pastelColor: () => string;
         neonColor: () => string;
-        brightColor: () => string;
+        brightColor: (factor?: number) => string;
     };
 }

package/dist/index.js

@@ -25,7 +25,6 @@ const m = class m {
     return { h: i, s: a, l: u };
   }
   static isBrightAndVivid(e) {
-    debugger;
     const [t, s, n] = this.hexToRgb(e), o = this.rgbToHsl(t, s, n);
     return o.l >= this.MIN_LIGHTNESS && o.s >= this.MIN_SATURATION;
   }
@@ -51,14 +50,14 @@ const m = class m {
   static generateRGB() {
     return Array.from({ length: 3 }, () => Math.floor(Math.random() * 128 + 128));
   }
-  static brightColor() {
-    let e = 0, t;
+  static brightColor(e = 1.3) {
+    let t = 0, s;
     do {
-      const [s, n, o] = m.generateRGB();
-      if (t = `#${s.toString(16).padStart(2, "0")}${n.toString(16).padStart(2, "0")}${o.toString(16).padStart(2, "0")}`, e++, e > 100)
+      const [n, o, i] = m.generateRGB();
+      if (s = `#${n.toString(16).padStart(2, "0")}${o.toString(16).padStart(2, "0")}${i.toString(16).padStart(2, "0")}`, s = m.increaseSaturation(s, e), t++, t > 100)
         break;
-    } while (!m.isBrightAndVivid(t));
-    return t;
+    } while (!m.isBrightAndVivid(s));
+    return s;
   }
 };
 /*Проверить свои методы и возможно исключить т.к. функционал возможно повторяется */
@@ -224,6 +223,14 @@ c(m, "rgbaToRgb", (e, t) => {
 }), 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) => {
   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) => {
+  if (typeof e == "string") {
+    const s = m.hexToRgb(e), [n, o, i] = m.rgbToHsv(...s), a = Math.min(1, o * t), u = m.hsvToRgb(n, a, i);
+    return m.rgbToHex(...u);
+  } else {
+    const [s, n, o] = m.rgbToHsv(e[0], e[1], e[2]), i = Math.min(1, n * t);
+    return m.hsvToRgb(s, i, o);
+  }
 }), c(m, "clamp", (e, t, s) => Math.min(s, Math.max(t, e))), c(m, "isHex", (e) => {
   if (typeof e != "string")
     return !1;
@@ -801,10 +808,10 @@ function toFormData(r, e, t) {
       if (utils$1.endsWith(g, "{}"))
         g = s ? g : g.slice(0, -2), d = JSON.stringify(d);
       else if (utils$1.isArray(d) && isFlatArray(d) || (utils$1.isFileList(d) || utils$1.endsWith(g, "[]")) && (D = utils$1.toArray(d)))
-        return g = removeBrackets(g), D.forEach(function(S, T) {
+        return g = removeBrackets(g), D.forEach(function(S, O) {
           !(utils$1.isUndefined(S) || S === null) && e.append(
             // eslint-disable-next-line no-nested-ternary
-            i === !0 ? renderKey([g], T, o) : i === null ? g : g + "[]",
+            i === !0 ? renderKey([g], O, o) : i === null ? g : g + "[]",
             l(S)
           );
         }), !1;
@@ -1540,16 +1547,16 @@ const resolveConfig = (r) => {
     }, p.onerror = function() {
       s(new AxiosError("Network Error", AxiosError.ERR_NETWORK, r, p)), p = null;
     }, p.ontimeout = function() {
-      let T = n.timeout ? "timeout of " + n.timeout + "ms exceeded" : "timeout exceeded";
+      let O = n.timeout ? "timeout of " + n.timeout + "ms exceeded" : "timeout exceeded";
       const x = n.transitional || transitionalDefaults;
-      n.timeoutErrorMessage && (T = n.timeoutErrorMessage), s(new AxiosError(
-        T,
+      n.timeoutErrorMessage && (O = n.timeoutErrorMessage), s(new AxiosError(
+        O,
         x.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED,
         r,
         p
       )), p = null;
-    }, o === void 0 && i.setContentType(null), "setRequestHeader" in p && utils$1.forEach(i.toJSON(), function(T, x) {
-      p.setRequestHeader(x, T);
+    }, 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) => {
       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)));
@@ -1710,8 +1717,8 @@ const getBodyLength = async (r) => {
         method: "POST",
         body: s,
         duplex: "half"
-      }), O;
-      if (utils$1.isFormData(s) && (O = x.headers.get("content-type")) && f.setContentType(O), x.body) {
+      }), T;
+      if (utils$1.isFormData(s) && (T = x.headers.get("content-type")) && f.setContentType(T), x.body) {
         const [C, N] = progressEventDecorator(
           p,
           progressEventReducer(asyncDecorator(u))
@@ -1737,8 +1744,8 @@ const getBodyLength = async (r) => {
       ["status", "statusText", "headers"].forEach((k) => {
         x[k] = A[k];
       });
-      const O = utils$1.toFiniteNumber(A.headers.get("content-length")), [C, N] = a && progressEventDecorator(
-        O,
+      const T = utils$1.toFiniteNumber(A.headers.get("content-length")), [C, N] = a && progressEventDecorator(
+        T,
         progressEventReducer(asyncDecorator(a), !0)
       ) || [];
       A = new Response(
@@ -1749,10 +1756,10 @@ const getBodyLength = async (r) => {
       );
     }
     l = l || "text";
-    let T = await resolvers[utils$1.findKey(resolvers, l) || "text"](A, r);
-    return !S && g && g(), await new Promise((x, O) => {
-      settle(x, O, {
-        data: T,
+    let O = await resolvers[utils$1.findKey(resolvers, l) || "text"](A, r);
+    return !S && g && g(), await new Promise((x, T) => {
+      settle(x, T, {
+        data: O,
         headers: AxiosHeaders$1.from(A.headers),
         status: A.status,
         statusText: A.statusText,
@@ -2396,17 +2403,17 @@ 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, ...T } = d, x = typeof S == "string" ? Utils.isJSON(S.trim()) : !1, O = {
+        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 = {
           headers: A,
           status: D,
           message: ""
         };
         if (x) {
           const C = JSON.parse(S.trim()), N = E.errorsHandler.getErrorMessageFromData(D, C);
-          O.message = N, O.data = C, g.msg = E.errorsHandler.gerErrorByStatusCordovaHttp(D, p);
+          T.message = N, T.data = C, g.msg = E.errorsHandler.gerErrorByStatusCordovaHttp(D, p);
         } else
-          typeof S == "string" && (O.message = S);
-        n({ ...f, ...g, errExt: O });
+          typeof S == "string" && (T.message = S);
+        n({ ...f, ...g, errExt: T });
       }
     );
   } else
@@ -2415,7 +2422,7 @@ c(E, "keyCookie", "AuthCookie"), c(E, "cookieOptions", {}), c(E, "registerReques
       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: T } = w, x = {
+      const d = E.errorsHandler.handleError(w), { code: g, config: p, status: D, message: A, response: S, stack: O } = w, x = {
         code: g,
         config: p,
         status: D || u,
@@ -2423,7 +2430,7 @@ c(E, "keyCookie", "AuthCookie"), c(E, "cookieOptions", {}), c(E, "registerReques
         headers: S == null ? void 0 : S.headers,
         statusText: S == null ? void 0 : S.statusText,
         data: S == null ? void 0 : S.data,
-        stack: T
+        stack: O
       };
       n({ ...f, ...d, errExt: x });
     });

package/package.json

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