@innei/pretty-logger-nestjs 0.3.4 → 0.3.5

package/dist/index.d.mts

@@ -15,20 +15,24 @@ declare class LoggerModule {
 declare class Logger extends ConsoleLogger {
   private static loggerInstance;
   static setLoggerInstance(logger: WrappedConsola$1): void;
-  constructor(context: string, options: ConsoleLoggerOptions);
-  private _getColorByLogLevel;
+  constructor(context?: string, options?: ConsoleLoggerOptions);
   private lastTimestampAt;
   private _updateAndGetTimestampDiff;
-  protected formatMessage(message: any, logLevel?: string): any;
-  log(message: any, context?: string, ...argv: any[]): void;
-  warn(message: any, context?: string, ...argv: any[]): void;
-  debug(message: any, context?: string, ...argv: any[]): void;
-  verbose(message: any, context?: string, ...argv: any[]): void;
-  fatal(message: any, context?: string, ...argv: any[]): void;
-  error(message: any, context?: string, ...argv: any[]): void;
+  private getContextPrefix;
+  private get workerPrefix();
+  /**
+   * Check if the last argument looks like a NestJS context string.
+   * NestJS passes context as the last string argument (e.g., 'AppService', 'UserController').
+   * Context strings are typically PascalCase class names.
+   */
+  private isContextString;
   private print;
-  private defaultContextPrefix;
-}
-
-//#endregion
+  log(...args: any[]): void;
+  info(...args: any[]): void;
+  warn(...args: any[]): void;
+  debug(...args: any[]): void;
+  verbose(...args: any[]): void;
+  fatal(...args: any[]): void;
+  error(...args: any[]): void;
+} //#endregion
 export { Core, Logger, LoggerConsolaOptions, LoggerModule, WrappedConsola, createLogger };

package/dist/index.d.ts

@@ -15,20 +15,24 @@ declare class LoggerModule {
 declare class Logger extends ConsoleLogger {
   private static loggerInstance;
   static setLoggerInstance(logger: WrappedConsola$1): void;
-  constructor(context: string, options: ConsoleLoggerOptions);
-  private _getColorByLogLevel;
+  constructor(context?: string, options?: ConsoleLoggerOptions);
   private lastTimestampAt;
   private _updateAndGetTimestampDiff;
-  protected formatMessage(message: any, logLevel?: string): any;
-  log(message: any, context?: string, ...argv: any[]): void;
-  warn(message: any, context?: string, ...argv: any[]): void;
-  debug(message: any, context?: string, ...argv: any[]): void;
-  verbose(message: any, context?: string, ...argv: any[]): void;
-  fatal(message: any, context?: string, ...argv: any[]): void;
-  error(message: any, context?: string, ...argv: any[]): void;
+  private getContextPrefix;
+  private get workerPrefix();
+  /**
+   * Check if the last argument looks like a NestJS context string.
+   * NestJS passes context as the last string argument (e.g., 'AppService', 'UserController').
+   * Context strings are typically PascalCase class names.
+   */
+  private isContextString;
   private print;
-  private defaultContextPrefix;
-}
-
-//#endregion
+  log(...args: any[]): void;
+  info(...args: any[]): void;
+  warn(...args: any[]): void;
+  debug(...args: any[]): void;
+  verbose(...args: any[]): void;
+  fatal(...args: any[]): void;
+  error(...args: any[]): void;
+} //#endregion
 export { Core, Logger, LoggerConsolaOptions, LoggerModule, WrappedConsola, createLogger };

package/dist/index.js

