@quatrain/log 0.1.2 → 0.1.4

package/lib/AbstractLoggerAdapter.d.ts

@@ -1,11 +1,4 @@
-export declare enum LogLevel {
-    TRACE = 0,
-    DEBUG = 1,
-    INFO = 2,
-    WARN = 3,
-    ERROR = 4,
-    SILENT = 5
-}
+import { LogLevel } from './Log';
 export interface LoggerType {
     log(message: string): void;
     debug(message: string): void;
@@ -14,19 +7,20 @@ export interface LoggerType {
     error(message: string): void;
     trace(message: string): void;
 }
-export declare class AbstractLoggerAdapter {
+export declare const loglevelNames: string[];
+export declare abstract class AbstractLoggerAdapter implements LoggerType {
     protected _me: string;
     protected _logLevel: LogLevel;
     protected _logger: any;
     constructor(prefix?: string, level?: LogLevel);
-    timestamp: () => string;
-    formatLogMessage: (message: any) => string;
+    logLevel(level: LogLevel): void;
+    formatLogMessage: (messages: any[], loglevel?: LogLevel) => string;
     /**
      * Log message using defined logger
      * @param message string | object
      * @param level string
      */
-    log(message: any, level?: LogLevel): void;
+    log(...messages: any): void;
     debug(message: any): void;
     warn(message: any): void;
     info(message: any): void;

package/lib/AbstractLoggerAdapter.js

@@ -1,25 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractLoggerAdapter = exports.LogLevel = void 0;
+exports.AbstractLoggerAdapter = exports.loglevelNames = void 0;
 const Log_1 = require("./Log");
-var LogLevel;
-(function (LogLevel) {
-    LogLevel[LogLevel["TRACE"] = 0] = "TRACE";
-    LogLevel[LogLevel["DEBUG"] = 1] = "DEBUG";
-    LogLevel[LogLevel["INFO"] = 2] = "INFO";
-    LogLevel[LogLevel["WARN"] = 3] = "WARN";
-    LogLevel[LogLevel["ERROR"] = 4] = "ERROR";
-    LogLevel[LogLevel["SILENT"] = 5] = "SILENT";
-})(LogLevel || (exports.LogLevel = LogLevel = {}));
+exports.loglevelNames = [
+    'TRACE',
+    'DEBUG',
+    'INFO',
+    'WARN',
+    'ERROR',
+    'SILENT',
+];
 class AbstractLoggerAdapter {
-    constructor(prefix = '', level = LogLevel.WARN) {
+    constructor(prefix = '', level = Log_1.LogLevel.WARN) {
         this._me = '';
-        this._logLevel = LogLevel.WARN;
+        this._logLevel = Log_1.LogLevel.WARN;
         this._logger = undefined;
-        // How timestamp are formatted
-        this.timestamp = () => new Date().toISOString();
-        this.formatLogMessage = (message) => `${Log_1.Log.timestamp()} - [${this._me}] ${typeof message === 'string' ? message : JSON.stringify(message)}`;
+        this.formatLogMessage = (messages, loglevel = 3) => {
+            messages.unshift(`${Log_1.Log.timestamp()} - [${this._me}]`);
+            const strs = messages.map((message) => {
+                return typeof message !== 'object' ? message : JSON.stringify(message);
+            });
+            return strs.join(' ');
+        };
         this._me = prefix;
+    }
+    logLevel(level) {
         this._logLevel = level;
     }
     /**
@@ -27,23 +32,11 @@ class AbstractLoggerAdapter {
      * @param message string | object
      * @param level string
      */
-    log(message, level = LogLevel.WARN) {
-        this._logger.log(this.formatLogMessage(message));
-    }
-    debug(message) {
-        this._logger.debug(this.formatLogMessage(message));
-    }
-    warn(message) {
-        this._logger.warn(this.formatLogMessage(message));
-    }
-    info(message) {
-        this._logger.info(this.formatLogMessage(message));
-    }
-    error(message) {
-        this._logger.error(this.formatLogMessage(message));
-    }
-    trace(message) {
-        this._logger.trace(this.formatLogMessage(message));
-    }
+    log(...messages) { }
+    debug(message) { }
+    warn(message) { }
+    info(message) { }
+    error(message) { }
+    trace(message) { }
 }
 exports.AbstractLoggerAdapter = AbstractLoggerAdapter;

package/lib/DefaultLoggerAdapter.d.ts

@@ -1,4 +1,17 @@
 import { AbstractLoggerAdapter } from './AbstractLoggerAdapter';
+import { LogLevel } from './Log';
 export declare class DefaultLoggerAdapter extends AbstractLoggerAdapter {
-    constructor();
+    constructor(prefix?: string, level?: LogLevel);
+    /**
+     * Log message using defined logger
+     * @param messages array
+     * @param level LogLevel
+     */
+    log(messages: any[], level?: LogLevel): void;
+    logLevel(level: LogLevel): void;
+    debug(...messages: any): void;
+    warn(...messages: any): void;
+    info(...messages: any): void;
+    error(...messages: any): void;
+    trace(...messages: any): void;
 }

package/lib/DefaultLoggerAdapter.js

@@ -6,10 +6,59 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultLoggerAdapter = void 0;
 const AbstractLoggerAdapter_1 = require("./AbstractLoggerAdapter");
 const loglevel_1 = __importDefault(require("loglevel"));
+const Log_1 = require("./Log");
 class DefaultLoggerAdapter extends AbstractLoggerAdapter_1.AbstractLoggerAdapter {
-    constructor() {
-        super('Log');
+    constructor(prefix = '', level = Log_1.LogLevel.DEBUG) {
+        super(prefix, level);
         this._logger = loglevel_1.default;
+        this._logger.setLevel(level);
+    }
+    /**
+     * Log message using defined logger
+     * @param messages array
+     * @param level LogLevel
+     */
+    log(messages, level = this._logLevel) {
+        const message = this.formatLogMessage(messages);
+        switch (level) {
+            case Log_1.LogLevel.TRACE:
+                this._logger.trace(message);
+                break;
+            case Log_1.LogLevel.DEBUG:
+                this._logger.debug(message);
+                break;
+            case Log_1.LogLevel.INFO:
+                this._logger.info(message);
+                break;
+            case Log_1.LogLevel.WARN:
+                this._logger.warn(message);
+                break;
+            case Log_1.LogLevel.ERROR:
+                this._logger.error(message);
+                break;
+            default:
+                this._logger.log(message);
+                break;
+        }
+    }
+    logLevel(level) {
+        super.logLevel(level);
+        this._logger.setLevel(level);
+    }
+    debug(...messages) {
+        this.log(messages[0], Log_1.LogLevel.DEBUG);
+    }
+    warn(...messages) {
+        this.log(messages[0], Log_1.LogLevel.WARN);
+    }
+    info(...messages) {
+        this.log(messages[0], Log_1.LogLevel.INFO);
+    }
+    error(...messages) {
+        this.log(messages[0], Log_1.LogLevel.ERROR);
+    }
+    trace(...messages) {
+        this.log(messages[0], Log_1.LogLevel.TRACE);
     }
 }
 exports.DefaultLoggerAdapter = DefaultLoggerAdapter;

package/lib/Log.d.ts

@@ -1,12 +1,20 @@
-import { AbstractLoggerAdapter } from "./AbstractLoggerAdapter";
+import { AbstractLoggerAdapter } from './AbstractLoggerAdapter';
+export declare enum LogLevel {
+    TRACE = 0,
+    DEBUG = 1,
+    INFO = 2,
+    WARN = 3,
+    ERROR = 4,
+    SILENT = 5
+}
 export type LoggerRegistry<T extends AbstractLoggerAdapter> = {
     [x: string]: T;
 };
 export declare class Log {
     static defaultLogger: string;
     protected static _loggers: LoggerRegistry<any>;
-    static timestamp: () => string;
-    static addLogger(logger: AbstractLoggerAdapter, alias: string, setDefault?: boolean): void;
+    static timestamp(): string;
+    static addLogger(alias: string, logger?: AbstractLoggerAdapter, setDefault?: boolean): any;
     static getLogger<T extends AbstractLoggerAdapter>(alias?: string): T;
     /**
      * Log message using defined logger

package/lib/Log.js

@@ -1,13 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Log = void 0;
+exports.Log = exports.LogLevel = void 0;
 const DefaultLoggerAdapter_1 = require("./DefaultLoggerAdapter");
+var LogLevel;
+(function (LogLevel) {
+    LogLevel[LogLevel["TRACE"] = 0] = "TRACE";
+    LogLevel[LogLevel["DEBUG"] = 1] = "DEBUG";
+    LogLevel[LogLevel["INFO"] = 2] = "INFO";
+    LogLevel[LogLevel["WARN"] = 3] = "WARN";
+    LogLevel[LogLevel["ERROR"] = 4] = "ERROR";
+    LogLevel[LogLevel["SILENT"] = 5] = "SILENT";
+})(LogLevel || (exports.LogLevel = LogLevel = {}));
 class Log {
-    static addLogger(logger, alias, setDefault = false) {
+    // How timestamp are formatted
+    static timestamp() {
+        return new Date().toISOString();
+    }
+    static addLogger(alias, logger = new DefaultLoggerAdapter_1.DefaultLoggerAdapter(), setDefault = false) {
         this._loggers[alias] = logger;
         if (setDefault) {
             this.defaultLogger = alias;
         }
+        return this._loggers[alias];
     }
     static getLogger(alias = this.defaultLogger) {
         if (this._loggers[alias]) {
@@ -43,7 +57,5 @@ class Log {
 exports.Log = Log;
 Log.defaultLogger = '@default';
 Log._loggers = {
-    default: new DefaultLoggerAdapter_1.DefaultLoggerAdapter()
+    '@default': new DefaultLoggerAdapter_1.DefaultLoggerAdapter(),
 };
-// How timestamp are formatted
-Log.timestamp = () => new Date().toISOString();

package/lib/index.d.ts

@@ -1,3 +1,4 @@
-import { Log } from './Log';
-import { LogLevel, AbstractLoggerAdapter } from './AbstractLoggerAdapter';
-export { Log, AbstractLoggerAdapter, LogLevel };
+import { Log, LogLevel } from './Log';
+import { AbstractLoggerAdapter } from './AbstractLoggerAdapter';
+import { DefaultLoggerAdapter } from './DefaultLoggerAdapter';
+export { Log, LogLevel, AbstractLoggerAdapter, DefaultLoggerAdapter };

package/lib/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevel = exports.AbstractLoggerAdapter = exports.Log = void 0;
+exports.DefaultLoggerAdapter = exports.AbstractLoggerAdapter = exports.LogLevel = exports.Log = void 0;
 const Log_1 = require("./Log");
 Object.defineProperty(exports, "Log", { enumerable: true, get: function () { return Log_1.Log; } });
+Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return Log_1.LogLevel; } });
 const AbstractLoggerAdapter_1 = require("./AbstractLoggerAdapter");
-Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return AbstractLoggerAdapter_1.LogLevel; } });
 Object.defineProperty(exports, "AbstractLoggerAdapter", { enumerable: true, get: function () { return AbstractLoggerAdapter_1.AbstractLoggerAdapter; } });
+const DefaultLoggerAdapter_1 = require("./DefaultLoggerAdapter");
+Object.defineProperty(exports, "DefaultLoggerAdapter", { enumerable: true, get: function () { return DefaultLoggerAdapter_1.DefaultLoggerAdapter; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/log",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Logger for business apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",