@orion-js/logger 3.2.18 → 3.2.37

package/lib/formats.js

@@ -6,11 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonConsoleTransport = exports.jsonConsoleFormat = exports.textConsoleTransport = exports.textConsoleFormat = exports.sentryFormat = void 0;
 const winston_1 = require("winston");
 const util_1 = __importDefault(require("util"));
+const lodash_1 = require("lodash");
 const { metadata, timestamp, json, colorize, combine, printf } = winston_1.format;
 const metaError = (0, winston_1.format)(info => {
-    if (info.metadata && info.metadata.error && info.metadata.error instanceof Error) {
-        info.stack = info.metadata.error.stack;
-        info.metadata.error = info.metadata.error.message;
+    if (info?.metadata?.value?.error instanceof Error) {
+        info.stack = info?.metadata?.value?.error.stack;
+        info.errorMessage = info?.metadata?.value?.error.message;
+        delete info?.metadata?.value?.error;
+    }
+    if (info?.metadata?.value instanceof Error) {
+        info.stack = info?.metadata?.value.stack;
+        info.errorMessage = info?.metadata?.value.message;
+        delete info?.metadata?.value;
     }
     return info;
 });
@@ -24,8 +31,23 @@ exports.sentryFormat = (0, winston_1.format)(info => {
         }
     };
 });
+function getMetadataText(metadata) {
+    const { value, ...rest } = metadata;
+    if ((0, lodash_1.isEmpty)(rest)) {
+        if (typeof value === 'undefined')
+            return '';
+        return util_1.default.inspect(value);
+    }
+    return `${util_1.default.inspect(value)} ${util_1.default.inspect(rest)}`;
+}
 exports.textConsoleFormat = combine(colorize(), metadata({ fillExcept: ['fileName', 'level', 'message', 'stack'] }), metaError(), timestamp(), printf(info => {
-    return `[${info.level}] [${info.timestamp}] ${info.fileName ? `[${info.fileName}]` : ''} ${info.message} ${info.stack ? `\n${info.stack}` : ''} ${util_1.default.inspect(info.metadata)}`;
+    // console.log(info)
+    const date = new Date(info.timestamp);
+    const timeLabel = `${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`;
+    const fileNameLabel = info.fileName ? `[${info.fileName}]` : '';
+    const stack = info.stack ? `\n${info.stack}` : '';
+    const value = getMetadataText(info.metadata);
+    return `[${info.level}] [${timeLabel}] ${fileNameLabel} ${info.message} ${value} ${stack}`;
 }));
 exports.textConsoleTransport = new winston_1.transports.Console({
     handleExceptions: true,

package/lib/helpers/getFileName.d.ts

@@ -1,3 +1,2 @@
 export declare const getFileName: () => string;
 export declare const improveFileName: (path: string) => string;
-export declare const setFileName: (metadata: any) => void;

package/lib/helpers/getFileName.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setFileName = exports.improveFileName = exports.getFileName = void 0;
+exports.improveFileName = exports.getFileName = void 0;
 const getFileName = () => {
     try {
         const stack = new Error().stack;
         const lines = stack.split('\n');
-        const filePath = lines[4].split('(')[1].split(')')[0];
+        const filePath = lines[3].split('(')[1].split(')')[0];
         return (0, exports.improveFileName)(filePath);
     }
     catch (error) {
@@ -33,9 +33,3 @@ const improveFileName = (path) => {
     return path;
 };
 exports.improveFileName = improveFileName;
-const setFileName = (metadata) => {
-    if (metadata.fileName)
-        return;
-    metadata.fileName = (0, exports.getFileName)();
-};
-exports.setFileName = setFileName;

package/lib/index.test.js

@@ -7,5 +7,18 @@ describe('Log', () => {
         logger_1.logger.debug('debug');
         logger_1.logger.info('info');
         logger_1.logger.warn('warn');
+        logger_1.logger.warn('warn', { info: 'of the log' });
+    });
+    it('shouldnt fail when passing a non object to the metadata', () => {
+        logger_1.logger.info('info', 'a string');
+        logger_1.logger.info('info', ['array']);
+    });
+    it('should log errors correctly', () => {
+        logger_1.logger.error('an error', new Error('message'));
+        logger_1.logger.error('an error2', { error: new Error('message'), info: 'of the log' });
+    });
+    it('should pass the context', () => {
+        const withMeta = logger_1.logger.addMetadata({ context: 'context' });
+        withMeta.info('info', { notContext: 'notContext' });
     });
 });

package/lib/logger.js

@@ -31,21 +31,21 @@ const getLogger = (context) => {
 exports.getLogger = getLogger;
 const createLogger = (logger) => {
     return {
-        debug: (message, metadata = {}) => {
-            (0, getFileName_1.setFileName)(metadata);
-            return logger.debug(message, metadata);
+        debug: (message, value) => {
+            const fileName = (0, getFileName_1.getFileName)();
+            return logger.debug({ message, fileName, value });
         },
-        info: (message, metadata = {}) => {
-            (0, getFileName_1.setFileName)(metadata);
-            return logger.info(message, metadata);
+        info: (message, value) => {
+            const fileName = (0, getFileName_1.getFileName)();
+            return logger.info({ message, fileName, value });
         },
-        warn: (message, metadata = {}) => {
-            (0, getFileName_1.setFileName)(metadata);
-            return logger.warn(message, metadata);
+        warn: (message, value) => {
+            const fileName = (0, getFileName_1.getFileName)();
+            return logger.warn({ message, fileName, value });
         },
-        error: (message, metadata = {}) => {
-            (0, getFileName_1.setFileName)(metadata);
-            return logger.error(message, metadata);
+        error: (message, value) => {
+            const fileName = (0, getFileName_1.getFileName)();
+            return logger.error({ message, fileName, value });
         },
         addContext: (module) => {
             if (module.id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/logger",
-  "version": "3.2.18",
+  "version": "3.2.37",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -13,11 +13,13 @@
     "upgrade-interactive": "yarn upgrade-interactive"
   },
   "dependencies": {
+    "lodash": "^4.17.21",
     "object-hash": "^2.2.0",
     "winston": "^3.6.0"
   },
   "devDependencies": {
     "@types/jest": "^27.0.2",
+    "@types/lodash": "^4.14.182",
     "jest": "27.3.1",
     "ts-jest": "27.0.7",
     "typescript": "^4.4.4"
@@ -25,5 +27,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "95db28fdf82bca1f23a07ea3a0d8f1218b7c1373"
+  "gitHead": "f64b1082ff22931fc49c2df07bb477eb14ac9df2"
 }