refactor: create formatterConfig to separate driver and formatter con…

…figs
AthennaIO · Apr 4, 2022 · 27142d8 · 27142d8
1 parent 0f78392
commit 27142d8
Show file tree

Hide file tree

Showing 8 changed files with 137 additions and 130 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/logger",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
@@ -153,7 +153,7 @@
     }
   },
   "dependencies": {
-    "@athenna/ioc": "1.0.8",
+    "@athenna/ioc": "1.0.9",
     "@secjs/utils": "1.8.0",
     "reflect-metadata": "0.1.13",
     "tscpaths": "0.0.9"

diff --git a/src/Drivers/ConsoleDriver.ts b/src/Drivers/ConsoleDriver.ts
@@ -18,38 +18,36 @@ export interface ConsoleDriverOpts {
   context: string
   formatter: string
   streamType: string
+  formatterConfig: any
 }
 
 export class ConsoleDriver implements DriverContract {
-  private readonly _level: string
-  private readonly _context: string
   private readonly _formatter: string
   private readonly _streamType: string
+  private readonly _formatterConfig: any
 
   constructor(channel: string, configs: any = {}) {
     const channelConfig = Config.get(`logging.channels.${channel}`)
 
-    this._level = configs.level || channelConfig.level
-    this._context = configs.context || channelConfig.context
     this._formatter = configs.formatter || channelConfig.formatter
     this._streamType = configs.streamType || channelConfig.streamType
+    this._formatterConfig =
+      configs.formatterConfig || channelConfig.formatterConfig
   }
 
   transport(message: string, options?: ConsoleDriverOpts): void {
     options = Object.assign(
       {},
       {
-        level: this._level,
-        context: this._context,
         formatter: this._formatter,
         streamType: this._streamType,
       },
       options,
-    )
+    ) as ConsoleDriverOpts
 
     message = FormatterFactory.fabricate(options.formatter).format(
       message,
-      options,
+      options.formatterConfig || this._formatterConfig,
     )
 
     process[options.streamType].write(`${message}\n`)

diff --git a/src/Drivers/DebugDriver.ts b/src/Drivers/DebugDriver.ts
@@ -19,38 +19,36 @@ export interface DebugDriverOpts {
   context: string
   formatter: string
   namespace: string
+  formatterConfig: any
 }
 
 export class DebugDriver implements DriverContract {
-  private readonly _level: string
-  private readonly _context: string
   private readonly _formatter: string
   private readonly _namespace: string
+  private readonly _formatterConfig: any
 
   constructor(channel: string, configs: any = {}) {
     const channelConfig = Config.get(`logging.channels.${channel}`)
 
-    this._level = configs.level || channelConfig.level
-    this._context = configs.context || channelConfig.context
     this._formatter = configs.formatter || channelConfig.formatter
     this._namespace = configs.namespace || channelConfig.namespace
+    this._formatterConfig =
+      configs.formatterConfig || channelConfig.formatterConfig
   }
 
   transport(message: string, options?: DebugDriverOpts): void {
     options = Object.assign(
       {},
       {
-        level: this._level,
-        context: this._context,
         formatter: this._formatter,
         namespace: this._namespace,
       },
       options,
-    )
+    ) as DebugDriverOpts
 
     message = FormatterFactory.fabricate(options.formatter).format(
       message,
-      options,
+      options.formatterConfig || this._formatterConfig,
     )
 
     debug(options.namespace)(message)

diff --git a/src/Drivers/FileDriver.ts b/src/Drivers/FileDriver.ts
@@ -19,34 +19,32 @@ export interface FileDriverOpts {
   context: string
   formatter: string
   filePath: string
+  formatterConfig: any
 }
 
 export class FileDriver implements DriverContract {
-  private readonly _level: string
-  private readonly _context: string
   private readonly _filePath: string
   private readonly _formatter: string
+  private readonly _formatterConfig: any
 
   constructor(channel: string, configs: any = {}) {
     const channelConfig = Config.get(`logging.channels.${channel}`)
 
-    this._level = configs.level || channelConfig.level
-    this._context = configs.context || channelConfig.context
     this._filePath = configs.filePath || channelConfig.filePath
     this._formatter = configs.formatter || channelConfig.formatter
+    this._formatterConfig =
+      configs.formatterConfig || channelConfig.formatterConfig
   }
 
   async transport(message: string, options?: FileDriverOpts): Promise<void> {
     options = Object.assign(
       {},
       {
-        level: this._level,
-        context: this._context,
         filePath: this._filePath,
         formatter: this._formatter,
       },
       options,
-    )
+    ) as FileDriverOpts
 
     const filePath = options.filePath
     const { dir } = parse(filePath)
@@ -57,7 +55,7 @@ export class FileDriver implements DriverContract {
 
     message = FormatterFactory.fabricate(options.formatter).format(
       message,
-      options,
+      options.formatterConfig || this._formatterConfig,
     )
 
     return new Promise((resolve, reject) => {