@unchainedshop/logger 2.0.0-rc.4 → 2.0.1

package/jest.config.js

@@ -11,4 +11,7 @@ export default {
       },
     ],
   },
+  moduleNameMapper: {
+    '(.+)\\.js': '$1',
+  },
 };

package/lib/createLogger.js

@@ -4,7 +4,7 @@ import { LogLevel } from './logger.types.js';
 const require = createRequire(import.meta.url);
 const { stringify } = require('safe-stable-stringify');
 const { DEBUG = '', LOG_LEVEL = LogLevel.Info, UNCHAINED_LOG_FORMAT = 'unchained' } = process.env;
-const { combine, label, timestamp, colorize, printf, json } = format;
+const { combine, colorize, json } = format;
 const debugStringContainsModule = (debugString, moduleName) => {
     if (!debugString)
         return false;
@@ -24,13 +24,20 @@ const debugStringContainsModule = (debugString, moduleName) => {
     }, undefined);
     return loggingMatched || false;
 };
-const myFormat = printf(({ level, message, label: _label, timestamp: _timestamp, ...rest }) => {
+const myFormat = format.printf(({ level, message, label, timestamp, stack, ...rest }) => {
     const otherPropsString = stringify(rest);
-    return `[${_label}] ${level}: ${message} ${otherPropsString}`;
+    return [
+        `${timestamp} [${label}] ${level}:`,
+        `${message}`,
+        `${otherPropsString}`,
+        stack ? `\n${stack}` : null,
+    ]
+        .filter(Boolean)
+        .join(' ');
 });
 const UnchainedLogFormats = {
-    unchained: (moduleName) => combine(timestamp(), label({ label: moduleName }), colorize(), myFormat),
-    json,
+    unchained: combine(colorize(), myFormat),
+    json: json(),
 };
 if (!UnchainedLogFormats[UNCHAINED_LOG_FORMAT.toLowerCase()]) {
     throw new Error(`UNCHAINED_LOG_FORMAT is invalid, use one of ${Object.keys(UnchainedLogFormats).join(',')}`);
@@ -39,9 +46,10 @@ export { transports, format };
 export const createLogger = (moduleName, moreTransports = []) => {
     const loggingMatched = debugStringContainsModule(DEBUG, moduleName);
     return createWinstonLogger({
+        format: format.combine(format.errors({ stack: process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' }), format.timestamp(), format.label({ label: moduleName })),
         transports: [
             new transports.Console({
-                format: UnchainedLogFormats[UNCHAINED_LOG_FORMAT](moduleName),
+                format: UnchainedLogFormats[UNCHAINED_LOG_FORMAT],
                 stderrLevels: [LogLevel.Error],
                 consoleWarnLevels: [LogLevel.Warning],
                 level: loggingMatched ? LogLevel.Debug : LOG_LEVEL,

package/lib/createLogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"createLogger.js","sourceRoot":"","sources":["../src/createLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,mBAAmB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAEvD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,SAAS,GAAG,QAAQ,CAAC,IAAI,EAAE,oBAAoB,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAElG,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;AAErE,MAAM,yBAAyB,GAAG,CAAC,WAAmB,EAAE,UAAkB,EAAE,EAAE;IAC5E,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IAC/B,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,WAAgB,EAAE,IAAY,EAAE,EAAE;QACtF,IAAI,WAAW,KAAK,KAAK;YAAE,OAAO,WAAW,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC3F,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,SAAS,GAAG,EAAE,GAAG,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YAC3B,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,EAAE;gBAC5B,qBAAqB;gBACrB,OAAO,KAAK,CAAC;aACd;YACD,OAAO,IAAI,CAAC;SACb;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,EAAE,SAAS,CAAC,CAAC;IACd,OAAO,cAAc,IAAI,KAAK,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC5F,MAAM,gBAAgB,GAAW,SAAS,CAAC,IAAI,CAAC,CAAC;IACjD,OAAO,IAAI,MAAM,KAAK,KAAK,KAAK,OAAO,IAAI,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG;IAC1B,SAAS,EAAE,CAAC,UAAkB,EAAE,EAAE,CAChC,OAAO,CAAC,SAAS,EAAE,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,QAAQ,CAAC;IAC1E,IAAI;CACL,CAAC;AAEF,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAC,EAAE;IAC5D,MAAM,IAAI,KAAK,CACb,+CAA+C,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC5F,CAAC;CACH;AAED,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AAE9B,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,UAAkB,EAAE,iBAAyC,EAAE,EAAE,EAAE;IAC9F,MAAM,cAAc,GAAG,yBAAyB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACpE,OAAO,mBAAmB,CAAC;QACzB,UAAU,EAAE;YACV,IAAI,UAAU,CAAC,OAAO,CAAC;gBACrB,MAAM,EAAE,mBAAmB,CAAC,oBAAoB,CAAC,CAAC,UAAU,CAAC;gBAC7D,YAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAC9B,iBAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACrC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;aACnD,CAAC;YACF,GAAG,cAAc;SAClB;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"createLogger.js","sourceRoot":"","sources":["../src/createLogger.ts"],"names":[],"mappings":"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"}

package/lib/log.d.ts

@@ -1,3 +1,3 @@
 import winston from 'winston';
 import { LogOptions } from './logger.types.js';
-export declare const log: (message: string, options?: LogOptions) => winston.Logger;
+export declare const log: (message: string | Error, options?: LogOptions) => winston.Logger;

package/lib/log.js

@@ -2,6 +2,9 @@ import { LogLevel } from './logger.types.js';
 import { createLogger } from './createLogger.js';
 const logger = createLogger('unchained');
 export const log = (message, options) => {
+    if (!options?.level) {
+        return logger.info(message, options);
+    }
     const { level = LogLevel.Info, ...meta } = options || {};
     return logger.log(level, message, meta);
 };

package/lib/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAc,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;AAEzC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,OAAe,EAAE,OAAoB,EAAkB,EAAE;IAC3E,MAAM,EAAE,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IACzD,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC,CAAC"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAc,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;AAEzC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,OAAuB,EAAE,OAAoB,EAAkB,EAAE;IACnF,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE;QACnB,OAAO,MAAM,CAAC,IAAI,CAAC,OAAc,EAAE,OAAO,CAAC,CAAC;KAC7C;IACD,MAAM,EAAE,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IACzD,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,OAAc,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/logger",
-  "version": "2.0.0-rc.4",
+  "version": "2.0.1",
   "main": "lib/logger-index.js",
   "exports": {
     ".": "./lib/logger-index.js",
@@ -36,11 +36,11 @@
     "winston-transport": "^4.5.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.2.5",
+    "@types/jest": "^29.4.0",
     "@types/node": "^18.11.18",
-    "@unchainedshop/types": "^2.0.0-rc.4",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.4"
+    "@unchainedshop/types": "^2.0.1",
+    "jest": "^29.4.1",
+    "ts-jest": "^29.0.5",
+    "typescript": "^4.9.5"
   }
 }

package/src/createLogger.ts

@@ -8,7 +8,7 @@ const { stringify } = require('safe-stable-stringify');
 
 const { DEBUG = '', LOG_LEVEL = LogLevel.Info, UNCHAINED_LOG_FORMAT = 'unchained' } = process.env;
 
-const { combine, label, timestamp, colorize, printf, json } = format;
+const { combine, colorize, json } = format;
 
 const debugStringContainsModule = (debugString: string, moduleName: string) => {
   if (!debugString) return false;
@@ -28,15 +28,21 @@ const debugStringContainsModule = (debugString: string, moduleName: string) => {
   return loggingMatched || false;
 };
 
-const myFormat = printf(({ level, message, label: _label, timestamp: _timestamp, ...rest }) => { //eslint-disable-line
+const myFormat = format.printf(({ level, message, label, timestamp, stack, ...rest }) => {
   const otherPropsString: string = stringify(rest);
-  return `[${_label}] ${level}: ${message} ${otherPropsString}`;
+  return [
+    `${timestamp} [${label}] ${level}:`,
+    `${message}`,
+    `${otherPropsString}`,
+    stack ? `\n${stack}` : null,
+  ]
+    .filter(Boolean)
+    .join(' ');
 });
 
 const UnchainedLogFormats = {
-  unchained: (moduleName: string) =>
-    combine(timestamp(), label({ label: moduleName }), colorize(), myFormat),
-  json,
+  unchained: combine(colorize(), myFormat),
+  json: json(),
 };
 
 if (!UnchainedLogFormats[UNCHAINED_LOG_FORMAT.toLowerCase()]) {
@@ -50,9 +56,14 @@ export { transports, format };
 export const createLogger = (moduleName: string, moreTransports: Array<TransportStream> = []) => {
   const loggingMatched = debugStringContainsModule(DEBUG, moduleName);
   return createWinstonLogger({
+    format: format.combine(
+      format.errors({ stack: process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' }),
+      format.timestamp(),
+      format.label({ label: moduleName }),
+    ),
     transports: [
       new transports.Console({
-        format: UnchainedLogFormats[UNCHAINED_LOG_FORMAT](moduleName),
+        format: UnchainedLogFormats[UNCHAINED_LOG_FORMAT],
         stderrLevels: [LogLevel.Error],
         consoleWarnLevels: [LogLevel.Warning],
         level: loggingMatched ? LogLevel.Debug : LOG_LEVEL,

package/src/log.ts

@@ -4,7 +4,10 @@ import { createLogger } from './createLogger.js';
 
 const logger = createLogger('unchained');
 
-export const log = (message: string, options?: LogOptions): winston.Logger => {
+export const log = (message: string | Error, options?: LogOptions): winston.Logger => {
+  if (!options?.level) {
+    return logger.info(message as any, options);
+  }
   const { level = LogLevel.Info, ...meta } = options || {};
-  return logger.log(level, message, meta);
+  return logger.log(level, message as any, meta);
 };

package/tsconfig.json

@@ -1,29 +1,11 @@
 {
+  "extends": "../shared/base.tsconfig.json",
   "compilerOptions": {
-    "allowJs": true,
-    "allowSyntheticDefaultImports": true,
-    "declaration": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "forceConsistentCasingInFileNames": true,
-    "lib": [
-      "esnext"
-    ],
-    "module": "Node16",
-    "moduleResolution": "Node16",
-    "noImplicitReturns": true,
-    "noUnusedLocals": false,
+    "rootDir": "src",
     "outDir": "lib",
-    "preserveWatchOutput": true,
-    "skipLibCheck": true,
-    "sourceMap": true,
-    "target": "ES2022",
-    "types": [
-      "node",
-      "jest"
-    ]
   },
+  "exclude": ["**/*.test.ts", "**/*.test.js", "tests"],
   "include": [
-    "src"
+    "./src"
   ]
 }