fix: space error log if after message

.npmignore

@@ -3,6 +3,7 @@
 .editorconfig
 .env
 .eslintignore
+eslint.config.mjs
 .eslintrc.json
 .nyc_output
 .travis.yml

example/index.js

@@ -9,6 +9,7 @@ const mylogger = digipolisLogger(console, configuration);
 
 mylogger.log('hello');
 mylogger.log('hello');
+mylogger.log('something went wrong', new Error("wupsi"));
 mylogger.log({ message: 'logmessage2', timestamp: 'timestamp123' });
 const err = new Error('Errormessage');
 mylogger.error(err);

lib/helpers/formatter.js

@@ -34,6 +34,9 @@ function json(args, level) {
       if (!newAcc.message && ('message' in arg || 'stack' in arg)) {
         newAcc.message = '';
       }
+      if (newAcc.message && ('message' in arg || 'stack' in arg)) {
+        newAcc.message += ' ';
+      }
       if ('message' in arg) {
         newAcc.message += arg.message;
       }

lib/index.js

@@ -2,17 +2,17 @@ const formatter = require('./helpers/formatter');
 
 const { levels, validateConfig } = require('./config');
 
-module.exports = (cons, config) => {
+module.exports = (consoleInstance, config) => {
   const logger = {};
   const validatedConfig = validateConfig(config);
-  if (cons.isProxied && validatedConfig.override) {
-    cons.reset();
+  if (consoleInstance.isProxied && validatedConfig.override) {
+    consoleInstance.reset();
     console.warn('Already overridden, replacing logproxy');
   }
   const baseproxy = {};
   const logproxy = {};
   Object.keys(levels.consoleLevels).forEach((level) => {
-    const org = cons[level];
+    const org = consoleInstance[level];
     // proxy without handler this is the proxy we reset to as we can`t reset to native code
     baseproxy[level] = new Proxy(org, {});
 
@@ -34,19 +34,19 @@ module.exports = (cons, config) => {
       },
     });
     if (validatedConfig.override) {
-      cons[level] = logproxy[level];
+      consoleInstance[level] = logproxy[level];
     }
     logger[level] = logproxy[level];
   });
 
-  cons.isProxied = true;
-  cons.reset = () => {
-    cons.isProxied = false;
+  consoleInstance.isProxied = true;
+  consoleInstance.reset = () => {
+    consoleInstance.isProxied = false;
     Object.keys(levels.consoleLevels).forEach((level) => {
-      cons[level] = baseproxy[level];
+      consoleInstance[level] = baseproxy[level];
       logger[level] = baseproxy[level];
     });
-    return cons;
+    return consoleInstance;
   };
   return logger;
 };

package.json

@@ -23,7 +23,7 @@
   "license": "MIT",
   "devDependencies": {
     "c8": "^10.1.3",
-    "eslint": "^9.32.0",
+    "eslint": "^9.33.0",
     "eslint-plugin-mocha": "^11.1.0",
     "jsonschema": "^1.5.0",
     "mocha": "^11.7.1",

test/log.test.mjs

@@ -3,7 +3,7 @@ import sinon from 'sinon';
 import { levels } from '../lib/config/index.js';
 import uuidhelper from '../lib/helpers/uuid.js';
 import log from '../lib/index.js';
-import logschema from './data/logschema.json' with { type: "json"  };
+import logschema from './data/logschema.json' with { type: "json" };
 import { Validator } from 'jsonschema';
 
 const v4 = /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$|/i;
@@ -77,6 +77,23 @@ describe('Logs:', () => {
       sinon.assert.calledWith(logstub.log, result);
       assert.equal(validator.validate(result, logschema).valid ,true)
     });
+    it('test, { x: "y" }', async () => {
+      const logmessage = { x: 'y' };
+      log(console, {
+        type: 'json',
+        override: true,
+      });
+      console.log('test', logmessage);
+      const result = {
+        message: 'test Extrainfo: {"x":"y"}',
+        timestamp: new Date().toISOString(),
+        type: ['technical'],
+        level: 'INFO',
+        correlationId: 'ABCDEFAB-ABCD-4ABC-AABC-ABCDEFABCDEF',
+      };
+      sinon.assert.calledWith(logstub.log, result);
+      assert.equal(validator.validate(result, logschema).valid ,true)
+    });
     it('{ timestamp: "timestamp" }', async () => {
       const logmessage = { timestamp: 'timestamp' };
       log(console, {
@@ -171,6 +188,25 @@ describe('Logs:', () => {
         correlationId: 'ABCDEFAB-ABCD-4ABC-AABC-ABCDEFABCDEF',
       });
     });
+    it('message, new Error(\'errormessage\')', async () => {
+      const logmessage = new Error('errormessage');
+      logmessage.stack = `
+  stack
+  stack
+  stack`;
+      log(console, {
+        type: 'json',
+        override: true,
+      });
+      console.log('message', logmessage);
+      sinon.assert.calledWith(logstub.log, {
+        message: 'message errormessage \n  stack\n  stack\n  stack',
+        timestamp: new Date().toISOString(),
+        type: ['technical'],
+        level: 'INFO',
+        correlationId: 'ABCDEFAB-ABCD-4ABC-AABC-ABCDEFABCDEF',
+      });
+    });
   });
   describe('{ type: silent }', () => {
     it('"logmessage"', async () => {
@@ -185,7 +221,7 @@ describe('Logs:', () => {
     });
   });
   describe('{ type: log }', () => {
-    it('"logmessage"', async () => {
+        it('"logmessage"', async () => {
       const logmessage = 'logmessage';
       log(console, {
         type: 'log',
@@ -293,6 +329,23 @@ describe('Logs:', () => {
       }));
     });
   });
+  it('"logmessage1", "logmessage2"', async () => {
+    const logmessage = 'logmessage';
+    const logmessage2 = 'logmessage2';
+    log(console, {
+      type: 'log',
+      override: true,
+    });
+    console.log(logmessage, logmessage2);
+    const result = JSON.stringify({
+      timestamp: new Date().toISOString(),
+      type: ['technical'],
+      level: 'INFO',
+      correlationId: 'ABCDEFAB-ABCD-4ABC-AABC-ABCDEFABCDEF',
+      message: `${logmessage} ${logmessage2}`,
+    });
+    sinon.assert.calledWith(logstub.log, result);
+  });
   describe('{ type: text }', () => {
     it('"logmessage"', async () => {
       const logmessage = 'logmessage';