@hestjs/logger 0.1.4 → 0.1.5
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/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +9 -6
- package/dist/factory.js.map +1 -1
- package/dist/global.d.ts +6 -6
- package/dist/global.d.ts.map +1 -1
- package/dist/global.js +72 -18
- package/dist/global.js.map +1 -1
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +24 -74
- package/dist/logger.js.map +1 -1
- package/dist/serializers.d.ts +0 -1
- package/dist/serializers.d.ts.map +1 -1
- package/dist/serializers.js +2 -3
- package/dist/serializers.js.map +1 -1
- package/package.json +1 -1
package/dist/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEpD;;GAEG;AACH,wBAAgB,YAAY,CAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC7B,MAAM,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEpD;;GAEG;AACH,wBAAgB,YAAY,CAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC7B,MAAM,CA4ER;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC7B,MAAM,CAGR;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,MAAM,CAER"}
|
package/dist/factory.js
CHANGED
|
@@ -40,7 +40,7 @@ function createLogger(name, config) {
|
|
|
40
40
|
const stream = (0, pino_pretty_1.default)({
|
|
41
41
|
levelFirst: false,
|
|
42
42
|
colorize: true,
|
|
43
|
-
ignore: "pid,hostname",
|
|
43
|
+
ignore: "pid,hostname,error", // 忽略重复的error字段，只显示err
|
|
44
44
|
translateTime: "yy-mm-dd HH:MM:ss.l",
|
|
45
45
|
messageFormat: "{msg}",
|
|
46
46
|
customLevels: {
|
|
@@ -63,8 +63,8 @@ function createLogger(name, config) {
|
|
|
63
63
|
const pinoConfig = {
|
|
64
64
|
name: finalConfig.name || name || "HestJS",
|
|
65
65
|
level: finalConfig.level || "debug",
|
|
66
|
-
serializers: finalConfig.serializers,
|
|
67
|
-
formatters: finalConfig.formatters,
|
|
66
|
+
serializers: finalConfig.serializers || {},
|
|
67
|
+
formatters: finalConfig.formatters || {},
|
|
68
68
|
};
|
|
69
69
|
pinoLogger = (0, pino_1.default)(pinoConfig, stream);
|
|
70
70
|
}
|
|
@@ -73,12 +73,15 @@ function createLogger(name, config) {
|
|
|
73
73
|
pinoLogger = (0, pino_1.default)({
|
|
74
74
|
name: finalConfig.name || "HestJS",
|
|
75
75
|
level: finalConfig.level || "info",
|
|
76
|
-
serializers: finalConfig.serializers,
|
|
77
|
-
formatters: finalConfig.formatters,
|
|
76
|
+
serializers: finalConfig.serializers || {},
|
|
77
|
+
formatters: finalConfig.formatters || {},
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
|
+
// 如果有 name，创建一个 child logger 来包含 name
|
|
81
|
+
const loggerName = name || finalConfig.name || "HestJS";
|
|
82
|
+
const loggerWithName = pinoLogger.child({ name: loggerName });
|
|
80
83
|
// 返回 HestLogger 实例
|
|
81
|
-
return new logger_1.HestLogger(
|
|
84
|
+
return new logger_1.HestLogger(loggerWithName);
|
|
82
85
|
}
|
|
83
86
|
/**
|
|
84
87
|
* 创建带有上下文的 Logger
|
package/dist/factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":";;;;;AAeA,
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"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"}
|
package/dist/global.d.ts
CHANGED
|
@@ -19,12 +19,12 @@ export declare function configureGlobalLogger(name?: string, config?: Partial<Lo
|
|
|
19
19
|
* 便利方法 - 直接从全局 Logger 记录日志
|
|
20
20
|
*/
|
|
21
21
|
export declare const logger: {
|
|
22
|
-
fatal:
|
|
23
|
-
error:
|
|
24
|
-
warn:
|
|
25
|
-
info:
|
|
26
|
-
debug:
|
|
27
|
-
trace:
|
|
22
|
+
fatal: Logger["fatal"];
|
|
23
|
+
error: Logger["error"];
|
|
24
|
+
warn: Logger["warn"];
|
|
25
|
+
info: Logger["info"];
|
|
26
|
+
debug: Logger["debug"];
|
|
27
|
+
trace: Logger["trace"];
|
|
28
28
|
child: (bindings: Record<string, any>) => Logger;
|
|
29
29
|
setContext: (context: Record<string, any>) => Logger;
|
|
30
30
|
flush: () => void;
|
package/dist/global.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOpD;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAKxC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEpD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAExC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC7B,MAAM,CAGR;AAED;;GAEG;AACH,eAAO,MAAM,MAAM;
|
|
1
|
+
{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOpD;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAKxC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEpD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAExC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC7B,MAAM,CAGR;AAED;;GAEG;AACH,eAAO,MAAM,MAAM;WAUX,MAAM,CAAC,OAAO,CAAC;WAWf,MAAM,CAAC,OAAO,CAAC;UAWf,MAAM,CAAC,MAAM,CAAC;UAWd,MAAM,CAAC,MAAM,CAAC;WAWd,MAAM,CAAC,OAAO,CAAC;WAWf,MAAM,CAAC,OAAO,CAAC;sBAEH,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;0BAGf,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;4BAMjB,MAAM;CAG/B,CAAC"}
|
package/dist/global.js
CHANGED
|
@@ -42,24 +42,78 @@ function configureGlobalLogger(name, config) {
|
|
|
42
42
|
* 便利方法 - 直接从全局 Logger 记录日志
|
|
43
43
|
*/
|
|
44
44
|
exports.logger = {
|
|
45
|
-
fatal: (obj, message, ...args) => {
|
|
46
|
-
getGlobalLogger()
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
},
|
|
57
|
-
|
|
58
|
-
getGlobalLogger()
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
45
|
+
fatal: ((obj, message, ...args) => {
|
|
46
|
+
const globalLogger = getGlobalLogger();
|
|
47
|
+
if (obj instanceof Error) {
|
|
48
|
+
globalLogger.fatal(obj, message, ...args);
|
|
49
|
+
}
|
|
50
|
+
else if (typeof obj === 'string') {
|
|
51
|
+
globalLogger.fatal(obj, message, ...args);
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
globalLogger.fatal(obj, message, ...args);
|
|
55
|
+
}
|
|
56
|
+
}),
|
|
57
|
+
error: ((obj, message, ...args) => {
|
|
58
|
+
const globalLogger = getGlobalLogger();
|
|
59
|
+
if (obj instanceof Error) {
|
|
60
|
+
globalLogger.error(obj, message, ...args);
|
|
61
|
+
}
|
|
62
|
+
else if (typeof obj === 'string') {
|
|
63
|
+
globalLogger.error(obj, message, ...args);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
globalLogger.error(obj, message, ...args);
|
|
67
|
+
}
|
|
68
|
+
}),
|
|
69
|
+
warn: ((obj, message, ...args) => {
|
|
70
|
+
const globalLogger = getGlobalLogger();
|
|
71
|
+
if (obj instanceof Error) {
|
|
72
|
+
globalLogger.warn(obj, message, ...args);
|
|
73
|
+
}
|
|
74
|
+
else if (typeof obj === 'string') {
|
|
75
|
+
globalLogger.warn(obj, message, ...args);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
globalLogger.warn(obj, message, ...args);
|
|
79
|
+
}
|
|
80
|
+
}),
|
|
81
|
+
info: ((obj, message, ...args) => {
|
|
82
|
+
const globalLogger = getGlobalLogger();
|
|
83
|
+
if (obj instanceof Error) {
|
|
84
|
+
globalLogger.info(obj, message, ...args);
|
|
85
|
+
}
|
|
86
|
+
else if (typeof obj === 'string') {
|
|
87
|
+
globalLogger.info(obj, message, ...args);
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
globalLogger.info(obj, message, ...args);
|
|
91
|
+
}
|
|
92
|
+
}),
|
|
93
|
+
debug: ((obj, message, ...args) => {
|
|
94
|
+
const globalLogger = getGlobalLogger();
|
|
95
|
+
if (obj instanceof Error) {
|
|
96
|
+
globalLogger.debug(obj, message, ...args);
|
|
97
|
+
}
|
|
98
|
+
else if (typeof obj === 'string') {
|
|
99
|
+
globalLogger.debug(obj, message, ...args);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
globalLogger.debug(obj, message, ...args);
|
|
103
|
+
}
|
|
104
|
+
}),
|
|
105
|
+
trace: ((obj, message, ...args) => {
|
|
106
|
+
const globalLogger = getGlobalLogger();
|
|
107
|
+
if (obj instanceof Error) {
|
|
108
|
+
globalLogger.trace(obj, message, ...args);
|
|
109
|
+
}
|
|
110
|
+
else if (typeof obj === 'string') {
|
|
111
|
+
globalLogger.trace(obj, message, ...args);
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
globalLogger.trace(obj, message, ...args);
|
|
115
|
+
}
|
|
116
|
+
}),
|
|
63
117
|
child: (bindings) => {
|
|
64
118
|
return getGlobalLogger().child(bindings);
|
|
65
119
|
},
|
package/dist/global.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.js","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":";;;AAWA,0CAKC;AAKD,0CAEC;AAKD,8CAEC;AAKD,sDAMC;AAzCD,uCAAyC;AAGzC;;GAEG;AACH,IAAI,YAAY,GAAkB,IAAI,CAAC;AAEvC;;GAEG;AACH,SAAgB,eAAe;IAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,YAAY,GAAG,IAAA,sBAAY,EAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe,CAAC,MAAc;IAC5C,YAAY,GAAG,MAAM,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB;IAC/B,YAAY,GAAG,IAAI,CAAC;AACtB,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CACnC,IAAa,EACb,MAA8B;IAE9B,YAAY,GAAG,IAAA,sBAAY,EAAC,IAAI,IAAI,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;GAEG;AACU,QAAA,MAAM,GAAG;IACpB,KAAK,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"global.js","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":"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"}
|
package/dist/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAElD;;GAEG;AACH,qBAAa,UAAW,YAAW,MAAM;IACvC,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,QAAQ,CAAkB;gBAEtB,UAAU,EAAE,UAAU;IAIlC;;OAEG;IACH,IAAI,IAAI,IAAI,UAAU,CAErB;IAED;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM;IAKvC;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAO5C;;OAEG;IACH,OAAO,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
package/dist/logger.js
CHANGED
|
@@ -39,99 +39,36 @@ class HestLogger {
|
|
|
39
39
|
let logObj = { ...context };
|
|
40
40
|
let logMessage;
|
|
41
41
|
if (typeof obj === 'string') {
|
|
42
|
-
// logger.info('message') 或 logger.info('message',
|
|
42
|
+
// logger.info('message') 或 logger.info('message', data, ...)
|
|
43
43
|
logMessage = obj;
|
|
44
|
-
//
|
|
44
|
+
// 检查后续参数中是否有普通对象数据（不处理Error对象）
|
|
45
45
|
if (message !== undefined || args.length > 0) {
|
|
46
46
|
const allArgs = [message, ...args].filter(arg => arg !== undefined);
|
|
47
47
|
for (const arg of allArgs) {
|
|
48
|
-
if (arg instanceof Error) {
|
|
49
|
-
// 如果是 Error 对象，使用 err 键
|
|
50
|
-
if (!logObj.err) {
|
|
51
|
-
logObj.err = arg;
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
// 如果已经有错误，创建数组
|
|
55
|
-
if (Array.isArray(logObj.err)) {
|
|
56
|
-
logObj.err.push(arg);
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
logObj.err = [logObj.err, arg];
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
else if (typeof arg === 'object' && arg !== null) {
|
|
48
|
+
if (typeof arg === 'object' && arg !== null && !(arg instanceof Error)) {
|
|
64
49
|
// 如果是普通对象，合并到日志对象中
|
|
65
50
|
Object.assign(logObj, arg);
|
|
66
51
|
}
|
|
67
52
|
}
|
|
68
53
|
}
|
|
69
54
|
}
|
|
70
|
-
else if (obj instanceof Error) {
|
|
71
|
-
// logger.info(error, 'message') - Error 在前，消息在后
|
|
72
|
-
logObj.err = obj;
|
|
73
|
-
logMessage = message;
|
|
74
|
-
// 处理额外参数
|
|
75
|
-
for (const arg of args) {
|
|
76
|
-
if (arg instanceof Error && arg !== obj) {
|
|
77
|
-
// 如果有多个 Error，使用数组
|
|
78
|
-
if (Array.isArray(logObj.err)) {
|
|
79
|
-
logObj.err.push(arg);
|
|
80
|
-
}
|
|
81
|
-
else {
|
|
82
|
-
logObj.err = [logObj.err, arg];
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
else if (typeof arg === 'object' && arg !== null) {
|
|
86
|
-
Object.assign(logObj, arg);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
else if (obj && typeof obj === 'object') {
|
|
55
|
+
else if (obj && typeof obj === 'object' && !(obj instanceof Error)) {
|
|
91
56
|
// logger.info({ key: 'value' }, 'message') - 数据在前，消息在后
|
|
92
57
|
Object.assign(logObj, obj);
|
|
93
58
|
logMessage = message;
|
|
94
|
-
//
|
|
59
|
+
// 处理额外参数中的普通对象
|
|
95
60
|
for (const arg of args) {
|
|
96
|
-
if (arg instanceof Error) {
|
|
97
|
-
if (!logObj.err) {
|
|
98
|
-
logObj.err = arg;
|
|
99
|
-
}
|
|
100
|
-
else {
|
|
101
|
-
// 如果已经有错误，创建数组
|
|
102
|
-
if (Array.isArray(logObj.err)) {
|
|
103
|
-
logObj.err.push(arg);
|
|
104
|
-
}
|
|
105
|
-
else {
|
|
106
|
-
logObj.err = [logObj.err, arg];
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
else if (typeof arg === 'object' && arg !== null) {
|
|
61
|
+
if (typeof arg === 'object' && arg !== null && !(arg instanceof Error)) {
|
|
111
62
|
Object.assign(logObj, arg);
|
|
112
63
|
}
|
|
113
64
|
}
|
|
114
65
|
}
|
|
115
66
|
else {
|
|
116
|
-
// logger.info() - 没有参数，或者 obj
|
|
67
|
+
// logger.info() - 没有参数，或者 obj 是其他类型（包括Error）
|
|
117
68
|
logMessage = message;
|
|
118
|
-
//
|
|
69
|
+
// 处理额外参数中的普通对象
|
|
119
70
|
for (const arg of args) {
|
|
120
|
-
if (arg instanceof Error) {
|
|
121
|
-
if (!logObj.err) {
|
|
122
|
-
logObj.err = arg;
|
|
123
|
-
}
|
|
124
|
-
else {
|
|
125
|
-
// 如果已经有错误，创建数组
|
|
126
|
-
if (Array.isArray(logObj.err)) {
|
|
127
|
-
logObj.err.push(arg);
|
|
128
|
-
}
|
|
129
|
-
else {
|
|
130
|
-
logObj.err = [logObj.err, arg];
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
else if (typeof arg === 'object' && arg !== null) {
|
|
71
|
+
if (typeof arg === 'object' && arg !== null && !(arg instanceof Error)) {
|
|
135
72
|
Object.assign(logObj, arg);
|
|
136
73
|
}
|
|
137
74
|
}
|
|
@@ -143,8 +80,21 @@ class HestLogger {
|
|
|
143
80
|
this._pino.fatal(logObj, msg);
|
|
144
81
|
}
|
|
145
82
|
error(obj, message, ...args) {
|
|
146
|
-
|
|
147
|
-
|
|
83
|
+
if (typeof obj === 'string' && message instanceof Error) {
|
|
84
|
+
// logger.error('message', error) - 消息在前，错误在后
|
|
85
|
+
// 直接让pino处理：传递Error对象作为合并对象，消息作为第二个参数
|
|
86
|
+
this._pino.error(message, obj);
|
|
87
|
+
}
|
|
88
|
+
else if (obj instanceof Error) {
|
|
89
|
+
// logger.error(error, 'message') - 错误在前，消息在后
|
|
90
|
+
// 直接让pino处理：传递Error对象作为合并对象，消息作为第二个参数
|
|
91
|
+
this._pino.error(obj, message);
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
// 其他情况使用原来的方法
|
|
95
|
+
const [logObj, msg] = this.buildLogObject(obj, message, ...args);
|
|
96
|
+
this._pino.error(logObj, msg);
|
|
97
|
+
}
|
|
148
98
|
}
|
|
149
99
|
warn(obj, message, ...args) {
|
|
150
100
|
const [logObj, msg] = this.buildLogObject(obj, message, ...args);
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;AAGA;;GAEG;AACH,MAAa,UAAU;IAIrB,YAAY,UAAsB;QAF1B,aAAQ,GAAe,EAAE,CAAC;QAGhC,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,OAAmB;QAC5B,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,OAAO,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAA6B;QACjC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC;QAC9C,WAAW,CAAC,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,GAAqB,EAAE,OAAgB,EAAE,GAAG,IAAW;QAC5E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,IAAI,MAAM,GAAQ,EAAE,GAAG,OAAO,EAAE,CAAC;QACjC,IAAI,UAA8B,CAAC;QAEnC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
package/dist/serializers.d.ts
CHANGED
|
@@ -25,7 +25,6 @@ export declare const querySerializer: (query: any) => any;
|
|
|
25
25
|
export declare function getDefaultSerializers(): {
|
|
26
26
|
req: typeof stdSerializers.req;
|
|
27
27
|
res: typeof stdSerializers.res;
|
|
28
|
-
err: (err: Error) => any;
|
|
29
28
|
user: (user: any) => any;
|
|
30
29
|
query: (query: any) => any;
|
|
31
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializers.d.ts","sourceRoot":"","sources":["../src/serializers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,KAAK,QAYzC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,KAAK,GAAG,QAqBzC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,KAAK,GAAG,QAU1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,GAAG,QAKvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,OAAO,GAAG,QAWzC,CAAC;AAEF;;GAEG;AACH,wBAAgB,qBAAqB;;;
|
|
1
|
+
{"version":3,"file":"serializers.d.ts","sourceRoot":"","sources":["../src/serializers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,KAAK,QAYzC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,KAAK,GAAG,QAqBzC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,KAAK,GAAG,QAU1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,GAAG,QAKvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,OAAO,GAAG,QAWzC,CAAC;AAEF;;GAEG;AACH,wBAAgB,qBAAqB;;;iBA1BA,GAAG;mBAUD,GAAG;EA0BzC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,GAAG,EACtC,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,GACpB,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CASnB"}
|
package/dist/serializers.js
CHANGED
|
@@ -125,11 +125,10 @@ exports.querySerializer = querySerializer;
|
|
|
125
125
|
*/
|
|
126
126
|
function getDefaultSerializers() {
|
|
127
127
|
return {
|
|
128
|
-
//
|
|
128
|
+
// 使用 pino 标准的序列化器
|
|
129
129
|
req: stdSerializers.req,
|
|
130
130
|
res: stdSerializers.res,
|
|
131
|
-
//
|
|
132
|
-
err: exports.errorSerializer,
|
|
131
|
+
// 不使用任何错误序列化器，让pino使用默认处理
|
|
133
132
|
// 自定义序列化器
|
|
134
133
|
user: exports.userSerializer,
|
|
135
134
|
query: exports.querySerializer,
|
package/dist/serializers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../src/serializers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyFA,
|
|
1
|
+
{"version":3,"file":"serializers.js","sourceRoot":"","sources":["../src/serializers.ts"],"names":[],"mappings":"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"}
|