@athenna/logger 1.0.9 → 1.1.2

package/index.d.ts

@@ -7,5 +7,6 @@
  * file that was distributed with this source code.
  */
 export * from './src/Logger';
+export * from './src/Utils/Color';
 export * from './src/Contracts/DriverContract';
 export * from './src/Contracts/FormatterContract';

package/index.js

@@ -19,5 +19,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./src/Logger"), exports);
+__exportStar(require("./src/Utils/Color"), 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.9",
+  "version": "1.1.2",
   "description": "",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
@@ -153,8 +153,8 @@
     }
   },
   "dependencies": {
-    "@athenna/ioc": "1.0.9",
-    "@secjs/utils": "1.8.0",
+    "@athenna/ioc": "1.1.1",
+    "@secjs/utils": "1.8.2",
     "chalk": "4.1.1",
     "reflect-metadata": "0.1.13",
     "tscpaths": "0.0.9"

package/src/Drivers/ConsoleDriver.js

@@ -16,15 +16,15 @@ class ConsoleDriver {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
         this._formatter = configs.formatter || channelConfig.formatter;
         this._streamType = configs.streamType || channelConfig.streamType;
-        this._formatterConfig =
-            configs.formatterConfig || channelConfig.formatterConfig;
+        this._formatterConfig = Object.assign({}, channelConfig.formatterConfig, configs.formatterConfig);
     }
     transport(message, options) {
         options = Object.assign({}, {
             formatter: this._formatter,
             streamType: this._streamType,
         }, options);
-        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options.formatterConfig || this._formatterConfig);
+        const formatterOptions = Object.assign({}, this._formatterConfig, options.formatterConfig);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, formatterOptions);
         process[options.streamType].write(`${message}\n`);
     }
 }

package/src/Drivers/DebugDriver.js

@@ -17,15 +17,15 @@ class DebugDriver {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
         this._formatter = configs.formatter || channelConfig.formatter;
         this._namespace = configs.namespace || channelConfig.namespace;
-        this._formatterConfig =
-            configs.formatterConfig || channelConfig.formatterConfig;
+        this._formatterConfig = Object.assign({}, channelConfig.formatterConfig, configs.formatterConfig);
     }
     transport(message, options) {
         options = Object.assign({}, {
             formatter: this._formatter,
             namespace: this._namespace,
         }, options);
-        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options.formatterConfig || this._formatterConfig);
+        const formatterOptions = Object.assign({}, this._formatterConfig, options.formatterConfig);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, formatterOptions);
         debug_1.debug(options.namespace)(message);
     }
 }

package/src/Drivers/FileDriver.js

