@sjts/lib-log 31.1.6 → 31.1.8

package/dist/Logger.d.ts

@@ -19,7 +19,7 @@ export declare class Logger {
     static underline: string;
     static strikethrough: string;
     static lastLogTimestamp: number;
-    private static _indent;
+    private _indent;
     private level;
     private systemTags;
     c: any;
@@ -27,8 +27,8 @@ export declare class Logger {
     static set console(c: any);
     set logLevel(l: LoggerLevel[]);
     static set logLevel(l: LoggerLevel[]);
-    static indent(): void;
-    static outdent(): void;
+    indent(): void;
+    outdent(): void;
     addDebug(): void;
     static addDebug(): void;
     addSystem(): void;
@@ -52,10 +52,14 @@ export declare class Logger {
     kill: (message: string, data?: any) => void;
     static kill(message: string, data?: any): void;
     static instance: Logger;
-    private static _openProfiles;
+    private _openProfiles;
+    startProfiling(key: string): void;
     static startProfiling(key: string): void;
+    stopProfiling(key: string): void;
     static stopProfiling(key: string): void;
+    initProfiles(exclude?: string[]): void;
     static initProfiles(exclude?: string[]): void;
+    indentMessage(message: string): string;
     static indentMessage(message: string): string;
 }
 //# sourceMappingURL=Logger.d.ts.map

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

@@ -39,7 +39,7 @@ export class Logger {
     static underline = underline;
     static strikethrough = strikethrough;
     static lastLogTimestamp = 0;
-    static _indent = 0;
+    _indent = 0;
     level = [INFO, WARN, ERROR, THROW, KILL];
     systemTags = [];
     c = console;
@@ -55,10 +55,10 @@ export class Logger {
     static set logLevel(l) {
         this.instance.logLevel = l;
     }
-    static indent() {
+    indent() {
         this._indent++;
     }
-    static outdent() {
+    outdent() {
         this._indent--;
     }
     addDebug() {
@@ -146,41 +146,53 @@ export class Logger {
     // ------------------------------------------------------------
     // Performance
     // ------------------------------------------------------------
-    static _openProfiles = {};
+    _openProfiles = {};
+    startProfiling(key) {
+        this._openProfiles[key] = { key, start: DateTime.now().toMillis(), initiated: false };
+    }
     static startProfiling(key) {
-        Logger._openProfiles[key] = { key, start: DateTime.now().toMillis(), initiated: false };
+        Logger.instance.startProfiling(key);
     }
-    static stopProfiling(key) {
-        const p = Logger._openProfiles[key];
+    stopProfiling(key) {
+        const p = this._openProfiles[key];
         if (!p) {
-            this.instance.c.warn('Cannot STOP profiling. Key "' + key + '" not found');
+            this.c.warn('Cannot STOP profiling. Key "' + key + '" not found');
             return;
         }
         const endTime = DateTime.now().toMillis();
         const duration = endTime - p.start;
         const initiated = p.initiated;
         if (initiated)
-            Logger.outdent();
-        delete Logger._openProfiles[key];
+            this.outdent();
+        delete this._openProfiles[key];
         if (!initiated)
             this.initProfiles([key]);
-        const msg = Logger.indentMessage(`${blue}${italic}${key}${reset} - ${green}${duration}ms${reset}`);
-        this.instance.c.log(msg);
+        const msg = this.indentMessage(`${blue}${italic}${key}${reset} - ${green}${duration}ms${reset}`);
+        this.c.log(msg);
     }
-    static initProfiles(exclude = []) {
-        Object.values(Logger._openProfiles)
+    static stopProfiling(key) {
+        Logger.instance.stopProfiling(key);
+    }
+    initProfiles(exclude = []) {
+        Object.values(this._openProfiles)
             .filter(profile => !profile.initiated && !exclude.includes(profile.key))
             .sort((a, b) => a.start - b.start)
             .forEach(profile => {
             profile.initiated = true;
-            const msg = Logger.indentMessage(`${blue}${italic}${profile.key}${reset}`);
-            this.instance.c.log(msg);
-            Logger.indent();
+            const msg = this.indentMessage(`${blue}${italic}${profile.key}${reset}`);
+            this.c.log(msg);
+            this.indent();
         });
     }
-    static indentMessage(message) {
-        return Logger._indent > 0
-            ? `${dim}${blue}${'|  '.repeat(Logger._indent)}${reset}${message}`
+    static initProfiles(exclude = []) {
+        Logger.instance.initProfiles(exclude);
+    }
+    indentMessage(message) {
+        return this._indent > 0
+            ? `${dim}${blue}${'|  '.repeat(this._indent)}${reset}${message}`
             : message;
     }
+    static indentMessage(message) {
+        return Logger.instance.indentMessage(message);
+    }
 }

package/dist/WithLogging.d.ts

@@ -0,0 +1,19 @@
+import { Logger } from './Logger.js';
+type ConstructorOf<CLASS> = new (...params: any[]) => CLASS;
+export type WithLogging = {
+    logPrefix: string;
+    $$shout(msg: string, data?: any): void;
+    $$info(msg: string, data?: any): void;
+    $$warn(msg: string, data?: any): void;
+    $$error(msg: string, data?: any): void;
+    $$debug(msg: string, data?: any): void;
+    $$startProfiling(key: string): void;
+    $$stopProfiling(key: string): void;
+};
+export type WithLoggingable = {
+    logPrefix: string;
+    logger: Logger;
+};
+export declare const WithLoggingMixin: () => <T extends WithLoggingable>(Base: ConstructorOf<T>) => ConstructorOf<WithLogging & T>;
+export {};
+//# sourceMappingURL=WithLogging.d.ts.map

package/dist/WithLogging.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WithLogging.d.ts","sourceRoot":"","sources":["../src/WithLogging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,KAAK,aAAa,CAAC,KAAK,IAAI,KAAK,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,KAAK,CAAA;AAG3D,MAAM,MAAM,WAAW,GAAG;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACtC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACrC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACrC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACtC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAA;IACtC,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IACnC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC,CAAA;AAGD,MAAM,MAAM,eAAe,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACd,CAAA;AAGD,eAAO,MAAM,gBAAgB,SAE3B,CAAC,SAAS,eAAe,EAAE,MAAM,aAAa,CAAC,CAAC,CAAC,KA0BtB,aAAa,CAAC,WAAW,GAAG,CAAC,CACxD,CAAA"}

package/dist/WithLogging.js

@@ -0,0 +1,29 @@
+// The mixin function
+export const WithLoggingMixin = () => (Base) => {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    class WithLoggingClass extends Base {
+        $$shout(msg, data) {
+            this.logger.shout(`${this.logPrefix} - ${msg}`, data);
+        }
+        $$info(msg, data) {
+            this.logger.info(`${this.logPrefix} - ${msg}`, data);
+        }
+        $$warn(msg, data) {
+            this.logger.warn(`${this.logPrefix} - ${msg}`, data);
+        }
+        $$error(msg, data) {
+            this.logger.error(`${this.logPrefix} - ${msg}`, data);
+        }
+        $$debug(msg, data) {
+            this.logger.debug(`${this.logPrefix} - ${msg}`, data);
+        }
+        $$startProfiling(key) {
+            this.logger.startProfiling(key);
+        }
+        $$stopProfiling(key) {
+            this.logger.stopProfiling(key);
+        }
+    }
+    return WithLoggingClass;
+};

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './Logger.js';
 export * from './LoggerLevel.js';
+export * from './WithLogging.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA"}

package/dist/index.js

@@ -1,2 +1,3 @@
 export * from './Logger.js';
 export * from './LoggerLevel.js';
+export * from './WithLogging.js';

package/package.json

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

package/dist/Logger.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Logger.test.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"Logger.test.d.ts","sourceRoot":"","sources":["../src/Logger.test.ts"],"names":[],"mappings":""}

package/dist/Logger.test.js

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

package/dist/Profiler.d.ts

@@ -1,11 +0,0 @@
-export type ProfilerOptions = {
-    logAtStart?: boolean;
-};
-export declare class Profiler {
-    private label;
-    private o;
-    private startTime;
-    constructor(label: string, o?: ProfilerOptions);
-    stop(): void;
-}
-//# sourceMappingURL=Profiler.d.ts.map

package/dist/Profiler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Profiler.d.ts","sourceRoot":"","sources":["../src/Profiler.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,eAAe,GAAG;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,qBAAa,QAAQ;IAInB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,CAAC;IAJV,OAAO,CAAC,SAAS,CAAQ;gBAGhB,KAAK,EAAE,MAAM,EACb,CAAC,GAAE,eAAuC;IAUnD,IAAI;CAUJ"}

package/dist/Profiler.js

@@ -1,25 +0,0 @@
-import { DateTime } from 'luxon';
-import { Logger } from './Logger';
-export class Profiler {
-    label;
-    o;
-    startTime;
-    constructor(label, o = { logAtStart: false }) {
-        this.label = label;
-        this.o = o;
-        this.label = label;
-        this.startTime = DateTime.now().toMillis();
-        if (o.logAtStart) {
-            Logger.info(`${label}`);
-            Logger.indent();
-        }
-    }
-    stop() {
-        const endTime = Date.now();
-        const duration = endTime - this.startTime;
-        if (this.o.logAtStart) {
-            Logger.outdent();
-        }
-        Logger.info(`${this.label} - ${duration}ms`);
-    }
-}