@idlebox/logger 0.0.17 → 0.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/common/create.function.d.ts.map +1 -1
- package/lib/common/create.function.js +10 -6
- package/lib/common/create.function.js.map +1 -1
- package/lib/common/create.logger.d.ts.map +1 -1
- package/lib/common/create.logger.js +12 -6
- package/lib/common/create.logger.js.map +1 -1
- package/lib/common/debug.commands.d.ts.map +1 -1
- package/lib/common/debug.commands.js +7 -1
- package/lib/common/debug.commands.js.map +1 -1
- package/package.json +2 -2
- package/src/common/create.function.ts +11 -6
- package/src/common/create.logger.ts +14 -6
- package/src/common/debug.commands.ts +6 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.function.d.ts","sourceRoot":"","sources":["../../src/common/create.function.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create.function.d.ts","sourceRoot":"","sources":["../../src/common/create.function.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAmC,MAAM,aAAa,CAAC;AAGxE,OAAO,KAAK,EAAY,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEhE,UAAU,aAAa;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,QAAQ,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AACD,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,iBAAyB,EAAE,MAAuB,EAAE,OAAc,EAAE,EAAE,aAAa,GAAG,mBAAmB,CAwCjK"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { defineInspectMethod } from '@idlebox/common';
|
|
1
2
|
import { Cdim, Crst, CSI, NCdim } from './ansi.js';
|
|
2
3
|
import { LogLevel, logLevelPaddingStr, logTagColor } from './colors.js';
|
|
3
4
|
import { call_debug_command, debug_commands, nodeFormat } from './debug.commands.js';
|
|
4
|
-
import { current_error_action } from './helpers.js';
|
|
5
|
+
import { current_error_action, escapeRegExp } from './helpers.js';
|
|
5
6
|
export function createDebug({ tag, level, color_enabled, color_entire_line = false, stream = process.stdout, enabled = true }) {
|
|
6
7
|
const color = logTagColor[level];
|
|
7
8
|
const lineOpt = {
|
|
@@ -36,9 +37,11 @@ export function createDebug({ tag, level, color_enabled, color_entire_line = fal
|
|
|
36
37
|
},
|
|
37
38
|
isEnabled: enabled,
|
|
38
39
|
});
|
|
39
|
-
return r
|
|
40
|
+
return defineInspectMethod(r, (_depth, context) => {
|
|
41
|
+
return `[${context.stylize('Debug', 'special')} "${context.stylize(tag, 'string')}" ${context.stylize(LogLevel[level], 'undefined')} ${context.stylize(r.isEnabled ? 'enabled' : 'disabled', 'boolean')}]`;
|
|
42
|
+
});
|
|
40
43
|
}
|
|
41
|
-
const
|
|
44
|
+
const commandsReg = new RegExp(`(${Object.keys(debug_commands).map(escapeRegExp).join('|')})<$`);
|
|
42
45
|
function format_template(messages, args, color) {
|
|
43
46
|
const result_messages = messages.slice();
|
|
44
47
|
const result_args = [];
|
|
@@ -46,9 +49,10 @@ function format_template(messages, args, color) {
|
|
|
46
49
|
const prefix = result_messages[index] || '';
|
|
47
50
|
const postfix = result_messages[index + 1] || '';
|
|
48
51
|
if (prefix.at(-1) === '<' && postfix[0] === '>') {
|
|
49
|
-
|
|
52
|
+
// 处理类似 relative<xxx> 的命令
|
|
53
|
+
const lastWord = commandsReg.exec(prefix);
|
|
50
54
|
if (lastWord) {
|
|
51
|
-
const command = prefix.slice(lastWord.index, -1);
|
|
55
|
+
const command = prefix.slice(lastWord.index, -1); // remove '<'
|
|
52
56
|
const result = call_debug_command(command, arg, color);
|
|
53
57
|
result_messages[index] = prefix.slice(0, lastWord.index);
|
|
54
58
|
result_messages[index + 1] = postfix.slice(1);
|
|
@@ -81,7 +85,7 @@ function format_template(messages, args, color) {
|
|
|
81
85
|
while (result_messages.length || result_args.length) {
|
|
82
86
|
const message = result_messages.shift();
|
|
83
87
|
if (message)
|
|
84
|
-
ret += message;
|
|
88
|
+
ret += message.replace('，', ', ');
|
|
85
89
|
const arg = result_args.shift();
|
|
86
90
|
if (arg)
|
|
87
91
|
ret += arg;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.function.js","sourceRoot":"","sources":["../../src/common/create.function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"create.function.js","sourceRoot":"","sources":["../../src/common/create.function.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.logger.d.ts","sourceRoot":"","sources":["../../src/common/create.logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create.logger.d.ts","sourceRoot":"","sources":["../../src/common/create.logger.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAA4B,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAGtF,eAAO,MAAM,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAgB,CAAC;AAElE,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,eAAe,EAAE,YAAY,iBAAsB,GAAG,SAAS,CAuDrJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SoftwareDefectError } from '@idlebox/common';
|
|
1
|
+
import { defineInspectMethod, SoftwareDefectError } from '@idlebox/common';
|
|
2
2
|
import { LogLevel } from './colors.js';
|
|
3
3
|
import { createDebug } from './create.function.js';
|
|
4
4
|
import { defaultLogLevel, detectColorEnable } from './helpers.js';
|
|
@@ -19,13 +19,14 @@ export function create(tag, color_enabled, stream, defaultLevel = EnableLogLevel
|
|
|
19
19
|
const debug = createDebug({ tag, color_enabled, level: LogLevel.debug, stream, color_entire_line: true });
|
|
20
20
|
const verbose = createDebug({ tag, color_enabled, level: LogLevel.verbose, stream, color_entire_line: true });
|
|
21
21
|
syncEnabled({ error, warn, info, log, success, debug, verbose }, tag, currentLevel);
|
|
22
|
-
|
|
22
|
+
function fatal(messages, ...args) {
|
|
23
|
+
log_fatal(messages, ...args);
|
|
24
|
+
throw new SoftwareDefectError(`logger.fatal has been called`, { boundary: fatal });
|
|
25
|
+
}
|
|
26
|
+
const result = {
|
|
23
27
|
tag,
|
|
24
28
|
stream,
|
|
25
|
-
fatal
|
|
26
|
-
log_fatal(messages, ...args);
|
|
27
|
-
throw new SoftwareDefectError(`logger.fatal has been called`, { boundary: fatal });
|
|
28
|
-
},
|
|
29
|
+
fatal,
|
|
29
30
|
error,
|
|
30
31
|
warn,
|
|
31
32
|
info,
|
|
@@ -47,6 +48,11 @@ export function create(tag, color_enabled, stream, defaultLevel = EnableLogLevel
|
|
|
47
48
|
}
|
|
48
49
|
},
|
|
49
50
|
};
|
|
51
|
+
return defineInspectMethod(result, (_depth, context) => {
|
|
52
|
+
if (_depth < 0)
|
|
53
|
+
return `${context.stylize(`[Logger ${tag}]`, 'special')}`;
|
|
54
|
+
return `${context.stylize('Logger', 'name')} { "${context.stylize(tag, 'string')}" ${context.stylize(EnableLogLevel[currentLevel], 'undefined')} }`;
|
|
55
|
+
});
|
|
50
56
|
}
|
|
51
57
|
function syncEnabled(opt, tag, currentLevel) {
|
|
52
58
|
if (currentLevel === EnableLogLevel.auto) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.logger.js","sourceRoot":"","sources":["../../src/common/create.logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"create.logger.js","sourceRoot":"","sources":["../../src/common/create.logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.commands.d.ts","sourceRoot":"","sources":["../../src/common/debug.commands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAsBhD,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAE9F;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEnE;AAMD,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"debug.commands.d.ts","sourceRoot":"","sources":["../../src/common/debug.commands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAsBhD,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAE9F;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAEnE;AAMD,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAwGxD,CAAC;AAcF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,OAAO,cAAc,GAAG,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAMtH"}
|
|
@@ -123,7 +123,13 @@ export const debug_commands = {
|
|
|
123
123
|
if (typeof s !== 'string') {
|
|
124
124
|
return color_error(`relative<> need string, not ${typeof s}(${s?.constructor?.name})`, color);
|
|
125
125
|
}
|
|
126
|
-
|
|
126
|
+
const r = relative(process.cwd(), s);
|
|
127
|
+
if (r.startsWith('.')) {
|
|
128
|
+
return r;
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
return `./${r}`;
|
|
132
|
+
}
|
|
127
133
|
},
|
|
128
134
|
printable(data, color) {
|
|
129
135
|
if (typeof data !== 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.commands.js","sourceRoot":"","sources":["../../src/common/debug.commands.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"debug.commands.js","sourceRoot":"","sources":["../../src/common/debug.commands.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@idlebox/logger",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.18",
|
|
5
5
|
"description": "A simple logger module for my self use (nodejs).",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"sideEffects": false,
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"debug": "^4.4.3",
|
|
16
|
-
"@idlebox/common": "^1.5.
|
|
16
|
+
"@idlebox/common": "^1.5.15"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@types/debug": "^4.1.12",
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { defineInspectMethod } from '@idlebox/common';
|
|
2
|
+
import type { InspectContext } from 'node:util';
|
|
1
3
|
import { Cdim, Crst, CSI, NCdim } from './ansi.js';
|
|
2
4
|
import { LogLevel, logLevelPaddingStr, logTagColor } from './colors.js';
|
|
3
5
|
import { call_debug_command, debug_commands, nodeFormat } from './debug.commands.js';
|
|
4
|
-
import { current_error_action } from './helpers.js';
|
|
6
|
+
import { current_error_action, escapeRegExp } from './helpers.js';
|
|
5
7
|
import type { IMyDebug, IMyDebugWithControl } from './types.js';
|
|
6
8
|
|
|
7
9
|
interface IDebugOptions {
|
|
@@ -49,7 +51,9 @@ export function createDebug({ tag, level, color_enabled, color_entire_line = fal
|
|
|
49
51
|
},
|
|
50
52
|
);
|
|
51
53
|
|
|
52
|
-
return r
|
|
54
|
+
return defineInspectMethod(r, (_depth: number, context: InspectContext) => {
|
|
55
|
+
return `[${context.stylize('Debug', 'special')} "${context.stylize(tag, 'string')}" ${context.stylize(LogLevel[level], 'undefined')} ${context.stylize(r.isEnabled ? 'enabled' : 'disabled', 'boolean')}]`;
|
|
56
|
+
});
|
|
53
57
|
}
|
|
54
58
|
|
|
55
59
|
interface IWriteLineOptions {
|
|
@@ -59,7 +63,7 @@ interface IWriteLineOptions {
|
|
|
59
63
|
level: LogLevel;
|
|
60
64
|
}
|
|
61
65
|
|
|
62
|
-
const
|
|
66
|
+
const commandsReg = new RegExp(`(${Object.keys(debug_commands).map(escapeRegExp).join('|')})<$`);
|
|
63
67
|
|
|
64
68
|
function format_template(messages: TemplateStringsArray, args: unknown[], color: boolean) {
|
|
65
69
|
const result_messages: string[] = messages.slice();
|
|
@@ -69,9 +73,10 @@ function format_template(messages: TemplateStringsArray, args: unknown[], color:
|
|
|
69
73
|
const postfix = result_messages[index + 1] || '';
|
|
70
74
|
|
|
71
75
|
if (prefix.at(-1) === '<' && postfix[0] === '>') {
|
|
72
|
-
|
|
76
|
+
// 处理类似 relative<xxx> 的命令
|
|
77
|
+
const lastWord = commandsReg.exec(prefix);
|
|
73
78
|
if (lastWord) {
|
|
74
|
-
const command = prefix.slice(lastWord.index, -1);
|
|
79
|
+
const command = prefix.slice(lastWord.index, -1); // remove '<'
|
|
75
80
|
const result = call_debug_command(command, arg, color);
|
|
76
81
|
|
|
77
82
|
result_messages[index] = prefix.slice(0, lastWord.index);
|
|
@@ -102,7 +107,7 @@ function format_template(messages: TemplateStringsArray, args: unknown[], color:
|
|
|
102
107
|
let ret = '';
|
|
103
108
|
while (result_messages.length || result_args.length) {
|
|
104
109
|
const message = result_messages.shift();
|
|
105
|
-
if (message) ret += message;
|
|
110
|
+
if (message) ret += message.replace('，', ', ');
|
|
106
111
|
const arg = result_args.shift();
|
|
107
112
|
if (arg) ret += arg;
|
|
108
113
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { SoftwareDefectError } from '@idlebox/common';
|
|
1
|
+
import { defineInspectMethod, SoftwareDefectError } from '@idlebox/common';
|
|
2
|
+
import type { InspectContext } from 'node:util';
|
|
2
3
|
import { LogLevel } from './colors.js';
|
|
3
4
|
import { createDebug } from './create.function.js';
|
|
4
5
|
import { defaultLogLevel, detectColorEnable } from './helpers.js';
|
|
@@ -25,13 +26,15 @@ export function create(tag: string, color_enabled: undefined | boolean, stream:
|
|
|
25
26
|
|
|
26
27
|
syncEnabled({ error, warn, info, log, success, debug, verbose }, tag, currentLevel);
|
|
27
28
|
|
|
28
|
-
|
|
29
|
+
function fatal(messages: string | TemplateStringsArray, ...args: any[]): never {
|
|
30
|
+
log_fatal(messages as any, ...args);
|
|
31
|
+
throw new SoftwareDefectError(`logger.fatal has been called`, { boundary: fatal });
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
const result = {
|
|
29
35
|
tag,
|
|
30
36
|
stream,
|
|
31
|
-
fatal
|
|
32
|
-
log_fatal(messages as any, ...args);
|
|
33
|
-
throw new SoftwareDefectError(`logger.fatal has been called`, { boundary: fatal });
|
|
34
|
-
},
|
|
37
|
+
fatal,
|
|
35
38
|
error,
|
|
36
39
|
warn,
|
|
37
40
|
info,
|
|
@@ -55,6 +58,11 @@ export function create(tag: string, color_enabled: undefined | boolean, stream:
|
|
|
55
58
|
}
|
|
56
59
|
},
|
|
57
60
|
};
|
|
61
|
+
|
|
62
|
+
return defineInspectMethod(result, (_depth: number, context: InspectContext) => {
|
|
63
|
+
if (_depth < 0) return `${context.stylize(`[Logger ${tag}]`, 'special')}`;
|
|
64
|
+
return `${context.stylize('Logger', 'name')} { "${context.stylize(tag, 'string')}" ${context.stylize(EnableLogLevel[currentLevel], 'undefined')} }`;
|
|
65
|
+
});
|
|
58
66
|
}
|
|
59
67
|
|
|
60
68
|
interface IPass {
|
|
@@ -122,7 +122,12 @@ export const debug_commands: Record<string, IDebugCommand> = {
|
|
|
122
122
|
if (typeof s !== 'string') {
|
|
123
123
|
return color_error(`relative<> need string, not ${typeof s}(${s?.constructor?.name})`, color);
|
|
124
124
|
}
|
|
125
|
-
|
|
125
|
+
const r = relative(process.cwd(), s);
|
|
126
|
+
if (r.startsWith('.')) {
|
|
127
|
+
return r;
|
|
128
|
+
} else {
|
|
129
|
+
return `./${r}`;
|
|
130
|
+
}
|
|
126
131
|
},
|
|
127
132
|
printable(data: unknown, color: boolean) {
|
|
128
133
|
if (typeof data !== 'string') {
|