@@ -19,8 +19,7 @@ class FileDriver {
         const channelConfig = utils_1.Config.get(`logging.channels.${channel}`);
         this._filePath = configs.filePath || channelConfig.filePath;
         this._formatter = configs.formatter || channelConfig.formatter;
-        this._formatterConfig =
-            configs.formatterConfig || channelConfig.formatterConfig;
+        this._formatterConfig = Object.assign({}, channelConfig.formatterConfig, configs.formatterConfig);
     }
     async transport(message, options) {
         options = Object.assign({}, {
@@ -32,7 +31,8 @@ class FileDriver {
         if (!fs_1.existsSync(dir)) {
             fs_1.mkdirSync(dir, { recursive: true });
         }
-        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, options.formatterConfig || this._formatterConfig);
+        const formatterOptions = Object.assign({}, this._formatterConfig, options.formatterConfig);
+        message = FormatterFactory_1.FormatterFactory.fabricate(options.formatter).format(message, formatterOptions);
         return new Promise((resolve, reject) => {
             const stream = fs_1.createWriteStream(filePath, { flags: 'a' });
             stream.write(`${Color_1.Color.removeColors(message)}` + '\n');

package/src/Formatters/CliFormatter.d.ts

@@ -10,10 +10,10 @@ import { Chalk } from 'chalk';
 import { LevelTypes } from '../Contracts/LevelTypes';
 import { FormatterContract } from '../Contracts/FormatterContract';
 export interface CliFormatterOptions {
-    color: Chalk;
+    chalk: Chalk;
     level: LevelTypes;
 }
 export declare class CliFormatter implements FormatterContract {
     private static paintByLevel;
-    format(message: string, options?: CliFormatterOptions): string;
+    format(message: string, options: CliFormatterOptions): string;
 }

package/src/Formatters/CliFormatter.js

@@ -22,7 +22,6 @@ class CliFormatter {
         return levelColors[level.toLowerCase()](`[  ${level.toLowerCase()}  ]`);
     }
     format(message, options) {
-        options = Object.assign({}, { level: 'info' }, options);
         const level = CliFormatter.paintByLevel(options.level);
         return `${level} ${message}`;
     }

package/src/Formatters/JsonFormatter.d.ts

@@ -9,8 +9,8 @@
 import { Chalk } from 'chalk';
 import { FormatterContract } from '../Contracts/FormatterContract';
 export interface JsonFormatterOptions {
-    color: Chalk;
+    chalk: Chalk;
 }
 export declare class JsonFormatter implements FormatterContract {
-    format(message: Record<any, unknown>, options?: JsonFormatterOptions): string;
+    format(message: Record<any, unknown>, options: JsonFormatterOptions): string;
 }

package/src/Formatters/JsonFormatter.js

@@ -12,9 +12,8 @@ exports.JsonFormatter = void 0;
 const Color_1 = require("../Utils/Color");
 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, null, 2))}`;
+        return `${pid} - ${Color_1.Color.bold('JSON:')} ${options.chalk(JSON.stringify(message, null, 2))}`;
     }
 }
 exports.JsonFormatter = JsonFormatter;

package/src/Formatters/NestFormatter.d.ts

@@ -9,11 +9,11 @@
 import { Chalk } from 'chalk';
 import { FormatterContract } from '../Contracts/FormatterContract';
 export interface ContextFormatterOptions {
-    color: Chalk;
+    chalk: Chalk;
     context: string;
 }
 export declare class NestFormatter implements FormatterContract {
     private static lastTimestamp?;
     private static getTimestampDiff;
-    format(message: string, options?: ContextFormatterOptions): string;
+    format(message: string, options: ContextFormatterOptions): string;
 }

package/src/Formatters/NestFormatter.js

@@ -21,12 +21,11 @@ class NestFormatter {
         return result;
     }
     format(message, options) {
-        options = Object.assign({}, { color: Color_1.Color.green, context: 'Logger' }, options);
         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 = NestFormatter.getTimestampDiff();
-        return `${pid} - ${timestamp} ${messageCtx}${options.color(message)}${timestampDiff}`;
+        return `${pid} - ${timestamp} ${messageCtx}${options.chalk(message)}${timestampDiff}`;
     }
 }
 exports.NestFormatter = NestFormatter;

package/src/Formatters/SimpleFormatter.d.ts

@@ -10,12 +10,12 @@ import { Chalk } from 'chalk';
 import { LevelTypes } from '../Contracts/LevelTypes';
 import { FormatterContract } from '../Contracts/FormatterContract';
 export interface LogFormatterOptions {
-    color: Chalk;
+    chalk: Chalk;
     level: LevelTypes;
 }
 export declare class SimpleFormatter implements FormatterContract {
     private static lastTimestamp?;
     private static getTimestampDiff;
     private static paintByLevel;
-    format(message: string, options?: LogFormatterOptions): string;
+    format(message: string, options: LogFormatterOptions): string;
 }

package/src/Formatters/SimpleFormatter.js

@@ -28,14 +28,13 @@ class SimpleFormatter {
             error: Color_1.Color.error,
             success: Color_1.Color.log,
         };
-        return levelColors[level.toLowerCase()](`[${level}]`);
+        return levelColors[level.toLowerCase()](`[${level.toUpperCase()}]`);
     }
     format(message, options) {
-        options = Object.assign({}, { color: Color_1.Color.green, level: 'info' }, options);
         const timestamp = getTimestamp_1.getTimestamp();
         const timestampDiff = SimpleFormatter.getTimestampDiff();
         const level = SimpleFormatter.paintByLevel(options.level);
-        return `${level} - ${timestamp} ${options.color(message)}${timestampDiff}`;
+        return `${level} - ${timestamp} ${options.chalk(message)}${timestampDiff}`;
     }
 }
 exports.SimpleFormatter = SimpleFormatter;

package/src/Logger.js

@@ -5,13 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const Color_1 = require("./Utils/Color");
 const utils_1 = require("@secjs/utils");
+const Color_1 = require("./Utils/Color");
 const DriverFactory_1 = require("./Factories/DriverFactory");
 const FormatterFactory_1 = require("./Factories/FormatterFactory");
 class Logger {
     constructor(runtimeConfig = {}) {
-        new utils_1.Config().safeLoad(utils_1.Path.config('logging'));
         this.runtimeConfig = runtimeConfig;
         this.channelName = 'default';
         this.driver = DriverFactory_1.DriverFactory.fabricate(this.channelName, this.runtimeConfig);
@@ -68,7 +67,7 @@ class Logger {
             streamType: 'stdout',
             formatterConfig: {
                 level: 'INFO',
-                color: Color_1.Color.cyan,
+                chalk: Color_1.Color.cyan,
             },
         });
         message = Logger.applyLogEngine(message);
@@ -79,7 +78,7 @@ class Logger {
             streamType: 'stdout',
             formatterConfig: {
                 level: 'WARN',
-                color: Color_1.Color.orange,
+                chalk: Color_1.Color.orange,
             },
         });
         message = Logger.applyLogEngine(message);
@@ -90,7 +89,7 @@ class Logger {
             streamType: 'stdout',
             formatterConfig: {
                 level: 'ERROR',
-                color: Color_1.Color.red,
+                chalk: Color_1.Color.red,
             },
         });
         message = Logger.applyLogEngine(message);
@@ -101,7 +100,7 @@ class Logger {
             streamType: 'stdout',
             formatterConfig: {
                 level: 'DEBUG',
-                color: Color_1.Color.purple,
+                chalk: Color_1.Color.purple,
             },
         });
         message = Logger.applyLogEngine(message);
@@ -112,7 +111,7 @@ class Logger {
             streamType: 'stdout',
             formatterConfig: {
                 level: 'SUCCESS',
-                color: Color_1.Color.green,
+                chalk: Color_1.Color.green,
             },
         });
         message = Logger.applyLogEngine(message);