oberknecht-utils - npm Package Compare versions

Comparing version 1.4.8 to 1.4.9

lib-js/utils/index.d.ts

@@ -56,2 +56,3 @@ export * from "./cleanChannelName";
 export * from "./splitPixelize";
+export * from "./concatJSON";
 export * from "../variables/regex";

lib-js/utils/index.js

@@ -72,2 +72,3 @@ "use strict";
 __exportStar(require("./splitPixelize"), exports);
+__exportStar(require("./concatJSON"), exports);
 __exportStar(require("../variables/regex"), exports);

lib-js/utils/log.d.ts

@@ -1,1 +0,5 @@
-export declare function log(logopt: number | string, logmsg?: any, logcolorfg?: string, logcolorbg?: string): void;
+import { logOptConfigType } from "../types/log";
+declare const logOpts: number[];
+type logOptsType = typeof logOpts[number];
+export declare function log(logOpt: logOptConfigType | logOptsType | any, ...logMsg: any): void;
+export {};

lib-js/utils/log.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.log = void 0;
-function date_() {
-    return new Date(new Date().setMinutes(new Date().getMinutes() - new Date().getTimezoneOffset()))
-        .toISOString()
-        .split("Z")[0]
-        .replace("T", " ");
-}
-function log(logopt, logmsg, logcolorfg, logcolorbg) {
+const _1 = require(".");
+const maxGlobalLogs = 100;
+const casecolors = {
+    fg: { "0": "", "1": "30", "2": "41" },
+    bg: { "0": "", "1": "43", "2": "41" },
+};
+const logOpts = [1, 2, 3];
+function log(logOpt, ...logMsg) {
     if (!global.logs)
         global.logs = {};
-    if (!global.logs[String(logopt)])
-        global.logs[String(logopt)] = {};
+    if (!global.logs[String(logOpt)])
+        global.logs[String(logOpt)] = {};
     if (!global.logs.all)
         global.logs.all = {};
-    if (typeof logmsg === "string") {
-        if (global.logs)
-            global.logs.all[Date.now()] = global.logs[String(logopt)][Date.now()] = [
-                logopt,
-                logmsg?.replace(/\x1b\[[\w;]+m/g, ""),
-                date_(),
-            ];
-    }
-    if (!logmsg && logopt) {
-        logmsg = logopt;
-        logopt = 0;
-    }
-    const logcolors = {
-        reset: "0",
-        bright: "1",
-        dim: "2",
-        underscore: "4",
-        blink: "5",
-        reverse: "7",
-        hidden: "8",
-        fgblack: "30",
-        fgred: "31",
-        fggreen: "32",
-        fgyellow: "33",
-        fgblue: "34",
-        fgmagenta: "35",
-        fgcyan: "36",
-        fgwhite: "37",
-        bgblack: "40",
-        bgred: "41",
-        bggreen: "42",
-        bgyellow: "43",
-        bgblue: "44",
-        bgmagenta: "45",
-        bgcyan: "46",
-        bgwhite: "47",
+    let logOptOption = logOpt?.option ?? (logOpts.includes(logOpt) ? logOpt : 0);
+    let logOpt_ = {
+        option: logOptOption,
+        logColorFG: logOpt?.logColorFG ?? casecolors.fg[logOptOption] ?? "0",
+        logColorBG: logOpt?.logColorBG ?? casecolors.bg[logOptOption] ?? "0",
     };
-    const casecolors = {
-        fg: { "0": "", "1": "30", "2": "41" },
-        bg: { "0": "", "1": "43", "2": "41" },
-    };
-    logcolorfg = `\x1b[${(logcolorfg ?? 0) === 0
-        ? casecolors.fg[logopt ?? 0]
-        : logcolors[logcolorfg]
-            ? logcolors[logcolorfg]
-            : logcolorfg ?? casecolors.fg[logopt ?? 0]}m`;
-    logcolorbg = `\x1b[${(logcolorbg ?? 0) === 0
-        ? casecolors.bg[logopt ?? 0]
-        : logcolors[logcolorbg]
-            ? logcolors[logcolorbg]
-            : logcolorbg ?? casecolors[logopt ?? 0]}m`;
+    let logMsg_ = [...logMsg];
+    if (((0, _1.extendedTypeof)(logOpt) !== "json" ||
+        (!logOpt.option && !logOpt.logColorFG && !logOpt.logColorBG)) &&
+        !logOpts.includes(logOpt))
+        logMsg_.unshift(logOpt);
+    [(global.logs[String(logOptOption)], global.logs.all)].forEach((a) => {
+        a = (0, _1.concatJSON)(Object.keys(a ?? {})
+            .slice(0, maxGlobalLogs)
+            .map((b) => {
+            return { [b]: a[b] };
+        }));
+    });
+    if (global.logs)
+        global.logs.all[Date.now()] = global.logs[String(logOpt)][Date.now()] = [
+            logOpt_,
+            logMsg_?.map((a) => {
+                if (typeof a === "string")
+                    return a?.replace(/\x1b\[[\w;]+m/g, "");
+                return a;
+            }),
+            (0, _1.getDateParsed)(),
+        ];
+    logOpt = logOpt ?? 0;
+    const logcolorfg = `\x1b[${logOpt_.logColorFG}m`;
+    const logcolorbg = `\x1b[${logOpt_.logColorBG}m`;
     const logm = [
-        `${logcolorbg}${logcolorfg} ${date_()} \x1b[0m >`,
-        logmsg?.error?.message ?? logmsg?.error ?? logmsg?.message ?? logmsg,
+        `${logcolorbg}${logcolorfg} ${(0, _1.getDateParsed)()} \x1b[0m >`,
+        ...logMsg_,
     ];
-    switch (logopt) {
+    switch (logOpt) {
         default:
@@ -74,0 +55,0 @@ case 0:

lib-ts/utils/index.ts

@@ -56,3 +56,4 @@ export * from "./cleanChannelName";
 export * from "./splitPixelize";
+export * from "./concatJSON";
 
 export * from "../variables/regex";

lib-ts/utils/log.ts

@@ -1,84 +0,70 @@
-function date_() {
-  return new Date(
-    new Date().setMinutes(
-      new Date().getMinutes() - new Date().getTimezoneOffset()
-    )
-  )
-    .toISOString()
-    .split("Z")[0]
-    .replace("T", " ");
-}
+import { concatJSON, extendedTypeof, getDateParsed, regex, returnErr } from ".";
+import { logColorValues, logColors, logOptConfigType } from "../types/log";
 
+const maxGlobalLogs = 100;
+
+const casecolors = {
+  fg: { "0": "", "1": "30", "2": "41" },
+  bg: { "0": "", "1": "43", "2": "41" },
+};
+
+const logOpts = [1, 2, 3];
+type logOptsType = typeof logOpts[number];
+
 export function log(
-  logopt: number | string,
-  logmsg?: any,
-  logcolorfg?: string,
-  logcolorbg?: string
+  logOpt: logOptConfigType | logOptsType | any,
+  ...logMsg: any
 ): void {
   if (!global.logs) global.logs = {};
-  if (!global.logs[String(logopt)]) global.logs[String(logopt)] = {};
+  if (!global.logs[String(logOpt)]) global.logs[String(logOpt)] = {};
   if (!global.logs.all) global.logs.all = {};
-  if (typeof logmsg === "string") {
-    if (global.logs)
-      global.logs.all[Date.now()] = global.logs[String(logopt)][Date.now()] = [
-        logopt,
-        logmsg?.replace(/\x1b\[[\w;]+m/g, ""),
-        date_(),
-      ];
-  }
-  if (!logmsg && logopt) {
-    logmsg = logopt;
-    logopt = 0;
-  }
 
-  const logcolors = {
-    reset: "0",
-    bright: "1",
-    dim: "2",
-    underscore: "4",
-    blink: "5",
-    reverse: "7",
-    hidden: "8",
-    fgblack: "30",
-    fgred: "31",
-    fggreen: "32",
-    fgyellow: "33",
-    fgblue: "34",
-    fgmagenta: "35",
-    fgcyan: "36",
-    fgwhite: "37",
-    bgblack: "40",
-    bgred: "41",
-    bggreen: "42",
-    bgyellow: "43",
-    bgblue: "44",
-    bgmagenta: "45",
-    bgcyan: "46",
-    bgwhite: "47",
+  let logOptOption = logOpt?.option ?? (logOpts.includes(logOpt) ? logOpt : 0);
+
+  let logOpt_: logOptConfigType = {
+    option: logOptOption,
+    logColorFG: logOpt?.logColorFG ?? casecolors.fg[logOptOption] ?? "0",
+    logColorBG: logOpt?.logColorBG ?? casecolors.bg[logOptOption] ?? "0",
   };
-  const casecolors = {
-    fg: { "0": "", "1": "30", "2": "41" },
-    bg: { "0": "", "1": "43", "2": "41" },
-  };
-  
-  logcolorfg = `\x1b[${
-    (logcolorfg ?? 0) === 0
-      ? casecolors.fg[logopt ?? 0]
-      : logcolors[logcolorfg]
-      ? logcolors[logcolorfg]
-      : logcolorfg ?? casecolors.fg[logopt ?? 0]
-  }m`;
-  
-  logcolorbg = `\x1b[${
-    (logcolorbg ?? 0) === 0
-      ? casecolors.bg[logopt ?? 0]
-      : logcolors[logcolorbg]
-      ? logcolors[logcolorbg]
-      : logcolorbg ?? casecolors[logopt ?? 0]
-  }m`;
+
+  let logMsg_ = [...logMsg];
+
+  if (
+    (extendedTypeof(logOpt) !== "json" ||
+      (!logOpt.option && !logOpt.logColorFG && !logOpt.logColorBG)) &&
+    !logOpts.includes(logOpt)
+  )
+    logMsg_.unshift(logOpt);
+
+  [(global.logs[String(logOptOption)], global.logs.all)].forEach((a) => {
+    a = concatJSON(
+      Object.keys(a ?? {})
+        .slice(0, maxGlobalLogs)
+        .map((b) => {
+          return { [b]: a[b] };
+        })
+    );
+  });
+
+  if (global.logs)
+    global.logs.all[Date.now()] = global.logs[String(logOpt)][Date.now()] = [
+      logOpt_,
+      logMsg_?.map((a) => {
+        if (typeof a === "string") return a?.replace(/\x1b\[[\w;]+m/g, "");
+        return a;
+      }),
+      getDateParsed(),
+    ];
+
+  logOpt = logOpt ?? 0;
+
+  const logcolorfg = `\x1b[${logOpt_.logColorFG}m`;
+  const logcolorbg = `\x1b[${logOpt_.logColorBG}m`;
+
   const logm = [
-    `${logcolorbg}${logcolorfg} ${date_()} \x1b[0m >`,
-    logmsg?.error?.message ?? logmsg?.error ?? logmsg?.message ?? logmsg,
+    `${logcolorbg}${logcolorfg} ${getDateParsed()} \x1b[0m >`,
+    ...logMsg_,
   ];
-  switch (logopt) {
+
+  switch (logOpt) {
     default:
@@ -85,0 +71,0 @@ case 0:

package.json

 {
   "name": "oberknecht-utils",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "description": "Utils for oberknecht packages",
@@ -5,0 +5,0 @@ "main": "./lib-ts/utils/index",

No alert changes

Improved metrics

Total package byte prevSize

125202

increased by2.31%

Number of package files

195

increased by3.17%

Lines of code

3378

increased by2.46%

No dependency changes