@idlebox/logger 0.0.4 → 0.0.6

package/src/common/debug.commands.ts

@@ -1,11 +1,13 @@
 import { relative } from 'node:path';
 import { formatWithOptions, inspect } from 'node:util';
+import { Cdim, Cdimita, CFgreen, CFred, Cita, Crst, NCF, NCita } from './ansi.js';
+import type { IDebugCommand } from './types.js';
 
 const STRING_MAX_LENGTH = 128;
 
 function color_error(message: string, color: boolean) {
 	if (color) {
-		return `\x1B[38;5;9m<inspect**${message}**>\x1B[39m`;
+		return `${CFred}<inspect**${message}**>${NCF}`;
 	} else {
 		return `<inspect**${message}**>`;
 	}
@@ -33,7 +35,7 @@ function isSyncIterable(obj: unknown): obj is Iterable<unknown> {
 	return typeof obj === 'object' && obj !== null && Symbol.iterator in obj;
 }
 
-const debug_commands = {
+export const debug_commands: Record<string, IDebugCommand> = {
 	inspect(object: unknown, color: boolean) {
 		return inspect(object, options(color));
 	},
@@ -41,24 +43,30 @@ const debug_commands = {
 		if (typeof s !== 'string') {
 			return color_error(`can not stripe ${typeof s}`, color);
 		}
-		if (s.length > 100) {
+		let str = s;
+		str = str.replace(/\n/g, '\\n');
+		str = str.replace(/\r/g, '\\r');
+		str = str.replace(/\t/g, '\\t');
+		str = str.replace(/\x1B/g, '\\e');
+		if (str.length > STRING_MAX_LENGTH) {
+			const chars = `(${str.length.toFixed(0)} chars)`;
 			if (color) {
-				return `\x1B[38;5;10m"${s.slice(0, STRING_MAX_LENGTH - 3)}..."\x1B[39m`;
+				return `"${CFgreen}${str.slice(0, STRING_MAX_LENGTH - chars.length - 3)}...${NCF} ${chars}"`;
 			} else {
-				return `"${s.slice(0, STRING_MAX_LENGTH - 3)}..."`;
+				return `"${CFgreen}${str}${NCF}"`;
 			}
 		} else {
-			return s;
+			return str;
 		}
 	},
 	list(items: unknown, color: boolean) {
 		if (!isSyncIterable(items)) {
 			return color_error(`list<> need iterable value, not ${typeof items}(${items?.constructor?.name})`, color);
 		}
-		const postfix = color ? '\x1B[0m' : '';
+		const postfix = color ? Crst : '';
 		let index = 0;
 		const lines: string[] = [];
-		const prefix = color ? '\x1B[2m' : '';
+		const prefix = color ? Cdim : '';
 		for (const item of items) {
 			if (Array.isArray(item)) {
 				if (item.length === 2) {
@@ -78,19 +86,19 @@ const debug_commands = {
 		}
 
 		if (lines.length === 0) {
-			const prefix = color ? '\x1B[3;2m' : '';
-			return ':\n' + prefix + '  - <list is empty>' + postfix;
+			const prefix = color ? Cdimita : '';
+			return `:\n${prefix}  - <list is empty>${postfix}`;
 		}
-		return ':\n' + lines.join('\n');
+		return `:\n${lines.join('\n')}`;
 	},
 	commandline(cmds: unknown, color: boolean) {
 		if (Array.isArray(cmds)) {
-			const prefix = color ? '\x1B[2m' : '';
-			const postfix = color ? '\x1B[0m' : '';
+			const prefix = color ? Cdim : '';
+			const postfix = color ? Crst : '';
 			return prefix + cmds.map((s) => JSON.stringify(s)).join(' ') + postfix;
 		} else if (typeof cmds === 'string') {
-			const prefix = color ? '\x1B[2;3m' : '';
-			const postfix = color ? '\x1B[0m' : '';
+			const prefix = color ? Cdimita : '';
+			const postfix = color ? Crst : '';
 			return prefix + cmds + postfix;
 		} else {
 			return color_error(`commandline<> need string or array, not ${typeof cmds}`, color);
@@ -105,9 +113,9 @@ const debug_commands = {
 			}
 		}
 		if (color) {
-			return `\x1B[3m${s}\x1B[23m`;
+			return `${Cita}${s}${NCita}`;
 		} else {
-			return s;
+			return s as string;
 		}
 	},
 	relative(s: unknown, color: boolean) {
@@ -119,11 +127,7 @@ const debug_commands = {
 };
 type DebugCommands = Record<string, (arg: unknown, color: boolean) => string>;
 
-export function call_debug_command(
-	command: keyof typeof debug_commands | string,
-	arg: unknown,
-	color: boolean,
-): string {
+export function call_debug_command(command: keyof typeof debug_commands | string, arg: unknown, color: boolean): string {
 	const fn = (debug_commands as DebugCommands)[command];
 	if (!fn) {
 		return color_error(`unknown command ${command}`, color);

package/src/common/helpers.ts

@@ -1,7 +1,9 @@
+import { prettyFormatError } from '@idlebox/common';
 import debug from 'debug';
 import process from 'node:process';
+import { debug_commands } from './debug.commands.js';
 import { terminal } from './logger.global.js';
-import { EnableLogLevel } from './types.js';
+import { EnableLogLevel, type IDebugCommand } from './types.js';
 
 /**
  * 判断 字符串是否为“真值”
@@ -69,7 +71,7 @@ export function detectColorEnable(stream: IWritableStream = process.stderr): boo
 }
 
 export function escapeRegExp(str: string) {
-	return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
+	return str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
 }
 
 /**
@@ -81,9 +83,9 @@ export function compile_match_regex(tag: string, invert = false): RegExp {
 	const parts = tag.split(':');
 	parts.pop();
 
-	let regs = ['\\*'];
+	const regs = ['\\*'];
 
-	let comb = [];
+	const comb = [];
 	for (const part of parts) {
 		comb.push(part);
 		regs.push(`${escapeRegExp(comb.join(':'))}:\\*`);
@@ -183,3 +185,32 @@ export let defaultLogLevel = (() => {
 export function set_default_log_level(level: EnableLogLevel) {
 	defaultLogLevel = level;
 }
+
+type ErrorAction = 'stack' | 'message' | 'stack-pretty' | 'inspect' | IDebugCommand;
+const actions = {
+	stack(e: Error, _color: boolean) {
+		return e.stack || e.message || e?.toString() || '*unknown error*';
+	},
+	message(e: Error, _color: boolean) {
+		return e.message || e?.toString() || '*unknown error*';
+	},
+	['stack-pretty']: (e: Error, _color: boolean) => {
+		return prettyFormatError(e);
+	},
+};
+export let current_error_action = actions.stack;
+export function set_error_action(action: ErrorAction) {
+	switch (action) {
+		case 'stack':
+		case 'message':
+		case 'stack-pretty':
+			current_error_action = actions[action];
+			break;
+		case 'inspect':
+			current_error_action = debug_commands.inspect;
+			break;
+		default:
+			current_error_action = action;
+			break;
+	}
+}

package/src/common/logger.create.ts

@@ -11,11 +11,7 @@ import { EnableLogLevel, type IMyLogger } from './types.js';
  * @param pipeTo 默认是 process.stderr
  * @returns
  */
-export function createLogger(
-	tag: string,
-	color_enabled: boolean | undefined = undefined,
-	pipeTo: undefined | NodeJS.WritableStream = process.stderr,
-): IMyLogger {
+export function createLogger(tag: string, color_enabled: boolean | undefined = undefined, pipeTo: undefined | NodeJS.WritableStream = process.stderr): IMyLogger {
 	const stream = new PassThrough();
 	if (pipeTo) {
 		Object.assign(stream, { isTTY: (pipeTo as any).isTTY });

package/src/common/types.ts

@@ -37,3 +37,5 @@ export type IMyLogger = {
 	readonly tag: string;
 	readonly colorEnabled: boolean;
 };
+
+export type IDebugCommand = (object: unknown, color: boolean) => string;

package/src/index.ts

@@ -8,6 +8,7 @@ export {
 	match_disabled,
 	match_enabled,
 	set_default_log_level,
+	set_error_action,
 } from './common/helpers.js';
 export { createLogger } from './common/logger.create.js';
 export {
@@ -19,5 +20,8 @@ export {
 	type IMyDebug,
 	type IMyDebugWithControl,
 	type IMyLogger,
+	type IDebugCommand,
 } from './common/types.js';
 export { createLogFile } from './printers/file.js';
+
+export { CSI } from './common/ansi.js';