@idlebox/logger 0.0.11 → 0.0.13
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/{debug-fn.d.ts → create.function.d.ts} +1 -1
- package/lib/common/create.function.d.ts.map +1 -0
- package/lib/common/{debug-fn.js → create.function.js} +2 -2
- package/lib/common/create.function.js.map +1 -0
- package/lib/common/{create.d.ts → create.logger.d.ts} +1 -1
- package/lib/common/create.logger.d.ts.map +1 -0
- package/lib/common/{create.js → create.logger.js} +2 -2
- package/lib/common/create.logger.js.map +1 -0
- package/lib/common/debug.commands.d.ts.map +1 -1
- package/lib/common/debug.commands.js +19 -0
- package/lib/common/debug.commands.js.map +1 -1
- package/lib/common/helpers.d.ts.map +1 -1
- package/lib/common/helpers.js +6 -4
- package/lib/common/helpers.js.map +1 -1
- package/lib/common/logger.create.js +1 -1
- package/lib/common/logger.create.js.map +1 -1
- package/lib/common/logger.global.js +1 -1
- package/lib/common/logger.global.js.map +1 -1
- package/lib/index.d.ts +2 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -2
- package/lib/index.js.map +1 -1
- package/package.json +3 -3
- package/src/common/{debug-fn.ts → create.function.ts} +1 -1
- package/src/common/{create.ts → create.logger.ts} +1 -1
- package/src/common/debug.commands.ts +21 -0
- package/src/common/helpers.ts +7 -5
- package/src/common/logger.create.ts +1 -1
- package/src/common/logger.global.ts +1 -1
- package/src/index.ts +2 -2
- package/lib/common/create.d.ts.map +0 -1
- package/lib/common/create.js.map +0 -1
- package/lib/common/debug-fn.d.ts.map +0 -1
- package/lib/common/debug-fn.js.map +0 -1
|
@@ -10,4 +10,4 @@ interface IDebugOptions {
|
|
|
10
10
|
}
|
|
11
11
|
export declare function createDebug({ tag, level, color_enabled, color_entire_line, stream, enabled }: IDebugOptions): IMyDebugWithControl;
|
|
12
12
|
export {};
|
|
13
|
-
//# sourceMappingURL=
|
|
13
|
+
//# sourceMappingURL=create.function.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create.function.d.ts","sourceRoot":"","sources":["../../src/common/create.function.ts"],"names":[],"mappings":"AACA,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,CAsCjK"}
|
|
@@ -45,7 +45,7 @@ function format_template(messages, args, color) {
|
|
|
45
45
|
for (const [index, arg] of args.entries()) {
|
|
46
46
|
const prefix = result_messages[index] || '';
|
|
47
47
|
const postfix = result_messages[index + 1] || '';
|
|
48
|
-
if (prefix
|
|
48
|
+
if (prefix.at(-1) === '<' && postfix[0] === '>') {
|
|
49
49
|
const lastWord = lastWordReg.exec(prefix);
|
|
50
50
|
if (lastWord) {
|
|
51
51
|
const command = prefix.slice(lastWord.index, -1);
|
|
@@ -146,4 +146,4 @@ function write(stream, head, body) {
|
|
|
146
146
|
stream.write(`${head} ${body}\n`);
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
|
-
//# sourceMappingURL=
|
|
149
|
+
//# sourceMappingURL=create.function.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create.function.js","sourceRoot":"","sources":["../../src/common/create.function.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { EnableLogLevel, type IMyLogger } from './types.js';
|
|
2
2
|
export declare const all_logger_names: ReadonlySet<string>;
|
|
3
3
|
export declare function create(tag: string, color_enabled: undefined | boolean, stream: NodeJS.ReadWriteStream, defaultLevel?: EnableLogLevel): IMyLogger;
|
|
4
|
-
//# sourceMappingURL=create.d.ts.map
|
|
4
|
+
//# sourceMappingURL=create.logger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create.logger.d.ts","sourceRoot":"","sources":["../../src/common/create.logger.ts"],"names":[],"mappings":"AAIA,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,CAgDrJ"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SoftwareDefectError } from '@idlebox/common';
|
|
2
2
|
import { LogLevel } from './colors.js';
|
|
3
|
-
import { createDebug } from './
|
|
3
|
+
import { createDebug } from './create.function.js';
|
|
4
4
|
import { defaultLogLevel, detectColorEnable } from './helpers.js';
|
|
5
5
|
import { EnableLogLevel } from './types.js';
|
|
6
6
|
const seen_loggers = new Set();
|
|
@@ -90,4 +90,4 @@ function syncEnabled(opt, tag, currentLevel) {
|
|
|
90
90
|
opt.verbose.disable();
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
|
-
//# sourceMappingURL=create.js.map
|
|
93
|
+
//# sourceMappingURL=create.logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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,CAmGxD,CAAC;AAcF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,OAAO,cAAc,GAAG,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAMtH"}
|
|
@@ -125,7 +125,26 @@ export const debug_commands = {
|
|
|
125
125
|
}
|
|
126
126
|
return relative(process.cwd(), s);
|
|
127
127
|
},
|
|
128
|
+
printable(data, color) {
|
|
129
|
+
if (typeof data !== 'string') {
|
|
130
|
+
if (data?.toString) {
|
|
131
|
+
data = data.toString();
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
return color_error(`printable<> need string or toString(), not ${typeof data}(${data?.constructor?.name})`, color);
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return data.replace(combinedSequence, '');
|
|
138
|
+
},
|
|
128
139
|
};
|
|
140
|
+
const controlCharacters = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g; // 除了 \t \n \r 之外的控制字符
|
|
141
|
+
const csiSequence = /\x1B\[[\x30–\x3F]*[\x20-\x2F]*[\x40-\x7E]/g; // ANSI CSI序列
|
|
142
|
+
const oscSequence = /\x1B\][^\x1B\x07]*(\x1B\\|\x07)/g; // ANSI OSC序列
|
|
143
|
+
const pmApcSequence = /\x1B[_^][^\x1B\x07]*\x1B\\/g; // ANSI PM/APC序列
|
|
144
|
+
const dcsSequence = /\x1B[\x20-\x7E\x08-\x0D]*\x1B\\/g; // ANSI DCS序列
|
|
145
|
+
const sosSequence = /\x1B[\s\S]+?\x1B\\/g; // ANSI SOS序列
|
|
146
|
+
const otherC1 = /\x1B[\x80-\x9F]/g; // 其他C1控制字符
|
|
147
|
+
const combinedSequence = new RegExp([csiSequence.source, oscSequence.source, pmApcSequence.source, dcsSequence.source, sosSequence.source, otherC1.source, controlCharacters.source].join('|'), 'g');
|
|
129
148
|
export function call_debug_command(command, arg, color) {
|
|
130
149
|
const fn = debug_commands[command];
|
|
131
150
|
if (!fn) {
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhE;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,WAYzD;AAED,UAAU,eAAgB,SAAQ,MAAM,CAAC,cAAc;IACtD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AA+BD,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,eAAgC,GAAG,OAAO,CAKnF;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,UAEvC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,MAAM,CAavE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAA0B,GAAG,MAAM,CAKhF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAA0B,GAAG,MAAM,CAKjF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,WAGxC;AAED;;;;;GAKG;AACH,eAAO,IAAI,eAAe,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhE;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,WAYzD;AAED,UAAU,eAAgB,SAAQ,MAAM,CAAC,cAAc;IACtD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AA+BD,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,eAAgC,GAAG,OAAO,CAKnF;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,UAEvC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,MAAM,CAavE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAA0B,GAAG,MAAM,CAKhF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAA0B,GAAG,MAAM,CAKjF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,WAGxC;AAED;;;;;GAKG;AACH,eAAO,IAAI,eAAe,gBA6CtB,CAAC;AAEL;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,QAE1D;AAED,KAAK,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,GAAG,aAAa,CAAC;AAYpF,eAAO,IAAI,oBAAoB,MAVrB,KAAK,UAAU,OAAO,WAUe,CAAC;AAChD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,QAcnD"}
|
package/lib/common/helpers.js
CHANGED
|
@@ -79,7 +79,7 @@ export function compile_match_regex(tag, invert = false) {
|
|
|
79
79
|
regs.push(`${escapeRegExp(comb.join(':'))}:\\*`);
|
|
80
80
|
}
|
|
81
81
|
regs.push(escapeRegExp(tag));
|
|
82
|
-
return new RegExp(`(
|
|
82
|
+
return new RegExp(`(?:^| )(${invert ? '-' : ''})(${regs.join('|')})(?:$| )`, 'i');
|
|
83
83
|
}
|
|
84
84
|
/**
|
|
85
85
|
* 从字符串中匹配指定的tag是否启用,不完全模拟 debug 模块的功能,不处理反义匹配(需用match_disabled)
|
|
@@ -138,8 +138,8 @@ export let defaultLogLevel = (() => {
|
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
140
|
// DEBUG=xxx,verbose,xxx
|
|
141
|
-
// biome-ignore lint/performance/useTopLevelRegex:
|
|
142
|
-
const has_debug_verbose = /(
|
|
141
|
+
// biome-ignore lint/performance/useTopLevelRegex: a
|
|
142
|
+
const has_debug_verbose = /(?<=^| )(verbose|debug)(?=$| )/;
|
|
143
143
|
const setted = has_debug_verbose.exec(process.env.DEBUG || '');
|
|
144
144
|
if (setted) {
|
|
145
145
|
if (setted[0] === 'verbose') {
|
|
@@ -162,8 +162,10 @@ export let defaultLogLevel = (() => {
|
|
|
162
162
|
return EnableLogLevel.info;
|
|
163
163
|
case 'warn':
|
|
164
164
|
return EnableLogLevel.warn;
|
|
165
|
+
case 'error':
|
|
166
|
+
return EnableLogLevel.error;
|
|
165
167
|
default:
|
|
166
|
-
console.error('Invalid DEBUG_LEVEL: %s, using verbose.', process.env.DEBUG_LEVEL);
|
|
168
|
+
console.error('Invalid DEBUG_LEVEL: %s (allow: "", verbose, debug, info, warn, error), using verbose.', process.env.DEBUG_LEVEL);
|
|
167
169
|
return EnableLogLevel.verbose;
|
|
168
170
|
}
|
|
169
171
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/common/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import process from 'node:process';
|
|
2
2
|
import { PassThrough } from 'node:stream';
|
|
3
|
-
import { create } from './create.js';
|
|
3
|
+
import { create } from './create.logger.js';
|
|
4
4
|
import { debug_enabled, defaultLogLevel } from './helpers.js';
|
|
5
5
|
import { terminal } from './logger.global.js';
|
|
6
6
|
import { EnableLogLevel } from './types.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.create.js","sourceRoot":"","sources":["../../src/common/logger.create.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.create.js","sourceRoot":"","sources":["../../src/common/logger.create.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAkB,MAAM,YAAY,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,GAAW,EAAE,gBAAqC,SAAS,EAAE,SAA4C,OAAO,CAAC,MAAM;IACnJ,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;IACjC,IAAI,MAAM,EAAE,CAAC;QACZ,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAG,MAAc,CAAC,KAAK,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IACjC,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,KAAK,GAAG,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAEzD,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,OAAO,CAAA,WAAW,GAAG,sBAAsB,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;IAExF,OAAO,MAAM,CAAC;AACf,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import process from 'node:process';
|
|
2
2
|
import { PassThrough } from 'node:stream';
|
|
3
|
-
import { create } from './create.js';
|
|
3
|
+
import { create } from './create.logger.js';
|
|
4
4
|
import { EnableLogLevel } from './types.js';
|
|
5
5
|
const stream = new PassThrough();
|
|
6
6
|
stream.pipe(process.stderr);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.global.js","sourceRoot":"","sources":["../../src/common/logger.global.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.global.js","sourceRoot":"","sources":["../../src/common/logger.global.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAkB,MAAM,YAAY,CAAC;AAE5D,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;AACjC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;AAEvD;;GAEG;AACH,MAAM,CAAC,IAAI,QAAmB,CAAC;AAE/B;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,eAA+B,cAAc,CAAC,IAAI;IACjG,IAAI,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAE/D,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAE1C,QAAQ,CAAC,MAAM,CAAC,YAAY,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC;IAEpD,IAAI,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAChC,QAAQ,CAAC,OAAO,CAAA,oBAAoB,CAAC;IACtC,CAAC;SAAM,CAAC;QACP,QAAQ,CAAC,KAAK,CAAA,kBAAkB,CAAC;IAClC,CAAC;IACD,OAAO;AACR,CAAC"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { LogLevel, logTagColor } from './common/colors.js';
|
|
2
|
-
export { all_logger_names } from './common/create.js';
|
|
3
|
-
export { createDebug } from './common/
|
|
2
|
+
export { all_logger_names } from './common/create.logger.js';
|
|
3
|
+
export { createDebug } from './common/create.function.js';
|
|
4
4
|
export { detectColorEnable as color_enabled, debug_enabled, is_string_truthy, match_disabled, match_enabled, set_default_log_level, set_error_action, } from './common/helpers.js';
|
|
5
5
|
export { createLogger } from './common/logger.create.js';
|
|
6
6
|
export { createGlobalLogger as createRootLogger, terminal as logger, } from './common/logger.global.js';
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EACN,iBAAiB,IAAI,aAAa,EAClC,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,qBAAqB,EACrB,gBAAgB,GAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACN,kBAAkB,IAAI,gBAAgB,EACtC,QAAQ,IAAI,MAAM,GAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACN,cAAc,EACd,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACxB,KAAK,SAAS,EACd,KAAK,aAAa,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { LogLevel, logTagColor } from './common/colors.js';
|
|
2
|
-
export { all_logger_names } from './common/create.js';
|
|
3
|
-
export { createDebug } from './common/
|
|
2
|
+
export { all_logger_names } from './common/create.logger.js';
|
|
3
|
+
export { createDebug } from './common/create.function.js';
|
|
4
4
|
export { detectColorEnable as color_enabled, debug_enabled, is_string_truthy, match_disabled, match_enabled, set_default_log_level, set_error_action, } from './common/helpers.js';
|
|
5
5
|
export { createLogger } from './common/logger.create.js';
|
|
6
6
|
export { createGlobalLogger as createRootLogger, terminal as logger, } from './common/logger.global.js';
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EACN,iBAAiB,IAAI,aAAa,EAClC,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,qBAAqB,EACrB,gBAAgB,GAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACN,kBAAkB,IAAI,gBAAgB,EACtC,QAAQ,IAAI,MAAM,GAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACN,cAAc,GAKd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC"}
|
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.13",
|
|
5
5
|
"description": "A simple logger module for my self use (nodejs).",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": {
|
|
@@ -13,13 +13,13 @@
|
|
|
13
13
|
"sideEffects": false,
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"debug": "^4.4.1",
|
|
16
|
-
"@idlebox/common": "^1.5.
|
|
16
|
+
"@idlebox/common": "^1.5.10"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@types/debug": "^4.1.12",
|
|
20
20
|
"@types/node": "^24.0.14",
|
|
21
21
|
"@build-script/single-dog-asset": "latest",
|
|
22
|
-
"@mpis/run": "^0.0.
|
|
22
|
+
"@mpis/run": "^0.0.16"
|
|
23
23
|
},
|
|
24
24
|
"license": "MIT",
|
|
25
25
|
"author": "GongT <admin@gongt.me>",
|
|
@@ -68,7 +68,7 @@ function format_template(messages: TemplateStringsArray, args: unknown[], color:
|
|
|
68
68
|
const prefix = result_messages[index] || '';
|
|
69
69
|
const postfix = result_messages[index + 1] || '';
|
|
70
70
|
|
|
71
|
-
if (prefix
|
|
71
|
+
if (prefix.at(-1) === '<' && postfix[0] === '>') {
|
|
72
72
|
const lastWord = lastWordReg.exec(prefix);
|
|
73
73
|
if (lastWord) {
|
|
74
74
|
const command = prefix.slice(lastWord.index, -1);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SoftwareDefectError } from '@idlebox/common';
|
|
2
2
|
import { LogLevel } from './colors.js';
|
|
3
|
-
import { createDebug } from './
|
|
3
|
+
import { createDebug } from './create.function.js';
|
|
4
4
|
import { defaultLogLevel, detectColorEnable } from './helpers.js';
|
|
5
5
|
import { EnableLogLevel, type IMyDebugWithControl, type IMyLogger } from './types.js';
|
|
6
6
|
|
|
@@ -124,8 +124,29 @@ export const debug_commands: Record<string, IDebugCommand> = {
|
|
|
124
124
|
}
|
|
125
125
|
return relative(process.cwd(), s);
|
|
126
126
|
},
|
|
127
|
+
printable(data: unknown, color: boolean) {
|
|
128
|
+
if (typeof data !== 'string') {
|
|
129
|
+
if (data?.toString) {
|
|
130
|
+
data = data.toString();
|
|
131
|
+
} else {
|
|
132
|
+
return color_error(`printable<> need string or toString(), not ${typeof data}(${data?.constructor?.name})`, color);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return (data as string).replace(combinedSequence, '');
|
|
136
|
+
},
|
|
127
137
|
};
|
|
128
138
|
type DebugCommands = Record<string, (arg: unknown, color: boolean) => string>;
|
|
139
|
+
const controlCharacters = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g; // 除了 \t \n \r 之外的控制字符
|
|
140
|
+
const csiSequence = /\x1B\[[\x30–\x3F]*[\x20-\x2F]*[\x40-\x7E]/g; // ANSI CSI序列
|
|
141
|
+
const oscSequence = /\x1B\][^\x1B\x07]*(\x1B\\|\x07)/g; // ANSI OSC序列
|
|
142
|
+
const pmApcSequence = /\x1B[_^][^\x1B\x07]*\x1B\\/g; // ANSI PM/APC序列
|
|
143
|
+
const dcsSequence = /\x1B[\x20-\x7E\x08-\x0D]*\x1B\\/g; // ANSI DCS序列
|
|
144
|
+
const sosSequence = /\x1B[\s\S]+?\x1B\\/g; // ANSI SOS序列
|
|
145
|
+
const otherC1 = /\x1B[\x80-\x9F]/g; // 其他C1控制字符
|
|
146
|
+
const combinedSequence = new RegExp(
|
|
147
|
+
[csiSequence.source, oscSequence.source, pmApcSequence.source, dcsSequence.source, sosSequence.source, otherC1.source, controlCharacters.source].join('|'),
|
|
148
|
+
'g',
|
|
149
|
+
);
|
|
129
150
|
|
|
130
151
|
export function call_debug_command(command: keyof typeof debug_commands | string, arg: unknown, color: boolean): string {
|
|
131
152
|
const fn = (debug_commands as DebugCommands)[command];
|
package/src/common/helpers.ts
CHANGED
|
@@ -91,7 +91,7 @@ export function compile_match_regex(tag: string, invert = false): RegExp {
|
|
|
91
91
|
regs.push(`${escapeRegExp(comb.join(':'))}:\\*`);
|
|
92
92
|
}
|
|
93
93
|
regs.push(escapeRegExp(tag));
|
|
94
|
-
return new RegExp(`(
|
|
94
|
+
return new RegExp(`(?:^| )(${invert ? '-' : ''})(${regs.join('|')})(?:$| )`, 'i');
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
/**
|
|
@@ -124,7 +124,7 @@ export function match_disabled(tag: string, env = process.env.DEBUG || ''): numb
|
|
|
124
124
|
* 调用debug模块的debug.enabled方法
|
|
125
125
|
*/
|
|
126
126
|
export function debug_enabled(tag: string) {
|
|
127
|
-
if(!tag) return true;
|
|
127
|
+
if (!tag) return true;
|
|
128
128
|
return debug(tag).enabled;
|
|
129
129
|
}
|
|
130
130
|
|
|
@@ -150,8 +150,8 @@ export let defaultLogLevel = (() => {
|
|
|
150
150
|
}
|
|
151
151
|
|
|
152
152
|
// DEBUG=xxx,verbose,xxx
|
|
153
|
-
// biome-ignore lint/performance/useTopLevelRegex:
|
|
154
|
-
const has_debug_verbose = /(
|
|
153
|
+
// biome-ignore lint/performance/useTopLevelRegex: a
|
|
154
|
+
const has_debug_verbose = /(?<=^| )(verbose|debug)(?=$| )/;
|
|
155
155
|
const setted = has_debug_verbose.exec(process.env.DEBUG || '');
|
|
156
156
|
if (setted) {
|
|
157
157
|
if (setted[0] === 'verbose') {
|
|
@@ -172,8 +172,10 @@ export let defaultLogLevel = (() => {
|
|
|
172
172
|
return EnableLogLevel.info;
|
|
173
173
|
case 'warn':
|
|
174
174
|
return EnableLogLevel.warn;
|
|
175
|
+
case 'error':
|
|
176
|
+
return EnableLogLevel.error;
|
|
175
177
|
default:
|
|
176
|
-
console.error('Invalid DEBUG_LEVEL: %s, using verbose.', process.env.DEBUG_LEVEL);
|
|
178
|
+
console.error('Invalid DEBUG_LEVEL: %s (allow: "", verbose, debug, info, warn, error), using verbose.', process.env.DEBUG_LEVEL);
|
|
177
179
|
return EnableLogLevel.verbose;
|
|
178
180
|
}
|
|
179
181
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import process from 'node:process';
|
|
2
2
|
import { PassThrough } from 'node:stream';
|
|
3
|
-
import { create } from './create.js';
|
|
3
|
+
import { create } from './create.logger.js';
|
|
4
4
|
import { debug_enabled, defaultLogLevel } from './helpers.js';
|
|
5
5
|
import { terminal } from './logger.global.js';
|
|
6
6
|
import { EnableLogLevel, type IMyLogger } from './types.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import process from 'node:process';
|
|
2
2
|
import { PassThrough } from 'node:stream';
|
|
3
|
-
import { create } from './create.js';
|
|
3
|
+
import { create } from './create.logger.js';
|
|
4
4
|
import { EnableLogLevel, type IMyLogger } from './types.js';
|
|
5
5
|
|
|
6
6
|
const stream = new PassThrough();
|
package/src/index.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { LogLevel, logTagColor } from './common/colors.js';
|
|
2
|
-
export { all_logger_names } from './common/create.js';
|
|
3
|
-
export { createDebug } from './common/
|
|
2
|
+
export { all_logger_names } from './common/create.logger.js';
|
|
3
|
+
export { createDebug } from './common/create.function.js';
|
|
4
4
|
export {
|
|
5
5
|
detectColorEnable as color_enabled,
|
|
6
6
|
debug_enabled,
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/common/create.ts"],"names":[],"mappings":"AAIA,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,CAgDrJ"}
|
package/lib/common/create.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/common/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"debug-fn.d.ts","sourceRoot":"","sources":["../../src/common/debug-fn.ts"],"names":[],"mappings":"AACA,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,CAsCjK"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"debug-fn.js","sourceRoot":"","sources":["../../src/common/debug-fn.ts"],"names":[],"mappings":"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"}
|