@athenna/logger 1.1.3 → 1.1.6

package/index.d.ts

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

package/index.js

@@ -19,6 +19,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./src/Logger"), exports);
+__exportStar(require("./src/Facades/Log"), 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.1.3",
+  "version": "1.1.6",
   "description": "",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",

package/src/Facades/Log.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @athenna/logger
+ *
+ * (c) João Lenon <lenon@athenna.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+import { Logger } from '../Logger';
+export declare const Log: Logger;

package/src/Facades/Log.js

@@ -0,0 +1,13 @@
+"use strict";
+/**
+ * @athenna/logger
+ *
+ * (c) João Lenon <lenon@athenna.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Log = void 0;
+const Handler_1 = require("../Utils/Handler");
+exports.Log = new Proxy({}, new Handler_1.Handler('Athenna/Core/Logger'));

package/src/Factories/FormatterFactory.js

@@ -9,12 +9,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormatterFactory = void 0;
+const CliFormatter_1 = require("../Formatters/CliFormatter");
 const JsonFormatter_1 = require("../Formatters/JsonFormatter");
 const NestFormatter_1 = require("../Formatters/NestFormatter");
 const SimpleFormatter_1 = require("../Formatters/SimpleFormatter");
+const RequestFormatter_1 = require("../Formatters/RequestFormatter");
 const NotFoundFormatterException_1 = require("../Exceptions/NotFoundFormatterException");
 const FormatterAlreadyExistException_1 = require("../Exceptions/FormatterAlreadyExistException");
-const CliFormatter_1 = require("../Formatters/CliFormatter");
 class FormatterFactory {
     static availableFormatters() {
         const availableFormatters = [];
@@ -42,4 +43,5 @@ FormatterFactory.formatters = new Map()
     .set('cli', { Formatter: CliFormatter_1.CliFormatter })
     .set('nest', { Formatter: NestFormatter_1.NestFormatter })
     .set('json', { Formatter: JsonFormatter_1.JsonFormatter })
-    .set('simple', { Formatter: SimpleFormatter_1.SimpleFormatter });
+    .set('simple', { Formatter: SimpleFormatter_1.SimpleFormatter })
+    .set('request', { Formatter: RequestFormatter_1.RequestFormatter });

package/src/Formatters/RequestFormatter.js

@@ -14,11 +14,10 @@ class RequestFormatter {
     format(ctx, options) {
         const ip = ctx.request.ip;
         const status = ctx.status;
-        const baseUrl = ctx.request.baseUrl;
-        const method = Color_1.Color[ctx.request.method];
-        const responseTimeMs = `${ctx.responseTime}ms`;
+        const responseTimeMs = `${Math.round(ctx.responseTime)}ms`;
+        const methodAndUrl = Color_1.Color[ctx.request.method](`${ctx.request.method}::${ctx.request.baseUrl}`);
         if (!options.asJson) {
-            return `(${ip}) - [${status}] ${method}::${baseUrl} ${responseTimeMs}`;
+            return `(${ip}) - [${status}] ${methodAndUrl} ${responseTimeMs}`;
         }
         const metadata = {
             method: ctx.request.method,
@@ -28,12 +27,21 @@ class RequestFormatter {
             url: ctx.request.hostUrl,
             path: ctx.request.baseUrl,
             createdAt: Date.now(),
+            data: ctx.data,
         };
-        return JSON.stringify({
-            request: JSON.stringify(ctx.request),
-            response: JSON.stringify(ctx.response),
-            metadata,
-        });
+        const request = {
+            url: ctx.request.hostUrl,
+            method: ctx.request.method,
+            body: ctx.request.body,
+            params: ctx.request.params,
+            queries: ctx.request.queries,
+            headers: ctx.request.headers,
+        };
+        const response = {
+            body: ctx.body,
+            headers: ctx.headers,
+        };
+        return JSON.stringify({ request, response, metadata });
     }
 }
 exports.RequestFormatter = RequestFormatter;

package/src/Providers/LoggerProvider.js

@@ -18,7 +18,7 @@ class LoggerProvider extends ioc_1.ServiceProvider {
      * @return void
      */
     register() {
-        this.container.bind('Athenna/Core/Logger', Logger_1.Logger);
+        this.container.instance('Athenna/Core/Logger', new Logger_1.Logger());
     }
 }
 exports.LoggerProvider = LoggerProvider;

package/src/Utils/Color.js

@@ -60,25 +60,25 @@ class Color {
         return this.orange.bold;
     }
     static get GET() {
-        return this.purple.bold('GET');
+        return this.purple.bold;
     }
     static get HEAD() {
-        return this.cyan.bold('HEAD');
+        return this.cyan.bold;
     }
     static get PUT() {
-        return this.orange.bold('PUT');
+        return this.orange.bold;
     }
     static get PATCH() {
-        return this.yellow.bold('PATCH');
+        return this.yellow.bold;
     }
     static get POST() {
-        return this.green.bold('POST');
+        return this.green.bold;
     }
     static get DELETE() {
-        return this.red.bold('DELETE');
+        return this.red.bold;
     }
     static get OPTIONS() {
-        return this.cyan.bold('OPTIONS');
+        return this.cyan.bold;
     }
     static removeColors(string) {
         return Color.chalk.reset(string).replace(

package/src/Utils/Handler.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @athenna/logger
+ *
+ * (c) João Lenon <lenon@athenna.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+export declare class Handler {
+    private readonly alias;
+    constructor(alias: any);
+    get(_object: any, key: string): any;
+}

package/src/Utils/Handler.js

@@ -0,0 +1,24 @@
+"use strict";
+/**
+ * @athenna/logger
+ *
+ * (c) João Lenon <lenon@athenna.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Handler = void 0;
+class Handler {
+    constructor(alias) {
+        this.alias = alias;
+    }
+    get(_object, key) {
+        const provider = ioc.use(this.alias);
+        if (!provider) {
+            return () => { };
+        }
+        return provider[key];
+    }
+}
+exports.Handler = Handler;