dev-classes 1.0.5 → 1.0.6

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 f = (l, t, n) => (b(l, typeof t != "symbol" ? t + "" : t, n), n);
-const s = class s {
+var T = (l, t, n) => (b(l, typeof t != "symbol" ? t + "" : t, n), n);
+const a = class a {
   /**
    * https://stackoverflow.com/a/54070620/6758968
    * r, g, b in [0, 255]
@@ -9,8 +9,8 @@ const s = class s {
    */
   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), i = o && (r === t ? (n - e) / o : r == n ? 2 + (e - t) / o : 4 + (t - n) / o);
-    return [60 * (i < 0 ? i + 6 : i), r && o / r, r];
+    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];
   }
   /**
    * https://stackoverflow.com/a/54024653/6758968
@@ -20,7 +20,7 @@ const s = class s {
    * @returns r, g, b in [0, 255]
    */
   static hsvToRgb(t, n, e) {
-    const r = (o, i = (o + t / 60) % 6) => Math.round((e - e * n * Math.max(Math.min(i, 4 - i, 1), 0)) * 255);
+    const r = (o, s = (o + t / 60) % 6) => Math.round((e - e * n * Math.max(Math.min(s, 4 - s, 1), 0)) * 255);
     return [r(5), r(3), r(1)];
   }
   /**
@@ -28,30 +28,30 @@ const s = class s {
    */
   static rgbaToHsla(t, n, e, r = 1) {
     t /= 255, n /= 255, e /= 255;
-    const o = Math.max(t, n, e), i = Math.min(t, n, e);
-    let a = 0, c;
-    const u = (o + i) / 2;
-    if (o === i)
-      a = c = 0;
+    const o = Math.max(t, n, e), s = Math.min(t, n, e);
+    let i = 0, c;
+    const h = (o + s) / 2;
+    if (o === s)
+      i = c = 0;
     else {
-      const g = o - i;
-      switch (c = u > 0.5 ? g / (2 - o - i) : g / (o + i), o) {
+      const g = o - s;
+      switch (c = h > 0.5 ? g / (2 - o - s) : g / (o + s), o) {
         case t:
-          a = (n - e) / g + (n < e ? 6 : 0);
+          i = (n - e) / g + (n < e ? 6 : 0);
           break;
         case n:
-          a = (e - t) / g + 2;
+          i = (e - t) / g + 2;
           break;
         case e:
-          a = (t - n) / g + 4;
+          i = (t - n) / g + 4;
           break;
       }
-      a /= 6;
+      i /= 6;
     }
     return {
-      h: a * 360,
+      h: i * 360,
       s: c * 100,
-      l: u * 100,
+      l: h * 100,
       a: r
     };
   }
@@ -67,20 +67,20 @@ const s = class s {
    */
   static hslaToRgba(t, n, e, r) {
     t /= 360, n /= 100, e /= 100;
-    let o, i, a;
+    let o, s, i;
     if (n === 0)
-      o = i = a = e;
+      o = s = i = e;
     else {
-      const c = function(m, T, h) {
-        return h < 0 && (h += 1), h > 1 && (h -= 1), h < 0.16666666666666666 ? m + (T - m) * 6 * h : h < 0.5 ? T : h < 0.6666666666666666 ? m + (T - m) * (0.6666666666666666 - h) * 6 : m;
-      }, u = e < 0.5 ? e * (1 + n) : e + n - e * n, g = 2 * e - u;
-      o = c(g, u, t + 1 / 3), i = c(g, u, t), a = c(g, u, t - 1 / 3);
+      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;
+      }, 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);
     }
-    return [o, i, a, r].map((c) => Math.round(c * 255));
+    return [o, s, 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 s.hslaToRgba(r[0], r[1], r[2], e);
+    return a.hslaToRgba(r[0], r[1], r[2], e);
   }
   static hexaToRgba(t) {
     const n = [], e = t[0] === "#" ? 1 : 0;
@@ -97,20 +97,21 @@ const s = class s {
     return n;
   }
   static hexToRgb(t) {
-    return s.hexaToRgba(t.slice(0, 7));
+    return a.hexaToRgba(t.slice(0, 7));
   }
   static hexaToHsla(t) {
-    const n = s.hexaToRgba(t);
-    return s.rgbaToHsla(n[0], n[1], n[2], n[3]);
+    const n = a.hexaToRgba(t);
+    return a.rgbaToHsla(n[0], n[1], n[2], n[3]);
   }
   static rgbaToHexa(t) {
-    return "#" + t.map((n) => ("0" + n.toString(16)).slice(-2)).join("");
+    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);
   }
   static hslaStringToHexa(t) {
-    return s.rgbaToHexa(s.hslaStringToRgba(t));
+    return a.rgbaToHexa(a.hslaStringToRgba(t));
   }
   static hslaStringToHex(t) {
-    return s.hslaStringToHexa(t).slice(0, -2);
+    return a.hslaStringToHexa(t).slice(0, -2);
   }
   /**
    * @param weight [0, 1]
@@ -118,8 +119,8 @@ const s = class s {
   static mixColors(t, n, e) {
     const r = new Array(3);
     for (let o = 0; o < 3; ++o) {
-      const i = t[o], a = n[o];
-      r[o] = Math.floor(a + (i - a) * e);
+      const s = t[o], i = n[o];
+      r[o] = Math.floor(i + (s - i) * e);
     }
     return r;
   }
@@ -130,32 +131,32 @@ const s = class s {
     return t.map((e, r) => Math.round((e + n[r]) / 2));
   }
   static getAccentColor(t, n, e) {
-    const r = s.rgbToHsv(...n), o = s.rgbToHsv(...e), i = 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] + i - 1) * t[2] / i), r[2] < 0.3 ? e : s.hsvToRgb(...r);
+    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);
   }
   static changeColorAccent(t, n, e, r) {
-    const o = s.rgbToHsv(...e);
+    const o = a.rgbToHsv(...e);
     if (Math.min(Math.abs(o[0] - t[0]), Math.abs(o[0] - t[0] - 360)) > 30)
       return e;
-    const a = 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 - a + a * n[2] / t[2])) : 0;
-    let c = s.hsvToRgb(...o);
-    const u = s.computePerceivedBrightness(e), g = s.computePerceivedBrightness(c);
-    if (r ? u > g : u < g) {
-      const T = 0.4 * u / g + 0.6;
-      c = s.changeBrightness(c, T);
+    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);
+    if (r ? h > g : h < g) {
+      const p = 0.4 * h / g + 0.6;
+      c = a.changeBrightness(c, p);
     }
     return c;
   }
   static changeBrightness(t, n) {
-    return t.map((e) => s.clamp(Math.round(e * n), 0, 255));
+    return t.map((e) => a.clamp(Math.round(e * n), 0, 255));
   }
   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 s.hexToRgb(s.getHexColorFromTelegramColor(t));
+    return a.hexToRgb(a.getHexColorFromTelegramColor(t));
   }
   static getColorsFromWallPaper(t) {
     return t.settings ? [
@@ -163,11 +164,11 @@ const s = class s {
       t.settings.second_background_color,
       t.settings.third_background_color,
       t.settings.fourth_background_color
-    ].filter(Boolean).map(s.getHexColorFromTelegramColor).join(",") : "";
+    ].filter(Boolean).map(a.getHexColorFromTelegramColor).join(",") : "";
   }
   static rgbaToRgb(t, n) {
     const e = t[3];
-    return t.slice(0, 3).map((r, o) => s.clamp(Math.round((e * (r / 255) + e * (n[o] / 255)) * 255), 0, 255));
+    return t.slice(0, 3).map((r, o) => a.clamp(Math.round((e * (r / 255) + e * (n[o] / 255)) * 255), 0, 255));
   }
   static calculateLuminance(t) {
     const [n, e, r] = t;
@@ -185,14 +186,14 @@ const s = class s {
   }
 };
 /*Проверить свои методы и возможно исключить т.к. функционал возможно повторяется */
-f(s, "componentToHex", (t) => {
+T(a, "componentToHex", (t) => {
   var n = t.toString(16);
   return n.length == 1 ? "0" + n : n;
-}), f(s, "getNumberRGB", (t) => {
+}), T(a, "getNumberRGB", (t) => {
   let n = t.match(/\d+/gi);
   return n != null && n.length ? n.map((e) => Number(e)) : n || [255, 255, 255];
-}), f(s, "rgbToHex", (t, n, e) => "#" + s.componentToHex(t) + s.componentToHex(n) + s.componentToHex(e));
-let p = s;
+}), T(a, "rgbToHex", (t, n, e) => "#" + a.componentToHex(t) + a.componentToHex(n) + a.componentToHex(e));
+let f = a;
 export {
-  p as Color
+  f as Color
 };

package/dist/classes/DateProcessing.js

@@ -110,13 +110,7 @@ n(t, "getActiveColorClassInDiffDate", (e, r, a) => {
   if (e === a)
     return "Сегодня";
   const s = t.hasDateLessInNumber(e, a);
-  if (s === 1)
-    return "Вчера";
-  if (s === 2)
-    return "Позавчера";
-  console.dir(e);
-  const c = t.correctionDate(e, { shortYear: !0, withOutCurrentYear: r.withOutCurrentYear });
-  return console.dir(c), c;
+  return s === 1 ? "Вчера" : s === 2 ? "Позавчера" : t.correctionDate(e, { shortYear: !0, withOutCurrentYear: r.withOutCurrentYear });
 });
 let f = t;
 window.DateProcessing = f;

package/dist/classes/Delay.js

@@ -1,21 +1,21 @@
-var A = Object.defineProperty;
-var p = (o, e, t) => e in o ? A(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
-var I = (o, e, t) => (p(o, typeof e != "symbol" ? e + "" : e, t), t);
-class d {
+var p = Object.defineProperty;
+var d = (u, e, t) => e in u ? p(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t;
+var A = (u, e, t) => (d(u, typeof e != "symbol" ? e + "" : e, t), t);
+class y {
   constructor() {
-    I(this, "startActionEvery", (e, t = { interval: 5e3 }) => {
+    A(this, "startActionEvery", (e, t = { interval: 5e3 }) => {
       const r = (s) => {
         typeof (t == null ? void 0 : t.watchIdInterval) == "function" && (t == null || t.watchIdInterval(s));
-      }, n = (s) => {
+      }, v = (s) => {
         typeof (t == null ? void 0 : t.controlAction) == "function" && (t == null || t.controlAction(s));
       };
       return new Promise((s, a) => {
-        let v = 0, u = 0;
+        let n = 0, I = 0;
         const l = {
           isActive: !0
         }, m = setInterval(
           () => {
-            if (v += t.interval, u += 1, t != null && t.cutoffTime && v > t.cutoffTime || t != null && t.countAction && (t == null ? void 0 : t.countAction) < u) {
+            if (n += t.interval, I += 1, t != null && t.cutoffTime && n > t.cutoffTime || t != null && t.countAction && (t == null ? void 0 : t.countAction) < I) {
               l.isActive = !1, clearInterval(m), r(null), a({ status: !1, msg: Error("Время загрузки истекло") });
               return;
             }
@@ -23,44 +23,44 @@ class d {
           },
           t.interval < 200 ? 200 : t.interval
         );
-        r(m), n({
+        r(m), v({
           getIsActiveEvent: () => l.isActive,
           stop: () => {
-            const i = "Ручное завершение startActionEvery";
-            console.dir(`controlAction (stop): ${i}`), l.isActive = !1, clearInterval(m), r(null), s({ status: !0, msg: i });
+            const o = "Ручное завершение startActionEvery";
+            l.isActive = !1, clearInterval(m), r(null), s({ status: !0, msg: o });
           }
         });
       });
     });
-    I(this, "oneOf", (e, t, { second: r }) => {
-      let n = 1;
+    A(this, "oneOf", (e, t, { second: r }) => {
+      let v = 1;
       e().then(() => {
-        n === 1 && (n = 0);
+        v === 1 && (v = 0);
       });
       let s = setInterval(() => {
-        console.dir("setInterval в oneOf"), n === 1 && t(), clearInterval(s);
+        v === 1 && t(), clearInterval(s);
       }, r * 1e3);
     });
-    I(this, "oneOfPromise", (e, t, { second: r }) => new Promise((n, s) => {
-      let a = 1, v = { status: !1, msg: "" };
+    A(this, "oneOfPromise", (e, t, { second: r }) => new Promise((v, s) => {
+      let a = 1, n = { status: !1, msg: "" };
       e().then((l) => {
-        console.log("DelaysPromise.oneOfPromise (promiseWatch ==> data)", l), a === 1 && (a = 0, n(l));
+        a === 1 && (a = 0, v(l));
       }).catch((l) => {
-        a === 1 && (a = 0, v.msg = l, s(l));
+        a === 1 && (a = 0, n.msg = l, s(l));
       });
-      let u = setInterval(() => {
-        if (console.log("DelaysPromise.oneOfPromise (interval ==> potentialCaseCB)"), a === 1) {
+      let I = setInterval(() => {
+        if (a === 1) {
           if (a = 0, typeof t == "function") {
-            s({ status: !1, msg: "", ...t(v) });
+            s({ status: !1, msg: "", ...t(n) });
             return;
           }
           s({ status: !1, msg: "oneOfPromise reject" });
         }
-        clearInterval(u);
+        clearInterval(I);
       }, r * 1e3);
     }));
   }
 }
 export {
-  d as DelaysPromise
+  y as DelaysPromise
 };

package/package.json

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