@@ -35,59 +35,64 @@ var Logger = class Logger extends __nestjs_common.ConsoleLogger {
 		this.loggerInstance = logger;
 	}
 	constructor(context, options) {
-		super(context, options);
+		super(context || "", options || {});
 		this.lastTimestampAt = Date.now();
-		this.defaultContextPrefix = this.context ? `[${picocolors.default.yellow(this.context)}] ` : `[${picocolors.default.red("System")}] `;
-	}
-	_getColorByLogLevel(logLevel) {
-		switch (logLevel) {
-			case "debug": return picocolors.default.cyan;
-			case "warn": return picocolors.default.yellow;
-			case "error": return picocolors.default.red;
-			case "verbose": return picocolors.default.gray;
-			default: return picocolors.default.green;
-		}
 	}
 	_updateAndGetTimestampDiff() {
-		const includeTimestamp = this.lastTimestampAt && this.options.timestamp;
+		const includeTimestamp = this.lastTimestampAt && this.options?.timestamp;
 		const now = Date.now();
 		const result = includeTimestamp ? picocolors.default.yellow(` +${now - this.lastTimestampAt}ms`) : "";
 		this.lastTimestampAt = now;
 		return result;
 	}
-	formatMessage(message, logLevel = "log") {
-		const formatMessage = typeof message == "string" ? this._getColorByLogLevel(logLevel)(message) : message;
-		return formatMessage;
+	getContextPrefix(context) {
+		const ctx = context || this.context;
+		return ctx ? `[${picocolors.default.yellow(ctx)}]` : `[${picocolors.default.red("System")}]`;
 	}
-	log(message, context, ...argv) {
-		this.print("info", message, context, ...argv);
+	get workerPrefix() {
+		return node_cluster.default.isWorker ? picocolors.default.yellow(`*Worker - ${node_cluster.default.worker.id}*`) : "";
 	}
-	warn(message, context, ...argv) {
-		this.print("warn", message, context, ...argv);
+	/**
+	* Check if the last argument looks like a NestJS context string.
+	* NestJS passes context as the last string argument (e.g., 'AppService', 'UserController').
+	* Context strings are typically PascalCase class names.
+	*/
+	isContextString(value) {
+		if (typeof value !== "string") return false;
+		return /^[A-Z][a-zA-Z0-9]*$/.test(value);
 	}
-	debug(message, context, ...argv) {
-		this.print("debug", message, context, ...argv);
+	print(level, ...args) {
+		const print = Logger.loggerInstance[level];
+		const diff = this._updateAndGetTimestampDiff();
+		let context;
+		let messages = args;
+		if (args.length > 0 && this.isContextString(args.at(-1))) {
+			context = args.at(-1);
+			messages = args.slice(0, -1);
+		}
+		const prefix = this.workerPrefix ? `${this.workerPrefix} ${this.getContextPrefix(context)}` : this.getContextPrefix(context);
+		print(prefix, ...messages, diff);
 	}
-	verbose(message, context, ...argv) {
-		this.print("verbose", message, context, ...argv);
+	log(...args) {
+		this.print("info", ...args);
 	}
-	fatal(message, context, ...argv) {
-		this.print("fatal", message, context, ...argv);
+	info(...args) {
+		this.print("info", ...args);
 	}
-	error(message, context, ...argv) {
-		const trace = context;
-		const _context = argv[0];
-		if (!trace && _context) this.print("error", message, _context, ...argv.slice(1));
-		else this.print("error", message, context, ...argv);
+	warn(...args) {
+		this.print("warn", ...args);
 	}
-	print(level, message, context, ...argv) {
-		const print = Logger.loggerInstance[level];
-		const formatMessage = this.formatMessage(message, level);
-		const diff = this._updateAndGetTimestampDiff();
-		const workerPrefix = node_cluster.default.isWorker ? picocolors.default.yellow(`*Worker - ${node_cluster.default.worker.id}*`) : "";
-		if (context && argv.length === 0) print(`${workerPrefix} [${picocolors.default.yellow(context)}] `, formatMessage, diff);
-		else if (argv.length === 0) print(`${workerPrefix} ${this.defaultContextPrefix}`, formatMessage, diff);
-		else print(`${workerPrefix} ${this.defaultContextPrefix}`, message, context, ...argv, diff);
+	debug(...args) {
+		this.print("debug", ...args);
+	}
+	verbose(...args) {
+		this.print("verbose", ...args);
+	}
+	fatal(...args) {
+		this.print("fatal", ...args);
+	}
+	error(...args) {
+		this.print("error", ...args);
 	}
 };
 Logger.loggerInstance = (0, __innei_pretty_logger_core.createLoggerConsola)();

package/dist/index.mjs

@@ -36,59 +36,64 @@ var Logger = class Logger extends ConsoleLogger {
 		this.loggerInstance = logger;
 	}
 	constructor(context, options) {
-		super(context, options);
+		super(context || "", options || {});
 		this.lastTimestampAt = Date.now();
-		this.defaultContextPrefix = this.context ? `[${picocolors.yellow(this.context)}] ` : `[${picocolors.red("System")}] `;
-	}
-	_getColorByLogLevel(logLevel) {
-		switch (logLevel) {
-			case "debug": return picocolors.cyan;
-			case "warn": return picocolors.yellow;
-			case "error": return picocolors.red;
-			case "verbose": return picocolors.gray;
-			default: return picocolors.green;
-		}
 	}
 	_updateAndGetTimestampDiff() {
-		const includeTimestamp = this.lastTimestampAt && this.options.timestamp;
+		const includeTimestamp = this.lastTimestampAt && this.options?.timestamp;
 		const now = Date.now();
 		const result = includeTimestamp ? picocolors.yellow(` +${now - this.lastTimestampAt}ms`) : "";
 		this.lastTimestampAt = now;
 		return result;
 	}
-	formatMessage(message, logLevel = "log") {
-		const formatMessage = typeof message == "string" ? this._getColorByLogLevel(logLevel)(message) : message;
-		return formatMessage;
+	getContextPrefix(context) {
+		const ctx = context || this.context;
+		return ctx ? `[${picocolors.yellow(ctx)}]` : `[${picocolors.red("System")}]`;
 	}
-	log(message, context, ...argv) {
-		this.print("info", message, context, ...argv);
+	get workerPrefix() {
+		return cluster.isWorker ? picocolors.yellow(`*Worker - ${cluster.worker.id}*`) : "";
 	}
-	warn(message, context, ...argv) {
-		this.print("warn", message, context, ...argv);
+	/**
+	* Check if the last argument looks like a NestJS context string.
+	* NestJS passes context as the last string argument (e.g., 'AppService', 'UserController').
+	* Context strings are typically PascalCase class names.
+	*/
+	isContextString(value) {
+		if (typeof value !== "string") return false;
+		return /^[A-Z][a-zA-Z0-9]*$/.test(value);
 	}
-	debug(message, context, ...argv) {
-		this.print("debug", message, context, ...argv);
+	print(level, ...args) {
+		const print = Logger.loggerInstance[level];
+		const diff = this._updateAndGetTimestampDiff();
+		let context;
+		let messages = args;
+		if (args.length > 0 && this.isContextString(args.at(-1))) {
+			context = args.at(-1);
+			messages = args.slice(0, -1);
+		}
+		const prefix = this.workerPrefix ? `${this.workerPrefix} ${this.getContextPrefix(context)}` : this.getContextPrefix(context);
+		print(prefix, ...messages, diff);
 	}
-	verbose(message, context, ...argv) {
-		this.print("verbose", message, context, ...argv);
+	log(...args) {
+		this.print("info", ...args);
 	}
-	fatal(message, context, ...argv) {
-		this.print("fatal", message, context, ...argv);
+	info(...args) {
+		this.print("info", ...args);
 	}
-	error(message, context, ...argv) {
-		const trace = context;
-		const _context = argv[0];
-		if (!trace && _context) this.print("error", message, _context, ...argv.slice(1));
-		else this.print("error", message, context, ...argv);
+	warn(...args) {
+		this.print("warn", ...args);
 	}
-	print(level, message, context, ...argv) {
-		const print = Logger.loggerInstance[level];
-		const formatMessage = this.formatMessage(message, level);
-		const diff = this._updateAndGetTimestampDiff();
-		const workerPrefix = cluster.isWorker ? picocolors.yellow(`*Worker - ${cluster.worker.id}*`) : "";
-		if (context && argv.length === 0) print(`${workerPrefix} [${picocolors.yellow(context)}] `, formatMessage, diff);
-		else if (argv.length === 0) print(`${workerPrefix} ${this.defaultContextPrefix}`, formatMessage, diff);
-		else print(`${workerPrefix} ${this.defaultContextPrefix}`, message, context, ...argv, diff);
+	debug(...args) {
+		this.print("debug", ...args);
+	}
+	verbose(...args) {
+		this.print("verbose", ...args);
+	}
+	fatal(...args) {
+		this.print("fatal", ...args);
+	}
+	error(...args) {
+		this.print("error", ...args);
 	}
 };
 Logger.loggerInstance = createLoggerConsola();

package/logger.service.ts

@@ -1,12 +1,12 @@
 import cluster from 'node:cluster'
-
+import picocolors from 'picocolors'
 import type { WrappedConsola } from '@innei/pretty-logger-core'
-import { createLoggerConsola } from '@innei/pretty-logger-core'
 import type { ConsoleLoggerOptions } from '@nestjs/common'
+
+import { createLoggerConsola } from '@innei/pretty-logger-core'
 import { ConsoleLogger } from '@nestjs/common'
-import picocolors from 'picocolors'
 
-type LoggerType =
+type LogLevel =
   | 'info'
   | 'log'
   | 'error'
@@ -22,32 +22,13 @@ export class Logger extends ConsoleLogger {
     this.loggerInstance = logger
   }
 
-  constructor(context: string, options: ConsoleLoggerOptions) {
-    super(context, options)
-  }
-  private _getColorByLogLevel(logLevel: string) {
-    switch (logLevel) {
-      case 'debug': {
-        return picocolors.cyan
-      }
-      case 'warn': {
-        return picocolors.yellow
-      }
-      case 'error': {
-        return picocolors.red
-      }
-      case 'verbose': {
-        return picocolors.gray
-      }
-      default: {
-        return picocolors.green
-      }
-    }
+  constructor(context?: string, options?: ConsoleLoggerOptions) {
+    super(context || '', options || {})
   }
 
   private lastTimestampAt: number = Date.now()
   private _updateAndGetTimestampDiff() {
-    const includeTimestamp = this.lastTimestampAt && this.options.timestamp
+    const includeTimestamp = this.lastTimestampAt && this.options?.timestamp
     const now = Date.now()
     const result = includeTimestamp
       ? picocolors.yellow(` +${now - this.lastTimestampAt}ms`)
@@ -55,77 +36,75 @@ export class Logger extends ConsoleLogger {
     this.lastTimestampAt = now
     return result
   }
-  protected formatMessage(message: any, logLevel = 'log') {
-    const formatMessage =
-      typeof message == 'string'
-        ? this._getColorByLogLevel(logLevel)(message)
-        : message
-    return formatMessage
+
+  private getContextPrefix(context?: string) {
+    const ctx = context || this.context
+    return ctx ? `[${picocolors.yellow(ctx)}]` : `[${picocolors.red('System')}]`
   }
 
-  log(message: any, context?: string, ...argv: any[]) {
-    this.print('info', message, context, ...argv)
+  private get workerPrefix() {
+    return cluster.isWorker
+      ? picocolors.yellow(`*Worker - ${cluster.worker!.id}*`)
+      : ''
   }
 
-  warn(message: any, context?: string, ...argv: any[]) {
-    this.print('warn', message, context, ...argv)
+  /**
+   * Check if the last argument looks like a NestJS context string.
+   * NestJS passes context as the last string argument (e.g., 'AppService', 'UserController').
+   * Context strings are typically PascalCase class names.
+   */
+  private isContextString(value: unknown): value is string {
+    if (typeof value !== 'string') return false
+    // Context is usually a short PascalCase identifier (class name)
+    // Not a sentence, not a path, not containing spaces or special chars
+    return /^[A-Z][a-zA-Z0-9]*$/.test(value)
   }
-  debug(message: any, context?: string, ...argv: any[]) {
-    this.print('debug', message, context, ...argv)
+
+  private print(level: LogLevel, ...args: any[]) {
+    const print = Logger.loggerInstance[level]
+    const diff = this._updateAndGetTimestampDiff()
+
+    let context: string | undefined
+    let messages = args
+
+    // Check if the last argument is a context string (NestJS convention)
+    if (args.length > 0 && this.isContextString(args.at(-1))) {
+      context = args.at(-1)
+      messages = args.slice(0, -1)
+    }
+
+    const prefix = this.workerPrefix
+      ? `${this.workerPrefix} ${this.getContextPrefix(context)}`
+      : this.getContextPrefix(context)
+
+    print(prefix, ...messages, diff)
   }
 
-  verbose(message: any, context?: string, ...argv: any[]) {
-    this.print('verbose', message, context, ...argv)
+  log(...args: any[]) {
+    this.print('info', ...args)
   }
 
-  fatal(message: any, context?: string, ...argv: any[]) {
-    this.print('fatal', message, context, ...argv)
+  info(...args: any[]) {
+    this.print('info', ...args)
   }
 
-  error(message: any, context?: string, ...argv: any[]) {
-    const trace = context
-    const _context = argv[0]
+  warn(...args: any[]) {
+    this.print('warn', ...args)
+  }
 
-    if (!trace && _context) {
-      this.print('error', message, _context, ...argv.slice(1))
-    } else {
-      this.print('error', message, context, ...argv)
-    }
+  debug(...args: any[]) {
+    this.print('debug', ...args)
   }
 
-  private print(
-    level: LoggerType,
-    message: any,
-    context?: string,
-    ...argv: any[]
-  ) {
-    const print = Logger.loggerInstance[level]
-    const formatMessage = this.formatMessage(message, level)
-    const diff = this._updateAndGetTimestampDiff()
+  verbose(...args: any[]) {
+    this.print('verbose', ...args)
+  }
 
-    const workerPrefix = cluster.isWorker
-      ? picocolors.yellow(`*Worker - ${cluster!.worker!.id}*`)
-      : ''
-    if (context && argv.length === 0) {
-      print(
-        `${workerPrefix} [${picocolors.yellow(context)}] `,
-        formatMessage,
-        diff,
-      )
-    } else if (argv.length === 0) {
-      print(`${workerPrefix} ${this.defaultContextPrefix}`, formatMessage, diff)
-    } else {
-      print(
-        `${workerPrefix} ${this.defaultContextPrefix}`,
-        message,
-        context,
-        ...argv,
-        diff,
-      )
-    }
+  fatal(...args: any[]) {
+    this.print('fatal', ...args)
   }
 
-  private defaultContextPrefix = this.context
-    ? `[${picocolors.yellow(this.context)}] `
-    : `[${picocolors.red('System')}] `
+  error(...args: any[]) {
+    this.print('error', ...args)
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innei/pretty-logger-nestjs",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "exports": {
     ".": {
       "require": "./dist/index.js",
@@ -10,20 +10,20 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsdown"
+  },
   "peerDependencies": {
     "@nestjs/common": ">=10"
   },
   "dependencies": {
+    "@innei/pretty-logger-core": "workspace:*",
     "cron": "4.3.0",
     "defu": "^6.1.3",
     "picocolors": "^1.0.0",
-    "std-env": "^3.5.0",
-    "@innei/pretty-logger-core": "0.3.4"
+    "std-env": "^3.5.0"
   },
   "devDependencies": {
     "@oxc-project/runtime": "^0.70.0"
-  },
-  "scripts": {
-    "build": "tsdown"
   }
-}
+}