@sjts/lib-log 31.1.2 → 31.1.4

package/dist/Logger.d.ts

@@ -7,17 +7,17 @@ export declare class Logger {
     static magenta: string;
     static cyan: string;
     static reset: string;
-    static bold: string;
-    static dim: string;
-    static italic: string;
-    static underline: string;
-    static strikethrough: string;
     static bgRed: string;
     static bgGreen: string;
     static bgYellow: string;
     static bgBlue: string;
     static bgMagenta: string;
     static bgCyan: string;
+    static bold: string;
+    static dim: string;
+    static italic: string;
+    static underline: string;
+    static strikethrough: string;
     static lastLogTimestamp: number;
     private static _indent;
     private level;

package/dist/Logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":"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"}

package/dist/Logger.js

@@ -1,25 +1,43 @@
 import { DateTime } from 'luxon';
 import { LoggerLevel } from './LoggerLevel.js';
 const { DEBUG, INFO, SYSTEM, WARN, ERROR, THROW, KILL } = LoggerLevel;
+const red = '\x1b[31m';
+const green = '\x1b[32m';
+const yellow = '\x1b[33m';
+const blue = '\x1b[34m';
+const magenta = '\x1b[35m';
+const cyan = '\x1b[36m';
+const reset = '\x1b[0m';
+const bold = '\x1b[1m';
+const dim = '\x1b[2m';
+const italic = '\x1b[3m';
+const underline = '\x1b[4m';
+const strikethrough = '\x1b[9m';
+const bgRed = '\x1b[41m';
+const bgGreen = '\x1b[42m';
+const bgYellow = '\x1b[43m';
+const bgBlue = '\x1b[44m';
+const bgMagenta = '\x1b[45m';
+const bgCyan = '\x1b[46m';
 export class Logger {
-    static red = '\x1b[31m';
-    static green = '\x1b[32m';
-    static yellow = '\x1b[33m';
-    static blue = '\x1b[34m';
-    static magenta = '\x1b[35m';
-    static cyan = '\x1b[36m';
-    static reset = '\x1b[0m';
-    static bold = '\x1b[1m';
-    static dim = '\x1b[2m';
-    static italic = '\x1b[3m';
-    static underline = '\x1b[4m';
-    static strikethrough = '\x1b[9m';
-    static bgRed = '\x1b[41m';
-    static bgGreen = '\x1b[42m';
-    static bgYellow = '\x1b[43m';
-    static bgBlue = '\x1b[44m';
-    static bgMagenta = '\x1b[45m';
-    static bgCyan = '\x1b[46m';
+    static red = red;
+    static green = green;
+    static yellow = yellow;
+    static blue = blue;
+    static magenta = magenta;
+    static cyan = cyan;
+    static reset = reset;
+    static bgRed = bgRed;
+    static bgGreen = bgGreen;
+    static bgYellow = bgYellow;
+    static bgBlue = bgBlue;
+    static bgMagenta = bgMagenta;
+    static bgCyan = bgCyan;
+    static bold = bold;
+    static dim = dim;
+    static italic = italic;
+    static underline = underline;
+    static strikethrough = strikethrough;
     static lastLogTimestamp = 0;
     static _indent = 0;
     level = [INFO, WARN, ERROR, THROW, KILL];
@@ -61,19 +79,9 @@ export class Logger {
     static setSystemTags(tags) {
         this.instance.setSystemTags(tags);
     }
-    shout = (message, data) => Logger.info(Logger.green +
-        Logger.bold +
-        '--------------\n' +
-        message +
-        '\n--------------' +
-        Logger.reset, data);
+    shout = (message, data) => Logger.info(green + bold + '--------------\n' + message + '\n--------------' + reset, data);
     static shout(message, data) {
-        this.info(Logger.green +
-            Logger.bold +
-            '--------------\n' +
-            message +
-            '\n--------------' +
-            Logger.reset, data);
+        this.info(green + bold + '--------------\n' + message + '\n--------------' + reset, data);
     }
     debug = (message, data) => Logger.debug(message, data);
     static debug(message, data) {
@@ -94,46 +102,41 @@ export class Logger {
     system = (tag, message, data) => Logger.info(message, data);
     static system(tag, message, data) {
         Logger.initProfiles();
-        const msg = Logger.indentMessage(message);
-        const formattedMessage = `${Logger.magenta}${msg}${Logger.reset}`;
+        const msg = Logger.indentMessage(`${magenta}${italic}${tag}${reset}: ${message}${reset}`);
         if (this.instance.level.includes(SYSTEM) && this.instance.systemTags.includes(tag))
-            this.instance.c.log(...(data ? [formattedMessage, data] : [formattedMessage]));
+            this.instance.c.log(...(data ? [msg, data] : [msg]));
         this.lastLogTimestamp = DateTime.now().toMillis();
     }
     warn = (message, data) => Logger.warn(message, data);
     static warn(message, data) {
         Logger.initProfiles();
-        const msg = Logger.indentMessage(message);
-        const formattedMessage = `${Logger.yellow}WARN: ${msg}${Logger.reset}`;
+        const msg = Logger.indentMessage(`${yellow}WARN: ${message}${reset}`);
         if (this.instance.level.includes(WARN))
-            this.instance.c.warn(...(data ? [formattedMessage, data] : [formattedMessage]));
+            this.instance.c.warn(...(data ? [msg, data] : [msg]));
         this.lastLogTimestamp = DateTime.now().toMillis();
     }
     error = (message, data) => Logger.error(message, data);
     static error(message, data) {
         Logger.initProfiles();
-        const msg = Logger.indentMessage(message);
-        const formattedMessage = `${Logger.red}ERROR: ${msg}${Logger.reset}`;
+        const msg = Logger.indentMessage(`${red}ERROR: ${message}${reset}`);
         if (this.instance.level.includes(ERROR))
-            this.instance.c.error(...(data ? [formattedMessage, data] : [formattedMessage]));
+            this.instance.c.error(...(data ? [msg, data] : [msg]));
         this.lastLogTimestamp = DateTime.now().toMillis();
     }
     throw = (message, data) => Logger.throw(message, data);
     static throw(message, data) {
         Logger.initProfiles();
-        const msg = Logger.indentMessage(message);
-        const formattedMessage = `${Logger.red}ERROR: ${msg}${Logger.reset}`;
+        const msg = Logger.indentMessage(`${red}ERROR: ${message}${reset}`);
         if (this.instance.level.includes(THROW))
-            this.instance.c.error(...(data ? [formattedMessage, data] : [formattedMessage]));
+            this.instance.c.error(...(data ? [msg, data] : [msg]));
         throw new Error(message.toString());
     }
     kill = (message, data) => Logger.kill(message, data);
     static kill(message, data) {
         Logger.initProfiles();
-        const msg = Logger.indentMessage(message);
-        const formattedMessage = `${Logger.red}ERROR: ${msg}${Logger.reset}`;
+        const msg = Logger.indentMessage(`${red}ERROR: ${message}${reset}`);
         if (this.instance.level.includes(KILL))
-            this.instance.c.error(...(data ? [formattedMessage, data] : [formattedMessage]));
+            this.instance.c.error(...(data ? [msg, data] : [msg]));
         this.lastLogTimestamp = DateTime.now().toMillis();
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
@@ -148,15 +151,21 @@ export class Logger {
         Logger._openProfiles[key] = { key, start: DateTime.now().toMillis(), initiated: false };
     }
     static stopProfiling(key) {
-        if (!Logger._openProfiles[key])
+        const p = Logger._openProfiles[key];
+        if (!p) {
+            this.instance.c.warn('Cannot STOP profiling. Key "' + key + '" not found');
             return;
+        }
         const endTime = DateTime.now().toMillis();
-        const duration = endTime - Logger._openProfiles[key].start;
-        if (Logger._openProfiles[key].initiated)
+        const duration = endTime - p.start;
+        const initiated = p.initiated;
+        if (initiated)
             Logger.outdent();
         delete Logger._openProfiles[key];
-        const msg = `${Logger.blue}${Logger.italic}${key}${Logger.reset} - ${Logger.green}${duration}ms${Logger.reset}`;
-        this.instance.c.log(Logger.indentMessage(msg));
+        const msg = initiated
+            ? Logger.indentMessage(`${green}${duration}ms${reset}`)
+            : Logger.indentMessage(`${blue}${italic}${key}${reset} - ${green}${duration}ms${reset}`);
+        this.info(msg);
     }
     static initProfiles() {
         Object.values(Logger._openProfiles)
@@ -164,14 +173,14 @@ export class Logger {
             .sort((a, b) => a.start - b.start)
             .forEach(profile => {
             profile.initiated = true;
-            const msg = `${Logger.blue}${Logger.italic}${profile.key}${Logger.reset}`;
-            this.instance.c.log(Logger.indentMessage(msg));
+            const msg = Logger.indentMessage(`${blue}${italic}${profile.key}${reset}`);
+            this.instance.c.log(msg);
             Logger.indent();
         });
     }
     static indentMessage(message) {
         return Logger._indent > 0
-            ? `${Logger.dim}${Logger.blue}${'|  '.repeat(Logger._indent)}${Logger.reset}${message}`
+            ? `${dim}${blue}${'|  '.repeat(Logger._indent)}${reset}${message}`
             : message;
     }
 }

package/dist/_/Logger.test.d.ts

@@ -1,2 +1,2 @@
-export declare const test: () => number;
+export declare const test: () => void;
 //# sourceMappingURL=Logger.test.d.ts.map

package/dist/_/Logger.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.test.d.ts","sourceRoot":"","sources":["../../src/_/Logger.test.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI,cAYhB,CAAA"}
+{"version":3,"file":"Logger.test.d.ts","sourceRoot":"","sources":["../../src/_/Logger.test.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI,YAmBhB,CAAA"}

package/dist/_/Logger.test.js

@@ -1,15 +1,22 @@
 import { Logger } from '../Logger';
 export const test = () => {
+    Logger.shout('Testing');
     Logger.startProfiling('Speed Test');
-    Logger.info('ABC');
-    Logger.startProfiling('Something');
+    Logger.startProfiling('Something1');
     Logger.info('DEF');
     Logger.debug('GHI');
-    Logger.stopProfiling('Something');
+    Logger.startProfiling('Something2');
+    Logger.info('DEF');
+    Logger.debug('GHI');
+    Logger.startProfiling('Something3');
+    Logger.info('DEF');
+    Logger.debug('GHI');
+    Logger.stopProfiling('Something3');
+    Logger.stopProfiling('Something2');
+    Logger.stopProfiling('Something1');
     Logger.info('JKL');
     Logger.startProfiling('Something Else');
     Logger.stopProfiling('Something Else');
     Logger.stopProfiling('Speed Test');
-    return 100;
 };
 test();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjts/lib-log",
   "description": "The Steve James Typescript Log package",
-  "version": "31.1.2",
+  "version": "31.1.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",