dev-classes 1.0.7 → 1.0.9

package/dist/classes/Color.d.ts

@@ -1,6 +1,7 @@
 export type ColorRgba = [number, number, number, number];
 export type ColorRgb = [number, number, number];
 export type ColorHsla = Record<"h" | "s" | "l" | "a", number>;
+export type TypeBrightness_OR = "BT601" | "BT709" | "BT2020";
 export declare class Color {
     private static componentToHex;
     static getNumberRGB: (getComputedStyleRGB: string) => number[] | RegExpMatchArray;
@@ -44,16 +45,18 @@ export declare class Color {
      * @param weight [0, 1]
      */
     static mixColors(color1: ColorRgb, color2: ColorRgb, weight: number): ColorRgb;
-    static computePerceivedBrightness(color: ColorRgb): number;
+    static getRgbByTypeBrightness(type: TypeBrightness_OR): number[];
+    static computePerceivedBrightness(color: ColorRgb, type?: TypeBrightness_OR): number;
     static getAverageColor(color1: ColorRgb, color2: ColorRgb): ColorRgb;
     static getAccentColor(baseHsv: number[], baseColor: ColorRgb, elementColor: ColorRgb): ColorRgb;
     static changeColorAccent(baseHsv: number[], accentHsv: number[], color: ColorRgb, isDarkTheme: boolean): ColorRgb;
     static changeBrightness(color: ColorRgb, amount: number): ColorRgb;
+    static hexBrightness(hex: string, amount: number): any;
     static getHexColorFromTelegramColor(color: number): string;
     static getRgbColorFromTelegramColor(color: number): ColorRgb;
     static getColorsFromWallPaper(wallPaper: any): string;
     static rgbaToRgb(rgba: ColorRgba, bg: ColorRgb): ColorRgb;
-    static calculateLuminance(rgb: ColorRgb): number;
+    static calculateLuminance(rgb: ColorRgb, type?: TypeBrightness_OR): number;
     static getTextColor(luminance: number): ColorRgb;
     static calculateOpacity(luminance: number, targetContrast: number): number;
     static clamp(v: number, min: number, max: number): number;

package/dist/classes/Color.js

@@ -1,7 +1,7 @@
-var d = Object.defineProperty;
-var b = (l, t, n) => t in l ? d(l, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : l[t] = n;
-var T = (l, t, n) => (b(l, typeof t != "symbol" ? t + "" : t, n), n);
-const a = class a {
+var M = Object.defineProperty;
+var b = (l, t, n) => t in l ? M(l, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : l[t] = n;
+var p = (l, t, n) => (b(l, typeof t != "symbol" ? t + "" : t, n), n);
+const o = class o {
   /**
    * https://stackoverflow.com/a/54070620/6758968
    * r, g, b in [0, 255]
@@ -9,8 +9,8 @@ const a = class a {
    */
   static rgbToHsv(t, n, e) {
     t /= 255, n /= 255, e /= 255;
-    const r = Math.max(t, n, e), o = r - Math.min(t, n, e), s = o && (r === t ? (n - e) / o : r == n ? 2 + (e - t) / o : 4 + (t - n) / o);
-    return [60 * (s < 0 ? s + 6 : s), r && o / r, r];
+    const r = Math.max(t, n, e), s = r - Math.min(t, n, e), a = s && (r === t ? (n - e) / s : r == n ? 2 + (e - t) / s : 4 + (t - n) / s);
+    return [60 * (a < 0 ? a + 6 : a), r && s / r, r];
   }
   /**
    * https://stackoverflow.com/a/54024653/6758968
@@ -20,7 +20,7 @@ const a = class a {
    * @returns r, g, b in [0, 255]
    */
   static hsvToRgb(t, n, e) {
-    const r = (o, s = (o + t / 60) % 6) => Math.round((e - e * n * Math.max(Math.min(s, 4 - s, 1), 0)) * 255);
+    const r = (s, a = (s + t / 60) % 6) => Math.round((e - e * n * Math.max(Math.min(a, 4 - a, 1), 0)) * 255);
     return [r(5), r(3), r(1)];
   }
   /**
@@ -28,14 +28,14 @@ const a = class a {
    */
   static rgbaToHsla(t, n, e, r = 1) {
     t /= 255, n /= 255, e /= 255;
-    const o = Math.max(t, n, e), s = Math.min(t, n, e);
+    const s = Math.max(t, n, e), a = Math.min(t, n, e);
     let i = 0, c;
-    const h = (o + s) / 2;
-    if (o === s)
+    const h = (s + a) / 2;
+    if (s === a)
       i = c = 0;
     else {
-      const g = o - s;
-      switch (c = h > 0.5 ? g / (2 - o - s) : g / (o + s), o) {
+      const g = s - a;
+      switch (c = h > 0.5 ? g / (2 - s - a) : g / (s + a), s) {
         case t:
           i = (n - e) / g + (n < e ? 6 : 0);
           break;
@@ -67,20 +67,20 @@ const a = class a {
    */
   static hslaToRgba(t, n, e, r) {
     t /= 360, n /= 100, e /= 100;
-    let o, s, i;
+    let s, a, i;
     if (n === 0)
-      o = s = i = e;
+      s = a = i = e;
     else {
-      const c = function(m, p, u) {
-        return u < 0 && (u += 1), u > 1 && (u -= 1), u < 0.16666666666666666 ? m + (p - m) * 6 * u : u < 0.5 ? p : u < 0.6666666666666666 ? m + (p - m) * (0.6666666666666666 - u) * 6 : m;
+      const c = function(m, T, u) {
+        return u < 0 && (u += 1), u > 1 && (u -= 1), u < 0.16666666666666666 ? m + (T - m) * 6 * u : u < 0.5 ? T : u < 0.6666666666666666 ? m + (T - m) * (0.6666666666666666 - u) * 6 : m;
       }, h = e < 0.5 ? e * (1 + n) : e + n - e * n, g = 2 * e - h;
-      o = c(g, h, t + 1 / 3), s = c(g, h, t), i = c(g, h, t - 1 / 3);
+      s = c(g, h, t + 1 / 3), a = c(g, h, t), i = c(g, h, t - 1 / 3);
     }
-    return [o, s, i, r].map((c) => Math.round(c * 255));
+    return [s, a, i, r].map((c) => Math.round(c * 255));
   }
   static hslaStringToRgba(t) {
-    const n = t.slice(5, -1).split(", "), e = Number(n.pop()), r = n.map((o) => o.endsWith("%") ? +o.slice(0, -1) : +o);
-    return a.hslaToRgba(r[0], r[1], r[2], e);
+    const n = t.slice(5, -1).split(", "), e = Number(n.pop()), r = n.map((s) => s.endsWith("%") ? +s.slice(0, -1) : +s);
+    return o.hslaToRgba(r[0], r[1], r[2], e);
   }
   static hexaToRgba(t) {
     const n = [], e = t[0] === "#" ? 1 : 0;
@@ -97,66 +97,78 @@ const a = class a {
     return n;
   }
   static hexToRgb(t) {
-    return a.hexaToRgba(t.slice(0, 7));
+    return o.hexaToRgba(t.slice(0, 7));
   }
   static hexaToHsla(t) {
-    const n = a.hexaToRgba(t);
-    return a.rgbaToHsla(n[0], n[1], n[2], n[3]);
+    const n = o.hexaToRgba(t);
+    return o.rgbaToHsla(n[0], n[1], n[2], n[3]);
   }
   static rgbaToHexa(t) {
     const n = [...t], e = n.pop(), r = Math.round(Math.min(Math.max(e ?? 1, 0), 1) * 255);
-    return "#" + n.map((o) => ("0" + o.toString(16)).slice(-2)).join("") + r.toString(16);
+    return "#" + n.map((s) => ("0" + s.toString(16)).slice(-2)).join("") + r.toString(16);
   }
   static hslaStringToHexa(t) {
-    return a.rgbaToHexa(a.hslaStringToRgba(t));
+    return o.rgbaToHexa(o.hslaStringToRgba(t));
   }
   static hslaStringToHex(t) {
-    return a.hslaStringToHexa(t).slice(0, -2);
+    return o.hslaStringToHexa(t).slice(0, -2);
   }
   /**
    * @param weight [0, 1]
    */
   static mixColors(t, n, e) {
     const r = new Array(3);
-    for (let o = 0; o < 3; ++o) {
-      const s = t[o], i = n[o];
-      r[o] = Math.floor(i + (s - i) * e);
+    for (let s = 0; s < 3; ++s) {
+      const a = t[s], i = n[s];
+      r[s] = Math.floor(i + (a - i) * e);
     }
     return r;
   }
-  static computePerceivedBrightness(t) {
-    return (t[0] * 0.2126 + t[1] * 0.7152 + t[2] * 0.0722) / 255;
+  static getRgbByTypeBrightness(t) {
+    return {
+      BT601: [0.299, 0.587, 0.114],
+      BT709: [0.2126, 0.7152, 0.0722],
+      BT2020: [0.2627, 0.678, 0.0593]
+    }[t];
+  }
+  static computePerceivedBrightness(t, n = "BT709") {
+    const e = o.getRgbByTypeBrightness(n);
+    return (t[0] * e[n][0] + t[1] * e[n][1] + t[2] * e[n][2]) / 255;
   }
   static getAverageColor(t, n) {
     return t.map((e, r) => Math.round((e + n[r]) / 2));
   }
   static getAccentColor(t, n, e) {
-    const r = a.rgbToHsv(...n), o = a.rgbToHsv(...e), s = Math.min(1.5 * r[1] / t[1], 1);
-    return r[0] = Math.min(360, o[0] - r[0] + t[0]), r[1] = Math.min(1, o[1] * t[1] / r[1]), r[2] = Math.min(1, (o[2] / r[2] + s - 1) * t[2] / s), r[2] < 0.3 ? e : a.hsvToRgb(...r);
+    const r = o.rgbToHsv(...n), s = o.rgbToHsv(...e), a = Math.min(1.5 * r[1] / t[1], 1);
+    return r[0] = Math.min(360, s[0] - r[0] + t[0]), r[1] = Math.min(1, s[1] * t[1] / r[1]), r[2] = Math.min(1, (s[2] / r[2] + a - 1) * t[2] / a), r[2] < 0.3 ? e : o.hsvToRgb(...r);
   }
   static changeColorAccent(t, n, e, r) {
-    const o = a.rgbToHsv(...e);
-    if (Math.min(Math.abs(o[0] - t[0]), Math.abs(o[0] - t[0] - 360)) > 30)
+    const s = o.rgbToHsv(...e);
+    if (Math.min(Math.abs(s[0] - t[0]), Math.abs(s[0] - t[0] - 360)) > 30)
       return e;
-    const i = t[1] ? Math.min(1.5 * o[1] / t[1], 1) : 0;
-    o[0] = Math.min(360, o[0] + n[0] - t[0]), o[1] = t[1] ? Math.min(1, o[1] * n[1] / t[1]) : 0, o[2] = t[2] ? Math.min(1, o[2] * (1 - i + i * n[2] / t[2])) : 0;
-    let c = a.hsvToRgb(...o);
-    const h = a.computePerceivedBrightness(e), g = a.computePerceivedBrightness(c);
+    const i = t[1] ? Math.min(1.5 * s[1] / t[1], 1) : 0;
+    s[0] = Math.min(360, s[0] + n[0] - t[0]), s[1] = t[1] ? Math.min(1, s[1] * n[1] / t[1]) : 0, s[2] = t[2] ? Math.min(1, s[2] * (1 - i + i * n[2] / t[2])) : 0;
+    let c = o.hsvToRgb(...s);
+    const h = o.computePerceivedBrightness(e), g = o.computePerceivedBrightness(c);
     if (r ? h > g : h < g) {
-      const p = 0.4 * h / g + 0.6;
-      c = a.changeBrightness(c, p);
+      const T = 0.4 * h / g + 0.6;
+      c = o.changeBrightness(c, T);
     }
     return c;
   }
   static changeBrightness(t, n) {
-    return t.map((e) => a.clamp(Math.round(e * n), 0, 255));
+    return t.map((e) => o.clamp(Math.round(e * n), 0, 255));
+  }
+  static hexBrightness(t, n) {
+    const e = o.hexToRgb(t), r = o.changeBrightness(e, n), [s, a, i] = r;
+    return o.rgbToHex(s, a, i);
   }
   static getHexColorFromTelegramColor(t) {
     const n = (t < 0 ? 16777215 + t : t).toString(16);
     return "#" + (n.length >= 6 ? n : "0".repeat(6 - n.length) + n);
   }
   static getRgbColorFromTelegramColor(t) {
-    return a.hexToRgb(a.getHexColorFromTelegramColor(t));
+    return o.hexToRgb(o.getHexColorFromTelegramColor(t));
   }
   static getColorsFromWallPaper(t) {
     return t.settings ? [
@@ -164,15 +176,15 @@ const a = class a {
       t.settings.second_background_color,
       t.settings.third_background_color,
       t.settings.fourth_background_color
-    ].filter(Boolean).map(a.getHexColorFromTelegramColor).join(",") : "";
+    ].filter(Boolean).map(o.getHexColorFromTelegramColor).join(",") : "";
   }
   static rgbaToRgb(t, n) {
     const e = t[3];
-    return t.slice(0, 3).map((r, o) => a.clamp(Math.round((e * (r / 255) + e * (n[o] / 255)) * 255), 0, 255));
+    return t.slice(0, 3).map((r, s) => o.clamp(Math.round((e * (r / 255) + e * (n[s] / 255)) * 255), 0, 255));
   }
-  static calculateLuminance(t) {
-    const [n, e, r] = t;
-    return 0.2126 * n / 255 + 0.7152 * e / 255 + 0.0722 * r / 255;
+  static calculateLuminance(t, n = "BT709") {
+    const [e, r, s] = t, a = o.getRgbByTypeBrightness(n);
+    return a[0] * e / 255 + a[1] * r / 255 + a[2] * s / 255;
   }
   static getTextColor(t) {
     return t > 0.5 ? [0, 0, 0] : [255, 255, 255];
@@ -186,14 +198,14 @@ const a = class a {
   }
 };
 /*Проверить свои методы и возможно исключить т.к. функционал возможно повторяется */
-T(a, "componentToHex", (t) => {
+p(o, "componentToHex", (t) => {
   var n = t.toString(16);
   return n.length == 1 ? "0" + n : n;
-}), T(a, "getNumberRGB", (t) => {
+}), p(o, "getNumberRGB", (t) => {
   let n = t.match(/\d+/gi);
   return n != null && n.length ? n.map((e) => Number(e)) : n || [255, 255, 255];
-}), T(a, "rgbToHex", (t, n, e) => "#" + a.componentToHex(t) + a.componentToHex(n) + a.componentToHex(e));
-let f = a;
+}), p(o, "rgbToHex", (t, n, e) => "#" + o.componentToHex(t) + o.componentToHex(n) + o.componentToHex(e));
+let f = o;
 export {
   f as Color
 };

package/package.json

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