@athenna/logger 1.0.2 → 1.0.5

package/index.d.ts

@@ -6,7 +6,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-export * from './src/Log';
 export * from './src/Logger';
 export * from './src/Contracts/DriverContract';
 export * from './src/Contracts/FormatterContract';

package/index.js

@@ -18,7 +18,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./src/Log"), exports);
 __exportStar(require("./src/Logger"), exports);
 __exportStar(require("./src/Contracts/DriverContract"), exports);
 __exportStar(require("./src/Contracts/FormatterContract"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/logger",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
@@ -130,6 +130,7 @@
       "@typescript-eslint/interface-name-prefix": "off",
       "@typescript-eslint/no-explicit-any": "off",
       "prettier/prettier": "error",
+      "@typescript-eslint/no-empty-function": "off",
       "@typescript-eslint/no-unused-vars": [
         "error",
         {
@@ -152,6 +153,7 @@
     }
   },
   "dependencies": {
+    "@athenna/ioc": "1.0.7",
     "@secjs/utils": "1.8.0",
     "reflect-metadata": "0.1.13",
     "tscpaths": "0.0.9"

package/src/Drivers/ConsoleDriver.d.ts

@@ -12,6 +12,7 @@ export interface ConsoleDriverOpts {
     color: Color;
     level: string;
     context: string;
+    formatter: string;
     streamType: string;
 }
 export declare class ConsoleDriver implements DriverContract {
@@ -19,6 +20,6 @@ export declare class ConsoleDriver implements DriverContract {
     private readonly _context;
     private readonly _formatter;
     private readonly _streamType;
-    constructor(channel: string);
+    constructor(channel: string, configs?: any);
     transport(message: string, options?: ConsoleDriverOpts): void;
 }

package/src/Drivers/ConsoleDriver.js

@@ -12,21 +12,22 @@ exports.ConsoleDriver = void 0;
 const utils_1 = require("@secjs/utils");
 const FormatterFactory_1 = require("../Factories/FormatterFactory");
 class ConsoleDriver {
-    constructor(channel) {
+    constructor(channel, configs = {}) {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
-        this._level = channelConfig.level || 'INFO';
-        this._context = channelConfig.context || 'ConsoleDriver';
-        this._formatter = channelConfig.formatter || 'context';
-        this._streamType = channelConfig.streamType || 'stdout';
+        this._level = configs.level || channelConfig.level;
+        this._context = configs.context || channelConfig.context;
+        this._formatter = configs.formatter || channelConfig.formatter;
+        this._streamType = configs.streamType || channelConfig.streamType;
     }
     transport(message, options) {
         options = Object.assign({}, {
             level: this._level,
             context: this._context,
+            formatter: this._formatter,
             streamType: this._streamType,
         }, options);
-        message = FormatterFactory_1.FormatterFactory.fabricate(this._formatter).format(message, options);
-        process[this._streamType].write(`${message}\n`);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options);
+        process[options.streamType].write(`${message}\n`);
     }
 }
 exports.ConsoleDriver = ConsoleDriver;

package/src/Drivers/DebugDriver.d.ts

@@ -20,6 +20,6 @@ export declare class DebugDriver implements DriverContract {
     private readonly _context;
     private readonly _formatter;
     private readonly _namespace;
-    constructor(channel: string);
+    constructor(channel: string, configs?: any);
     transport(message: string, options?: DebugDriverOpts): void;
 }

package/src/Drivers/DebugDriver.js

@@ -13,20 +13,21 @@ const debug_1 = require("debug");
 const utils_1 = require("@secjs/utils");
 const FormatterFactory_1 = require("../Factories/FormatterFactory");
 class DebugDriver {
-    constructor(channel) {
+    constructor(channel, configs = {}) {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
-        this._level = channelConfig.level || 'DEBUG';
-        this._context = channelConfig.context || 'DebugDriver';
-        this._formatter = channelConfig.formatter || 'context';
-        this._namespace = channelConfig.namespace || 'api:main';
+        this._level = configs.level || channelConfig.level;
+        this._context = configs.context || channelConfig.context;
+        this._formatter = configs.formatter || channelConfig.formatter;
+        this._namespace = configs.namespace || channelConfig.namespace;
     }
     transport(message, options) {
         options = Object.assign({}, {
             level: this._level,
             context: this._context,
+            formatter: this._formatter,
             namespace: this._namespace,
         }, options);
-        message = FormatterFactory_1.FormatterFactory.fabricate(this._formatter).format(message, options);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options);
         debug_1.debug(options.namespace)(message);
     }
 }

package/src/Drivers/FileDriver.d.ts

@@ -18,6 +18,6 @@ export declare class FileDriver implements DriverContract {
     private readonly _context;
     private readonly _filePath;
     private readonly _formatter;
-    constructor(channel: string);
+    constructor(channel: string, configs?: any);
     transport(message: string, options?: FileDriverOpts): Promise<void>;
 }

package/src/Drivers/FileDriver.js

@@ -10,26 +10,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileDriver = void 0;
 const path_1 = require("path");
-const Color_1 = require("../Utils/Color");
 const utils_1 = require("@secjs/utils");
+const Color_1 = require("../Utils/Color");
 const fs_1 = require("fs");
 const FormatterFactory_1 = require("../Factories/FormatterFactory");
 class FileDriver {
-    constructor(channel) {
+    constructor(channel, configs = {}) {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
-        this._level = channelConfig.level || 'INFO';
-        this._context = channelConfig.context || 'FileDriver';
-        this._filePath = channelConfig.filePath || utils_1.Path.noBuild().logs('secjs.log');
-        this._formatter = channelConfig.formatter || 'log';
+        this._level = configs.level || channelConfig.level;
+        this._context = configs.context || channelConfig.context;
+        this._filePath = configs.filePath || channelConfig.filePath;
+        this._formatter = configs.formatter || channelConfig.formatter;
     }
     async transport(message, options) {
-        options = Object.assign({}, { level: this._level, context: this._context, filePath: this._filePath }, options);
+        options = Object.assign({}, {
+            level: this._level,
+            context: this._context,
+            filePath: this._filePath,
+            formatter: this._formatter,
+        }, options);
         const filePath = options.filePath;
         const { dir } = path_1.parse(filePath);
         if (!fs_1.existsSync(dir)) {
             fs_1.mkdirSync(dir, { recursive: true });
         }
-        message = FormatterFactory_1.FormatterFactory.fabricate(this._formatter).format(message, options);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options);
         return new Promise((resolve, reject) => {
             const stream = fs_1.createWriteStream(filePath, { flags: 'a' });
             stream.write(`${Color_1.Color.removeColors(message)}` + '\n');

package/src/Formatters/ContextFormatter.js

@@ -14,7 +14,7 @@ const getTimestamp_1 = require("../Utils/getTimestamp");
 class ContextFormatter {
     format(message, options) {
         options = Object.assign({}, { color: Color_1.Color.green, context: 'Logger' }, options);
-        const pid = Color_1.Color.darkPurple(`[Athenna] - PID: ${process.pid}`);
+        const pid = Color_1.Color.yellow(`[Athenna] - PID: ${process.pid}`);
         const timestamp = getTimestamp_1.getTimestamp();
         const messageCtx = Color_1.Color.yellow(`[${options.context}] `);
         const timestampDiff = ContextFormatter.getTimestampDiff();

package/src/Formatters/DebugFormatter.js

@@ -14,7 +14,7 @@ const getTimestamp_1 = require("../Utils/getTimestamp");
 class DebugFormatter {
     format(message, options) {
         options = Object.assign({}, { color: Color_1.Color.green, context: 'Debugger', namespace: 'api:main' }, options);
-        const pid = Color_1.Color.purple(`[Athenna Debugger] - PID: ${process.pid}`);
+        const pid = Color_1.Color.yellow(`[Athenna Debugger] - PID: ${process.pid}`);
         const timestamp = Color_1.Color.white(getTimestamp_1.getTimestamp());
         const messageCtx = Color_1.Color.yellow(`[${options.context}] `);
         const timestampDiff = DebugFormatter.getTimestampDiff();

package/src/Formatters/JsonFormatter.js

@@ -14,7 +14,7 @@ class JsonFormatter {
     format(message, options) {
         options = Object.assign({}, { color: Color_1.Color.green }, options);
         const pid = Color_1.Color.yellow(`[Athenna] - PID: ${process.pid}`);
-        return `${pid} - ${Color_1.Color.bold('JSON:')} ${options.color(JSON.stringify(message))}`;
+        return `${pid} - ${Color_1.Color.bold('JSON:')} ${options.color(JSON.stringify(message, null, 2))}`;
     }
 }
 exports.JsonFormatter = JsonFormatter;

package/src/{Utils/global.d.ts → Providers/LoggerProvider.d.ts}

@@ -6,10 +6,8 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-import { Log as LogFunction } from '../Log';
-import { Logger as LoggerClass } from '../Logger';
-export {};
-declare global {
-    const Log: typeof LogFunction;
-    const Logger: typeof LoggerClass;
+import { ServiceProvider } from '@athenna/ioc';
+export declare class LoggerProvider extends ServiceProvider {
+    boot(): void;
+    register(): void;
 }

package/src/{Utils/global.js → Providers/LoggerProvider.js}

@@ -8,8 +8,13 @@
  * file that was distributed with this source code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const Log_1 = require("../Log");
+exports.LoggerProvider = void 0;
 const Logger_1 = require("../Logger");
-const _global = global;
-_global.Log = Log_1.Log;
-_global.Logger = Logger_1.Logger;
+const ioc_1 = require("@athenna/ioc");
+class LoggerProvider extends ioc_1.ServiceProvider {
+    boot() { }
+    register() {
+        this.container.bind('Athenna/Core/Logger', Logger_1.Logger);
+    }
+}
+exports.LoggerProvider = LoggerProvider;

package/src/Log.d.ts

@@ -1,18 +0,0 @@
-import { DriverContract } from './Contracts/DriverContract';
-import { FormatterContract } from './Contracts/FormatterContract';
-export declare class Log {
-    private static _options?;
-    private static logger;
-    static options(options?: any): void;
-    static buildDriver(name: string, driver: new (channel: string, configs?: any) => DriverContract): typeof Log;
-    static buildFormatter(name: string, formatter: new () => FormatterContract): typeof Log;
-    static get drivers(): string[];
-    static get formatters(): string[];
-    static channel(channel: string): typeof Log;
-    static log(message: any, options?: any): void;
-    static info(message: any, options?: any): void;
-    static warn(message: any, options?: any): void;
-    static error(message: any, options?: any): void;
-    static debug(message: any, options?: any): void;
-    static success(message: any, options?: any): void;
-}

package/src/Log.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Log = void 0;
-const Logger_1 = require("./Logger");
-class Log {
-    static options(options) {
-        this._options = options;
-    }
-    static buildDriver(name, driver) {
-        Logger_1.Logger.buildDriver(name, driver);
-        return this;
-    }
-    static buildFormatter(name, formatter) {
-        Logger_1.Logger.buildFormatter(name, formatter);
-        return this;
-    }
-    static get drivers() {
-        return Logger_1.Logger.drivers;
-    }
-    static get formatters() {
-        return Logger_1.Logger.formatters;
-    }
-    static channel(channel) {
-        if (!this.logger)
-            this.logger = new Logger_1.Logger();
-        this.logger.channel(channel);
-        return this;
-    }
-    static log(message, options) {
-        options = {
-            ...options,
-            ...this._options,
-        };
-        this.logger.log(message, options);
-        this.logger = new Logger_1.Logger();
-    }
-    static info(message, options) {
-        options = {
-            ...options,
-            ...this._options,
-        };
-        this.logger.info(message, options);
-        this.logger = new Logger_1.Logger();
-    }
-    static warn(message, options) {
-        options = {
-            ...options,
-            ...this._options,
-        };
-        this.logger.warn(message, options);
-        this.logger = new Logger_1.Logger();
-    }
-    static error(message, options) {
-        options = {
-            ...options,
-            ...this._options,
-        };
-        this.logger.error(message, options);
-        this.logger = new Logger_1.Logger();
-    }
-    static debug(message, options) {
-        options = {
-            ...options,
-            ...this._options,
-        };
-        this.logger.debug(message, options);
-        this.logger = new Logger_1.Logger();
-    }
-    static success(message, options) {
-        options = {
-            ...options,
-            ...this._options,
-        };
-        this.logger.success(message, options);
-        this.logger = new Logger_1.Logger();
-    }
-}
-exports.Log = Log;
-Log._options = {};